Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/base/src/Boot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const boot = async (): Promise<void> => {
resolve();

booted = true;
await eventProvider.fireEventAsync("boot");
eventProvider.fireEvent("boot");
};

bootPromise = new Promise(bootExecutor as (resolve: PromiseResolve) => void);
Expand Down
24 changes: 13 additions & 11 deletions packages/base/src/UI5Element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,10 @@ abstract class UI5Element extends HTMLElement {
return;
}

if (!ctor.asyncFinished) {
await ctor.definePromise;
}

renderImmediately(this);
this._domRefReadyPromise._deferredResolve!();
this._fullyConnected = true;
Expand Down Expand Up @@ -1199,13 +1203,6 @@ abstract class UI5Element extends HTMLElement {
return uniqueDependenciesCache.get(this) || [];
}

/**
* Returns a promise that resolves whenever all dependencies for this UI5 Web Component have resolved
*/
static whenDependenciesDefined(): Promise<Array<typeof UI5Element>> {
return Promise.all(this.getUniqueDependencies().map(dep => dep.define()));
}

/**
* Hook that will be called upon custom element definition
*
Expand All @@ -1215,15 +1212,16 @@ abstract class UI5Element extends HTMLElement {
return Promise.resolve();
}

static asyncFinished: boolean;
static definePromise: Promise<[void, void]> | undefined;

/**
* Registers a UI5 Web Component in the browser window object
* @public
*/
static async define(): Promise<typeof UI5Element> {
await boot();

await Promise.all([
this.whenDependenciesDefined(),
this.definePromise = Promise.all([
boot(),
this.onDefine(),
]);

Expand All @@ -1249,6 +1247,10 @@ abstract class UI5Element extends HTMLElement {
registerTag(tag);
customElements.define(tag, this as unknown as CustomElementConstructor);
}

await this.definePromise;
this.asyncFinished = true;

return this;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/compat/src/TableGroupRow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class TableGroupRow extends UI5Element implements ITableRow {
}

get ariaLabelText() {
return `${TableGroupRow.i18nBundle.getText(TABLE_GROUP_ROW_ARIA_LABEL)} ${this.innerText}. ${this.forcedAriaPosition}`;
return `${TableGroupRow.i18nBundle.getText(TABLE_GROUP_ROW_ARIA_LABEL)} ${this.textContent}. ${this.forcedAriaPosition}`;
}

visibleColCount(): number {
Expand Down
5 changes: 4 additions & 1 deletion packages/main/src/Calendar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,10 @@ class Calendar extends CalendarPart {
}

static async onDefine() {
Calendar.i18nBundle = await getI18nBundle("@ui5/webcomponents");
[Calendar.i18nBundle] = await Promise.all([
getI18nBundle("@ui5/webcomponents"),
super.onDefine(),
]);
}

/**
Expand Down