smarthr-ui 96.1.3 → 98.0.0

package/lib/components/Disclosure/useDisclosure.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useDisclosure.cjs","sources":["../../../src/components/Disclosure/useDisclosure.ts"],"sourcesContent":["import { useCallback, useEffect, useState } from 'react'\n\nconst DISCLOSURE_CHANGE_EVENT = 'smarthr-ui:disclosure-change'\ntype DisclosureChangeEventDetail = { id: string; expanded: boolean }\n\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions\n  interface DocumentEventMap {\n    [DISCLOSURE_CHANGE_EVENT]: CustomEvent<DisclosureChangeEventDetail>\n  }\n}\n\ntype Setter = (value: boolean | ((prev: boolean) => boolean)) => void\n\ntype UseDisclosureResult = [expanded: boolean, setExpanded: Setter]\n\n/**\n * 同じ `id` で呼ぶとイベント経由で状態が同期される custom hook\n */\nexport const useDisclosure = (id: string): UseDisclosureResult => {\n  const [expanded, setExpanded] = useState(false)\n\n  useEffect(() => {\n    document.dispatchEvent(\n      new CustomEvent<DisclosureChangeEventDetail>(DISCLOSURE_CHANGE_EVENT, {\n        detail: { id, expanded },\n      }),\n    )\n  }, [expanded, id])\n\n  const handleDisclosureChange = useCallback(\n    (e: CustomEvent<DisclosureChangeEventDetail>) => {\n      if (id === e.detail.id) {\n        setExpanded(e.detail.expanded)\n      }\n    },\n    [id],\n  )\n\n  useEffect(() => {\n    document.addEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange)\n    return () => {\n      document.removeEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange)\n    }\n  }, [id, handleDisclosureChange])\n\n  const safeSetExpanded: Setter = useCallback(\n    (value) => {\n      // DisclosureTrigger と DisclosureContent のレンダリング順序に影響しないように animation frame を待ってから state を更新する\n      requestAnimationFrame(() => {\n        if (typeof value === 'function') {\n          const newValue = value(expanded)\n          setExpanded(newValue)\n        } else {\n          setExpanded(value)\n        }\n      })\n    },\n    [expanded],\n  )\n\n  return [expanded, safeSetExpanded]\n}\n"],"names":["useState","useEffect","useCallback"],"mappings":";;;;AAEA,MAAM,uBAAuB,GAAG,8BAA8B;AAc9D;;AAEG;AACI,MAAM,aAAa,GAAG,CAAC,EAAU,KAAyB;IAC/D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAGA,cAAQ,CAAC,KAAK,CAAC;IAE/CC,eAAS,CAAC,MAAK;AACb,QAAA,QAAQ,CAAC,aAAa,CACpB,IAAI,WAAW,CAA8B,uBAAuB,EAAE;AACpE,YAAA,MAAM,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;AACzB,SAAA,CAAC,CACH;AACH,IAAA,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AAElB,IAAA,MAAM,sBAAsB,GAAGC,iBAAW,CACxC,CAAC,CAA2C,KAAI;QAC9C,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE;AACtB,YAAA,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChC;AACF,IAAA,CAAC,EACD,CAAC,EAAE,CAAC,CACL;IAEDD,eAAS,CAAC,MAAK;AACb,QAAA,QAAQ,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;AAC1E,QAAA,OAAO,MAAK;AACV,YAAA,QAAQ,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;AAC/E,QAAA,CAAC;AACH,IAAA,CAAC,EAAE,CAAC,EAAE,EAAE,sBAAsB,CAAC,CAAC;AAEhC,IAAA,MAAM,eAAe,GAAWC,iBAAW,CACzC,CAAC,KAAK,KAAI;;QAER,qBAAqB,CAAC,MAAK;AACzB,YAAA,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;AAC/B,gBAAA,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;gBAChC,WAAW,CAAC,QAAQ,CAAC;YACvB;iBAAO;gBACL,WAAW,CAAC,KAAK,CAAC;YACpB;AACF,QAAA,CAAC,CAAC;AACJ,IAAA,CAAC,EACD,CAAC,QAAQ,CAAC,CACX;AAED,IAAA,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC;AACpC;;;;"}
+{"version":3,"file":"useDisclosure.cjs","sources":["../../../src/components/Disclosure/useDisclosure.ts"],"sourcesContent":["import { useCallback, useEffect, useState } from 'react'\n\nconst DISCLOSURE_CHANGE_EVENT = 'smarthr-ui:disclosure-change'\ntype DisclosureChangeEventDetail = { id: string; expanded: boolean }\n\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions\n  interface DocumentEventMap {\n    [DISCLOSURE_CHANGE_EVENT]: CustomEvent<DisclosureChangeEventDetail>\n  }\n}\n\ntype Setter = (value: boolean | ((prev: boolean) => boolean)) => void\n\ntype UseDisclosureResult = [expanded: boolean, setExpanded: Setter]\n\n/**\n * 同じ `id` で呼ぶとイベント経由で状態が同期される custom hook\n */\nexport const useDisclosure = (id: string): UseDisclosureResult => {\n  const [expanded, setExpanded] = useState(false)\n\n  useEffect(() => {\n    document.dispatchEvent(\n      new CustomEvent<DisclosureChangeEventDetail>(DISCLOSURE_CHANGE_EVENT, {\n        detail: { id, expanded },\n      }),\n    )\n  }, [expanded, id])\n\n  useEffect(() => {\n    const handleDisclosureChange = (e: CustomEvent<DisclosureChangeEventDetail>) => {\n      if (id === e.detail.id) {\n        setExpanded(e.detail.expanded)\n      }\n    }\n\n    document.addEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange)\n    return () => {\n      document.removeEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange)\n    }\n  }, [id])\n\n  const safeSetExpanded: Setter = useCallback((value) => {\n    // DisclosureTrigger と DisclosureContent のレンダリング順序に影響しないように animation frame を待ってから state を更新する\n    requestAnimationFrame(() => {\n      setExpanded(value)\n    })\n  }, [])\n\n  return [expanded, safeSetExpanded]\n}\n"],"names":["useState","useEffect","useCallback"],"mappings":";;;;AAEA,MAAM,uBAAuB,GAAG,8BAA8B;AAc9D;;AAEG;AACI,MAAM,aAAa,GAAG,CAAC,EAAU,KAAyB;IAC/D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAGA,cAAQ,CAAC,KAAK,CAAC;IAE/CC,eAAS,CAAC,MAAK;AACb,QAAA,QAAQ,CAAC,aAAa,CACpB,IAAI,WAAW,CAA8B,uBAAuB,EAAE;AACpE,YAAA,MAAM,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;AACzB,SAAA,CAAC,CACH;AACH,IAAA,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAElBA,eAAS,CAAC,MAAK;AACb,QAAA,MAAM,sBAAsB,GAAG,CAAC,CAA2C,KAAI;YAC7E,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE;AACtB,gBAAA,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;YAChC;AACF,QAAA,CAAC;AAED,QAAA,QAAQ,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;AAC1E,QAAA,OAAO,MAAK;AACV,YAAA,QAAQ,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;AAC/E,QAAA,CAAC;AACH,IAAA,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAER,IAAA,MAAM,eAAe,GAAWC,iBAAW,CAAC,CAAC,KAAK,KAAI;;QAEpD,qBAAqB,CAAC,MAAK;YACzB,WAAW,CAAC,KAAK,CAAC;AACpB,QAAA,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC;AAEN,IAAA,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC;AACpC;;;;"}

package/lib/components/Disclosure/useDisclosure.js

@@ -11,29 +11,23 @@ const useDisclosure = (id) => {
             detail: { id, expanded },
         }));
     }, [expanded, id]);
-    const handleDisclosureChange = useCallback((e) => {
-        if (id === e.detail.id) {
-            setExpanded(e.detail.expanded);
-        }
-    }, [id]);
     useEffect(() => {
+        const handleDisclosureChange = (e) => {
+            if (id === e.detail.id) {
+                setExpanded(e.detail.expanded);
+            }
+        };
         document.addEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange);
         return () => {
             document.removeEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange);
         };
-    }, [id, handleDisclosureChange]);
+    }, [id]);
     const safeSetExpanded = useCallback((value) => {
         // DisclosureTrigger と DisclosureContent のレンダリング順序に影響しないように animation frame を待ってから state を更新する
         requestAnimationFrame(() => {
-            if (typeof value === 'function') {
-                const newValue = value(expanded);
-                setExpanded(newValue);
-            }
-            else {
-                setExpanded(value);
-            }
+            setExpanded(value);
         });
-    }, [expanded]);
+    }, []);
     return [expanded, safeSetExpanded];
 };
 

