@ui5/webcomponents-base 0.0.0-e55c2cec6 → 0.0.0-e5b03d3e8

package/dist/sap/base/util/uid.js

@@ -0,0 +1,27 @@
+/**
+ * Some private variable used for creation of (pseudo-)unique IDs.
+ * @type int
+ * @private
+ */ /*!
+     * OpenUI5
+     * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+     * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+     */
+
+var iIdCounter = 0;
+
+/**
+ * Creates and returns a pseudo-unique ID.
+ *
+ * No means for detection of overlap with already present or future UIDs.
+ *
+ * @function
+ * @since 1.58
+ * @alias module:sap/base/util/uid
+ * @return {string} A pseudo-unique id.
+ * @public
+ */
+var fnUid = function uid() {
+  return "id-" + new Date().valueOf() + "-" + iIdCounter++;
+};
+export default fnUid;

package/dist/sap/ui/thirdparty/caja-html-sanitizer.js

@@ -489,7 +489,10 @@ var cssSchema = (function () {
       },
       'font-weight': {
         'cssPropBits': 0,
-        'cssLitGroup': [ L[ 4 ], L[ 47 ], L[ 55 ] ]
+        'cssLitGroup': [ L[ 4 ], L[ 47 ], L[ 55 ] ],
+        // ##### BEGIN: MODIFIED BY SAP
+        'cssLitNumeric': true
+        // ##### END: MODIFIED BY SAP
       },
       'height': {
         'cssPropBits': 37,
@@ -1217,101 +1220,113 @@ var sanitizeCssProperty = (function () {
       token = (
         // Strip out spaces.  Normally cssparser.js dumps these, but we
         // strip them out in case the content doesn't come via cssparser.js.
-        (cc === ' '.charCodeAt(0)) ? ''
-        : (cc === '"'.charCodeAt(0)) ? (  // Quoted string.
-          (qstringBits === CSS_PROP_BIT_QSTRING_URL && opt_naiveUriRewriter)
-          // Sanitize and convert to url("...") syntax.
-          // Treat url content as case-sensitive.
-          ? (normalizeUrl(safeUri(
-                decodeCss(tokens[i].substring(1, token.length - 1)),
-                property,
-                opt_naiveUriRewriter)))
-          // Drop if plain text content strings not allowed.
-          : (qstringBits === CSS_PROP_BIT_QSTRING_CONTENT) ? token : '')
-        // Preserve hash color literals if allowed.
-        : (cc === '#'.charCodeAt(0) && /^#(?:[0-9a-f]{3}){1,2}$/.test(token))
-        ? (propBits & CSS_PROP_BIT_HASH_VALUE ? token : '')
-        : ('0'.charCodeAt(0) <= cc && cc <= '9'.charCodeAt(0))
-        // A number starting with a digit.
-        ? ((propBits & CSS_PROP_BIT_QUANTITY)
-          ? ((propBits & CSS_PROP_BIT_Z_INDEX)
-            ? (token.match(/^\d{1,7}$/) ? token : '')
-            : token)
-          : '')
-        // Normalize quantities so they don't start with a '.' or '+' sign and
-        // make sure they all have an integer component so can't be confused
-        // with a dotted identifier.
-        // This can't be done in the lexer since ".4" is a valid rule part.
-        : (cc1 = token.charCodeAt(1),
-           cc2 = token.charCodeAt(2),
-           isnum1 = '0'.charCodeAt(0) <= cc1 && cc1 <= '9'.charCodeAt(0),
-           isnum2 = '0'.charCodeAt(0) <= cc2 && cc2 <= '9'.charCodeAt(0),
-           // +.5 -> 0.5 if allowed.
-           (cc === '+'.charCodeAt(0)
-            && (isnum1 || (cc1 === '.'.charCodeAt(0) && isnum2))))
-          ? ((propBits & CSS_PROP_BIT_QUANTITY)
-            ? ((propBits & CSS_PROP_BIT_Z_INDEX)
-              ? (token.match(/^\+\d{1,7}$/) ? token : '')
-              : ((isnum1 ? '' : '0') + token.substring(1)))
-            : '')
-        // -.5 -> -0.5 if allowed otherwise -> 0 if quantities allowed.
-        : (cc === '-'.charCodeAt(0)
-           && (isnum1 || (cc1 === '.'.charCodeAt(0) && isnum2)))
-          ? ((propBits & CSS_PROP_BIT_NEGATIVE_QUANTITY)
-             ? ((propBits & CSS_PROP_BIT_Z_INDEX)
-               ? (token.match(/^\-\d{1,7}$/) ? token : '')
-               : ((isnum1 ? '-' : '-0') + token.substring(1)))
-             : ((propBits & CSS_PROP_BIT_QUANTITY) ? '0' : ''))
-        // .5 -> 0.5 if allowed.
-        : (cc === '.'.charCodeAt(0) && isnum1)
-        ? ((propBits & CSS_PROP_BIT_QUANTITY) ? '0' + token : '')
-        // Handle url("...") by rewriting the body.
-        : ('url(' === token.substring(0, 4))
-        ? ((opt_naiveUriRewriter && (qstringBits & CSS_PROP_BIT_QSTRING_URL))
-           ? normalizeUrl(safeUri(
-                tokens[i].substring(5, token.length - 2),
-                property,
-                opt_naiveUriRewriter))
-           : '')
-        // Handle func(...) and literal tokens
-        // such as keywords and punctuation.
-        : (
-          // Step 1. Combine func(...) into something that can be compared
-          // against propertySchema.cssExtra.
-          (token.charAt(token.length-1) === '(')
-          && (end = normalizeFunctionCall(tokens, i),
-              // When tokens is
-              //   ['x', ' ', 'rgb(', '255', ',', '0', ',', '0', ')', ' ', 'y']
-              // and i is the index of 'rgb(' and end is the index of ')'
-              // splices tokens to where i now is the index of the whole call:
-              //   ['x', ' ', 'rgb( 255 , 0 , 0 )', ' ', 'y']
-              tokens.splice(i, end - i,
-                            token = tokens.slice(i, end).join(' '))),
-          litGroup = propertySchema.cssLitGroup,
-          litMap = (litGroup
-                    ? (propertySchema.cssLitMap
-                       // Lazily compute the union from litGroup.
-                       || (propertySchema.cssLitMap = unionArrays(litGroup)))
-                    : ALLOWED_LITERAL),  // A convenient empty object.
-          (litMap[token] === ALLOWED_LITERAL
-           || propertySchema.cssExtra && propertySchema.cssExtra.test(token)))
-          // Token is in the literal map or matches extra.
-          ? token
-          : (/^\w+$/.test(token)
-             && (qstringBits === CSS_PROP_BIT_QSTRING_CONTENT))
-          // Quote unrecognized keywords so font names like
-          //    Arial Bold
-          // ->
-          //    "Arial Bold"
-          ? (lastQuoted+1 === k
-             // If the last token was also a keyword that was quoted, then
-             // combine this token into that.
-             ? (tokens[lastQuoted] = tokens[lastQuoted]
-                .substring(0, tokens[lastQuoted].length-1) + ' ' + token + '"',
-                token = '')
-             : (lastQuoted = k, '"' + token + '"'))
-          // Disallowed.
-          : '');
+        (cc === ' '.charCodeAt(0))
+          ? ''
+          : (cc === '"'.charCodeAt(0))
+              ? (  // Quoted string.
+                  (qstringBits === CSS_PROP_BIT_QSTRING_URL && opt_naiveUriRewriter)
+                  // Sanitize and convert to url("...") syntax.
+                  // Treat url content as case-sensitive.
+                  ? (normalizeUrl(
+                       safeUri(
+                         decodeCss(tokens[i].substring(1, token.length - 1)),
+                         property,
+                         opt_naiveUriRewriter
+                       )
+                     ))
+                  // Drop if plain text content strings not allowed.
+                  : (qstringBits === CSS_PROP_BIT_QSTRING_CONTENT) ? token : '')
+              // Preserve hash color literals if allowed.
+              : (cc === '#'.charCodeAt(0) && /^#(?:[0-9a-f]{3}){1,2}$/.test(token))
+                  ? (propBits & CSS_PROP_BIT_HASH_VALUE ? token : '')
+                  // ##### BEGIN: MODIFIED BY SAP
+                  // : ('0'.charCodeAt(0) <= cc && cc <= '9'.charCodeAt(0))
+                  : ('0'.charCodeAt(0) <= cc && cc <= '9'.charCodeAt(0) && !propertySchema.cssLitNumeric)
+                  // ##### END: MODIFIED BY SAP
+                      // A number starting with a digit.
+                      ? ((propBits & CSS_PROP_BIT_QUANTITY)
+                           ? ((propBits & CSS_PROP_BIT_Z_INDEX)
+                                ? (token.match(/^\d{1,7}$/) ? token : '')
+                                : token)
+                           : '')
+                      // Normalize quantities so they don't start with a '.' or '+' sign and
+                      // make sure they all have an integer component so can't be confused
+                      // with a dotted identifier.
+                      // This can't be done in the lexer since ".4" is a valid rule part.
+                      : (cc1 = token.charCodeAt(1),
+                         cc2 = token.charCodeAt(2),
+                         isnum1 = '0'.charCodeAt(0) <= cc1 && cc1 <= '9'.charCodeAt(0),
+                         isnum2 = '0'.charCodeAt(0) <= cc2 && cc2 <= '9'.charCodeAt(0),
+                         // +.5 -> 0.5 if allowed.
+                         (cc === '+'.charCodeAt(0)
+                          && (isnum1 || (cc1 === '.'.charCodeAt(0) && isnum2))))
+                           ? ((propBits & CSS_PROP_BIT_QUANTITY)
+                                ? ((propBits & CSS_PROP_BIT_Z_INDEX)
+                                     ? (token.match(/^\+\d{1,7}$/) ? token : '')
+                                     : ((isnum1 ? '' : '0') + token.substring(1)))
+                                : '')
+                           // -.5 -> -0.5 if allowed otherwise -> 0 if quantities allowed.
+                           : (cc === '-'.charCodeAt(0)
+                              && (isnum1 || (cc1 === '.'.charCodeAt(0) && isnum2)))
+                                ? ((propBits & CSS_PROP_BIT_NEGATIVE_QUANTITY)
+                                     ? ((propBits & CSS_PROP_BIT_Z_INDEX)
+                                          ? (token.match(/^\-\d{1,7}$/) ? token : '')
+                                          : ((isnum1 ? '-' : '-0') + token.substring(1)))
+                                     : ((propBits & CSS_PROP_BIT_QUANTITY) ? '0' : ''))
+                                // .5 -> 0.5 if allowed.
+                                : (cc === '.'.charCodeAt(0) && isnum1)
+                                     ? ((propBits & CSS_PROP_BIT_QUANTITY) ? '0' + token : '')
+                                     // Handle url("...") by rewriting the body.
+                                     : ('url(' === token.substring(0, 4))
+                                          ? ((opt_naiveUriRewriter && (qstringBits & CSS_PROP_BIT_QSTRING_URL))
+                                               ? normalizeUrl(
+                                                   safeUri(
+                                                     tokens[i].substring(5, token.length - 2),
+                                                     property,
+                                                     opt_naiveUriRewriter
+                                                   )
+                                                 )
+                                               : '')
+                                          // Handle func(...) and literal tokens
+                                          // such as keywords and punctuation.
+                                          : (
+                                             // Step 1. Combine func(...) into something that can be compared
+                                             // against propertySchema.cssExtra.
+                                             (token.charAt(token.length-1) === '(')
+                                             && (end = normalizeFunctionCall(tokens, i),
+                                               // When tokens is
+                                               //   ['x', ' ', 'rgb(', '255', ',', '0', ',', '0', ')', ' ', 'y']
+                                               // and i is the index of 'rgb(' and end is the index of ')'
+                                               // splices tokens to where i now is the index of the whole call:
+                                               //   ['x', ' ', 'rgb( 255 , 0 , 0 )', ' ', 'y']
+                                               tokens.splice(i, end - i,
+                                                 token = tokens.slice(i, end).join(' '))),
+                                             litGroup = propertySchema.cssLitGroup,
+                                             litMap = (
+                                                litGroup
+                                                ? (propertySchema.cssLitMap
+                                                   // Lazily compute the union from litGroup.
+                                                   || (propertySchema.cssLitMap = unionArrays(litGroup)))
+                                                : ALLOWED_LITERAL),  // A convenient empty object.
+                                             (litMap[token] === ALLOWED_LITERAL
+                                              || propertySchema.cssExtra && propertySchema.cssExtra.test(token)))
+                                                // Token is in the literal map or matches extra.
+                                                ? token
+                                                : (/^\w+$/.test(token)
+                                                   && (qstringBits === CSS_PROP_BIT_QSTRING_CONTENT))
+                                                     // Quote unrecognized keywords so font names like
+                                                      //    Arial Bold
+                                                      // ->
+                                                      //    "Arial Bold"
+                                                      ? (lastQuoted+1 === k
+                                                         // If the last token was also a keyword that was quoted, then
+                                                         // combine this token into that.
+                                                         ? (tokens[lastQuoted] = tokens[lastQuoted]
+                                                            .substring(0, tokens[lastQuoted].length-1) + ' ' + token + '"',
+                                                            token = '')
+                                                         : (lastQuoted = k, '"' + token + '"'))
+                                                      // Disallowed.
+                                                      : '');
       if (token) {
         tokens[k++] = token;
       }
@@ -1989,7 +2004,7 @@ if (typeof window !== 'undefined') {
 }
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 // Based on coding from the HTML4 Sanitizer by Google Inc.
@@ -2532,7 +2547,7 @@ html4.ELEMENTS = {
 	'hr': 2, //EMPTY
 	'html': 49, //OPTIONAL_ENDTAG, UNSAFE, FOLDABLE
 	'i': 0,
-	'iframe': 4, //CDATA
+	'iframe': 0, //new
 	'img': 2,//EMPTY
 	'input': 2, //EMPTY
 	'ins': 0,

package/dist/ssr-dom-shim.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/ssr-dom-shim.js

@@ -0,0 +1,62 @@
+/* eslint-disable max-classes-per-file */
+import { HTMLElement, Element, customElements, ElementInternals } from "@lit-labs/ssr-dom-shim";
+globalThis.HTMLElement ??= HTMLElement;
+globalThis.Element ??= Element;
+globalThis.customElements ??= customElements;
+class NodeShim {
+}
+globalThis.Node ??= NodeShim;
+class FileListShim {
+}
+globalThis.FileList ??= FileListShim;
+// ------- JS DOM shims -------
+// Polyfill `adoptedStyleSheets` globally for both `Document` and `ShadowRoot`
+const adoptedSheetsStore = new WeakMap();
+if (globalThis.Document && !("adoptedStyleSheets" in Document.prototype)) {
+    Object.defineProperty(Document.prototype, "adoptedStyleSheets", {
+        get() {
+            return adoptedSheetsStore.get(this) || [];
+        },
+        set(sheets) {
+            adoptedSheetsStore.set(this, sheets);
+        },
+    });
+}
+if (globalThis.ShadowRoot && !("adoptedStyleSheets" in ShadowRoot.prototype)) {
+    Object.defineProperty(ShadowRoot.prototype, "adoptedStyleSheets", {
+        get() {
+            return adoptedSheetsStore.get(this) || [];
+        },
+        set(sheets) {
+            adoptedSheetsStore.set(this, sheets);
+        },
+    });
+}
+// Polyfill CSSStyleSheet to provide `replaceSync`
+if (globalThis.CSSStyleSheet && !("replaceSync" in CSSStyleSheet.prototype)) {
+    Object.defineProperty(CSSStyleSheet.prototype, "replaceSync", {
+        value(cssText) {
+            this.cssText = cssText;
+            return cssText;
+        },
+    });
+}
+// Empty resize observer
+globalThis.ResizeObserver = class ResizeObserver {
+    observe() {
+        // do nothing
+    }
+    unobserve() {
+        // do nothing
+    }
+    disconnect() {
+        // do nothing
+    }
+};
+// empty showPopover method
+globalThis.HTMLElement.prototype.showPopover = function () { };
+//  ElementInternals
+globalThis.HTMLElement.prototype.attachInternals = function () {
+    return new ElementInternals();
+};
+//# sourceMappingURL=ssr-dom-shim.js.map

package/dist/ssr-dom-shim.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ssr-dom-shim.js","sourceRoot":"","sources":["../src/ssr-dom-shim.ts"],"names":[],"mappings":"AAAA,yCAAyC;AACzC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAEhG,UAAU,CAAC,WAAW,KAAK,WAAW,CAAC;AACvC,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC;AAC/B,UAAU,CAAC,cAAc,KAAK,cAAc,CAAC;AAE7C,MAAM,QAAQ;CAAG;AACjB,UAAU,CAAC,IAAI,KAAK,QAAiC,CAAC;AAEtD,MAAM,YAAY;CAAG;AACrB,UAAU,CAAC,QAAQ,KAAK,YAAyC,CAAC;AAElE,+BAA+B;AAE/B,8EAA8E;AAC9E,MAAM,kBAAkB,GAAG,IAAI,OAAO,EAAE,CAAC;AAEzC,IAAI,UAAU,CAAC,QAAQ,IAAI,CAAC,CAAC,oBAAoB,IAAI,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;IACzE,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,EAAE;QAC9D,GAAG;YACD,OAAO,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5C,CAAC;QACD,GAAG,CAAC,MAAuB;YACzB,kBAAkB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,IAAI,UAAU,CAAC,UAAU,IAAI,CAAC,CAAC,oBAAoB,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;IAC7E,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,EAAE,oBAAoB,EAAE;QAChE,GAAG;YACD,OAAO,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5C,CAAC;QACD,GAAG,CAAC,MAAuB;YACzB,kBAAkB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,kDAAkD;AAClD,IAAI,UAAU,CAAC,aAAa,IAAI,CAAC,CAAC,aAAa,IAAI,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;IAC1E,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,SAAS,EAAE,aAAa,EAAE;QAC5D,KAAK,CAAC,OAAe;YACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,OAAO,OAAO,CAAC;QACjB,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAEH,wBAAwB;AACxB,UAAU,CAAC,cAAc,GAAG,MAAM,cAAc;IAC5C,OAAO;QACL,aAAa;IACf,CAAC;IACD,SAAS;QACP,aAAa;IACf,CAAC;IACD,UAAU;QACR,aAAa;IACf,CAAC;CACJ,CAAC;AAEF,2BAA2B;AAC3B,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,WAAW,GAAG,cAAa,CAAC,CAAC;AAE9D,oBAAoB;AACpB,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,eAAe,GAAG;IAC/C,OAAO,IAAI,gBAAgB,EAAE,CAAC;AAClC,CAAC,CAAA","sourcesContent":["/* eslint-disable max-classes-per-file */\nimport { HTMLElement, Element, customElements, ElementInternals } from \"@lit-labs/ssr-dom-shim\";\n\nglobalThis.HTMLElement ??= HTMLElement;\nglobalThis.Element ??= Element;\nglobalThis.customElements ??= customElements;\n\nclass NodeShim {}\nglobalThis.Node ??= NodeShim as object as typeof Node;\n\nclass FileListShim {}\nglobalThis.FileList ??= FileListShim as object as typeof FileList;\n\n// ------- JS DOM shims -------\n\n// Polyfill `adoptedStyleSheets` globally for both `Document` and `ShadowRoot`\nconst adoptedSheetsStore = new WeakMap();\n\nif (globalThis.Document && !(\"adoptedStyleSheets\" in Document.prototype)) {\n  Object.defineProperty(Document.prototype, \"adoptedStyleSheets\", {\n    get() {\n      return adoptedSheetsStore.get(this) || [];\n    },\n    set(sheets: CSSStyleSheet[]) {\n      adoptedSheetsStore.set(this, sheets);\n    },\n  });\n}\n\nif (globalThis.ShadowRoot && !(\"adoptedStyleSheets\" in ShadowRoot.prototype)) {\n  Object.defineProperty(ShadowRoot.prototype, \"adoptedStyleSheets\", {\n    get() {\n      return adoptedSheetsStore.get(this) || [];\n    },\n    set(sheets: CSSStyleSheet[]) {\n      adoptedSheetsStore.set(this, sheets);\n    },\n  });\n}\n\n// Polyfill CSSStyleSheet to provide `replaceSync`\nif (globalThis.CSSStyleSheet && !(\"replaceSync\" in CSSStyleSheet.prototype)) {\n    Object.defineProperty(CSSStyleSheet.prototype, \"replaceSync\", {\n      value(cssText: string) {\n        this.cssText = cssText;\n        return cssText;\n      },\n    });\n  }\n\n// Empty resize observer\nglobalThis.ResizeObserver = class ResizeObserver {\n    observe() {\n      // do nothing\n    }\n    unobserve() {\n      // do nothing\n    }\n    disconnect() {\n      // do nothing\n    }\n};\n\n// empty showPopover method\nglobalThis.HTMLElement.prototype.showPopover = function () {};\n\n//  ElementInternals\nglobalThis.HTMLElement.prototype.attachInternals = function() {\n    return new ElementInternals();\n}"]}

package/dist/ssr-dom.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/ssr-dom.js

@@ -0,0 +1,3 @@
+export {};
+// no shims in the browser when imported via conditional export
+//# sourceMappingURL=ssr-dom.js.map

package/dist/ssr-dom.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ssr-dom.js","sourceRoot":"","sources":["../src/ssr-dom.ts"],"names":[],"mappings":";AAAA,+DAA+D","sourcesContent":["// no shims in the browser when imported via conditional export\n"]}

package/dist/theming/CustomStyle.js

@@ -1,18 +1,18 @@
 import { reRenderAllUI5Elements } from "../Render.js";
 import getSharedResource from "../getSharedResource.js";
 import EventProvider from "../EventProvider.js";
-const eventProvider = getSharedResource("CustomStyle.eventProvider", new EventProvider());
+const getEventProvider = () => getSharedResource("CustomStyle.eventProvider", new EventProvider());
 const CUSTOM_CSS_CHANGE = "CustomCSSChange";
 const attachCustomCSSChange = (listener) => {
-    eventProvider.attachEvent(CUSTOM_CSS_CHANGE, listener);
+    getEventProvider().attachEvent(CUSTOM_CSS_CHANGE, listener);
 };
 const detachCustomCSSChange = (listener) => {
-    eventProvider.detachEvent(CUSTOM_CSS_CHANGE, listener);
+    getEventProvider().detachEvent(CUSTOM_CSS_CHANGE, listener);
 };
 const fireCustomCSSChange = (tag) => {
-    return eventProvider.fireEvent(CUSTOM_CSS_CHANGE, tag);
+    return getEventProvider().fireEvent(CUSTOM_CSS_CHANGE, tag);
 };
-const customCSSFor = getSharedResource("CustomStyle.customCSSFor", {});
+const getCustomCSSFor = () => getSharedResource("CustomStyle.customCSSFor", {});
 // Listen to the eventProvider, in case other copies of this CustomStyle module fire this
 // event, and this copy would therefore need to reRender the ui5 webcomponents; but
 // don't reRender if it was this copy that fired the event to begin with.
@@ -23,6 +23,7 @@ attachCustomCSSChange((tag) => {
     }
 });
 const addCustomCSS = (tag, css) => {
+    const customCSSFor = getCustomCSSFor();
     if (!customCSSFor[tag]) {
         customCSSFor[tag] = [];
     }
@@ -40,6 +41,7 @@ const addCustomCSS = (tag, css) => {
     return reRenderAllUI5Elements({ tag });
 };
 const getCustomCSS = (tag) => {
+    const customCSSFor = getCustomCSSFor();
     return customCSSFor[tag] ? customCSSFor[tag].join("") : "";
 };
 export { addCustomCSS, getCustomCSS, attachCustomCSSChange, detachCustomCSSChange, };

package/dist/theming/CustomStyle.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomStyle.js","sourceRoot":"","sources":["../../src/theming/CustomStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAIhD,MAAM,aAAa,GAAG,iBAAiB,CAAC,2BAA2B,EAAE,IAAI,aAAa,EAAgB,CAAC,CAAC;AACxG,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE5C,MAAM,qBAAqB,GAAG,CAAC,QAAiC,EAAE,EAAE;IACnE,aAAa,CAAC,WAAW,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,QAAiC,EAAE,EAAE;IACnE,aAAa,CAAC,WAAW,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,EAAE;IAC3C,OAAO,aAAa,CAAC,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,iBAAiB,CAAgC,0BAA0B,EAAE,EAAE,CAAC,CAAC;AAEtG,yFAAyF;AACzF,mFAAmF;AACnF,yEAAyE;AACzE,IAAI,YAAqB,CAAC;AAC1B,qBAAqB,CAAC,CAAC,GAAW,EAAE,EAAE;IACrC,IAAI,CAAC,YAAY,EAAE;QAClB,sBAAsB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;KAChC;AACF,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,EAAE;IACjD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE;QACvB,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;KACvB;IACD,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5B,YAAY,GAAG,IAAI,CAAC;IACpB,IAAI;QACH,mFAAmF;QACnF,wGAAwG;QACxG,iEAAiE;QACjE,mBAAmB,CAAC,GAAG,CAAC,CAAC;KACzB;YAAS;QACT,YAAY,GAAG,KAAK,CAAC;KACrB;IAED,OAAO,sBAAsB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE;IACpC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5D,CAAC,CAAC;AAEF,OAAO,EACN,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,qBAAqB,GACrB,CAAC"}
+{"version":3,"file":"CustomStyle.js","sourceRoot":"","sources":["../../src/theming/CustomStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAIhD,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,iBAAiB,CAAC,2BAA2B,EAAE,IAAI,aAAa,EAAgB,CAAC,CAAC;AACjH,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE5C,MAAM,qBAAqB,GAAG,CAAC,QAAiC,EAAE,EAAE;IACnE,gBAAgB,EAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,QAAiC,EAAE,EAAE;IACnE,gBAAgB,EAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,EAAE;IAC3C,OAAO,gBAAgB,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,iBAAiB,CAAgC,0BAA0B,EAAE,EAAE,CAAC,CAAC;AAE/G,yFAAyF;AACzF,mFAAmF;AACnF,yEAAyE;AACzE,IAAI,YAAqB,CAAC;AAC1B,qBAAqB,CAAC,CAAC,GAAW,EAAE,EAAE;IACrC,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,sBAAsB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IACjC,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,EAAE;IACjD,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;IACxB,CAAC;IACD,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5B,YAAY,GAAG,IAAI,CAAC;IACpB,IAAI,CAAC;QACJ,mFAAmF;QACnF,wGAAwG;QACxG,iEAAiE;QACjE,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;YAAS,CAAC;QACV,YAAY,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,OAAO,sBAAsB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE;IACpC,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5D,CAAC,CAAC;AAEF,OAAO,EACN,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,qBAAqB,GACrB,CAAC","sourcesContent":["import { reRenderAllUI5Elements } from \"../Render.js\";\nimport getSharedResource from \"../getSharedResource.js\";\nimport EventProvider from \"../EventProvider.js\";\n\ntype CustomCSSChangeCallback = (tag: string) => void;\n\nconst getEventProvider = () => getSharedResource(\"CustomStyle.eventProvider\", new EventProvider<string, void>());\nconst CUSTOM_CSS_CHANGE = \"CustomCSSChange\";\n\nconst attachCustomCSSChange = (listener: CustomCSSChangeCallback) => {\n\tgetEventProvider().attachEvent(CUSTOM_CSS_CHANGE, listener);\n};\n\nconst detachCustomCSSChange = (listener: CustomCSSChangeCallback) => {\n\tgetEventProvider().detachEvent(CUSTOM_CSS_CHANGE, listener);\n};\n\nconst fireCustomCSSChange = (tag: string) => {\n\treturn getEventProvider().fireEvent(CUSTOM_CSS_CHANGE, tag);\n};\n\nconst getCustomCSSFor = () => getSharedResource<Record<string, Array<string>>>(\"CustomStyle.customCSSFor\", {});\n\n// Listen to the eventProvider, in case other copies of this CustomStyle module fire this\n// event, and this copy would therefore need to reRender the ui5 webcomponents; but\n// don't reRender if it was this copy that fired the event to begin with.\nlet skipRerender: boolean;\nattachCustomCSSChange((tag: string) => {\n\tif (!skipRerender) {\n\t\treRenderAllUI5Elements({ tag });\n\t}\n});\n\nconst addCustomCSS = (tag: string, css: string) => {\n\tconst customCSSFor = getCustomCSSFor();\n\tif (!customCSSFor[tag]) {\n\t\tcustomCSSFor[tag] = [];\n\t}\n\tcustomCSSFor[tag].push(css);\n\n\tskipRerender = true;\n\ttry {\n\t\t// The event is fired and the attached event listeners are all called synchronously\n\t\t// The skipRerender flag will be used to avoid calling reRenderAllUI5Elements twice when it is this copy\n\t\t// of CustomStyle.js which is firing the `CustomCSSChange` event.\n\t\tfireCustomCSSChange(tag);\n\t} finally {\n\t\tskipRerender = false;\n\t}\n\n\treturn reRenderAllUI5Elements({ tag });\n};\n\nconst getCustomCSS = (tag: string) => {\n\tconst customCSSFor = getCustomCSSFor();\n\treturn customCSSFor[tag] ? customCSSFor[tag].join(\"\") : \"\";\n};\n\nexport {\n\taddCustomCSS,\n\tgetCustomCSS,\n\tattachCustomCSSChange,\n\tdetachCustomCSSChange,\n};\n"]}

package/dist/theming/ThemeLoaded.js.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeLoaded.js","sourceRoot":"","sources":["../../src/theming/ThemeLoaded.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAIhD,MAAM,aAAa,GAAG,IAAI,aAAa,EAAgB,CAAC;AACxD,MAAM,YAAY,GAAG,aAAa,CAAC;AAEnC,MAAM,iBAAiB,GAAG,CAAC,QAA6B,EAAE,EAAE;IAC3D,aAAa,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,QAA6B,EAAE,EAAE;IAC3D,aAAa,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,EAAE;IACzC,OAAO,aAAa,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,OAAO,EACN,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GACf,CAAC"}
+{"version":3,"file":"ThemeLoaded.js","sourceRoot":"","sources":["../../src/theming/ThemeLoaded.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAIhD,MAAM,aAAa,GAAG,IAAI,aAAa,EAAgB,CAAC;AACxD,MAAM,YAAY,GAAG,aAAa,CAAC;AAEnC,MAAM,iBAAiB,GAAG,CAAC,QAA6B,EAAE,EAAE;IAC3D,aAAa,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,QAA6B,EAAE,EAAE;IAC3D,aAAa,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,EAAE;IACzC,OAAO,aAAa,CAAC,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,OAAO,EACN,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GACf,CAAC","sourcesContent":["import EventProvider from \"../EventProvider.js\";\n\ntype ThemeLoadedCallback = (theme: string) => void;\n\nconst eventProvider = new EventProvider<string, void>();\nconst THEME_LOADED = \"themeLoaded\";\n\nconst attachThemeLoaded = (listener: ThemeLoadedCallback) => {\n\teventProvider.attachEvent(THEME_LOADED, listener);\n};\n\nconst detachThemeLoaded = (listener: ThemeLoadedCallback) => {\n\teventProvider.detachEvent(THEME_LOADED, listener);\n};\n\nconst fireThemeLoaded = (theme: string) => {\n\treturn eventProvider.fireEvent(THEME_LOADED, theme);\n};\n\nexport {\n\tattachThemeLoaded,\n\tdetachThemeLoaded,\n\tfireThemeLoaded,\n};\n"]}

package/dist/theming/ThemeRegistered.d.ts

@@ -0,0 +1,4 @@
+type ThemeRegisteredCallback = (theme: string) => void;
+declare const attachThemeRegistered: (listener: ThemeRegisteredCallback) => void;
+declare const fireThemeRegistered: (theme: string) => void[];
+export { attachThemeRegistered, fireThemeRegistered, };

package/dist/theming/ThemeRegistered.js

@@ -0,0 +1,11 @@
+import EventProvider from "../EventProvider.js";
+const eventProvider = new EventProvider();
+const THEME_REGISTERED = "themeRegistered";
+const attachThemeRegistered = (listener) => {
+    eventProvider.attachEvent(THEME_REGISTERED, listener);
+};
+const fireThemeRegistered = (theme) => {
+    return eventProvider.fireEvent(THEME_REGISTERED, theme);
+};
+export { attachThemeRegistered, fireThemeRegistered, };
+//# sourceMappingURL=ThemeRegistered.js.map

package/dist/theming/ThemeRegistered.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ThemeRegistered.js","sourceRoot":"","sources":["../../src/theming/ThemeRegistered.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAIhD,MAAM,aAAa,GAAG,IAAI,aAAa,EAAgB,CAAC;AACxD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAE3C,MAAM,qBAAqB,GAAG,CAAC,QAAiC,EAAE,EAAE;IACnE,aAAa,CAAC,WAAW,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,KAAa,EAAE,EAAE;IAC7C,OAAO,aAAa,CAAC,SAAS,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;AACzD,CAAC,CAAC;AAEF,OAAO,EACN,qBAAqB,EACrB,mBAAmB,GACnB,CAAC","sourcesContent":["import EventProvider from \"../EventProvider.js\";\n\ntype ThemeRegisteredCallback = (theme: string) => void;\n\nconst eventProvider = new EventProvider<string, void>();\nconst THEME_REGISTERED = \"themeRegistered\";\n\nconst attachThemeRegistered = (listener: ThemeRegisteredCallback) => {\n\teventProvider.attachEvent(THEME_REGISTERED, listener);\n};\n\nconst fireThemeRegistered = (theme: string) => {\n\treturn eventProvider.fireEvent(THEME_REGISTERED, theme);\n};\n\nexport {\n\tattachThemeRegistered,\n\tfireThemeRegistered,\n};\n"]}

package/dist/theming/applyTheme.js

@@ -3,8 +3,9 @@ import { removeStyle, createOrUpdateStyle } from "../ManagedStyles.js";
 import getThemeDesignerTheme from "./getThemeDesignerTheme.js";
 import { fireThemeLoaded } from "./ThemeLoaded.js";
 import { getFeature } from "../FeaturesRegistry.js";
-import { attachCustomThemeStylesToHead, getThemeRoot } from "../config/ThemeRoots.js";
+import { attachCustomThemeStylesToHead, getThemeRoot } from "../config/ThemeRoot.js";
 import { DEFAULT_THEME } from "../generated/AssetParameters.js";
+import { getCurrentRuntimeIndex } from "../Runtimes.js";
 const BASE_THEME_PACKAGE = "@ui5/webcomponents-theming";
 const isThemeBaseRegistered = () => {
     const registeredPackages = getRegisteredPackages();
@@ -16,21 +17,21 @@ const loadThemeBase = async (theme) => {
     }
     const cssData = await getThemeProperties(BASE_THEME_PACKAGE, theme);
     if (cssData) {
-        createOrUpdateStyle(cssData, "data-ui5-theme-properties", BASE_THEME_PACKAGE);
+        createOrUpdateStyle(cssData, "data-ui5-theme-properties", BASE_THEME_PACKAGE, theme);
     }
 };
 const deleteThemeBase = () => {
     removeStyle("data-ui5-theme-properties", BASE_THEME_PACKAGE);
 };
-const loadComponentPackages = async (theme) => {
+const loadComponentPackages = async (theme, externalThemeName) => {
     const registeredPackages = getRegisteredPackages();
     const packagesStylesPromises = [...registeredPackages].map(async (packageName) => {
         if (packageName === BASE_THEME_PACKAGE) {
             return;
         }
-        const cssData = await getThemeProperties(packageName, theme);
+        const cssData = await getThemeProperties(packageName, theme, externalThemeName);
         if (cssData) {
-            createOrUpdateStyle(cssData, "data-ui5-theme-properties", packageName);
+            createOrUpdateStyle(cssData, `data-ui5-component-properties-${getCurrentRuntimeIndex()}`, packageName);
         }
     });
     return Promise.all(packagesStylesPromises);
@@ -43,11 +44,11 @@ const detectExternalTheme = async (theme) => {
     }
     // If OpenUI5Support is enabled, try to find out if it loaded variables
     const openUI5Support = getFeature("OpenUI5Support");
-    if (openUI5Support) {
+    if (openUI5Support && openUI5Support.isOpenUI5Detected()) {
         const varsLoaded = openUI5Support.cssVariablesLoaded();
         if (varsLoaded) {
             return {
-                themeName: openUI5Support.getConfigurationSettingsObject()?.theme,
+                themeName: openUI5Support.getConfigurationSettingsObject()?.theme, // just themeName
                 baseThemeName: "", // baseThemeName is only relevant for custom themes
             };
         }
@@ -68,7 +69,7 @@ const applyTheme = async (theme) => {
     }
     // Always load component packages properties. For non-registered themes, try with the base theme, if any
     const packagesTheme = isThemeRegistered(theme) ? theme : extTheme && extTheme.baseThemeName;
-    await loadComponentPackages(packagesTheme || DEFAULT_THEME);
+    await loadComponentPackages(packagesTheme || DEFAULT_THEME, extTheme && extTheme.themeName === theme ? theme : undefined);
     fireThemeLoaded(theme);
 };
 export default applyTheme;

package/dist/theming/applyTheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"applyTheme.js","sourceRoot":"","sources":["../../src/theming/applyTheme.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"applyTheme.js","sourceRoot":"","sources":["../../src/theming/applyTheme.ts"],"names":[],"mappings":"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","sourcesContent":["import { getThemeProperties, getRegisteredPackages, isThemeRegistered } from \"../asset-registries/Themes.js\";\nimport { removeStyle, createOrUpdateStyle } from \"../ManagedStyles.js\";\nimport getThemeDesignerTheme from \"./getThemeDesignerTheme.js\";\nimport { fireThemeLoaded } from \"./ThemeLoaded.js\";\nimport { getFeature } from \"../FeaturesRegistry.js\";\nimport { attachCustomThemeStylesToHead, getThemeRoot } from \"../config/ThemeRoot.js\";\nimport type OpenUI5Support from \"../features/OpenUI5Support.js\";\nimport { DEFAULT_THEME } from \"../generated/AssetParameters.js\";\nimport { getCurrentRuntimeIndex } from \"../Runtimes.js\";\n\nconst BASE_THEME_PACKAGE = \"@ui5/webcomponents-theming\";\n\nconst isThemeBaseRegistered = () => {\n\tconst registeredPackages = getRegisteredPackages();\n\treturn registeredPackages.has(BASE_THEME_PACKAGE);\n};\n\nconst loadThemeBase = async (theme: string) => {\n\tif (!isThemeBaseRegistered()) {\n\t\treturn;\n\t}\n\n\tconst cssData = await getThemeProperties(BASE_THEME_PACKAGE, theme);\n\tif (cssData) {\n\t\tcreateOrUpdateStyle(cssData, \"data-ui5-theme-properties\", BASE_THEME_PACKAGE, theme);\n\t}\n};\n\nconst deleteThemeBase = () => {\n\tremoveStyle(\"data-ui5-theme-properties\", BASE_THEME_PACKAGE);\n};\n\nconst loadComponentPackages = async (theme: string, externalThemeName?: string) => {\n\tconst registeredPackages = getRegisteredPackages();\n\n\tconst packagesStylesPromises = [...registeredPackages].map(async packageName => {\n\t\tif (packageName === BASE_THEME_PACKAGE) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst cssData = await getThemeProperties(packageName, theme, externalThemeName);\n\t\tif (cssData) {\n\t\t\tcreateOrUpdateStyle(cssData, `data-ui5-component-properties-${getCurrentRuntimeIndex()}`, packageName);\n\t\t}\n\t});\n\n\treturn Promise.all(packagesStylesPromises);\n};\n\nconst detectExternalTheme = async (theme: string) => {\n\t// If theme designer theme is detected, use this\n\tconst extTheme = getThemeDesignerTheme();\n\tif (extTheme) {\n\t\treturn extTheme;\n\t}\n\n\t// If OpenUI5Support is enabled, try to find out if it loaded variables\n\tconst openUI5Support = getFeature<typeof OpenUI5Support>(\"OpenUI5Support\");\n\tif (openUI5Support && openUI5Support.isOpenUI5Detected()) {\n\t\tconst varsLoaded = openUI5Support.cssVariablesLoaded();\n\t\tif (varsLoaded) {\n\t\t\treturn {\n\t\t\t\tthemeName: openUI5Support.getConfigurationSettingsObject()?.theme, // just themeName\n\t\t\t\tbaseThemeName: \"\", // baseThemeName is only relevant for custom themes\n\t\t\t};\n\t\t}\n\t} else if (getThemeRoot()) {\n\t\tawait attachCustomThemeStylesToHead(theme);\n\n\t\treturn getThemeDesignerTheme();\n\t}\n};\n\nconst applyTheme = async (theme: string) => {\n\tconst extTheme = await detectExternalTheme(theme);\n\n\t// Only load theme_base properties if there is no externally loaded theme, or there is, but it is not being loaded\n\tif (!extTheme || theme !== extTheme.themeName) {\n\t\tawait loadThemeBase(theme);\n\t} else {\n\t\tdeleteThemeBase();\n\t}\n\n\t// Always load component packages properties. For non-registered themes, try with the base theme, if any\n\tconst packagesTheme = isThemeRegistered(theme) ? theme : extTheme && extTheme.baseThemeName;\n\tawait loadComponentPackages(packagesTheme || DEFAULT_THEME, extTheme && extTheme.themeName === theme ? theme : undefined);\n\n\tfireThemeLoaded(theme);\n};\n\nexport default applyTheme;\n"]}

package/dist/theming/getConstructableStyle.d.ts

@@ -1,9 +1,9 @@
-import UI5Element from "../UI5Element.js";
+import type UI5Element from "../UI5Element.js";
 /**
  * Returns (and caches) a constructable style sheet for a web component class
  * Note: Chrome
  * @param ElementClass
  * @returns {*}
  */
-declare const getConstructableStyle: (ElementClass: typeof UI5Element, forStaticArea?: boolean) => CSSStyleSheet[];
+declare const getConstructableStyle: (ElementClass: typeof UI5Element) => CSSStyleSheet[];
 export default getConstructableStyle;

package/dist/theming/getConstructableStyle.js

@@ -10,11 +10,11 @@ attachCustomCSSChange((tag) => {
  * @param ElementClass
  * @returns {*}
  */
-const getConstructableStyle = (ElementClass, forStaticArea = false) => {
+const getConstructableStyle = (ElementClass) => {
     const tag = ElementClass.getMetadata().getTag();
-    const key = `${tag}_${forStaticArea ? "static" : "normal"}`;
+    const key = `${tag}_normal`;
     if (!constructableStyleMap.has(key)) {
-        const styleContent = getEffectiveStyle(ElementClass, forStaticArea);
+        const styleContent = getEffectiveStyle(ElementClass);
         const style = new CSSStyleSheet();
         style.replaceSync(styleContent);
         constructableStyleMap.set(key, [style]);

package/dist/theming/getConstructableStyle.js.map

@@ -1 +1 @@
-{"version":3,"file":"getConstructableStyle.js","sourceRoot":"","sources":["../../src/theming/getConstructableStyle.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAgC,CAAC;AAEtE,qBAAqB,CAAC,CAAC,GAAW,EAAE,EAAE;IACrC,qBAAqB,CAAC,MAAM,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,kFAAkF;AAClI,CAAC,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG,CAAC,YAA+B,EAAE,aAAa,GAAG,KAAK,EAAE,EAAE;IACxF,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;IAChD,MAAM,GAAG,GAAG,GAAG,GAAG,IAAI,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAE5D,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACpC,MAAM,YAAY,GAAG,iBAAiB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACpE,MAAM,KAAK,GAAG,IAAI,aAAa,EAAE,CAAC;QAClC,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAChC,qBAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;KACxC;IAED,OAAO,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;AACxC,CAAC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"getConstructableStyle.js","sourceRoot":"","sources":["../../src/theming/getConstructableStyle.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAgC,CAAC;AAEtE,qBAAqB,CAAC,CAAC,GAAW,EAAE,EAAE;IACrC,qBAAqB,CAAC,MAAM,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,kFAAkF;AAClI,CAAC,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG,CAAC,YAA+B,EAAE,EAAE;IACjE,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;IAChD,MAAM,GAAG,GAAG,GAAG,GAAG,SAAS,CAAC;IAE5B,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,YAAY,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,aAAa,EAAE,CAAC;QAClC,KAAK,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAChC,qBAAqB,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;AACxC,CAAC,CAAC;AAEF,eAAe,qBAAqB,CAAC","sourcesContent":["import getEffectiveStyle from \"./getEffectiveStyle.js\";\nimport { attachCustomCSSChange } from \"./CustomStyle.js\";\nimport type UI5Element from \"../UI5Element.js\";\n\nconst constructableStyleMap = new Map<string, Array<CSSStyleSheet>>();\n\nattachCustomCSSChange((tag: string) => {\n\tconstructableStyleMap.delete(`${tag}_normal`); // there is custom CSS only for the component itself, not for its static area part\n});\n\n/**\n * Returns (and caches) a constructable style sheet for a web component class\n * Note: Chrome\n * @param ElementClass\n * @returns {*}\n */\nconst getConstructableStyle = (ElementClass: typeof UI5Element) => {\n\tconst tag = ElementClass.getMetadata().getTag();\n\tconst key = `${tag}_normal`;\n\n\tif (!constructableStyleMap.has(key)) {\n\t\tconst styleContent = getEffectiveStyle(ElementClass);\n\t\tconst style = new CSSStyleSheet();\n\t\tstyle.replaceSync(styleContent);\n\t\tconstructableStyleMap.set(key, [style]);\n\t}\n\n\treturn constructableStyleMap.get(key)!;\n};\n\nexport default getConstructableStyle;\n"]}

package/dist/theming/getEffectiveStyle.d.ts

@@ -1,3 +1,3 @@
 import type UI5Element from "../UI5Element.js";
-declare const getEffectiveStyle: (ElementClass: typeof UI5Element, forStaticArea?: boolean) => string;
+declare const getEffectiveStyle: (ElementClass: typeof UI5Element) => string;
 export default getEffectiveStyle;