chore: ActionDialogの早期returnを調整する

kufu · Jan 23, 2025 · 703c0e3 · 703c0e3
1 parent c6f4417
commit 703c0e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/smarthr-ui/src/components/Dialog/ActionDialog/ActionDialog.tsx b/packages/smarthr-ui/src/components/Dialog/ActionDialog/ActionDialog.tsx
@@ -24,7 +24,7 @@ export const ActionDialog: React.FC<Props & ElementProps> = ({
   onClickClose,
   onPressEscape = onClickClose,
   responseMessage,
-  actionDisabled = false,
+  actionDisabled,
   closeDisabled,
   subActionArea,
   className,
@@ -37,17 +37,15 @@ export const ActionDialog: React.FC<Props & ElementProps> = ({
   const titleId = useId()
 
   const handleClickClose = useCallback(() => {
-    if (!props.isOpen) {
-      return
+    if (props.isOpen) {
+      onClickClose()
     }
-    onClickClose()
   }, [onClickClose, props.isOpen])
 
   const handleClickAction = useCallback(() => {
-    if (!props.isOpen) {
-      return
+    if (props.isOpen) {
+      onClickAction(onClickClose)
     }
-    onClickAction(onClickClose)
   }, [onClickAction, onClickClose, props.isOpen])
 
   return createPortal(

diff --git a/packages/smarthr-ui/src/components/Dialog/ActionDialog/ActionDialogContentInner.tsx b/packages/smarthr-ui/src/components/Dialog/ActionDialog/ActionDialogContentInner.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import React, { type FC, type PropsWithChildren, type ReactNode, useCallback } from 'react'
+import React, { type FC, type PropsWithChildren, type ReactNode, useCallback, useMemo } from 'react'
 
 import { Button } from '../../Button'
 import { Cluster, Stack } from '../../Layout'
@@ -133,7 +133,7 @@ export const ActionDialogContentInner: FC<ActionDialogContentInnerProps> = ({
 
 const ActionAreaCluster = React.memo<
   Pick<
-    FormDialogContentInnerProps,
+    ActionDialogContentInnerProps,
     | 'onClickClose'
     | 'onClickAction'
     | 'closeDisabled'