@evergis/uilib-gl 1.0.78 → 1.0.80

package/dist/organisms/AutoComplete/types.d.ts

@@ -63,6 +63,7 @@ export interface IPopup {
     bottomBind?: boolean;
     menuHeight?: string;
     width?: string;
+    minWidth?: string;
     containerRef?: (ref: HTMLDivElement | null) => void;
     root?: HTMLElement | null;
     onRequestClose?: VoidFunction;

package/dist/organisms/Tree/types.d.ts

@@ -47,6 +47,7 @@ export declare type TreeProps<T = any> = {
     data: TreeItemProps<T>[];
     setData?: Dispatch<SetStateAction<TreeItemProps<T>[]>>;
     loadNode?: (item: TreeItemProps<T>, offset?: number) => Promisable<PartialLoadData<T>>;
+    partialNodeMerge?: boolean;
     withLoadMore?: boolean;
     expanded?: TreeId[];
     allExpanded?: boolean;

package/dist/uilib-gl.esm.js

@@ -11,7 +11,7 @@ import de from 'date-fns/locale/de';
 import Locale from 'date-fns/locale/ru';
 import AutosuggestHighlightMatch from 'autosuggest-highlight/match';
 import AutosuggestHighlightParse from 'autosuggest-highlight/parse';
-import { debounce as debounce$1, throttle, isEqual, isNil, unescape, defaults, keyBy } from 'lodash-es';
+import { debounce as debounce$1, throttle, isEqual, isNil, unescape, defaults, keyBy, isEmpty } from 'lodash-es';
 import { CSSTransition as CSSTransition$1, TransitionGroup } from 'react-transition-group';
 import Transition from 'react-transition-group/Transition';
 import { background, border, color, flexbox, fontSize, fontWeight, fontStyle, space, layout, textAlign, position, lineHeight, padding } from 'styled-system';
@@ -13709,7 +13709,7 @@ const Box = styled.span`
       borderRadius
     }
   } = _ref3;
-  return borderRadius.medium;
+  return borderRadius.xSmall;
 }};
   box-sizing: border-box;
   overflow: hidden;
@@ -18783,7 +18783,7 @@ const OptionContainer = styled.div`
   justify-content: flex-start;
   align-items: center;
   min-height: 1.25em;
-  padding: 0.75rem 1rem;
+  padding: 0.625rem 1rem;
   color: ${_ref => {
   let {
     theme: {
@@ -18856,7 +18856,6 @@ const OptionContainer = styled.div`
 }};
 `;
 const OptionIcon = styled.span`
-  margin-right: 0.5rem;
   min-width: 1.5rem;
   text-overflow: unset !important;
 `;
@@ -21086,16 +21085,22 @@ const classNames = {
 };
 const Menu$1 = /*#__PURE__*/styled(Blank)`
   position: relative;
-  min-width: ${_ref => {
+  width: ${_ref => {
   let {
-    minWidth
+    width
   } = _ref;
+  return width ?? "auto";
+}};
+  min-width: ${_ref2 => {
+  let {
+    minWidth
+  } = _ref2;
   return minWidth;
 }};
-  max-height: ${_ref2 => {
+  max-height: ${_ref3 => {
   let {
     maxHeight
-  } = _ref2;
+  } = _ref3;
   return maxHeight;
 }};
   padding: 0.625rem 0;
@@ -21114,6 +21119,7 @@ const PopupComponent = _ref => {
     bottomBind,
     menuHeight,
     width,
+    minWidth,
     anchor,
     children,
     containerRef,
@@ -21132,7 +21138,8 @@ const PopupComponent = _ref => {
     root: root,
     onRequestClose: onRequestClose
   }, React.createElement(Menu$1, Object.assign({
-    minWidth: width,
+    width: width,
+    minWidth: minWidth,
     maxHeight: menuHeight,
     ref: containerRef
   }, props), children));
@@ -28507,7 +28514,6 @@ const TreeExpand = /*#__PURE__*/styled(Icon)`
   width: 0.875rem;
   height: 0.875rem;
   margin-top: -0.125rem;
-  margin-right: 0.5rem;
   cursor: pointer;
 
   &:after {
@@ -28517,6 +28523,7 @@ const TreeExpand = /*#__PURE__*/styled(Icon)`
 const TreeContent = /*#__PURE__*/styled(Flex)`
   align-items: center;
   gap: 0 0.25rem;
+  min-width: 1px;
 `;
 const TreeText = styled.div`
   font-size: 0.75rem;
@@ -28785,6 +28792,7 @@ const TreeComponent = _ref => {
     setExpanded,
     setSelected,
     withLoadMore,
+    partialNodeMerge = true,
     onItemClick,
     onExpand,
     Item = TreeItem
@@ -28816,10 +28824,25 @@ const TreeComponent = _ref => {
           children,
           totalCount
         } = await loadNode(item);
-        onItemUpdate(item.id, currentItem => ({ ...currentItem,
-          children,
-          totalCount
-        }));
+        onItemUpdate(item.id, currentItem => {
+          const newChildren = children == null ? void 0 : children.map(item => {
+            var _currentItem$children;
+
+            const oldItem = (_currentItem$children = currentItem.children) == null ? void 0 : _currentItem$children.find(_ref2 => {
+              let {
+                id
+              } = _ref2;
+              return id === item.id;
+            });
+            return { ...item,
+              children: !isEmpty(oldItem == null ? void 0 : oldItem.children) && partialNodeMerge ? oldItem == null ? void 0 : oldItem.children : item == null ? void 0 : item.children
+            };
+          }, []);
+          return { ...currentItem,
+            children: newChildren,
+            totalCount
+          };
+        });
       } finally {
         onItemUpdate(item.id, currentItem => ({ ...currentItem,
           loading: false
@@ -28828,7 +28851,7 @@ const TreeComponent = _ref => {
     }
 
     onExpand == null ? void 0 : onExpand(item, isExpanded, onlyReload);
-  }, [expand, onExpand, onItemUpdate, loadNode]);
+  }, [expand, onExpand, onItemUpdate, loadNode, partialNodeMerge]);
   const onLoadMore = useCallback(async item => {
     if (!loadNode) {
       return;
@@ -28860,39 +28883,39 @@ const TreeComponent = _ref => {
       return [...result, item, ...getChildren(item.children)];
     }, []);
   }, []);
-  const getIsSomeSelected = useCallback(items => items.some(_ref2 => {
+  const getIsSomeSelected = useCallback(items => items.some(_ref3 => {
     let {
       id,
       disabled,
       children
-    } = _ref2;
+    } = _ref3;
     return disabled ? false : children != null && children.length ? getIsSomeSelected(children) : selected == null ? void 0 : selected.includes(id);
   }), [selected]);
-  const getIsSomeDeselected = useCallback(items => items.some(_ref3 => {
+  const getIsSomeDeselected = useCallback(items => items.some(_ref4 => {
     let {
       id,
       disabled,
       children
-    } = _ref3;
+    } = _ref4;
     return disabled ? false : children != null && children.length ? getIsSomeDeselected(children) : !(selected != null && selected.includes(id));
   }), [selected]);
   const getIsIndeterminate = useCallback(items => {
     if (!(items != null && items.length)) return false;
     return getIsSomeSelected(items) && getIsSomeDeselected(items);
   }, [getIsSomeDeselected, getIsSomeSelected]);
-  const getIsDisabled = useCallback(_ref4 => {
+  const getIsDisabled = useCallback(_ref5 => {
     let {
       disabled,
       children
-    } = _ref4;
+    } = _ref5;
     return disabled || !!(children != null && children.length) && (children == null ? void 0 : children.every(child => getIsDisabled(child)));
   }, []);
-  const addItem = useCallback((_ref5, selected) => {
+  const addItem = useCallback((_ref6, selected) => {
     let {
       id,
       disabled,
       children
-    } = _ref5;
+    } = _ref6;
     return disabled ? selected : children != null && children.length || selected.includes(id) ? selected : [...selected, id];
   }, []);
   const removeItem = useCallback((item, selected) => {