@ui5/webcomponents-base 0.0.0-96e98c995 → 0.0.0-97cba4b0b

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;QAClB,sBAAsB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;KAChC;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;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,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"}

package/dist/theming/getStylesString.d.ts

@@ -1,3 +1,3 @@
-import { ComponentStylesData } from "../types.js";
+import type { ComponentStylesData } from "../types.js";
 declare const getStylesString: (styles: ComponentStylesData) => string;
 export default getStylesString;

package/dist/types/AnimationMode.d.ts

@@ -1,7 +1,7 @@
 /**
  * Different types of AnimationMode.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/AnimationMode.js

@@ -1,7 +1,7 @@
 /**
  * Different types of AnimationMode.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/CSSColor.d.ts

@@ -8,7 +8,6 @@ import DataType from "./DataType.js";
  * @author SAP SE
  * @alias sap.ui.webc.base.types.CSSColor
  * @public
- * @enum {string}
  */
 declare class CSSColor extends DataType {
     static isValid(value: string): boolean;

package/dist/types/CSSColor.js

@@ -8,7 +8,6 @@ import DataType from "./DataType.js";
  * @author SAP SE
  * @alias sap.ui.webc.base.types.CSSColor
  * @public
- * @enum {string}
  */
 class CSSColor extends DataType {
     static isValid(value) {

package/dist/types/CSSColor.js.map

@@ -1 +1 @@
-{"version":3,"file":"CSSColor.js","sourceRoot":"","sources":["../../src/types/CSSColor.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC;;;;;;;;;;GAUG;AACH,MAAM,QAAS,SAAQ,QAAQ;IAC9B,MAAM,CAAU,OAAO,CAAC,KAAa;QACpC,OAAO,8/DAA8/D,CAAC,IAAI,CAAC,KAAK,CAAE,CAAC,CAAC,sBAAsB;IAC3iE,CAAC;CACD;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"CSSColor.js","sourceRoot":"","sources":["../../src/types/CSSColor.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC;;;;;;;;;GASG;AACH,MAAM,QAAS,SAAQ,QAAQ;IAC9B,MAAM,CAAU,OAAO,CAAC,KAAa;QACpC,OAAO,8/DAA8/D,CAAC,IAAI,CAAC,KAAK,CAAE,CAAC,CAAC,sBAAsB;IAC3iE,CAAC;CACD;AAED,eAAe,QAAQ,CAAC"}

package/dist/types/CalendarType.d.ts

@@ -1,7 +1,7 @@
 /**
  * Different calendar types.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/CalendarType.js

@@ -1,7 +1,7 @@
 /**
  * Different calendar types.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/Float.d.ts

@@ -9,7 +9,6 @@ import DataType from "./DataType.js";
  * @author SAP SE
  * @alias sap.ui.webc.base.types.Float
  * @public
- * @enum {number}
  */
 declare class Float extends DataType {
     static isValid(value: any): boolean;

package/dist/types/Float.js

@@ -8,7 +8,6 @@ import DataType from "./DataType.js";
  * @author SAP SE
  * @alias sap.ui.webc.base.types.Float
  * @public
- * @enum {number}
  */
 class Float extends DataType {
     static isValid(value) {

package/dist/types/Float.js.map

@@ -1 +1 @@
-{"version":3,"file":"Float.js","sourceRoot":"","sources":["../../src/types/Float.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC;;;;;;;;;;GAUG;AACH,MAAM,KAAM,SAAQ,QAAQ;IAC3B,MAAM,CAAU,OAAO,CAAC,KAAU;QACjC,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;IAChC,CAAC;IAED,MAAM,CAAU,mBAAmB,CAAC,cAAsB;QACzD,OAAO,UAAU,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;CACD;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Float.js","sourceRoot":"","sources":["../../src/types/Float.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC;;;;;;;;;GASG;AACH,MAAM,KAAM,SAAQ,QAAQ;IAC3B,MAAM,CAAU,OAAO,CAAC,KAAU;QACjC,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;IAChC,CAAC;IAED,MAAM,CAAU,mBAAmB,CAAC,cAAsB;QACzD,OAAO,UAAU,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC;CACD;AAED,eAAe,KAAK,CAAC"}

package/dist/types/Integer.d.ts

@@ -9,7 +9,6 @@ import DataType from "./DataType.js";
  * @author SAP SE
  * @alias sap.ui.webc.base.types.Integer
  * @public
- * @enum {number}
  */
 declare class Integer extends DataType {
     static isValid(value: any): boolean;

package/dist/types/Integer.js

@@ -8,7 +8,6 @@ import DataType from "./DataType.js";
  * @author SAP SE
  * @alias sap.ui.webc.base.types.Integer
  * @public
- * @enum {number}
  */
 class Integer extends DataType {
     static isValid(value) {

package/dist/types/Integer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Integer.js","sourceRoot":"","sources":["../../src/types/Integer.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC;;;;;;;;;;GAUG;AACH,MAAM,OAAQ,SAAQ,QAAQ;IAC7B,MAAM,CAAU,OAAO,CAAC,KAAU;QACjC,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,CAAU,mBAAmB,CAAC,cAAsB;QACzD,OAAO,QAAQ,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;CACD;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"Integer.js","sourceRoot":"","sources":["../../src/types/Integer.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC;;;;;;;;;GASG;AACH,MAAM,OAAQ,SAAQ,QAAQ;IAC7B,MAAM,CAAU,OAAO,CAAC,KAAU;QACjC,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,CAAU,mBAAmB,CAAC,cAAsB;QACzD,OAAO,QAAQ,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;CACD;AAED,eAAe,OAAO,CAAC"}

package/dist/types/InvisibleMessageMode.d.ts

@@ -1,7 +1,7 @@
 /**
  * Enumeration for different mode behaviors of the InvisibleMessage.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/InvisibleMessageMode.js

@@ -1,7 +1,7 @@
 /**
  * Enumeration for different mode behaviors of the InvisibleMessage.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/ItemNavigationBehavior.d.ts

@@ -1,7 +1,7 @@
 /**
  * Different behavior for ItemNavigation.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/ItemNavigationBehavior.js

@@ -1,7 +1,7 @@
 /**
  * Different behavior for ItemNavigation.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/NavigationMode.d.ts

@@ -1,7 +1,7 @@
 /**
  * Different navigation modes for ItemNavigation.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/NavigationMode.js

@@ -1,7 +1,7 @@
 /**
  * Different navigation modes for ItemNavigation.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/ValueState.d.ts

@@ -1,7 +1,7 @@
 /**
  * Different types of ValueStates.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/types/ValueState.js

@@ -1,7 +1,7 @@
 /**
  * Different types of ValueStates.
  *
- * @class
+ * @readonly
  * @enum {string}
  * @public
  * @author SAP SE

package/dist/updateShadowRoot.js

@@ -28,6 +28,10 @@ const updateShadowRoot = (element, forStaticArea = false) => {
     else { // FF, Safari
         styleStrOrHrefsArr = getEffectiveStyle(ctor, forStaticArea);
     }
+    if (ctor.renderer) {
+        ctor.renderer(renderResult, shadowRoot, styleStrOrHrefsArr, forStaticArea, { host: element });
+        return;
+    }
     ctor.render(renderResult, shadowRoot, styleStrOrHrefsArr, forStaticArea, { host: element });
 };
 export default updateShadowRoot;

package/dist/updateShadowRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateShadowRoot.js","sourceRoot":"","sources":["../src/updateShadowRoot.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,qBAAqB,MAAM,oCAAoC,CAAC;AACvE,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAC/D,OAAO,sBAAsB,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C;;;;GAIG;AACH,MAAM,gBAAgB,GAAG,CAAC,OAAmB,EAAE,aAAa,GAAG,KAAK,EAAE,EAAE;IACvE,IAAI,kBAAkB,CAAC;IACvB,MAAM,IAAI,GAAG,OAAO,CAAC,WAAgC,CAAC;IACtD,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,UAAU,CAAC;IACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,cAAe,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IAC3F,MAAM,YAAY,GAAG,eAAe,CAAC,QAAS,EAAE,OAAO,CAAC,CAAC,CAAC,kDAAkD;IAE5G,IAAI,CAAC,UAAU,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,CAAC,sBAAsB;QACzE,OAAO;KACP;IAED,IAAI,cAAc,EAAE,EAAE;QACrB,kBAAkB,GAAG,sBAAsB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KACjE;SAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,EAAE,SAAS;QAClD,UAAU,CAAC,kBAAkB,GAAG,qBAAqB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KAC3E;SAAM,EAAE,aAAa;QACrB,kBAAkB,GAAG,iBAAiB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KAC5D;IAED,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,EAAE,kBAAkB,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAC7F,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"updateShadowRoot.js","sourceRoot":"","sources":["../src/updateShadowRoot.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,qBAAqB,MAAM,oCAAoC,CAAC;AACvE,OAAO,iBAAiB,MAAM,gCAAgC,CAAC;AAC/D,OAAO,sBAAsB,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C;;;;GAIG;AACH,MAAM,gBAAgB,GAAG,CAAC,OAAmB,EAAE,aAAa,GAAG,KAAK,EAAE,EAAE;IACvE,IAAI,kBAAkB,CAAC;IACvB,MAAM,IAAI,GAAG,OAAO,CAAC,WAAgC,CAAC;IACtD,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,UAAU,CAAC;IACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,cAAe,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IAC3F,MAAM,YAAY,GAAG,eAAe,CAAC,QAAS,EAAE,OAAO,CAAC,CAAC,CAAC,kDAAkD;IAE5G,IAAI,CAAC,UAAU,EAAE;QAChB,OAAO,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,CAAC,sBAAsB;QACzE,OAAO;KACP;IAED,IAAI,cAAc,EAAE,EAAE;QACrB,kBAAkB,GAAG,sBAAsB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KACjE;SAAM,IAAI,QAAQ,CAAC,kBAAkB,EAAE,EAAE,SAAS;QAClD,UAAU,CAAC,kBAAkB,GAAG,qBAAqB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KAC3E;SAAM,EAAE,aAAa;QACrB,kBAAkB,GAAG,iBAAiB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KAC5D;IAED,IAAI,IAAI,CAAC,QAAQ,EAAE;QAClB,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,UAAU,EAAE,kBAAkB,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9F,OAAO;KACP;IAED,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,EAAE,kBAAkB,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAC7F,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

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/dist/util/FocusableElements.js

@@ -21,12 +21,15 @@ const isElemFocusable = (el) => {
 };
 const findFocusableElement = async (container, forward, startFromContainer) => {
     let child;
+    let assignedElements;
+    let currentIndex = -1;
     if (container.shadowRoot) {
         child = forward ? container.shadowRoot.firstChild : container.shadowRoot.lastChild;
     }
     else if (container instanceof HTMLSlotElement && container.assignedNodes()) {
-        const assignedElements = container.assignedNodes();
-        child = forward ? assignedElements[0] : assignedElements[assignedElements.length - 1];
+        assignedElements = container.assignedNodes();
+        currentIndex = forward ? 0 : assignedElements.length - 1;
+        child = assignedElements[currentIndex];
     }
     else if (startFromContainer) {
         child = container;
@@ -54,6 +57,12 @@ const findFocusableElement = async (container, forward, startFromContainer) => {
             }
         }
         child = forward ? originalChild.nextSibling : originalChild.previousSibling;
+        // If the child element is not part of the currently assigned element,
+        // we have to check the next element assigned to the slot or continue with the next sibling of the slot,
+        // otherwise, the nextSibling is the next element inside the light DOM
+        if (assignedElements && !assignedElements[currentIndex].contains(child)) {
+            child = assignedElements[++currentIndex];
+        }
     }
     /* eslint-enable no-await-in-loop */
     return null;

package/dist/util/FocusableElements.js.map

@@ -1 +1 @@
-{"version":3,"file":"FocusableElements.js","sourceRoot":"","sources":["../../src/util/FocusableElements.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FocusableElements.js","sourceRoot":"","sources":["../../src/util/FocusableElements.ts"],"names":[],"mappings":"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"}

package/dist/util/getClassCopy.d.ts

@@ -60,10 +60,10 @@ declare const getClassCopy: (klass: typeof UI5Element, constructorCallback: () =
         getDomRef(): HTMLElement | undefined;
         getFocusDomRef(): HTMLElement | undefined;
         getFocusDomRefAsync(): Promise<HTMLElement | undefined>;
-        focus(): Promise<void>;
+        focus(focusOptions?: FocusOptions | undefined): Promise<void>;
         fireEvent<T>(name: string, data?: T | undefined, cancelable?: boolean, bubbles?: boolean): boolean;
         _fireEvent<T_1>(name: string, data?: T_1 | undefined, cancelable?: boolean, bubbles?: boolean): boolean;
-        getSlottedNodes(slotName: string): Node[];
+        getSlottedNodes<T_2 = Node>(slotName: string): T_2[];
         readonly effectiveDir: string | undefined;
         readonly isUI5Element: boolean;
         readonly classes: import("../types.js").ClassMap;
@@ -174,21 +174,21 @@ declare const getClassCopy: (klass: typeof UI5Element, constructorCallback: () =
         readonly parentNode: ParentNode | null;
         readonly previousSibling: ChildNode | null;
         textContent: string | null;
-        appendChild<T_2 extends Node>(node: T_2): T_2;
+        appendChild<T_3 extends Node>(node: T_3): T_3;
         cloneNode(deep?: boolean | undefined): Node;
         compareDocumentPosition(other: Node): number;
         contains(other: Node | null): boolean;
         getRootNode(options?: GetRootNodeOptions | undefined): Node;
         hasChildNodes(): boolean;
-        insertBefore<T_3 extends Node>(node: T_3, child: Node | null): T_3;
+        insertBefore<T_4 extends Node>(node: T_4, child: Node | null): T_4;
         isDefaultNamespace(namespace: string | null): boolean;
         isEqualNode(otherNode: Node | null): boolean;
         isSameNode(otherNode: Node | null): boolean;
         lookupNamespaceURI(prefix: string | null): string | null;
         lookupPrefix(namespace: string | null): string | null;
         normalize(): void;
-        removeChild<T_4 extends Node>(child: T_4): T_4;
-        replaceChild<T_5 extends Node>(node: Node, child: T_5): T_5;
+        removeChild<T_5 extends Node>(child: T_5): T_5;
+        replaceChild<T_6 extends Node>(node: Node, child: T_6): T_6;
         readonly ATTRIBUTE_NODE: number;
         readonly CDATA_SECTION_NODE: number;
         readonly COMMENT_NODE: number;
@@ -379,9 +379,8 @@ declare const getClassCopy: (klass: typeof UI5Element, constructorCallback: () =
     template?: import("../renderer/executeTemplate.js").TemplateFunction | undefined;
     staticAreaTemplate?: import("../renderer/executeTemplate.js").TemplateFunction | undefined;
     _metadata: import("../UI5ElementMetadata.js").default;
-    render: (templateFunctionResult: object, container: HTMLElement | DocumentFragment, styleStrOrHrefsArr: string | string[] | undefined, forStaticArea: boolean, options: {
-        host: HTMLElement;
-    }) => void;
+    render: import("../UI5Element.js").Renderer;
+    renderer?: import("../UI5Element.js").Renderer | undefined;
     readonly observedAttributes: string[];
     _needsShadowDOM(): boolean;
     _needsStaticArea(): boolean;
@@ -395,6 +394,5 @@ declare const getClassCopy: (klass: typeof UI5Element, constructorCallback: () =
     onDefine(): Promise<void>;
     define(): Promise<typeof UI5Element>;
     getMetadata(): import("../UI5ElementMetadata.js").default;
-    decoratorMetadata: import("../UI5ElementMetadata.js").Metadata;
 };
 export default getClassCopy;

package/lib/generate-styles/index.js

@@ -3,19 +3,24 @@ const path = require('path');
 const CleanCSS = require('clean-css');
 
 const generate = async () => {
-	await fs.mkdir("dist/generated/css/", {recursive: true});
+	await fs.mkdir("src/generated/css/", {recursive: true});
 
 	const files = (await fs.readdir("src/css/")).filter(file => file.endsWith(".css"));
 	const filesPromises = files.map(async file => {
 		let content = await fs.readFile(path.join("src/css/", file));
 		const res = new CleanCSS().minify(`${content}`);
-		content = `export default {
+		content = `import type { StyleData } from "../../types.js";
+
+const styleData: StyleData = {
 	packageName: "@ui5/webcomponents-base",
 	fileName: "${file}",
-	content: \`${res.styles}\`
-};`;
+	content: \`${res.styles}\`,
+};
+
+export default styleData;
+`;
 
-		return fs.writeFile(path.join("dist/generated/css/", `${file}.js`), content);
+		return fs.writeFile(path.join("src/generated/css/", `${file}.ts`), content);
 	});
 
 	return Promise.all(filesPromises);