no longer forcibly warpping an overriden close button with a button

EitanElbaz · Jun 28, 2023 · 346662f · 346662f
1 parent d9e798f
commit 346662f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/components/CloseButton.tsx b/src/components/CloseButton.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { CloseButtonProps } from '../types';
+import { Close } from '../components/Icons';
 
 const CloseButton: React.FC<CloseButtonProps> = ({ close, children }) => (
     <button
@@ -10,7 +11,7 @@ const CloseButton: React.FC<CloseButtonProps> = ({ close, children }) => (
         }}
         className="__react-grand-tour__close-button"
     >
-        {children}
+        <Close />
     </button>
 );
 

diff --git a/src/components/Modal.tsx b/src/components/Modal.tsx
@@ -30,7 +30,7 @@ const Modal = ({
     renderedContent: content,
     scrollToElement,
     arrow: Arrow,
-    closeButton: CloseButtonOverride,
+    closeButton: CloseButton,
     currentStepLabel: CurrentStepLabel,
     dialogWrapper: DialogWrapper,
     nextStepButton: NextStepButton,
@@ -95,14 +95,8 @@ const Modal = ({
         ),
         [allSteps, stepIndex, changeStep, StepButton, StepButtonWrapper],
     );
-    const closeButton = useMemo(
-        () => (
-            <CloseButton close={close}>
-                <CloseButtonOverride close={close} />
-            </CloseButton>
-        ),
-        [close, CloseButtonOverride],
-    );
+
+    const closeButton = useMemo(() => <CloseButton close={close} />, [close, CloseButton]);
 
     return (
         <FadeIn>