@danielgindi/selectbox 2.0.6 → 2.0.8

package/dist/lib.umd.js

@@ -1,5 +1,5 @@
 /*!
- * @danielgindi/selectbox 2.0.6
+ * @danielgindi/selectbox 2.0.8
  * git://github.com/danielgindi/selectbox.git
  */
 (function (global, factory) {
@@ -184,7 +184,7 @@
     'hide': the drop list was hidden.
     'hide:after': emitted after the hide css transition has ended, or immediately after 'hide'.
     'check' {value, item, checked: boolean, isGroup: boolean, isCheckingGroup: boolean}: item was selected (in multi mode).
-    'groupcheck' {value, item, affectedItems}: item was selected (in multi mode).
+    'groupcheck' {value, item, affectedCount: number}: item was selected (in multi mode).
     'blur' {event}: element lost focus
     'show_subitems {value, item, el, droplist: DropList}': subitems dropdown will show.
     'hide_subitems {value, item, el}': subitems dropdown did hide.
@@ -777,6 +777,10 @@
             p.groupCount++;
           }
 
+          if (typeof oitem._level === 'number') {
+            item._level = oitem._level;
+          }
+
           if (oitem._child) {
             // This is used for setting a child class,
             // But can be used to determine that current item is not part of above group,
@@ -879,6 +883,10 @@
           }
         }
 
+        if (hasOwnProperty.call(newItem, '_level')) {
+          newItem._level = item._level;
+        }
+
         if (hasOwnProperty.call(newItem, '_child'))
         item._child = !!newItem._child;
 
@@ -1184,7 +1192,15 @@
           if (typeof fn === 'function') {
             // Send the original items to the filter function
             filteredItems = p.filterFn(
-              p.items.map((x) => x[ItemSymbol] ?? x),
+              p.items.map((x) => {
+                const y = x[ItemSymbol];
+                if (y !== undefined) {
+                  y[ItemSymbol] = x;
+                  return y;
+                }
+
+                return x;
+              }),
               term);
 
             if (Array.isArray(filteredItems)) {
@@ -1200,6 +1216,7 @@
                     _nointeraction: !!oitem._nointeraction,
                     _subitems: oitem._subitems,
                     _group: !!oitem._group,
+                    _level: !!oitem._level,
                     _checked: !!oitem._checked
                   };
                 }
@@ -3006,17 +3023,19 @@
         if (item._group) {
           // Now loop through children below the group
 
-          let affectedItems = 0;
+          let affectedCount = 0;
 
           if (p.autoCheckGroupChildren) {
             const items = p.filteredItems ?? p.items;
             let groupIndex = items.indexOf(item);
+            const groupLevel = item._level;
 
             for (let i = groupIndex + 1, len = items.length; i < len; i++) {
               let next = items[i];
 
               // Hit the next group, break out
-              if (next._group || !next._child && items[i - 1]._child)
+              if (!next._child && items[i - 1]._child || (
+              groupLevel === undefined ? next._group || next._level !== undefined : next._level <= groupLevel))
               break;
 
               // No change, skip
@@ -3026,7 +3045,7 @@
               // Update state
               next._checked = item._checked;
 
-              affectedItems++;
+              affectedCount++;
 
               // Update DOM
               let nextEl = p.virtualListHelper.getItemElementAt(i);
@@ -3049,7 +3068,7 @@
           this._trigger('groupcheck', {
             value: item.value,
             item: item[ItemSymbol] ?? item,
-            affectedItems: affectedItems
+            affectedCount: affectedCount
           });
         } else if (p.groupCount > 0 && p.autoCheckGroupChildren) {
           const items = p.filteredItems ?? p.items;
@@ -3083,18 +3102,21 @@
 
         if (!groupItem || !groupItem._group) return this;
 
-        let item,hasChecked = false,hasUnchecked = false;
+        let next,hasChecked = false,hasUnchecked = false;
+
+        const groupLevel = groupItem._level;
 
         for (let i = groupIndex + 1, len = items.length; i < len; i++) {
-          item = items[i];
+          next = items[i];
 
           // Hit the next group, break out
-          if (item._group || !item._child && items[i - 1]._child)
+          if (!next._child && items[i - 1]._child || (
+          groupLevel === undefined ? next._group || next._level !== undefined : next._level <= groupLevel))
           break;
 
-          if (item._checked) {
+          if (next._checked) {
             hasChecked = true;
-          } else if (!item._checked) {
+          } else if (!next._checked) {
             hasUnchecked = true;
           }
         }
@@ -3451,11 +3473,12 @@
     'open' { list: DropList }: the drop list is opening
     'open:before' { list: DropList }: the drop list will open
     'close': the drop list is closing
-    'addsel:before' {value, item, cancel: false}: an item selection is about to be added (in multi mode). return false to abort.
-    'removesel:before' {value, item, cancel: false}: an item selection is about to be removed (in multi mode). return false to abort.
+    'addsel:before' {value, item, cancel: false, isCheckingGroup: bool}: an item selection is about to be added (in multi mode). return false to abort.
+    'removesel:before' {value, item, cancel: false, isCheckingGroup: bool}: an item selection is about to be removed (in multi mode). return false to abort.
+    'addsel' {value, item, isCheckingGroup: bool}: an item selection has been added (in multi mode)
+    'removesel' {value, item, isCheckingGroup: bool}: an item selection has been removed (in multi mode)
+    'groupcheck' {value, item, affectedCount: number}: an item selection has been removed (in multi mode)
     'select:before' {value, item, cancel: false}: an item is about to be selected (in single mode). return false to abort.
-    'addsel' {value, item}: an item selection has been added (in multi mode)
-    'removesel' {value, item}: an item selection has been removed (in multi mode)
     'select' {value, item}: an item has been selected (in single mode)
     'search' {value}: input box value has changed
     'search:focus': input box has gained focus
@@ -5133,7 +5156,12 @@
                   let checked = event.checked;
                   if (event.isGroup && !p.treatGroupSelectionAsItems) return; // Ignore groups
 
-                  let selEvt = { value: value, item: item, cancel: false };
+                  let selEvt = {
+                    value: value,
+                    item: item,
+                    cancel: false,
+                    isCheckingGroup: event.isCheckingGroup
+                  };
                   this._trigger((checked ? 'addsel' : 'removesel') + ':before', selEvt);
 
                   if (selEvt.cancel) {
@@ -5191,16 +5219,26 @@
                     this._scheduleSync('syncPlaceholder');
                   }
 
-                  this._trigger(checked ? 'addsel' : 'removesel', { value: value, item: item });
+                  this._trigger(checked ? 'addsel' : 'removesel', {
+                    value: value,
+                    item: item,
+                    isCheckingGroup: event.isCheckingGroup
+                  });
                 }
                 break;
 
               case 'groupcheck':{
                   if (!p.multi) return;
 
-                  if (event.affectedItems) {
+                  if (event.affectedCount) {
                     this._scheduleSync(p.sortSelectedItems ? 'full' : 'render_base');
                   }
+
+                  this._trigger('groupcheck', {
+                    value: event.value,
+                    item: event.item,
+                    affectedCount: event.affectedCount
+                  });
                 }
                 break;