bug fix and feature update

sa-si-dev · Jan 1, 2023 · 91ec18e · 91ec18e
1 parent 18afcd6
commit 91ec18e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -39,10 +39,8 @@ export class Utils {
       if (value.length === 0) {
         result = true;
       }
-    } else if (typeof value === 'object') {
-      if (Object.keys(value).length === 0) {
-        result = true;
-      }
+    } else if (typeof value === 'object' && Object.keys(value).length === 0) {
+      result = true;
     }
 
     return result;
@@ -101,15 +99,11 @@ export class Utils {
     return Math.floor(Math.random() * (maxN - minN - 1)) + minN;
   }
 
-
   /**
-   * @static
    * @param {string} text
-   * @return {string} 
-   * @memberof Utils
+   * @return {string}
    */
   static regexEscape(text) {
-    return text.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); 
-  };
-
+    return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+  }
 }
diff --git a/src/virtual-select.js b/src/virtual-select.js
@@ -35,6 +35,7 @@ const dataProps = [
   'dropboxWrapper',
   'emptyValue',
   'enableSecureText',
+  'focusSelectedOptionOnOpen',
   'hasOptionDescription',
   'hideClearButton',
   'hideValueTooltipOnSelectAll',
@@ -255,10 +256,9 @@ export class VirtualSelect {
     const { labelRenderer, disableOptionGroupCheckbox, uniqueId, searchGroup } = this;
     const hasLabelRenderer = typeof labelRenderer === 'function';
     const { convertToBoolean } = Utils;
-    const { regexEscape } = Utils;
 
     if (markSearchResults) {
-      searchRegex = new RegExp(`(${regexEscape(this.searchValue)})`, 'gi');
+      searchRegex = new RegExp(`(${Utils.regexEscape(this.searchValue)})`, 'gi');
     }
 
     if (this.multiple) {
@@ -758,6 +758,7 @@ export class VirtualSelect {
     this.required = convertToBoolean(options.required);
     this.autofocus = convertToBoolean(options.autofocus);
     this.useGroupValue = convertToBoolean(options.useGroupValue);
+    this.focusSelectedOptionOnOpen = convertToBoolean(options.focusSelectedOptionOnOpen);
     this.noOptionsText = options.noOptionsText;
     this.noSearchResultsText = options.noSearchResultsText;
     this.selectAllText = options.selectAllText;
@@ -864,6 +865,7 @@ export class VirtualSelect {
       hideValueTooltipOnSelectAll: true,
       emptyValue: '',
       searchDelay: 300,
+      focusSelectedOptionOnOpen: true,
     };
 
     if (options.hasOptionDescription) {
@@ -1760,7 +1762,7 @@ export class VirtualSelect {
   setScrollTop() {
     const { selectedValues } = this;
 
-    if (this.showSelectedOptionsFirst || selectedValues.length === 0) {
+    if (this.showSelectedOptionsFirst || !this.focusSelectedOptionOnOpen || selectedValues.length === 0) {
       return;
     }
 
@@ -1887,7 +1889,7 @@ export class VirtualSelect {
     const { getString } = Utils;
     const secureText = this.secureText.bind(this);
 
-    const newOption = {
+    return {
       index: data.index,
       value: secureText(getString(data.value)),
       label: secureText(getString(data.label)),
@@ -1897,8 +1899,6 @@ export class VirtualSelect {
       isNew: data.isNew || false,
       isVisible: true,
     };
-
-    return newOption;
   }
 
   getNewOption() {
@@ -2179,11 +2179,9 @@ export class VirtualSelect {
     DomUtils.removeClass(this.$allWrappers, 'focused');
     this.removeOptionFocus();
 
-    if (!isSilent) {
-      if (this.isPopupActive) {
-        DomUtils.removeClass(this.$body, 'vscomp-popup-active');
-        this.isPopupActive = false;
-      }
+    if (!isSilent && this.isPopupActive) {
+      DomUtils.removeClass(this.$body, 'vscomp-popup-active');
+      this.isPopupActive = false;
     }
 
     DomUtils.addClass(this.$allWrappers, 'closed');
@@ -2557,6 +2555,7 @@ export class VirtualSelect {
     const isAllSelected = typeof isSelected === 'boolean' ? isSelected : this.isAllGroupOptionsSelected(groupIndex);
 
     this.toggleGroupTitleCheckbox($group, isAllSelected);
+    this.toggleGroupTitleProp(groupIndex, isAllSelected);
   }
 
   toggleGroupTitleProp(groupIndex, isSelected) {
@@ -2751,10 +2750,8 @@ export class VirtualSelect {
     const { description, alias } = data;
     let isVisible = searchByStartsWith ? label.startsWith(searchValue) : label.indexOf(searchValue) !== -1;
 
-    if (data.isGroupTitle) {
-      if (!searchGroup || !isVisible) {
-        isVisible = visibleOptionGroupsMapping[data.index];
-      }
+    if (data.isGroupTitle && (!searchGroup || !isVisible)) {
+      isVisible = visibleOptionGroupsMapping[data.index];
     }
 
     if (!searchByStartsWith && alias && !isVisible) {

diff --git a/src/virtual-select.types.js b/src/virtual-select.types.js
@@ -37,6 +37,7 @@
  * @property {string} [tooltipAlignment=center] CSS Text alignment for tooltip
  * @property {string} [tooltipMaxWidth='300px'] CSS max width for tooltip
  * @property {boolean} [showSelectedOptionsFirst=false] Show selected options at the top of the dropbox
+ * @property {boolean} [focusSelectedOptionOnOpen=true] Scroll selected option to viewport on dropbox open
  * @property {string} [name] Name attribute for hidden input
  * @property {boolean} [keepAlwaysOpen] Keep dropbox always open with fixed height
  * @property {number} [maxValues=0] Maximum no.of options allowed to choose in multiple select