From 5a5b2a18586056f9996ff2bc78d1c185239a971c Mon Sep 17 00:00:00 2001 From: Nayden Naydenov Date: Thu, 16 Nov 2023 16:41:14 +0200 Subject: [PATCH] fix(framework): font loading --- packages/base/src/ManagedStyles.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/base/src/ManagedStyles.ts b/packages/base/src/ManagedStyles.ts index 37312ea007d2..299470ba2a80 100644 --- a/packages/base/src/ManagedStyles.ts +++ b/packages/base/src/ManagedStyles.ts @@ -105,16 +105,18 @@ const updateStyle = (data: StyleData, name: string, value = "", theme?: string) } }; -const hasStyle = (name: string, value = "") => { +const hasStyle = (name: string, value = ""): boolean => { if (shouldUseLinks()) { return !!document.querySelector(`head>link[${name}="${value}"]`); } + const styleElement = document.querySelector(`head>style[${name}="${value}"]`); + if (document.adoptedStyleSheets && !isSafari()) { - return !!document.adoptedStyleSheets.find(sh => (sh as Record)._ui5StyleId === getStyleId(name, value)); + return !!styleElement || !!document.adoptedStyleSheets.find(sh => (sh as Record)._ui5StyleId === getStyleId(name, value)); } - return !!document.querySelector(`head>style[${name}="${value}"]`); + return !!styleElement; }; const removeStyle = (name: string, value = "") => {