@laser-ui/components 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.1](https://github.com/laser-ui/laser-ui/compare/v1.1.0...v1.1.1) (2024-08-30)
+
+### Bug Fixes
+
+- fix automatically update when nested ([d1c0b46](https://github.com/laser-ui/laser-ui/commit/d1c0b4645965e31b382058b60b2569b253c162e5))
+
 # [1.1.0](https://github.com/laser-ui/laser-ui/compare/v1.0.2...v1.1.0) (2024-08-30)
 
 ### Features

package/dropdown/Dropdown.js

@@ -9,7 +9,7 @@ import { DropdownItem as DropdownItemFC } from './internal/DropdownItem';
 import { DropdownSub } from './internal/DropdownSub';
 import { checkEnableItem, getSameLevelEnableItems } from './utils';
 import { CLASSES } from './vars';
-import { useComponentProps, useControlled, useFocusVisible, useJSS, useMaxIndex, useNamespace, useNestedPopup, useStyled, useTranslation, } from '../hooks';
+import { useComponentProps, useContainerScrolling, useControlled, useFocusVisible, useJSS, useMaxIndex, useNamespace, useNestedPopup, useStyled, useTranslation, } from '../hooks';
 import { Popup } from '../internal/popup';
 import { Portal } from '../internal/portal';
 import { Transition } from '../internal/transition';
@@ -254,14 +254,14 @@ function DropdownFC(props, ref) {
         });
         return getNodes(list, 0, []);
     })();
