fix: Fix loading of stylesheet when it's already preloaded.

open-craft · Nov 14, 2023 · 9aa4fa6 · 9aa4fa6
1 parent cf10278
commit 9aa4fa6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "lodash.merge": "4.6.2",
     "lodash.snakecase": "4.1.1",
     "pubsub-js": "1.9.4",
-    "react-intl": "5.25.1",
+    "react-intl": "^5.25.1",
     "universal-cookie": "4.0.4"
   },
   "peerDependencies": {

diff --git a/src/react/AppProvider.jsx b/src/react/AppProvider.jsx
@@ -89,6 +89,8 @@ export default function AppProvider({ store, children }) {
     return null;
   }
 
+  console.log({locale});
+
   return (
     <IntlProvider locale={locale} messages={getMessages()}>
       <ErrorBoundary>

diff --git a/src/react/hooks/paragon/useParagonThemeCore.js b/src/react/hooks/paragon/useParagonThemeCore.js
@@ -34,11 +34,11 @@ const useParagonThemeCore = ({
       setIsBrandThemeCoreLoaded(true);
       return;
     }
-    const getParagonThemeCoreLink = () => document.head.querySelector('link[data-paragon-theme-core="true"');
-    const existingCoreThemeLink = document.head.querySelector(`link[href='${themeCore.urls.default}']`);
+    const getParagonThemeCoreLink = () => document.head.querySelector('link[data-paragon-theme-core="true"][rel=stylesheet]');
+    const existingCoreThemeLink = document.head.querySelector(`link[href='${themeCore.urls.default}'][rel=stylesheet]`);
     if (!existingCoreThemeLink) {
       const getExistingCoreThemeLinks = (isBrandOverride) => {
-        const coreThemeLinkSelector = `link[data-${isBrandOverride ? 'brand' : 'paragon'}-theme-core="true"]`;
+        const coreThemeLinkSelector = `link[data-${isBrandOverride ? 'brand' : 'paragon'}-theme-core="true"][rel=stylesheet]`;
         return document.head.querySelectorAll(coreThemeLinkSelector);
       };
       const createCoreThemeLink = (
@@ -131,3 +131,4 @@ const useParagonThemeCore = ({
 };
 
 export default useParagonThemeCore;
+
diff --git a/src/react/hooks/paragon/useParagonThemeVariants.js b/src/react/hooks/paragon/useParagonThemeVariants.js
@@ -77,12 +77,12 @@ const useParagonThemeVariants = ({
         setIsBrandThemeVariantLoaded(true);
         return;
       }
-      const getParagonThemeVariantLink = () => document.head.querySelector(`link[data-paragon-theme-variant='${themeVariant}']`);
-      const existingThemeVariantLink = document.head.querySelector(`link[href='${value.urls.default}']`);
-      const existingThemeVariantBrandLink = document.head.querySelector(`link[href='${value.urls.brandOverride}']`);
+      const getParagonThemeVariantLink = () => document.head.querySelector(`link[data-paragon-theme-variant='${themeVariant}'][rel=stylesheet]`);
+      const existingThemeVariantLink = document.head.querySelector(`link[href='${value.urls.default}'][rel=stylesheet]`);
+      const existingThemeVariantBrandLink = document.head.querySelector(`link[href='${value.urls.brandOverride}'][rel=stylesheet]`);
 
       const getExistingThemeVariantLinks = (isBrandOverride) => {
-        const themeVariantLinkSelector = `link[data-${isBrandOverride ? 'brand' : 'paragon'}-theme-variant='${themeVariant}']`;
+        const themeVariantLinkSelector = `link[data-${isBrandOverride ? 'brand' : 'paragon'}-theme-variant='${themeVariant}'][rel=stylesheet]`;
         return document.head.querySelectorAll(themeVariantLinkSelector);
       };