smarthr-ui 64.0.1 → 65.0.1

package/esm/components/AppHeader/components/desktop/Navigation.js

@@ -1,10 +1,10 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import { tv } from 'tailwind-variants';
-import { AppNavi } from '../../../AppNavi';
+import { AppNavi, AppNaviAnchor, AppNaviButton, AppNaviCustomTag, AppNaviDropdownMenuButton, } from '../../../AppNavi';
+import { AnchorButton, Button } from '../../../Button';
+import { DropdownMenuGroup } from '../../../Dropdown';
 import { Cluster } from '../../../Layout';
-import { Text } from '../../../Text';
-import { isChildNavigation, isChildNavigationGroup } from '../../utils';
-import { CommonButton, commonButton } from '../common/CommonButton';
+import { commonButton } from '../common/CommonButton';
 import { ReleaseNotesDropdown } from './ReleaseNotesDropdown';
 const appNavi = tv({
     base: ['shr-overflow-x-auto shr-min-w-[auto]', 'max-[751px]:!shr-hidden'],
@@ -14,64 +14,36 @@ const appNavi = tv({
         },
     },
 });
-export const Navigation = ({ appName, navigations, additionalContent, releaseNote, enableNew, }) => {
-    const buttons = buildButtonsFromNavigations(navigations);
-    return (React.createElement(AppNavi, { label: enableNew ? undefined : appName, buttons: buttons, className: appNavi({ withReleaseNote: !!releaseNote }), displayDropdownCaret: true, additionalArea: React.createElement(Cluster, { align: "center", className: "shr-flex-nowrap shr-ps-1" },
-            additionalContent,
-            releaseNote && React.createElement(ReleaseNotesDropdown, { ...releaseNote })) }));
-};
-const navigationTitle = tv({
-    base: ['shr-px-1 shr-pt-0.5 shr-pb-0.25'],
-});
-const separator = tv({
-    base: ['[&&]:shr-mx-0 [&&]:shr-my-0.5 [&&]:shr-border-b-shorthand'],
-});
-// TODO smarthr-ui 側でグループ化された Navigation が対応されたら AppNaviDropdownMenuButton を使った実装に変更する
-const buildButtonsFromNavigations = (navigations) => navigations.map((navigation) => {
-    if (isChildNavigation(navigation)) {
-        // smarthr-ui の buttons props ではカスタムエレメントは elementAs ではなく tag という名前なので変換する必要がある
-        if ('elementAs' in navigation) {
-            const { elementAs, ...rest } = navigation;
-            return {
-                ...rest,
-                tag: elementAs,
-            };
-        }
-        return navigation;
+export const Navigation = ({ appName, navigations, additionalContent, releaseNote, enableNew, }) => (React.createElement(AppNavi, { label: enableNew ? undefined : appName, className: appNavi({ withReleaseNote: !!releaseNote }), displayDropdownCaret: true, additionalArea: React.createElement(Cluster, { align: "center", className: "shr-flex-nowrap shr-ps-1" },
+        additionalContent,
+        releaseNote && React.createElement(ReleaseNotesDropdown, { ...releaseNote })) }, buildNavigations(navigations)));
+const buildNavigations = (navigations) => (React.createElement(React.Fragment, null, navigations.map((navigation) => {
+    if ('elementAs' in navigation) {
+        return (React.createElement(AppNaviCustomTag, { ...navigation, key: navigation.children.toString(), tag: navigation.elementAs }));
     }
-    // 子要素に current を持っているものがあるかどうか
-    const childrenHasCurrent = navigation.childNavigations.some((child) => {
-        if (isChildNavigation(child))
-            return child.current;
-        return child.childNavigations.some((c) => c.current);
-    });
-    return {
-        ...navigation,
-        current: navigation.current || childrenHasCurrent,
-        dropdownContent: (React.createElement("div", { className: "shr-py-0.5" }, navigation.childNavigations.map((childNavigation, i) => {
-            if (isChildNavigationGroup(childNavigation)) {
-                const { childNavigations } = childNavigation;
-                return (React.createElement(Fragment, { key: childNavigation.title.toString() },
-                    React.createElement("div", { className: "shr-px-0.5" },
-                        React.createElement(Text, { styleType: "subSubBlockTitle", as: "p", className: navigationTitle() }, childNavigation.title),
-                        childNavigations.map((child) => (React.createElement(Fragment, { key: child.children.toString() }, buildDropdownItemFromNavigation(child))))),
-                    i + 1 !== navigation.childNavigations.length && React.createElement("hr", { className: separator() })));
-            }
-            const nextChildNavigation = navigation.childNavigations[i + 1];
-            return (React.createElement(Fragment, { key: childNavigation.children.toString() },
-                React.createElement("div", { className: "shr-px-0.5" }, buildDropdownItemFromNavigation(childNavigation)),
-                isChildNavigationGroup(nextChildNavigation) && React.createElement("hr", { className: separator() })));
-        }))),
-    };
-});
-const buildDropdownItemFromNavigation = (navigation) => {
+    if ('href' in navigation) {
+        return React.createElement(AppNaviAnchor, { ...navigation, key: navigation.children.toString() });
+    }
+    if ('childNavigations' in navigation) {
+        return (React.createElement(AppNaviDropdownMenuButton, { label: navigation.children, key: navigation.children.toString() }, buildDropdownMenu(navigation.childNavigations)));
+    }
+    return React.createElement(AppNaviButton, { ...navigation, key: navigation.children.toString() });
+})));
+const buildDropdownMenu = (navigations) => (React.createElement(React.Fragment, null, navigations.map((navigation) => {
     if ('elementAs' in navigation) {
-        const { elementAs: Tag, current: isCurrent, ...rest } = navigation;
-        return (React.createElement(Tag, { ...rest, className: commonButton({ current: isCurrent, className: rest.className }) }));
+        const Component = navigation.elementAs;
+        // TODO: DropdownMenuItemを作成し、elementAsを渡せるようにする
+        return (React.createElement(Component, { ...navigation, key: navigation.children, "aria-current": navigation.current, className: commonButton({
+                current: navigation.current,
+                className: navigation.className,
+            }) }));
     }
     if ('href' in navigation) {
-        return React.createElement(CommonButton, { ...navigation, elementAs: "a", current: navigation.current });
+        return (React.createElement(AnchorButton, { ...navigation, "aria-current": navigation.current && 'page', key: navigation.children.toString() }));
+    }
+    if ('title' in navigation) {
+        return (React.createElement(DropdownMenuGroup, { name: navigation.title, key: navigation.title.toString() }, buildDropdownMenu(navigation.childNavigations)));
     }
-    return (React.createElement(CommonButton, { ...navigation, elementAs: "button", type: "button", current: navigation.current }));
-};
+    return (React.createElement(Button, { ...navigation, "aria-current": navigation.current && 'page', key: navigation.children.toString() }));
+})));
 //# sourceMappingURL=Navigation.js.map

package/esm/components/AppHeader/components/desktop/Navigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Navigation.js","sourceRoot":"","sources":["../../../../../src/components/AppHeader/components/desktop/Navigation.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Navigation.js","sourceRoot":"","sources":["../../../../../src/components/AppHeader/components/desktop/Navigation.tsx"],"names":[],"mappings":"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"}

package/esm/components/ComboBox/usePartialRendering.d.ts

@@ -4,5 +4,5 @@ export declare function usePartialRendering<T>({ items, minLength, }: {
     minLength?: number;
 }): {
     items: T[];
-    renderIntersection: () => React.JSX.Element | null;
+    renderIntersection: (() => null) | (() => React.JSX.Element);
 };

package/esm/components/ComboBox/usePartialRendering.js

@@ -1,27 +1,20 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 const OPTION_INCREMENT_AMOUNT = 100;
+const RETURN_NULL = () => null;
 export function usePartialRendering({ items, minLength = 0, }) {
-    const [currentItemLength, setCurrentItemLength] = useState(Math.max(OPTION_INCREMENT_AMOUNT, minLength));
-    // minLength も考慮した実際のアイテム数を算出
-    const actualLength = useMemo(() => Math.max(currentItemLength, minLength), [currentItemLength, minLength]);
-    const partialItems = useMemo(() => items.slice(0, actualLength), [actualLength, items]);
+    const limiter = useCallback((length) => Math.max(length, minLength), [minLength]);
+    const [currentItemLength, setCurrentItemLength] = useState(limiter(OPTION_INCREMENT_AMOUNT));
     useEffect(() => {
-        // currentItemLength を実際の値に補正
-        setCurrentItemLength(actualLength);
-    }, [actualLength]);
-    const isAllItemsShown = useMemo(() => actualLength >= items.length, [actualLength, items.length]);
-    const handleIntersect = useCallback(() => {
-        setCurrentItemLength((current) => current + OPTION_INCREMENT_AMOUNT);
-    }, []);
-    const renderIntersection = useCallback(() => {
-        if (isAllItemsShown) {
-            return null;
-        }
-        return React.createElement(Intersection, { onIntersect: handleIntersect });
-    }, [handleIntersect, isAllItemsShown]);
+        setCurrentItemLength((current) => limiter(current));
+    }, [limiter]);
+    // minLength も考慮した実際のアイテム数を算出
+    const partialItems = useMemo(() => items.slice(0, currentItemLength), [currentItemLength, items]);
+    const renderIntersection = useCallback(() => (React.createElement(Intersection, { onIntersect: () => {
+            setCurrentItemLength((current) => limiter(current + OPTION_INCREMENT_AMOUNT));
+        } })), [limiter]);
     return {
         items: partialItems,
-        renderIntersection,
+        renderIntersection: currentItemLength >= items.length ? RETURN_NULL : renderIntersection,
     };
 }
 const Intersection = ({ onIntersect }) => {

package/esm/components/ComboBox/usePartialRendering.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePartialRendering.js","sourceRoot":"","sources":["../../../src/components/ComboBox/usePartialRendering.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAM,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEpF,MAAM,uBAAuB,GAAG,GAAG,CAAA;AAEnC,MAAM,UAAU,mBAAmB,CAAI,EACrC,KAAK,EACL,SAAS,GAAG,CAAC,GAId;IACC,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CACxD,IAAI,CAAC,GAAG,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAC7C,CAAA;IACD,6BAA6B;IAC7B,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAC5C,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAC/B,CAAA;IACD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAA;IAEvF,SAAS,CAAC,GAAG,EAAE;QACb,6BAA6B;QAC7B,oBAAoB,CAAC,YAAY,CAAC,CAAA;IACpC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;IAElB,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,YAAY,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IAEjG,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QACvC,oBAAoB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,GAAG,uBAAuB,CAAC,CAAA;IACtE,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC1C,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,OAAO,oBAAC,YAAY,IAAC,WAAW,EAAE,eAAe,GAAI,CAAA;IACvD,CAAC,EAAE,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAA;IAEtC,OAAO;QACL,KAAK,EAAE,YAAY;QACnB,kBAAkB;KACnB,CAAA;AACH,CAAC;AAED,MAAM,YAAY,GAAoC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;IACxE,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAExC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAA;QAC1B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,OAAM;QACR,CAAC;QACD,yDAAyD;QACzD,MAAM,QAAQ,GAAG,IAAI,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE;YACpD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;gBACzB,WAAW,EAAE,CAAA;YACf,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACxB,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAA;IACpC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;IAEjB,OAAO,6BAAK,GAAG,EAAE,GAAG,GAAQ,CAAA;AAC9B,CAAC,CAAA"}
+{"version":3,"file":"usePartialRendering.js","sourceRoot":"","sources":["../../../src/components/ComboBox/usePartialRendering.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAM,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEpF,MAAM,uBAAuB,GAAG,GAAG,CAAA;AACnC,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;AAE9B,MAAM,UAAU,mBAAmB,CAAI,EACrC,KAAK,EACL,SAAS,GAAG,CAAC,GAId;IACC,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;IAEzF,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAA;IAE5F,SAAS,CAAC,GAAG,EAAE;QACb,oBAAoB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;IACrD,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;IAEb,6BAA6B;IAC7B,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAA;IAEjG,MAAM,kBAAkB,GAAG,WAAW,CACpC,GAAG,EAAE,CAAC,CACJ,oBAAC,YAAY,IACX,WAAW,EAAE,GAAG,EAAE;YAChB,oBAAoB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,GAAG,uBAAuB,CAAC,CAAC,CAAA;QAC/E,CAAC,GACD,CACH,EACD,CAAC,OAAO,CAAC,CACV,CAAA;IAED,OAAO;QACL,KAAK,EAAE,YAAY;QACnB,kBAAkB,EAAE,iBAAiB,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB;KACzF,CAAA;AACH,CAAC;AAED,MAAM,YAAY,GAAoC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;IACxE,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAExC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAA;QAE1B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,OAAM;QACR,CAAC;QAED,yDAAyD;QACzD,MAAM,QAAQ,GAAG,IAAI,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE;YACpD,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;gBACzB,WAAW,EAAE,CAAA;YACf,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAExB,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAA;IACpC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;IAEjB,OAAO,6BAAK,GAAG,EAAE,GAAG,GAAI,CAAA;AAC1B,CAAC,CAAA"}

package/esm/components/Dialog/FocusTrap.js

@@ -1,35 +1,36 @@
-import React, { useCallback, useEffect, useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { tabbable } from '../../libs/tabbable';
 export const FocusTrap = ({ firstFocusTarget, children }) => {
     const ref = useRef(null);
     const dummyFocusRef = useRef(null);
-    const handleKeyDown = useCallback((e) => {
-        if (e.key !== 'Tab' || ref.current === null) {
-            return;
-        }
-        const tabbables = tabbable(ref.current).filter((elm) => elm.tabIndex >= 0);
-        if (tabbables.length === 0) {
-            return;
-        }
-        const firstTabbable = tabbables[0];
-        const lastTabbable = tabbables[tabbables.length - 1];
-        const currentFocused = Array.from(tabbables).find((elm) => elm === e.target);
-        if (e.shiftKey &&
-            (currentFocused === firstTabbable || document.activeElement === dummyFocusRef.current)) {
-            lastTabbable.focus();
-            e.preventDefault();
-        }
-        else if (!e.shiftKey && currentFocused === lastTabbable) {
-            firstTabbable.focus();
-            e.preventDefault();
-        }
-    }, []);
     useEffect(() => {
+        const handleKeyDown = (e) => {
+            if (e.key !== 'Tab' || ref.current === null) {
+                return;
+            }
+            const tabbables = tabbable(ref.current).filter((elm) => elm.tabIndex >= 0);
+            if (tabbables.length === 0) {
+                return;
+            }
+            const firstTabbable = tabbables[0];
+            const lastTabbable = tabbables[tabbables.length - 1];
+            const currentFocused = tabbables.find((elm) => elm === e.target);
+            if (e.shiftKey) {
+                if (currentFocused === firstTabbable || document.activeElement === dummyFocusRef.current) {
+                    e.preventDefault();
+                    lastTabbable.focus();
+                }
+            }
+            else if (currentFocused === lastTabbable) {
+                e.preventDefault();
+                firstTabbable.focus();
+            }
+        };
         window.addEventListener('keydown', handleKeyDown);
         return () => {
             window.removeEventListener('keydown', handleKeyDown);
         };
-    }, [handleKeyDown]);
+    }, []);
     useEffect(() => {
         const triggerElement = document.activeElement;
         if (firstFocusTarget?.current) {

package/esm/components/Dialog/FocusTrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"FocusTrap.js","sourceRoot":"","sources":["../../../src/components/Dialog/FocusTrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAoC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAE/F,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAM9C,MAAM,CAAC,MAAM,SAAS,GAAc,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE;IACrE,MAAM,GAAG,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAA;IAC/C,MAAM,aAAa,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAElD,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAgB,EAAE,EAAE;QACrD,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC5C,OAAM;QACR,CAAC;QACD,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAA;QAC1E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAM;QACR,CAAC;QACD,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAClC,MAAM,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACpD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;QAC5E,IACE,CAAC,CAAC,QAAQ;YACV,CAAC,cAAc,KAAK,aAAa,IAAI,QAAQ,CAAC,aAAa,KAAK,aAAa,CAAC,OAAO,CAAC,EACtF,CAAC;YACD,YAAY,CAAC,KAAK,EAAE,CAAA;YACpB,CAAC,CAAC,cAAc,EAAE,CAAA;QACpB,CAAC;aAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,cAAc,KAAK,YAAY,EAAE,CAAC;YAC1D,aAAa,CAAC,KAAK,EAAE,CAAA;YACrB,CAAC,CAAC,cAAc,EAAE,CAAA;QACpB,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACjD,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACtD,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAA;QAC7C,IAAI,gBAAgB,EAAE,OAAO,EAAE,CAAC;YAC9B,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QAClC,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,CAAA;QAChC,CAAC;QAED,OAAO,GAAG,EAAE;YACV,4BAA4B;YAC5B,IAAI,cAAc,YAAY,WAAW,EAAE,CAAC;gBAC1C,cAAc,CAAC,KAAK,EAAE,CAAA;YACxB,CAAC;QACH,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAEtB,OAAO,CACL,6BAAK,GAAG,EAAE,GAAG;QAEX,6BAAK,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAI;QACxC,QAAQ,CACL,CACP,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"FocusTrap.js","sourceRoot":"","sources":["../../../src/components/Dialog/FocusTrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAoC,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAElF,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAM9C,MAAM,CAAC,MAAM,SAAS,GAAc,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE;IACrE,MAAM,GAAG,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAA;IAC/C,MAAM,aAAa,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAElD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,aAAa,GAAG,CAAC,CAAgB,EAAE,EAAE;YACzC,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC5C,OAAM;YACR,CAAC;YAED,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAA;YAE1E,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAM;YACR,CAAC;YAED,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;YAClC,MAAM,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YACpD,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAA;YAEhE,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACf,IAAI,cAAc,KAAK,aAAa,IAAI,QAAQ,CAAC,aAAa,KAAK,aAAa,CAAC,OAAO,EAAE,CAAC;oBACzF,CAAC,CAAC,cAAc,EAAE,CAAA;oBAClB,YAAY,CAAC,KAAK,EAAE,CAAA;gBACtB,CAAC;YACH,CAAC;iBAAM,IAAI,cAAc,KAAK,YAAY,EAAE,CAAC;gBAC3C,CAAC,CAAC,cAAc,EAAE,CAAA;gBAClB,aAAa,CAAC,KAAK,EAAE,CAAA;YACvB,CAAC;QACH,CAAC,CAAA;QAED,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QAEjD,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAA;QACtD,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAA;QAE7C,IAAI,gBAAgB,EAAE,OAAO,EAAE,CAAC;YAC9B,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;QAClC,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,CAAA;QAChC,CAAC;QAED,OAAO,GAAG,EAAE;YACV,4BAA4B;YAC5B,IAAI,cAAc,YAAY,WAAW,EAAE,CAAC;gBAC1C,cAAc,CAAC,KAAK,EAAE,CAAA;YACxB,CAAC;QACH,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAEtB,OAAO,CACL,6BAAK,GAAG,EAAE,GAAG;QAEX,6BAAK,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAI;QACxC,QAAQ,CACL,CACP,CAAA;AACH,CAAC,CAAA"}

package/esm/components/Dialog/FormDialog/FormDialog.js

@@ -3,20 +3,18 @@ import React, { useCallback, useId } from 'react';
 import { DialogContentInner } from '../DialogContentInner';
 import { useDialogPortal } from '../useDialogPortal';
 import { FormDialogContentInner } from './FormDialogContentInner';
-export const FormDialog = ({ children, title, subtitle, titleTag, contentBgColor, contentPadding, actionText, actionTheme, onSubmit, onClickClose, onPressEscape = onClickClose, responseMessage, actionDisabled = false, closeDisabled, subActionArea, className, portalParent, decorators, id, ...props }) => {
+export const FormDialog = ({ children, title, subtitle, titleTag, contentBgColor, contentPadding, actionText, actionTheme, onSubmit, onClickClose, onPressEscape = onClickClose, responseMessage, actionDisabled, closeDisabled, subActionArea, className, portalParent, decorators, id, ...props }) => {
     const { createPortal } = useDialogPortal(portalParent, id);
     const titleId = useId();
     const handleClickClose = useCallback(() => {
-        if (!props.isOpen) {
-            return;
+        if (props.isOpen) {
+            onClickClose();
         }
-        onClickClose();
     }, [onClickClose, props.isOpen]);
     const handleSubmitAction = useCallback((close, e) => {
-        if (!props.isOpen) {
-            return;
+        if (props.isOpen) {
+            onSubmit(close, e);
         }
-        onSubmit(close, e);
     }, [onSubmit, props.isOpen]);
     return createPortal(React.createElement(DialogContentInner, { ...props, ariaLabelledby: titleId, className: className, onPressEscape: onPressEscape },
         React.createElement(FormDialogContentInner, { title: title, titleId: titleId, subtitle: subtitle, titleTag: titleTag, contentBgColor: contentBgColor, contentPadding: contentPadding, actionText: actionText, actionTheme: actionTheme, actionDisabled: actionDisabled, closeDisabled: closeDisabled, subActionArea: subActionArea, onClickClose: handleClickClose, onSubmit: handleSubmitAction, responseMessage: responseMessage, decorators: decorators }, children)));

package/esm/components/Dialog/FormDialog/FormDialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormDialog.js","sourceRoot":"","sources":["../../../../src/components/Dialog/FormDialog/FormDialog.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,KAAK,EAAE,EAA6B,WAAW,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAE5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,OAAO,EAAE,sBAAsB,EAA+B,MAAM,0BAA0B,CAAA;AAK9F,MAAM,CAAC,MAAM,UAAU,GAAmC,CAAC,EACzD,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,cAAc,EACd,cAAc,EACd,UAAU,EACV,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,aAAa,GAAG,YAAY,EAC5B,eAAe,EACf,cAAc,GAAG,KAAK,EACtB,aAAa,EACb,aAAa,EACb,SAAS,EACT,YAAY,EACZ,UAAU,EACV,EAAE,EACF,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;IAC1D,MAAM,OAAO,GAAG,KAAK,EAAE,CAAA;IAEvB,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,OAAM;QACR,CAAC;QACD,YAAY,EAAE,CAAA;IAChB,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IAEhC,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,KAAiB,EAAE,CAA6B,EAAE,EAAE;QACnD,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,OAAM;QACR,CAAC;QAED,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IACpB,CAAC,EACD,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CACzB,CAAA;IAED,OAAO,YAAY,CACjB,oBAAC,kBAAkB,OACb,KAAK,EACT,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa;QAG5B,oBAAC,sBAAsB,IACrB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,UAAU,IAErB,QAAQ,CACc,CACN,CACtB,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"FormDialog.js","sourceRoot":"","sources":["../../../../src/components/Dialog/FormDialog/FormDialog.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,KAAK,EAAE,EAA6B,WAAW,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAE5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,OAAO,EAAE,sBAAsB,EAA+B,MAAM,0BAA0B,CAAA;AAK9F,MAAM,CAAC,MAAM,UAAU,GAAmC,CAAC,EACzD,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,cAAc,EACd,cAAc,EACd,UAAU,EACV,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,aAAa,GAAG,YAAY,EAC5B,eAAe,EACf,cAAc,EACd,aAAa,EACb,aAAa,EACb,SAAS,EACT,YAAY,EACZ,UAAU,EACV,EAAE,EACF,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;IAC1D,MAAM,OAAO,GAAG,KAAK,EAAE,CAAA;IAEvB,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,YAAY,EAAE,CAAA;QAChB,CAAC;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IAEhC,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,KAAiB,EAAE,CAA6B,EAAE,EAAE;QACnD,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QACpB,CAAC;IACH,CAAC,EACD,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CACzB,CAAA;IAED,OAAO,YAAY,CACjB,oBAAC,kBAAkB,OACb,KAAK,EACT,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa;QAG5B,oBAAC,sBAAsB,IACrB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,UAAU,IAErB,QAAQ,CACc,CACN,CACtB,CAAA;AACH,CAAC,CAAA"}

package/esm/components/Dialog/FormDialog/FormDialogContent.js

@@ -4,20 +4,18 @@ import { DialogContentInner } from '../DialogContentInner';
 import { DialogContext } from '../DialogWrapper';
 import { useDialogPortal } from '../useDialogPortal';
 import { FormDialogContentInner } from './FormDialogContentInner';
-export const FormDialogContent = ({ children, title, contentBgColor, contentPadding, actionText, actionTheme, onSubmit, actionDisabled = false, portalParent, className = '', decorators, ...props }) => {
+export const FormDialogContent = ({ children, title, contentBgColor, contentPadding, actionText, actionTheme, onSubmit, actionDisabled, portalParent, className = '', decorators, ...props }) => {
     const { onClickClose, active } = useContext(DialogContext);
     const { createPortal } = useDialogPortal(portalParent);
     const handleClickClose = useCallback(() => {
-        if (!active) {
-            return;
+        if (active) {
+            onClickClose();
         }
-        onClickClose();
     }, [active, onClickClose]);
     const handleSubmitAction = useCallback((close, e) => {
-        if (!active) {
-            return;
+        if (active) {
+            onSubmit(close, e);
         }
-        onSubmit(close, e);
     }, [active, onSubmit]);
     const titleId = useId();
     return createPortal(React.createElement(DialogContentInner, { ...props, onPressEscape: onClickClose, isOpen: active, ariaLabelledby: titleId, className: className },

package/esm/components/Dialog/FormDialog/FormDialogContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormDialogContent.js","sourceRoot":"","sources":["../../../../src/components/Dialog/FormDialog/FormDialogContent.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,KAAK,EAAE,EAA6B,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAExF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,OAAO,EAAa,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAK5E,MAAM,CAAC,MAAM,iBAAiB,GAAmC,CAAC,EAChE,QAAQ,EACR,KAAK,EACL,cAAc,EACd,cAAc,EACd,UAAU,EACV,WAAW,EACX,QAAQ,EACR,cAAc,GAAG,KAAK,EACtB,YAAY,EACZ,SAAS,GAAG,EAAE,EACd,UAAU,EACV,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,YAAY,CAAC,CAAA;IAEtD,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAM;QACR,CAAC;QACD,YAAY,EAAE,CAAA;IAChB,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;IAE1B,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,KAAiB,EAAE,CAA6B,EAAE,EAAE;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAM;QACR,CAAC;QAED,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IACpB,CAAC,EACD,CAAC,MAAM,EAAE,QAAQ,CAAC,CACnB,CAAA;IAED,MAAM,OAAO,GAAG,KAAK,EAAE,CAAA;IAEvB,OAAO,YAAY,CACjB,oBAAC,kBAAkB,OACb,KAAK,EACT,aAAa,EAAE,YAAY,EAC3B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,SAAS;QAGpB,oBAAC,sBAAsB,IACrB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,kBAAkB,EAC5B,YAAY,EAAE,gBAAgB,EAC9B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,UAAU,IAErB,QAAQ,CACc,CACN,CACtB,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"FormDialogContent.js","sourceRoot":"","sources":["../../../../src/components/Dialog/FormDialog/FormDialogContent.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,KAAK,EAAE,EAA6B,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAExF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,OAAO,EAAa,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAK5E,MAAM,CAAC,MAAM,iBAAiB,GAAmC,CAAC,EAChE,QAAQ,EACR,KAAK,EACL,cAAc,EACd,cAAc,EACd,UAAU,EACV,WAAW,EACX,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,SAAS,GAAG,EAAE,EACd,UAAU,EACV,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,YAAY,CAAC,CAAA;IAEtD,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,IAAI,MAAM,EAAE,CAAC;YACX,YAAY,EAAE,CAAA;QAChB,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;IAE1B,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,KAAiB,EAAE,CAA6B,EAAE,EAAE;QACnD,IAAI,MAAM,EAAE,CAAC;YACX,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QACpB,CAAC;IACH,CAAC,EACD,CAAC,MAAM,EAAE,QAAQ,CAAC,CACnB,CAAA;IAED,MAAM,OAAO,GAAG,KAAK,EAAE,CAAA;IAEvB,OAAO,YAAY,CACjB,oBAAC,kBAAkB,OACb,KAAK,EACT,aAAa,EAAE,YAAY,EAC3B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,SAAS;QAGpB,oBAAC,sBAAsB,IACrB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,kBAAkB,EAC5B,YAAY,EAAE,gBAAgB,EAC9B,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,UAAU,IAErB,QAAQ,CACc,CACN,CACtB,CAAA;AACH,CAAC,CAAA"}

package/esm/components/Dialog/FormDialog/FormDialogContentInner.js

@@ -1,4 +1,4 @@
-import React, { useCallback, } from 'react';
+import React, { useCallback, useMemo, } from 'react';
 import { tv } from 'tailwind-variants';
 import { Button } from '../../Button';
 import { Cluster, Stack } from '../../Layout';
@@ -8,13 +8,14 @@ import { DialogBody } from '../DialogBody';
 import { DialogHeader } from '../DialogHeader';
 import { dialogContentInner } from '../dialogInnerStyle';
 const CLOSE_BUTTON_LABEL = 'キャンセル';
+const ACTION_AREA_CLUSTER_GAP = { row: 0.5, column: 1 };
 const formDialogContentInner = tv({
     extend: dialogContentInner,
     slots: {
         form: 'shr-contents',
     },
 });
-export const FormDialogContentInner = ({ children, title, titleId, subtitle, titleTag, contentBgColor, contentPadding, actionText, actionTheme = 'primary', onSubmit, onClickClose, responseMessage, actionDisabled = false, closeDisabled, subActionArea, decorators, }) => {
+export const FormDialogContentInner = ({ children, title, titleId, subtitle, titleTag, contentBgColor, contentPadding, actionText, actionTheme, onSubmit, onClickClose, responseMessage, actionDisabled, closeDisabled, subActionArea, decorators, }) => {
     const handleSubmitAction = useCallback((e) => {
         e.preventDefault();
         // HINT: React Portals などで擬似的にformがネストしている場合など、stopPropagationを実行しないと
@@ -22,21 +23,57 @@ export const FormDialogContentInner = ({ children, title, titleId, subtitle, tit
         e.stopPropagation();
         onSubmit(onClickClose, e);
     }, [onSubmit, onClickClose]);
-    const isRequestProcessing = responseMessage && responseMessage.status === 'processing';
-    const { form, wrapper, actionArea, buttonArea, message } = formDialogContentInner();
+    const calculatedResponseStatus = useMemo(() => {
+        if (!responseMessage) {
+            return {
+                isProcessing: false,
+                visibleMessage: false,
+            };
+        }
+        if (responseMessage.status === 'processing') {
+            return {
+                isProcessing: true,
+                visibleMessage: false,
+            };
+        }
+        return {
+            isProcessing: false,
+            visibleMessage: true,
+            // HINT: statusがprocessingではない === success or errorであることが確定する
+            // success or error の場合、text属性も必ず存在する
+            status: responseMessage.status,
+            message: responseMessage.text,
+        };
+    }, [responseMessage]);
+    const styles = useMemo(() => {
+        const { form, wrapper, actionArea, buttonArea, message } = formDialogContentInner();
+        return {
+            form: form(),
+            wrapper: wrapper(),
+            actionArea: actionArea(),
+            buttonArea: buttonArea(),
+            message: message(),
+        };
+    }, []);
     return (
-    // eslint-disable-next-line smarthr/best-practice-for-layouts, smarthr/a11y-heading-in-sectioning-content
-    React.createElement(Stack, { gap: 0, as: Section, className: wrapper() },
+    // eslint-disable-next-line smarthr/a11y-prohibit-sectioning-content-in-form, smarthr/a11y-heading-in-sectioning-content
+    React.createElement(Section, { className: styles.wrapper },
         React.createElement(DialogHeader, { title: title, subtitle: subtitle, titleTag: titleTag, titleId: titleId }),
-        React.createElement("form", { onSubmit: handleSubmitAction, className: form() },
+        React.createElement("form", { onSubmit: handleSubmitAction, className: styles.form },
             React.createElement(DialogBody, { contentPadding: contentPadding, contentBgColor: contentBgColor }, children),
-            React.createElement(Stack, { gap: 0.5, className: actionArea() },
+            React.createElement(Stack, { gap: 0.5, className: styles.actionArea },
                 React.createElement(Cluster, { justify: "space-between" },
                     subActionArea,
-                    React.createElement(Cluster, { gap: { row: 0.5, column: 1 }, className: buttonArea() },
-                        React.createElement(Button, { onClick: onClickClose, disabled: closeDisabled || isRequestProcessing, className: "smarthr-ui-Dialog-closeButton" }, decorators?.closeButtonLabel?.(CLOSE_BUTTON_LABEL) || CLOSE_BUTTON_LABEL),
-                        React.createElement(Button, { type: "submit", variant: actionTheme, disabled: actionDisabled, loading: isRequestProcessing, className: "smarthr-ui-Dialog-actionButton" }, actionText))),
-                (responseMessage?.status === 'success' || responseMessage?.status === 'error') && (React.createElement("div", { className: message() },
-                    React.createElement(ResponseMessage, { type: responseMessage.status, role: "alert" }, responseMessage.text)))))));
+                    React.createElement(ActionAreaCluster, { onClickClose: onClickClose, closeDisabled: closeDisabled, actionDisabled: actionDisabled, loading: calculatedResponseStatus.isProcessing, actionTheme: actionTheme, decorators: decorators, actionText: actionText, className: styles.buttonArea })),
+                calculatedResponseStatus.visibleMessage && (React.createElement("div", { className: styles.message },
+                    React.createElement(ResponseMessage, { type: calculatedResponseStatus.status, role: "alert" }, calculatedResponseStatus.message)))))));
 };
+const ActionAreaCluster = React.memo(({ onClickClose, closeDisabled, actionDisabled, loading, actionTheme, decorators, actionText, className, }) => (React.createElement(Cluster, { gap: ACTION_AREA_CLUSTER_GAP, className: className },
+    React.createElement(CloseButton, { onClick: onClickClose, disabled: closeDisabled || loading, decorators: decorators }),
+    React.createElement(ActionButton, { variant: actionTheme, disabled: actionDisabled, loading: loading }, actionText))));
+const ActionButton = React.memo(({ variant = 'primary', disabled, loading, children }) => (React.createElement(Button, { type: "submit", variant: variant, disabled: disabled, loading: loading, className: "smarthr-ui-Dialog-actionButton" }, children)));
+const CloseButton = React.memo(({ onClick, disabled, decorators }) => {
+    const children = useMemo(() => decorators?.closeButtonLabel?.(CLOSE_BUTTON_LABEL) || CLOSE_BUTTON_LABEL, [decorators]);
+    return (React.createElement(Button, { onClick: onClick, disabled: disabled, className: "smarthr-ui-Dialog-closeButton" }, children));
+});
 //# sourceMappingURL=FormDialogContentInner.js.map

package/esm/components/Dialog/FormDialog/FormDialogContentInner.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormDialogContentInner.js","sourceRoot":"","sources":["../../../../src/components/Dialog/FormDialog/FormDialogContentInner.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"FormDialogContentInner.js","sourceRoot":"","sources":["../../../../src/components/Dialog/FormDialog/FormDialogContentInner.tsx"],"names":[],"mappings":"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"}

package/esm/components/Dialog/MessageDialog/MessageDialogContent.js

@@ -7,10 +7,9 @@ export const MessageDialogContent = ({ title, description, portalParent, classNa
     const { onClickClose, active } = useContext(DialogContext);
     const { createPortal } = useDialogPortal(portalParent);
     const handleClickClose = useCallback(() => {
-        if (!active) {
-            return;
+        if (active) {
+            onClickClose();
         }
-        onClickClose();
     }, [active, onClickClose]);
     const titleId = useId();
     return createPortal(React.createElement(DialogContentInner, { ...props, onPressEscape: onClickClose, isOpen: active, className: className, ariaLabelledby: titleId },

package/esm/components/Dialog/MessageDialog/MessageDialogContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"MessageDialogContent.js","sourceRoot":"","sources":["../../../../src/components/Dialog/MessageDialog/MessageDialogContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAkB,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAE7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,OAAO,EAAa,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAKlF,MAAM,CAAC,MAAM,oBAAoB,GAAmC,CAAC,EACnE,KAAK,EACL,WAAW,EACX,YAAY,EACZ,SAAS,EACT,cAAc,EACd,cAAc,EACd,UAAU,EACV,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,YAAY,CAAC,CAAA;IAEtD,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAM;QACR,CAAC;QACD,YAAY,EAAE,CAAA;IAChB,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;IAC1B,MAAM,OAAO,GAAG,KAAK,EAAE,CAAA;IAEvB,OAAO,YAAY,CACjB,oBAAC,kBAAkB,OACb,KAAK,EACT,aAAa,EAAE,YAAY,EAC3B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO;QAEvB,oBAAC,yBAAyB,IACxB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,UAAU,GACtB,CACiB,CACtB,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"MessageDialogContent.js","sourceRoot":"","sources":["../../../../src/components/Dialog/MessageDialog/MessageDialogContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAkB,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAE7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,OAAO,EAAa,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAKlF,MAAM,CAAC,MAAM,oBAAoB,GAAmC,CAAC,EACnE,KAAK,EACL,WAAW,EACX,YAAY,EACZ,SAAS,EACT,cAAc,EACd,cAAc,EACd,UAAU,EACV,GAAG,KAAK,EACT,EAAE,EAAE;IACH,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAA;IAC1D,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,YAAY,CAAC,CAAA;IAEtD,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,IAAI,MAAM,EAAE,CAAC;YACX,YAAY,EAAE,CAAA;QAChB,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;IAC1B,MAAM,OAAO,GAAG,KAAK,EAAE,CAAA;IAEvB,OAAO,YAAY,CACjB,oBAAC,kBAAkB,OACb,KAAK,EACT,aAAa,EAAE,YAAY,EAC3B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,OAAO;QAEvB,oBAAC,yBAAyB,IACxB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EAAE,UAAU,GACtB,CACiB,CACtB,CAAA;AACH,CAAC,CAAA"}

package/esm/components/Dialog/MessageDialog/MessageDialogContentInner.js

@@ -1,18 +1,29 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Button } from '../../Button';
-import { Cluster, Stack } from '../../Layout';
+import { Cluster } from '../../Layout';
+import { Section } from '../../SectioningContent';
 import { DialogBody } from '../DialogBody';
 import { DialogHeader } from '../DialogHeader';
 import { dialogContentInner } from '../dialogInnerStyle';
 const CLOSE_BUTTON_LABEL = '閉じる';
 export const MessageDialogContentInner = ({ title, subtitle, titleTag, titleId, contentBgColor, contentPadding, description, onClickClose, decorators, }) => {
-    const { wrapper, actionArea } = dialogContentInner();
+    const styles = useMemo(() => {
+        const { wrapper, actionArea } = dialogContentInner();
+        return {
+            wrapper: wrapper(),
+            actionArea: actionArea(),
+        };
+    }, []);
     return (
-    // eslint-disable-next-line smarthr/best-practice-for-layouts, smarthr/a11y-heading-in-sectioning-content
-    React.createElement(Stack, { gap: 0, as: "section", className: wrapper() },
+    // eslint-disable-next-line smarthr/a11y-heading-in-sectioning-content
+    React.createElement(Section, { className: styles.wrapper },
         React.createElement(DialogHeader, { title: title, subtitle: subtitle, titleTag: titleTag, titleId: titleId }),
         React.createElement(DialogBody, { contentPadding: contentPadding, contentBgColor: contentBgColor }, description),
-        React.createElement(Cluster, { as: "footer", justify: "flex-end", className: actionArea() },
-            React.createElement(Button, { onClick: onClickClose, className: "smarthr-ui-Dialog-closeButton" }, decorators?.closeButtonLabel?.(CLOSE_BUTTON_LABEL) || CLOSE_BUTTON_LABEL))));
+        React.createElement(FooterCluster, { onClickClose: onClickClose, decorators: decorators, className: styles.actionArea })));
 };
+const FooterCluster = React.memo(({ onClickClose, decorators, className }) => {
+    const children = useMemo(() => decorators?.closeButtonLabel?.(CLOSE_BUTTON_LABEL) || CLOSE_BUTTON_LABEL, [decorators]);
+    return (React.createElement(Cluster, { as: "footer", justify: "flex-end", className: className },
+        React.createElement(Button, { onClick: onClickClose, className: "smarthr-ui-Dialog-closeButton" }, children)));
+});
 //# sourceMappingURL=MessageDialogContentInner.js.map

package/esm/components/Dialog/MessageDialog/MessageDialogContentInner.js.map

@@ -1 +1 @@
-{"version":3,"file":"MessageDialogContentInner.js","sourceRoot":"","sources":["../../../../src/components/Dialog/MessageDialog/MessageDialogContentInner.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAA;AAEtC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,UAAU,EAA4B,MAAM,eAAe,CAAA;AACpE,OAAO,EAAE,YAAY,EAA8B,MAAM,iBAAiB,CAAA;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAgBxD,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEhC,MAAM,CAAC,MAAM,yBAAyB,GAAuC,CAAC,EAC5E,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,cAAc,EACd,cAAc,EACd,WAAW,EACX,YAAY,EACZ,UAAU,GACX,EAAE,EAAE;IACH,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAEpD,OAAO;IACL,yGAAyG;IACzG,oBAAC,KAAK,IAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAC,SAAS,EAAC,SAAS,EAAE,OAAO,EAAE;QAC9C,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,GAAI;QACxF,oBAAC,UAAU,IAAC,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,IACvE,WAAW,CACD;QACb,oBAAC,OAAO,IAAC,EAAE,EAAC,QAAQ,EAAC,OAAO,EAAC,UAAU,EAAC,SAAS,EAAE,UAAU,EAAE;YAC7D,oBAAC,MAAM,IAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC,+BAA+B,IACrE,UAAU,EAAE,gBAAgB,EAAE,CAAC,kBAAkB,CAAC,IAAI,kBAAkB,CAClE,CACD,CACJ,CACT,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"MessageDialogContentInner.js","sourceRoot":"","sources":["../../../../src/components/Dialog/MessageDialog/MessageDialogContentInner.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAW,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAA;AACjD,OAAO,EAAE,UAAU,EAA4B,MAAM,eAAe,CAAA;AACpE,OAAO,EAAE,YAAY,EAA8B,MAAM,iBAAiB,CAAA;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAgBxD,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEhC,MAAM,CAAC,MAAM,yBAAyB,GAAuC,CAAC,EAC5E,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,cAAc,EACd,cAAc,EACd,WAAW,EACX,YAAY,EACZ,UAAU,GACX,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;QAC1B,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,kBAAkB,EAAE,CAAA;QAEpD,OAAO;YACL,OAAO,EAAE,OAAO,EAAE;YAClB,UAAU,EAAE,UAAU,EAAE;SACzB,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO;IACL,sEAAsE;IACtE,oBAAC,OAAO,IAAC,SAAS,EAAE,MAAM,CAAC,OAAO;QAChC,oBAAC,YAAY,IAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,GAAI;QACxF,oBAAC,UAAU,IAAC,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,IACvE,WAAW,CACD;QACb,oBAAC,aAAa,IACZ,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,MAAM,CAAC,UAAU,GAC5B,CACM,CACX,CAAA;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAE9B,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE;IAC5C,MAAM,QAAQ,GAAG,OAAO,CACtB,GAAG,EAAE,CAAC,UAAU,EAAE,gBAAgB,EAAE,CAAC,kBAAkB,CAAC,IAAI,kBAAkB,EAC9E,CAAC,UAAU,CAAC,CACb,CAAA;IAED,OAAO,CACL,oBAAC,OAAO,IAAC,EAAE,EAAC,QAAQ,EAAC,OAAO,EAAC,UAAU,EAAC,SAAS,EAAE,SAAS;QAC1D,oBAAC,MAAM,IAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC,+BAA+B,IACrE,QAAQ,CACF,CACD,CACX,CAAA;AACH,CAAC,CAAC,CAAA"}