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

package/lib/electron/until.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = exports.hangDetectionErrorCode = exports.generaErrorCode = exports.crashedErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
+exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.hangDetectionErrorCode = exports.generaErrorCode = exports.crashedErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
 // 错误代码枚举定义
 var ServiceErrorCode = /*#__PURE__*/function (ServiceErrorCode) {
   ServiceErrorCode[ServiceErrorCode["FcrUIScene"] = 800] = "FcrUIScene";
@@ -12,7 +12,6 @@ var ServiceErrorCode = /*#__PURE__*/function (ServiceErrorCode) {
 }(ServiceErrorCode || {});
 var UISceneErrorCode = /*#__PURE__*/function (UISceneErrorCode) {
   UISceneErrorCode[UISceneErrorCode["Creator"] = 10] = "Creator";
-  UISceneErrorCode[UISceneErrorCode["ProcessManager"] = 11] = "ProcessManager";
   return UISceneErrorCode;
 }(UISceneErrorCode || {});
 var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
@@ -45,7 +44,7 @@ var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
   // 会议启动中
   DetailErrorCode[DetailErrorCode["meetingLaunchProcessing"] = 84] = "meetingLaunchProcessing";
   // 窗口在会议启动后隐藏
-  DetailErrorCode[DetailErrorCode["mainWindowHiddenAfterLaunchSuccess"] = 85] = "mainWindowHiddenAfterLaunchSuccess";
+  // mainWindowHiddenAfterLaunchSuccess = 85,
   // 窗口崩溃
   DetailErrorCode[DetailErrorCode["crashed"] = 86] = "crashed";
   // 窗口无响应
@@ -55,9 +54,18 @@ var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
 var generaErrorCode = exports.generaErrorCode = function generaErrorCode(serviceCode, uiSceneCode, detailCode) {
   return serviceCode * 1000000 + uiSceneCode * 1000 + detailCode;
 };
+
+// 800010082
 var windowHideErrorCode = exports.windowHideErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHidden);
+// // 800010083
 var closeWindowBeforeLaunchSuccessErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.closeWindowBeforeLaunchSuccess);
 var meetingLaunchProcessingErrorCode = exports.meetingLaunchProcessingErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.meetingLaunchProcessing);
-var mainWindowHiddenOnLaunchSuccessErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHiddenAfterLaunchSuccess);
+
+// export const mainWindowHiddenOnLaunchSuccessErrorCode = generaErrorCode(
+//   ServiceErrorCode.FcrUIScene,
+//   UISceneErrorCode.Creator,
+//   DetailErrorCode.mainWindowHiddenAfterLaunchSuccess,
+// );
+
 var crashedErrorCode = exports.crashedErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.crashed);
 var hangDetectionErrorCode = exports.hangDetectionErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.hangDetection);

package/lib/index.js

@@ -47,10 +47,17 @@ require("./plugins/electron-rtc-plugin");
 require("./plugins/multi-lang-plugin");
 require("./plugins/rtm-plugin");
 require("./plugins/web-rtc-plugin");
+var _logger = require("./utilities/logger");
+var _imports = require("fcr-core/lib/imports");
 // import { configure } from 'mobx';
 
 // configure({
 //   enforceActions: 'always',
 // });
 
-_dayjs["default"].extend(_duration["default"]);
+_dayjs["default"].extend(_duration["default"]);
+// @ts-ignore
+window.__AgoraLogger = (0, _logger.getLogger)();
+
+// @ts-ignore
+window.__AgoraMutex = new _imports.Mutex();

package/lib/modules/action-bar/components/screen-share/index.electron.js

@@ -24,7 +24,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
     startScreenShare = _useContext.startScreenShare,
     localUserRole = _useContext.localUserRole,
     hasStartScreenSharePermission = _useContext.hasStartScreenSharePermission;
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     visibleMenu = _useState2[0],
     setMenuVisible = _useState2[1];

package/lib/modules/components/control-bar/components/switch-theme/index.js

@@ -39,7 +39,9 @@ var WhiteboardSwitchTheme = function WhiteboardSwitchTheme(props) {
     },
     overlayOffset: 4,
     showArrow: false,