-    useImperativeHandle(ref, () => ({
-        updatePosition: () => {
-            updatePosition();
-            for (const fn of dataRef.current.updatePosition.values()) {
-                fn();
-            }
-        },
-    }), [updatePosition]);
+    const updateAllPosition = useEventCallback(() => {
+        updatePosition();
+        for (const fn of dataRef.current.updatePosition.values()) {
+            fn();
+        }
+    });
+    useContainerScrolling(triggerRef, updateAllPosition, !visible);
+    useImperativeHandle(ref, () => ({ updatePosition: updateAllPosition }), [updateAllPosition]);
     return (_jsx(Popup, { visible: visible, trigger: trigger, updatePosition: {
             fn: updatePosition,
             triggerRef,

package/dropdown/internal/DropdownSub.js

@@ -20,7 +20,7 @@ export const DropdownSub = forwardRef((props, ref) => {
     const visible = !isUndefined(popupState);
     const transformOrigin = useRef();
     const updatePosition = useEventCallback(() => {
-        if (visible && popupRef.current && triggerRef.current) {
+        if (!disabled && visible && popupRef.current && triggerRef.current) {
             const [width, height] = [popupRef.current.offsetWidth, popupRef.current.offsetHeight];
             const position = getHorizontalSidePosition(triggerRef.current, { width, height }, {
                 placement: 'right',
@@ -42,6 +42,7 @@ export const DropdownSub = forwardRef((props, ref) => {
             fn: updatePosition,
             triggerRef,
             popupRef,
+            scroll: false,
         }, onVisibleChange: onVisibleChange, children: ({ renderTrigger, renderPopup }) => (_jsxs(_Fragment, { children: [renderTrigger(_jsxs("li", Object.assign({}, mergeCS(styled('dropdown__item', 'dropdown__item--sub', {
                     'dropdown__item.is-expand': visible,
                     'dropdown__item.is-disabled': disabled,

package/internal/popup/Popup.js

@@ -42,7 +42,7 @@ export function Popup(props) {
             changeVisible();
         }
     };
-    useContainerScrolling(updatePosition.triggerRef, updatePosition.fn, disabled || !visibleProp);
+    useContainerScrolling(updatePosition.triggerRef, updatePosition.fn, disabled || updatePosition.scroll === false || !visibleProp);
     useResize(updatePosition.triggerRef, updatePosition.fn, undefined, disabled || !visibleProp);
     useResize(updatePosition.popupRef, updatePosition.fn, undefined, disabled || !visibleProp);
     useResize(contentResizeRef, updatePosition.fn, undefined, disabled || !visibleProp);

package/internal/popup/types.d.ts

@@ -15,6 +15,7 @@ export interface PopupProps {
         fn: () => void;
         triggerRef: React.RefObject<HTMLElement>;
         popupRef: React.RefObject<HTMLElement>;
+        scroll?: boolean;
     };
     onVisibleChange: (visible: boolean) => void;
 }

package/menu/Menu.js

@@ -2,13 +2,13 @@ import { __rest } from "tslib";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { findNested } from '@laser-ui/utils';
 import { isNull, isUndefined, nth } from 'lodash';
-import { Fragment, forwardRef, useId, useImperativeHandle, useRef, useState } from 'react';
+import { Fragment, forwardRef, useCallback, useId, useImperativeHandle, useRef, useState } from 'react';
 import { MenuGroup } from './internal/MenuGroup';
 import { MenuItem as MenuItemFC } from './internal/MenuItem';
 import { MenuSub } from './internal/MenuSub';
 import { checkEnableItem, getSameLevelEnableItems } from './utils';
 import { CLASSES } from './vars';
-import { useComponentProps, useControlled, useFocusVisible, useNamespace, useNestedPopup, useStyled } from '../hooks';
+import { useComponentProps, useContainerScrolling, useControlled, useFocusVisible, useNamespace, useNestedPopup, useStyled, } from '../hooks';
 import { CollapseTransition } from '../internal/transition';
 import { mergeCS } from '../utils';
 import { TTANSITION_DURING_BASE } from '../vars';
@@ -18,6 +18,7 @@ function MenuFC(props, ref) {
     const styled = useStyled(CLASSES, { menu: styleProvider === null || styleProvider === void 0 ? void 0 : styleProvider.menu, 'menu-popup': styleProvider === null || styleProvider === void 0 ? void 0 : styleProvider['menu-popup'] }, styleOverrides);
     const uniqueId = useId();
     const getItemId = (id) => `${namespace}-menu-item-${id}-${uniqueId}`;
+    const menuRef = useRef(null);
     const dataRef = useRef({
         mousedown: false,
         updatePosition: new Map(),
@@ -324,13 +325,13 @@ function MenuFC(props, ref) {
         };
         return getNodes(list, 0, [], true);
     })();
-    useImperativeHandle(ref, () => ({
-        updatePosition: () => {
-            for (const fn of dataRef.current.updatePosition.values()) {
-                fn();
-            }
-        },
-    }), []);
+    const updatePosition = useCallback(() => {
+        for (const fn of dataRef.current.updatePosition.values()) {
+            fn();
+        }
+    }, []);
+    useContainerScrolling(menuRef, updatePosition);
+    useImperativeHandle(ref, () => ({ updatePosition }), [updatePosition]);
     return (_jsx(CollapseTransition, { originalSize: {
             width,
         }, collapsedSize: {
@@ -342,7 +343,7 @@ function MenuFC(props, ref) {
             leaving: {
                 transition: ['width', 'padding', 'margin'].map((attr) => `${attr} ${TTANSITION_DURING_BASE}ms linear`).join(', '),
             },
-        }, children: (menuRef, collapseStyle) => {
+        }, children: (collapseRef, collapseStyle) => {
             var _a;
             const preventBlur = (e) => {
                 if (document.activeElement === e.currentTarget && e.button === 0) {
@@ -354,7 +355,10 @@ function MenuFC(props, ref) {
             _jsx("nav", Object.assign({}, restProps, mergeCS(styled('menu', { 'menu--horizontal': mode === 'horizontal' }), {
                 className: restProps.className,
                 style: Object.assign(Object.assign(Object.assign({}, restProps.style), { width }), collapseStyle),
-            }), { ref: menuRef, tabIndex: (_a = restProps.tabIndex) !== null && _a !== void 0 ? _a : 0, role: "menubar", "aria-orientation": mode === 'horizontal' ? 'horizontal' : 'vertical', "aria-activedescendant": isUndefined(focusId) ? undefined : getItemId(focusId), onFocus: (e) => {
+            }), { ref: (el) => {
+                    collapseRef.current = el;
+                    menuRef.current = el;
+                }, tabIndex: (_a = restProps.tabIndex) !== null && _a !== void 0 ? _a : 0, role: "menubar", "aria-orientation": mode === 'horizontal' ? 'horizontal' : 'vertical', "aria-activedescendant": isUndefined(focusId) ? undefined : getItemId(focusId), onFocus: (e) => {
                     var _a;
                     (_a = restProps.onFocus) === null || _a === void 0 ? void 0 : _a.call(restProps, e);
                     if (!dataRef.current.mousedown) {

package/menu/internal/MenuSub.js

@@ -21,7 +21,7 @@ export const MenuSub = forwardRef((props, ref) => {
     const iconMode = mode === 'icon' && inNav;
     const transformOrigin = useRef();
     const updatePosition = useEventCallback(() => {
-        if (visible && popupRef.current && triggerRef.current) {
+        if (!(disabled || mode === 'vertical') && visible && popupRef.current && triggerRef.current) {
             const height = popupRef.current.offsetHeight;
             let width = popupRef.current.offsetWidth;
             if (inHorizontalNav) {
@@ -56,6 +56,7 @@ export const MenuSub = forwardRef((props, ref) => {
                     fn: updatePosition,
                     triggerRef,
                     popupRef,
+                    scroll: false,
                 }, onVisibleChange: onVisibleChange, children: ({ renderTrigger, renderPopup }) => (_jsxs(_Fragment, { children: [renderTrigger(_jsxs("li", Object.assign({}, mergeCS(styled('menu__item', 'menu__item--sub', {
                             'menu__item--horizontal': inHorizontalNav,
                             'menu__item--icon': iconMode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laser-ui/components",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "React components.",
   "keywords": [
     "ui",
@@ -40,5 +40,5 @@
     "access": "public",
     "directory": "../../dist/libs/components"
   },
-  "gitHead": "6a7e6e2e141237b816d4a9f414bcf4c5274e14e6"
+  "gitHead": "5d76520ca057de8e9b23faa06ad88d5e7429d64d"
 }