feat: add theme compatible part2

https://bigc-b2b.atlassian.net/browse/BUN-1409
bigcommerce · Sep 28, 2023 · 204d746 · 204d746
1 parent f5d0c03
commit 204d746
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/apps/storefront/src/main.css b/apps/storefront/src/main.css
@@ -11,7 +11,7 @@
   height: 100%;
   position: fixed;
   overscroll-behavior: contain;
-  z-index: 100000;
+  z-index: 9999999999;
   pointer-events: pointer;
 }
 

diff --git a/packages/global-b3/index.ts b/packages/global-b3/index.ts
@@ -26,13 +26,16 @@ const themeOtherElementConfig = () => {
   // Camden: '[href="/account.php"] svg, [href="/account.php"] svg use, [href="/account.php"] span, [href="/account.php"], [href="/login.php"] span, [href="/login.php"] svg use, [href="/login.php"] svg, [href="/login.php"]'
   // Vault: '.navUser-item--account a, .navUser-item--account a svg',
   // Fortune: '[href="/login.php?action=create_account"]',
+  // Pinnacle: Theme Pinnacle and NextGen are compatible with the theme LifeStyle;; Artisan、CoventGarden、 Artify and HaloOne: method compatible
   const themeElements: ThemeElementsProps = {
     Hera: '[href^="/account.php"] span, .account-item .account-action span svg, .account-item .account-action span svg use, [href^="/login.php?action=logout"], [href="/login.php"] .icon, .account-item .account-action span',
     RightRope:
       '[href="/account.php"] svg, [href="/account.php"] svg use, [href="/account.php"] span, [href="/account.php"], [href="/login.php"] span, [href="/login.php"] svg use, [href="/login.php"] svg, [href="/login.php"]',
     SuperMarket: '[href="/login.php"] span, [href="/account.php"] span',
     LifeStyle:
       '.navUser-item--account a, .navUser-item--account a svg, .navUser-section-sub .navUser-item .needsclick, .navUser-section-sub .navUser-item .needsclick svg, .navUser-section-sub .navUser-item .needsclick span, .navUser-section-sub .navUser-item a, .navUser-section-sub .navUser-item a svg, .navUser-section-sub .navUser-item a svg use, .navUser-section-sub .navUser-item a span',
+    Chiara:
+      '.navUser-item--more, #navUser-more-toggle, #navUser-more-toggle a, #navUser-more-toggle .navUser-item-icon, #navUser-more-toggle .navUser-item-icon svg, #navUser-more-toggle .navUser-item-icon svg use, #navUser-more-toggle .navUser-item-moreLabel',
   }
 
   if (window?.B3CustomConfig) {

diff --git a/packages/hooks/useB3AppOpen.ts b/packages/hooks/useB3AppOpen.ts
@@ -56,12 +56,19 @@ export const useB3AppOpen = (initOpenState: OpenPageState) => {
           let href = tagHref || '/orders'
           const timeTarget = Date.now()
           if (!tagHref || typeof timeTarget !== 'string') {
-            const parentNode = (e.target as HTMLAnchorElement)?.parentNode
-            const parentNodeOrigin = (e.target as HTMLAnchorElement)?.parentNode
-              ?.parentNode
-            const parentHref =
-              (parentNodeOrigin as HTMLAnchorElement)?.href ||
-              (parentNode as HTMLAnchorElement)?.href
+            let parentNode = (e.target as HTMLAnchorElement)?.parentNode
+            let parentHref = (parentNode as HTMLAnchorElement)?.href
+            let number = 0
+            while (number < 3 && !parentHref) {
+              parentNode = (parentNode as HTMLAnchorElement)?.parentNode
+              const newUrl = (parentNode as HTMLAnchorElement)?.href
+              if (newUrl && typeof newUrl === 'string') {
+                parentHref = newUrl
+                number += 3
+              } else {
+                number += 1
+              }
+            }
             if (parentHref) {
               href = parentHref || '/orders'
             } else {
@@ -76,6 +83,16 @@ export const useB3AppOpen = (initOpenState: OpenPageState) => {
               }
             }
           }
+          const B3Role = sessionStorage.getItem('sf-B3Role') || ''
+          const isLogin = B3Role === '' ? false : JSON.parse(B3Role) !== 100
+          const hrefArr = href.split('/#')
+          if (hrefArr[1] === '' && isLogin) {
+            return false
+          }
+
+          if (isLogin && href.includes('/login')) {
+            href = '/orders'
+          }
           if (initOpenState?.handleEnterClick) {
             initOpenState.handleEnterClick(
               href,