@snack-uikit/fields 0.35.0 → 0.35.1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 0.35.1 (2024-11-20)
+
+
+### Bug Fixes
+
+* **PDS-959:** do not change item structure in search mode ([1abca3d](https://github.com/cloud-ru-tech/snack-uikit/commit/1abca3d7ca7cef91665195ee51a06cc9af14461e))
+
+
+
+
+
 # 0.35.0 (2024-11-19)
 
 

package/dist/cjs/components/FieldSelect/hooks.d.ts

@@ -37,5 +37,5 @@ export declare function useHandleDeleteItem(setValue: Handler): (item?: ItemWith
 /**
  * Четкий и нечеткий поиск среди айтемов по полям 'content.option', 'content.caption', 'content.description', 'label'
  */
-export declare function useSearch(items: ItemProps[], enableFuzzySearch?: boolean): (search: string) => import("@snack-uikit/list/dist/esm/components/Items").Item[] | import("@snack-uikit/list/dist/esm/components/Items").FlattenItem[];
+export declare function useSearch(items: ItemProps[], enableFuzzySearch?: boolean): (search: string) => import("@snack-uikit/list/dist/esm/components/Items").Item[];
 export {};

package/dist/cjs/components/FieldSelect/hooks.js

@@ -20,6 +20,7 @@ const list_1 = require("@snack-uikit/list");
 const hooks_1 = require("../../hooks");
 const legacy_1 = require("./legacy");
 const utils_1 = require("./utils");
+const filterItemsByFlattenIds_1 = require("./utils/filterItemsByFlattenIds");
 function useHandleOnKeyDown(_ref) {
   let {
     setOpen,
@@ -158,7 +159,7 @@ function useSearch(items) {
     });
     return Object.values(flattenItems);
   }, [items]);
-  const filterFunction = (0, react_1.useCallback)(search => {
+  const filterFlattenFunction = (0, react_1.useCallback)(search => {
     if (!enableFuzzySearch) {
       return flattenItems.filter(item => [...COMMON_FIELDS_TO_SEARCH, 'label'].some(key => {
         const value = (0, utils_1.getValueByPath)(item, key);
@@ -168,5 +169,9 @@ function useSearch(items) {
     const searcher = new fuzzy_search_1.default(flattenItems, COMMON_FIELDS_TO_SEARCH, {});
     return searcher.search(search);
   }, [enableFuzzySearch, flattenItems]);
+  const filterFunction = (0, react_1.useCallback)(search => {
+    const filteredIds = filterFlattenFunction(search).map(item => item.id);
+    return (0, filterItemsByFlattenIds_1.filterItemsByFlattenIds)(items, filteredIds);
+  }, [filterFlattenFunction, items]);
   return (0, react_1.useCallback)(search => search.length >= DEFAULT_MIN_SEARCH_INPUT_LENGTH ? filterFunction(search) : items, [filterFunction, items]);
 }

package/dist/cjs/components/FieldSelect/utils/filterItemsByFlattenIds.d.ts

@@ -0,0 +1,2 @@
+import { ItemId, ItemProps } from '@snack-uikit/list';
+export declare function filterItemsByFlattenIds(items: ItemProps[], ids: ItemId[]): import("@snack-uikit/list/dist/esm/components/Items").Item[];

package/dist/cjs/components/FieldSelect/utils/filterItemsByFlattenIds.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.filterItemsByFlattenIds = filterItemsByFlattenIds;
+const isItemWithId = item => item.id !== undefined;
+const isGroupItem = item => item.type === 'group';
+function filterItemsByFlattenIds(items, ids) {
+  const filteredItems = [];
+  items.forEach(item => {
+    if (isItemWithId(item) && item.id && ids.includes(item.id)) {
+      filteredItems.push(item);
+      return;
+    }
+    if (isGroupItem(item)) {
+      const filteredSubItems = filterItemsByFlattenIds(item.items, ids);
+      filteredItems.push(Object.assign(Object.assign({}, item), {
+        items: filteredSubItems
+      }));
+      return;
+    }
+  });
+  return filteredItems;
+}

package/dist/esm/components/FieldSelect/hooks.d.ts

@@ -37,5 +37,5 @@ export declare function useHandleDeleteItem(setValue: Handler): (item?: ItemWith
 /**
  * Четкий и нечеткий поиск среди айтемов по полям 'content.option', 'content.caption', 'content.description', 'label'
  */
-export declare function useSearch(items: ItemProps[], enableFuzzySearch?: boolean): (search: string) => import("@snack-uikit/list/dist/esm/components/Items").Item[] | import("@snack-uikit/list/dist/esm/components/Items").FlattenItem[];
+export declare function useSearch(items: ItemProps[], enableFuzzySearch?: boolean): (search: string) => import("@snack-uikit/list/dist/esm/components/Items").Item[];
 export {};

package/dist/esm/components/FieldSelect/hooks.js

@@ -5,6 +5,7 @@ import { isAccordionItemProps, isNextListItemProps, kindFlattenItems, } from '@s
 import { useCopyButton, useValueControl } from '../../hooks';
 import { extractChildIds } from './legacy';
 import { getValueByPath, isBaseOptionProps } from './utils';
+import { filterItemsByFlattenIds } from './utils/filterItemsByFlattenIds';
 export function useHandleOnKeyDown({ setOpen, inputKeyDownNavigationHandler, onInputKeyDownProp, }) {
     return useCallback((onKeyDown) => (e) => {
         if (e.code === 'Space') {
@@ -100,7 +101,7 @@ export function useSearch(items, enableFuzzySearch = true) {
         const { flattenItems } = kindFlattenItems({ items });
         return Object.values(flattenItems);
     }, [items]);
-    const filterFunction = useCallback((search) => {
+    const filterFlattenFunction = useCallback((search) => {
         if (!enableFuzzySearch) {
             return flattenItems.filter(item => [...COMMON_FIELDS_TO_SEARCH, 'label'].some(key => {
                 const value = getValueByPath(item, key);
@@ -110,5 +111,9 @@ export function useSearch(items, enableFuzzySearch = true) {
         const searcher = new FuzzySearch(flattenItems, COMMON_FIELDS_TO_SEARCH, {});
         return searcher.search(search);
     }, [enableFuzzySearch, flattenItems]);
+    const filterFunction = useCallback((search) => {
+        const filteredIds = filterFlattenFunction(search).map(item => item.id);
+        return filterItemsByFlattenIds(items, filteredIds);
+    }, [filterFlattenFunction, items]);
     return useCallback((search) => (search.length >= DEFAULT_MIN_SEARCH_INPUT_LENGTH ? filterFunction(search) : items), [filterFunction, items]);
 }

package/dist/esm/components/FieldSelect/utils/filterItemsByFlattenIds.d.ts

@@ -0,0 +1,2 @@
+import { ItemId, ItemProps } from '@snack-uikit/list';
+export declare function filterItemsByFlattenIds(items: ItemProps[], ids: ItemId[]): import("@snack-uikit/list/dist/esm/components/Items").Item[];

package/dist/esm/components/FieldSelect/utils/filterItemsByFlattenIds.js

@@ -0,0 +1,17 @@
+const isItemWithId = (item) => item.id !== undefined;
+const isGroupItem = (item) => item.type === 'group';
+export function filterItemsByFlattenIds(items, ids) {
+    const filteredItems = [];
+    items.forEach(item => {
+        if (isItemWithId(item) && item.id && ids.includes(item.id)) {
+            filteredItems.push(item);
+            return;
+        }
+        if (isGroupItem(item)) {
+            const filteredSubItems = filterItemsByFlattenIds(item.items, ids);
+            filteredItems.push(Object.assign(Object.assign({}, item), { items: filteredSubItems }));
+            return;
+        }
+    });
+    return filteredItems;
+}

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Fields",
-  "version": "0.35.0",
+  "version": "0.35.1",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -65,5 +65,5 @@
   "peerDependencies": {
     "@snack-uikit/locale": "*"
   },
-  "gitHead": "dd1825421e5d0964966e39a20bc5e09258acc3c2"
+  "gitHead": "8a406cbe32e37af611f8abee40c622e314a46090"
 }

package/src/components/FieldSelect/hooks.ts

@@ -15,6 +15,7 @@ import { useCopyButton, useValueControl } from '../../hooks';
 import { extractChildIds } from './legacy';
 import { ItemWithId, SearchState, SelectedOptionFormatter } from './types';
 import { getValueByPath, isBaseOptionProps } from './utils';
+import { filterItemsByFlattenIds } from './utils/filterItemsByFlattenIds';
 
 type UseHandleOnKeyDownProps = {
   inputKeyDownNavigationHandler: KeyboardEventHandler<HTMLInputElement>;
@@ -187,13 +188,12 @@ export function useSearch(items: ItemProps[], enableFuzzySearch: boolean = true)
     return Object.values(flattenItems);
   }, [items]);
 
-  const filterFunction = useCallback(
+  const filterFlattenFunction = useCallback(
     (search: string) => {
       if (!enableFuzzySearch) {
         return flattenItems.filter(item =>
           [...COMMON_FIELDS_TO_SEARCH, 'label'].some(key => {
             const value = getValueByPath(item, key);
-
             return value.toLowerCase().includes(search.toLowerCase());
           }),
         );
@@ -205,6 +205,14 @@ export function useSearch(items: ItemProps[], enableFuzzySearch: boolean = true)
     [enableFuzzySearch, flattenItems],
   );
 
+  const filterFunction = useCallback(
+    (search: string) => {
+      const filteredIds = filterFlattenFunction(search).map(item => item.id);
+      return filterItemsByFlattenIds(items, filteredIds);
+    },
+    [filterFlattenFunction, items],
+  );
+
   return useCallback(
     (search: string) => (search.length >= DEFAULT_MIN_SEARCH_INPUT_LENGTH ? filterFunction(search) : items),
     [filterFunction, items],

package/src/components/FieldSelect/utils/filterItemsByFlattenIds.ts

@@ -0,0 +1,23 @@
+import { GroupItemProps, ItemId, ItemProps } from '@snack-uikit/list';
+
+import { ItemWithId } from '../types';
+
+const isItemWithId = (item: ItemProps): item is ItemWithId => (item as ItemWithId).id !== undefined;
+
+const isGroupItem = (item: ItemProps): item is GroupItemProps => (item as GroupItemProps).type === 'group';
+
+export function filterItemsByFlattenIds(items: ItemProps[], ids: ItemId[]) {
+  const filteredItems: ItemProps[] = [];
+  items.forEach(item => {
+    if (isItemWithId(item) && item.id && ids.includes(item.id)) {
+      filteredItems.push(item);
+      return;
+    }
+    if (isGroupItem(item)) {
+      const filteredSubItems = filterItemsByFlattenIds(item.items, ids);
+      filteredItems.push({ ...item, items: filteredSubItems });
+      return;
+    }
+  });
+  return filteredItems;
+}