@ui5/webcomponents-base 0.0.0-2f7664755 → 0.0.0-31ad69296

package/dist/UI5Element.d.ts

@@ -1,8 +1,17 @@
+import "@ui5/webcomponents-base/dist/ssr-dom.js";
 import UI5ElementMetadata, { Slot, SlotValue, State, PropertyValue, Metadata } from "./UI5ElementMetadata.js";
 import EventProvider from "./EventProvider.js";
 import StaticAreaItem from "./StaticAreaItem.js";
-import { TemplateFunction, TemplateFunctionResult } from "./renderer/executeTemplate.js";
-import { PromiseResolve, ComponentStylesData, ClassMap } from "./types.js";
+import type { TemplateFunction, TemplateFunctionResult } from "./renderer/executeTemplate.js";
+import type { AccessibilityInfo, PromiseResolve, ComponentStylesData, ClassMap } from "./types.js";
+type Renderer = (templateResult: TemplateFunctionResult, container: HTMLElement | DocumentFragment, styleStrOrHrefsArr: string | Array<string> | undefined, forStaticArea: boolean, options: RendererOptions) => void;
+type RendererOptions = {
+    /**
+     * An object to use as the `this` value for event listeners. It's often
+     * useful to set this to the host component rendering a template.
+     */
+    host?: object;
+};
 type ChangeInfo = {
     type: "property" | "slot";
     name: string;
@@ -18,12 +27,9 @@ type InvalidationInfo = ChangeInfo & {
 type ChildChangeListener = (param: InvalidationInfo) => void;
 type SlotChangeListener = (this: HTMLSlotElement, ev: Event) => void;
 /**
+ * @class
  * Base class for all UI5 Web Components
  *
- * @class
- * @constructor
- * @author SAP SE
- * @alias sap.ui.webc.base.UI5Element
  * @extends HTMLElement
  * @public
  */
@@ -31,7 +37,8 @@ declare abstract class UI5Element extends HTMLElement {
     __id?: string;
     _suppressInvalidation: boolean;
     _changedState: Array<ChangeInfo>;
-    _eventProvider: EventProvider<InvalidationInfo, void>;
+    _invalidationEventProvider: EventProvider<InvalidationInfo, void>;
+    _componentStateFinalizedEventProvider: EventProvider<void, void>;
     _inDOM: boolean;
     _fullyConnected: boolean;
     _childChangeListeners: Map<string, ChildChangeListener>;
@@ -41,15 +48,16 @@ declare abstract class UI5Element extends HTMLElement {
     };
     _doNotSyncAttributes: Set<string>;
     _state: State;
-    _onComponentStateFinalized?: () => void;
     _getRealDomRef?: () => HTMLElement;
     staticAreaItem?: StaticAreaItem;
     static template?: TemplateFunction;
     static staticAreaTemplate?: TemplateFunction;
     static _metadata: UI5ElementMetadata;
-    static render: (templateFunctionResult: TemplateFunctionResult, container: HTMLElement | DocumentFragment, styleStrOrHrefsArr: string | Array<string> | undefined, forStaticArea: boolean, options: {
-        host: HTMLElement;
-    }) => void;
+    /**
+     * @deprecated
+     */
+    static render: Renderer;
+    static renderer?: Renderer;
     constructor();
     /**
      * Returns a unique ID for this UI5 Element
@@ -58,6 +66,8 @@ declare abstract class UI5Element extends HTMLElement {
      * @protected
      */
     get _id(): string;
+    render(): object;
+    renderStatic(): object;
     /**
      * Do not call this method from derivatives of UI5Element, use "onEnterDOM" only
      * @private
@@ -113,22 +123,22 @@ declare abstract class UI5Element extends HTMLElement {
     /**
      * Attach a callback that will be executed whenever the component is invalidated
      *
-     * @param {InvalidationInfo} callback
+     * @param callback
      * @public
      */
     attachInvalidate(callback: (param: InvalidationInfo) => void): void;
     /**
      * Detach the callback that is executed whenever the component is invalidated
      *
-     * @param {InvalidationInfo} callback
+     * @param callback
      * @public
      */
     detachInvalidate(callback: (param: InvalidationInfo) => void): void;
     /**
      * Callback that is executed whenever a monitored child changes its state
      *
-     * @param {sting} slotName the slot in which a child was invalidated
-     * @param { ChangeInfo } childChangeInfo the changeInfo object for the child in the given slot
+     * @param slotName the slot in which a child was invalidated
+     * @param childChangeInfo the changeInfo object for the child in the given slot
      * @private
      */
     _onChildChange(slotName: string, childChangeInfo: ChangeInfo): void;
@@ -153,15 +163,13 @@ declare abstract class UI5Element extends HTMLElement {
      * Returns a singleton event listener for the "change" event of a child in a given slot
      *
      * @param slotName the name of the slot, where the child is
-     * @returns {ChildChangeListener}
      * @private
      */
-    _getChildChangeListener(slotName: string): ChildChangeListener | undefined;
+    _getChildChangeListener(slotName: string): ChildChangeListener;
     /**
      * Returns a singleton slotchange event listener that invalidates the component due to changes in the given slot
      *
      * @param slotName the name of the slot, where the slot element (whose slotchange event we're listening to) is
-     * @returns {SlotChangeListener}
      * @private
      */
     _getSlotChangeListener(slotName: string): SlotChangeListener;
@@ -245,7 +253,7 @@ declare abstract class UI5Element extends HTMLElement {
     getFocusDomRefAsync(): Promise<HTMLElement | undefined>;
     /**
      * Set the focus to the element, returned by "getFocusDomRef()" (marked by "data-sap-focus-ref")
-     * @param {FocusOptions} focusOptions additional options for the focus
+     * @param focusOptions additional options for the focus
      * @public
      */
     focus(focusOptions?: FocusOptions): Promise<void>;
@@ -256,7 +264,7 @@ declare abstract class UI5Element extends HTMLElement {
      * @param data - additional data for the event
      * @param cancelable - true, if the user can call preventDefault on the event object
      * @param bubbles - true, if the event bubbles
-     * @returns {boolean} false, if the event was cancelled (preventDefault called), true otherwise
+     * @returns false, if the event was cancelled (preventDefault called), true otherwise
      */
     fireEvent<T>(name: string, data?: T, cancelable?: boolean, bubbles?: boolean): boolean;
     _fireEvent<T>(name: string, data?: T, cancelable?: boolean, bubbles?: boolean): boolean;
@@ -265,22 +273,41 @@ declare abstract class UI5Element extends HTMLElement {
      * Useful when there are transitive slots in nested component scenarios and you don't want to get a list of the slots, but rather of their content.
      * @public
      */
-    getSlottedNodes(slotName: string): Node[];
+    getSlottedNodes<T = Node>(slotName: string): Array<T>;
+    /**
+     * Attach a callback that will be executed whenever the component's state is finalized
+     *
+     * @param callback
+     * @public
+     */
+    attachComponentStateFinalized(callback: () => void): void;
+    /**
+     * Detach the callback that is executed whenever the component's state is finalized
+     *
+     * @param callback
+     * @public
+     */
+    detachComponentStateFinalized(callback: () => void): void;
     /**
      * Determines whether the component should be rendered in RTL mode or not.
      * Returns: "rtl", "ltr" or undefined
      *
      * @public
-     * @returns {String|undefined}
+     * @default undefined
      */
     get effectiveDir(): string | undefined;
     /**
      * Used to duck-type UI5 elements without using instanceof
-     * @returns {boolean}
      * @public
+     * @default true
      */
     get isUI5Element(): boolean;
     get classes(): ClassMap;
+    /**
+     * Returns the component accessibility info.
+     * @private
+     */
+    get accessibilityInfo(): AccessibilityInfo;
     /**
      * Do not override this method in derivatives of UI5Element, use metadata properties instead
      * @private
@@ -306,17 +333,12 @@ declare abstract class UI5Element extends HTMLElement {
      * Returns the metadata object for this UI5 Web Component Class
      * @protected
      */
-    static get metadata(): Metadata;
-    /**
-     * Sets a new metadata object for this UI5 Web Component Class
-     * @protected
-     */
-    static set metadata(newMetadata: Metadata);
+    static metadata: Metadata;
     /**
      * Returns the CSS for this UI5 Web Component Class
      * @protected
      */
-    static get styles(): ComponentStylesData;
+    static styles: ComponentStylesData;
     /**
      * Returns the Static Area CSS for this UI5 Web Component Class
      * @protected
@@ -335,40 +357,33 @@ declare abstract class UI5Element extends HTMLElement {
      *
      * @public
      */
-    static getUniqueDependencies(this: typeof UI5Element): (typeof UI5Element)[];
+    static getUniqueDependencies(this: typeof UI5Element): Array<typeof UI5Element>;
     /**
      * Returns a promise that resolves whenever all dependencies for this UI5 Web Component have resolved
-     *
-     * @returns {Promise}
      */
     static whenDependenciesDefined(): Promise<Array<typeof UI5Element>>;
     /**
      * Hook that will be called upon custom element definition
      *
      * @protected
-     * @returns {Promise<void>}
      */
     static onDefine(): Promise<void>;
     /**
      * Registers a UI5 Web Component in the browser window object
      * @public
-     * @returns {Promise<UI5Element>}
      */
     static define(): Promise<typeof UI5Element>;
     /**
      * Returns an instance of UI5ElementMetadata.js representing this UI5 Web Component's full metadata (its and its parents')
      * Note: not to be confused with the "get metadata()" method, which returns an object for this class's metadata only
      * @public
-     * @returns {UI5ElementMetadata}
      */
     static getMetadata(): UI5ElementMetadata;
-    static decoratorMetadata: Metadata;
 }
 /**
  * Always use duck-typing to cover all runtimes on the page.
- * @returns {boolean}
  */
 declare const instanceOfUI5Element: (object: any) => object is UI5Element;
 export default UI5Element;
 export { instanceOfUI5Element };
-export type { ChangeInfo };
+export type { ChangeInfo, Renderer, RendererOptions, };

package/dist/UI5Element.js

@@ -1,3 +1,5 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import "@ui5/webcomponents-base/dist/ssr-dom.js";
 import merge from "./thirdparty/merge.js";
 import { boot } from "./Boot.js";
 import UI5ElementMetadata from "./UI5ElementMetadata.js";
@@ -5,6 +7,7 @@ import EventProvider from "./EventProvider.js";
 import getSingletonElementInstance from "./util/getSingletonElementInstance.js";
 import StaticAreaItem from "./StaticAreaItem.js";
 import updateShadowRoot from "./updateShadowRoot.js";
+import { shouldIgnoreCustomElement } from "./IgnoreCustomElements.js";
 import { renderDeferred, renderImmediately, cancelRender } from "./Render.js";
 import { registerTag, isTagRegistered, recordTagRegistrationFailure } from "./CustomElementsRegistry.js";
 import { observeDOMNode, unobserveDOMNode } from "./DOMObserver.js";
@@ -16,6 +19,7 @@ import { getSlotName, getSlottedNodesList } from "./util/SlotsHelper.js";
 import arraysAreEqual from "./util/arraysAreEqual.js";
 import { markAsRtlAware } from "./locale/RTLAwareRegistry.js";
 import preloadLinks from "./theming/preloadLinks.js";
+import executeTemplate from "./renderer/executeTemplate.js";
 let autoId = 0;
 const elementTimeouts = new Map();
 const uniqueDependenciesCache = new Map();
@@ -34,16 +38,28 @@ function _invalidate(changeInfo) {
     this.onInvalidation(changeInfo);
     this._changedState.push(changeInfo);
     renderDeferred(this);
-    this._eventProvider.fireEvent("invalidate", { ...changeInfo, target: this });
+    this._invalidationEventProvider.fireEvent("invalidate", { ...changeInfo, target: this });
 }
-let metadata = {};
 /**
+ * looks up a property descsriptor including in the prototype chain
+ * @param proto the starting prototype
+ * @param name the property to look for
+ * @returns the property descriptor if found directly or in the prototype chaing, undefined if not found
+ */
+function getPropertyDescriptor(proto, name) {
+    do {
+        const descriptor = Object.getOwnPropertyDescriptor(proto, name);
+        if (descriptor) {
+            return descriptor;
+        }
+        // go up the prototype chain
+        proto = Object.getPrototypeOf(proto);
+    } while (proto && proto !== HTMLElement.prototype);
+}
+/**
+ * @class
  * Base class for all UI5 Web Components
  *
- * @class
- * @constructor
- * @author SAP SE
- * @alias sap.ui.webc.base.UI5Element
  * @extends HTMLElement
  * @public
  */
@@ -57,7 +73,8 @@ class UI5Element extends HTMLElement {
         this._fullyConnected = false; // A flag telling whether the UI5Element's onEnterDOM hook was called (since it's possible to have the element removed from DOM before that)
         this._childChangeListeners = new Map(); // used to store lazy listeners per slot for the child change event of every child inside that slot
         this._slotChangeListeners = new Map(); // used to store lazy listeners per slot for the slotchange event of all slot children inside that slot
-        this._eventProvider = new EventProvider(); // used by parent components for listening to changes to child components
+        this._invalidationEventProvider = new EventProvider(); // used by parent components for listening to changes to child components
+        this._componentStateFinalizedEventProvider = new EventProvider(); // used by friend classes for synchronization
         let deferredResolve;
         this._domRefReadyPromise = new Promise(resolve => {
             deferredResolve = resolve;
@@ -82,6 +99,14 @@ class UI5Element extends HTMLElement {
         }
         return this.__id;
     }
+    render() {
+        const template = this.constructor.template;
+        return executeTemplate(template, this);
+    }
+    renderStatic() {
+        const template = this.constructor.staticAreaTemplate;
+        return executeTemplate(template, this);
+    }
     /**
      * Do not call this method from derivatives of UI5Element, use "onEnterDOM" only
      * @private
@@ -152,14 +177,16 @@ class UI5Element extends HTMLElement {
      */
     _startObservingDOMChildren() {
         const ctor = this.constructor;
-        const shouldObserveChildren = ctor.getMetadata().hasSlots();
+        const metadata = ctor.getMetadata();
+        const shouldObserveChildren = metadata.hasSlots();
         if (!shouldObserveChildren) {
             return;
         }
-        const canSlotText = ctor.getMetadata().canSlotText();
+        const canSlotText = metadata.canSlotText();
+        const hasClonedSlot = Object.keys(metadata.getSlots()).some(slotName => metadata.getSlots()[slotName].cloned);
         const mutationObserverOptions = {
             childList: true,
-            subtree: canSlotText,
+            subtree: canSlotText || hasClonedSlot,
             characterData: canSlotText,
         };
         observeDOMNode(this, this._processChildren.bind(this), mutationObserverOptions);
@@ -220,11 +247,11 @@ class UI5Element extends HTMLElement {
             // Await for not-yet-defined custom elements
             if (child instanceof HTMLElement) {
                 const localName = child.localName;
-                const isCustomElement = localName.includes("-");
-                if (isCustomElement) {
-                    const isDefined = window.customElements.get(localName);
+                const shouldWaitForCustomElement = localName.includes("-") && !shouldIgnoreCustomElement(localName);
+                if (shouldWaitForCustomElement) {
+                    const isDefined = customElements.get(localName);
                     if (!isDefined) {
-                        const whenDefinedPromise = window.customElements.whenDefined(localName); // Class registered, but instances not upgraded yet
+                        const whenDefinedPromise = customElements.whenDefined(localName); // Class registered, but instances not upgraded yet
                         let timeoutPromise = elementTimeouts.get(localName);
                         if (!timeoutPromise) {
                             timeoutPromise = new Promise(resolve => setTimeout(resolve, 1000));
@@ -232,7 +259,7 @@ class UI5Element extends HTMLElement {
                         }
                         await Promise.race([whenDefinedPromise, timeoutPromise]);
                     }
-                    window.customElements.upgrade(child);
+                    customElements.upgrade(child);
                 }
             }
             child = ctor.getMetadata().constructor.validateSlotValue(child, slotData);
@@ -307,26 +334,26 @@ class UI5Element extends HTMLElement {
     /**
      * Attach a callback that will be executed whenever the component is invalidated
      *
-     * @param {InvalidationInfo} callback
+     * @param callback
      * @public
      */
     attachInvalidate(callback) {
-        this._eventProvider.attachEvent("invalidate", callback);
+        this._invalidationEventProvider.attachEvent("invalidate", callback);
     }
     /**
      * Detach the callback that is executed whenever the component is invalidated
      *
-     * @param {InvalidationInfo} callback
+     * @param callback
      * @public
      */
     detachInvalidate(callback) {
-        this._eventProvider.detachEvent("invalidate", callback);
+        this._invalidationEventProvider.detachEvent("invalidate", callback);
     }
     /**
      * Callback that is executed whenever a monitored child changes its state
      *
-     * @param {sting} slotName the slot in which a child was invalidated
-     * @param { ChangeInfo } childChangeInfo the changeInfo object for the child in the given slot
+     * @param slotName the slot in which a child was invalidated
+     * @param childChangeInfo the changeInfo object for the child in the given slot
      * @private
      */
     _onChildChange(slotName, childChangeInfo) {
@@ -436,7 +463,6 @@ class UI5Element extends HTMLElement {
      * Returns a singleton event listener for the "change" event of a child in a given slot
      *
      * @param slotName the name of the slot, where the child is
-     * @returns {ChildChangeListener}
      * @private
      */
     _getChildChangeListener(slotName) {
@@ -449,7 +475,6 @@ class UI5Element extends HTMLElement {
      * Returns a singleton slotchange event listener that invalidates the component due to changes in the given slot
      *
      * @param slotName the name of the slot, where the slot element (whose slotchange event we're listening to) is
-     * @returns {SlotChangeListener}
      * @private
      */
     _getSlotChangeListener(slotName) {
@@ -525,9 +550,7 @@ class UI5Element extends HTMLElement {
         this._suppressInvalidation = true;
         this.onBeforeRendering();
         // Intended for framework usage only. Currently ItemNavigation updates tab indexes after the component has updated its state but before the template is rendered
-        if (this._onComponentStateFinalized) {
-            this._onComponentStateFinalized();
-        }
+        this._componentStateFinalizedEventProvider.fireEvent("componentStateFinalized");
         // resume normal invalidation handling
         this._suppressInvalidation = false;
         // Update the shadow root with the render result
@@ -627,7 +650,7 @@ class UI5Element extends HTMLElement {
     }
     /**
      * Set the focus to the element, returned by "getFocusDomRef()" (marked by "data-sap-focus-ref")
-     * @param {FocusOptions} focusOptions additional options for the focus
+     * @param focusOptions additional options for the focus
      * @public
      */
     async focus(focusOptions) {
@@ -644,13 +667,13 @@ class UI5Element extends HTMLElement {
      * @param data - additional data for the event
      * @param cancelable - true, if the user can call preventDefault on the event object
      * @param bubbles - true, if the event bubbles
-     * @returns {boolean} false, if the event was cancelled (preventDefault called), true otherwise
+     * @returns false, if the event was cancelled (preventDefault called), true otherwise
      */
     fireEvent(name, data, cancelable = false, bubbles = true) {
         const eventResult = this._fireEvent(name, data, cancelable, bubbles);
         const camelCaseEventName = kebabToCamelCase(name);
         if (camelCaseEventName !== name) {
-            return eventResult && this._fireEvent(camelCaseEventName, data, cancelable);
+            return eventResult && this._fireEvent(camelCaseEventName, data, cancelable, bubbles);
         }
         return eventResult;
     }
@@ -685,12 +708,30 @@ class UI5Element extends HTMLElement {
     getSlottedNodes(slotName) {
         return getSlottedNodesList(this[slotName]);
     }
+    /**
+     * Attach a callback that will be executed whenever the component's state is finalized
+     *
+     * @param callback
+     * @public
+     */
+    attachComponentStateFinalized(callback) {
+        this._componentStateFinalizedEventProvider.attachEvent("componentStateFinalized", callback);
+    }
+    /**
+     * Detach the callback that is executed whenever the component's state is finalized
+     *
+     * @param callback
+     * @public
+     */
+    detachComponentStateFinalized(callback) {
+        this._componentStateFinalizedEventProvider.detachEvent("componentStateFinalized", callback);
+    }
     /**
      * Determines whether the component should be rendered in RTL mode or not.
      * Returns: "rtl", "ltr" or undefined
      *
      * @public
-     * @returns {String|undefined}
+     * @default undefined
      */
     get effectiveDir() {
         markAsRtlAware(this.constructor); // if a UI5 Element calls this method, it's considered to be rtl-aware
@@ -698,8 +739,8 @@ class UI5Element extends HTMLElement {
     }
     /**
      * Used to duck-type UI5 elements without using instanceof
-     * @returns {boolean}
      * @public
+     * @default true
      */
     get isUI5Element() {
         return true;
@@ -707,6 +748,13 @@ class UI5Element extends HTMLElement {
     get classes() {
         return {};
     }
+    /**
+     * Returns the component accessibility info.
+     * @private
+     */
+    get accessibilityInfo() {
+        return {};
+    }
     /**
      * Do not override this method in derivatives of UI5Element, use metadata properties instead
      * @private
@@ -718,13 +766,13 @@ class UI5Element extends HTMLElement {
      * @private
      */
     static _needsShadowDOM() {
-        return !!this.template;
+        return !!this.template || Object.prototype.hasOwnProperty.call(this.prototype, "render");
     }
     /**
      * @private
      */
     static _needsStaticArea() {
-        return !!this.staticAreaTemplate;
+        return !!this.staticAreaTemplate || Object.prototype.hasOwnProperty.call(this.prototype, "renderStatic");
     }
     /**
      * @public
@@ -766,8 +814,25 @@ class UI5Element extends HTMLElement {
             if (propData.multiple && propData.defaultValue) {
                 throw new Error(`Cannot set a default value for property "${prop}". All multiple properties are empty arrays by default.`);
             }
+            const descriptor = getPropertyDescriptor(proto, prop);
+            // if the decorator is on a setter, proxy the new setter to it
+            let origSet;
+            if (descriptor?.set) {
+                // eslint-disable-next-line @typescript-eslint/unbound-method
+                origSet = descriptor.set;
+            }
+            // if the decorator is on a setter, there will be a corresponding getter - proxy the new getter to it
+            let origGet;
+            if (descriptor?.get) {
+                // eslint-disable-next-line @typescript-eslint/unbound-method
+                origGet = descriptor.get;
+            }
             Object.defineProperty(proto, prop, {
                 get() {
+                    // proxy the getter to the original accessor if there was one
+                    if (origGet) {
+                        return origGet.call(this);
+                    }
                     if (this._state[prop] !== undefined) {
                         return this._state[prop];
                     }
@@ -792,7 +857,7 @@ class UI5Element extends HTMLElement {
                     value = metadataCtor.validatePropertyValue(value, propData);
                     const propertyType = propData.type;
                     let propertyValidator = propData.validator;
-                    const oldState = this._state[prop];
+                    const oldState = origGet ? origGet.call(this) : this._state[prop];
                     if (propertyType && propertyType.isDataTypeClass) {
                         propertyValidator = propertyType;
                     }
@@ -806,7 +871,13 @@ class UI5Element extends HTMLElement {
                         isDifferent = oldState !== value;
                     }
                     if (isDifferent) {
-                        this._state[prop] = value;
+                        // if the decorator is on a setter, use it for storage
+                        if (origSet) {
+                            origSet.call(this, value);
+                        }
+                        else {
+                            this._state[prop] = value;
+                        }
                         _invalidate.call(this, {
                             type: "property",
                             name: prop,
@@ -840,27 +911,6 @@ class UI5Element extends HTMLElement {
             }
         }
     }
-    /**
-     * Returns the metadata object for this UI5 Web Component Class
-     * @protected
-     */
-    static get metadata() {
-        return metadata;
-    }
-    /**
-     * Sets a new metadata object for this UI5 Web Component Class
-     * @protected
-     */
-    static set metadata(newMetadata) {
-        metadata = newMetadata;
-    }
-    /**
-     * Returns the CSS for this UI5 Web Component Class
-     * @protected
-     */
-    static get styles() {
-        return "";
-    }
     /**
      * Returns the Static Area CSS for this UI5 Web Component Class
      * @protected
@@ -892,8 +942,6 @@ class UI5Element extends HTMLElement {
     }
     /**
      * Returns a promise that resolves whenever all dependencies for this UI5 Web Component have resolved
-     *
-     * @returns {Promise}
      */
     static whenDependenciesDefined() {
         return Promise.all(this.getUniqueDependencies().map(dep => dep.define()));
@@ -902,7 +950,6 @@ class UI5Element extends HTMLElement {
      * Hook that will be called upon custom element definition
      *
      * @protected
-     * @returns {Promise<void>}
      */
     static async onDefine() {
         return Promise.resolve();
@@ -910,7 +957,6 @@ class UI5Element extends HTMLElement {
     /**
      * Registers a UI5 Web Component in the browser window object
      * @public
-     * @returns {Promise<UI5Element>}
      */
     static async define() {
         await boot();
@@ -927,7 +973,7 @@ class UI5Element extends HTMLElement {
         else if (!definedGlobally) {
             this._generateAccessors();
             registerTag(tag);
-            window.customElements.define(tag, this);
+            customElements.define(tag, this);
             preloadLinks(this);
         }
         return this;
@@ -936,29 +982,34 @@ class UI5Element extends HTMLElement {
      * Returns an instance of UI5ElementMetadata.js representing this UI5 Web Component's full metadata (its and its parents')
      * Note: not to be confused with the "get metadata()" method, which returns an object for this class's metadata only
      * @public
-     * @returns {UI5ElementMetadata}
      */
     static getMetadata() {
         if (this.hasOwnProperty("_metadata")) { // eslint-disable-line
             return this._metadata;
         }
-        const effectiveMetadata = Object.keys(this.metadata).length ? this.metadata : this.decoratorMetadata;
-        const metadataObjects = [effectiveMetadata];
+        const metadataObjects = [this.metadata];
         let klass = this; // eslint-disable-line
         while (klass !== UI5Element) {
             klass = Object.getPrototypeOf(klass);
-            const effectiveKlassMetadata = Object.keys(klass.metadata).length ? klass.metadata : klass.decoratorMetadata;
-            metadataObjects.unshift(effectiveKlassMetadata);
+            metadataObjects.unshift(klass.metadata);
         }
         const mergedMetadata = merge({}, ...metadataObjects);
         this._metadata = new UI5ElementMetadata(mergedMetadata);
         return this._metadata;
     }
 }
-UI5Element.decoratorMetadata = {};
+/**
+ * Returns the metadata object for this UI5 Web Component Class
+ * @protected
+ */
+UI5Element.metadata = {};
+/**
+ * Returns the CSS for this UI5 Web Component Class
+ * @protected
+ */
+UI5Element.styles = "";
 /**
  * Always use duck-typing to cover all runtimes on the page.
- * @returns {boolean}
  */
 const instanceOfUI5Element = (object) => {
     return "isUI5Element" in object;