-    getTooltipContainer: function getTooltipContainer() {
+    getTooltipContainer: function getTooltipContainer(_target) {
+      // window.document 是主窗口内的, 为了在子窗口中获取主窗口的 DOM 节点, 所以使用 _target.ownerDocument
+      var document = _target.ownerDocument || window.document;
       var target = document.getElementById('fcr-whiteboard-controlbar');
       return target;
     },
@@ -57,7 +59,7 @@ var WhiteboardSwitchTheme = function WhiteboardSwitchTheme(props) {
               return item.theme === theme.theme;
             });
             setTheme(result);
-            setWhiteboardVisible(false);
+            setWhiteboardVisible(!whiteboardVisible);
           }
         }, theme.theme);
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/modules/components/control-bar/index.js

@@ -291,9 +291,7 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
             className: "fcr-whiteboard-controlbar-item",
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_switchTheme["default"], {
               whiteboardVisible: showSwitchTheme,
-              setWhiteboardVisible: function setWhiteboardVisible() {
-                return setShowSwitchTheme(!showSwitchTheme);
-              },
+              setWhiteboardVisible: setShowSwitchTheme,
               currentThemeType: currentTheme,
               setTheme: setTheme
             })

package/lib/modules/components/leave-meeting/store.base.d.ts

@@ -32,5 +32,6 @@ export declare abstract class LeaveMeetingStoreBase {
     setKeepConnect(value: boolean): void;
     end(): Promise<void>;
     release(): void;
+    private _checkIfQuitFullScreen;
 }
 export declare const LeaveMeetingStoreContext: import("react").Context<LeaveMeetingStoreBase>;

package/lib/modules/components/leave-meeting/store.base.js

@@ -59,6 +59,7 @@ var _react = require("react");
 var _constant = require("../../../utilities/constant");
 var _objectManager = require("../../../object-manager");
 var _env = require("agora-foundation/lib/utilities/env");
+var _imports = require("fcr-core/lib/imports");
 var _LeaveMeetingStoreBase;
 var _initProto, _init_keepConnect, _init_canAssign, _init_loading, _showEndConfirmDialogDecs, _assignHostDecs, _setIsSelfEndMeetingDecs, _leaveDecs, _keepPhoneAudioConnectionDecs, _setCanAssignDecs, _setKeepConnectDecs, _endDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -163,19 +164,22 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              _context.next = 1;
+              return this._checkIfQuitFullScreen();
+            case 1:
               this.loading = true;
               _t = this.keepConnect && this.isPstnUser;
               if (!_t) {
-                _context.next = 1;
+                _context.next = 2;
                 break;
               }
-              _context.next = 1;
+              _context.next = 2;
               return this.keepPhoneAudioConnection();
-            case 1:
+            case 2:
               this.loading = false;
               this._roomProvider.exitRoom();
               this.resetPreventClose();
-            case 2:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -237,10 +241,13 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              _context3.next = 1;
+              return this._checkIfQuitFullScreen();
+            case 1:
               this._roomControl.close();
               this._roomProvider.exitRoom();
               this.resetPreventClose();
-            case 1:
+            case 2:
             case "end":
               return _context3.stop();
           }
@@ -254,6 +261,40 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
   }, {
     key: "release",
     value: function release() {}
+  }, {
+    key: "_checkIfQuitFullScreen",
+    value: function () {
+      var _checkIfQuitFullScreen2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+        var windowProvider, mainWindow;
+        return _regenerator["default"].wrap(function (_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              if (!(0, _env.isElectron)()) {
+                _context4.next = 1;
+                break;
+              }
+              windowProvider = this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
+              mainWindow = windowProvider.getCurrentWindow();
+              if (!mainWindow.isFullScreen()) {
+                _context4.next = 1;
+                break;
+              }
+              mainWindow.setFullScreen(false);
+
+              // 需要等待窗口退出全屏完成
+              _context4.next = 1;
+              return (0, _imports.sleep)(500);
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function _checkIfQuitFullScreen() {
+        return _checkIfQuitFullScreen2.apply(this, arguments);
+      }
+      return _checkIfQuitFullScreen;
+    }()
   }]);
 }();
 _LeaveMeetingStoreBase = LeaveMeetingStoreBase;

