@astral/ui 4.4.1 → 4.5.0

package/node/components/TreeLikeList/TreeItem/useLogic/utils/removeItem/removeItem.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeItem = void 0;
+const getIdFromValue_1 = require("../getIdFromValue");
+/**
+ * Удаляет элемент из value по id
+ */
+const removeItem = (value, idToRemove) => {
+    if (!value) {
+        return value;
+    }
+    return value.filter((treeItem) => (0, getIdFromValue_1.getIdFromValue)(treeItem) !== idToRemove);
+};
+exports.removeItem = removeItem;

package/node/components/TreeLikeList/TreeItem/useLogic/utils/removeItemsByIds/index.d.ts

@@ -0,0 +1 @@
+export { removeItemsByIds } from './removeItemsByIds';

package/node/components/TreeLikeList/TreeItem/useLogic/utils/removeItemsByIds/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeItemsByIds = void 0;
+var removeItemsByIds_1 = require("./removeItemsByIds");
+Object.defineProperty(exports, "removeItemsByIds", { enumerable: true, get: function () { return removeItemsByIds_1.removeItemsByIds; } });

package/node/components/TreeLikeList/TreeItem/useLogic/utils/removeItemsByIds/removeItemsByIds.d.ts

@@ -0,0 +1,5 @@
+import type { MultipleValue } from '../../../../types';
+/**
+ * Удаляет элементы из value по массиву id
+ */
+export declare const removeItemsByIds: <TValue extends MultipleValue = string[]>(value: TValue, idsToRemove: string[]) => TValue;

package/node/components/TreeLikeList/TreeItem/useLogic/utils/removeItemsByIds/removeItemsByIds.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeItemsByIds = void 0;
+const getIdFromValue_1 = require("../getIdFromValue");
+/**
+ * Удаляет элементы из value по массиву id
+ */
+const removeItemsByIds = (value, idsToRemove) => {
+    if (!value || idsToRemove.length === 0) {
+        return value;
+    }
+    const idsSet = new Set(idsToRemove);
+    return value.filter((treeItem) => !idsSet.has((0, getIdFromValue_1.getIdFromValue)(treeItem)));
+};
+exports.removeItemsByIds = removeItemsByIds;

package/node/components/TreeLikeList/TreeLikeList.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="react" />
-import { type TreeLikeListProps } from './types';
-export type { TreeLikeListProps };
-export declare const TreeLikeList: (props: TreeLikeListProps) => JSX.Element;
+import type { MultipleValue, TreeLikeListProps } from './types';
+export declare const TreeLikeList: <TValue extends MultipleValue = string[]>(props: TreeLikeListProps<TValue>) => JSX.Element;

package/node/components/TreeLikeList/TreeLikeList.js

@@ -9,6 +9,6 @@ const INITIAL_LEVEL = 0;
 const TreeLikeList = (props) => {
     const { listProps, itemProps } = (0, useLogic_1.useLogic)(props);
     const { data, className, expandedLevel = 10, disabledItems, ...restProps } = props;
-    return ((0, jsx_runtime_1.jsx)(styles_1.List, { className: className, ...listProps, children: data.map((item) => ((0, jsx_runtime_1.jsx)(TreeItem_1.TreeItem, { ...item, level: INITIAL_LEVEL, expandedLevel: expandedLevel, ...itemProps, ...restProps }, item.id))) }));
+    return ((0, jsx_runtime_1.jsx)(styles_1.List, { className: className, ...listProps, children: data.map((item) => ((0, jsx_runtime_1.jsx)(TreeItem_1.TreeItem, { item: item, level: INITIAL_LEVEL, expandedLevel: expandedLevel, ...itemProps, ...restProps }, item.id))) }));
 };
 exports.TreeLikeList = TreeLikeList;

package/node/components/TreeLikeList/index.d.ts

@@ -1 +1,2 @@
 export * from './TreeLikeList';
+export type { TreeLikeListProps } from './types';

package/node/components/TreeLikeList/types.d.ts

@@ -1,15 +1,15 @@
 import { type FunctionComponent } from 'react';
 import type { TreeListData } from '../Tree';
-export type MultipleValue = string[] | undefined;
+export type MultipleValue = TreeListData[] | string[] | undefined;
 export type DisabledItemValue = string | {
     id: string;
     disabledReason?: string;
 };
