fix: click target flag

bigcommerce · Sep 8, 2023 · 9e613c6 · 9e613c6
1 parent bf96bda
commit 9e613c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/apps/storefront/src/App.tsx b/apps/storefront/src/App.tsx
@@ -78,10 +78,14 @@ export default function App() {
     currentClickedUrl,
     isRegisterAndLogin,
   } = useSelector(globalStateSelector)
-  const [isClickBtn, setIsClickEnterBtn] = useState<boolean>(false)
-
-  const handleAccountClick = (href: string, isRegisterAndLogin: boolean) => {
-    setIsClickEnterBtn(!isClickBtn)
+  const [clickTimeTarget, setClickTimeTarget] = useState<number>(0)
+
+  const handleAccountClick = (
+    href: string,
+    isRegisterAndLogin: boolean,
+    timeTarget: number
+  ) => {
+    setClickTimeTarget(timeTarget)
     showPageMask(dispatch, true)
     storeDispatch(
       setGlabolCommonState({
@@ -276,7 +280,7 @@ export default function App() {
         })
       )
     }
-  }, [isPageComplete, currentClickedUrl, isClickBtn])
+  }, [isPageComplete, currentClickedUrl, clickTimeTarget])
 
   useEffect(() => {
     const handleHashChange = () => {

diff --git a/packages/hooks/useB3AppOpen.ts b/packages/hooks/useB3AppOpen.ts
@@ -16,7 +16,7 @@ export interface OpenPageState {
   isOpen: boolean
   openUrl?: string
   isPageComplete?: boolean
-  handleEnterClick?: (href: string, bool: boolean) => void
+  handleEnterClick?: (href: string, bool: boolean, timeTarget: number) => void
   params?: { [key: string]: string }
   // gotoPageByClick: ({
   //   href,
@@ -54,6 +54,7 @@ export const useB3AppOpen = (initOpenState: OpenPageState) => {
           const isRegisterArrInclude = registerArr.includes(e.target)
           const tagHref = (e.target as HTMLAnchorElement)?.href
           let href = tagHref || '/orders'
+          const timeTarget = Date.now()
           if (!tagHref) {
             const parentNode = (e.target as HTMLAnchorElement)?.parentNode
             const parentNodeOrigin = (e.target as HTMLAnchorElement)?.parentNode
@@ -76,7 +77,11 @@ export const useB3AppOpen = (initOpenState: OpenPageState) => {
             }
           }
           if (initOpenState?.handleEnterClick) {
-            initOpenState.handleEnterClick(href, isRegisterArrInclude)
+            initOpenState.handleEnterClick(
+              href,
+              isRegisterArrInclude,
+              timeTarget
+            )
           }
         }
         return false