fcr-ui-scene 3.7.7 → 3.7.8

package/lib/modules/event-confirm/store.js

@@ -72,7 +72,7 @@ var _dialogUtils = require("../../utilities/dialog-utils");
 var _env = require("agora-foundation/lib/utilities/env");
 var _imports = require("fcr-core/lib/imports");
 var _ConfirmStore;
-var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _removeObserverWindowDecs, _setObserverWindowDecs, _resetIsReplaceDecs, _setMousePositionDecs, _handleConfirmEventDecs, _handleMousePositionObserverMouseOverDecs, _handleMousePositionObserverMouseOutDecs, _ref;
+var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _resetIsReplaceDecs, _setMousePositionDecs, _handleConfirmEventDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -90,7 +90,7 @@ var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
-_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _removeObserverWindowDecs = [_mobx.action, _mobx.action.bound], _setObserverWindowDecs = [_mobx.action, _mobx.action.bound], _resetIsReplaceDecs = [_mobx.action, _mobx.action.bound], _setMousePositionDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], _handleMousePositionObserverMouseOverDecs = [_mobx.action, _mobx.action.bound], _handleMousePositionObserverMouseOutDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _resetIsReplaceDecs = [_mobx.action, _mobx.action.bound], _setMousePositionDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
   function ConfirmStore(_ref2) {
     var _this = this;
@@ -107,10 +107,6 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_handleConfirmEventObserver", {
       onEvent: this._handleConfirmEvent.bind(this)
     });
-    (0, _defineProperty2["default"])(this, "_handleMousePositionObserver", {
-      onMouseOver: this._handleMousePositionObserverMouseOver,
-      onMouseOut: this._handleMousePositionObserverMouseOut
-    });
     _classPrivateFieldInitSpec(this, _A, _init_isReplaceShare(this, false));
     _classPrivateFieldInitSpec(this, _B, _init_calculateMethods(this, new Map()));
     _classPrivateFieldInitSpec(this, _C, _init_reposition(this, 0));
@@ -122,7 +118,6 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     this._sharedConfirmDataSource = sharedConfirmDataSource;
     this._uiEventProvider.addObserver(this._handleConfirmEventObserver);
     this._dialogProvider.addObserver(this._handleConfirmEventObserver);
-    this._sharedConfirmDataSource.addObserver(this._handleMousePositionObserver);
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.confirmList;
     }, function () {
@@ -203,25 +198,22 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "screenBounds",
-    get: // get mousePosition() {
-    //   return this._sharedConfirmDataSource.position;
-    // }
-    function get() {
+    get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_E, this, v);
     }
+  }, {
+    key: "mousePosition",
+    get: function get() {
+      return this._sharedConfirmDataSource.position;
+    }
   }, {
     key: "confirmList",
     get: function get() {
-      var result = Array.from(this.confirms.values()).map(function (_ref4) {
-        var id = _ref4.id,
-          params = _ref4.params;
-        return {
-          id: id,
-          params: params
-        };
+      var result = Array.from(this.confirms.values()).map(function (item) {
+        return item.params;
       });
       return result;
     }
@@ -240,17 +232,14 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         var timer = setTimeout(function () {
           (0, _mobx.runInAction)(function () {
             _this2.confirms["delete"](dialogId);
-            _this2.removeObserverWindow(dialogId);
           });
           clearTimeout(timer);
         }, params.duration || 3000);
       } : undefined;
       var confirmParams = {
-        id: dialogId,
         params: _objectSpread(_objectSpread({}, params), {}, {
           onClose: function onClose() {
             _this2.confirms["delete"](dialogId);
-            _this2.removeObserverWindow(dialogId);
           }
         }),
         timer: timer
@@ -261,12 +250,6 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         });
       } else {
         this.confirms.set(dialogId, confirmParams);
-        this.setObserverWindow(dialogId, {
-          x: 0,
-          y: 0,
-          width: confirmParams.params.width || 320,
-          height: confirmParams.params.height || 150
-        });
       }
       var confirmInstance = this.confirms.get(dialogId);
       if (confirmInstance) {
@@ -297,16 +280,6 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         }
       }
     }
