diff --git a/package.json b/package.json index e9163ecb64f..25969b84307 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "0.0.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-widget-api": "^1.4.0", + "matrix-widget-api": "^1.5.0", "memoize-one": "^6.0.0", "minimist": "^1.2.5", "oidc-client-ts": "^2.2.4", diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx index 2c1125e56d3..40770297403 100644 --- a/src/components/views/elements/AppTile.tsx +++ b/src/components/views/elements/AppTile.tsx @@ -345,14 +345,16 @@ export default class AppTile extends React.Component { private setupSgListeners(): void { this.sgWidget?.on("preparing", this.onWidgetPreparing); + this.sgWidget?.on("error:preparing", this.updateRequiresClient); // emits when the capabilities have been set up or changed - this.sgWidget?.on("capabilitiesNotified", this.onWidgetCapabilitiesNotified); + this.sgWidget?.on("capabilitiesNotified", this.updateRequiresClient); } private stopSgListeners(): void { if (!this.sgWidget) return; this.sgWidget.off("preparing", this.onWidgetPreparing); - this.sgWidget.off("capabilitiesNotified", this.onWidgetCapabilitiesNotified); + this.sgWidget.off("error:preparing", this.updateRequiresClient); + this.sgWidget.off("capabilitiesNotified", this.updateRequiresClient); } private resetWidget(newProps: IProps): void { @@ -441,7 +443,7 @@ export default class AppTile extends React.Component { this.setState({ loading: false }); }; - private onWidgetCapabilitiesNotified = (): void => { + private updateRequiresClient = (): void => { this.setState({ requiresClient: !!this.sgWidget?.widgetApi?.hasCapability(ElementWidgetCapabilities.RequiresClient), }); diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts index 2781612a0c3..42cf56f95a7 100644 --- a/src/stores/widgets/StopGapWidget.ts +++ b/src/stores/widgets/StopGapWidget.ts @@ -285,6 +285,7 @@ export class StopGapWidget extends EventEmitter { this.messaging = new ClientWidgetApi(this.mockWidget, iframe, driver); this.messaging.on("preparing", () => this.emit("preparing")); + this.messaging.on("error:preparing", (err: unknown) => this.emit("error:preparing", err)); this.messaging.on("ready", () => { WidgetMessagingStore.instance.storeMessaging(this.mockWidget, this.roomId, this.messaging!); this.emit("ready"); diff --git a/yarn.lock b/yarn.lock index 90dcf8732bb..a8c14e5f2ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7019,14 +7019,6 @@ matrix-web-i18n@^1.4.0: "@babel/traverse" "^7.18.5" walk "^2.3.15" -matrix-widget-api@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.4.0.tgz#e426ec16a013897f3a4a9c2bff423f54ab0ba745" - integrity sha512-dw0dRylGQzDUoiaY/g5xx1tBbS7aoov31PRtFMAvG58/4uerYllV9Gfou7w+I1aglwB6hihTREzKltVjARWV6A== - dependencies: - "@types/events" "^3.0.0" - events "^3.2.0" - matrix-widget-api@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.5.0.tgz#4ae3e46a7f2854f944ddaf8a5af63d72fba76c45"