@ui5/webcomponents-base 1.11.0-rc.1 → 1.11.0-rc.2

package/dist/config/Icons.js

@@ -1,48 +1,97 @@
 import { getTheme, isThemeFamily } from "./Theme.js";
+import { getIconCollectionByAlias } from "../assets-meta/IconCollectionsAlias.js";
 const IconCollectionConfiguration = new Map();
-var IconCollection;
-(function (IconCollection) {
-    IconCollection["v4"] = "SAP-icons";
-    IconCollection["v5"] = "SAP-icons-v5";
-})(IconCollection || (IconCollection = {}));
+// All registered icon collections - all icon collections resolves to these options at the end
+var RegisteredIconCollection;
+(function (RegisteredIconCollection) {
+    RegisteredIconCollection["SAPIconsV4"] = "SAP-icons-v4";
+    RegisteredIconCollection["SAPIconsV5"] = "SAP-icons-v5";
+    RegisteredIconCollection["SAPIconsTNTV2"] = "tnt-v2";
+    RegisteredIconCollection["SAPIconsTNTV3"] = "tnt-v3";
+    RegisteredIconCollection["SAPBSIcons"] = "business-suite";
+})(RegisteredIconCollection || (RegisteredIconCollection = {}));
 /**
- * Sets the default icon collection (SAP-icons font v4 or SAP-icons font v5) per theme,
- * which will be applied in case icon collection is not specified.
+ * Sets the default icon collection for a given theme.
+ *
+ * SAP Icons is the default icon collection (that resolves to SAP-icons version 5.x in Horizon theme family and SAP-icons version 4.x in all other themes)
+ * and to display icons from other collections, you have to specify the icon collection in addition to the icon name, for example: "tnt/actor", "business-suite/1x2-grid-layout", etc.
+ * This method allows setting another (built-in or custom) icon collection as default per theme.
+ *
+ * <b>Usage</b>
+ * <b>For example</b>, to make "SAP-icons version 5.x" the default icon collection in "sap_fiori_3":
+ *
+ * <pre>
+ * setDefaultIconCollection("sap_fiori_3", "SAP-icons-v5");
+ *
+ * <ui5-icon name="home"></ui5-icon>
+ * </pre>
+ *
+ * <b>For example</b>, to make a custom icon collection (with name "my-custom-collection") the default icon collection in "sap_fiori_3":
+ *
+ * <pre>
+ * setDefaultIconCollection("sap_fiori_3", "my-custom-collection");
+ *
+ * <ui5-icon name="custom-icon-name"></ui5-icon>
+ * </pre>
  *
- * Note: by default SAP-icons-v5 is used in all SAP Horizon variants and SAP-icons-v4 for all the rest.
  * @public
- * @param {string} theme
- * @param {IconCollection} collectionName
+ * @param { string } theme
+ * @param { string } collectionName
  */
 const setDefaultIconCollection = (theme, collectionName) => {
-    if (collectionName === "horizon") {
-        collectionName = IconCollection.v5;
-    }
     IconCollectionConfiguration.set(theme, collectionName);
 };
 /**
- * Returns the default icon collection (v4 or v5) for given theme,
- * that is configured.
+ * Returns the configured default icon collection for a given theme.
  *
- * @param {string} theme
+ * @param { string } theme
  * @public
- * @returns {string | undefined}
+ * @returns { string | undefined }
  */
 const getDefaultIconCollection = (theme) => {
     return IconCollectionConfiguration.get(theme);
 };
 /**
- * Returns the effective icon collection that will be applied for icon web components
- * whenever namespace is not specified.
- * @returns {string}
+ * Returns the effective icon collection,
+ * based on the default icon collection configuration and the current theme:
+ * @param { IconCollection } collectionName
+ * @returns { IconCollection } the effective collection name
  */