-  }, {
-    key: "removeObserverWindow",
-    value: function removeObserverWindow(key) {
-      this._sharedConfirmDataSource.removeWindowBounds(key);
-    }
-  }, {
-    key: "setObserverWindow",
-    value: function setObserverWindow(key, window) {
-      this._sharedConfirmDataSource.setWindowBounds(key, window);
-    }
   }, {
     key: "resetIsReplace",
     value: function resetIsReplace() {
@@ -323,7 +296,6 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "release",
     value: function release() {
-      var _this3 = this;
       this.confirms.clear();
       this.calculateMethods.clear();
       this._disposers.forEach(function (disposer) {
@@ -331,10 +303,6 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       });
       this._dialogProvider.removeObserver(this._handleConfirmEventObserver);
       this._uiEventProvider.removeObserver(this._handleConfirmEventObserver);
-      this.confirms.forEach(function (value, key) {
-        _this3.removeObserverWindow(key);
-      });
-      this._sharedConfirmDataSource.removeObserver(this._handleMousePositionObserver);
     }
   }, {
     key: "log",
@@ -348,11 +316,11 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
         switch (action) {
           case _constant.FcrUIAction.OPEN_DIALOG:
             if ((0, _env.isElectron)()) {
-              var _ref6 = (0, _dialogUtils.followCorrectDisplay)({
+              var _ref5 = (0, _dialogUtils.followCorrectDisplay)({
                   dialogKey: _constant.FcrUIDialogKey.CONFIRM,
                   alwaysFollowScreen: true
                 }),
-                nearDisplayBounds = _ref6.nearDisplayBounds;
+                nearDisplayBounds = _ref5.nearDisplayBounds;
               this.screenBounds = nearDisplayBounds;
               this.logger.info("open confirm dialog with bounds: ".concat((0, _imports.jsonstring)(nearDisplayBounds)));
             }
@@ -360,31 +328,14 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
             break;
           case _constant.FcrUIAction.CLOSE_DIALOG:
             this.confirms["delete"](payload.dialogId);
-            this.removeObserverWindow(payload.dialogId);
             break;
         }
       }
     }
-  }, {
-    key: "_handleMousePositionObserverMouseOver",
-    value: function _handleMousePositionObserverMouseOver(key) {
-      var confirm = this.confirms.get(key);
-      if (confirm) {
-        confirm.params.className = 'confirm-mouseover';
-      }
-    }
-  }, {
-    key: "_handleMousePositionObserverMouseOut",
-    value: function _handleMousePositionObserverMouseOut(key) {
-      var confirm = this.confirms.get(key);
-      if (confirm) {
-        confirm.params.className = '';
-      }
-    }
   }]);
 }();
 _ConfirmStore = ConfirmStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "calculateMethods"], [_mobx.observable, 1, "reposition"], [_mobx.observable, 1, "confirms"], [_mobx.observable, 1, "screenBounds"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_removeObserverWindowDecs, 18, "removeObserverWindow"], [_setObserverWindowDecs, 18, "setObserverWindow"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_setMousePositionDecs, 18, "setMousePosition"], [_decorator.bound, 2, "log"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"], [_handleMousePositionObserverMouseOverDecs, 18, "_handleMousePositionObserverMouseOver"], [_handleMousePositionObserverMouseOutDecs, 18, "_handleMousePositionObserverMouseOut"]], []).e, 6);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "calculateMethods"], [_mobx.observable, 1, "reposition"], [_mobx.observable, 1, "confirms"], [_mobx.observable, 1, "screenBounds"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_setMousePositionDecs, 18, "setMousePosition"], [_decorator.bound, 2, "log"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"]], []).e, 6);
 _init_isReplaceShare = _applyDecs$e[0];
 _init_calculateMethods = _applyDecs$e[1];
 _init_reposition = _applyDecs$e[2];

package/lib/modules/event-confirm/view.js

