Merge pull request #1232 from chainapsis/rowan/KEPLR-503

[KEPLR-503] Add Reject bottom button on user interaction required page
chainapsis · Nov 11, 2024 · 411bc63 · 411bc63
2 parents fb14054 + 127f94d
commit 411bc63
Show file tree

Hide file tree

Showing 36 changed files with 1,146 additions and 578 deletions.
diff --git a/apps/extension/src/components/button/styles.ts b/apps/extension/src/components/button/styles.ts
@@ -304,8 +304,5 @@ export const Styles = {
     align-items: center;
 
     position: absolute;
-    svg {
-      fill: none;
-    }
   `,
 };
diff --git a/apps/extension/src/components/icon/check.tsx b/apps/extension/src/components/icon/check.tsx
@@ -20,6 +20,7 @@ export const CheckIcon: FunctionComponent<IconProps> = ({
         strokeWidth="2.5"
         strokeLinecap="round"
         strokeLinejoin="round"
+        fill="none"
       />
     </svg>
   );

diff --git a/apps/extension/src/components/special-button/styles.ts b/apps/extension/src/components/special-button/styles.ts
@@ -91,6 +91,9 @@ export const Styles = {
     display: flex;
     align-items: center;
     margin-right: 0.25rem;
+    svg {
+      fill: ${ColorPalette["transparent"]};
+    }
   `,
   Right: styled.span`
     height: 100%;

diff --git a/apps/extension/src/hooks/interaction.ts b/apps/extension/src/hooks/interaction.ts
@@ -1,30 +1,40 @@
 import { useEffect, useMemo, useRef } from "react";
 import { useSearchParams } from "react-router-dom";
 
-export const useInteractionInfo = (cleanUp?: () => void) => {
+export const useInteractionInfo = ({
+  onUnmount,
+  onWindowClose,
+}: {
+  onUnmount?: () => void;
+  onWindowClose?: () => void;
+}) => {
   const [searchParams] = useSearchParams();
 
-  const cleanUpRef = useRef<(() => void) | undefined>(cleanUp);
-  cleanUpRef.current = cleanUp;
+  const onUnmountRef = useRef<(() => void) | undefined>(onUnmount);
+  onUnmountRef.current = onUnmount;
+
+  const onWindowCloseRef = useRef<(() => void) | undefined>(onWindowClose);
+  onWindowCloseRef.current = onWindowClose;
 
   const result = {
     interaction: searchParams.get("interaction") === "true",
     interactionInternal: searchParams.get("interactionInternal") === "true",
   };
 
   useEffect(() => {
+    // Execute the clean-up function when unmounting.
     return () => {
-      if (cleanUpRef.current) {
-        cleanUpRef.current();
+      if (onUnmountRef.current) {
+        onUnmountRef.current();
       }
     };
   }, []);
 
   useEffect(() => {
     // Execute the clean-up function when closing window.
     const beforeunload = async () => {
-      if (cleanUpRef.current) {
-        cleanUpRef.current();
+      if (onWindowCloseRef.current) {
+        onWindowCloseRef.current();
       }
     };
 

diff --git a/apps/extension/src/layouts/header/header.tsx b/apps/extension/src/layouts/header/header.tsx
@@ -9,10 +9,15 @@ import { HeaderProps } from "./types";
 import { Subtitle1 } from "../../components/typography";
 import { ColorPalette } from "../../styles";
 import { Box } from "../../components/box";
-import { Button, getButtonHeightRem } from "../../components/button";
+import {
+  Button,
+  ButtonProps,
+  getButtonHeightRem,
+} from "../../components/button";
 import { Skeleton } from "../../components/skeleton";
 import {
   SpecialButton,
+  SpecialButtonProps,
   getSpecialButtonHeightRem,
 } from "../../components/special-button";
 
@@ -182,7 +187,7 @@ export const HeaderLayout: FunctionComponent<
   title,
   left,
   right,
-  bottomButton,
+  bottomButtons,
   displayFlex,
   fixedHeight,
   fixedMinHeight,
@@ -197,6 +202,9 @@ export const HeaderLayout: FunctionComponent<
   const [height, setHeight] = React.useState(() => pxToRem(600));
   const lastSetHeight = useRef(-1);
 
+  const hasBottomButton = bottomButtons && bottomButtons.length > 0;
+  const hasMultipleBottomButton = bottomButtons && bottomButtons.length > 1;
+
   useLayoutEffect(() => {
     function handleResize() {
       if (window.visualViewport) {
@@ -217,22 +225,37 @@ export const HeaderLayout: FunctionComponent<
   }, []);
 
   const bottomPadding = (() => {
-    if (!bottomButton) {
+    if (!hasBottomButton) {
       return "0";
     }
 
-    if (bottomButton.isSpecial) {
-      return (
-        bottomButtonPaddingRem * 2 +
-        getSpecialButtonHeightRem(bottomButton.size) +
-        "rem"
-      );
+    const buttonHeights = bottomButtons.map((button) => {
+      return button.isSpecial
+        ? getSpecialButtonHeightRem(button.size)
+        : getButtonHeightRem(button.size);
+    });
+
+    const maxButtonHeightRem = Math.max(...buttonHeights);
+
+    return `${bottomButtonPaddingRem * 2 + maxButtonHeightRem}rem`;
+  })();
+
+  const renderButton = (
+    button:
+      | ({ isSpecial?: false } & ButtonProps)
+      | ({ isSpecial: true } & SpecialButtonProps),
+    index: number
+  ) => {
+    if (button.isSpecial) {
+      return <SpecialButton key={index} {...button} />;
     }
 
     return (
-      bottomButtonPaddingRem * 2 + getButtonHeightRem(bottomButton.size) + "rem"
+      <Skeleton isNotReady={isNotReady} type="button" key={index}>
+        <Button {...button} />
+      </Skeleton>
     );
-  })();
+  };
 
   return (
     <Styles.Container as={onSubmit ? "form" : undefined} onSubmit={onSubmit}>
@@ -277,14 +300,19 @@ export const HeaderLayout: FunctionComponent<
         {children}
       </Styles.ContentContainer>
 
-      {bottomButton ? (
+      {hasBottomButton ? (
         <Box
           padding={bottomButtonPaddingRem + "rem"}
           position="fixed"
           style={{
             left: 0,
             right: 0,
             bottom: additionalPaddingBottom || "0",
+            display: hasMultipleBottomButton ? "grid" : undefined,
+            gridTemplateColumns: hasMultipleBottomButton
+              ? `${"auto ".repeat(bottomButtons.length - 1)}1fr` // 마지막 버튼이 남은 공간을 다 채우도록 함
+              : undefined,
+            gap: hasMultipleBottomButton ? "0.75rem" : undefined,
           }}
         >
           {/*
@@ -304,30 +332,7 @@ export const HeaderLayout: FunctionComponent<
               }}
             />
           ) : null}
-          {(() => {
-            if (bottomButton.isSpecial) {
-              // isSpecial is not used.
-              const { isSpecial, ...other } = bottomButton;
-              return <SpecialButton {...other} />;
-            } else {
-              // isSpecial is not used.
-              const { isSpecial, type, ...other } = bottomButton;
-
-              // onSubmit prop이 존재한다면 기본적으로 type="submit"으로 설정한다
-              // TODO: 만약에 bottomButton이 배열을 받을 수 있도록 수정된다면 이 부분도 수정되어야함.
-
-              const props = {
-                ...other,
-                type: type || onSubmit ? ("submit" as const) : undefined,
-              };
-
-              return (
-                <Skeleton isNotReady={isNotReady} type="button">
-                  <Button {...props} />
-                </Skeleton>
-              );
-            }
-          })()}
+          {bottomButtons.map(renderButton)}
         </Box>
       ) : null}
     </Styles.Container>

diff --git a/apps/extension/src/layouts/header/types.ts b/apps/extension/src/layouts/header/types.ts
@@ -7,10 +7,10 @@ export interface HeaderProps {
   left?: ReactNode;
   right?: ReactNode;
 
-  // TODO: 나중에 아래 버튼이 여러개 필요해지면 배열로 만들자...
-  bottomButton?:
+  bottomButtons?: (
     | ({ isSpecial?: false } & ButtonProps)
-    | ({ isSpecial: true } & SpecialButtonProps);
+    | ({ isSpecial: true } & SpecialButtonProps)
+  )[];
 
   displayFlex?: boolean;
   fixedHeight?: boolean;