-export type TreeLikeListProps = {
+export type TreeLikeListProps<TValue extends MultipleValue = string[]> = {
     /**
      * Выбранные значения
      */
-    value?: MultipleValue;
+    value?: TValue;
     /**
      * Данные, которые необходимо отобразить в виде дерева.
      */
@@ -43,5 +43,9 @@ export type TreeLikeListProps = {
     /**
      * Функция, которая запускается при изменении состояния.
      */
-    onChange: (value: MultipleValue) => void;
+    onChange: (value: TValue) => void;
+    /**
+     *  Переключает компонент в режим работы с объектами а не с id элементов
+     */
+    isObjectMode?: boolean;
 };

package/node/components/TreeLikeList/useLogic/useLogic.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import { type TreeLikeListProps } from '../TreeLikeList';
-type UseLogicParams = TreeLikeListProps;
-export declare const useLogic: ({ data, value, disabledItems }: UseLogicParams) => {
+import type { MultipleValue, TreeLikeListProps } from '../types';
+type UseLogicParams<TValue extends MultipleValue = string[]> = TreeLikeListProps<TValue>;
+export declare const useLogic: <TValue extends MultipleValue = string[]>({ data, value, disabledItems, }: UseLogicParams<TValue>) => {
     listProps: {
         ref: import("react").RefObject<HTMLUListElement>;
     };

package/node/components/TreeLikeList/useLogic/useLogic.js

@@ -5,14 +5,15 @@ const react_1 = require("react");
 const useId_1 = require("../../hooks/useId");
 const utils_1 = require("../../Tree/utils");
 const utils_2 = require("./utils");
-const useLogic = ({ data, value, disabledItems }) => {
+const useLogic = ({ data, value, disabledItems, }) => {
     const prefixId = (0, useId_1.useId)();
     const listRef = (0, react_1.useRef)(null);
     (0, react_1.useEffect)(() => {
         if (listRef.current && value?.length) {
             // Выбираем первый элемент из списка value
+            const firstItemId = typeof value[0] === 'string' ? value[0] : value[0].id;
             const targetItem = listRef.current.querySelector(`
-        li[id="${prefixId}${value[0]}"]`);
+        li[id="${prefixId}${firstItemId}"]`);
             if (targetItem) {
                 targetItem.scrollIntoView({ block: 'center' });
             }

package/node/components/TreeLikeList/useLogic/utils/getChainsId/getChainsId.js

@@ -1,21 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChainsId = void 0;
+/*
+ * Возвращает цепочки идентификаторов до целевых элементов
+ */
 const getChainsId = (tree, targetId) => {
     const chainIds = [];
+    if (!targetId || targetId.length === 0) {
+        return [];
+    }
+    // Создаем набор идентификаторов для быстрого поиска
+    const targetIdsSet = new Set(targetId.map((item) => (typeof item === 'string' ? item : item.id)));
     const findChain = (node, chainId) => {
-        chainId.push(node.id);
-        if (targetId?.includes(node.id)) {
-            chainIds.push([...chainId]);
-            return;
-        }
-        if (node.children) {
-            for (const child of node.children) {
-                findChain(child, [...chainId]);
-            }
+        const currentChain = [...chainId, node.id];
+        // Проверяем по набору идентификаторов
+        if (targetIdsSet.has(node.id)) {
+            chainIds.push(currentChain);
+            // Не делаем return, так как элемент может иметь дочерние элементы с целевыми id
         }
+        node.children?.forEach((child) => findChain(child, currentChain));
     };
-    tree.forEach((node) => findChain(node, []));
+    for (const node of tree) {
+        findChain(node, []);
+    }
     return chainIds;
 };
 exports.getChainsId = getChainsId;

package/node/hook-form/FormTreeLikeAsyncAutocomplete/FormTreeLikeAsyncAutocomplete.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import { type FetchOptionsResult, type TreeLikeAsyncAutocompleteProps, type TreeLikeAsyncAutocompleteValue } from '../../components/TreeLikeAsyncAutocomplete';
+import { type WithFormFieldProps } from '../types';
+/**
+ * Тип значения, которое сетится в state формы
+ */
+export type FormTreeLikeAsyncAutocompleteValue = TreeLikeAsyncAutocompleteValue;
+export type FormFetchOptionsResult = FetchOptionsResult;
+export type FormTreeLikeAutocompleteProps<TFieldValues extends object> = WithFormFieldProps<TreeLikeAsyncAutocompleteProps, TFieldValues>;
+/**
+ * Обертка TreeLikeAsyncAutocomplete для формы
+ */
+export declare const FormTreeLikeAsyncAutocomplete: <TFieldValues extends object>(props: FormTreeLikeAutocompleteProps<TFieldValues>) => JSX.Element;

package/node/hook-form/FormTreeLikeAsyncAutocomplete/FormTreeLikeAsyncAutocomplete.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormTreeLikeAsyncAutocomplete = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const TreeLikeAsyncAutocomplete_1 = require("../../components/TreeLikeAsyncAutocomplete");
+const hooks_1 = require("../hooks");
+/**
+ * Обертка TreeLikeAsyncAutocomplete для формы
+ */
+const FormTreeLikeAsyncAutocomplete = (props) => {
+    const { error, ...fieldProps } = (0, hooks_1.useFormFieldProps)({
+        ...props,
+        defaultValue: props.defaultValue || '',
+    });
+    return (0, jsx_runtime_1.jsx)(TreeLikeAsyncAutocomplete_1.TreeLikeAsyncAutocomplete, { isError: error, ...fieldProps });
+};
+exports.FormTreeLikeAsyncAutocomplete = FormTreeLikeAsyncAutocomplete;

package/node/hook-form/FormTreeLikeAsyncAutocomplete/index.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astral/ui",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "browser": "./index.js",
   "main": "./node/index.js",
   "dependencies": {
@@ -127,6 +127,20 @@
       "types": "./hook-form/FormTreeAsyncAutocomplete/index.d.ts",
       "default": "./hook-form/FormTreeAsyncAutocomplete/index.js",
       "import": "./hook-form/FormTreeAsyncAutocomplete/index.js"
+    },
+    "./components/TreeLikeAsyncAutocomplete": {
+      "module": "./components/TreeLikeAsyncAutocomplete/index.js",
+      "require": "./node/components/TreeLikeAsyncAutocomplete/index.js",
+      "types": "./components/TreeLikeAsyncAutocomplete/index.d.ts",
+      "default": "./components/TreeLikeAsyncAutocomplete/index.js",
+      "import": "./components/TreeLikeAsyncAutocomplete/index.js"
+    },
+    "./hook-form/FormTreeLikeAsyncAutocomplete": {
+      "module": "./hook-form/FormTreeLikeAsyncAutocomplete/index.js",
+      "require": "./node/hook-form/FormTreeLikeAsyncAutocomplete/index.js",
+      "types": "./hook-form/FormTreeLikeAsyncAutocomplete/index.d.ts",
+      "default": "./hook-form/FormTreeLikeAsyncAutocomplete/index.js",
+      "import": "./hook-form/FormTreeLikeAsyncAutocomplete/index.js"
     }
   },
   "author": "Astral.Soft",