@nys-cui/cui-formpill 0.2.8 → 0.2.10

package/package.json

@@ -6,7 +6,7 @@
     },
     "main": "./dist/js/cui-formpill.js",
     "type": "module",
-    "version": "0.2.8",
+    "version": "0.2.10",
     "scripts": {
         "clean": "rm -rf ./dist",
         "build": "npm run clean && cui --dep",

package/src/cui-formpill.js

@@ -416,6 +416,34 @@ class CUI_FORMPILL extends HTMLElement {
 
         this.shadowRoot.innerHTML = `${this.sFieldLayout} `;
 
+
+        if (this._state.adPills.length > 0) {
+            for (let pill of this._state.adPills) {
+
+                let removedValue = pill._state.sValue1;
+
+                const initialIndex = this._initialState.configData.filterCriteria.items.findIndex(item => item.value === removedValue);
+
+
+                // Check if the item is already in criteriaList
+                if (!this._state.criteriaList.some(item => item.value === removedValue)) {
+                    // Find the item in configData.filterCriteria.items
+                    const itemToAdd = this._state.configData.filterCriteria.items.find(item => item.value === removedValue);
+                    if (itemToAdd) {
+                        // Insert the item at the same position as in _initialState
+                        if (initialIndex !== -1) {
+                            this._state.criteriaList.splice(initialIndex, 0, itemToAdd);
+                        } else {
+                            // If the item is not found in _initialState, default to adding at the end
+                            this._state.criteriaList.push(itemToAdd);
+                        }
+                    }
+                }
+            }
+        }
+
+
+
         this._state.adPills = [];
 
         if (this._state.configData?.filterCriteria && !this._state.configData.filterCriteria.loadedPills) {
@@ -1305,7 +1333,8 @@ class CUI_FORMPILL extends HTMLElement {
 
                         // Loop through each value in pill.values
                         for (const val of pill.values) {
-                            const option = foundItem.controls.value.options.find(opt => opt.value === val);
+                            const optionProperty = foundItem.controls.value.options ?? foundItem.controls.value.control ?? null;
+                            const option = optionProperty ? optionProperty.find(opt => opt.value === val) : null;
                             if (option) {
                                 labelsArray.push(option.label);
                             } else {