npm - @theia/core - Versions diffs - 1.75.0-next.4 → 1.75.0-next.43 - Mend

@theia/core 1.75.0-next.4 → 1.75.0-next.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (290) hide show

package/lib/browser/widgets/react-renderer.js CHANGED Viewed

@@ -1,4 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReactRenderer = exports.RendererHost = void 0;
+const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
 // *****************************************************************************
 // Copyright (C) 2018 TypeFox and others.
 //
@@ -14,9 +18,6 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReactRenderer = exports.RendererHost = void 0;
-const tslib_1 = require("tslib");
 const inversify_1 = require("inversify");
 const React = require("react");
 const client_1 = require("react-dom/client");
@@ -35,7 +36,7 @@ let ReactRenderer = class ReactRenderer {
     render() {
         // Ignore all render calls after the host element has unmounted
         if (!this.toDispose.disposed) {
-            this.hostRoot.render(React.createElement(React.Fragment, null, this.doRender()));
+            this.hostRoot.render((0, jsx_runtime_1.jsx)(React.Fragment, { children: this.doRender() }));
         }
     }
     doRender() {

package/lib/browser/widgets/react-renderer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"react-renderer.js","sourceRoot":"","sources":["../../../src/browser/widgets/react-renderer.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF~~;;;;~~AAEhF,yCAAyD;AACzD,+BAA+B;AAC/B,6CAAoD;AACpD,yCAAgE;AAGnD,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAG5C,IAAM,aAAa,GAAnB,MAAM,aAAa;IAKtB,YACsC,IAAmB;QALtC,cAAS,GAAG,IAAI,6BAAoB,EAAE,CAAC;QAOtD,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM;QACF,+DAA+D;QAC/D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,~~oBAAC~~,KAAK,CAAC,QAAQ,~~QAAE~~,IAAI,CAAC,QAAQ,EAAE,~~CAAkB~~,CAAC,CAAC;QAC7E,CAAC;IACL,CAAC;IAES,QAAQ;QACd,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAA;AA3BY,sCAAa;wBAAb,aAAa;IADzB,IAAA,sBAAU,GAAE;IAOJ,mBAAA,IAAA,kBAAM,EAAC,oBAAY,CAAC,CAAA;IAAE,mBAAA,IAAA,oBAAQ,GAAE,CAAA;;GAN5B,aAAa,CA2BzB"}
1	+ {"version":3,"file":"react-renderer.js","sourceRoot":"","sources":["../../../src/browser/widgets/react-renderer.tsx"],"names":[],"mappings":";;;;;AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,yCAAyD;AACzD,+BAA+B;AAC/B,6CAAoD;AACpD,yCAAgE;AAGnD,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAG5C,IAAM,aAAa,GAAnB,MAAM,aAAa;IAKtB,YACsC,IAAmB;QALtC,cAAS,GAAG,IAAI,6BAAoB,EAAE,CAAC;QAOtD,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM;QACF,+DAA+D;QAC/D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,uBAAC,KAAK,CAAC,QAAQ,cAAE,IAAI,CAAC,QAAQ,EAAE,GAAkB,CAAC,CAAC;QAC7E,CAAC;IACL,CAAC;IAES,QAAQ;QACd,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAA;AA3BY,sCAAa;wBAAb,aAAa;IADzB,IAAA,sBAAU,GAAE;IAOJ,mBAAA,IAAA,kBAAM,EAAC,oBAAY,CAAC,CAAA;IAAE,mBAAA,IAAA,oBAAQ,GAAE,CAAA;;GAN5B,aAAa,CA2BzB"}

package/lib/browser/widgets/react-widget.js CHANGED Viewed

@@ -1,4 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReactWidget = void 0;
+const tslib_1 = require("tslib");
+const jsx_runtime_1 = require("react/jsx-runtime");
 // *****************************************************************************
 // Copyright (C) 2018 TypeFox and others.
 //
@@ -14,9 +18,6 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReactWidget = void 0;
-const tslib_1 = require("tslib");
 const React = require("react");
 const inversify_1 = require("inversify");
 const common_1 = require("../../common");
@@ -36,7 +37,7 @@ let ReactWidget = class ReactWidget extends widget_1.BaseWidget {
     onUpdateRequest(msg) {
         super.onUpdateRequest(msg);
         if (!this.isDisposed) {
-            this.nodeRoot.render(React.createElement(React.Fragment, null, this.render()));
+            this.nodeRoot.render((0, jsx_runtime_1.jsx)(React.Fragment, { children: this.render() }));
         }
     }
 };

package/lib/browser/widgets/react-widget.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"react-widget.js","sourceRoot":"","sources":["../../../src/browser/widgets/react-widget.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF~~;;;;~~AAEhF,+BAA+B;AAC/B,yCAAkD;AAClD,yCAA0C;AAC1C,qCAA+C;AAC/C,6CAAyC;AACzC,6CAAoD;AAG7C,IAAe,WAAW,GAA1B,MAAe,WAAY,SAAQ,mBAAU;IAIhD,YAAyB,OAAyB;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,aAAa,GAAG;YACjB,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,EAAE;SACzB,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEkB,eAAe,CAAC,GAAY;QAC3C,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,~~oBAAC~~,KAAK,CAAC,QAAQ,~~QAAE~~,IAAI,CAAC,MAAM,EAAE,~~CAAkB~~,CAAC,CAAC;QAC3E,CAAC;IACL,CAAC;CASJ,CAAA;AA5BqB,kCAAW;sBAAX,WAAW;IADhC,IAAA,sBAAU,GAAE;IAKI,mBAAA,IAAA,qBAAS,GAAE,CAAA;;GAJN,WAAW,CA4BhC"}
1	+ {"version":3,"file":"react-widget.js","sourceRoot":"","sources":["../../../src/browser/widgets/react-widget.tsx"],"names":[],"mappings":";;;;;AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,+BAA+B;AAC/B,yCAAkD;AAClD,yCAA0C;AAC1C,qCAA+C;AAC/C,6CAAyC;AACzC,6CAAoD;AAG7C,IAAe,WAAW,GAA1B,MAAe,WAAY,SAAQ,mBAAU;IAIhD,YAAyB,OAAyB;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,aAAa,GAAG;YACjB,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,EAAE;SACzB,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEkB,eAAe,CAAC,GAAY;QAC3C,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,uBAAC,KAAK,CAAC,QAAQ,cAAE,IAAI,CAAC,MAAM,EAAE,GAAkB,CAAC,CAAC;QAC3E,CAAC;IACL,CAAC;CASJ,CAAA;AA5BqB,kCAAW;sBAAX,WAAW;IADhC,IAAA,sBAAU,GAAE;IAKI,mBAAA,IAAA,qBAAS,GAAE,CAAA;;GAJN,WAAW,CA4BhC"}

package/lib/browser/widgets/select-component.d.ts CHANGED Viewed

@@ -29,13 +29,25 @@ export interface SelectComponentState {
 export declare const SELECT_COMPONENT_CONTAINER = "select-component-container";
 export declare class SelectComponent extends React.Component<SelectComponentProps, SelectComponentState> {
     protected dropdownElement: HTMLElement;
-    protected fieldRef: React.RefObject<HTMLDivElement>;
-    protected dropdownRef: React.RefObject<HTMLDivElement>;
+    protected fieldRef: React.RefObject<HTMLDivElement | null>;
+    protected dropdownRef: React.RefObject<HTMLDivElement | null>;
     protected mountedListeners: Map<string, EventListenerOrEventListenerObject>;
     protected optimalWidth: number;
     protected optimalHeight: number;
     protected resizeObserver: ResizeObserver | undefined;
+    /** Window the scroll/wheel/resize listeners are attached to; may differ from the main window in secondary windows. */
+    protected listenersWindow: Window | undefined;
+    /** Perfect-scrollbar ancestors the `ps-scroll-y` listener was attached to. The field may have moved to another window since, so the elements are remembered. */
+    protected psScrollListenerTargets: HTMLElement[];
     constructor(props: SelectComponentProps);
+    /**
+     * The document that currently hosts this component. Falls back to the main document before
+     * the first render. Widgets can be moved to secondary windows, so this must be re-queried
+     * instead of captured once.
+     */
+    protected getHostDocument(): Document;
+    /** Finds or creates the dropdown portal container in the given document. */
+    protected resolveDropdownContainer(hostDocument: Document): HTMLElement;
     protected getInitialSelectedIndex(props: SelectComponentProps): number;
     componentDidUpdate(prevProps: SelectComponentProps, prevState: SelectComponentState): void;
     get options(): readonly SelectOption[];
@@ -46,6 +58,7 @@ export declare class SelectComponent extends React.Component<SelectComponentProp
     protected getOptimalHeight(maxWidth?: number): number;
     protected attachListeners(): void;
     componentWillUnmount(): void;
+    protected detachListeners(): void;
     render(): React.ReactNode;
     protected nextNotSeparator(direction: 'forwards' | 'backwards', startFrom?: number): number;
     protected handleKeypress(ev: React.KeyboardEvent<HTMLDivElement>): void;

package/lib/browser/widgets/select-component.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"select-component.d.ts","sourceRoot":"","sources":["../../../src/browser/widgets/select-component.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,iDAAiD,CAAC;AAEzD,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,oBAAoB;IACjC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,oBAAoB;IACjC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAEvE,qBAAa,eAAgB,SAAQ,KAAK,CAAC,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAC5F,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC;IACvC,SAAS,CAAC,QAAQ,~~kCAAqC~~;IACvD,SAAS,CAAC,WAAW,~~kCAAqC~~;IAC1D,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAa;IACxF,SAAS,CAAC,YAAY,SAAK;IAC3B,SAAS,CAAC,aAAa,SAAK;IAC5B,SAAS,CAAC,cAAc,EAAE,cAAc,GAAG,SAAS,CAAC;~~gBAEzC~~,KAAK,EAAE,oBAAoB;~~IAmBvC~~,SAAS,CAAC,uBAAuB,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM;IAU7D,kBAAkB,CAAC,SAAS,EAAE,oBAAoB,EAAE,SAAS,EAAE,oBAAoB,GAAG,IAAI;IAwBnG,IAAI,OAAO,IAAI,SAAS,YAAY,EAAE,CAErC;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,MAAM,GAAG,SAAS,CAEvC;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAc3C;IAED,SAAS,KAAK,SAAS,IAAI,OAAO,CAEjC;IAED,SAAS,CAAC,eAAe,IAAI,MAAM;IAKnC,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAcrD,SAAS,CAAC,eAAe,IAAI,IAAI;~~IA2DxB~~,oBAAoB,IAAI,IAAI;~~IAe5B~~,MAAM,IAAI,KAAK,CAAC,SAAS;IAoClC,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,GAAG,WAAW,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAkB3F,SAAS,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,IAAI;IA4CvE,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI;IAMtE,SAAS,CAAC,gBAAgB,IAAI,IAAI;~~IAYlC~~,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,IAAI;~~IAc1D~~,SAAS,CAAC,cAAc,IAAI,KAAK,CAAC,SAAS;~~IAuD3C~~,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,KAAK,CAAC,SAAS;IA4B5E,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI;CAIpE"}
1	+ {"version":3,"file":"select-component.d.ts","sourceRoot":"","sources":["../../../src/browser/widgets/select-component.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,iDAAiD,CAAC;AAEzD,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,oBAAoB;IACjC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC9B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,oBAAoB;IACjC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAEvE,qBAAa,eAAgB,SAAQ,KAAK,CAAC,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAC5F,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC;IACvC,SAAS,CAAC,QAAQ,yCAAqC;IACvD,SAAS,CAAC,WAAW,yCAAqC;IAC1D,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAa;IACxF,SAAS,CAAC,YAAY,SAAK;IAC3B,SAAS,CAAC,aAAa,SAAK;IAC5B,SAAS,CAAC,cAAc,EAAE,cAAc,GAAG,SAAS,CAAC;IACrD,sHAAsH;IACtH,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,gKAAgK;IAChK,SAAS,CAAC,uBAAuB,EAAE,WAAW,EAAE,CAAM;gBAE1C,KAAK,EAAE,oBAAoB;IAYvC;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,QAAQ;IAIrC,4EAA4E;IAC5E,SAAS,CAAC,wBAAwB,CAAC,YAAY,EAAE,QAAQ,GAAG,WAAW;IAWvE,SAAS,CAAC,uBAAuB,CAAC,KAAK,EAAE,oBAAoB,GAAG,MAAM;IAU7D,kBAAkB,CAAC,SAAS,EAAE,oBAAoB,EAAE,SAAS,EAAE,oBAAoB,GAAG,IAAI;IAwBnG,IAAI,OAAO,IAAI,SAAS,YAAY,EAAE,CAErC;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,MAAM,GAAG,SAAS,CAEvC;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAc3C;IAED,SAAS,KAAK,SAAS,IAAI,OAAO,CAEjC;IAED,SAAS,CAAC,eAAe,IAAI,MAAM;IAKnC,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAcrD,SAAS,CAAC,eAAe,IAAI,IAAI;IA6DxB,oBAAoB,IAAI,IAAI;IAIrC,SAAS,CAAC,eAAe,IAAI,IAAI;IAiBxB,MAAM,IAAI,KAAK,CAAC,SAAS;IAoClC,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,UAAU,GAAG,WAAW,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAkB3F,SAAS,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC,GAAG,IAAI;IA4CvE,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,IAAI;IAMtE,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAoBlC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,IAAI;IAe1D,SAAS,CAAC,cAAc,IAAI,KAAK,CAAC,SAAS;IAyD3C,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,KAAK,CAAC,SAAS;IA4B5E,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI;CAIpE"}

package/lib/browser/widgets/select-component.js CHANGED Viewed

@@ -1,4 +1,7 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SelectComponent = exports.SELECT_COMPONENT_CONTAINER = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
 // *****************************************************************************
 // Copyright (C) 2022 TypeFox and others.
 //
@@ -14,8 +17,6 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SelectComponent = exports.SELECT_COMPONENT_CONTAINER = void 0;
 const React = require("react");
 const ReactDOM = require("react-dom");
 const DOMPurify = require("dompurify");
@@ -31,20 +32,34 @@ class SelectComponent extends React.Component {
         this.mountedListeners = new Map();
         this.optimalWidth = 0;
         this.optimalHeight = 0;
+        /** Perfect-scrollbar ancestors the `ps-scroll-y` listener was attached to. The field may have moved to another window since, so the elements are remembered. */
+        this.psScrollListenerTargets = [];
         const selected = this.getInitialSelectedIndex(props);
         this.state = {
             selected,
             original: selected,
             hover: selected
         };
-        let list = document.getElementById(exports.SELECT_COMPONENT_CONTAINER);
+        this.dropdownElement = this.resolveDropdownContainer(document);
+    }
+    /**
+     * The document that currently hosts this component. Falls back to the main document before
+     * the first render. Widgets can be moved to secondary windows, so this must be re-queried
+     * instead of captured once.
+     */
+    getHostDocument() {
+        return this.fieldRef.current?.ownerDocument ?? document;
+    }
+    /** Finds or creates the dropdown portal container in the given document. */
+    resolveDropdownContainer(hostDocument) {
+        let list = hostDocument.getElementById(exports.SELECT_COMPONENT_CONTAINER);
         if (!list) {
-            list = document.createElement('div');
+            list = hostDocument.createElement('div');
             list.id = exports.SELECT_COMPONENT_CONTAINER;
             list.className = 'theia-select-component-container';
-            document.body.appendChild(list);
+            hostDocument.body.appendChild(list);
         }
-        this.dropdownElement = list;
+        return list;
     }
     getInitialSelectedIndex(props) {
         let selected = 0;
@@ -138,11 +153,13 @@ class SelectComponent extends React.Component {
             // neither triggers the `scroll`, `wheel` nor `blur` event
             if (parent.classList.contains('ps')) {
                 parent.addEventListener('ps-scroll-y', hide);
+                this.psScrollListenerTargets.push(parent);
             }
             parent = parent.parentElement;
         }
+        this.listenersWindow = this.getHostDocument().defaultView ?? window;
         for (const [key, listener] of this.mountedListeners.entries()) {
-            window.addEventListener(key, listener);
+            this.listenersWindow.addEventListener(key, listener);
         }
         // Catch Lumino sash drags globally - observe the closest lm-Widget panel
         const fieldEl = this.fieldRef.current;
@@ -173,18 +190,23 @@ class SelectComponent extends React.Component {
         }
     }
     componentWillUnmount() {
+        this.detachListeners();
+    }
+    detachListeners() {
         this.resizeObserver?.disconnect();
+        this.resizeObserver = undefined;
         if (this.mountedListeners.size > 0) {
             const eventListener = this.mountedListeners.get('scroll');
-            let parent = this.fieldRef.current?.parentElement;
-            while (parent) {
-                parent.removeEventListener('ps-scroll-y', eventListener);
-                parent = parent.parentElement;
+            for (const target of this.psScrollListenerTargets) {
+                target.removeEventListener('ps-scroll-y', eventListener);
             }
             for (const [key, listener] of this.mountedListeners.entries()) {
-                window.removeEventListener(key, listener);
+                (this.listenersWindow ?? window).removeEventListener(key, listener);
             }
+            this.mountedListeners.clear();
         }
+        this.psScrollListenerTargets = [];
+        this.listenersWindow = undefined;
     }
     render() {
         const { options } = this.props;
@@ -198,14 +220,10 @@ class SelectComponent extends React.Component {
         const selectionDisabled = !!options[selected]?.disabled;
         const fieldClassName = `theia-select-component${this.props.className ? ` ${this.props.className}` : ''}`
             + `${selectionDisabled ? ' theia-select-component-selection-disabled' : ''}`;
-        return React.createElement(React.Fragment, null,
-            React.createElement("div", { id: this.props.id, key: "select-component", ref: this.fieldRef, tabIndex: 0, className: fieldClassName, onClick: e => this.handleClickEvent(e), onBlur: () => {
-                    this.hide();
-                    this.props.onBlur?.();
-                }, onFocus: () => this.props.onFocus?.(), onKeyDown: e => this.handleKeypress(e) },
-                React.createElement("div", { key: "label", className: "theia-select-component-label" }, selectedItemLabel),
-                React.createElement("div", { key: "icon", className: `theia-select-component-chevron ${(0, widget_1.codicon)('chevron-down')}` })),
-            ReactDOM.createPortal(this.renderDropdown(), this.dropdownElement));
+        return (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("div", { id: this.props.id, ref: this.fieldRef, tabIndex: 0, className: fieldClassName, onClick: e => this.handleClickEvent(e), onBlur: () => {
+                        this.hide();
+                        this.props.onBlur?.();
+                    }, onFocus: () => this.props.onFocus?.(), onKeyDown: e => this.handleKeypress(e), children: [(0, jsx_runtime_1.jsx)("div", { className: "theia-select-component-label", children: selectedItemLabel }, "label"), (0, jsx_runtime_1.jsx)("div", { className: `theia-select-component-chevron ${(0, widget_1.codicon)('chevron-down')}` }, "icon")] }, "select-component"), ReactDOM.createPortal(this.renderDropdown(), this.dropdownElement)] });
     }
     nextNotSeparator(direction, startFrom) {
         const { options } = this.props;
@@ -282,6 +300,14 @@ class SelectComponent extends React.Component {
             return;
         }
         if (!this.state.dimensions) {
+            // Re-resolve the portal container and listener window against the document that
+            // currently hosts the field: the widget may have been moved to a secondary window
+            // (or back to the main window) since the last time the dropdown was opened.
+            const hostDocument = this.getHostDocument();
+            this.dropdownElement = this.resolveDropdownContainer(hostDocument);
+            if (this.listenersWindow && this.listenersWindow !== hostDocument.defaultView) {
+                this.detachListeners();
+            }
             const rect = this.fieldRef.current.getBoundingClientRect();
             this.setState({ dimensions: rect });
         }
@@ -298,7 +324,8 @@ class SelectComponent extends React.Component {
             hover: selectedIndex
         });
         // Force releasing focus of the select element to allow closing via escape later on
-        if (releaseFocus && document.activeElement && document.activeElement === this.fieldRef.current) {
+        const hostDocument = this.getHostDocument();
+        if (releaseFocus && hostDocument.activeElement && hostDocument.activeElement === this.fieldRef.current) {
             this.fieldRef.current.blur();
         }
     }
@@ -306,7 +333,9 @@ class SelectComponent extends React.Component {
         if (!this.state.dimensions) {
             return;
         }
-        const shellArea = document.getElementById('theia-app-shell').getBoundingClientRect();
+        // Secondary windows have no 'theia-app-shell' element; use the document element as the boundary there.
+        const hostDocument = this.getHostDocument();
+        const shellArea = (hostDocument.getElementById('theia-app-shell') ?? hostDocument.documentElement).getBoundingClientRect();
         const maxWidth = this.alignLeft ? shellArea.width - this.state.dimensions.left : this.state.dimensions.right;
         if (this.mountedListeners.size === 0) {
             // Only attach our listeners once we render our dropdown menu
@@ -328,10 +357,10 @@ class SelectComponent extends React.Component {
             let descriptionNode;
             const className = 'theia-select-component-description';
             if (markdown) {
-                descriptionNode = React.createElement("div", { key: "description", className: className, dangerouslySetInnerHTML: { __html: DOMPurify.sanitize(description) } }); // eslint-disable-line react/no-danger
+                descriptionNode = (0, jsx_runtime_1.jsx)("div", { className: className, dangerouslySetInnerHTML: { __html: DOMPurify.sanitize(description) } }, "description"); // eslint-disable-line react/no-danger
             }
             else {
-                descriptionNode = React.createElement("div", { key: "description", className: className }, description);
+                descriptionNode = (0, jsx_runtime_1.jsx)("div", { className: className, children: description }, "description");
             }
             if (invert) {
                 items.unshift(descriptionNode);
@@ -340,7 +369,7 @@ class SelectComponent extends React.Component {
                 items.push(descriptionNode);
             }
         }
-        return React.createElement("div", { key: "dropdown", className: "theia-select-component-dropdown", style: {
+        return (0, jsx_runtime_1.jsx)("div", { className: "theia-select-component-dropdown", style: {
                 top: invert ? 'none' : this.state.dimensions.bottom,
                 bottom: invert ? shellArea.top - this.state.dimensions.top : 'none',
                 left: this.alignLeft ? this.state.dimensions.left : 'none',
@@ -348,15 +377,15 @@ class SelectComponent extends React.Component {
                 width: Math.min(Math.max(this.state.dimensions.width, this.optimalWidth), maxWidth),
                 maxHeight: shellArea.height - (invert ? shellArea.height - this.state.dimensions.bottom : this.state.dimensions.top) - this.state.dimensions.height,
                 position: 'absolute'
-            }, ref: this.dropdownRef }, items);
+            }, ref: this.dropdownRef, children: items }, "dropdown");
     }
     renderOption(index, option) {
         if (option.separator) {
-            return React.createElement("div", { key: index, className: "theia-select-component-separator" });
+            return (0, jsx_runtime_1.jsx)("div", { className: "theia-select-component-separator" }, index);
         }
         const selected = this.state.hover;
         const disabled = !!option.disabled;
-        return (React.createElement("div", { key: index, "data-option-index": index, className: `theia-select-component-option${index === selected ? ' selected' : ''}${disabled ? ' disabled' : ''}`, onMouseOver: () => {
+        return ((0, jsx_runtime_1.jsxs)("div", { "data-option-index": index, className: `theia-select-component-option${index === selected ? ' selected' : ''}${disabled ? ' disabled' : ''}`, onMouseOver: () => {
                 this.setState({
                     hover: index
                 });
@@ -364,9 +393,7 @@ class SelectComponent extends React.Component {
                 if (!disabled) {
                     this.selectOption(index, option);
                 }
-            } },
-            React.createElement("div", { key: "value", className: "theia-select-component-option-value" }, option.label ?? option.value),
-            option.detail && React.createElement("div", { key: "detail", className: "theia-select-component-option-detail" }, option.detail)));
+            }, children: [(0, jsx_runtime_1.jsx)("div", { className: "theia-select-component-option-value", children: option.label ?? option.value }, "value"), option.detail && (0, jsx_runtime_1.jsx)("div", { className: "theia-select-component-option-detail", children: option.detail }, "detail")] }, index));
     }
     selectOption(index, option) {
         this.props.onChange?.(option, index);

package/lib/browser/widgets/select-component.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"select-component.js","sourceRoot":"","sources":["../../../src/browser/widgets/select-component.tsx"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"select-component.js","sourceRoot":"","sources":["../../../src/browser/widgets/select-component.tsx"],"names":[],"mappings":"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"}

package/lib/browser/window/default-secondary-window-service.d.ts CHANGED Viewed

@@ -2,12 +2,14 @@ import { SecondaryWindow, SecondaryWindowService } from './secondary-window-serv
 import { WindowService } from './window-service';
 import { ExtractableWidget, Widget } from '../widgets';
 import { ApplicationShell } from '../shell';
-import { Emitter, Event, PreferenceService } from '../../common';
+import { Emitter, Event, PreferenceService, ILogger } from '../../common';
 import { SaveableService } from '../saveable-service';
 import { WindowFocusService } from './window-focus-service';
 export declare class DefaultSecondaryWindowService implements SecondaryWindowService {
     protected readonly onWindowOpenedEmitter: Emitter<Window>;
     readonly onWindowOpened: Event<Window>;
+    protected readonly onWindowLoadedEmitter: Emitter<Window>;
+    readonly onWindowLoaded: Event<Window>;
     protected readonly onWindowClosedEmitter: Emitter<Window>;
     readonly onWindowClosed: Event<Window>;
     protected readonly beforeWidgetRestoreEmitter: Emitter<[Widget, Window]>;
@@ -25,6 +27,7 @@ export declare class DefaultSecondaryWindowService implements SecondaryWindowSer
     protected readonly preferenceService: PreferenceService;
     protected readonly saveResourceService: SaveableService;
     protected readonly windowFocusService: WindowFocusService;
+    protected readonly logger: ILogger;
     init(): void;
     protected registerShutdownListeners(): void;
     createSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell): Window | SecondaryWindow | undefined;

package/lib/browser/window/default-secondary-window-service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"default-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/browser/window/default-secondary-window-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAe,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;~~AAC9E~~,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,6BAA8B,YAAW,sBAAsB;IACxE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,kBAAuB;IAC/D,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAoC;IAC1E,SAAS,CAAC,QAAQ,CAAC,qBAAqB,kBAAuB;IAC/D,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAoC;IAC1E,SAAS,CAAC,QAAQ,CAAC,0BAA0B,4BAAiC;IAC9E,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAyC;IAE9F,SAAS,CAAC,MAAM,CAAC,oBAAoB,SAA2B;IAEhE;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAiD;IAC1E,8CAA8C;IAC9C,OAAO,CAAC,MAAM,CAAK;IAEnB,SAAS,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAM;IAG1C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,eAAe,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,IAAI,IAAI,IAAI;IA+BZ,SAAS,CAAC,yBAAyB,IAAI,IAAI;IAU3C,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,MAAM,GAAG,eAAe,GAAG,SAAS;~~IAwC~~/G,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAMpG,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAS/D,SAAS,CAAC,8BAA8B,CAAC,MAAM,EAAE,iBAAiB,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE;IA0C3F,UAAU,IAAI,MAAM,EAAE;IAItB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;cACa,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAgCrI"}
1	+ {"version":3,"file":"default-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/browser/window/default-secondary-window-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAe,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,6BAA8B,YAAW,sBAAsB;IACxE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,kBAAuB;IAC/D,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAoC;IAC1E,SAAS,CAAC,QAAQ,CAAC,qBAAqB,kBAAuB;IAC/D,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAoC;IAC1E,SAAS,CAAC,QAAQ,CAAC,qBAAqB,kBAAuB;IAC/D,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,CAAC,CAAoC;IAC1E,SAAS,CAAC,QAAQ,CAAC,0BAA0B,4BAAiC;IAC9E,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAyC;IAE9F,SAAS,CAAC,MAAM,CAAC,oBAAoB,SAA2B;IAEhE;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,MAAM,SAAiD;IAC1E,8CAA8C;IAC9C,OAAO,CAAC,MAAM,CAAK;IAEnB,SAAS,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAM;IAG1C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,eAAe,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,IAAI,IAAI,IAAI;IA+BZ,SAAS,CAAC,yBAAyB,IAAI,IAAI;IAU3C,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,MAAM,GAAG,eAAe,GAAG,SAAS;IA4C/G,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAMpG,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAS/D,SAAS,CAAC,8BAA8B,CAAC,MAAM,EAAE,iBAAiB,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE;IA0C3F,UAAU,IAAI,MAAM,EAAE;IAItB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC;;OAEG;cACa,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAgCrI"}

package/lib/browser/window/default-secondary-window-service.js CHANGED Viewed

@@ -30,6 +30,8 @@ let DefaultSecondaryWindowService = class DefaultSecondaryWindowService {
     constructor() {
         this.onWindowOpenedEmitter = new common_1.Emitter;
         this.onWindowOpened = this.onWindowOpenedEmitter.event;
+        this.onWindowLoadedEmitter = new common_1.Emitter;
+        this.onWindowLoaded = this.onWindowLoadedEmitter.event;
         this.onWindowClosedEmitter = new common_1.Emitter;
         this.onWindowClosed = this.onWindowClosedEmitter.event;
         this.beforeWidgetRestoreEmitter = new common_1.Emitter;
@@ -49,13 +51,13 @@ let DefaultSecondaryWindowService = class DefaultSecondaryWindowService {
     init() {
         // Set up messaging with secondary windows
         window.addEventListener('message', (event) => {
-            console.trace('Message on main window', event);
+            this.logger.trace('Message on main window', event);
             if (event.data.fromSecondary) {
-                console.trace('Message comes from secondary window');
+                this.logger.trace('Message comes from secondary window');
                 return;
             }
             if (event.data.fromMain) {
-                console.trace('Message has mainWindow marker, therefore ignore it');
+                this.logger.trace('Message has mainWindow marker, therefore ignore it');
                 return;
             }
             // Filter setImmediate messages. Do not forward because these come in with very high frequency.
@@ -64,7 +66,7 @@ let DefaultSecondaryWindowService = class DefaultSecondaryWindowService {
             if (typeof event.data === 'string' && event.data.startsWith('setImmediate')) {
                 return;
             }
-            console.trace('Delegate main window message to secondary windows', event);
+            this.logger.trace('Delegate main window message to secondary windows', event);
             this.secondaryWindows.forEach(secondaryWindow => {
                 if (!secondaryWindow.window.closed) {
                     secondaryWindow.window.postMessage({ ...event.data, fromMain: true }, '*');
@@ -93,6 +95,10 @@ let DefaultSecondaryWindowService = class DefaultSecondaryWindowService {
             this.secondaryWindows.push(newWindow);
             this.onWindowOpenedEmitter.fire(newWindow);
             newWindow.addEventListener('DOMContentLoaded', () => {
+                // This fires for the final secondary-window.html document, not for the initial
+                // about:blank document the window starts out with, so onWindowLoaded listeners
+                // can safely modify the document.
+                this.onWindowLoadedEmitter.fire(newWindow);
                 const focusRegistration = this.windowFocusService.registerWindow(newWindow);
                 newWindow.addEventListener('beforeunload', evt => {
                     const widgets = (0, secondary_window_handler_1.getAllWidgetsFromSecondaryWindow)(newWindow) ?? [widget];
@@ -106,7 +112,7 @@ let DefaultSecondaryWindowService = class DefaultSecondaryWindowService {
                         }
                     }
                 }, { capture: true });
-                newWindow.addEventListener('unload', () => {
+                newWindow.addEventListener('pagehide', () => {
                     focusRegistration.dispose();
                     const extIndex = this.secondaryWindows.indexOf(newWindow);
                     if (extIndex > -1) {
@@ -122,7 +128,7 @@ let DefaultSecondaryWindowService = class DefaultSecondaryWindowService {
         return newWindow;
     }
     windowCreated(newWindow, widget, shell) {
-        newWindow.addEventListener('unload', () => {
+        newWindow.addEventListener('pagehide', () => {
             this.restoreWidgets(newWindow, widget, shell);
         });
     }
@@ -238,6 +244,11 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(window_focus_service_1.WindowFocusService),
     tslib_1.__metadata("design:type", window_focus_service_1.WindowFocusService)
 ], DefaultSecondaryWindowService.prototype, "windowFocusService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(common_1.ILogger),
+    (0, inversify_1.named)('core:DefaultSecondaryWindowService'),
+    tslib_1.__metadata("design:type", Object)
+], DefaultSecondaryWindowService.prototype, "logger", void 0);
 tslib_1.__decorate([
     (0, inversify_1.postConstruct)(),
     tslib_1.__metadata("design:type", Function),

package/lib/browser/window/default-secondary-window-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"default-secondary-window-service.js","sourceRoot":"","sources":["../../../src/browser/window/default-secondary-window-service.ts"],"names":[],"mappings":";;;;;AAAA,gFAAgF;AAChF,kFAAkF;AAClF,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,~~yCAA8D~~;~~AAE9D~~,qDAAiD;AACjD,wCAAuD;AAEvD,0CAAuC;AACvC,~~yCAA8E~~;~~AAC9E~~,0DAAsD;AACtD,0EAAsG;AACtG,iEAA4D;AAGrD,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAAnC;QACgB,0BAAqB,GAAG,IAAI,gBAAe,CAAC;QACtD,mBAAc,GAAkB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;QACvD,0BAAqB,GAAG,IAAI,gBAAe,CAAC;QACtD,mBAAc,GAAkB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;QACvD,+BAA0B,GAAG,IAAI,gBAAyB,CAAC;QACrE,wBAAmB,GAA4B,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;QAI9F;;;WAGG;QACgB,WAAM,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,8CAA8C;QACtC,WAAM,GAAG,CAAC,CAAC;QAET,qBAAgB,GAAa,EAAE,CAAC;~~IAwM9C~~,CAAC;;~~IAnNG~~,mJAAmJ;aAClI,yBAAoB,GAAG,uBAAuB,AAA1B,CAA2B;~~IAyBhE~~,IAAI;QACA,0CAA0C;QAC1C,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,KAAmB,EAAE,EAAE;YACvD,~~OAAO~~,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;~~YAC/C~~,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC3B,~~OAAO~~,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;~~gBACrD~~,OAAO;YACX,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACtB,~~OAAO~~,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;~~gBACpE~~,OAAO;YACX,CAAC;YAED,+FAA+F;YAC/F,yFAAyF;YACzF,qHAAqH;YACrH,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC1E,OAAO;YACX,CAAC;YAED,~~OAAO~~,CAAC,KAAK,CAAC,mDAAmD,EAAE,KAAK,CAAC,CAAC;~~YAC1E~~,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;gBAC5C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;oBACjC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC/E,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,yBAAyB,EAAE,CAAC;IACrC,CAAC;IAES,yBAAyB;QAC/B,yDAAyD;QACzD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,wFAAwF;YACxF,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACzD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YACrC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,qBAAqB,CAAC,MAAyB,EAAE,KAAuB;QACpE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;QAC/E,IAAI,OAAO,GAAG,iBAAiB,KAAK,WAAW,MAAM,SAAS,IAAI,QAAQ,GAAG,EAAE,CAAC;QAChF,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,mCAAmC,CAAC,EAAE,CAAC;YAClE,OAAO,IAAI,mBAAmB,CAAC;QACnC,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,+BAA6B,CAAC,oBAAoB,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,IAAI,SAAS,CAAC;QAC7H,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,SAAS,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,GAAG,EAAE;gBAChD,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;gBAC5E,SAAS,CAAC,gBAAgB,CAAC,cAAc,EAAE,GAAG,CAAC,EAAE;oBAC7C,MAAM,OAAO,GAAG,IAAA,2DAAgC,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACxE,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;wBACtB,MAAM,QAAQ,GAAG,mBAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;wBACjC,MAAM,cAAc,GAAG,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,mBAAmB,CAAC,QAAQ,KAAK,KAAK,CAAC;wBACnG,IAAI,cAAc,EAAE,CAAC;4BACjB,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC;4BACrB,GAAG,CAAC,cAAc,EAAE,CAAC;4BACrB,OAAO,WAAW,CAAC;wBACvB,CAAC;oBACL,CAAC;gBACL,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBAEtB,SAAS,CAAC,gBAAgB,CAAC,~~QAAQ~~,EAAE,GAAG,EAAE;~~oBACtC~~,iBAAiB,CAAC,OAAO,EAAE,CAAC;oBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBAC1D,IAAI,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC;wBAChB,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBAC3C,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;oBAC9C,CAAC;oBAAA,CAAC;gBACN,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;QACP,CAAC;QACA,SAA6B,CAAC,UAAU,GAAG,SAAS,CAAC;QACtD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,aAAa,CAAC,SAAiB,EAAE,MAAyB,EAAE,KAAuB;QACzF,SAAS,CAAC,gBAAgB,CAAC,~~QAAQ~~,EAAE,GAAG,EAAE;~~YACtC~~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~~AAzNQ~~,sEAA6B;~~AAqBnB~~;IADlB,IAAA,kBAAM,EAAC,8BAAa,CAAC;;oEAC0B;AAG7B;IADlB,IAAA,kBAAM,EAAC,0BAAiB,CAAC;;wEAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,kCAAe,CAAC;sCACgB,kCAAe;0EAAC;AAGrC;IADlB,IAAA,kBAAM,EAAC,yCAAkB,CAAC;sCACY,yCAAkB;yEAAC;~~AAG1D~~;IADC,IAAA,yBAAa,GAAE;;;;yDA8Bf;~~wCA9DQ~~,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,~~CA0NzC~~"}
1	+ {"version":3,"file":"default-secondary-window-service.js","sourceRoot":"","sources":["../../../src/browser/window/default-secondary-window-service.ts"],"names":[],"mappings":";;;;;AAAA,gFAAgF;AAChF,kFAAkF;AAClF,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,yCAAqE;AAErE,qDAAiD;AACjD,wCAAuD;AAEvD,0CAAuC;AACvC,yCAAuF;AACvF,0DAAsD;AACtD,0EAAsG;AACtG,iEAA4D;AAGrD,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAAnC;QACgB,0BAAqB,GAAG,IAAI,gBAAe,CAAC;QACtD,mBAAc,GAAkB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;QACvD,0BAAqB,GAAG,IAAI,gBAAe,CAAC;QACtD,mBAAc,GAAkB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;QACvD,0BAAqB,GAAG,IAAI,gBAAe,CAAC;QACtD,mBAAc,GAAkB,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;QACvD,+BAA0B,GAAG,IAAI,gBAAyB,CAAC;QACrE,wBAAmB,GAA4B,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;QAI9F;;;WAGG;QACgB,WAAM,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,8CAA8C;QACtC,WAAM,GAAG,CAAC,CAAC;QAET,qBAAgB,GAAa,EAAE,CAAC;IA+M9C,CAAC;;IA1NG,mJAAmJ;aAClI,yBAAoB,GAAG,uBAAuB,AAA1B,CAA2B;IA4BhE,IAAI;QACA,0CAA0C;QAC1C,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,KAAmB,EAAE,EAAE;YACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;YACnD,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACzD,OAAO;YACX,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;gBACxE,OAAO;YACX,CAAC;YAED,+FAA+F;YAC/F,yFAAyF;YACzF,qHAAqH;YACrH,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC1E,OAAO;YACX,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE,KAAK,CAAC,CAAC;YAC9E,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;gBAC5C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;oBACjC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC/E,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,yBAAyB,EAAE,CAAC;IACrC,CAAC;IAES,yBAAyB;QAC/B,yDAAyD;QACzD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,wFAAwF;YACxF,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACzD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YACrC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,qBAAqB,CAAC,MAAyB,EAAE,KAAuB;QACpE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;QAC/E,IAAI,OAAO,GAAG,iBAAiB,KAAK,WAAW,MAAM,SAAS,IAAI,QAAQ,GAAG,EAAE,CAAC;QAChF,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,mCAAmC,CAAC,EAAE,CAAC;YAClE,OAAO,IAAI,mBAAmB,CAAC;QACnC,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,+BAA6B,CAAC,oBAAoB,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,IAAI,SAAS,CAAC;QAC7H,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,SAAS,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,GAAG,EAAE;gBAChD,+EAA+E;gBAC/E,+EAA+E;gBAC/E,kCAAkC;gBAClC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC3C,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;gBAC5E,SAAS,CAAC,gBAAgB,CAAC,cAAc,EAAE,GAAG,CAAC,EAAE;oBAC7C,MAAM,OAAO,GAAG,IAAA,2DAAgC,EAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACxE,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;wBACtB,MAAM,QAAQ,GAAG,mBAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;wBACjC,MAAM,cAAc,GAAG,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,mBAAmB,CAAC,QAAQ,KAAK,KAAK,CAAC;wBACnG,IAAI,cAAc,EAAE,CAAC;4BACjB,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC;4BACrB,GAAG,CAAC,cAAc,EAAE,CAAC;4BACrB,OAAO,WAAW,CAAC;wBACvB,CAAC;oBACL,CAAC;gBACL,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;gBAEtB,SAAS,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE;oBACxC,iBAAiB,CAAC,OAAO,EAAE,CAAC;oBAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBAC1D,IAAI,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC;wBAChB,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBAC3C,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;oBAC9C,CAAC;oBAAA,CAAC;gBACN,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;QACP,CAAC;QACA,SAA6B,CAAC,UAAU,GAAG,SAAS,CAAC;QACtD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,aAAa,CAAC,SAAiB,EAAE,MAAyB,EAAE,KAAuB;QACzF,SAAS,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE;YACxC,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC;IAES,UAAU,CAAI,UAAkB;QACtC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpC,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACxB,OAAO,CAAC,CAAC;YACb,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,8BAA8B,CAAC,MAAyB;QAC9D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAEjF,IAAI,MAAM,CAAC;QAAC,IAAI,KAAK,CAAC;QAAC,IAAI,IAAI,CAAC;QAAC,IAAI,GAAG,CAAC;QACzC,MAAM,OAAO,GAAG,EAAE,CAAC,CAAC,uCAAuC;QAE3D,QAAQ,UAAU,EAAE,CAAC;YACjB,KAAK,cAAc,CAAC,CAAC,CAAC;gBAClB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;gBAClC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;gBAChC,IAAI,GAAG,MAAM,CAAC,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC;gBAC1C,GAAG,GAAG,MAAM,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;gBAC7E,IAAI,oBAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;oBAC5B,GAAG,GAAG,MAAM,CAAC,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC;gBAC5C,CAAC;gBACD,MAAM;YACV,CAAC;YACD,KAAK,WAAW,CAAC,CAAC,CAAC;gBACf,MAAM,GAAG,MAAM,CAAC,WAAW,GAAG,CAAC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;gBACxE,KAAK,GAAG,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;gBAC9B,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC;gBACzB,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC;gBACvB,IAAI,CAAC,oBAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;oBAC7B,MAAM,GAAG,MAAM,CAAC,WAAW,GAAG,YAAY,CAAC,CAAC,GAAG,OAAO,CAAC;gBAC3D,CAAC;gBACD,MAAM;YACV,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBACd,MAAM,GAAG,MAAM,CAAC,WAAW,GAAG,CAAC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;gBACxE,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC;gBAC1B,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC;gBACzB,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC;gBACvB,IAAI,CAAC,oBAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;oBAC7B,MAAM,GAAG,MAAM,CAAC,WAAW,GAAG,YAAY,CAAC,CAAC,GAAG,OAAO,CAAC;gBAC3D,CAAC;gBACD,MAAM;YACV,CAAC;QACL,CAAC;QACD,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,GAAW;QACb,GAAG,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;IAES,YAAY;QAClB,OAAO,GAAG,IAAI,CAAC,MAAM,oBAAoB,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IAC7D,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,cAAc,CAAC,SAAiB,EAAE,iBAAoC,EAAE,KAAuB;QAC3G,MAAM,OAAO,GAAG,IAAA,2DAAgC,EAAC,SAAS,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC5F,MAAM,kBAAkB,GAAG,IAAA,gDAAqB,EAAC,SAAS,CAAC,CAAC;QAE5D,IAAI,kBAAkB,GAAG,IAAI,CAAC;QAC9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;gBACpB,SAAS;YACb,CAAC;YACD,IAAI,CAAC;gBACD,MAAM,oBAAoB,GAAG,2BAAiB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC;gBACrG,MAAM,IAAI,GAAG,CAAC,oBAAoB,KAAK,SAAS,IAAI,oBAAoB,KAAK,KAAK,IAAI,oBAAoB,KAAK,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC;gBAClK,+CAA+C;gBAC/C,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;gBAC1D,0GAA0G;gBAC1G,IAAI,2BAAiB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC/B,MAAM,CAAC,eAAe,GAAG,SAAS,CAAC;oBACnC,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC;gBACpC,CAAC;gBACD,MAAM,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;gBACxC,MAAM,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,oCAAoC;gBACpC,mEAAmE;gBACnE,MAAM,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACnC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;oBACrB,kBAAkB,GAAG,KAAK,CAAC;gBAC/B,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,kBAAkB,CAAC;IAC9B,CAAC;;AAlOQ,sEAA6B;AAuBnB;IADlB,IAAA,kBAAM,EAAC,8BAAa,CAAC;;oEAC0B;AAG7B;IADlB,IAAA,kBAAM,EAAC,0BAAiB,CAAC;;wEAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,kCAAe,CAAC;sCACgB,kCAAe;0EAAC;AAGrC;IADlB,IAAA,kBAAM,EAAC,yCAAkB,CAAC;sCACY,yCAAkB;yEAAC;AAGvC;IADlB,IAAA,kBAAM,EAAC,gBAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,oCAAoC,CAAC;;6DAC1B;AAGnC;IADC,IAAA,yBAAa,GAAE;;;;yDA8Bf;wCAnEQ,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAmOzC"}

package/lib/browser/window/default-window-service.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ import { FrontendApplication } from '../frontend-application';
 export declare class DefaultWindowService implements WindowService, FrontendApplicationContribution {
     protected frontendApplication: FrontendApplication;
     protected allowVetoes: boolean;
+    protected unloaded: boolean;
     protected onUnloadEmitter: Emitter<void>;
     get onUnload(): Event<void>;
     protected readonly corePreferences: CorePreferences;
@@ -28,6 +29,24 @@ export declare class DefaultWindowService implements WindowService, FrontendAppl
      * Implement the mechanism to detect unloading of the page.
      */
     protected registerUnloadListeners(): void;
+    /**
+     * `pagehide` is used instead of the deprecated `unload` event, which Chrome may block
+     * via permissions policy (https://developer.chrome.com/docs/web-platform/deprecating-unload),
+     * silently skipping the handler and thus e.g. losing the layout.
+     */
+    protected registerPageHideListener(): void;
+    /**
+     * `pagehide` also fires when the page enters the back/forward cache, in which case the frontend
+     * has already shut down (state saved, connections closed). Reload to get a working application
+     * again if the page is restored from the cache. That shutdown already happened, so the reload
+     * must not be vetoed by the contributions.
+     */
+    protected handlePageShow(event: PageTransitionEvent): void;
+    /**
+     * Fires {@link onUnload} at most once per document: `pagehide` fires again for the reload that
+     * recovers a page restored from the back/forward cache, but the application is already stopped.
+     */
+    protected handlePageHide(): void;
     isSafeToShutDown(stopReason: StopReason): Promise<boolean>;
     setSafeToShutDown(): void;
     /**

package/lib/browser/window/default-window-service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"default-window-service.d.ts","sourceRoot":"","sources":["../../../src/browser/window/default-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,qBACa,oBAAqB,YAAW,aAAa,EAAE,+BAA+B;IAEvF,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IACnD,SAAS,CAAC,WAAW,UAAQ;~~IAE7B~~,SAAS,CAAC,eAAe,gBAAuB;IAChD,IAAI,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,CAE1B;IAGD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAIpD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;IAGxF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,OAAO,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAKvC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IAK/B,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC;IAK7C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInC,KAAK,IAAI,IAAI;IAIb;;;;OAIG;IACH,SAAS,CAAC,+BAA+B,IAAI,gBAAgB,EAAE;IAyB/D;;OAEG;IACH,SAAS,CAAC,uBAAuB,IAAI,IAAI;~~IASnC~~,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBhE,iBAAiB,IAAI,IAAI;IAIzB;;;;;;OAMG;IACH,SAAS,CAAC,uBAAuB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI;IAU1E;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI;IAMhE,MAAM,IAAI,IAAI;CAOjB"}
1	+ {"version":3,"file":"default-window-service.d.ts","sourceRoot":"","sources":["../../../src/browser/window/default-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,+BAA+B,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,qBACa,oBAAqB,YAAW,aAAa,EAAE,+BAA+B;IAEvF,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IACnD,SAAS,CAAC,WAAW,UAAQ;IAC7B,SAAS,CAAC,QAAQ,UAAS;IAE3B,SAAS,CAAC,eAAe,gBAAuB;IAChD,IAAI,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,CAE1B;IAGD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAIpD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC,+BAA+B,CAAC,CAAC;IAGxF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,OAAO,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAKvC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IAK/B,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC;IAK7C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInC,KAAK,IAAI,IAAI;IAIb;;;;OAIG;IACH,SAAS,CAAC,+BAA+B,IAAI,gBAAgB,EAAE;IAyB/D;;OAEG;IACH,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAOzC;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAI1C;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI;IAO1D;;;OAGG;IACH,SAAS,CAAC,cAAc,IAAI,IAAI;IAO1B,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBhE,iBAAiB,IAAI,IAAI;IAIzB;;;;;;OAMG;IACH,SAAS,CAAC,uBAAuB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI;IAU1E;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI;IAMhE,MAAM,IAAI,IAAI;CAOjB"}