feat(search-pad): reset selection and viewbox on escape without enter

lib/features/search-pad/SearchPad.js

@@ -47,6 +47,8 @@ export default function SearchPad(canvas, eventBus, overlays, selection, transla
   this._open = false;
   this._results = [];
   this._eventMaps = [];
+  this._cachedSelection = null;
+  this._cachedViewbox = null;
 
   this._canvas = canvas;
   this._eventBus = eventBus;
@@ -328,6 +330,9 @@ SearchPad.prototype.open = function() {
     return;
   }
 
+  this._cachedSelection = this._selection.get();
+  this._cachedViewbox = this._canvas.viewbox();
+
   this._bindEvents();
 
   this._open = true;
@@ -348,6 +353,14 @@ SearchPad.prototype.close = function() {
     return;
   }
 
+  if (this._cachedSelection) {
+    this._selection.select(this._cachedSelection);
+  }
+
+  if (this._cachedViewbox) {
+    this._canvas.viewbox(this._cachedViewbox);
+  }
+
   this._unbindEvents();
 
   this._open = false;
@@ -406,6 +419,7 @@ SearchPad.prototype._preselect = function(node) {
 
   this._resetOverlay(element);
 
+  this._canvas.zoom(1);
   this._canvas.scrollToElement(element, { top: 400 });
 
   this._selection.select(element);
@@ -423,6 +437,9 @@ SearchPad.prototype._select = function(node) {
   var id = domAttr(node, SearchPad.RESULT_ID_ATTRIBUTE);
   var element = this._results[id].element;
 
+  this._cachedSelection = null;
+  this._cachedViewbox = null;
+
   this.close();
 
   this._resetOverlay();

test/spec/features/search-pad/SearchPadSpec.js

@@ -205,12 +205,11 @@ describe('features/searchPad', function() {
 
   describe('searching/selection', function() {
 
-    var element;
-
-    beforeEach(inject(function(searchPad) {
+    beforeEach(inject(function(selection, searchPad) {
 
       // given
-      element = searchProvider.find('one')[0].element;
+      selection.select(elements.one.a);
+
       searchPad.open();
     }));
 
@@ -286,13 +285,30 @@ describe('features/searchPad', function() {
     });
 
 
+    it('should reset selection on escape without enter', inject(function(selection) {
+
+      // given
+      selection.select(elements.one.a);
+
+      typeText(input_node, 'two');
+
+      expect(selection.isSelected(elements.one.a)).to.be.false;
+
+      // when
+      triggerKeyEvent(input_node, 'keyup', 'Escape');
+
+      // then
+      expect(selection.isSelected(elements.one.a)).to.be.true;
+    }));
+
+
     it('should set overlay on an highlighted element', inject(function(overlays) {
 
       // when
       typeText(input_node, 'one');
 
       // then
-      var overlay = overlays.get({ element: element });
+      var overlay = overlays.get({ element: elements.one.a });
       expect(overlay).length(1);
     }));
 
@@ -306,7 +322,7 @@ describe('features/searchPad', function() {
       triggerKeyEvent(input_node, 'keyup', 'Enter');
 
       // then
-      var overlay = overlays.get({ element: element });
+      var overlay = overlays.get({ element: elements.one.a });
       expect(overlay).length(0);
     }));
 
@@ -337,7 +353,7 @@ describe('features/searchPad', function() {
     }));
 
 
-    it('select should keep zoom level', inject(function(canvas) {
+    it('select set zoom level to 1', inject(function(canvas) {
 
       // given
       canvas.zoom(0.4);
@@ -348,8 +364,24 @@ describe('features/searchPad', function() {
       triggerKeyEvent(input_node, 'keyup', 'Enter');
 
       // then
-      var newViewbox = canvas.viewbox();
-      expect(newViewbox).to.have.property('scale', 0.4);
+      expect(canvas.zoom()).to.equal(1);
+    }));
+
+
+    it('select reset viewbox on escape without enter', inject(function(canvas) {
+
+      // given
+      var viewbox = canvas.viewbox();
+
+      typeText(input_node, 'two');
+
+      expect(canvas.viewbox()).not.to.eql(viewbox);
+
+      // when
+      triggerKeyEvent(input_node, 'keyup', 'Escape');
+
+      // then
+      expect(canvas.viewbox()).to.eql(viewbox);
     }));
 
 
@@ -362,7 +394,7 @@ describe('features/searchPad', function() {
       triggerKeyEvent(input_node, 'keyup', 'Enter');
 
       // then
-      expect(selection.isSelected(element)).to.be.true;
+      expect(selection.isSelected(elements.one.a)).to.be.true;
     }));