package/lib/modules/dialog/dialogs/confirm-leave-meeting/index.d.ts

@@ -14,5 +14,6 @@ export declare const windowConfig: {
     resizable: false;
     width: number;
     height: number;
+    alwaysOnTop: true;
 };
 export {};

package/lib/modules/dialog/dialogs/confirm-leave-meeting/index.js

@@ -40,5 +40,6 @@ var windowConfig = exports.windowConfig = {
   },
   resizable: false,
   width: 255,
-  height: 158
+  height: 158,
+  alwaysOnTop: true
 };

package/lib/modules/dialog/dialogs/share-screen-selection/index.js

@@ -15,18 +15,6 @@ var ShareScreenSelectionDialog = exports.ShareScreenSelectionDialog = /*#__PURE_
     children = _ref.children;
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare');
-
-  // const body = (
-  //   <DialogContainer
-  //     dialogId={dialogId}
-  //     dialogKey={dialogKey}
-  //     title={title}
-  //     width={790}
-  //     height={550}>
-  //     {children}
-  //   </DialogContainer>
-  // );
-
   var body = children;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_normalWindow.NormalWindow, {
     title: title,

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/share-screen/store.base.js

@@ -73,7 +73,6 @@ var _type = require("./type");
 var _type2 = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _struct = require("../../providers/screen-share/struct");
-var _constant = require("../../utilities/constant");
 var _type3 = require("agora-ui-foundation/lib/components/icon/type");
 var _ShareScreenStoreBase;
 var _initProto, _init_isSharing, _init_displayList, _init_applicationList, _init_selectedShareItem, _init_isWhiteboardSelected, _init_isSharingWithAudio, _init_isSharingInSmoothMode, _loadSelectionListDecs, _setSelectedItemDecs, _ref;
@@ -379,7 +378,6 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
                 captureType: captureType
               });
             case 6:
-              this.dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
               _context2.next = 8;
               break;
             case 7:

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

@@ -64,6 +64,7 @@ var _mobx = require("mobx");
 var _parameters = require("../../utilities/parameters");
 var _type3 = require("fcr-core/lib/type");
 var _levelConfig = require("../dialog/level-config");
+var _imports = require("fcr-core/lib/imports");
 var _ElectronShareScreenStore;
 var _initProto, _handleSelectionOpenDecs, _setShareWithAudioStateDecs, _setShareInSmoothModeDecs, _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)); }
@@ -189,21 +190,52 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
     }
   }, {
     key: "_showControlBar",
-    value: function _showControlBar() {
-      this._isSharing = true;
-      this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
-      var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-      videoWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.VIDEO_WINDOW_LEVEL);
-      var isMultiDisplayActive = this._multiDisplayProvider.isActive;
-      this._ensureWindowsAreOpenAndPositioned(true, isMultiDisplayActive);
-      if (isMultiDisplayActive) {
-        this._multiDisplayProvider.moveMainWindowToIndexLeastDisplay();
-      } else {
-        var mainWindow = this._windowProvider.getCurrentWindow();
-        mainWindow.setFullScreen(false);
-        mainWindow.hide();
+    value: function () {
+      var _showControlBar2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var isMultiDisplayActive, mainWindow, videoWindow;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this._isSharing = true;
+              this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
+              isMultiDisplayActive = this._multiDisplayProvider.isActive;
+              mainWindow = this._windowProvider.getCurrentWindow();
+              if (isMultiDisplayActive) {
+                _context.next = 1;
+                break;
+              }
+              if (!mainWindow.isFullScreen()) {
+                _context.next = 1;
+                break;
+              }
+              mainWindow.setFullScreen(false);
+
+              // 需要等待窗口退出全屏完成
+              _context.next = 1;
+              return (0, _imports.sleep)(1000);
+            case 1:
+              videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+              if (!videoWindow.isVisible()) {
+                videoWindow.show();
+              }
+              videoWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.VIDEO_WINDOW_LEVEL);
+              this._ensureWindowsAreOpenAndPositioned(true, isMultiDisplayActive);
+              if (isMultiDisplayActive) {
+                this._multiDisplayProvider.moveMainWindowToIndexLeastDisplay();
+              } else {
+                mainWindow.hide();
+              }
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function _showControlBar() {
+        return _showControlBar2.apply(this, arguments);
       }
-    }
+      return _showControlBar;
+    }()
   }, {
     key: "_hideControlBar",
     value: function _hideControlBar() {
@@ -226,20 +258,20 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
   }, {
     key: "_checkAutoStartScreenSharing",
     value: function () {
-      var _checkAutoStartScreenSharing2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _checkAutoStartScreenSharing2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var needStartShare, displayList, _displayList$, bounds, id;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               needStartShare = (0, _parameters.getStartScreenSharing)(this._sharedConfigDataSource.creatorConfig.parameters);
               if (!needStartShare) {
-                _context.next = 2;
+                _context2.next = 2;
                 break;
               }
-              _context.next = 1;
+              _context2.next = 1;
               return this.screenShareProvider.getDisplayList();
             case 1:
-              displayList = _context.sent;
+              displayList = _context2.sent;
               if (displayList.length === 0) {
                 this.logger.error('cannot start auto screen sharing, no display found');
               } else {
@@ -252,9 +284,9 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
               }
             case 2:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
       function _checkAutoStartScreenSharing() {
         return _checkAutoStartScreenSharing2.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/modules/video-window/popover-watcher.js

@@ -33,7 +33,10 @@ function usePopoverWatcher(_ref) {
       mutationsList.forEach(function (mutation) {
         if (mutation.type === 'childList') {
           mutation.removedNodes.forEach(function (node) {
-            if (node.nodeType === Node.ELEMENT_NODE && node.classList.contains(popoverClassName)) {
+            var hasPopoverNode = function hasPopoverNode(node) {
+              return node.classList.contains(popoverClassName) || node.querySelector(".".concat(popoverClassName));
+            };
+            if (isPopoverOpened && node.nodeType === Node.ELEMENT_NODE && hasPopoverNode(node)) {
               isPopoverOpened = false;
               resetVideoWindowSize();
             }

package/lib/modules/video-window/store.js

@@ -496,7 +496,13 @@ var VideoWindowStore = exports["default"] = /*#__PURE__*/function () {
           width: _type.DefaultVideoWindowWidth,
           height: _type.DefaultVideoWindowSmallTypeHeight
         };
