feat(react-components): hide buttons without text

RBND-studio · Nov 27, 2024 · 1c7022b · 1c7022b
1 parent 11370c5
commit 1c7022b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/workspaces/react-components/src/components/modal.tsx b/workspaces/react-components/src/components/modal.tsx
@@ -5,7 +5,7 @@ import { BaseModal } from "../internal-components/modal";
 export interface ModalProps {
   title: string;
   body: string;
-  continueText: string;
+  continueText?: string;
   showCloseButton: boolean;
   hideOverlay: boolean;
 
@@ -19,9 +19,11 @@ export const Modal: FC<ModalProps> = (props) => {
       title={props.title}
       body={props.body}
       buttons={
-        <Button variant="primary" onClick={props.continue}>
-          {props.continueText}
-        </Button>
+        props.continueText ? (
+          <Button variant="primary" onClick={props.continue}>
+            {props.continueText}
+          </Button>
+        ) : null
       }
       overlay={!props.hideOverlay}
       onClose={props.showCloseButton ? props.close : undefined}

diff --git a/workspaces/react-components/src/components/tooltip.tsx b/workspaces/react-components/src/components/tooltip.tsx
@@ -5,7 +5,7 @@ import { Button } from "../internal-components/button";
 export interface TooltipProps {
   title: string;
   body: string;
-  continueText: string;
+  continueText?: string;
   targetElement: string;
   showCloseButton: boolean;
 
@@ -21,9 +21,11 @@ export const Tooltip: FC<TooltipProps> = (props) => {
       targetElement={props.targetElement}
       onClose={props.showCloseButton ? props.close : undefined}
       buttons={
-        <Button variant="primary" onClick={props.continue}>
-          {props.continueText}
-        </Button>
+        props.continueText ? (
+          <Button variant="primary" onClick={props.continue}>
+            {props.continueText}
+          </Button>
+        ) : null
       }
     />
   );

diff --git a/workspaces/react-components/src/tour-components/modal.tsx b/workspaces/react-components/src/tour-components/modal.tsx
@@ -6,8 +6,8 @@ import { Button } from "../internal-components/button";
 export type ModalProps = TourComponentProps<{
   title: string;
   body: string;
-  continueText: string;
-  previousText: string;
+  continueText?: string;
+  previousText?: string;
   showCloseButton: boolean;
   hideOverlay: boolean;
 }>;
@@ -20,14 +20,16 @@ export const Modal: FC<ModalProps> = (props) => {
       overlay={!props.hideOverlay}
       buttons={
         <>
-          {props.previous ? (
+          {props.previous && props.previousText ? (
             <Button variant="secondary" onClick={props.previous}>
               {props.previousText}
             </Button>
           ) : null}
-          <Button variant="primary" onClick={props.continue}>
-            {props.continueText}
-          </Button>
+          {props.continueText ? (
+            <Button variant="primary" onClick={props.continue}>
+              {props.continueText}
+            </Button>
+          ) : null}
         </>
       }
       onClose={props.showCloseButton ? props.cancel : undefined}

diff --git a/workspaces/react-components/src/tour-components/tooltip.tsx b/workspaces/react-components/src/tour-components/tooltip.tsx
@@ -6,8 +6,8 @@ import { Button } from "../internal-components/button";
 export type TooltipProps = TourComponentProps<{
   title: string;
   body: string;
-  continueText: string;
-  previousText: string;
+  continueText?: string;
+  previousText?: string;
   showCloseButton: boolean;
   targetElement: string;
 }>;
@@ -21,14 +21,16 @@ export const Tooltip: FC<TooltipProps> = (props) => {
       onClose={props.showCloseButton ? props.cancel : undefined}
       buttons={
         <>
-          {props.previous ? (
+          {props.previous && props.previousText ? (
             <Button variant="secondary" onClick={props.previous}>
               {props.previousText}
             </Button>
           ) : null}
-          <Button variant="primary" onClick={props.continue}>
-            {props.continueText}
-          </Button>
+          {props.continueText ? (
+            <Button variant="primary" onClick={props.continue}>
+              {props.continueText}
+            </Button>
+          ) : null}
         </>
       }
     />