@@ -27,28 +27,26 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     browserWindow = _ref.browserWindow;
   (0, _react.useEffect)(function () {
     window.addEventListener('mousemove', setMousePosition);
-    return function () {
-      window.removeEventListener('mousemove', setMousePosition);
-    };
-  }, []);
-  (0, _react.useEffect)(function () {
     if ((0, _toConsumableArray2["default"])(confirmList).length === 0) {
       browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
         forward: true
       });
       browserWindow === null || browserWindow === void 0 || browserWindow.blur();
     } else {
+      // browserWindow?.setIgnoreMouseEvents(false);
       browserWindow === null || browserWindow === void 0 || browserWindow.setAlwaysOnTop(true, 'screen-saver');
     }
-  }, [confirmList.length]);
+    return function () {
+      window.removeEventListener('mousemove', setMousePosition);
+    };
+  }, [confirmList]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "fcr-event-confirm-wrapper fcr-event-confirm-container",
       children: (0, _toConsumableArray2["default"])(confirmList).map(function (confirm) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_window.ConfirmWindow, {
-          id: confirm.id,
-          confirm: confirm.params
-        }, confirm.params.title);
+          confirm: confirm
+        }, confirm.title);
       })
     })
   });

package/lib/modules/layout/store.js

@@ -1183,6 +1183,20 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
         }
       }, {
         fireImmediately: true
+      }), (0, _mobx.reaction)(function () {
+        return {
+          cameraEnabled: _this5._deviceProvider.cameraEnabled,
+          cameraId: _this5._deviceProvider.cameraId
+        };
+      }, function (_ref6) {
+        var cameraEnabled = _ref6.cameraEnabled,
+          cameraId = _ref6.cameraId;
+        if (!cameraEnabled && _this5._localView) {
+          _this5.stopLocalPreview(_this5._localView);
+        }
+        if (cameraEnabled && cameraId && _this5._localView) {
+          _this5.startLocalPreview(_this5._localView);
+        }
       }), (0, _mobx.reaction)(function () {
         return _this5.barLocked;
       }, function (barLocked) {
@@ -1201,8 +1215,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
         return {
           enableSpotlight: _this5.enableSpotlight
         };
-      }, function (_ref6) {
-        var enableSpotlight = _ref6.enableSpotlight;
+      }, function (_ref7) {
+        var enableSpotlight = _ref7.enableSpotlight;
         _this5._videoWindowDataSource.setSpotlightEnabled(enableSpotlight);
       }),
       // 录制的特殊逻辑：
