design-system-next 2.8.0 → 2.8.1

package/dist/package.json.d.ts

@@ -1,7 +1,7 @@
 declare const _default: {
   "name": "design-system-next",
   "private": false,
-  "version": "2.8.0",
+  "version": "2.8.1",
   "main": "./dist/design-system-next.js",
   "module": "./dist/design-system-next.js",
   "repository": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "design-system-next",
   "private": false,
-  "version": "2.8.0",
+  "version": "2.8.1",
   "main": "./dist/design-system-next.js",
   "module": "./dist/design-system-next.js",
   "repository": {

package/src/components/list/ladderized-list/use-ladderized-list.ts

@@ -1,4 +1,4 @@
-import { computed, onBeforeMount, ref, toRefs } from 'vue';
+import { computed, onBeforeMount, ref, toRefs, watch } from 'vue';
 import { useVModel } from '@vueuse/core';
 
 import { LadderizedListPropTypes, LadderizedListEmitTypes } from './ladderized-list';
@@ -146,6 +146,16 @@ export const useLadderizedList = (
     }
   };
 
+  // Watch for modelValue changes and reset selectedListItem if cleared
+  watch(
+    () => props.modelValue,
+    (newVal) => {
+      if (!newVal || (Array.isArray(newVal) && newVal.length === 0)) {
+        selectedListItem.value = [];
+      }
+    },
+  );
+
   onBeforeMount(() => {
     activeList.value = menuList.value;
     initializeMenuList();

package/src/components/select/select-multiple/select-multiple.ts

@@ -124,9 +124,6 @@ export const multiSelectEmitTypes = {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   'update:modelValue': (_value: unknown) => true,
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  'infinite-scroll-trigger': (_triggered: boolean) => true,
-
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   'search-string': (_search: string | number) => true,
 };

package/src/components/select/select-multiple/use-select-multiple.ts

@@ -1,5 +1,5 @@
 import { ref, toRefs, computed, ComputedRef, onMounted, watch } from 'vue';
-import { onClickOutside, useInfiniteScroll, useVModel, useDebounceFn } from '@vueuse/core';
+import { onClickOutside, useVModel, useDebounceFn } from '@vueuse/core';
 
 import classNames from 'classnames';
 
@@ -28,46 +28,46 @@ export const useMultiSelect = (props: MultiSelectPropTypes, emit: SetupContext<M
     };
   });
 
-  // Popper Variables
   const multiSelectRef = ref<HTMLDivElement | null>(null);
   const multiSelectPopperState = ref<boolean>(false);
   const isMultiSelectPopperDisabled = computed(() => disabled.value);
 
-  // Multi-Select Variables
   const multiSelectModel = useVModel(props, 'modelValue', emit);
-  const multiSelectedListItems = ref<MenuListType[]>();
+  const multiSelectedListItems = ref<MenuListType[]>([]);
   const multiSelectMenuList = ref<MenuListType[]>([]);
   const hasUserSelected = ref(false);
 
-  // Input Text Variables
   const inputText = ref<string | number>('');
   const inputTextBackup = ref<string | number>('');
   const isSearching = ref<boolean>(false);
 
+  /**
+   * Opens the multi-select dropdown menu and resets the searching state.
+   */
   const handleMenuToggle = () => {
     multiSelectPopperState.value = true;
-
     isSearching.value = false;
   };
 
-  // Normalized value for internal use - always an array
+  /**
+   * Returns the normalized value of the model as an array for internal use.
+   */
   const normalizedValue = computed(() => {
-    // If already an array, use it
     if (Array.isArray(multiSelectModel.value)) {
       return multiSelectModel.value;
     }
 
-    // If not an array but has a value, make it a single-item array
     if (multiSelectModel.value !== undefined && multiSelectModel.value !== null) {
       return [multiSelectModel.value];
     }
 
-    // Default empty array
     return [];
   });
 
+  /**
+   * Processes the menuList prop and normalizes it into MenuListType[] for the dropdown.
+   */
   const processMenuList = () => {
-    // Handle empty array or non-array values
     if (!menuList.value || !Array.isArray(menuList.value) || menuList.value.length === 0) {
       multiSelectMenuList.value = [];
 
@@ -76,7 +76,6 @@ export const useMultiSelect = (props: MultiSelectPropTypes, emit: SetupContext<M
 
     const firstItem = menuList.value[0];
 
-    // Handle array of strings
     if (typeof firstItem === 'string') {
       multiSelectMenuList.value = (menuList.value as string[]).map((item) => ({
         text: item,
@@ -86,43 +85,47 @@ export const useMultiSelect = (props: MultiSelectPropTypes, emit: SetupContext<M
       return;
     }
 
-    // Handle array of numbers
     if (typeof firstItem === 'number') {
-      multiSelectMenuList.value = (menuList.value as number[]).map((item) => ({
-        text: item.toString(),
-        value: item, // Keep the value as a number instead of converting to string
-      }));
+      multiSelectMenuList.value = (menuList.value as Array<number | string | Record<string, unknown>>)
+        .filter((item): item is number => typeof item === 'number')
+        .map((item) => ({
+          text: item.toString(),
+          value: item,
+        }));
 
       return;
     }
 
-    // Handle array of objects with dynamic attributes
     if (typeof firstItem === 'object' && firstItem !== null) {
-      // Check if it's already in MenuListType format
       if ('text' in firstItem && 'value' in firstItem) {
         multiSelectMenuList.value = menuList.value as MenuListType[];
+
         return;
       }
-      // Transform to MenuListType format using textField and valueField
+
       multiSelectMenuList.value = (menuList.value as Record<string, unknown>[]).map((item) => {
-        // Ensure displayText is a string
         const displayText = item[textField.value] !== undefined ? String(item[textField.value]) : 'Unnamed';
-        // Use the specified value field if available, otherwise use the entire object
+
         let itemValue = valueField.value && item[valueField.value] !== undefined ? item[valueField.value] : item;
-        // If itemValue is undefined, fallback to empty string
+
         if (itemValue === undefined) itemValue = '';
+
         return {
           text: displayText,
           value: typeof itemValue === 'object' ? JSON.stringify(itemValue) : String(itemValue),
-          _originalObject: item, // Store the original object for reference
+          _originalObject: item,
         };
       });
+
       return;
     }
 
     multiSelectMenuList.value = menuList.value as MenuListType[];
   };
 
+  /**
+   * Returns the filtered menu list based on the search input, or the full list if local search is disabled.
+   */
   const filteredMultiSelectMenuList = computed(() => {
     if (disabledLocalSearch.value) {
       return multiSelectMenuList.value;
@@ -135,102 +138,59 @@ export const useMultiSelect = (props: MultiSelectPropTypes, emit: SetupContext<M
     return multiSelectMenuList.value.filter((item) => item.text?.toString().toLowerCase().includes(query));
   });
 
-  watch(menuList, () => {
-    processMenuList();
-  });
-
-  // Search handler: always emit search-string, but only filter locally if local search is enabled
+  /**
+   * Handles the search input and emits the search-string event (debounced).
+   */
   const handleSearch = () => {
     isSearching.value = true;
 
     debouncedEmitSearch();
   };
 
+  /**
+   * Debounced function to emit the search-string event for remote search.
+   */
   const debouncedEmitSearch = useDebounceFn(() => {
     emit('search-string', inputText.value);
   }, 300);
 
+  /**
+   * Handles closing the dropdown when clicking outside, restoring input text if searching.
+   */
   onClickOutside(multiSelectRef, () => {
     multiSelectPopperState.value = false;
-    // If user was searching, restore inputText from backup
     if (isSearching.value) {
       inputText.value = inputTextBackup.value;
     }
     isSearching.value = false;
   });
 
-  useInfiniteScroll(
-    multiSelectRef,
-    () => {
-      emit('infinite-scroll-trigger', true);
-    },
-    { distance: 10 },
-  );
-
-  // Handle multi-selected item for simple list component
+  /**
+   * Handles selection changes from the dropdown and updates the model value.
+   * Converts stringified objects back to objects if needed.
+   */
   const handleMultiSelectedItem = (multiSelectedItems: MenuListType[]) => {
-    // Get the last clicked item (assuming spr-list emits the full array in order)
-    const lastClicked = multiSelectedItems[multiSelectedItems.length - 1];
-    if (!lastClicked) return;
-
-    // Normalize value for comparison
-    let lastValue: string | number | Record<string, unknown>;
-    if ('_originalObject' in lastClicked) {
-      lastValue = lastClicked._originalObject ?? lastClicked.value;
-    } else if (typeof lastClicked.value === 'number') {
-      lastValue = lastClicked.value;
-    } else if (
-      typeof lastClicked.value === 'string' &&
-      !isNaN(Number(lastClicked.value)) &&
-      lastClicked.value.trim() !== '' &&
-      /^-?\d+(\.\d+)?$/.test(lastClicked.value)
-    ) {
-      lastValue = Number(lastClicked.value);
-    } else {
-      lastValue = lastClicked.value;
-    }
-
-    // Always normalize current selection to an array
-    let current: (string | number | Record<string, unknown>)[] = [];
-    if (Array.isArray(multiSelectModel.value)) {
-      current = [...multiSelectModel.value];
-    } else if (
-      multiSelectModel.value !== undefined &&
-      multiSelectModel.value !== null &&
-      multiSelectModel.value !== ''
-    ) {
-      current = [multiSelectModel.value];
-    }
-
-    // Find if already selected (deep compare for objects, strict for primitives)
-    const isSelected = current.some((sel) => {
-      if (typeof sel === 'object' && typeof lastValue === 'object') {
-        return JSON.stringify(sel) === JSON.stringify(lastValue);
+    const selectedValues = multiSelectedItems.map((item) => {
+      if (typeof item.value === 'string' && item.value.startsWith('{') && item.value.endsWith('}')) {
+        try {
+          return JSON.parse(item.value);
+        } catch {
+          return item.value;
+        }
       }
-      return sel === lastValue;
+      return item.value;
     });
 
-    if (isSelected) {
-      // Remove from selection
-      current = current.filter((sel) => {
-        if (typeof sel === 'object' && typeof lastValue === 'object') {
-          return JSON.stringify(sel) !== JSON.stringify(lastValue);
-        }
-        return sel !== lastValue;
-      });
-    } else {
-      // Add to selection
-      current.push(lastValue);
-    }
-
     hasUserSelected.value = true;
-    multiSelectModel.value = current;
+    multiSelectModel.value = selectedValues;
     multiSelectPopperState.value = true;
-    // Clone inputText to backup after selection
     inputTextBackup.value = inputText.value;
   };
 
-  // Update multi-selected items when model value changes externally
+  /**
+   * Updates the selected items in the dropdown based on the current model value.
+   * Handles stringified objects and updates the input text accordingly.
+   */
   const updateMultiSelectedItemsFromValue = () => {
     if (!multiSelectMenuList.value.length) return;
 
@@ -238,70 +198,41 @@ export const useMultiSelect = (props: MultiSelectPropTypes, emit: SetupContext<M
 
     if (!values || !values.length) {
       multiSelectedListItems.value = [];
-
-      // Always clear inputText and backup if nothing is selected
       inputText.value = '';
       inputTextBackup.value = '';
 
       return;
     }
 
-    // Store both original values and string versions for flexible matching
-    const valueData = values.map((val) => {
-      if (val === undefined || val === null) return { original: '', string: '' };
-
-      // For objects, use JSON string representation
-      if (typeof val === 'object') {
-        return {
-          original: val,
-          string: JSON.stringify(val),
-          isObject: true,
-          id: 'id' in val ? val.id : undefined,
-        };
-      }
-
-      // For numbers and strings, keep original and string versions
-      return {
-        original: val,
-        string: val.toString(),
-        isObject: false,
-      };
-    });
-
-    // Extract just string values for comparison
-    const valueStrings = valueData.map((v) => v.string);
-
     multiSelectedListItems.value = multiSelectMenuList.value.filter((item) => {
-      // Handle objects with _originalObject property
-      if ('_originalObject' in item && item._originalObject) {
-        return valueData.some((v) => {
-          // If both are objects, compare by JSON string or by ID
-          if (v.isObject && typeof v.original === 'object') {
-            const originalObj = item._originalObject as Record<string, unknown>;
-
-            if (v.original === originalObj) return true;
-
-            const itemJson = JSON.stringify(originalObj);
-
-            if (v.string === itemJson) return true;
+      return values.some((val) => {
+        let itemVal = item.value;
+        let valToCompare = val;
+
+        if (typeof itemVal === 'string' && itemVal.startsWith('{') && itemVal.endsWith('}')) {
+          try {
+            itemVal = JSON.parse(itemVal);
+          } catch {
+            // ignore
+          }
+        }
 
-            if (v.id !== undefined && 'id' in originalObj) {
-              return v.id === originalObj.id;
-            }
+        if (typeof valToCompare === 'string' && valToCompare.startsWith('{') && valToCompare.endsWith('}')) {
+          try {
+            valToCompare = JSON.parse(valToCompare);
+          } catch {
+            // ignore
           }
-          return false;
-        });
-      }
+        }
 
-      // Handle both numeric and string values correctly
-      if (typeof item.value === 'number') {
-        return valueData.some((v) => v.original === item.value || v.string === String(item.value));
-      } else {
-        return valueStrings.includes(String(item.value));
-      }
+        if (typeof itemVal === 'object' && typeof valToCompare === 'object') {
+          return JSON.stringify(itemVal) === JSON.stringify(valToCompare);
+        }
+
+        return itemVal == valToCompare;
+      });
     });
 
-    // Only update inputText if not searching
     if (!isSearching.value) {
       if (multiSelectedListItems.value.length > 3) {
         inputText.value = `${multiSelectedListItems.value.length} items selected`;
@@ -309,19 +240,20 @@ export const useMultiSelect = (props: MultiSelectPropTypes, emit: SetupContext<M
         inputText.value = multiSelectedListItems.value.map((item) => item.text).join(', ');
       }
 
-      // Only use displayText.value if user hasn't selected anything yet
       if (displayText.value && !hasUserSelected.value && (!inputText.value || inputText.value === '')) {
         inputText.value = displayText.value;
         inputTextBackup.value = displayText.value;
-      } else {
-        // Always update backup to match inputText if not searching
+      } else if (hasUserSelected.value) {
         inputTextBackup.value = inputText.value;
       }
     }
   };
 
+  /**
+   * Clears the selection and input text, and closes the dropdown.
+   */
   const handleClear = () => {
-    emit('update:modelValue', '');
+    emit('update:modelValue', []);
 
     inputText.value = '';
 
@@ -339,7 +271,6 @@ export const useMultiSelect = (props: MultiSelectPropTypes, emit: SetupContext<M
   onMounted(() => {
     processMenuList();
 
-    // Set initial multi-selected items based on model value
     if (normalizedValue.value.length > 0) {
       updateMultiSelectedItemsFromValue();
     } else if (displayText.value) {