fixing api

ClickHouse · Nov 13, 2023 · 71c9b4b · 71c9b4b
1 parent a762faf
commit 71c9b4b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -435,7 +435,7 @@ const App = () => {
         <ConfirmationDialog
           title="Confirmation Dialog Example"
           message="This is a simple dialog that will be reused across the application"
-          onPrimaryActionClick={() => {
+          onConfirm={() => {
             console.log("close");
           }}
         >

diff --git a/src/components/ConfirmationDialog/ConfirmationDialog.stories.tsx b/src/components/ConfirmationDialog/ConfirmationDialog.stories.tsx
@@ -9,18 +9,18 @@ const ConfirmationDialogComponent = ({
   title,
   message,
   primaryActionLabel,
-  onPrimaryActionClick,
+  onConfirm,
   secondaryActionLabel,
-  onOpenChange,
+  onCancel,
 }: ConfirmationDialogProps) => (
   <GridCenter>
     <ConfirmationDialog
       open={open}
       title={title}
       message={message}
-      onOpenChange={onOpenChange}
+      onCancel={onCancel}
       primaryActionLabel={primaryActionLabel}
-      onPrimaryActionClick={onPrimaryActionClick}
+      onConfirm={onConfirm}
       secondaryActionLabel={secondaryActionLabel}
     >
     </ConfirmationDialog>

diff --git a/src/components/ConfirmationDialog/ConfirmationDialog.test.tsx b/src/components/ConfirmationDialog/ConfirmationDialog.test.tsx
@@ -10,10 +10,10 @@ describe("Dialog Component", () => {
     {
       title = "Dialog Title",
       message = "Are you sure you want to proceed?",
-      onPrimaryActionClick = () => {
+      onConfirm = () => {
         void undefined;
       },
-      onOpenChange,
+      onCancel,
       open,
       primaryActionLabel = "Confirm",
       secondaryActionLabel = "Cancel",
@@ -24,10 +24,10 @@ describe("Dialog Component", () => {
       <ConfirmationDialog
         title={title}
         message={message}
-        onPrimaryActionClick={onPrimaryActionClick}
+        onConfirm={onConfirm}
         primaryActionLabel={primaryActionLabel}
         secondaryActionLabel={secondaryActionLabel}
-        onOpenChange={onOpenChange}
+        onCancel={onCancel}
         open={open}
         children={children}
       />
@@ -70,7 +70,7 @@ describe("Dialog Component", () => {
       title,
       primaryActionLabel,
       open,
-      onOpenChange: (b: boolean) => open = b
+      onCancel: () => open = false
     });
 
     expect(queryAllByText(title).length).toEqual(1);
@@ -83,12 +83,12 @@ describe("Dialog Component", () => {
     let counter = 0;
     const title = "Dialog Title";
     const primaryActionLabel = "PrimaryAction";
-    const onPrimaryActionClick = () => counter++;
+    const onConfirm = () => counter++;
 
     const { getByText } = renderDialog({
       title,
       primaryActionLabel,
-      onPrimaryActionClick,
+      onConfirm,
       open: true,
     });
 
@@ -113,7 +113,7 @@ describe("Dialog Component", () => {
       title,
       secondaryActionLabel,
       open,
-      onOpenChange: (b: boolean) => open = b
+      onCancel: () => open = false
     });
 
     expect(queryAllByText(title).length).toEqual(1);

diff --git a/src/components/ConfirmationDialog/ConfirmationDialog.tsx b/src/components/ConfirmationDialog/ConfirmationDialog.tsx
@@ -6,15 +6,15 @@ type DialogPrimaryAction = "primary" | "danger";
 
 export interface ConfirmationDialogProps {
   open?: boolean;
-  onOpenChange?: (b: boolean) => void;
+  onCancel?: () => void;
   title: string;
   primaryActionType?: DialogPrimaryAction;
   primaryActionLabel?: string;
   secondaryActionLabel?: string;
   message?: string;
   children?: ReactNode;
   loading?: boolean;
-  onPrimaryActionClick?: (() => void) | (() => Promise<void>);
+  onConfirm?: (() => void) | (() => Promise<void>);
 }
 
 const ActionsWrapper = styled.div`
@@ -25,14 +25,14 @@ const ActionsWrapper = styled.div`
 
 export const ConfirmationDialog = ({
   open,
-  onOpenChange,
+  onCancel,
   title,
   message,
   loading,
   primaryActionType = "primary",
   primaryActionLabel = "Confirm",
   secondaryActionLabel = "Cancel",
-  onPrimaryActionClick,
+  onConfirm,
   children,
 }: ConfirmationDialogProps): ReactElement => {
   if (children && message) {
@@ -44,7 +44,9 @@ export const ConfirmationDialog = ({
   return (
     <Dialog
       open={open}
-      onOpenChange={onOpenChange}
+      onOpenChange={(open: boolean) => {
+        !open && onCancel && onCancel();
+      }}
     >
       <Dialog.Content title={title}>
         {children ? children : <Text>{message}</Text>}
@@ -57,11 +59,8 @@ export const ConfirmationDialog = ({
             type={primaryActionType}
             label={primaryActionLabel}
             onClick={() => {
-              if (onPrimaryActionClick) {
-                onPrimaryActionClick();
-              }
-              if (onOpenChange) {
-                onOpenChange(false);
+              if (onConfirm) {
+                onConfirm();
               }
             }}
           />