@@ -1357,8 +1371,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     key: "_onStreamsAdded",
     value: function _onStreamsAdded(roomId, events) {
       var _this8 = this;
-      events.forEach(function (_ref7) {
-        var modifiedStream = _ref7.modifiedStream;
+      events.forEach(function (_ref8) {
+        var modifiedStream = _ref8.modifiedStream;
         _this8._handleStreamAdded(modifiedStream);
       });
     }
@@ -1366,8 +1380,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     key: "_onStreamsUpdated",
     value: function _onStreamsUpdated(roomId, events) {
       var _this9 = this;
-      events.forEach(function (_ref8) {
-        var modifiedStream = _ref8.modifiedStream;
+      events.forEach(function (_ref9) {
+        var modifiedStream = _ref9.modifiedStream;
         _this9._videoWindowDataSource.update(modifiedStream);
       });
     }
@@ -1375,8 +1389,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     key: "_onStreamsRemoved",
     value: function _onStreamsRemoved(roomId, events) {
       var _this0 = this;
-      events.forEach(function (_ref9) {
-        var modifiedStream = _ref9.modifiedStream;
+      events.forEach(function (_ref0) {
+        var modifiedStream = _ref0.modifiedStream;
         _this0._videoWindowDataSource["delete"](modifiedStream);
       });
       var hasScreenStream = events === null || events === void 0 ? void 0 : events.find(function (event) {

package/lib/modules/participant/store.base.js

@@ -682,7 +682,6 @@ var ParticipantStoreBase = exports.ParticipantStoreBase = /*#__PURE__*/function
   }, {
     key: "setChatActiveTab",
     value: function setChatActiveTab(activeTab) {
-      console.log('cjtest setChatActiveTab', activeTab);
       this._sharedChatDataSource.activeTab = activeTab;
     }
   }, {

package/lib/modules/participant/store.js

@@ -1132,7 +1132,7 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
             case 3:
               _context2.prev = 3;
               _t = _context2["catch"](1);
-              if (!(_t instanceof _type.FcrError && _t.code === _constant.ErrorCode.FAILED_TO_MOVE_USER_TO_WAITING_ROOM)) {
+              if (!(_t.code === '732403470')) {
                 _context2.next = 4;
                 break;
               }
@@ -1528,19 +1528,17 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function () {
                 case 3:
                   _context5.prev = 3;
                   _t2 = _context5["catch"](1);
-                  if (_t2 instanceof _type.FcrError) {
-                    errCode = _t2.code;
-                    if (errCode === _constant.ErrorCode.FAILED_TO_UPDATE_USER_ROLE_DUE_TO_PRIVILEGE) {
-                      _this10._messageProvider.showToast({
-                        type: 'error',
-                        message: (0, _i18n.transI18n)('fmt_attendies_button_revokehost_error')
-                      });
-                    } else if (errCode === _constant.ErrorCode.FAILED_TO_UPDATE_USER_ROLE_DUE_TO_LIMIT_REACHED) {
-                      _this10._messageProvider.showToast({
-                        type: 'error',
-                        message: (0, _i18n.transI18n)('fmt_attendies_toast_cohost_upper_limit')
-                      });
-                    }
+                  errCode = _t2.code;
+                  if (errCode === '700000403') {
+                    _this10._messageProvider.showToast({
+                      type: 'error',
+                      message: (0, _i18n.transI18n)('fmt_attendies_button_revokehost_error')
+                    });
+                  } else if (errCode === '720403001') {
+                    _this10._messageProvider.showToast({
+                      type: 'error',
+                      message: (0, _i18n.transI18n)('fmt_attendies_toast_cohost_upper_limit')
+                    });
                   }
                   _this10.logger.error(_t2);
                 case 4:

package/lib/modules/share-screen/store.d.ts

@@ -53,7 +53,7 @@ export default class ShareScreenStore {
     private _sharedAnnotationDataSource;
     accessor boardOwnerUser: FcrUserInfo | undefined;
     get cardChooseBounds(): CurrentShareBounds;
-    get currentShareStreamId(): string | undefined;
+    get currentShareStreamId(): string;
     get screenTrack(): FcrScreenTrack | null;
     get currentShareType(): FcrScreenCaptureType;
     get isCurrentOriginal(): boolean;

package/lib/modules/share-screen/store.electron.js

@@ -43,6 +43,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.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"));
@@ -193,6 +195,13 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       this._isSharing = true;
       this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
       var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+      try {
+        if (!videoWindow.isVisible()) {
+          videoWindow.show();
+        }
+      } catch (e) {
+        this.logger.warn('share_screen _showControlBar error', JSON.stringify(e));
+      }
       videoWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.VIDEO_WINDOW_LEVEL);
       var isMultiDisplayActive = this._multiDisplayProvider.isActive;
       this._ensureWindowsAreOpenAndPositioned(true, isMultiDisplayActive);

package/lib/modules/share-screen/store.js

@@ -615,8 +615,7 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
           electronBounds,
           needToReplaceMyself,
           validShareStart,
-          _args3 = arguments,
-          _t;
+          _args3 = arguments;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -689,22 +688,13 @@ var ShareScreenStore = exports["default"] = /*#__PURE__*/function () {
               // 初始化 controlbar 并隐藏, controlbar 不能在 startShareScreen 之后初始化，否则获取不到窗口信息，在屏幕共享时无法排除
               this._initControlbar();
               this._sharedScreenShareSharedDataSource.setCurrentShareIdInfos(id, type, bounds);
-              _context3.prev = 8;
-              _context3.next = 9;
+              _context3.next = 8;
               return this._screenShareProvider.startShareScreen(id, type, withAudio, false);
-            case 9:
-              _context3.next = 11;
-              break;
-            case 10:
-              _context3.prev = 10;
-              _t = _context3["catch"](8);
-              this.logger.error('failed to start share screen:', _t);
-              this._closeShareScreenComps();
-            case 11:
+            case 8:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[8, 10]]);
+        }, _callee3, this);
       }));
       function handleStartShare(_x, _x2, _x3) {
         return _handleStartShare.apply(this, arguments);

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;