@appbaseio/reactivesearch-vue 1.35.3 → 1.35.5

package/dist/cjs/DataSearch.js

@@ -60,8 +60,7 @@ var DataSearch = {
       selectedTags: [],
       isOpen: false,
       normalizedSuggestions: [],
-      isPending: false,
-      isSuggestionSelected: false
+      isPending: false
     };
     this.internalComponent = props.componentId + "__internal";
     return this.__state;
@@ -446,7 +445,6 @@ var DataSearch = {
           _this.getRecentSearches();
         }
         if (isTagsMode) {
-          var isTagAdded = false;
           if (Array.isArray(_this.selectedTags) && _this.selectedTags.length) {
             // check if value already present in selectedTags
             if (typeof value === 'string' && _this.selectedTags.includes(value)) {
@@ -455,36 +453,14 @@ var DataSearch = {
             }
             _this.selectedTags = [].concat(_this.selectedTags);
             if (typeof value === 'string' && !!value) {
-              if (props.strictSelection && cause === configureStore.causes.SUGGESTION_SELECT) {
-                _this.selectedTags.push(value);
-                isTagAdded = true;
-              } else if (!props.strictSelection) {
-                _this.selectedTags.push(value);
-                isTagAdded = true;
-              }
+              _this.selectedTags.push(value);
             } else if (Array.isArray(value) && !isEqual(_this.selectedTags, value)) {
-              if (props.strictSelection && cause === configureStore.causes.SUGGESTION_SELECT) {
-                _this.selectedTags = value;
-                isTagAdded = true;
-              } else if (!props.strictSelection) {
-                _this.selectedTags.push(value);
-                isTagAdded = true;
-              }
+              _this.selectedTags = value;
             }
           } else if (value) {
-            if (props.strictSelection && cause === configureStore.causes.SUGGESTION_SELECT) {
-              _this.selectedTags = typeof value !== 'string' ? value : [].concat(value);
-              isTagAdded = true;
-            } else if (!props.strictSelection) {
-              _this.selectedTags = typeof value !== 'string' ? value : [].concat(value);
-              isTagAdded = true;
-            }
-          }
-          if (props.strictSelection && !isTagAdded) {
-            _this.currentValue = value;
-          } else {
-            _this.currentValue = '';
+            _this.selectedTags = typeof value !== 'string' ? value : [].concat(value);
           }
+          _this.currentValue = '';
         } else {
           _this.currentValue = value;
         }
@@ -504,7 +480,7 @@ var DataSearch = {
           if (props.strictSelection && props.autosuggest) {
             if (cause === configureStore.causes.SUGGESTION_SELECT || props.value !== undefined) {
               _this.updateQueryHandler(props.componentId, queryHandlerValue, props);
-            } else if (_this.currentValue !== '' && !props.strictSelection) {
+            } else if (_this.currentValue !== '') {
               _this.setValue('', true);
             }
           } else {
@@ -633,17 +609,17 @@ var DataSearch = {
       var targetValue = event.target.value;
       var _this$$props2 = this.$props,
         value = _this$$props2.value,
-        size = _this$$props2.size;
+        strictSelection = _this$$props2.strictSelection,
+        size = _this$$props2.size,
+        autosuggest = _this$$props2.autosuggest;
       if (value !== undefined) {
         this.isPending = true;
       }
       // if a suggestion was selected, delegate the handling to suggestion handler
       if (event.key === 'Enter' && (highlightedIndex === null || highlightedIndex < 0 || highlightedIndex === [].concat([].concat(this.suggestionsList).slice(0, size || 10), this.defaultSearchSuggestions, this.topSuggestions).length)) {
         this.isPending = false;
-        if (!this.isSuggestionSelected) {
-          this.setValue(targetValue, true, this.$props, undefined, false);
-          this.onValueSelectedHandler(targetValue, configureStore.causes.ENTER_PRESS);
-        }
+        this.setValue(this.$options.isTagsMode && autosuggest && strictSelection ? '' : targetValue, true, this.$props, undefined, false);
+        this.onValueSelectedHandler(targetValue, configureStore.causes.ENTER_PRESS);
       }
       // Need to review
       this.$emit('keyDown', event, this.triggerQuery);
@@ -679,16 +655,11 @@ var DataSearch = {
       }
     },
     onSuggestionSelected: function onSuggestionSelected(suggestion) {
-      var _this3 = this;
       var value = this.$props.value;
       // Record analytics for selected suggestions
       this.triggerClickAnalytics(suggestion._click_id);
       if (value === undefined) {
         this.setValue(suggestion.value, true, this.$props, configureStore.causes.SUGGESTION_SELECT);
-        this.isSuggestionSelected = true;
-        setTimeout(function () {
-          _this3.isSuggestionSelected = false;
-        }, 50);
       } else if (this.$options.isTagsMode) {
         var emitValue = Array.isArray(this.selectedTags) ? [].concat(this.selectedTags) : [];
         if (this.selectedTags.includes(suggestion.value)) {
@@ -794,7 +765,7 @@ var DataSearch = {
       return null;
     },
     renderTag: function renderTag(item) {
-      var _this4 = this;
+      var _this3 = this;
       var h = this.$createElement;
       var innerClass = this.$props.innerClass;
       return h(Tags.TagItem, {
@@ -807,7 +778,7 @@ var DataSearch = {
         "class": "close-icon",
         "on": {
           "click": function click() {
-            return _this4.clearTag(item);
+            return _this3.clearTag(item);
           }
         }
       }, [h(CancelSvg.CancelSvg)])]);
@@ -829,7 +800,7 @@ var DataSearch = {
       }
     },
     renderTags: function renderTags() {
-      var _this5 = this;
+      var _this4 = this;
       var h = this.$createElement;
       if (!Array.isArray(this.selectedTags)) {
         return null;
@@ -842,7 +813,7 @@ var DataSearch = {
         handleClear: this.clearTag,
         handleClearAll: this.clearAllTags
       }) : h(Tags.TagsContainer, [tagsList.map(function (item) {
-        return _this5.renderTag(item);
+        return _this4.renderTag(item);
       }), shouldRenderClearAllTag && h(Tags.TagItem, {
         "class": getClassName(this.$props.innerClass, 'selected-tag') || ''
       }, [h("span", ["Clear All"]), h("span", {
@@ -921,7 +892,7 @@ var DataSearch = {
       (_this$$refs = this.$refs) == null || (_this$$refs = _this$$refs[this.$props.innerRef]) == null ? void 0 : _this$$refs.focus(); // eslint-disable-line
     },
     listenForFocusShortcuts: function listenForFocusShortcuts() {
-      var _this6 = this;
+      var _this5 = this;
       var _this$$props$focusSho = this.$props.focusShortcuts,
         focusShortcuts = _this$$props$focusSho === void 0 ? ['/'] : _this$$props$focusSho;
       if (index.isEmpty(focusShortcuts)) {
@@ -936,7 +907,7 @@ var DataSearch = {
       function (event, handler) {
         // Prevent the default refresh event under WINDOWS system
         event.preventDefault();
-        _this6.focusSearchBox(event);
+        _this5.focusSearchBox(event);
       });
 
       // if one of modifier keys are used, they are handled below
@@ -946,7 +917,7 @@ var DataSearch = {
         for (var index$1 = 0; index$1 < modifierKeys.length; index$1 += 1) {
           var element = modifierKeys[index$1];
           if (hotkeys[element]) {
-            _this6.focusSearchBox(event);
+            _this5.focusSearchBox(event);
             break;
           }
         }
@@ -954,7 +925,7 @@ var DataSearch = {
     }
   },
   render: function render() {
-    var _this7 = this;
+    var _this6 = this;
     var h = arguments[0];
     var _this$$props6 = this.$props,
       theme = _this$$props6.theme,
@@ -989,14 +960,14 @@ var DataSearch = {
             highlightedIndex = _ref4.highlightedIndex,
             setHighlightedIndex = _ref4.setHighlightedIndex;
           var renderSuggestionsContainer = function renderSuggestionsContainer() {
-            return h("div", [_this7.hasCustomRenderer && _this7.getComponent({
+            return h("div", [_this6.hasCustomRenderer && _this6.getComponent({
               isOpen: isOpen,
               getItemProps: getItemProps,
               getItemEvents: getItemEvents,
               highlightedIndex: highlightedIndex
-            }), _this7.renderErrorComponent(), !_this7.hasCustomRenderer && isOpen && hasSuggestions ? h("ul", {
-              "class": Input.suggestions(_this7.themePreset, theme) + " " + getClassName(_this7.$props.innerClass, 'list')
-            }, [_this7.suggestionsList.slice(0, size || 10).map(function (item, index) {
+            }), _this6.renderErrorComponent(), !_this6.hasCustomRenderer && isOpen && hasSuggestions ? h("ul", {
+              "class": Input.suggestions(_this6.themePreset, theme) + " " + getClassName(_this6.$props.innerClass, 'list')
+            }, [_this6.suggestionsList.slice(0, size || 10).map(function (item, index) {
               return h("li", {
                 "domProps": _rollupPluginBabelHelpers._extends({}, getItemProps({
                   item: item
@@ -1006,15 +977,15 @@ var DataSearch = {
                 })),
                 "key": index + 1 + "-" + item.value,
                 "style": {
-                  backgroundColor: _this7.getBackgroundColor(highlightedIndex, index)
+                  backgroundColor: _this6.getBackgroundColor(highlightedIndex, index)
                 }
               }, [h(Tags.SuggestionItem, {
                 "attrs": {
-                  "currentValue": _this7.currentValue,
+                  "currentValue": _this6.currentValue,
                   "suggestion": item
                 }
               })]);
-            }), _this7.defaultSearchSuggestions.map(function (sugg, index) {
+            }), _this6.defaultSearchSuggestions.map(function (sugg, index) {
               return h("li", {
                 "domProps": _rollupPluginBabelHelpers._extends({}, getItemProps({
                   item: sugg
@@ -1022,9 +993,9 @@ var DataSearch = {
                 "on": _rollupPluginBabelHelpers._extends({}, getItemEvents({
                   item: sugg
                 })),
-                "key": _this7.suggestionsList.length + index + 1 + "-" + sugg.value,
+                "key": _this6.suggestionsList.length + index + 1 + "-" + sugg.value,
                 "style": {
-                  backgroundColor: _this7.getBackgroundColor(highlightedIndex, _this7.suggestionsList.length + index),
+                  backgroundColor: _this6.getBackgroundColor(highlightedIndex, _this6.suggestionsList.length + index),
                   justifyContent: 'flex-start'
                 }
               }, [h("div", {
@@ -1033,28 +1004,28 @@ var DataSearch = {
                 }
               }, [sugg.source && sugg.source._recent_search && h(Tags.CustomSvg, {
                 "attrs": {
-                  "className": getClassName(_this7.$props.innerClass, 'recent-search-icon') || null,
+                  "className": getClassName(_this6.$props.innerClass, 'recent-search-icon') || null,
                   "icon": recentSearchesIcon,
                   "type": "recent-search-icon"
                 }
               }), sugg.source && sugg.source._popular_suggestion && h(Tags.CustomSvg, {
                 "attrs": {
-                  "className": getClassName(_this7.$props.innerClass, 'popular-search-icon') || null,
+                  "className": getClassName(_this6.$props.innerClass, 'popular-search-icon') || null,
                   "icon": popularSearchesIcon,
                   "type": "popular-search-icon"
                 }
               })]), h(Tags.SuggestionItem, {
                 "attrs": {
-                  "currentValue": _this7.currentValue,
+                  "currentValue": _this6.currentValue,
                   "suggestion": sugg
                 }
               })]);
-            }), index.hasQuerySuggestionsRenderer(_this7) ? _this7.getComponent({
+            }), index.hasQuerySuggestionsRenderer(_this6) ? _this6.getComponent({
               isOpen: isOpen,
               getItemProps: getItemProps,
               getItemEvents: getItemEvents,
               highlightedIndex: highlightedIndex
-            }, true) : _this7.topSuggestions.map(function (sugg, index) {
+            }, true) : _this6.topSuggestions.map(function (sugg, index) {
               return h("li", {
                 "domProps": _rollupPluginBabelHelpers._extends({}, getItemProps({
                   item: sugg
@@ -1062,9 +1033,9 @@ var DataSearch = {
                 "on": _rollupPluginBabelHelpers._extends({}, getItemEvents({
                   item: sugg
                 })),
-                "key": _this7.suggestionsList.length + index + 1 + "-" + sugg.value,
+                "key": _this6.suggestionsList.length + index + 1 + "-" + sugg.value,
                 "style": {
-                  backgroundColor: _this7.getBackgroundColor(highlightedIndex, _this7.suggestionsList.length + index),
+                  backgroundColor: _this6.getBackgroundColor(highlightedIndex, _this6.suggestionsList.length + index),
                   justifyContent: 'flex-start'
                 }
               }, [h("div", {
@@ -1073,58 +1044,58 @@ var DataSearch = {
                 }
               }, [h(Tags.CustomSvg, {
                 "attrs": {
-                  "className": getClassName(_this7.$props.innerClass, 'popular-search-icon') || null,
+                  "className": getClassName(_this6.$props.innerClass, 'popular-search-icon') || null,
                   "icon": popularSearchesIcon,
                   "type": "popular-search-icon"
                 }
               })]), h(Tags.SuggestionItem, {
                 "attrs": {
-                  "currentValue": _this7.currentValue,
+                  "currentValue": _this6.currentValue,
                   "suggestion": sugg
                 }
               })]);
-            })]) : _this7.renderNoSuggestions(_this7.suggestionsList)]);
+            })]) : _this6.renderNoSuggestions(_this6.suggestionsList)]);
           };
           return h("div", {
             "class": Input.suggestionsContainer
-          }, [h(Tags.InputGroup, [_this7.renderInputAddonBefore(), h(CancelSvg.InputWrapper, [h(Input.Input, {
+          }, [h(Tags.InputGroup, [_this6.renderInputAddonBefore(), h(CancelSvg.InputWrapper, [h(Input.Input, {
             "attrs": {
-              "id": _this7.$props.componentId + "-input",
-              "showIcon": _this7.$props.showIcon,
-              "showClear": _this7.$props.showClear,
-              "iconPosition": _this7.$props.iconPosition,
-              "placeholder": _this7.$props.placeholder,
-              "autoFocus": _this7.$props.autoFocus,
-              "themePreset": _this7.themePreset,
+              "id": _this6.$props.componentId + "-input",
+              "showIcon": _this6.$props.showIcon,
+              "showClear": _this6.$props.showClear,
+              "iconPosition": _this6.$props.iconPosition,
+              "placeholder": _this6.$props.placeholder,
+              "autoFocus": _this6.$props.autoFocus,
+              "themePreset": _this6.themePreset,
               "autocomplete": "off"
             },
-            "ref": _this7.$props.innerRef,
-            "class": getClassName(_this7.$props.innerClass, 'input'),
+            "ref": _this6.$props.innerRef,
+            "class": getClassName(_this6.$props.innerClass, 'input'),
             "on": _rollupPluginBabelHelpers._extends({}, getInputEvents({
-              onInput: _this7.onInputChange,
+              onInput: _this6.onInputChange,
               onBlur: function onBlur(e) {
-                _this7.$emit('blur', e, _this7.triggerQuery);
+                _this6.$emit('blur', e, _this6.triggerQuery);
               },
-              onFocus: _this7.handleFocus,
+              onFocus: _this6.handleFocus,
               onKeyPress: function onKeyPress(e) {
-                _this7.$emit('keyPress', e, _this7.triggerQuery);
-                _this7.$emit('key-press', e, _this7.triggerQuery);
+                _this6.$emit('keyPress', e, _this6.triggerQuery);
+                _this6.$emit('key-press', e, _this6.triggerQuery);
               },
               onKeyDown: function onKeyDown(e) {
-                return _this7.handleKeyDown(e, highlightedIndex);
+                return _this6.handleKeyDown(e, highlightedIndex);
               },
               onKeyUp: function onKeyUp(e) {
-                _this7.$emit('keyUp', e, _this7.triggerQuery);
-                _this7.$emit('key-up', e, _this7.triggerQuery);
+                _this6.$emit('keyUp', e, _this6.triggerQuery);
+                _this6.$emit('key-up', e, _this6.triggerQuery);
               },
               onClick: function onClick() {
                 setHighlightedIndex(null);
               }
             })),
             "domProps": _rollupPluginBabelHelpers._extends({}, getInputProps({
-              value: _this7.$data.currentValue === null || typeof _this7.$data.currentValue !== 'string' ? '' : _this7.$data.currentValue
+              value: _this6.$data.currentValue === null || typeof _this6.$data.currentValue !== 'string' ? '' : _this6.$data.currentValue
             }))
-          }), _this7.renderIcons(), !expandSuggestionsContainer && renderSuggestionsContainer()]), ' ', _this7.renderInputAddonAfter()]), expandSuggestionsContainer && renderSuggestionsContainer(), _this7.renderTags()]);
+          }), _this6.renderIcons(), !expandSuggestionsContainer && renderSuggestionsContainer()]), ' ', _this6.renderInputAddonAfter()]), expandSuggestionsContainer && renderSuggestionsContainer(), _this6.renderTags()]);
         }
       }
     }) : h("div", {
@@ -1140,22 +1111,22 @@ var DataSearch = {
       },
       "on": _rollupPluginBabelHelpers._extends({}, {
         blur: function blur(e) {
-          _this7.$emit('blur', e, _this7.triggerQuery);
+          _this6.$emit('blur', e, _this6.triggerQuery);
         },
         keypress: function keypress(e) {
-          _this7.$emit('keyPress', e, _this7.triggerQuery);
-          _this7.$emit('key-press', e, _this7.triggerQuery);
+          _this6.$emit('keyPress', e, _this6.triggerQuery);
+          _this6.$emit('key-press', e, _this6.triggerQuery);
         },
         input: this.onInputChange,
         focus: function focus(e) {
-          _this7.$emit('focus', e, _this7.triggerQuery);
+          _this6.$emit('focus', e, _this6.triggerQuery);
         },
         keydown: function keydown(e) {
-          _this7.handleKeyDown(e, null);
+          _this6.handleKeyDown(e, null);
         },
         keyup: function keyup(e) {
-          _this7.$emit('keyUp', e, _this7.triggerQuery);
-          _this7.$emit('key-up', e, _this7.triggerQuery);
+          _this6.$emit('keyUp', e, _this6.triggerQuery);
+          _this6.$emit('key-up', e, _this6.triggerQuery);
         }
       }),
       "domProps": _rollupPluginBabelHelpers._extends({}, {

package/dist/cjs/ReactiveComponent.js

@@ -56,6 +56,7 @@ var ReactiveComponent = {
     var props = this.$props;
     this.internalComponent = null;
     this.$defaultQuery = null;
+    this.currentValue = this.selectedValue;
     // Set custom query in store
     index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
     var customQuery = props.customQuery,
@@ -140,7 +141,7 @@ var ReactiveComponent = {
   },
   watch: {
     selectedValue: function selectedValue(newVal, oldVal) {
-      if (!isEqual(newVal, oldVal)) {
+      if (!isEqual(newVal, oldVal) || !isEqual(newVal, this.currentValue)) {
         this.$emit('data', this.getData());
         this.currentValue = newVal;
       }