-        _this4.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
+
+        // 如果是小窗模式, 则重置为 dialog 为小窗尺寸, 否则切换为小窗模式, reaction 里会更新 dialog 尺寸
+        if (_this4.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.SMALL) {
+          _this4._setVideoWindowDialogSize(_type.DefaultVideoWindowWidth, _type.DefaultVideoWindowSmallTypeHeight);
+        } else {
+          _this4.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
+        }
       });
     }
   }]);

package/lib/modules/video-window/view.js

@@ -61,14 +61,24 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
   }, [isHover]);
   (0, _react.useEffect)(function () {
     if (divRef.current === null) return;
+
+    // 刚打开 dialog 时, divRef.current 还在主窗口的 document 中, 需要等到下一次渲染才会被移动到 dialog 的 document 中
+    if (divRef.current.ownerDocument === document) return;
     var ownerDocument = divRef.current.ownerDocument;
     var defaultView = ownerDocument.defaultView;
     var body = ownerDocument.body;
     var onResize = function onResize() {
-      handleVideowWindowResize({
-        width: body.offsetWidth,
-        height: body.offsetHeight
-      });
+      if (defaultView) {
+        handleVideowWindowResize({
+          width: defaultView.innerWidth,
+          height: defaultView.innerHeight
+        });
+      } else {
+        handleVideowWindowResize({
+          width: body.clientWidth,
+          height: body.clientHeight
+        });
+      }
     };
     if (defaultView) {
       defaultView.addEventListener('resize', onResize);

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;