package/lib/components/Disclosure/useDisclosure.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDisclosure.js","sources":["../../../src/components/Disclosure/useDisclosure.ts"],"sourcesContent":["import { useCallback, useEffect, useState } from 'react'\n\nconst DISCLOSURE_CHANGE_EVENT = 'smarthr-ui:disclosure-change'\ntype DisclosureChangeEventDetail = { id: string; expanded: boolean }\n\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions\n  interface DocumentEventMap {\n    [DISCLOSURE_CHANGE_EVENT]: CustomEvent<DisclosureChangeEventDetail>\n  }\n}\n\ntype Setter = (value: boolean | ((prev: boolean) => boolean)) => void\n\ntype UseDisclosureResult = [expanded: boolean, setExpanded: Setter]\n\n/**\n * 同じ `id` で呼ぶとイベント経由で状態が同期される custom hook\n */\nexport const useDisclosure = (id: string): UseDisclosureResult => {\n  const [expanded, setExpanded] = useState(false)\n\n  useEffect(() => {\n    document.dispatchEvent(\n      new CustomEvent<DisclosureChangeEventDetail>(DISCLOSURE_CHANGE_EVENT, {\n        detail: { id, expanded },\n      }),\n    )\n  }, [expanded, id])\n\n  const handleDisclosureChange = useCallback(\n    (e: CustomEvent<DisclosureChangeEventDetail>) => {\n      if (id === e.detail.id) {\n        setExpanded(e.detail.expanded)\n      }\n    },\n    [id],\n  )\n\n  useEffect(() => {\n    document.addEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange)\n    return () => {\n      document.removeEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange)\n    }\n  }, [id, handleDisclosureChange])\n\n  const safeSetExpanded: Setter = useCallback(\n    (value) => {\n      // DisclosureTrigger と DisclosureContent のレンダリング順序に影響しないように animation frame を待ってから state を更新する\n      requestAnimationFrame(() => {\n        if (typeof value === 'function') {\n          const newValue = value(expanded)\n          setExpanded(newValue)\n        } else {\n          setExpanded(value)\n        }\n      })\n    },\n    [expanded],\n  )\n\n  return [expanded, safeSetExpanded]\n}\n"],"names":[],"mappings":";;AAEA,MAAM,uBAAuB,GAAG,8BAA8B;AAc9D;;AAEG;AACI,MAAM,aAAa,GAAG,CAAC,EAAU,KAAyB;IAC/D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;IAE/C,SAAS,CAAC,MAAK;AACb,QAAA,QAAQ,CAAC,aAAa,CACpB,IAAI,WAAW,CAA8B,uBAAuB,EAAE;AACpE,YAAA,MAAM,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;AACzB,SAAA,CAAC,CACH;AACH,IAAA,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AAElB,IAAA,MAAM,sBAAsB,GAAG,WAAW,CACxC,CAAC,CAA2C,KAAI;QAC9C,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE;AACtB,YAAA,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChC;AACF,IAAA,CAAC,EACD,CAAC,EAAE,CAAC,CACL;IAED,SAAS,CAAC,MAAK;AACb,QAAA,QAAQ,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;AAC1E,QAAA,OAAO,MAAK;AACV,YAAA,QAAQ,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;AAC/E,QAAA,CAAC;AACH,IAAA,CAAC,EAAE,CAAC,EAAE,EAAE,sBAAsB,CAAC,CAAC;AAEhC,IAAA,MAAM,eAAe,GAAW,WAAW,CACzC,CAAC,KAAK,KAAI;;QAER,qBAAqB,CAAC,MAAK;AACzB,YAAA,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;AAC/B,gBAAA,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;gBAChC,WAAW,CAAC,QAAQ,CAAC;YACvB;iBAAO;gBACL,WAAW,CAAC,KAAK,CAAC;YACpB;AACF,QAAA,CAAC,CAAC;AACJ,IAAA,CAAC,EACD,CAAC,QAAQ,CAAC,CACX;AAED,IAAA,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC;AACpC;;;;"}
+{"version":3,"file":"useDisclosure.js","sources":["../../../src/components/Disclosure/useDisclosure.ts"],"sourcesContent":["import { useCallback, useEffect, useState } from 'react'\n\nconst DISCLOSURE_CHANGE_EVENT = 'smarthr-ui:disclosure-change'\ntype DisclosureChangeEventDetail = { id: string; expanded: boolean }\n\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions\n  interface DocumentEventMap {\n    [DISCLOSURE_CHANGE_EVENT]: CustomEvent<DisclosureChangeEventDetail>\n  }\n}\n\ntype Setter = (value: boolean | ((prev: boolean) => boolean)) => void\n\ntype UseDisclosureResult = [expanded: boolean, setExpanded: Setter]\n\n/**\n * 同じ `id` で呼ぶとイベント経由で状態が同期される custom hook\n */\nexport const useDisclosure = (id: string): UseDisclosureResult => {\n  const [expanded, setExpanded] = useState(false)\n\n  useEffect(() => {\n    document.dispatchEvent(\n      new CustomEvent<DisclosureChangeEventDetail>(DISCLOSURE_CHANGE_EVENT, {\n        detail: { id, expanded },\n      }),\n    )\n  }, [expanded, id])\n\n  useEffect(() => {\n    const handleDisclosureChange = (e: CustomEvent<DisclosureChangeEventDetail>) => {\n      if (id === e.detail.id) {\n        setExpanded(e.detail.expanded)\n      }\n    }\n\n    document.addEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange)\n    return () => {\n      document.removeEventListener(DISCLOSURE_CHANGE_EVENT, handleDisclosureChange)\n    }\n  }, [id])\n\n  const safeSetExpanded: Setter = useCallback((value) => {\n    // DisclosureTrigger と DisclosureContent のレンダリング順序に影響しないように animation frame を待ってから state を更新する\n    requestAnimationFrame(() => {\n      setExpanded(value)\n    })\n  }, [])\n\n  return [expanded, safeSetExpanded]\n}\n"],"names":[],"mappings":";;AAEA,MAAM,uBAAuB,GAAG,8BAA8B;AAc9D;;AAEG;AACI,MAAM,aAAa,GAAG,CAAC,EAAU,KAAyB;IAC/D,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC;IAE/C,SAAS,CAAC,MAAK;AACb,QAAA,QAAQ,CAAC,aAAa,CACpB,IAAI,WAAW,CAA8B,uBAAuB,EAAE;AACpE,YAAA,MAAM,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;AACzB,SAAA,CAAC,CACH;AACH,IAAA,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAElB,SAAS,CAAC,MAAK;AACb,QAAA,MAAM,sBAAsB,GAAG,CAAC,CAA2C,KAAI;YAC7E,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE;AACtB,gBAAA,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;YAChC;AACF,QAAA,CAAC;AAED,QAAA,QAAQ,CAAC,gBAAgB,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;AAC1E,QAAA,OAAO,MAAK;AACV,YAAA,QAAQ,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,sBAAsB,CAAC;AAC/E,QAAA,CAAC;AACH,IAAA,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAER,IAAA,MAAM,eAAe,GAAW,WAAW,CAAC,CAAC,KAAK,KAAI;;QAEpD,qBAAqB,CAAC,MAAK;YACzB,WAAW,CAAC,KAAK,CAAC;AACpB,QAAA,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC;AAEN,IAAA,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC;AACpC;;;;"}

package/lib/components/DropZone/DropZone.cjs

@@ -6,7 +6,7 @@ var React = require('react');
 var index = require('./../../vendor/.pnpm/tailwind-variants@0.3.1_tailwindcss@3.4.19_ts-node@10.9.2_@swc_core@1.15.17_@types_node@20.19.35_typescript@5.9.3__/vendor/tailwind-variants/dist/index.cjs');
 require('../../intl/IntlProvider.cjs');
 var intl_useIntl = require('../../intl/useIntl.cjs');
-require('react-intl');
+require('../../intl/Localizer.cjs');
 require('../../_virtual/dayjs.min.cjs');
 require('../../intl/TimeFormatter.cjs');
 var components_Button_Button = require('../Button/Button.cjs');

package/lib/components/DropZone/DropZone.js

@@ -4,7 +4,7 @@ import { forwardRef, useRef, useState, useMemo, useImperativeHandle, useCallback
 import { tv as ce } from './../../vendor/.pnpm/tailwind-variants@0.3.1_tailwindcss@3.4.19_ts-node@10.9.2_@swc_core@1.15.17_@types_node@20.19.35_typescript@5.9.3__/vendor/tailwind-variants/dist/index.js';
 import '../../intl/IntlProvider.js';
 import { useIntl } from '../../intl/useIntl.js';
-import 'react-intl';
+import '../../intl/Localizer.js';
 import '../../_virtual/dayjs.min.js';
 import '../../intl/TimeFormatter.js';
 import { Button } from '../Button/Button.js';

package/lib/components/Dropdown/Dropdown.cjs

@@ -28,45 +28,27 @@ const Dropdown = ({ onOpen, onClose, children }) => {
     const { createPortal, portalRoot, isPortalRootMounted, isChildPortal, PortalParentProvider } = hooks_usePortal.usePortal();
     const triggerElementRef = React.useRef(null);
     const contentId = React.useId();
-    if (portalRoot) {
-        portalRoot.setAttribute('id', contentId);
-    }
-    React.useEffect(() => {
-        const onClickBody = (e) => {
-            // ignore events from events within DropdownTrigger and DropdownContent
-            if (!components_Dropdown_dropdownHelper.isEventFromChild(e, triggerElementRef.current) && !isChildPortal(e.target)) {
-                setActive(false);
-            }
-        };
-        document.body.addEventListener('click', onClickBody, false);
-        return () => {
-            document.body.removeEventListener('click', onClickBody, false);
-        };
-    }, [isChildPortal, portalRoot]);
+    const unstableRef = React.useRef({
+        active,
+        isPortalRootMounted,
+        onOpen,
+        onClose,
+        createPortal,
+    });
+    unstableRef.current = {
+        active,
+        isPortalRootMounted,
+        onOpen,
+        onClose,
+        createPortal,
+    };
     // This is the root container of a dropdown content located in outside the DOM tree
     const DropdownContentRoot = React.useMemo(() => {
-        const result = (props) => active ? createPortal(props.children) : null;
+        const result = (props) => unstableRef.current.active ? unstableRef.current.createPortal(props.children) : null;
         // set the displayName explicit for DevTools
         result.displayName = 'DropdownContentRoot';
         return result;
-    }, [active, createPortal]);
-    const togglerRef = React.useRef({
-        isPortalRootMounted,
-        onOpen,
-        onClose,
-    });
-    React.useEffect(() => {
-        togglerRef.current = {
-            isPortalRootMounted,
-            onOpen,
-            onClose,
-        };
-    }, [isPortalRootMounted, onOpen, onClose]);
-    React.useEffect(() => {
-        if (togglerRef.current.isPortalRootMounted()) {
-            togglerRef.current[active ? 'onOpen' : 'onClose']?.();
-        }
-    }, [active]);
+    }, []);
     const memoizedOnClickTrigger = React.useCallback((rect) => {
         setActive((current) => {
             const newActive = !current;
@@ -81,6 +63,26 @@ const Dropdown = ({ onOpen, onClose, children }) => {
         // return focus to the Trigger
         components_Dropdown_dropdownHelper.getFirstTabbable(triggerElementRef)?.focus();
     }, []);
+    React.useEffect(() => {
+        if (portalRoot) {
+            portalRoot.setAttribute('id', contentId);
+        }
+        const onClickBody = (e) => {
+            // ignore events from events within DropdownTrigger and DropdownContent
+            if (!components_Dropdown_dropdownHelper.isEventFromChild(e, triggerElementRef.current) && !isChildPortal(e.target)) {
+                setActive(false);
+            }
+        };
+        document.body.addEventListener('click', onClickBody, false);
+        return () => {
+            document.body.removeEventListener('click', onClickBody, false);
+        };
+    }, [isChildPortal, portalRoot, contentId]);
+    React.useEffect(() => {
+        if (unstableRef.current.isPortalRootMounted()) {
+            unstableRef.current[active ? 'onOpen' : 'onClose']?.();
+        }
+    }, [active]);
     return (jsxRuntime.jsx(PortalParentProvider, { children: jsxRuntime.jsx(DropdownContext.Provider, { value: {
                 active,
                 triggerRect,

package/lib/components/Dropdown/Dropdown.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Dropdown.cjs","sources":["../../../src/components/Dropdown/Dropdown.tsx"],"sourcesContent":["'use client'\n\nimport {\n  type FC,\n  type MutableRefObject,\n  type PropsWithChildren,\n  type ReactNode,\n  createContext,\n  createRef,\n  useCallback,\n  useContext,\n  useEffect,\n  useId,\n  useMemo,\n  useRef,\n  useState,\n} from 'react'\n\nimport { usePortal } from '../../hooks/usePortal'\n\nimport { type Rect, getFirstTabbable, isEventFromChild } from './dropdownHelper'\n\ntype Props = PropsWithChildren<{\n  onOpen?: () => void\n  onClose?: () => void\n}>\n\ntype DropdownContextType = {\n  active: boolean\n  triggerRect: Rect\n  triggerElementRef: MutableRefObject<HTMLDivElement | null>\n  rootTriggerRef: MutableRefObject<HTMLDivElement | null> | null\n  memoizedOnClickTrigger: (rect: Rect) => void\n  onClickCloser: () => void\n  DropdownContentRoot: FC<{ children: ReactNode }>\n  contentId: string\n}\n\nconst initialRect = { top: 0, right: 0, bottom: 0, left: 0 }\n\nexport const DropdownContext = createContext<DropdownContextType>({\n  active: false,\n  triggerRect: initialRect,\n  triggerElementRef: createRef(),\n  rootTriggerRef: null,\n  memoizedOnClickTrigger: () => {\n    /* noop */\n  },\n  onClickCloser: () => {\n    /* noop */\n  },\n  DropdownContentRoot: () => null,\n  contentId: '',\n})\n\nexport const Dropdown: FC<Props> = ({ onOpen, onClose, children }) => {\n  const [active, setActive] = useState(false)\n  const [triggerRect, setTriggerRect] = useState<Rect>(initialRect)\n\n  const { rootTriggerRef } = useContext(DropdownContext)\n  const { createPortal, portalRoot, isPortalRootMounted, isChildPortal, PortalParentProvider } =\n    usePortal()\n\n  const triggerElementRef = useRef<HTMLDivElement>(null)\n  const contentId = useId()\n\n  if (portalRoot) {\n    portalRoot.setAttribute('id', contentId)\n  }\n\n  useEffect(() => {\n    const onClickBody = (e: any) => {\n      // ignore events from events within DropdownTrigger and DropdownContent\n      if (!isEventFromChild(e, triggerElementRef.current) && !isChildPortal(e.target)) {\n        setActive(false)\n      }\n    }\n\n    document.body.addEventListener('click', onClickBody, false)\n\n    return () => {\n      document.body.removeEventListener('click', onClickBody, false)\n    }\n  }, [isChildPortal, portalRoot])\n\n  // This is the root container of a dropdown content located in outside the DOM tree\n  const DropdownContentRoot = useMemo<FC<{ children: ReactNode }>>(() => {\n    const result: FC<{ children: ReactNode }> = (props) =>\n      active ? createPortal(props.children) : null\n\n    // set the displayName explicit for DevTools\n    result.displayName = 'DropdownContentRoot'\n\n    return result\n  }, [active, createPortal])\n\n  const togglerRef = useRef({\n    isPortalRootMounted,\n    onOpen,\n    onClose,\n  })\n  useEffect(() => {\n    togglerRef.current = {\n      isPortalRootMounted,\n      onOpen,\n      onClose,\n    }\n  }, [isPortalRootMounted, onOpen, onClose])\n\n  useEffect(() => {\n    if (togglerRef.current.isPortalRootMounted()) {\n      togglerRef.current[active ? 'onOpen' : 'onClose']?.()\n    }\n  }, [active])\n\n  const memoizedOnClickTrigger = useCallback((rect: Rect) => {\n    setActive((current) => {\n      const newActive = !current\n\n      if (newActive) {\n        setTriggerRect(rect)\n      }\n\n      return newActive\n    })\n  }, [])\n\n  const onClickCloser = useCallback(() => {\n    setActive(false)\n\n    // return focus to the Trigger\n    getFirstTabbable(triggerElementRef)?.focus()\n  }, [])\n\n  return (\n    <PortalParentProvider>\n      <DropdownContext.Provider\n        value={{\n          active,\n          triggerRect,\n          triggerElementRef,\n          rootTriggerRef: rootTriggerRef || triggerElementRef || null,\n          memoizedOnClickTrigger,\n          onClickCloser,\n          DropdownContentRoot,\n          contentId,\n        }}\n      >\n        {children}\n      </DropdownContext.Provider>\n    </PortalParentProvider>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;AAsCA;AAEO;AACL;AACA;;AAEA;;;;;;;AAOA;AACA;AACD;AAEM;;;;AAKL;AAGA;AACA;;AAGE;;;AAIA;;AAEE;;;AAGF;;AAIA;;AAEA;AACF;;AAGA;;;AAKE;AAEA;AACF;;;;;AAMC;;;;;;;;;AAUC;AACE;;AAEJ;AAEA;AACE;AACE;;;;AAMA;AACF;;AAGF;;;AAIE;;;;;;AAUM;;;;;AAKD;AAMT;;;"}
+{"version":3,"file":"Dropdown.cjs","sources":["../../../src/components/Dropdown/Dropdown.tsx"],"sourcesContent":["'use client'\n\nimport {\n  type FC,\n  type MutableRefObject,\n  type PropsWithChildren,\n  type ReactNode,\n  createContext,\n  createRef,\n  useCallback,\n  useContext,\n  useEffect,\n  useId,\n  useMemo,\n  useRef,\n  useState,\n} from 'react'\n\nimport { usePortal } from '../../hooks/usePortal'\n\nimport { type Rect, getFirstTabbable, isEventFromChild } from './dropdownHelper'\n\ntype Props = PropsWithChildren<{\n  onOpen?: () => void\n  onClose?: () => void\n}>\n\ntype DropdownContextType = {\n  active: boolean\n  triggerRect: Rect\n  triggerElementRef: MutableRefObject<HTMLDivElement | null>\n  rootTriggerRef: MutableRefObject<HTMLDivElement | null> | null\n  memoizedOnClickTrigger: (rect: Rect) => void\n  onClickCloser: () => void\n  DropdownContentRoot: FC<{ children: ReactNode }>\n  contentId: string\n}\n\nconst initialRect = { top: 0, right: 0, bottom: 0, left: 0 }\n\nexport const DropdownContext = createContext<DropdownContextType>({\n  active: false,\n  triggerRect: initialRect,\n  triggerElementRef: createRef(),\n  rootTriggerRef: null,\n  memoizedOnClickTrigger: () => {\n    /* noop */\n  },\n  onClickCloser: () => {\n    /* noop */\n  },\n  DropdownContentRoot: () => null,\n  contentId: '',\n})\n\nexport const Dropdown: FC<Props> = ({ onOpen, onClose, children }) => {\n  const [active, setActive] = useState(false)\n  const [triggerRect, setTriggerRect] = useState<Rect>(initialRect)\n\n  const { rootTriggerRef } = useContext(DropdownContext)\n  const { createPortal, portalRoot, isPortalRootMounted, isChildPortal, PortalParentProvider } =\n    usePortal()\n\n  const triggerElementRef = useRef<HTMLDivElement>(null)\n  const contentId = useId()\n\n  const unstableRef = useRef({\n    active,\n    isPortalRootMounted,\n    onOpen,\n    onClose,\n    createPortal,\n  })\n  unstableRef.current = {\n    active,\n    isPortalRootMounted,\n    onOpen,\n    onClose,\n    createPortal,\n  }\n\n  // This is the root container of a dropdown content located in outside the DOM tree\n  const DropdownContentRoot = useMemo<FC<{ children: ReactNode }>>(() => {\n    const result: FC<{ children: ReactNode }> = (props) =>\n      unstableRef.current.active ? unstableRef.current.createPortal(props.children) : null\n\n    // set the displayName explicit for DevTools\n    result.displayName = 'DropdownContentRoot'\n\n    return result\n  }, [])\n\n  const memoizedOnClickTrigger = useCallback((rect: Rect) => {\n    setActive((current) => {\n      const newActive = !current\n\n      if (newActive) {\n        setTriggerRect(rect)\n      }\n\n      return newActive\n    })\n  }, [])\n\n  const onClickCloser = useCallback(() => {\n    setActive(false)\n\n    // return focus to the Trigger\n    getFirstTabbable(triggerElementRef)?.focus()\n  }, [])\n\n  useEffect(() => {\n    if (portalRoot) {\n      portalRoot.setAttribute('id', contentId)\n    }\n\n    const onClickBody = (e: any) => {\n      // ignore events from events within DropdownTrigger and DropdownContent\n      if (!isEventFromChild(e, triggerElementRef.current) && !isChildPortal(e.target)) {\n        setActive(false)\n      }\n    }\n\n    document.body.addEventListener('click', onClickBody, false)\n\n    return () => {\n      document.body.removeEventListener('click', onClickBody, false)\n    }\n  }, [isChildPortal, portalRoot, contentId])\n\n  useEffect(() => {\n    if (unstableRef.current.isPortalRootMounted()) {\n      unstableRef.current[active ? 'onOpen' : 'onClose']?.()\n    }\n  }, [active])\n\n  return (\n    <PortalParentProvider>\n      <DropdownContext.Provider\n        value={{\n          active,\n          triggerRect,\n          triggerElementRef,\n          rootTriggerRef: rootTriggerRef || triggerElementRef || null,\n          memoizedOnClickTrigger,\n          onClickCloser,\n          DropdownContentRoot,\n          contentId,\n        }}\n      >\n        {children}\n      </DropdownContext.Provider>\n    </PortalParentProvider>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;AAsCA;AAEO;AACL;AACA;;AAEA;;;;;;;AAOA;AACA;AACD;AAEM;;;;AAKL;AAGA;AACA;;;;;;;AAQC;;;;;;;;;AAUD;AACE;;AAIA;AAEA;;AAGF;AACE;AACE;;;;AAMA;AACF;;AAGF;;;AAIE;;;;AAKE;;AAGF;;AAEE;;;AAGF;;AAIA;;AAEA;;;AAIA;AACE;;AAEJ;;;;;AASQ;;;;;AAKD;AAMT;;;"}

package/lib/components/Dropdown/Dropdown.js

@@ -1,6 +1,6 @@
 "use client";
 import { jsx } from 'react/jsx-runtime';
-import { createContext, createRef, useState, useContext, useRef, useId, useEffect, useMemo, useCallback } from 'react';
+import { createContext, createRef, useState, useContext, useRef, useId, useMemo, useCallback, useEffect } from 'react';
 import { usePortal } from '../../hooks/usePortal.js';
 import { getFirstTabbable, isEventFromChild } from './dropdownHelper.js';
 
@@ -26,45 +26,27 @@ const Dropdown = ({ onOpen, onClose, children }) => {
     const { createPortal, portalRoot, isPortalRootMounted, isChildPortal, PortalParentProvider } = usePortal();
     const triggerElementRef = useRef(null);
     const contentId = useId();
-    if (portalRoot) {
-        portalRoot.setAttribute('id', contentId);
-    }
-    useEffect(() => {
-        const onClickBody = (e) => {
-            // ignore events from events within DropdownTrigger and DropdownContent
-            if (!isEventFromChild(e, triggerElementRef.current) && !isChildPortal(e.target)) {
-                setActive(false);
-            }
-        };
-        document.body.addEventListener('click', onClickBody, false);
-        return () => {
-            document.body.removeEventListener('click', onClickBody, false);
-        };
-    }, [isChildPortal, portalRoot]);
+    const unstableRef = useRef({
+        active,
+        isPortalRootMounted,
+        onOpen,
+        onClose,
+        createPortal,
+    });
+    unstableRef.current = {
+        active,
+        isPortalRootMounted,
+        onOpen,
+        onClose,
+        createPortal,
+    };
     // This is the root container of a dropdown content located in outside the DOM tree
     const DropdownContentRoot = useMemo(() => {
-        const result = (props) => active ? createPortal(props.children) : null;
+        const result = (props) => unstableRef.current.active ? unstableRef.current.createPortal(props.children) : null;
         // set the displayName explicit for DevTools
         result.displayName = 'DropdownContentRoot';
         return result;
-    }, [active, createPortal]);
-    const togglerRef = useRef({
-        isPortalRootMounted,
-        onOpen,
-        onClose,
-    });
-    useEffect(() => {
-        togglerRef.current = {
-            isPortalRootMounted,
-            onOpen,
-            onClose,
-        };
-    }, [isPortalRootMounted, onOpen, onClose]);
-    useEffect(() => {
-        if (togglerRef.current.isPortalRootMounted()) {
-            togglerRef.current[active ? 'onOpen' : 'onClose']?.();
-        }
-    }, [active]);
+    }, []);
     const memoizedOnClickTrigger = useCallback((rect) => {
         setActive((current) => {
             const newActive = !current;
@@ -79,6 +61,26 @@ const Dropdown = ({ onOpen, onClose, children }) => {
         // return focus to the Trigger
         getFirstTabbable(triggerElementRef)?.focus();
     }, []);
+    useEffect(() => {
+        if (portalRoot) {
+            portalRoot.setAttribute('id', contentId);
+        }
+        const onClickBody = (e) => {
+            // ignore events from events within DropdownTrigger and DropdownContent
+            if (!isEventFromChild(e, triggerElementRef.current) && !isChildPortal(e.target)) {
+                setActive(false);
+            }
+        };
+        document.body.addEventListener('click', onClickBody, false);
+        return () => {
+            document.body.removeEventListener('click', onClickBody, false);
+        };
+    }, [isChildPortal, portalRoot, contentId]);
+    useEffect(() => {
+        if (unstableRef.current.isPortalRootMounted()) {
+            unstableRef.current[active ? 'onOpen' : 'onClose']?.();
+        }
+    }, [active]);
     return (jsx(PortalParentProvider, { children: jsx(DropdownContext.Provider, { value: {
                 active,
                 triggerRect,

package/lib/components/Dropdown/Dropdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"Dropdown.js","sources":["../../../src/components/Dropdown/Dropdown.tsx"],"sourcesContent":["'use client'\n\nimport {\n  type FC,\n  type MutableRefObject,\n  type PropsWithChildren,\n  type ReactNode,\n  createContext,\n  createRef,\n  useCallback,\n  useContext,\n  useEffect,\n  useId,\n  useMemo,\n  useRef,\n  useState,\n} from 'react'\n\nimport { usePortal } from '../../hooks/usePortal'\n\nimport { type Rect, getFirstTabbable, isEventFromChild } from './dropdownHelper'\n\ntype Props = PropsWithChildren<{\n  onOpen?: () => void\n  onClose?: () => void\n}>\n\ntype DropdownContextType = {\n  active: boolean\n  triggerRect: Rect\n  triggerElementRef: MutableRefObject<HTMLDivElement | null>\n  rootTriggerRef: MutableRefObject<HTMLDivElement | null> | null\n  memoizedOnClickTrigger: (rect: Rect) => void\n  onClickCloser: () => void\n  DropdownContentRoot: FC<{ children: ReactNode }>\n  contentId: string\n}\n\nconst initialRect = { top: 0, right: 0, bottom: 0, left: 0 }\n\nexport const DropdownContext = createContext<DropdownContextType>({\n  active: false,\n  triggerRect: initialRect,\n  triggerElementRef: createRef(),\n  rootTriggerRef: null,\n  memoizedOnClickTrigger: () => {\n    /* noop */\n  },\n  onClickCloser: () => {\n    /* noop */\n  },\n  DropdownContentRoot: () => null,\n  contentId: '',\n})\n\nexport const Dropdown: FC<Props> = ({ onOpen, onClose, children }) => {\n  const [active, setActive] = useState(false)\n  const [triggerRect, setTriggerRect] = useState<Rect>(initialRect)\n\n  const { rootTriggerRef } = useContext(DropdownContext)\n  const { createPortal, portalRoot, isPortalRootMounted, isChildPortal, PortalParentProvider } =\n    usePortal()\n\n  const triggerElementRef = useRef<HTMLDivElement>(null)\n  const contentId = useId()\n\n  if (portalRoot) {\n    portalRoot.setAttribute('id', contentId)\n  }\n\n  useEffect(() => {\n    const onClickBody = (e: any) => {\n      // ignore events from events within DropdownTrigger and DropdownContent\n      if (!isEventFromChild(e, triggerElementRef.current) && !isChildPortal(e.target)) {\n        setActive(false)\n      }\n    }\n\n    document.body.addEventListener('click', onClickBody, false)\n\n    return () => {\n      document.body.removeEventListener('click', onClickBody, false)\n    }\n  }, [isChildPortal, portalRoot])\n\n  // This is the root container of a dropdown content located in outside the DOM tree\n  const DropdownContentRoot = useMemo<FC<{ children: ReactNode }>>(() => {\n    const result: FC<{ children: ReactNode }> = (props) =>\n      active ? createPortal(props.children) : null\n\n    // set the displayName explicit for DevTools\n    result.displayName = 'DropdownContentRoot'\n\n    return result\n  }, [active, createPortal])\n\n  const togglerRef = useRef({\n    isPortalRootMounted,\n    onOpen,\n    onClose,\n  })\n  useEffect(() => {\n    togglerRef.current = {\n      isPortalRootMounted,\n      onOpen,\n      onClose,\n    }\n  }, [isPortalRootMounted, onOpen, onClose])\n\n  useEffect(() => {\n    if (togglerRef.current.isPortalRootMounted()) {\n      togglerRef.current[active ? 'onOpen' : 'onClose']?.()\n    }\n  }, [active])\n\n  const memoizedOnClickTrigger = useCallback((rect: Rect) => {\n    setActive((current) => {\n      const newActive = !current\n\n      if (newActive) {\n        setTriggerRect(rect)\n      }\n\n      return newActive\n    })\n  }, [])\n\n  const onClickCloser = useCallback(() => {\n    setActive(false)\n\n    // return focus to the Trigger\n    getFirstTabbable(triggerElementRef)?.focus()\n  }, [])\n\n  return (\n    <PortalParentProvider>\n      <DropdownContext.Provider\n        value={{\n          active,\n          triggerRect,\n          triggerElementRef,\n          rootTriggerRef: rootTriggerRef || triggerElementRef || null,\n          memoizedOnClickTrigger,\n          onClickCloser,\n          DropdownContentRoot,\n          contentId,\n        }}\n      >\n        {children}\n      </DropdownContext.Provider>\n    </PortalParentProvider>\n  )\n}\n"],"names":[],"mappings":";;;;;;AAsCA;AAEO;AACL;AACA;;AAEA;;;;;;;AAOA;AACA;AACD;AAEM;;;;AAKL;AAGA;AACA;;AAGE;;;AAIA;;AAEE;;;AAGF;;AAIA;;AAEA;AACF;;AAGA;;;AAKE;AAEA;AACF;;;;;AAMC;;;;;;;;;AAUC;AACE;;AAEJ;AAEA;AACE;AACE;;;;AAMA;AACF;;AAGF;;;AAIE;;;;;;AAUM;;;;;AAKD;AAMT;;"}
+{"version":3,"file":"Dropdown.js","sources":["../../../src/components/Dropdown/Dropdown.tsx"],"sourcesContent":["'use client'\n\nimport {\n  type FC,\n  type MutableRefObject,\n  type PropsWithChildren,\n  type ReactNode,\n  createContext,\n  createRef,\n  useCallback,\n  useContext,\n  useEffect,\n  useId,\n  useMemo,\n  useRef,\n  useState,\n} from 'react'\n\nimport { usePortal } from '../../hooks/usePortal'\n\nimport { type Rect, getFirstTabbable, isEventFromChild } from './dropdownHelper'\n\ntype Props = PropsWithChildren<{\n  onOpen?: () => void\n  onClose?: () => void\n}>\n\ntype DropdownContextType = {\n  active: boolean\n  triggerRect: Rect\n  triggerElementRef: MutableRefObject<HTMLDivElement | null>\n  rootTriggerRef: MutableRefObject<HTMLDivElement | null> | null\n  memoizedOnClickTrigger: (rect: Rect) => void\n  onClickCloser: () => void\n  DropdownContentRoot: FC<{ children: ReactNode }>\n  contentId: string\n}\n\nconst initialRect = { top: 0, right: 0, bottom: 0, left: 0 }\n\nexport const DropdownContext = createContext<DropdownContextType>({\n  active: false,\n  triggerRect: initialRect,\n  triggerElementRef: createRef(),\n  rootTriggerRef: null,\n  memoizedOnClickTrigger: () => {\n    /* noop */\n  },\n  onClickCloser: () => {\n    /* noop */\n  },\n  DropdownContentRoot: () => null,\n  contentId: '',\n})\n\nexport const Dropdown: FC<Props> = ({ onOpen, onClose, children }) => {\n  const [active, setActive] = useState(false)\n  const [triggerRect, setTriggerRect] = useState<Rect>(initialRect)\n\n  const { rootTriggerRef } = useContext(DropdownContext)\n  const { createPortal, portalRoot, isPortalRootMounted, isChildPortal, PortalParentProvider } =\n    usePortal()\n\n  const triggerElementRef = useRef<HTMLDivElement>(null)\n  const contentId = useId()\n\n  const unstableRef = useRef({\n    active,\n    isPortalRootMounted,\n    onOpen,\n    onClose,\n    createPortal,\n  })\n  unstableRef.current = {\n    active,\n    isPortalRootMounted,\n    onOpen,\n    onClose,\n    createPortal,\n  }\n\n  // This is the root container of a dropdown content located in outside the DOM tree\n  const DropdownContentRoot = useMemo<FC<{ children: ReactNode }>>(() => {\n    const result: FC<{ children: ReactNode }> = (props) =>\n      unstableRef.current.active ? unstableRef.current.createPortal(props.children) : null\n\n    // set the displayName explicit for DevTools\n    result.displayName = 'DropdownContentRoot'\n\n    return result\n  }, [])\n\n  const memoizedOnClickTrigger = useCallback((rect: Rect) => {\n    setActive((current) => {\n      const newActive = !current\n\n      if (newActive) {\n        setTriggerRect(rect)\n      }\n\n      return newActive\n    })\n  }, [])\n\n  const onClickCloser = useCallback(() => {\n    setActive(false)\n\n    // return focus to the Trigger\n    getFirstTabbable(triggerElementRef)?.focus()\n  }, [])\n\n  useEffect(() => {\n    if (portalRoot) {\n      portalRoot.setAttribute('id', contentId)\n    }\n\n    const onClickBody = (e: any) => {\n      // ignore events from events within DropdownTrigger and DropdownContent\n      if (!isEventFromChild(e, triggerElementRef.current) && !isChildPortal(e.target)) {\n        setActive(false)\n      }\n    }\n\n    document.body.addEventListener('click', onClickBody, false)\n\n    return () => {\n      document.body.removeEventListener('click', onClickBody, false)\n    }\n  }, [isChildPortal, portalRoot, contentId])\n\n  useEffect(() => {\n    if (unstableRef.current.isPortalRootMounted()) {\n      unstableRef.current[active ? 'onOpen' : 'onClose']?.()\n    }\n  }, [active])\n\n  return (\n    <PortalParentProvider>\n      <DropdownContext.Provider\n        value={{\n          active,\n          triggerRect,\n          triggerElementRef,\n          rootTriggerRef: rootTriggerRef || triggerElementRef || null,\n          memoizedOnClickTrigger,\n          onClickCloser,\n          DropdownContentRoot,\n          contentId,\n        }}\n      >\n        {children}\n      </DropdownContext.Provider>\n    </PortalParentProvider>\n  )\n}\n"],"names":[],"mappings":";;;;;;AAsCA;AAEO;AACL;AACA;;AAEA;;;;;;;AAOA;AACA;AACD;AAEM;;;;AAKL;AAGA;AACA;;;;;;;AAQC;;;;;;;;;AAUD;AACE;;AAIA;AAEA;;AAGF;AACE;AACE;;;;AAMA;AACF;;AAGF;;;AAIE;;;;AAKE;;AAGF;;AAEE;;;AAGF;;AAIA;;AAEA;;;AAIA;AACE;;AAEJ;;;;;AASQ;;;;;AAKD;AAMT;;"}

package/lib/components/Dropdown/DropdownMenuButton/DropdownMenuButton.cjs

@@ -3,12 +3,11 @@
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var index$1 = require('../../../_virtual/index3.cjs');
 var index = require('./../../../vendor/.pnpm/tailwind-variants@0.3.1_tailwindcss@3.4.19_ts-node@10.9.2_@swc_core@1.15.17_@types_node@20.19.35_typescript@5.9.3__/vendor/tailwind-variants/dist/index.cjs');
 var hooks_useObjectAttributes = require('../../../hooks/useObjectAttributes.cjs');
 require('../../../intl/IntlProvider.cjs');
 var intl_useIntl = require('../../../intl/useIntl.cjs');
-require('react-intl');
+require('../../../intl/Localizer.cjs');
 require('../../../_virtual/dayjs.min.cjs');
 require('../../../intl/TimeFormatter.cjs');
 var components_Button_Button = require('../../Button/Button.cjs');
@@ -78,7 +77,7 @@ const TriggerLabelText = React.memo(({ children, onlyIconTrigger }) => {
         return children;
     }
     const Icon = (typeof onlyIconTrigger === 'object' && onlyIconTrigger.component) || components_Icon_FaIcon.FaEllipsisIcon;
-    return jsxRuntime.jsx(Icon, { alt: typeof children === 'string' ? children : index$1(children) });
+    return jsxRuntime.jsx(Icon, { alt: children });
 });
 const renderButtonList = (children) => React.Children.map(children, (item) => {
     if (!item || !React.isValidElement(item)) {
@@ -111,6 +110,9 @@ const ButtonListItem = ({ children }) => {
         observer.observe(listItem, {
             childList: true,
             subtree: true,
+            // button要素の disabled / aria-disabled が動的に変化した場合も検知してリスナーを貼り直す
+            attributes: true,
+            attributeFilter: ['disabled', 'aria-disabled'],
         });
         return () => {
             observer.disconnect();

package/lib/components/Dropdown/DropdownMenuButton/DropdownMenuButton.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"DropdownMenuButton.cjs","sources":["../../../../src/components/Dropdown/DropdownMenuButton/DropdownMenuButton.tsx"],"sourcesContent":["'use client'\n\nimport {\n  Children,\n  type ComponentProps,\n  type ComponentPropsWithRef,\n  type ComponentType,\n  type FC,\n  Fragment,\n  type ReactElement,\n  type ReactNode,\n  isValidElement,\n  memo,\n  useContext,\n  useEffect,\n  useMemo,\n  useRef,\n} from 'react'\nimport innerText from 'react-innertext'\nimport { tv } from 'tailwind-variants'\n\nimport { useObjectAttributes } from '../../../hooks/useObjectAttributes'\nimport { useIntl } from '../../../intl'\nimport { type AnchorButton, Button, type AbstractProps as ButtonProps } from '../../Button'\nimport { FaCaretDownIcon, FaEllipsisIcon } from '../../Icon'\nimport { Dropdown, DropdownContext } from '../Dropdown'\nimport { DropdownCloser } from '../DropdownCloser'\nimport { DropdownContent } from '../DropdownContent'\nimport { DropdownTrigger } from '../DropdownTrigger'\n\nimport { DropdownMenuGroup } from './DropdownMenuGroup'\nimport useKeyboardNavigation from './useKeyboardNavigation'\n\nimport type { RemoteDialogTrigger } from '../../Dialog'\n\ntype Actions = ActionItem | ActionItem[]\n\n// これでコンポーネントを絞れるわけではないが Button[variant=text] を使ってほしいんだよ! という気持ち\ntype ActionItem =\n  | ReactElement<ComponentProps<typeof Button>>\n  | ReactElement<ComponentProps<typeof AnchorButton>>\n  | ReactElement<ComponentProps<typeof RemoteDialogTrigger>>\n  | ReactNode\n\ntype ObjectTriggerType = {\n  /** 引き金となるボタンラベル */\n  children: ReactNode\n  /** 引き金となるボタンの大きさ */\n  size?: ButtonProps['size']\n  /** 引き金となるボタンをアイコンのみとするかどうか */\n  onlyIcon?:\n    | boolean\n    | {\n        /** 引き金となるアイコンを差し替えたい場合（onlyIcon=true の場合のみ有効） */\n        component?: ComponentType<ComponentProps<typeof FaCaretDownIcon>>\n      }\n}\ntype AbstractProps = {\n  /** 引き金となるボタン */\n  trigger: ReactNode | ObjectTriggerType\n  /** 操作群 */\n  children: Actions\n  /** ドロップダウンメニューが開かれた際のイベント */\n  onOpen?: () => void\n  /** ドロップダウンメニューが閉じられた際のイベント */\n  onClose?: () => void\n}\ntype ElementProps = Omit<ComponentPropsWithRef<'button'>, keyof AbstractProps>\ntype Props = AbstractProps & ElementProps\n\nconst triggerObjectConverter = (trigger: ReactNode) => ({\n  children: trigger,\n})\n\nconst classNameGenerator = tv({\n  slots: {\n    triggerWrapper: 'smarthr-ui-DropdownMenuButton',\n    triggerButton:\n      'smarthr-ui-DropdownMenuButton-trigger [&[aria-expanded=\"true\"]_.smarthr-ui-Icon:last-child]:shr-rotate-180',\n    actionList: [\n      'smarthr-ui-DropdownMenuButton-panel',\n      'shr-list-none shr-py-0.5',\n      [\n        /* unset した Button の右 padding 分 */\n        '[&_.smarthr-ui-Button-disabledWrapper]:shr-pe-1',\n        '[&_.smarthr-ui-Button-disabledWrapper]:shr-gap-x-0.5',\n        '[&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-w-[unset] [&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-bg-transparent [&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-pe-[unset]',\n      ],\n    ],\n    actionListItemButton: [\n      // HINT: 実際にレンダリングされた要素のclassに対して追加されるため、優先度を上げる必要がある\n      '[&&]:shr-w-full [&&]:shr-justify-start [&&]:shr-rounded-none [&&]:shr-border-none [&&]:shr-py-0.5 [&&]:shr-font-normal',\n      '[&&]:focus-visible:shr-focus-indicator',\n    ],\n  },\n})\n\nconst { triggerWrapper, triggerButton, actionList, actionListItemButton } = classNameGenerator()\n\nexport const DropdownMenuButton: FC<Props> = ({\n  trigger,\n  children,\n  onOpen,\n  onClose,\n  className,\n  ...rest\n}) => {\n  const {\n    children: triggerChildren,\n    size: triggerSize,\n    onlyIcon: onlyIconTrigger,\n  } = useObjectAttributes<ReactNode | ObjectTriggerType, ObjectTriggerType>(\n    trigger,\n    triggerObjectConverter,\n  )\n\n  const containerRef = useRef<HTMLUListElement>(null)\n\n  useKeyboardNavigation(containerRef)\n\n  const classNames = useMemo(\n    () => ({\n      triggerWrapper: triggerWrapper({ className }),\n      triggerButton: triggerButton(),\n      actionList: actionList(),\n    }),\n    [className],\n  )\n\n  return (\n    <Dropdown onOpen={onOpen} onClose={onClose}>\n      <MemoizedTriggerButton\n        {...rest}\n        onlyIconTrigger={onlyIconTrigger}\n        triggerSize={triggerSize}\n        classNames={classNames}\n      >\n        {triggerChildren}\n      </MemoizedTriggerButton>\n      <DropdownContent controllable={true}>\n        <menu ref={containerRef} role=\"menu\" className={classNames.actionList}>\n          {renderButtonList(children)}\n        </menu>\n      </DropdownContent>\n    </Dropdown>\n  )\n}\n\nconst MemoizedTriggerButton = memo<\n  ElementProps & {\n    onlyIconTrigger: ObjectTriggerType['onlyIcon']\n    triggerSize: ObjectTriggerType['size']\n    children: ObjectTriggerType['children']\n    classNames: {\n      triggerWrapper: string\n      triggerButton: string\n    }\n  }\n>(({ onlyIconTrigger, triggerSize, children, classNames, ...rest }) => {\n  const { localize } = useIntl()\n\n  const { active } = useContext(DropdownContext)\n\n  return (\n    <DropdownTrigger\n      className={classNames.triggerWrapper}\n      tooltip={{ show: !!onlyIconTrigger, message: children }}\n    >\n      <Button\n        {...rest}\n        suffix={\n          !onlyIconTrigger && (\n            <FaCaretDownIcon\n              alt={\n                active\n                  ? localize({\n                      id: 'smarthr-ui/DropdownMenuButton/triggerActive',\n                      defaultText: '候補を閉じる',\n                    })\n                  : localize({\n                      id: 'smarthr-ui/DropdownMenuButton/triggerInactive',\n                      defaultText: '候補を開く',\n                    })\n              }\n            />\n          )\n        }\n        size={triggerSize}\n        className={classNames.triggerButton}\n      >\n        <TriggerLabelText onlyIconTrigger={onlyIconTrigger}>{children}</TriggerLabelText>\n      </Button>\n    </DropdownTrigger>\n  )\n})\n\nconst TriggerLabelText = memo<{\n  onlyIconTrigger: ObjectTriggerType['onlyIcon']\n  children: ObjectTriggerType['children']\n}>(({ children, onlyIconTrigger }) => {\n  if (!onlyIconTrigger) {\n    return children\n  }\n\n  const Icon = (typeof onlyIconTrigger === 'object' && onlyIconTrigger.component) || FaEllipsisIcon\n\n  return <Icon alt={typeof children === 'string' ? children : innerText(children)} />\n})\n\nexport const renderButtonList = (children: Actions) =>\n  Children.map(children, (item): ReactNode => {\n    if (!item || !isValidElement(item)) {\n      return null\n    }\n\n    switch (item.type) {\n      case Fragment:\n        return renderButtonList(item.props.children)\n      case DropdownMenuGroup:\n        return item\n    }\n\n    return <ButtonListItem>{item}</ButtonListItem>\n  })\n\nconst ButtonListItem: FC<{ children: ReactElement }> = ({ children }) => {\n  const ref = useRef<HTMLLIElement>(null)\n\n  useEffect(() => {\n    const listItem = ref.current\n    if (!listItem) {\n      return\n    }\n\n    const setupButton = () => {\n      const button = listItem.querySelector('button,a')\n\n      if (button) {\n        button.setAttribute('role', 'menuitem')\n        button.setAttribute(\n          'class',\n          actionListItemButton({ className: button.getAttribute('class') }),\n        )\n      }\n    }\n\n    setupButton()\n\n    const observer = new MutationObserver(setupButton)\n    observer.observe(listItem, {\n      childList: true,\n      subtree: true,\n    })\n\n    return () => {\n      observer.disconnect()\n    }\n  }, [])\n\n  return (\n    <li role=\"presentation\" ref={ref}>\n      <DropdownCloser>{children}</DropdownCloser>\n    </li>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAsEA;AACE;AACD;AAED;AACE;AACE;AACA;AAEA;;;AAGE;;;;;AAKC;AACF;AACD;;;;AAIC;AACF;AACF;AAED;;;AAmBE;;AAIA;AAEI;;;AAGD;AAIH;AAiBF;AAEA;AAWE;;AAIA;;AAaoB;AACA;;;AAGA;AACA;;AAatB;AAEA;;AAKI;;AAGF;;AAGF;AAEO;;AAGD;;AAGF;AACE;;AAEA;AACE;;AAGJ;AACF;AAEF;AACE;;AAGE;;;;;;;AASI;AACA;;AAKJ;AAEA;AAEA;AACA;AACE;AACA;AACD;AAED;;AAEA;;AAGF;AAKF;;;"}
+{"version":3,"file":"DropdownMenuButton.cjs","sources":["../../../../src/components/Dropdown/DropdownMenuButton/DropdownMenuButton.tsx"],"sourcesContent":["'use client'\n\nimport {\n  Children,\n  type ComponentProps,\n  type ComponentPropsWithRef,\n  type ComponentType,\n  type FC,\n  Fragment,\n  type ReactElement,\n  type ReactNode,\n  isValidElement,\n  memo,\n  useContext,\n  useEffect,\n  useMemo,\n  useRef,\n} from 'react'\nimport { tv } from 'tailwind-variants'\n\nimport { useObjectAttributes } from '../../../hooks/useObjectAttributes'\nimport { useIntl } from '../../../intl'\nimport { type AnchorButton, Button, type AbstractProps as ButtonProps } from '../../Button'\nimport { FaCaretDownIcon, FaEllipsisIcon } from '../../Icon'\nimport { Dropdown, DropdownContext } from '../Dropdown'\nimport { DropdownCloser } from '../DropdownCloser'\nimport { DropdownContent } from '../DropdownContent'\nimport { DropdownTrigger } from '../DropdownTrigger'\n\nimport { DropdownMenuGroup } from './DropdownMenuGroup'\nimport useKeyboardNavigation from './useKeyboardNavigation'\n\nimport type { RemoteDialogTrigger } from '../../Dialog'\n\ntype Actions = ActionItem | ActionItem[]\n\n// これでコンポーネントを絞れるわけではないが Button[variant=text] を使ってほしいんだよ! という気持ち\ntype ActionItem =\n  | ReactElement<ComponentProps<typeof Button>>\n  | ReactElement<ComponentProps<typeof AnchorButton>>\n  | ReactElement<ComponentProps<typeof RemoteDialogTrigger>>\n  | ReactNode\n\ntype ObjectTriggerType = {\n  /** 引き金となるボタンラベル */\n  children: ReactNode\n  /** 引き金となるボタンの大きさ */\n  size?: ButtonProps['size']\n  /** 引き金となるボタンをアイコンのみとするかどうか */\n  onlyIcon?:\n    | boolean\n    | {\n        /** 引き金となるアイコンを差し替えたい場合（onlyIcon=true の場合のみ有効） */\n        component?: ComponentType<ComponentProps<typeof FaCaretDownIcon>>\n      }\n}\ntype AbstractProps = {\n  /** 引き金となるボタン */\n  trigger: ReactNode | ObjectTriggerType\n  /** 操作群 */\n  children: Actions\n  /** ドロップダウンメニューが開かれた際のイベント */\n  onOpen?: () => void\n  /** ドロップダウンメニューが閉じられた際のイベント */\n  onClose?: () => void\n}\ntype ElementProps = Omit<ComponentPropsWithRef<'button'>, keyof AbstractProps>\ntype Props = AbstractProps & ElementProps\n\nconst triggerObjectConverter = (trigger: ReactNode) => ({\n  children: trigger,\n})\n\nconst classNameGenerator = tv({\n  slots: {\n    triggerWrapper: 'smarthr-ui-DropdownMenuButton',\n    triggerButton:\n      'smarthr-ui-DropdownMenuButton-trigger [&[aria-expanded=\"true\"]_.smarthr-ui-Icon:last-child]:shr-rotate-180',\n    actionList: [\n      'smarthr-ui-DropdownMenuButton-panel',\n      'shr-list-none shr-py-0.5',\n      [\n        /* unset した Button の右 padding 分 */\n        '[&_.smarthr-ui-Button-disabledWrapper]:shr-pe-1',\n        '[&_.smarthr-ui-Button-disabledWrapper]:shr-gap-x-0.5',\n        '[&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-w-[unset] [&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-bg-transparent [&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-pe-[unset]',\n      ],\n    ],\n    actionListItemButton: [\n      // HINT: 実際にレンダリングされた要素のclassに対して追加されるため、優先度を上げる必要がある\n      '[&&]:shr-w-full [&&]:shr-justify-start [&&]:shr-rounded-none [&&]:shr-border-none [&&]:shr-py-0.5 [&&]:shr-font-normal',\n      '[&&]:focus-visible:shr-focus-indicator',\n    ],\n  },\n})\n\nconst { triggerWrapper, triggerButton, actionList, actionListItemButton } = classNameGenerator()\n\nexport const DropdownMenuButton: FC<Props> = ({\n  trigger,\n  children,\n  onOpen,\n  onClose,\n  className,\n  ...rest\n}) => {\n  const {\n    children: triggerChildren,\n    size: triggerSize,\n    onlyIcon: onlyIconTrigger,\n  } = useObjectAttributes<ReactNode | ObjectTriggerType, ObjectTriggerType>(\n    trigger,\n    triggerObjectConverter,\n  )\n\n  const containerRef = useRef<HTMLUListElement>(null)\n\n  useKeyboardNavigation(containerRef)\n\n  const classNames = useMemo(\n    () => ({\n      triggerWrapper: triggerWrapper({ className }),\n      triggerButton: triggerButton(),\n      actionList: actionList(),\n    }),\n    [className],\n  )\n\n  return (\n    <Dropdown onOpen={onOpen} onClose={onClose}>\n      <MemoizedTriggerButton\n        {...rest}\n        onlyIconTrigger={onlyIconTrigger}\n        triggerSize={triggerSize}\n        classNames={classNames}\n      >\n        {triggerChildren}\n      </MemoizedTriggerButton>\n      <DropdownContent controllable={true}>\n        <menu ref={containerRef} role=\"menu\" className={classNames.actionList}>\n          {renderButtonList(children)}\n        </menu>\n      </DropdownContent>\n    </Dropdown>\n  )\n}\n\nconst MemoizedTriggerButton = memo<\n  ElementProps & {\n    onlyIconTrigger: ObjectTriggerType['onlyIcon']\n    triggerSize: ObjectTriggerType['size']\n    children: ObjectTriggerType['children']\n    classNames: {\n      triggerWrapper: string\n      triggerButton: string\n    }\n  }\n>(({ onlyIconTrigger, triggerSize, children, classNames, ...rest }) => {\n  const { localize } = useIntl()\n\n  const { active } = useContext(DropdownContext)\n\n  return (\n    <DropdownTrigger\n      className={classNames.triggerWrapper}\n      tooltip={{ show: !!onlyIconTrigger, message: children }}\n    >\n      <Button\n        {...rest}\n        suffix={\n          !onlyIconTrigger && (\n            <FaCaretDownIcon\n              alt={\n                active\n                  ? localize({\n                      id: 'smarthr-ui/DropdownMenuButton/triggerActive',\n                      defaultText: '候補を閉じる',\n                    })\n                  : localize({\n                      id: 'smarthr-ui/DropdownMenuButton/triggerInactive',\n                      defaultText: '候補を開く',\n                    })\n              }\n            />\n          )\n        }\n        size={triggerSize}\n        className={classNames.triggerButton}\n      >\n        <TriggerLabelText onlyIconTrigger={onlyIconTrigger}>{children}</TriggerLabelText>\n      </Button>\n    </DropdownTrigger>\n  )\n})\n\nconst TriggerLabelText = memo<{\n  onlyIconTrigger: ObjectTriggerType['onlyIcon']\n  children: ObjectTriggerType['children']\n}>(({ children, onlyIconTrigger }) => {\n  if (!onlyIconTrigger) {\n    return children\n  }\n\n  const Icon = (typeof onlyIconTrigger === 'object' && onlyIconTrigger.component) || FaEllipsisIcon\n\n  return <Icon alt={children} />\n})\n\nexport const renderButtonList = (children: Actions) =>\n  Children.map(children, (item): ReactNode => {\n    if (!item || !isValidElement(item)) {\n      return null\n    }\n\n    switch (item.type) {\n      case Fragment:\n        return renderButtonList(item.props.children)\n      case DropdownMenuGroup:\n        return item\n    }\n\n    return <ButtonListItem>{item}</ButtonListItem>\n  })\n\nconst ButtonListItem: FC<{ children: ReactElement }> = ({ children }) => {\n  const ref = useRef<HTMLLIElement>(null)\n\n  useEffect(() => {\n    const listItem = ref.current\n    if (!listItem) {\n      return\n    }\n\n    const setupButton = () => {\n      const button = listItem.querySelector('button,a')\n\n      if (button) {\n        button.setAttribute('role', 'menuitem')\n        button.setAttribute(\n          'class',\n          actionListItemButton({ className: button.getAttribute('class') }),\n        )\n      }\n    }\n\n    setupButton()\n\n    const observer = new MutationObserver(setupButton)\n    observer.observe(listItem, {\n      childList: true,\n      subtree: true,\n      // button要素の disabled / aria-disabled が動的に変化した場合も検知してリスナーを貼り直す\n      attributes: true,\n      attributeFilter: ['disabled', 'aria-disabled'],\n    })\n\n    return () => {\n      observer.disconnect()\n    }\n  }, [])\n\n  return (\n    <li role=\"presentation\" ref={ref}>\n      <DropdownCloser>{children}</DropdownCloser>\n    </li>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAqEA;AACE;AACD;AAED;AACE;AACE;AACA;AAEA;;;AAGE;;;;;AAKC;AACF;AACD;;;;AAIC;AACF;AACF;AAED;;;AAmBE;;AAIA;AAEI;;;AAGD;AAIH;AAiBF;AAEA;AAWE;;AAIA;;AAaoB;AACA;;;AAGA;AACA;;AAatB;AAEA;;AAKI;;AAGF;AAEA;AACF;AAEO;;AAGD;;AAGF;AACE;;AAEA;AACE;;AAGJ;AACF;AAEF;AACE;;AAGE;;;;;;;AASI;AACA;;AAKJ;AAEA;AAEA;AACA;AACE;AACA;;AAEA;AACA;AACD;AAED;;AAEA;;AAGF;AAKF;;;"}

package/lib/components/Dropdown/DropdownMenuButton/DropdownMenuButton.js

@@ -1,12 +1,11 @@
 "use client";
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { memo, useContext, useRef, useMemo, Children, isValidElement, Fragment, useEffect } from 'react';
-import innerText from '../../../_virtual/index3.js';
 import { tv as ce } from './../../../vendor/.pnpm/tailwind-variants@0.3.1_tailwindcss@3.4.19_ts-node@10.9.2_@swc_core@1.15.17_@types_node@20.19.35_typescript@5.9.3__/vendor/tailwind-variants/dist/index.js';
 import { useObjectAttributes } from '../../../hooks/useObjectAttributes.js';
 import '../../../intl/IntlProvider.js';
 import { useIntl } from '../../../intl/useIntl.js';
-import 'react-intl';
+import '../../../intl/Localizer.js';
 import '../../../_virtual/dayjs.min.js';
 import '../../../intl/TimeFormatter.js';
 import { Button } from '../../Button/Button.js';
@@ -76,7 +75,7 @@ const TriggerLabelText = memo(({ children, onlyIconTrigger }) => {
         return children;
     }
     const Icon = (typeof onlyIconTrigger === 'object' && onlyIconTrigger.component) || FaEllipsisIcon;
-    return jsx(Icon, { alt: typeof children === 'string' ? children : innerText(children) });
+    return jsx(Icon, { alt: children });
 });
 const renderButtonList = (children) => Children.map(children, (item) => {
     if (!item || !isValidElement(item)) {
@@ -109,6 +108,9 @@ const ButtonListItem = ({ children }) => {
         observer.observe(listItem, {
             childList: true,
             subtree: true,
+            // button要素の disabled / aria-disabled が動的に変化した場合も検知してリスナーを貼り直す
+            attributes: true,
+            attributeFilter: ['disabled', 'aria-disabled'],
         });
         return () => {
             observer.disconnect();

package/lib/components/Dropdown/DropdownMenuButton/DropdownMenuButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"DropdownMenuButton.js","sources":["../../../../src/components/Dropdown/DropdownMenuButton/DropdownMenuButton.tsx"],"sourcesContent":["'use client'\n\nimport {\n  Children,\n  type ComponentProps,\n  type ComponentPropsWithRef,\n  type ComponentType,\n  type FC,\n  Fragment,\n  type ReactElement,\n  type ReactNode,\n  isValidElement,\n  memo,\n  useContext,\n  useEffect,\n  useMemo,\n  useRef,\n} from 'react'\nimport innerText from 'react-innertext'\nimport { tv } from 'tailwind-variants'\n\nimport { useObjectAttributes } from '../../../hooks/useObjectAttributes'\nimport { useIntl } from '../../../intl'\nimport { type AnchorButton, Button, type AbstractProps as ButtonProps } from '../../Button'\nimport { FaCaretDownIcon, FaEllipsisIcon } from '../../Icon'\nimport { Dropdown, DropdownContext } from '../Dropdown'\nimport { DropdownCloser } from '../DropdownCloser'\nimport { DropdownContent } from '../DropdownContent'\nimport { DropdownTrigger } from '../DropdownTrigger'\n\nimport { DropdownMenuGroup } from './DropdownMenuGroup'\nimport useKeyboardNavigation from './useKeyboardNavigation'\n\nimport type { RemoteDialogTrigger } from '../../Dialog'\n\ntype Actions = ActionItem | ActionItem[]\n\n// これでコンポーネントを絞れるわけではないが Button[variant=text] を使ってほしいんだよ! という気持ち\ntype ActionItem =\n  | ReactElement<ComponentProps<typeof Button>>\n  | ReactElement<ComponentProps<typeof AnchorButton>>\n  | ReactElement<ComponentProps<typeof RemoteDialogTrigger>>\n  | ReactNode\n\ntype ObjectTriggerType = {\n  /** 引き金となるボタンラベル */\n  children: ReactNode\n  /** 引き金となるボタンの大きさ */\n  size?: ButtonProps['size']\n  /** 引き金となるボタンをアイコンのみとするかどうか */\n  onlyIcon?:\n    | boolean\n    | {\n        /** 引き金となるアイコンを差し替えたい場合（onlyIcon=true の場合のみ有効） */\n        component?: ComponentType<ComponentProps<typeof FaCaretDownIcon>>\n      }\n}\ntype AbstractProps = {\n  /** 引き金となるボタン */\n  trigger: ReactNode | ObjectTriggerType\n  /** 操作群 */\n  children: Actions\n  /** ドロップダウンメニューが開かれた際のイベント */\n  onOpen?: () => void\n  /** ドロップダウンメニューが閉じられた際のイベント */\n  onClose?: () => void\n}\ntype ElementProps = Omit<ComponentPropsWithRef<'button'>, keyof AbstractProps>\ntype Props = AbstractProps & ElementProps\n\nconst triggerObjectConverter = (trigger: ReactNode) => ({\n  children: trigger,\n})\n\nconst classNameGenerator = tv({\n  slots: {\n    triggerWrapper: 'smarthr-ui-DropdownMenuButton',\n    triggerButton:\n      'smarthr-ui-DropdownMenuButton-trigger [&[aria-expanded=\"true\"]_.smarthr-ui-Icon:last-child]:shr-rotate-180',\n    actionList: [\n      'smarthr-ui-DropdownMenuButton-panel',\n      'shr-list-none shr-py-0.5',\n      [\n        /* unset した Button の右 padding 分 */\n        '[&_.smarthr-ui-Button-disabledWrapper]:shr-pe-1',\n        '[&_.smarthr-ui-Button-disabledWrapper]:shr-gap-x-0.5',\n        '[&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-w-[unset] [&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-bg-transparent [&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-pe-[unset]',\n      ],\n    ],\n    actionListItemButton: [\n      // HINT: 実際にレンダリングされた要素のclassに対して追加されるため、優先度を上げる必要がある\n      '[&&]:shr-w-full [&&]:shr-justify-start [&&]:shr-rounded-none [&&]:shr-border-none [&&]:shr-py-0.5 [&&]:shr-font-normal',\n      '[&&]:focus-visible:shr-focus-indicator',\n    ],\n  },\n})\n\nconst { triggerWrapper, triggerButton, actionList, actionListItemButton } = classNameGenerator()\n\nexport const DropdownMenuButton: FC<Props> = ({\n  trigger,\n  children,\n  onOpen,\n  onClose,\n  className,\n  ...rest\n}) => {\n  const {\n    children: triggerChildren,\n    size: triggerSize,\n    onlyIcon: onlyIconTrigger,\n  } = useObjectAttributes<ReactNode | ObjectTriggerType, ObjectTriggerType>(\n    trigger,\n    triggerObjectConverter,\n  )\n\n  const containerRef = useRef<HTMLUListElement>(null)\n\n  useKeyboardNavigation(containerRef)\n\n  const classNames = useMemo(\n    () => ({\n      triggerWrapper: triggerWrapper({ className }),\n      triggerButton: triggerButton(),\n      actionList: actionList(),\n    }),\n    [className],\n  )\n\n  return (\n    <Dropdown onOpen={onOpen} onClose={onClose}>\n      <MemoizedTriggerButton\n        {...rest}\n        onlyIconTrigger={onlyIconTrigger}\n        triggerSize={triggerSize}\n        classNames={classNames}\n      >\n        {triggerChildren}\n      </MemoizedTriggerButton>\n      <DropdownContent controllable={true}>\n        <menu ref={containerRef} role=\"menu\" className={classNames.actionList}>\n          {renderButtonList(children)}\n        </menu>\n      </DropdownContent>\n    </Dropdown>\n  )\n}\n\nconst MemoizedTriggerButton = memo<\n  ElementProps & {\n    onlyIconTrigger: ObjectTriggerType['onlyIcon']\n    triggerSize: ObjectTriggerType['size']\n    children: ObjectTriggerType['children']\n    classNames: {\n      triggerWrapper: string\n      triggerButton: string\n    }\n  }\n>(({ onlyIconTrigger, triggerSize, children, classNames, ...rest }) => {\n  const { localize } = useIntl()\n\n  const { active } = useContext(DropdownContext)\n\n  return (\n    <DropdownTrigger\n      className={classNames.triggerWrapper}\n      tooltip={{ show: !!onlyIconTrigger, message: children }}\n    >\n      <Button\n        {...rest}\n        suffix={\n          !onlyIconTrigger && (\n            <FaCaretDownIcon\n              alt={\n                active\n                  ? localize({\n                      id: 'smarthr-ui/DropdownMenuButton/triggerActive',\n                      defaultText: '候補を閉じる',\n                    })\n                  : localize({\n                      id: 'smarthr-ui/DropdownMenuButton/triggerInactive',\n                      defaultText: '候補を開く',\n                    })\n              }\n            />\n          )\n        }\n        size={triggerSize}\n        className={classNames.triggerButton}\n      >\n        <TriggerLabelText onlyIconTrigger={onlyIconTrigger}>{children}</TriggerLabelText>\n      </Button>\n    </DropdownTrigger>\n  )\n})\n\nconst TriggerLabelText = memo<{\n  onlyIconTrigger: ObjectTriggerType['onlyIcon']\n  children: ObjectTriggerType['children']\n}>(({ children, onlyIconTrigger }) => {\n  if (!onlyIconTrigger) {\n    return children\n  }\n\n  const Icon = (typeof onlyIconTrigger === 'object' && onlyIconTrigger.component) || FaEllipsisIcon\n\n  return <Icon alt={typeof children === 'string' ? children : innerText(children)} />\n})\n\nexport const renderButtonList = (children: Actions) =>\n  Children.map(children, (item): ReactNode => {\n    if (!item || !isValidElement(item)) {\n      return null\n    }\n\n    switch (item.type) {\n      case Fragment:\n        return renderButtonList(item.props.children)\n      case DropdownMenuGroup:\n        return item\n    }\n\n    return <ButtonListItem>{item}</ButtonListItem>\n  })\n\nconst ButtonListItem: FC<{ children: ReactElement }> = ({ children }) => {\n  const ref = useRef<HTMLLIElement>(null)\n\n  useEffect(() => {\n    const listItem = ref.current\n    if (!listItem) {\n      return\n    }\n\n    const setupButton = () => {\n      const button = listItem.querySelector('button,a')\n\n      if (button) {\n        button.setAttribute('role', 'menuitem')\n        button.setAttribute(\n          'class',\n          actionListItemButton({ className: button.getAttribute('class') }),\n        )\n      }\n    }\n\n    setupButton()\n\n    const observer = new MutationObserver(setupButton)\n    observer.observe(listItem, {\n      childList: true,\n      subtree: true,\n    })\n\n    return () => {\n      observer.disconnect()\n    }\n  }, [])\n\n  return (\n    <li role=\"presentation\" ref={ref}>\n      <DropdownCloser>{children}</DropdownCloser>\n    </li>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAsEA;AACE;AACD;AAED;AACE;AACE;AACA;AAEA;;;AAGE;;;;;AAKC;AACF;AACD;;;;AAIC;AACF;AACF;AAED;;;AAmBE;;AAIA;AAEI;;;AAGD;AAIH;AAiBF;AAEA;AAWE;;AAIA;;AAaoB;AACA;;;AAGA;AACA;;AAatB;AAEA;;AAKI;;AAGF;;AAGF;AAEO;;AAGD;;AAGF;AACE;;AAEA;AACE;;AAGJ;AACF;AAEF;AACE;;AAGE;;;;;;;AASI;AACA;;AAKJ;AAEA;AAEA;AACA;AACE;AACA;AACD;AAED;;AAEA;;AAGF;AAKF;;"}
+{"version":3,"file":"DropdownMenuButton.js","sources":["../../../../src/components/Dropdown/DropdownMenuButton/DropdownMenuButton.tsx"],"sourcesContent":["'use client'\n\nimport {\n  Children,\n  type ComponentProps,\n  type ComponentPropsWithRef,\n  type ComponentType,\n  type FC,\n  Fragment,\n  type ReactElement,\n  type ReactNode,\n  isValidElement,\n  memo,\n  useContext,\n  useEffect,\n  useMemo,\n  useRef,\n} from 'react'\nimport { tv } from 'tailwind-variants'\n\nimport { useObjectAttributes } from '../../../hooks/useObjectAttributes'\nimport { useIntl } from '../../../intl'\nimport { type AnchorButton, Button, type AbstractProps as ButtonProps } from '../../Button'\nimport { FaCaretDownIcon, FaEllipsisIcon } from '../../Icon'\nimport { Dropdown, DropdownContext } from '../Dropdown'\nimport { DropdownCloser } from '../DropdownCloser'\nimport { DropdownContent } from '../DropdownContent'\nimport { DropdownTrigger } from '../DropdownTrigger'\n\nimport { DropdownMenuGroup } from './DropdownMenuGroup'\nimport useKeyboardNavigation from './useKeyboardNavigation'\n\nimport type { RemoteDialogTrigger } from '../../Dialog'\n\ntype Actions = ActionItem | ActionItem[]\n\n// これでコンポーネントを絞れるわけではないが Button[variant=text] を使ってほしいんだよ! という気持ち\ntype ActionItem =\n  | ReactElement<ComponentProps<typeof Button>>\n  | ReactElement<ComponentProps<typeof AnchorButton>>\n  | ReactElement<ComponentProps<typeof RemoteDialogTrigger>>\n  | ReactNode\n\ntype ObjectTriggerType = {\n  /** 引き金となるボタンラベル */\n  children: ReactNode\n  /** 引き金となるボタンの大きさ */\n  size?: ButtonProps['size']\n  /** 引き金となるボタンをアイコンのみとするかどうか */\n  onlyIcon?:\n    | boolean\n    | {\n        /** 引き金となるアイコンを差し替えたい場合（onlyIcon=true の場合のみ有効） */\n        component?: ComponentType<ComponentProps<typeof FaCaretDownIcon>>\n      }\n}\ntype AbstractProps = {\n  /** 引き金となるボタン */\n  trigger: ReactNode | ObjectTriggerType\n  /** 操作群 */\n  children: Actions\n  /** ドロップダウンメニューが開かれた際のイベント */\n  onOpen?: () => void\n  /** ドロップダウンメニューが閉じられた際のイベント */\n  onClose?: () => void\n}\ntype ElementProps = Omit<ComponentPropsWithRef<'button'>, keyof AbstractProps>\ntype Props = AbstractProps & ElementProps\n\nconst triggerObjectConverter = (trigger: ReactNode) => ({\n  children: trigger,\n})\n\nconst classNameGenerator = tv({\n  slots: {\n    triggerWrapper: 'smarthr-ui-DropdownMenuButton',\n    triggerButton:\n      'smarthr-ui-DropdownMenuButton-trigger [&[aria-expanded=\"true\"]_.smarthr-ui-Icon:last-child]:shr-rotate-180',\n    actionList: [\n      'smarthr-ui-DropdownMenuButton-panel',\n      'shr-list-none shr-py-0.5',\n      [\n        /* unset した Button の右 padding 分 */\n        '[&_.smarthr-ui-Button-disabledWrapper]:shr-pe-1',\n        '[&_.smarthr-ui-Button-disabledWrapper]:shr-gap-x-0.5',\n        '[&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-w-[unset] [&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-bg-transparent [&_.smarthr-ui-Button-disabledWrapper_>_.smarthr-ui-Button]:shr-pe-[unset]',\n      ],\n    ],\n    actionListItemButton: [\n      // HINT: 実際にレンダリングされた要素のclassに対して追加されるため、優先度を上げる必要がある\n      '[&&]:shr-w-full [&&]:shr-justify-start [&&]:shr-rounded-none [&&]:shr-border-none [&&]:shr-py-0.5 [&&]:shr-font-normal',\n      '[&&]:focus-visible:shr-focus-indicator',\n    ],\n  },\n})\n\nconst { triggerWrapper, triggerButton, actionList, actionListItemButton } = classNameGenerator()\n\nexport const DropdownMenuButton: FC<Props> = ({\n  trigger,\n  children,\n  onOpen,\n  onClose,\n  className,\n  ...rest\n}) => {\n  const {\n    children: triggerChildren,\n    size: triggerSize,\n    onlyIcon: onlyIconTrigger,\n  } = useObjectAttributes<ReactNode | ObjectTriggerType, ObjectTriggerType>(\n    trigger,\n    triggerObjectConverter,\n  )\n\n  const containerRef = useRef<HTMLUListElement>(null)\n\n  useKeyboardNavigation(containerRef)\n\n  const classNames = useMemo(\n    () => ({\n      triggerWrapper: triggerWrapper({ className }),\n      triggerButton: triggerButton(),\n      actionList: actionList(),\n    }),\n    [className],\n  )\n\n  return (\n    <Dropdown onOpen={onOpen} onClose={onClose}>\n      <MemoizedTriggerButton\n        {...rest}\n        onlyIconTrigger={onlyIconTrigger}\n        triggerSize={triggerSize}\n        classNames={classNames}\n      >\n        {triggerChildren}\n      </MemoizedTriggerButton>\n      <DropdownContent controllable={true}>\n        <menu ref={containerRef} role=\"menu\" className={classNames.actionList}>\n          {renderButtonList(children)}\n        </menu>\n      </DropdownContent>\n    </Dropdown>\n  )\n}\n\nconst MemoizedTriggerButton = memo<\n  ElementProps & {\n    onlyIconTrigger: ObjectTriggerType['onlyIcon']\n    triggerSize: ObjectTriggerType['size']\n    children: ObjectTriggerType['children']\n    classNames: {\n      triggerWrapper: string\n      triggerButton: string\n    }\n  }\n>(({ onlyIconTrigger, triggerSize, children, classNames, ...rest }) => {\n  const { localize } = useIntl()\n\n  const { active } = useContext(DropdownContext)\n\n  return (\n    <DropdownTrigger\n      className={classNames.triggerWrapper}\n      tooltip={{ show: !!onlyIconTrigger, message: children }}\n    >\n      <Button\n        {...rest}\n        suffix={\n          !onlyIconTrigger && (\n            <FaCaretDownIcon\n              alt={\n                active\n                  ? localize({\n                      id: 'smarthr-ui/DropdownMenuButton/triggerActive',\n                      defaultText: '候補を閉じる',\n                    })\n                  : localize({\n                      id: 'smarthr-ui/DropdownMenuButton/triggerInactive',\n                      defaultText: '候補を開く',\n                    })\n              }\n            />\n          )\n        }\n        size={triggerSize}\n        className={classNames.triggerButton}\n      >\n        <TriggerLabelText onlyIconTrigger={onlyIconTrigger}>{children}</TriggerLabelText>\n      </Button>\n    </DropdownTrigger>\n  )\n})\n\nconst TriggerLabelText = memo<{\n  onlyIconTrigger: ObjectTriggerType['onlyIcon']\n  children: ObjectTriggerType['children']\n}>(({ children, onlyIconTrigger }) => {\n  if (!onlyIconTrigger) {\n    return children\n  }\n\n  const Icon = (typeof onlyIconTrigger === 'object' && onlyIconTrigger.component) || FaEllipsisIcon\n\n  return <Icon alt={children} />\n})\n\nexport const renderButtonList = (children: Actions) =>\n  Children.map(children, (item): ReactNode => {\n    if (!item || !isValidElement(item)) {\n      return null\n    }\n\n    switch (item.type) {\n      case Fragment:\n        return renderButtonList(item.props.children)\n      case DropdownMenuGroup:\n        return item\n    }\n\n    return <ButtonListItem>{item}</ButtonListItem>\n  })\n\nconst ButtonListItem: FC<{ children: ReactElement }> = ({ children }) => {\n  const ref = useRef<HTMLLIElement>(null)\n\n  useEffect(() => {\n    const listItem = ref.current\n    if (!listItem) {\n      return\n    }\n\n    const setupButton = () => {\n      const button = listItem.querySelector('button,a')\n\n      if (button) {\n        button.setAttribute('role', 'menuitem')\n        button.setAttribute(\n          'class',\n          actionListItemButton({ className: button.getAttribute('class') }),\n        )\n      }\n    }\n\n    setupButton()\n\n    const observer = new MutationObserver(setupButton)\n    observer.observe(listItem, {\n      childList: true,\n      subtree: true,\n      // button要素の disabled / aria-disabled が動的に変化した場合も検知してリスナーを貼り直す\n      attributes: true,\n      attributeFilter: ['disabled', 'aria-disabled'],\n    })\n\n    return () => {\n      observer.disconnect()\n    }\n  }, [])\n\n  return (\n    <li role=\"presentation\" ref={ref}>\n      <DropdownCloser>{children}</DropdownCloser>\n    </li>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAqEA;AACE;AACD;AAED;AACE;AACE;AACA;AAEA;;;AAGE;;;;;AAKC;AACF;AACD;;;;AAIC;AACF;AACF;AAED;;;AAmBE;;AAIA;AAEI;;;AAGD;AAIH;AAiBF;AAEA;AAWE;;AAIA;;AAaoB;AACA;;;AAGA;AACA;;AAatB;AAEA;;AAKI;;AAGF;AAEA;AACF;AAEO;;AAGD;;AAGF;AACE;;AAEA;AACE;;AAGJ;AACF;AAEF;AACE;;AAGE;;;;;;;AASI;AACA;;AAKJ;AAEA;AAEA;AACA;AACE;AACA;;AAEA;AACA;AACD;AAED;;AAEA;;AAGF;AAKF;;"}

package/lib/components/Dropdown/DropdownTrigger.cjs

@@ -63,6 +63,9 @@ const DropdownTrigger = ({ children, className, tooltip }) => {
         observer.observe(triggerElement, {
             childList: true,
             subtree: true,
+            // button要素の disabled / aria-disabled が動的に変化した場合も検知してリスナーを貼り直す
+            attributes: true,
+            attributeFilter: ['disabled', 'aria-disabled'],
         });
         return () => {
             currentCleanup?.();

package/lib/components/Dropdown/DropdownTrigger.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"DropdownTrigger.cjs","sources":["../../../src/components/Dropdown/DropdownTrigger.tsx"],"sourcesContent":["'use client'\n\nimport {\n  type ComponentProps,\n  type FC,\n  type PropsWithChildren,\n  type ReactNode,\n  useContext,\n  useEffect,\n  useMemo,\n} from 'react'\nimport { tv } from 'tailwind-variants'\n\nimport { tabbable } from '../../libs/tabbable'\nimport { Tooltip } from '../Tooltip'\n\nimport { DropdownContext } from './Dropdown'\n\ntype ConditionalWrapperProps = {\n  shouldWrapContent?: boolean\n  wrapper: FC<PropsWithChildren>\n}\n\nconst CAPTURE_OPTION = {\n  capture: true,\n}\n\n/**\n * 条件付きでラッパをレンダリングする\n */\nconst ConditionalWrapper: FC<PropsWithChildren<ConditionalWrapperProps>> = ({\n  shouldWrapContent,\n  wrapper,\n  children,\n}) => (shouldWrapContent ? wrapper({ children }) : children)\n\ntype Props = PropsWithChildren<ComponentProps<'div'>> & {\n  tooltip?: { message: ReactNode; show?: boolean }\n}\n\nconst classNameGenerator = tv({\n  base: 'smarthr-ui-Dropdown shr-inline-block',\n})\n\nexport const DropdownTrigger: FC<Props> = ({ children, className, tooltip }) => {\n  const { active, memoizedOnClickTrigger, contentId, triggerElementRef } =\n    useContext(DropdownContext)\n  const actualClassName = useMemo(() => classNameGenerator({ className }), [className])\n\n  useEffect(() => {\n    if (!triggerElementRef.current) {\n      return\n    }\n\n    // apply ARIA to all focusable elements in trigger\n    const triggers = tabbable(triggerElementRef.current, { shouldIgnoreVisibility: true })\n\n    triggers.forEach((trigger) => {\n      trigger.setAttribute('aria-expanded', active.toString())\n      trigger.setAttribute('aria-controls', contentId)\n    })\n  }, [active, triggerElementRef, contentId])\n\n  useEffect(() => {\n    const triggerElement = triggerElementRef.current\n    if (!triggerElement) {\n      return\n    }\n\n    let currentCleanup: (() => void) | undefined\n\n    const setupButton = () => {\n      // 既存のクリーンアップを実行\n      currentCleanup?.()\n      currentCleanup = undefined\n\n      const button = triggerElement.querySelector<HTMLButtonElement>('button')\n\n      // 引き金となる要素が disabled な場合、処理を差し込む必要がないため、そのまま出力する\n      if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') {\n        return\n      }\n\n      // HINT: Trigger要素自体にonClickが設定されている場合、先にDropdownを開いた状態で処理を行いたい\n      // そのためcaptureで開く処理を実行する\n      const callback = (e: MouseEvent) => {\n        memoizedOnClickTrigger((e.currentTarget! as HTMLButtonElement).getBoundingClientRect())\n      }\n\n      button.addEventListener('click', callback, CAPTURE_OPTION)\n\n      currentCleanup = () => {\n        button.removeEventListener('click', callback, CAPTURE_OPTION)\n      }\n    }\n\n    setupButton()\n\n    const observer = new MutationObserver(setupButton)\n\n    observer.observe(triggerElement, {\n      childList: true,\n      subtree: true,\n    })\n\n    return () => {\n      currentCleanup?.()\n      observer.disconnect()\n    }\n  }, [memoizedOnClickTrigger, triggerElementRef])\n\n  return (\n    <div ref={triggerElementRef} className={actualClassName}>\n      {/* eslint-disable-next-line smarthr/a11y-scroller-has-tabindex */}\n      <ConditionalWrapper\n        shouldWrapContent={tooltip?.show}\n        wrapper={({ children: currentChildren }) =>\n          tooltip?.message ? (\n            // eslint-disable-next-line smarthr/a11y-scroller-has-tabindex\n            <Tooltip message={tooltip?.message} triggerType=\"icon\" tabIndex={-1}>\n              {currentChildren}\n            </Tooltip>\n          ) : (\n            currentChildren\n          )\n        }\n      >\n        {children}\n      </ConditionalWrapper>\n    </div>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;;;;AAuBA;AACE;;AAGF;;AAEG;AACH;AAUA;AACE;AACD;AAEM;AACL;AAEA;;AAGE;;;;AAKA;AAEA;;AAEE;AACF;;;AAIA;;;;AAKA;;;;;;;AAUE;;;;;AAMA;;AAEA;;;;AAMA;AACF;AAEA;AAEA;AAEA;AACE;AACA;AACD;AAED;;;AAGA;AACF;AAEA;;AAQU;AAYZ;;"}
+{"version":3,"file":"DropdownTrigger.cjs","sources":["../../../src/components/Dropdown/DropdownTrigger.tsx"],"sourcesContent":["'use client'\n\nimport {\n  type ComponentProps,\n  type FC,\n  type PropsWithChildren,\n  type ReactNode,\n  useContext,\n  useEffect,\n  useMemo,\n} from 'react'\nimport { tv } from 'tailwind-variants'\n\nimport { tabbable } from '../../libs/tabbable'\nimport { Tooltip } from '../Tooltip'\n\nimport { DropdownContext } from './Dropdown'\n\ntype ConditionalWrapperProps = {\n  shouldWrapContent?: boolean\n  wrapper: FC<PropsWithChildren>\n}\n\nconst CAPTURE_OPTION = {\n  capture: true,\n}\n\n/**\n * 条件付きでラッパをレンダリングする\n */\nconst ConditionalWrapper: FC<PropsWithChildren<ConditionalWrapperProps>> = ({\n  shouldWrapContent,\n  wrapper,\n  children,\n}) => (shouldWrapContent ? wrapper({ children }) : children)\n\ntype Props = PropsWithChildren<ComponentProps<'div'>> & {\n  tooltip?: { message: ReactNode; show?: boolean }\n}\n\nconst classNameGenerator = tv({\n  base: 'smarthr-ui-Dropdown shr-inline-block',\n})\n\nexport const DropdownTrigger: FC<Props> = ({ children, className, tooltip }) => {\n  const { active, memoizedOnClickTrigger, contentId, triggerElementRef } =\n    useContext(DropdownContext)\n  const actualClassName = useMemo(() => classNameGenerator({ className }), [className])\n\n  useEffect(() => {\n    if (!triggerElementRef.current) {\n      return\n    }\n\n    // apply ARIA to all focusable elements in trigger\n    const triggers = tabbable(triggerElementRef.current, { shouldIgnoreVisibility: true })\n\n    triggers.forEach((trigger) => {\n      trigger.setAttribute('aria-expanded', active.toString())\n      trigger.setAttribute('aria-controls', contentId)\n    })\n  }, [active, triggerElementRef, contentId])\n\n  useEffect(() => {\n    const triggerElement = triggerElementRef.current\n    if (!triggerElement) {\n      return\n    }\n\n    let currentCleanup: (() => void) | undefined\n\n    const setupButton = () => {\n      // 既存のクリーンアップを実行\n      currentCleanup?.()\n      currentCleanup = undefined\n\n      const button = triggerElement.querySelector<HTMLButtonElement>('button')\n\n      // 引き金となる要素が disabled な場合、処理を差し込む必要がないため、そのまま出力する\n      if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') {\n        return\n      }\n\n      // HINT: Trigger要素自体にonClickが設定されている場合、先にDropdownを開いた状態で処理を行いたい\n      // そのためcaptureで開く処理を実行する\n      const callback = (e: MouseEvent) => {\n        memoizedOnClickTrigger((e.currentTarget! as HTMLButtonElement).getBoundingClientRect())\n      }\n\n      button.addEventListener('click', callback, CAPTURE_OPTION)\n\n      currentCleanup = () => {\n        button.removeEventListener('click', callback, CAPTURE_OPTION)\n      }\n    }\n\n    setupButton()\n\n    const observer = new MutationObserver(setupButton)\n\n    observer.observe(triggerElement, {\n      childList: true,\n      subtree: true,\n      // button要素の disabled / aria-disabled が動的に変化した場合も検知してリスナーを貼り直す\n      attributes: true,\n      attributeFilter: ['disabled', 'aria-disabled'],\n    })\n\n    return () => {\n      currentCleanup?.()\n      observer.disconnect()\n    }\n  }, [memoizedOnClickTrigger, triggerElementRef])\n\n  return (\n    <div ref={triggerElementRef} className={actualClassName}>\n      {/* eslint-disable-next-line smarthr/a11y-scroller-has-tabindex */}\n      <ConditionalWrapper\n        shouldWrapContent={tooltip?.show}\n        wrapper={({ children: currentChildren }) =>\n          tooltip?.message ? (\n            // eslint-disable-next-line smarthr/a11y-scroller-has-tabindex\n            <Tooltip message={tooltip?.message} triggerType=\"icon\" tabIndex={-1}>\n              {currentChildren}\n            </Tooltip>\n          ) : (\n            currentChildren\n          )\n        }\n      >\n        {children}\n      </ConditionalWrapper>\n    </div>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;;;;AAuBA;AACE;;AAGF;;AAEG;AACH;AAUA;AACE;AACD;AAEM;AACL;AAEA;;AAGE;;;;AAKA;AAEA;;AAEE;AACF;;;AAIA;;;;AAKA;;;;;;;AAUE;;;;;AAMA;;AAEA;;;;AAMA;AACF;AAEA;AAEA;AAEA;AACE;AACA;;AAEA;AACA;AACD;AAED;;;AAGA;AACF;AAEA;;AAQU;AAYZ;;"}

package/lib/components/Dropdown/DropdownTrigger.js

@@ -61,6 +61,9 @@ const DropdownTrigger = ({ children, className, tooltip }) => {
         observer.observe(triggerElement, {
             childList: true,
             subtree: true,
+            // button要素の disabled / aria-disabled が動的に変化した場合も検知してリスナーを貼り直す
+            attributes: true,
+            attributeFilter: ['disabled', 'aria-disabled'],
         });
         return () => {
             currentCleanup?.();

package/lib/components/Dropdown/DropdownTrigger.js.map

@@ -1 +1 @@
-{"version":3,"file":"DropdownTrigger.js","sources":["../../../src/components/Dropdown/DropdownTrigger.tsx"],"sourcesContent":["'use client'\n\nimport {\n  type ComponentProps,\n  type FC,\n  type PropsWithChildren,\n  type ReactNode,\n  useContext,\n  useEffect,\n  useMemo,\n} from 'react'\nimport { tv } from 'tailwind-variants'\n\nimport { tabbable } from '../../libs/tabbable'\nimport { Tooltip } from '../Tooltip'\n\nimport { DropdownContext } from './Dropdown'\n\ntype ConditionalWrapperProps = {\n  shouldWrapContent?: boolean\n  wrapper: FC<PropsWithChildren>\n}\n\nconst CAPTURE_OPTION = {\n  capture: true,\n}\n\n/**\n * 条件付きでラッパをレンダリングする\n */\nconst ConditionalWrapper: FC<PropsWithChildren<ConditionalWrapperProps>> = ({\n  shouldWrapContent,\n  wrapper,\n  children,\n}) => (shouldWrapContent ? wrapper({ children }) : children)\n\ntype Props = PropsWithChildren<ComponentProps<'div'>> & {\n  tooltip?: { message: ReactNode; show?: boolean }\n}\n\nconst classNameGenerator = tv({\n  base: 'smarthr-ui-Dropdown shr-inline-block',\n})\n\nexport const DropdownTrigger: FC<Props> = ({ children, className, tooltip }) => {\n  const { active, memoizedOnClickTrigger, contentId, triggerElementRef } =\n    useContext(DropdownContext)\n  const actualClassName = useMemo(() => classNameGenerator({ className }), [className])\n\n  useEffect(() => {\n    if (!triggerElementRef.current) {\n      return\n    }\n\n    // apply ARIA to all focusable elements in trigger\n    const triggers = tabbable(triggerElementRef.current, { shouldIgnoreVisibility: true })\n\n    triggers.forEach((trigger) => {\n      trigger.setAttribute('aria-expanded', active.toString())\n      trigger.setAttribute('aria-controls', contentId)\n    })\n  }, [active, triggerElementRef, contentId])\n\n  useEffect(() => {\n    const triggerElement = triggerElementRef.current\n    if (!triggerElement) {\n      return\n    }\n\n    let currentCleanup: (() => void) | undefined\n\n    const setupButton = () => {\n      // 既存のクリーンアップを実行\n      currentCleanup?.()\n      currentCleanup = undefined\n\n      const button = triggerElement.querySelector<HTMLButtonElement>('button')\n\n      // 引き金となる要素が disabled な場合、処理を差し込む必要がないため、そのまま出力する\n      if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') {\n        return\n      }\n\n      // HINT: Trigger要素自体にonClickが設定されている場合、先にDropdownを開いた状態で処理を行いたい\n      // そのためcaptureで開く処理を実行する\n      const callback = (e: MouseEvent) => {\n        memoizedOnClickTrigger((e.currentTarget! as HTMLButtonElement).getBoundingClientRect())\n      }\n\n      button.addEventListener('click', callback, CAPTURE_OPTION)\n\n      currentCleanup = () => {\n        button.removeEventListener('click', callback, CAPTURE_OPTION)\n      }\n    }\n\n    setupButton()\n\n    const observer = new MutationObserver(setupButton)\n\n    observer.observe(triggerElement, {\n      childList: true,\n      subtree: true,\n    })\n\n    return () => {\n      currentCleanup?.()\n      observer.disconnect()\n    }\n  }, [memoizedOnClickTrigger, triggerElementRef])\n\n  return (\n    <div ref={triggerElementRef} className={actualClassName}>\n      {/* eslint-disable-next-line smarthr/a11y-scroller-has-tabindex */}\n      <ConditionalWrapper\n        shouldWrapContent={tooltip?.show}\n        wrapper={({ children: currentChildren }) =>\n          tooltip?.message ? (\n            // eslint-disable-next-line smarthr/a11y-scroller-has-tabindex\n            <Tooltip message={tooltip?.message} triggerType=\"icon\" tabIndex={-1}>\n              {currentChildren}\n            </Tooltip>\n          ) : (\n            currentChildren\n          )\n        }\n      >\n        {children}\n      </ConditionalWrapper>\n    </div>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;;AAuBA;AACE;;AAGF;;AAEG;AACH;AAUA;AACE;AACD;AAEM;AACL;AAEA;;AAGE;;;;AAKA;AAEA;;AAEE;AACF;;;AAIA;;;;AAKA;;;;;;;AAUE;;;;;AAMA;;AAEA;;;;AAMA;AACF;AAEA;AAEA;AAEA;AACE;AACA;AACD;AAED;;;AAGA;AACF;AAEA;;AAQU;AAYZ;;"}
+{"version":3,"file":"DropdownTrigger.js","sources":["../../../src/components/Dropdown/DropdownTrigger.tsx"],"sourcesContent":["'use client'\n\nimport {\n  type ComponentProps,\n  type FC,\n  type PropsWithChildren,\n  type ReactNode,\n  useContext,\n  useEffect,\n  useMemo,\n} from 'react'\nimport { tv } from 'tailwind-variants'\n\nimport { tabbable } from '../../libs/tabbable'\nimport { Tooltip } from '../Tooltip'\n\nimport { DropdownContext } from './Dropdown'\n\ntype ConditionalWrapperProps = {\n  shouldWrapContent?: boolean\n  wrapper: FC<PropsWithChildren>\n}\n\nconst CAPTURE_OPTION = {\n  capture: true,\n}\n\n/**\n * 条件付きでラッパをレンダリングする\n */\nconst ConditionalWrapper: FC<PropsWithChildren<ConditionalWrapperProps>> = ({\n  shouldWrapContent,\n  wrapper,\n  children,\n}) => (shouldWrapContent ? wrapper({ children }) : children)\n\ntype Props = PropsWithChildren<ComponentProps<'div'>> & {\n  tooltip?: { message: ReactNode; show?: boolean }\n}\n\nconst classNameGenerator = tv({\n  base: 'smarthr-ui-Dropdown shr-inline-block',\n})\n\nexport const DropdownTrigger: FC<Props> = ({ children, className, tooltip }) => {\n  const { active, memoizedOnClickTrigger, contentId, triggerElementRef } =\n    useContext(DropdownContext)\n  const actualClassName = useMemo(() => classNameGenerator({ className }), [className])\n\n  useEffect(() => {\n    if (!triggerElementRef.current) {\n      return\n    }\n\n    // apply ARIA to all focusable elements in trigger\n    const triggers = tabbable(triggerElementRef.current, { shouldIgnoreVisibility: true })\n\n    triggers.forEach((trigger) => {\n      trigger.setAttribute('aria-expanded', active.toString())\n      trigger.setAttribute('aria-controls', contentId)\n    })\n  }, [active, triggerElementRef, contentId])\n\n  useEffect(() => {\n    const triggerElement = triggerElementRef.current\n    if (!triggerElement) {\n      return\n    }\n\n    let currentCleanup: (() => void) | undefined\n\n    const setupButton = () => {\n      // 既存のクリーンアップを実行\n      currentCleanup?.()\n      currentCleanup = undefined\n\n      const button = triggerElement.querySelector<HTMLButtonElement>('button')\n\n      // 引き金となる要素が disabled な場合、処理を差し込む必要がないため、そのまま出力する\n      if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') {\n        return\n      }\n\n      // HINT: Trigger要素自体にonClickが設定されている場合、先にDropdownを開いた状態で処理を行いたい\n      // そのためcaptureで開く処理を実行する\n      const callback = (e: MouseEvent) => {\n        memoizedOnClickTrigger((e.currentTarget! as HTMLButtonElement).getBoundingClientRect())\n      }\n\n      button.addEventListener('click', callback, CAPTURE_OPTION)\n\n      currentCleanup = () => {\n        button.removeEventListener('click', callback, CAPTURE_OPTION)\n      }\n    }\n\n    setupButton()\n\n    const observer = new MutationObserver(setupButton)\n\n    observer.observe(triggerElement, {\n      childList: true,\n      subtree: true,\n      // button要素の disabled / aria-disabled が動的に変化した場合も検知してリスナーを貼り直す\n      attributes: true,\n      attributeFilter: ['disabled', 'aria-disabled'],\n    })\n\n    return () => {\n      currentCleanup?.()\n      observer.disconnect()\n    }\n  }, [memoizedOnClickTrigger, triggerElementRef])\n\n  return (\n    <div ref={triggerElementRef} className={actualClassName}>\n      {/* eslint-disable-next-line smarthr/a11y-scroller-has-tabindex */}\n      <ConditionalWrapper\n        shouldWrapContent={tooltip?.show}\n        wrapper={({ children: currentChildren }) =>\n          tooltip?.message ? (\n            // eslint-disable-next-line smarthr/a11y-scroller-has-tabindex\n            <Tooltip message={tooltip?.message} triggerType=\"icon\" tabIndex={-1}>\n              {currentChildren}\n            </Tooltip>\n          ) : (\n            currentChildren\n          )\n        }\n      >\n        {children}\n      </ConditionalWrapper>\n    </div>\n  )\n}\n"],"names":[],"mappings":";;;;;;;;;AAuBA;AACE;;AAGF;;AAEG;AACH;AAUA;AACE;AACD;AAEM;AACL;AAEA;;AAGE;;;;AAKA;AAEA;;AAEE;AACF;;;AAIA;;;;AAKA;;;;;;;AAUE;;;;;AAMA;;AAEA;;;;AAMA;AACF;AAEA;AAEA;AAEA;AACE;AACA;;AAEA;AACA;AACD;AAED;;;AAGA;AACF;AAEA;;AAQU;AAYZ;;"}