Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/react/hooks/paragon/useParagonThemeCore.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const useParagonThemeCore = ({

const paragonCoreThemeLink = createCoreThemeLink(themeCore.urls.default);
document.head.insertAdjacentElement(
'afterbegin',
'beforeend',
paragonCoreThemeLink,
);

Expand Down
27 changes: 22 additions & 5 deletions src/react/hooks/paragon/useParagonThemeVariants.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ const useParagonThemeVariants = ({
setIsBrandThemeVariantLoaded(true);
return;
}
const getParagonThemeCoreLink = () => document.head.querySelector('link[data-paragon-theme-core="true"]');
const getBrandThemeCoreLink = () => document.head.querySelector('link[data-brand-theme-core="true"]');
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}']`);
Expand Down Expand Up @@ -162,10 +164,25 @@ const useParagonThemeVariants = ({

if (!existingThemeVariantLink) {
const paragonThemeVariantLink = createThemeVariantLink(value.urls.default);
document.head.insertAdjacentElement(
'afterbegin',
paragonThemeVariantLink,
);
const foundParagonThemeCoreLink = getParagonThemeCoreLink();
const foundBrandThemeCoreLink = getBrandThemeCoreLink();

if (foundBrandThemeCoreLink) {
foundBrandThemeCoreLink.insertAdjacentElement(
'afterend',
paragonThemeVariantLink,
);
} else if (foundParagonThemeCoreLink) {
foundParagonThemeCoreLink.insertAdjacentElement(
'afterend',
paragonThemeVariantLink,
);
} else {
document.head.insertAdjacentElement(
'beforeend',
paragonThemeVariantLink,
);
}

if (value.urls.brandOverride) {
const brandThemeVariantLink = createThemeVariantLink(value.urls.brandOverride, { isBrandOverride: true });
Expand All @@ -177,7 +194,7 @@ const useParagonThemeVariants = ({
);
} else {
document.head.insertAdjacentElement(
'afterbegin',
'beforeend',
brandThemeVariantLink,
);
}
Expand Down