fcr-ui-scene 3.7.7-rc.1 → 3.7.8-rc.1

package/lib/modules/state-bar/store.base.electron.js

@@ -84,12 +84,16 @@ var StateBarElectronStoreBase = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "enterFullScreen",
     value: function enterFullScreen() {
-      this._mainWindow.setFullScreen(true);
+      if (!this._mainWindow.isFullScreen()) {
+        this._mainWindow.setFullScreen(true);
+      }
     }
   }, {
     key: "exitFullScreen",
     value: function exitFullScreen() {
-      this._mainWindow.setFullScreen(false);
+      if (this._mainWindow.isFullScreen()) {
+        this._mainWindow.setFullScreen(false);
+      }
     }
   }, {
     key: "addFullScreenChangeEventListener",

package/lib/providers/board-share/bar-control/base.d.ts

@@ -27,12 +27,14 @@ export declare abstract class FcrUIBoardControlShareProviderBase implements FcrU
     constructor(_privilegeProvider: FcrUIPrivilegeProvider, _boardControl: FcrPrivilegedWhiteboardControl);
     setControlEnable(enable: boolean): void;
     setSharingUser(userInfo: FcrUserInfo): void;
+    updateSubProcessBackgroundColor(color: string): void;
     setBackgroundColor(color: string): void;
     setWhiteboardTool(tool: {
         action: WhiteboardToolAction;
         tool: FcrBoardToolType | FcrBoardShape | string | number;
     }): void;
     setTheme(theme: WhiteboardThemeType): void;
+    setCurrentTheme(theme: Required<WhiteboardThemeType>): void;
     setShowLoading(show: boolean): void;
     setCommonColors(colors: string[]): void;
     saveDraft(): void;

package/lib/providers/board-share/bar-control/base.js

@@ -62,7 +62,7 @@ var _utils = require("../../../modules/whiteboard/utils");
 var _toolbar = require("../../../modules/components/toolbar");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _FcrUIBoardControlShareProviderBase;
-var _initProto, _init__showLoading, _init_currentTheme, _init_sharingUserInfo, _init_backgroundColor, _init_hasWriteBoardPermission, _init_connectionState, _init_joinSuccess, _init_toolbarState, _setControlEnableDecs, _setSharingUserDecs, _setBackgroundColorDecs, _setWhiteboardToolDecs, _setThemeDecs, _setShowLoadingDecs, _setCommonColorsDecs, _setProgressDecs, _setJoinSuccessDecs, _handleDraftSavedDecs, _ref;
+var _initProto, _init__showLoading, _init_currentTheme, _init_sharingUserInfo, _init_backgroundColor, _init_hasWriteBoardPermission, _init_connectionState, _init_joinSuccess, _init_toolbarState, _setControlEnableDecs, _setSharingUserDecs, _setBackgroundColorDecs, _setWhiteboardToolDecs, _setThemeDecs, _setCurrentThemeDecs, _setShowLoadingDecs, _setCommonColorsDecs, _setProgressDecs, _setJoinSuccessDecs, _handleDraftSavedDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -81,7 +81,7 @@ var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
-_ref = (_setControlEnableDecs = [_mobx.action, _mobx.action.bound], _setSharingUserDecs = [_mobx.action, _mobx.action.bound], _setBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardToolDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setShowLoadingDecs = [_mobx.action, _mobx.action.bound], _setCommonColorsDecs = [_mobx.action, _mobx.action.bound], _setProgressDecs = [_mobx.action, _mobx.action.bound], _setJoinSuccessDecs = [_mobx.action, _mobx.action.bound], _handleDraftSavedDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_setControlEnableDecs = [_mobx.action, _mobx.action.bound], _setSharingUserDecs = [_mobx.action, _mobx.action.bound], _setBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardToolDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setCurrentThemeDecs = [_mobx.action, _mobx.action.bound], _setShowLoadingDecs = [_mobx.action, _mobx.action.bound], _setCommonColorsDecs = [_mobx.action, _mobx.action.bound], _setProgressDecs = [_mobx.action, _mobx.action.bound], _setJoinSuccessDecs = [_mobx.action, _mobx.action.bound], _handleDraftSavedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderBase = /*#__PURE__*/function () {
   function FcrUIBoardControlShareProviderBase(_privilegeProvider, _boardControl) {
     (0, _classCallCheck2["default"])(this, FcrUIBoardControlShareProviderBase);
@@ -205,6 +205,11 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
     value: function setSharingUser(userInfo) {
       this.sharingUserInfo = userInfo;
     }
+  }, {
+    key: "updateSubProcessBackgroundColor",
+    value: function updateSubProcessBackgroundColor(color) {
+      // do nothing in base
+    }
   }, {
     key: "setBackgroundColor",
     value: function setBackgroundColor(color) {
@@ -240,6 +245,11 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
       });
       this._boardControl.setBackgroundColor(theme.background);
     }
+  }, {
+    key: "setCurrentTheme",
+    value: function setCurrentTheme(theme) {
+      this.currentTheme = theme;
+    }
   }, {
     key: "setShowLoading",
     value: function setShowLoading(show) {
@@ -301,7 +311,7 @@ var FcrUIBoardControlShareProviderBase = exports.FcrUIBoardControlShareProviderB
   }]);
 }();
 _FcrUIBoardControlShareProviderBase = FcrUIBoardControlShareProviderBase;