-const getEffectiveDefaultIconCollection = () => {
+const getEffectiveIconCollection = (collectionName) => {
     const currentTheme = getTheme();
     const currentThemeConfiguration = IconCollectionConfiguration.get(currentTheme);
-    if (currentThemeConfiguration) {
-        return currentThemeConfiguration;
+    // when no collection is set and default collection is configured - return the configured icon collection
+    if (!collectionName && currentThemeConfiguration) {
+        return getIconCollectionByAlias(currentThemeConfiguration);
+    }
+    // when collection is set - return the theme dependant icon collection
+    // when collection is not set and there is no default icon collection configured - return theme dependant icon collection
+    return getIconCollectionByTheme(collectionName);
+};
+/**
+ * Returns the icon theme dependant collection, based on the collection name and current theme as follows:
+ *
+ * - "no collection" resolves to "SAP-icons-v4" in "Quartz" and "Belize", and to "SAP-icons-v5" in "Horizon" (or as confugred via setDefaultIconCollection)
+ * - "SAP-icons-v4" (and its alias "SAP-icons") forces "SAP-icons v4" in any theme and resolves to itself "SAP-icons-v4"
+ * - "SAP-icons-v5" (and its alias "horizon") forces  "SAP-icons v5" in any theme and resolves to itself "SAP-icons-v5"
+ * - "tnt" (and its alias "SAP-icons-TNT") resolves to "tnt-v2" in "Quartz", "Belize", and resolves to "tnt-v3" in "Horizon"
+ * - "tnt-v2" forces "TNT icons v2" in any theme and resolves to itself "tnt-v2"
+ * - "tnt-v3" forces "TNT icons v3" in any theme and resolves to itself "tnt-v3"
+ * - "business-suite" (and its alias "BusinessSuiteInAppSymbols") has no versioning and resolves to "business-suite"
+ *
+ * <b>Note:</b> "SAP-icons-v4", "SAP-icons-v5", "tnt-v2", "tnt-v3" and "business-suite" are just returned
+ * @param { IconCollection } collectionName
+ * @returns { RegisteredIconCollection } the registered collection name
+ */
+const getIconCollectionByTheme = (collectionName) => {
+    const horizonThemeFamily = isThemeFamily("sap_horizon");
+    if (!collectionName) {
+        return horizonThemeFamily ? RegisteredIconCollection.SAPIconsV5 : RegisteredIconCollection.SAPIconsV4;
+    }
+    if (collectionName === "tnt") {
+        return horizonThemeFamily ? RegisteredIconCollection.SAPIconsTNTV3 : RegisteredIconCollection.SAPIconsTNTV2;
     }
-    return isThemeFamily("sap_horizon") ? IconCollection.v5 : IconCollection.v4;
+    return collectionName;
 };
-export { setDefaultIconCollection, getDefaultIconCollection, getEffectiveDefaultIconCollection, };
+export { setDefaultIconCollection, getDefaultIconCollection, getEffectiveIconCollection, RegisteredIconCollection, };
 //# sourceMappingURL=Icons.js.map

package/dist/config/Icons.js.map

@@ -1 +1 @@
-{"version":3,"file":"Icons.js","sourceRoot":"","sources":["../../src/config/Icons.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE9D,IAAK,cAGJ;AAHD,WAAK,cAAc;IAClB,kCAAgB,CAAA;IAChB,qCAAmB,CAAA;AACpB,CAAC,EAHI,cAAc,KAAd,cAAc,QAGlB;AAED;;;;;;;;GAQG;AACH,MAAM,wBAAwB,GAAG,CAAC,KAAa,EAAE,cAA0C,EAAE,EAAE;IAC9F,IAAI,cAAc,KAAK,SAAS,EAAE;QACjC,cAAc,GAAG,cAAc,CAAC,EAAE,CAAC;KACnC;IAED,2BAA2B,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,wBAAwB,GAAG,CAAC,KAAa,EAAsB,EAAE;IACtE,OAAO,2BAA2B,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,iCAAiC,GAAG,GAAG,EAAE;IAC9C,MAAM,YAAY,GAAG,QAAQ,EAAE,CAAC;IAChC,MAAM,yBAAyB,GAAG,2BAA2B,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAEhF,IAAI,yBAAyB,EAAE;QAC9B,OAAO,yBAAyB,CAAC;KACjC;IAED,OAAO,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC;AAC7E,CAAC,CAAC;AAEF,OAAO,EACN,wBAAwB,EACxB,wBAAwB,EACxB,iCAAiC,GACjC,CAAC"}
+{"version":3,"file":"Icons.js","sourceRoot":"","sources":["../../src/config/Icons.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAElF,MAAM,2BAA2B,GAAG,IAAI,GAAG,EAAkB,CAAC;AAK9D,8FAA8F;AAC9F,IAAK,wBAMJ;AAND,WAAK,wBAAwB;IAC5B,uDAA2B,CAAA;IAC3B,uDAA2B,CAAA;IAC3B,oDAAwB,CAAA;IACxB,oDAAwB,CAAA;IACxB,yDAA6B,CAAA;AAC9B,CAAC,EANI,wBAAwB,KAAxB,wBAAwB,QAM5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,wBAAwB,GAAG,CAAC,KAAa,EAAE,cAA8B,EAAE,EAAE;IAClF,2BAA2B,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,wBAAwB,GAAG,CAAC,KAAa,EAAsB,EAAE;IACtE,OAAO,2BAA2B,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,0BAA0B,GAAG,CAAC,cAA+B,EAAkB,EAAE;IACtF,MAAM,YAAY,GAAG,QAAQ,EAAE,CAAC;IAChC,MAAM,yBAAyB,GAAG,2BAA2B,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAEhF,yGAAyG;IACzG,IAAI,CAAC,cAAc,IAAI,yBAAyB,EAAE;QACjD,OAAO,wBAAwB,CAAC,yBAAyB,CAAC,CAAC;KAC3D;IAED,sEAAsE;IACtE,yHAAyH;IACzH,OAAO,wBAAwB,CAAC,cAAc,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,wBAAwB,GAAG,CAAC,cAA+B,EAA4B,EAAE;IAC9F,MAAM,kBAAkB,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;IAExD,IAAI,CAAC,cAAc,EAAE;QACpB,OAAO,kBAAkB,CAAC,CAAC,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,UAAU,CAAC;KACtG;IAED,IAAI,cAAc,KAAK,KAAK,EAAE;QAC7B,OAAO,kBAAkB,CAAC,CAAC,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC,CAAC,wBAAwB,CAAC,aAAa,CAAC;KAC5G;IAED,OAAO,cAA0C,CAAC;AACnD,CAAC,CAAC;AAEF,OAAO,EACN,wBAAwB,EACxB,wBAAwB,EACxB,0BAA0B,EAC1B,wBAAwB,GACxB,CAAC"}

package/dist/config/RTL.js

@@ -24,6 +24,9 @@ const impliesRTL = (language) => {
  * @returns {boolean} whether RTL should be used
  */
 const getRTL = () => {
+    if (typeof document === "undefined") {
+        return false;
+    }
     const configurationRTL = getConfiguredRTL();
     if (configurationRTL !== undefined) {
         return !!configurationRTL;

package/dist/config/RTL.js.map

@@ -1 +1 @@
-{"version":3,"file":"RTL.js","sourceRoot":"","sources":["../../src/config/RTL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,4BAA4B,MAAM,yCAAyC,CAAC;AACnF,OAAO,uBAAuB,MAAM,oCAAoC,CAAC;AAEzE,MAAM,mBAAmB,GAAG;IAC3B,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;CACV,CAAC;AAEF,MAAM,aAAa,GAAG,4BAA4B,CAAC,6BAA6B,CAAC,IAAI,EAAE,CAAC;AAExF;;;;GAIG;AACH,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,EAAE;IACvC,QAAQ,GAAG,CAAC,QAAQ,IAAI,mBAAmB,CAAC,QAA4C,CAAC,CAAC,IAAI,QAAQ,CAAC;IAEvG,OAAO,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,GAAG,GAAY,EAAE;IAC5B,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IAE5C,IAAI,gBAAgB,KAAK,SAAS,EAAE;QACnC,OAAO,CAAC,CAAC,gBAAgB,CAAC;KAC1B;IAED,OAAO,UAAU,CAAC,WAAW,EAAE,IAAI,uBAAuB,EAAE,CAAC,CAAC;AAC/D,CAAC,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,sBAAsB"}
+{"version":3,"file":"RTL.js","sourceRoot":"","sources":["../../src/config/RTL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,4BAA4B,MAAM,yCAAyC,CAAC;AACnF,OAAO,uBAAuB,MAAM,oCAAoC,CAAC;AAEzE,MAAM,mBAAmB,GAAG;IAC3B,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,IAAI;CACV,CAAC;AAEF,MAAM,aAAa,GAAG,4BAA4B,CAAC,6BAA6B,CAAC,IAAI,EAAE,CAAC;AAExF;;;;GAIG;AACH,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,EAAE;IACvC,QAAQ,GAAG,CAAC,QAAQ,IAAI,mBAAmB,CAAC,QAA4C,CAAC,CAAC,IAAI,QAAQ,CAAC;IAEvG,OAAO,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC7C,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,GAAG,GAAY,EAAE;IAC5B,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;QACpC,OAAO,KAAK,CAAC;KACb;IAED,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IAE5C,IAAI,gBAAgB,KAAK,SAAS,EAAE;QACnC,OAAO,CAAC,CAAC,gBAAgB,CAAC;KAC1B;IAED,OAAO,UAAU,CAAC,WAAW,EAAE,IAAI,uBAAuB,EAAE,CAAC,CAAC;AAC/D,CAAC,CAAC;AAEF,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,sBAAsB"}

package/dist/generated/VersionInfo.js

@@ -1,10 +1,10 @@
 const VersionInfo = {
-	version: "1.11.0-rc.1",
+	version: "1.11.0-rc.2",
 	major: 1,
 	minor: 11,
 	patch: 0,
-	suffix: "-rc.1",
+	suffix: "-rc.2",
 	isNext: false,
-	buildTime: 1675930310,
+	buildTime: 1676535002,
 };
 export default VersionInfo;

package/dist/test/pages/AllTestElements.html

@@ -6,7 +6,7 @@
     <title>Base package default test page</title>
 
 	
-  <script type="module" crossorigin src="/assets/bundle.esm.25073731.js"></script>
+  <script type="module" crossorigin src="/assets/bundle.esm.2d0cb31f.js"></script>
 </head>
 
 <body>

package/dist/test/pages/Configuration.html

@@ -7,7 +7,7 @@
 
 	
 
-  <script type="module" crossorigin src="/assets/bundle.esm.25073731.js"></script>
+  <script type="module" crossorigin src="/assets/bundle.esm.2d0cb31f.js"></script>
 </head>
 
 <body>

package/dist/test/pages/ConfigurationScript.html

@@ -23,7 +23,7 @@
 
 	
 
-  <script type="module" crossorigin src="/assets/bundle.esm.25073731.js"></script>
+  <script type="module" crossorigin src="/assets/bundle.esm.2d0cb31f.js"></script>
 </head>
 
 <body>

package/dist/test/pages/WithComplexTemplate.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>Compex Template Test Page</title>
 	
-  <script type="module" crossorigin src="/assets/bundle.esm.25073731.js"></script>
+  <script type="module" crossorigin src="/assets/bundle.esm.2d0cb31f.js"></script>
 </head>
 
 <body>

package/dist/test/pages/i18n.html

@@ -7,8 +7,8 @@
 
 	
 
-  <script type="module" crossorigin src="/assets/test/pages/i18n.html.4b1c0bdb.js"></script>
-  <link rel="modulepreload" href="/assets/bundle.esm.25073731.js">
+  <script type="module" crossorigin src="/assets/test/pages/i18n.html.cd6e3cfc.js"></script>
+  <link rel="modulepreload" href="/assets/bundle.esm.2d0cb31f.js">
 </head>
 
 <body>

package/dist/test/pages/i18n_texts.html

@@ -8,8 +8,8 @@
 
 	
 
-  <script type="module" crossorigin src="/assets/test/pages/i18n_texts.html.e98a417d.js"></script>
-  <link rel="modulepreload" href="/assets/bundle.esm.25073731.js">
+  <script type="module" crossorigin src="/assets/test/pages/i18n_texts.html.7beb72ee.js"></script>
+  <link rel="modulepreload" href="/assets/bundle.esm.2d0cb31f.js">
 </head>
 
 <body>

package/dist/util/AriaLabelHelper.d.ts

@@ -1,6 +1,15 @@
+import UI5Element from "../UI5Element.js";
+type MutationCallback = () => void;
 declare const getEffectiveAriaLabelText: (el: HTMLElement) => string | undefined;
+/**
+ *
+ * @param {HTMLElement} el Defines the HTMLElement, for which you need to get all related texts
+ */
+declare const getAllAccessibleNameRefTexts: (el: HTMLElement) => string;
 /**
  * @param {HTMLElement} el Defines the HTMLElement, for which you need to get all related "label for" texts
  */
 declare const getAssociatedLabelForTexts: (el: HTMLElement) => string | undefined;
-export { getEffectiveAriaLabelText, getAssociatedLabelForTexts, };
+declare const registerUI5Element: (el: UI5Element, callback: MutationCallback) => void;
+declare const deregisterUI5Element: (el: UI5Element) => void;
+export { getEffectiveAriaLabelText, getAssociatedLabelForTexts, registerUI5Element, deregisterUI5Element, getAllAccessibleNameRefTexts, };

package/dist/util/AriaLabelHelper.js

@@ -1,3 +1,11 @@
+const associatedElements = new WeakMap();
+const registeredElements = new WeakMap();
+const observerOptions = {
+    attributes: true,
+    childList: true,
+    characterData: true,
+    subtree: true,
+};
 const getEffectiveAriaLabelText = (el) => {
     const accessibleEl = el;
     if (!accessibleEl.accessibleNameRef) {
@@ -6,31 +14,59 @@ const getEffectiveAriaLabelText = (el) => {
         }
         return undefined;
     }
-    return _getAriaLabelledByTexts(el);
+    return getAllAccessibleNameRefTexts(el);
 };
 /**
  *
  * @param {HTMLElement} el Defines the HTMLElement, for which you need to get all related texts
  */
-const _getAriaLabelledByTexts = (el) => {
-    const ids = el.accessibleNameRef.split(" ");
+const getAllAccessibleNameRefTexts = (el) => {
+    const ids = el.accessibleNameRef?.split(" ") ?? [];
     const owner = el.getRootNode();
     let result = "";
     ids.forEach((elementId, index) => {
         const element = owner.querySelector(`[id='${elementId}']`);
-        result += `${element && element.textContent ? element.textContent : ""}`;
-        if (index < ids.length - 1) {
-            result += " ";
+        const text = `${element && element.textContent ? element.textContent : ""}`;
+        if (text) {
+            result += text;
+            if (index < ids.length - 1) {
+                result += " ";
+            }
         }
     });
     return result;
 };
+const _getAllAssociatedElementsFromDOM = (el) => {
+    const set = new Set();
+    // adding labels with attribute for matching the el.id
+    const labelsForAssociated = _getAssociatedLabels(el);
+    labelsForAssociated.forEach(itm => {
+        set.add(itm);
+    });
+    // adding other elements that id is the same as accessibleNameRef value
+    const value = el["accessibleNameRef"];
+    const ids = value?.split(" ") ?? [];
+    ids.forEach(id => {
+        const refEl = _getReferencedElementById(el, id);
+        if (refEl) {
+            set.add(refEl);
+        }
+    });
+    return Array.from(set);
+};
+const _getAssociatedLabels = (el) => {
+    const labels = el.getRootNode().querySelectorAll(`[for="${el.id}"]`);
+    return Array.from(labels);
+};
+const _getReferencedElementById = (el, elementId) => {
+    return el.getRootNode().querySelector(`[id='${elementId}']`);
+};
 /**
  * @param {HTMLElement} el Defines the HTMLElement, for which you need to get all related "label for" texts
  */
 const getAssociatedLabelForTexts = (el) => {
     const results = [];
-    const labels = el.getRootNode().querySelectorAll(`[ui5-label][for="${el.id}"],label[for="${el.id}"]`);
+    const labels = _getAssociatedLabels(el);
     labels.forEach((label) => {
         const labelText = label.textContent;
         labelText && results.push(labelText);
@@ -40,5 +76,96 @@ const getAssociatedLabelForTexts = (el) => {
     }
     return undefined;
 };
-export { getEffectiveAriaLabelText, getAssociatedLabelForTexts, };
+const _createInvalidationCallback = (el) => {
+    const invalidationCallback = (changeInfo) => {
+        if (!(changeInfo && changeInfo.type === "property" && changeInfo.name === "accessibleNameRef")) {
+            return;
+        }
+        const registeredElement = registeredElements.get(el);
+        if (!registeredElement) {
+            return;
+        }
+        const oldAssociatedElements = registeredElement.observedElements;
+        const newAssociatedElements = _getAllAssociatedElementsFromDOM(el);
+        oldAssociatedElements.forEach(oldElement => {
+            if (!newAssociatedElements.includes(oldElement)) {
+                _removeObservedElementFromRegisteredElement(registeredElement, oldElement);
+            }
+        });
+        newAssociatedElements.forEach(newElement => {
+            if (!oldAssociatedElements.includes(newElement)) {
+                _addObservedElementToRegisteredElement(registeredElement, newElement);
+                registeredElement.observedElements.push(newElement);
+            }
+        });
+        registeredElement?.callback();
+    };
+    return invalidationCallback;
+};
+const registerUI5Element = (el, callback) => {
+    if (registeredElements.has(el)) {
+        return;
+    }
+    const allAssociatedElements = _getAllAssociatedElementsFromDOM(el);
+    const invalidationCallback = _createInvalidationCallback(el);
+    const registeredElement = {
+        host: el,
+        observedElements: allAssociatedElements,
+        callback,
+        invalidationCallback,
+    };
+    registeredElements.set(el, registeredElement);
+    el.attachInvalidate(invalidationCallback);
+    allAssociatedElements.forEach((element) => {
+        _addObservedElementToRegisteredElement(registeredElement, element);
+    });
+    callback();
+};
+const _addObservedElementToRegisteredElement = (registeredElement, element) => {
+    let associatedElement = associatedElements.get(element);
+    if (!associatedElement) {
+        associatedElement = { observer: null, callbacks: [] };
+        const observer = new MutationObserver(() => {
+            const callbacks = associatedElement.callbacks;
+            callbacks.forEach(callback => {
+                callback();
+            });
+            const domEl = document.getElementById(element.id);
+            // if no longer should be observed from this registeredElement, remove it
+            if (!(registeredElement.host.id === element.getAttribute("for") || domEl)) {
+                _removeObservedElementFromRegisteredElement(registeredElement, element);
+            }
+        });
+        associatedElement.observer = observer;
+        observer.observe(element, observerOptions);
+        associatedElements.set(element, associatedElement);
+    }
+    if (!associatedElement.callbacks.includes(registeredElement.callback)) {
+        associatedElement.callbacks.push(registeredElement.callback);
+    }
+};
+const _removeObservedElementFromRegisteredElement = (registeredElement, element) => {
+    const associatedElement = associatedElements.get(element);
+    if (associatedElement) {
+        associatedElement.callbacks = associatedElement.callbacks.filter(itm => itm !== registeredElement.callback);
+        if (!associatedElement.callbacks.length) {
+            associatedElement.observer?.disconnect();
+            associatedElements.delete(element);
+        }
+    }
+    registeredElement.observedElements = registeredElement.observedElements.filter(itm => itm !== element);
+};
+const deregisterUI5Element = (el) => {
+    const registeredElement = registeredElements.get(el);
+    if (!registeredElement) {
+        return;
+    }
+    const oldObservedElements = [...registeredElement.observedElements];
+    oldObservedElements.forEach(observedElement => {
+        _removeObservedElementFromRegisteredElement(registeredElement, observedElement);
+    });
+    el.detachInvalidate(registeredElement.invalidationCallback);
+    registeredElements.delete(el);
+};
+export { getEffectiveAriaLabelText, getAssociatedLabelForTexts, registerUI5Element, deregisterUI5Element, getAllAccessibleNameRefTexts, };
 //# sourceMappingURL=AriaLabelHelper.js.map

package/dist/util/AriaLabelHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"AriaLabelHelper.js","sourceRoot":"","sources":["../../src/util/AriaLabelHelper.ts"],"names":[],"mappings":"AAKA,MAAM,yBAAyB,GAAG,CAAC,EAAe,EAAE,EAAE;IACrD,MAAM,YAAY,GAAG,EAAuB,CAAC;IAE7C,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE;QACpC,IAAI,YAAY,CAAC,cAAc,EAAE;YAChC,OAAO,YAAY,CAAC,cAAc,CAAC;SACnC;QAED,OAAO,SAAS,CAAC;KACjB;IAED,OAAO,uBAAuB,CAAC,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,uBAAuB,GAAG,CAAC,EAAe,EAAE,EAAE;IACnD,MAAM,GAAG,GAAI,EAAwB,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnE,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,EAAiB,CAAC;IAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,GAAG,CAAC,OAAO,CAAC,CAAC,SAAiB,EAAE,KAAa,EAAE,EAAE;QAChD,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,QAAQ,SAAS,IAAI,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAEzE,IAAI,KAAK,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,MAAM,IAAI,GAAG,CAAC;SACd;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,0BAA0B,GAAG,CAAC,EAAe,EAAE,EAAE;IACtD,MAAM,OAAO,GAAkB,EAAE,CAAC;IAClC,MAAM,MAAM,GAAI,EAAE,CAAC,WAAW,EAAkB,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAEvH,MAAM,CAAC,OAAO,CAAC,CAAC,KAAW,EAAE,EAAE;QAC9B,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC;QACpC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,IAAI,OAAO,CAAC,MAAM,EAAE;QACnB,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACzB;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAEF,OAAO,EACN,yBAAyB,EACzB,0BAA0B,GAC1B,CAAC"}
+{"version":3,"file":"AriaLabelHelper.js","sourceRoot":"","sources":["../../src/util/AriaLabelHelper.ts"],"names":[],"mappings":"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"}

package/package-scripts.js

@@ -16,7 +16,7 @@ const eslintConfig = `--config ${require.resolve("@ui5/webcomponents-tools/compo
 const scripts = {
 	clean: "rimraf jsdoc-dist && rimraf src/generated && rimraf dist && rimraf .port",
 	lint: `eslint . ${eslintConfig}`,
-	prepare: "nps clean integrate copy generateAssetParameters generateVersionInfo generateStyles generateTemplates typescript generateAPI",
+	prepare: "cross-env UI5_TS=true nps clean integrate copy generateAssetParameters generateVersionInfo generateStyles generateTemplates typescript generateAPI",
 	typescript: "tsc",
 	integrate: {
 		default: "nps integrate.copy-used-modules integrate.replace-amd integrate.amd-to-es6 integrate.esm-abs-to-rel integrate.third-party",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-base",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "description": "UI5 Web Components: webcomponents.base",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@buxlabs/amd-to-es6": "0.16.1",
     "@openui5/sap.ui.core": "1.109.0",
-    "@ui5/webcomponents-tools": "1.11.0-rc.1",
+    "@ui5/webcomponents-tools": "1.11.0-rc.2",
     "chromedriver": "109.0.0",
     "clean-css": "^5.2.2",
     "copy-and-watch": "^0.1.5",
@@ -46,5 +46,5 @@
     "replace-in-file": "^6.3.5",
     "resolve": "^1.20.0"
   },
-  "gitHead": "a76323e09b0190bbb72cbff141bb8093b8d0f4ff"
+  "gitHead": "a6334749f4f61a49b1ef754b75fe319991c54c17"
 }

package/src/asset-registries/Icons.ts

@@ -1,6 +1,6 @@
 import getSharedResource from "../getSharedResource.js";
-import IconCollectionsAlias from "../assets-meta/IconCollectionsAlias.js";
-import { getEffectiveDefaultIconCollection } from "../config/Icons.js";
+import { getIconCollectionByAlias } from "../assets-meta/IconCollectionsAlias.js";
+import { getEffectiveIconCollection } from "../config/Icons.js";
 import { I18nText } from "../i18nBundle.js";
 import { TemplateFunction } from "../renderer/executeTemplate.js";
 
@@ -19,7 +19,7 @@ type CollectionData = {
 };
 
 type IconData = {
-	collection?: string,
+	collection: string,
 	packageName: string,
 	pathData: string | Array<string>,
 	ltr: boolean,
@@ -67,11 +67,8 @@ const _fillRegistry = (bundleData: CollectionData) => {
 
 // set
 const registerIcon = (name: string, iconData: IconData) => { // eslint-disable-line
-	if (!iconData.collection) {
-		iconData.collection = getEffectiveDefaultIconCollection();
-	}
-
 	const key = `${iconData.collection}/${name}`;
+
 	registry.set(key, {
 		pathData: iconData.pathData,
 		ltr: iconData.ltr,
@@ -79,38 +76,48 @@ const registerIcon = (name: string, iconData: IconData) => { // eslint-disable-l
 		packageName: iconData.packageName,
 		customTemplate: iconData.customTemplate,
 		viewBox: iconData.viewBox,
+		collection: iconData.collection,
 	});
 };
 
-const _parseName = (name: string) => {
+/**
+ * Processes the full icon name and splits it into - "name", "collection"
+ * to form the proper registry key ("collection/name") under which the icon is registered:
+ *
+ * - removes legacy protocol ("sap-icon://")
+ * - resolves aliases (f.e "SAP-icons-TNT/actor" => "tnt/actor")
+ * - determines theme dependant icon collection (f.e "home" => "SAP-icons-v4/home" in Quartz | "SAP-icons-v5/home" in Horizon)
+ *
+ * @param { string } name
+ * @return { object }
+ */
+const processName = (name: string) => {
 	// silently support ui5-compatible URIs
 	if (name.startsWith("sap-icon://")) {
 		name = name.replace("sap-icon://", "");
 	}
 
-	let collection;
+	let collection: string;
 	[name, collection] = name.split("/").reverse();
-	collection = collection || getEffectiveDefaultIconCollection();
-
-	// Normalize collection name.
-	// - resolve `SAP-icons-TNT` to `tnt`.
-	// - resolve `BusinessSuiteInAppSymbols` to `business-suite`.
-	// - resolve `horizon` to `SAP-icons-v5`,
-	// Note: aliases can be made as a feature, if more collections need it or more aliases are needed.
-	collection = _normalizeCollection(collection);
+
 	name = name.replace("icon-", "");
 
+	if (collection) {
+		collection = getIconCollectionByAlias(collection);
+	}
+	collection = getEffectiveIconCollection(collection);
+
 	const registryKey = `${collection}/${name}`;
 	return { name, collection, registryKey };
 };
 
 const getIconDataSync = (name: string) => {
-	const { registryKey } = _parseName(name);
+	const { registryKey } = processName(name);
 	return registry.get(registryKey);
 };
 
 const getIconData = async (name: string) => {
-	const { collection, registryKey } = _parseName(name);
+	const { collection, registryKey } = processName(name);
 
 	let iconData: string | CollectionData = ICON_NOT_FOUND;
 	try {
@@ -140,14 +147,6 @@ const _getRegisteredNames = async () => {
 	return Array.from(registry.keys());
 };
 
-const _normalizeCollection = (collectionName: string) => {
-	if (IconCollectionsAlias[collectionName as keyof typeof IconCollectionsAlias]) {
-		return IconCollectionsAlias[collectionName as keyof typeof IconCollectionsAlias];
-	}
-
-	return collectionName;
-};
-
 export {
 	registerIconLoader,
 	getIconData,

package/src/assets-meta/IconCollectionsAlias.ts

@@ -1,18 +1,41 @@
 /**
- * Supported icon collection names and aliases.
+ * Supported icon collection aliases.
  *
  * Users might specify a collection, using both the key and the value in the following key-value pairs,
  * e.g the following pairs are completely exchangeable:
- * "SAP-icons-TNT/actor" and "tnt/actor", "BusinessSuiteInAppSymbols/3d" and "business-suite/3d",
- * "SAP-icons-v5/accept" and "horizon/accept".
  *
- * Note: technically, in the code we maintain the collections under the "value" name - "tnt", "business-suite",
- * SAP-icons-v5" and "SAP-icons"(which does not have an alias).
+ * - "SAP-icons/accept" and "SAP-icons-v4/accept"
+ * - "horizon/accept" and "SAP-icons-v5/accept"
+ * - "SAP-icons-TNT/actor" and "tnt/actor"
+ * - "BusinessSuiteInAppSymbols/3d" and "business-suite/3d"
  */
-const IconCollectionsAlias = {
-	"SAP-icons-TNT": "tnt",
-	"BusinessSuiteInAppSymbols": "business-suite",
-	"horizon": "SAP-icons-v5",
+enum IconCollectionsAlias {
+	"SAP-icons" = "SAP-icons-v4",
+	"horizon" = "SAP-icons-v5",
+	"SAP-icons-TNT" = "tnt",
+	"BusinessSuiteInAppSymbols" = "business-suite",
+}
+
+/**
+ * Returns the mapped collection name for a given alias.
+ *
+ * <b>For example</b>:
+ * - "SAP-icons-TNT"resolves to "tnt"
+ * - "BusinessSuiteInAppSymbols" resolves to "business-suite"
+ * - "horizon" resolves to "SAP-icons-v5"
+ *
+ * @param { string } collectionName
+ * @return { string } the normalized collection name
+ */
+const getIconCollectionByAlias = (collectionName: string) => {
+	if (IconCollectionsAlias[collectionName as keyof typeof IconCollectionsAlias]) {
+		return IconCollectionsAlias[collectionName as keyof typeof IconCollectionsAlias];
+	}
+
+	return collectionName;
 };
 
 export default IconCollectionsAlias;
+export {
+	getIconCollectionByAlias,
+};