From 451d2204e79a4a10c1eb829ab0bd75c137b02475 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 2 Mar 2023 10:05:15 -0500 Subject: [PATCH] fix(menu, split-pane): ssr does not fail on null customElements check (#26854) resolves #24714 --- core/src/components/menu/menu.tsx | 2 +- core/src/components/split-pane/split-pane.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx index 178491bef9..fdae1de8c9 100644 --- a/core/src/components/menu/menu.tsx +++ b/core/src/components/menu/menu.tsx @@ -173,7 +173,7 @@ export class Menu implements ComponentInterface, MenuI { async connectedCallback() { // TODO: connectedCallback is fired in CE build // before WC is defined. This needs to be fixed in Stencil. - if (typeof (customElements as any) !== 'undefined') { + if (typeof (customElements as any) !== 'undefined' && (customElements as any) != null) { await customElements.whenDefined('ion-menu'); } diff --git a/core/src/components/split-pane/split-pane.tsx b/core/src/components/split-pane/split-pane.tsx index eebcfbfbba..decd5d7a59 100644 --- a/core/src/components/split-pane/split-pane.tsx +++ b/core/src/components/split-pane/split-pane.tsx @@ -65,7 +65,7 @@ export class SplitPane implements ComponentInterface { async connectedCallback() { // TODO: connectedCallback is fired in CE build // before WC is defined. This needs to be fixed in Stencil. - if (typeof (customElements as any) !== 'undefined') { + if (typeof (customElements as any) !== 'undefined' && (customElements as any) != null) { await customElements.whenDefined('ion-split-pane'); } this.styleChildren();