-var _applyDecs$e = _applyDecs(_FcrUIBoardControlShareProviderBase, [[_mobx.observable, 1, "_showLoading"], [_mobx.observable, 1, "currentTheme"], [_mobx.observable, 1, "sharingUserInfo"], [_mobx.observable, 1, "backgroundColor"], [_mobx.observable, 1, "hasWriteBoardPermission"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "joinSuccess"], [_mobx.observable, 1, "toolbarState"], [_mobx.computed, 3, "canWriteBoard"], [_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_setShowLoadingDecs, 18, "setShowLoading"], [_setCommonColorsDecs, 18, "setCommonColors"], [_imports.bound, 2, "saveDraft"], [_setProgressDecs, 18, "setProgress"], [_setJoinSuccessDecs, 18, "setJoinSuccess"], [_imports.bound, 2, "resetWhiteboardTool"], [_handleDraftSavedDecs, 18, "_handleDraftSaved"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUIBoardControlShareProviderBase, [[_mobx.observable, 1, "_showLoading"], [_mobx.observable, 1, "currentTheme"], [_mobx.observable, 1, "sharingUserInfo"], [_mobx.observable, 1, "backgroundColor"], [_mobx.observable, 1, "hasWriteBoardPermission"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "joinSuccess"], [_mobx.observable, 1, "toolbarState"], [_mobx.computed, 3, "canWriteBoard"], [_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_setCurrentThemeDecs, 18, "setCurrentTheme"], [_setShowLoadingDecs, 18, "setShowLoading"], [_setCommonColorsDecs, 18, "setCommonColors"], [_imports.bound, 2, "saveDraft"], [_setProgressDecs, 18, "setProgress"], [_setJoinSuccessDecs, 18, "setJoinSuccess"], [_imports.bound, 2, "resetWhiteboardTool"], [_handleDraftSavedDecs, 18, "_handleDraftSaved"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 9);
 _init__showLoading = _applyDecs$e2[0];
 _init_currentTheme = _applyDecs$e2[1];

package/lib/providers/board-share/bar-control/electron.d.ts

@@ -15,6 +15,7 @@ export declare class FcrUIBoardControlShareProviderImpl extends FcrUIBoardContro
     constructor(privilegeProvider: FcrUIPrivilegeProvider, boardControl: FcrPrivilegedWhiteboardControl, _fcrUIMainWindowRenderer: FcrUIMainWindowRenderer);
     setControlEnable(enable: boolean): void;
     setSharingUser(userInfo: FcrUserInfo): void;
+    updateSubProcessBackgroundColor(color: string): void;
     setBackgroundColor(color: string): void;
     setWhiteboardTool(tool: {
         action: WhiteboardToolAction;

package/lib/providers/board-share/bar-control/electron.js

@@ -61,7 +61,7 @@ var _type = require("fcr-core/lib/type");
 var _mobx = require("mobx");
 var _base = require("./base");
 var _FcrUIBoardControlShareProviderImpl;
-var _initProto, _setControlEnableDecs, _setSharingUserDecs, _setBackgroundColorDecs, _setWhiteboardToolDecs, _setThemeDecs, _setIsDualDisplayModeDecs, _handleSubProcessStateUpdatedDecs, _ref;
+var _initProto, _setControlEnableDecs, _setSharingUserDecs, _updateSubProcessBackgroundColorDecs, _setBackgroundColorDecs, _setWhiteboardToolDecs, _setThemeDecs, _setIsDualDisplayModeDecs, _handleSubProcessStateUpdatedDecs, _ref;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _superPropGet(t, o, e, r) { var p = (0, _get2["default"])((0, _getPrototypeOf2["default"])(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
@@ -70,7 +70,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
-_ref = (_setControlEnableDecs = [_mobx.action, _mobx.action.bound], _setSharingUserDecs = [_mobx.action, _mobx.action.bound], _setBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardToolDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setIsDualDisplayModeDecs = [_mobx.action, _mobx.action.bound], _handleSubProcessStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_setControlEnableDecs = [_mobx.action, _mobx.action.bound], _setSharingUserDecs = [_mobx.action, _mobx.action.bound], _updateSubProcessBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardToolDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setIsDualDisplayModeDecs = [_mobx.action, _mobx.action.bound], _handleSubProcessStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIBoardControlShareProviderImpl = exports.FcrUIBoardControlShareProviderImpl = /*#__PURE__*/function (_FcrUIBoardControlSha) {
   function FcrUIBoardControlShareProviderImpl(privilegeProvider, boardControl, _fcrUIMainWindowRenderer) {
     var _this;
@@ -110,6 +110,13 @@ var FcrUIBoardControlShareProviderImpl = exports.FcrUIBoardControlShareProviderI
     value: function setSharingUser(userInfo) {
       this.sharingUserInfo = userInfo;
     }
+  }, {
+    key: "updateSubProcessBackgroundColor",
+    value: function updateSubProcessBackgroundColor(color) {
+      if (this._isDualDisplayMode) {
+        this._fcrUIMainWindowRenderer.notifyObservers('onBackgroundColorUpdated', color);
+      }
+    }
   }, {
     key: "setBackgroundColor",
     value: function setBackgroundColor(color) {
@@ -184,11 +191,15 @@ var FcrUIBoardControlShareProviderImpl = exports.FcrUIBoardControlShareProviderI
   }, {
     key: "_handleSubProcessStateUpdated",
     value: function _handleSubProcessStateUpdated(state) {
+      var _this3 = this;
       this.connectionState = state;
       if (state === _type.FcrConnectionState.CONNECTED) {
         _superPropGet(FcrUIBoardControlShareProviderImpl, "setShowLoading", this, 3)([false]);
         _superPropGet(FcrUIBoardControlShareProviderImpl, "setJoinSuccess", this, 3)([true]);
-        setTimeout(this.resetWhiteboardTool);
+        setTimeout(function () {
+          _this3.updateSubProcessBackgroundColor(_this3.currentTheme.background);
+          _this3.resetWhiteboardTool();
+        });
       }
       if (state === _type.FcrConnectionState.CONNECTING || state === _type.FcrConnectionState.DISCONNECTED) {
         _superPropGet(FcrUIBoardControlShareProviderImpl, "setShowLoading", this, 3)([true]);
@@ -199,7 +210,7 @@ var FcrUIBoardControlShareProviderImpl = exports.FcrUIBoardControlShareProviderI
   }]);
 }(_base.FcrUIBoardControlShareProviderBase);
 _FcrUIBoardControlShareProviderImpl = FcrUIBoardControlShareProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIBoardControlShareProviderImpl, [[_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_imports.bound, 2, "saveDraft"], [_imports.bound, 2, "inActive"], [_setIsDualDisplayModeDecs, 18, "setIsDualDisplayMode"], [_handleSubProcessStateUpdatedDecs, 18, "_handleSubProcessStateUpdated"]], [], 0, void 0, _base.FcrUIBoardControlShareProviderBase).e;
+var _applyDecs$e = _applyDecs(_FcrUIBoardControlShareProviderImpl, [[_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_updateSubProcessBackgroundColorDecs, 18, "updateSubProcessBackgroundColor"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_imports.bound, 2, "saveDraft"], [_imports.bound, 2, "inActive"], [_setIsDualDisplayModeDecs, 18, "setIsDualDisplayMode"], [_handleSubProcessStateUpdatedDecs, 18, "_handleSubProcessStateUpdated"]], [], 0, void 0, _base.FcrUIBoardControlShareProviderBase).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/board-share/provider.base.d.ts

@@ -18,6 +18,7 @@ export declare abstract class FcrUIBoardShareProviderBase implements FcrUIBoardS
     protected _boardMainWindow: FcrBoardMainWindow | undefined;
     private _userControl;
     private _dialogProvider;
+    private _userId;
     private _observer;
     private _boardObserver;
     protected get boardMainWindow(): FcrBoardMainWindow;

package/lib/providers/board-share/provider.base.js

@@ -116,6 +116,7 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
     this._sharingControl.addObserver(this._observer);
     this._addLogger();
     this.boardState = this._sharingControl.getWhiteboardState();
+    this._userId = this._userControl.getLocalUser().userId;
     if (this.isActive) {
       this._boardControl.open();
     }
@@ -198,7 +199,7 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
     key: "isMyBoard",
     get: function get() {
       if (this.isActive) {
-        return this.ownerUser.userId === this._userControl.getLocalUser().userId;
+        return this.ownerUser.userId === this._userId;
       } else {
         throw new Error('get isMyBoard failed, no user is sharing board currently');
       }
@@ -372,6 +373,7 @@ var FcrUIBoardShareProviderBase = exports.FcrUIBoardShareProviderBase = /*#__PUR
       });
       if (theme) {
         this.boardBarControl.toolbarState.themeColors = theme.colors;
+        this.boardBarControl.setCurrentTheme(theme);
       } else {
         this.logger.warn("setBackgroundColor ".concat(color, " not match in theme"));
       }

package/lib/providers/board-share/provider.electron.d.ts

@@ -19,4 +19,5 @@ export declare class FcrUIBoardShareProviderImpl extends FcrUIBoardShareProvider
     private _handleRedoStateUpdated;
     private _handleUndoStateUpdated;
     private _resetWhiteboardTool;
+    private _handleBackgroundColorUpdatedForSubProcess;
 }

package/lib/providers/board-share/provider.electron.js

@@ -83,7 +83,8 @@ var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PUR
       onUndoStateUpdated: _this._handleUndoStateUpdated
     });
     (0, _defineProperty2["default"])(_this, "_boardControlObserver", {
-      onConnectionStateUpdated: _this._handleStateUpdated
+      onConnectionStateUpdated: _this._handleStateUpdated,
+      onBackgroundColorUpdated: _this._handleBackgroundColorUpdatedForSubProcess
     });
     _this._objectManager = _objectManager;
     _this._mainWindowRenderer = _mainWindowRenderer;
@@ -154,10 +155,15 @@ var FcrUIBoardShareProviderImpl = exports.FcrUIBoardShareProviderImpl = /*#__PUR
       this.boardMainWindow.setStrokeColor(this._boardBarControl.currentTheme.colors[2]);
       this.boardBarControl.resetWhiteboardTool();
     }
+  }, {
+    key: "_handleBackgroundColorUpdatedForSubProcess",
+    value: function _handleBackgroundColorUpdatedForSubProcess(color) {
+      this._boardBarControl.updateSubProcessBackgroundColor(color);
+    }
   }]);
 }(_provider.FcrUIBoardShareProviderBase);
 _FcrUIBoardShareProviderImpl = FcrUIBoardShareProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIBoardShareProviderImpl, [[_decorator.bound, 2, "captureScreen"], [_handleStateUpdatedDecs, 18, "_handleStateUpdated"], [_handleRedoStateUpdatedDecs, 18, "_handleRedoStateUpdated"], [_handleUndoStateUpdatedDecs, 18, "_handleUndoStateUpdated"], [_decorator.bound, 2, "_resetWhiteboardTool"]], [], 0, void 0, _provider.FcrUIBoardShareProviderBase).e;
+var _applyDecs$e = _applyDecs(_FcrUIBoardShareProviderImpl, [[_decorator.bound, 2, "captureScreen"], [_handleStateUpdatedDecs, 18, "_handleStateUpdated"], [_handleRedoStateUpdatedDecs, 18, "_handleRedoStateUpdated"], [_handleUndoStateUpdatedDecs, 18, "_handleUndoStateUpdated"], [_decorator.bound, 2, "_resetWhiteboardTool"], [_decorator.bound, 2, "_handleBackgroundColorUpdatedForSubProcess"]], [], 0, void 0, _provider.FcrUIBoardShareProviderBase).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/board-share/type.d.ts

@@ -142,12 +142,14 @@ export interface FcrUIBoardBarControl {
     get toolbarState(): FcrToolbarState;
     release(): void;
     setSharingUser: (userInfo: FcrUserInfo) => void;
+    updateSubProcessBackgroundColor: (color: string) => void;
     setBackgroundColor: (color: string) => void;
     setWhiteboardTool: (tool: {
         action: WhiteboardToolAction;
         tool: FcrBoardToolType | FcrBoardShape | string | number;
     }) => void;
     setTheme: (theme: WhiteboardThemeType) => void;
+    setCurrentTheme: (theme: Required<WhiteboardThemeType>) => void;
     setControlEnable: (enable: boolean) => void;
     setShowLoading: (show: boolean) => void;
     setCommonColors: (colors: string[]) => void;

package/lib/providers/dialog/provider.electron.js

@@ -48,6 +48,7 @@ require("core-js/modules/es.string.includes.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -221,6 +222,7 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
           }
         },
         onClosed: function onClosed() {
+          _this2.logger.warn("dialog provider openWithKeyAndId onClosed dialogKey: ".concat(dialogKey, " dialogId: ").concat(dialogId));
           window.removeObserver(windowObserver);
           _this2.dialogKeyMap["delete"](dialogKey);
           _this2.dialogIdMap["delete"](dialogId);
@@ -241,9 +243,15 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
       window.addObserver(windowObserver);
       window.setPreventClose(true);
       window.show(showOptions);
-      if (params !== null && params !== void 0 && params.alwaysOnTop) {
+      if (params && params.alwaysOnTop) {
         window.setAlwaysOnTop(true, 'pop-up-menu');
       }
+      setTimeout(function () {
+        _this2.logger.warn("dialog provider openWithKeyAndId setTimeout dialogKey: ".concat(dialogKey, " dialogId: ").concat(dialogId, ",title: ").concat(window.getTitle(), ",isVisible: ").concat(window.isVisible(), ",showOptions: ").concat((0, _imports.jsonstring)(showOptions)));
+        if (!window.isVisible() && _this2.dialogKeyMap.has(dialogKey) && _this2.dialogIdMap.has(dialogId)) {
+          window.show(showOptions);
+        }
+      }, 1000);
       this.observable.notifyObservers('onDialogOpen', dialogKey, dialogId, params);
     }
   }, {
@@ -263,7 +271,7 @@ var FcrUIElectronDialogProviderImpl = exports.FcrUIElectronDialogProviderImpl =
   }]);
 }(_provider.FcrUIDialogProviderBase);
 _FcrUIElectronDialogProviderImpl = FcrUIElectronDialogProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIElectronDialogProviderImpl, [[_decorator.trace, 2, "openDialog"], [_decorator.trace, 2, "openDialogWithId"], [_decorator.trace, 2, "closeDialog"], [_decorator.trace, 2, "closeDialogById"], [_decorator.trace, 2, "setSharingDisplayBounds"]], [], 0, void 0, _provider.FcrUIDialogProviderBase).e;
+var _applyDecs$e = _applyDecs(_FcrUIElectronDialogProviderImpl, [[_decorator.trace, 2, "openDialog"], [_decorator.trace, 2, "openDialogWithId"], [_decorator.trace, 2, "closeDialog"], [_decorator.trace, 2, "closeDialogById"], [_decorator.trace, 2, "openWithKeyAndId"], [_decorator.trace, 2, "setSharingDisplayBounds"]], [], 0, void 0, _provider.FcrUIDialogProviderBase).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/screen-share/strategy/browser.js

@@ -1,8 +1,40 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.reflect.construct.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,6 +44,7 @@ require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -25,16 +58,24 @@ var _type = require("./type");
 var _objectManager2 = require("../../../object-manager");
 var _type2 = require("fcr-core/lib/type");
 var _defaultConfig = require("../../../utilities/default-config");
+var _decorator = require("agora-foundation/lib/decorator");
+var _FcrUIBrowserScreenShareStrategy;
+var _initProto;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var FcrUIBrowserScreenShareStrategy = exports.FcrUIBrowserScreenShareStrategy = /*#__PURE__*/function (_FcrUIScreenShareStra) {
   function FcrUIBrowserScreenShareStrategy(_objectManager) {
     var _this;
     (0, _classCallCheck2["default"])(this, FcrUIBrowserScreenShareStrategy);
     _this = _callSuper(this, FcrUIBrowserScreenShareStrategy);
-    (0, _defineProperty2["default"])(_this, "logger", (0, _logger.createLogger)({
+    (0, _defineProperty2["default"])(_this, "logger", (_initProto(_this), (0, _logger.createLogger)({
       prefix: 'BrowserScreenShareStrategy'
-    }));
+    })));
     (0, _defineProperty2["default"])(_this, "_screenTrack", null);
     (0, _defineProperty2["default"])(_this, "_loopbackDeviceId", 'default');
     (0, _defineProperty2["default"])(_this, "_isReplacing", false);
@@ -60,6 +101,7 @@ var FcrUIBrowserScreenShareStrategy = exports.FcrUIBrowserScreenShareStrategy =
         }
       }
     };
+    _this.addObserver((0, _logger.generateLogObserver)(_this.logger, ['onScreenCaptureError', 'onScreenCaptureReplaced', 'onScreenCaptureStarted', 'onScreenCaptureStopped']));
     return _this;
   }
   (0, _inherits2["default"])(FcrUIBrowserScreenShareStrategy, _FcrUIScreenShareStra);
@@ -263,4 +305,9 @@ var FcrUIBrowserScreenShareStrategy = exports.FcrUIBrowserScreenShareStrategy =
       return _stopTrackAndWaitUntilSuccess;
     }()
   }]);
-}(_type.FcrUIScreenShareStrategy);
+}(_type.FcrUIScreenShareStrategy);
+_FcrUIBrowserScreenShareStrategy = FcrUIBrowserScreenShareStrategy;
+var _applyDecs$e = _applyDecs(_FcrUIBrowserScreenShareStrategy, [[_decorator.trace, 2, "startLoopbackCapture"], [_decorator.trace, 2, "stopLoopbackCapture"], [_decorator.trace, 2, "replaceScreenCaptureSource"], [_decorator.trace, 2, "startScreenCapture"], [_decorator.trace, 2, "stopScreenCapture"]], [], 0, void 0, _type.FcrUIScreenShareStrategy).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
+_initProto = _applyDecs$e2[0];
+_applyDecs$e;

package/lib/providers/screen-share/strategy/electron.js

@@ -1,8 +1,40 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.reflect.construct.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,6 +45,7 @@ require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -24,16 +57,24 @@ var _logger = require("../../../utilities/logger");
 var _type = require("./type");
 var _objectManager2 = require("../../../object-manager");
 var _fcrCore = require("fcr-core");
+var _decorator = require("agora-foundation/lib/decorator");
+var _FcrUIElectronScreenShareStrategy;
+var _initProto;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy = /*#__PURE__*/function (_FcrUIScreenShareStra) {
   function FcrUIElectronScreenShareStrategy(_objectManager) {
     var _this;
     (0, _classCallCheck2["default"])(this, FcrUIElectronScreenShareStrategy);
     _this = _callSuper(this, FcrUIElectronScreenShareStrategy);
-    (0, _defineProperty2["default"])(_this, "logger", (0, _logger.createLogger)({
+    (0, _defineProperty2["default"])(_this, "logger", (_initProto(_this), (0, _logger.createLogger)({
       prefix: 'ElectronScreenShareStrategy'
-    }));
+    })));
     (0, _defineProperty2["default"])(_this, "_screenTrack", null);
     (0, _defineProperty2["default"])(_this, "_loopbackTrack", null);
     (0, _defineProperty2["default"])(_this, "_isReplacing", false);
@@ -43,10 +84,16 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
     _this._screenTrackObserver = {
       onScreenCaptureStateUpdated: function onScreenCaptureStateUpdated(sourceId, state) {
         if (state === _fcrCore.FcrMediaSourceState.ERROR) {
+          if (_this._screenTrack) {
+            _this._screenTrack.removeObserver(_this._screenTrackObserver);
+          }
           _this._screenTrack = null;
           _this.observable.notifyObservers('onScreenCaptureError', sourceId, _type.FcrUIScreenShareCaptureError.UNKNOWN);
         }
         if (state === _fcrCore.FcrMediaSourceState.CLOSE) {
+          if (_this._screenTrack) {
+            _this._screenTrack.removeObserver(_this._screenTrackObserver);
+          }
           _this._screenTrack = null;
           if (!_this._isReplacing) {
             _this.observable.notifyObservers('onScreenCaptureStopped', sourceId);
@@ -62,6 +109,7 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
         }
       }
     };
+    _this.addObserver((0, _logger.generateLogObserver)(_this.logger, ['onScreenCaptureError', 'onScreenCaptureReplaced', 'onScreenCaptureStarted', 'onScreenCaptureStopped']));
     return _this;
   }
   (0, _inherits2["default"])(FcrUIElectronScreenShareStrategy, _FcrUIScreenShareStra);
@@ -214,6 +262,13 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
               frameRate = _args4.length > 4 ? _args4[4] : undefined;
               bitrate = _args4.length > 5 ? _args4[5] : undefined;
               this._screenTrack = screenTrack;
+              if (!(screenTrack.getState() === _fcrCore.FcrMediaSourceState.OPEN)) {
+                _context4.next = 1;
+                break;
+              }
+              this.logger.info('the screen track is already started');
+              return _context4.abrupt("return");
+            case 1:
               p = new Promise(function (resolve, reject) {
                 var waitObserver = {
                   onScreenCaptureStateUpdated: function onScreenCaptureStateUpdated(sourceId, state) {
@@ -239,9 +294,9 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
                 bitrate: bitrate
               });
               screenTrack.start(captureType, excludeWindows);
-              _context4.next = 1;
+              _context4.next = 2;
               return p;
-            case 1:
+            case 2:
             case "end":
               return _context4.stop();
           }
@@ -261,6 +316,15 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
         return _regenerator["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
+              if (!(screenTrack.getState() === _fcrCore.FcrMediaSourceState.CLOSE)) {
+                _context5.next = 1;
+                break;
+              }
+              this.logger.info('the screen track is already stopped');
+              screenTrack.removeObserver(this._screenTrackObserver);
+              this._screenTrack = null;
+              return _context5.abrupt("return");
+            case 1:
               p = new Promise(function (resolve) {
                 var waitObserver = {
                   onScreenCaptureStateUpdated: function onScreenCaptureStateUpdated(sourceId, state) {
@@ -274,12 +338,12 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
                 screenTrack.addObserver(waitObserver);
               });
               screenTrack.stop();
-              _context5.next = 1;
+              _context5.next = 2;
               return p;
-            case 1:
+            case 2:
               screenTrack.removeObserver(this._screenTrackObserver);
               this._screenTrack = null;
-            case 2:
+            case 3:
             case "end":
               return _context5.stop();
           }
@@ -291,4 +355,9 @@ var FcrUIElectronScreenShareStrategy = exports.FcrUIElectronScreenShareStrategy
       return _stopTrackAndWaitUntilSuccess;
     }()
   }]);
-}(_type.FcrUIScreenShareStrategy);
+}(_type.FcrUIScreenShareStrategy);
+_FcrUIElectronScreenShareStrategy = FcrUIElectronScreenShareStrategy;
+var _applyDecs$e = _applyDecs(_FcrUIElectronScreenShareStrategy, [[_decorator.trace, 2, "startScreenCapture"], [_decorator.trace, 2, "stopScreenCapture"], [_decorator.trace, 2, "startLoopbackCapture"], [_decorator.trace, 2, "stopLoopbackCapture"], [_decorator.trace, 2, "replaceScreenCaptureSource"]], [], 0, void 0, _type.FcrUIScreenShareStrategy).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
+_initProto = _applyDecs$e2[0];
+_applyDecs$e;

package/lib/providers/screen-share/stream-state-sync.d.ts

@@ -4,13 +4,15 @@ import { FcrVideoEncoderConfig } from 'fcr-core/lib/type';
 import { FcrUIScreenStreamUpdateParams } from './type';
 export declare class FcrUIScreenStreamSync implements FcrUIManagedObject {
     protected logger: import("agora-foundation/lib/logger").Logger;
+    private _videoWindowDataSource;
     private _myCurrentScreenShareStreamId;
     private _sharingControl;
     private _streamControl;
     private _released;
+    private _isStopped;
     constructor(objectManager: FcrUIObjectManager);
     release(): void;
-    checkIfMyScreenShareStreamExists(): string | null;
+    checkIfMyScreenShareStreamExists(): boolean;
     startScreenStream(createConfig: FcrScreenStreamCreateConfig, encoderConfig: FcrVideoEncoderConfig): Promise<void>;
     stopScreenStream(): Promise<void>;
     updateStream({ videoSourceId, audioPublishPrivilege, videoPublishPrivilege, }: FcrUIScreenStreamUpdateParams): Promise<void>;