fcr-ui-scene 3.7.4 → 3.7.6

package/lib/modules/waiting-room-layout/index.d.ts

@@ -1,14 +1,8 @@
 import { UIModule } from '../../base';
-import { FcrUIDeviceProvider } from '../../providers/device-provider';
-import { FcrUILocalVideoRenderProvider } from '../../providers/renderer-provider';
-import { FcrLayoutSlots } from './store';
-import { FcrUICurrentRoomControlProvider, FcrUIRoomProvider } from '../../providers/room-provider';
+import LayoutStore, { FcrLayoutSlots } from './store';
 export declare class WaitingRoomLayout extends UIModule {
-    private _store?;
-    deviceProvider?: FcrUIDeviceProvider;
-    localVideoRenderProvider?: FcrUILocalVideoRenderProvider;
-    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
-    roomProvider?: FcrUIRoomProvider;
+    private _store;
+    get store(): LayoutStore;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(slots?: Partial<FcrLayoutSlots & {

package/lib/modules/waiting-room-layout/index.js

@@ -17,16 +17,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.WaitingRoomLayout = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.concat.js");
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _base = require("../../base");
-var _toast = _interopRequireDefault(require("../dialog/dialogs/toast"));
 var _store = _interopRequireWildcard(require("./store"));
 var _view = _interopRequireDefault(require("./view"));
-var _confirm = require("../dialog/dialogs/confirm");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["globalToast", "confirm"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -34,43 +36,48 @@ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var WaitingRoomLayout = exports.WaitingRoomLayout = /*#__PURE__*/function (_UIModule) {
   function WaitingRoomLayout() {
+    var _this;
     (0, _classCallCheck2["default"])(this, WaitingRoomLayout);
-    return _callSuper(this, WaitingRoomLayout, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, WaitingRoomLayout, [].concat(args));
+    (0, _defineProperty2["default"])(_this, "_store", null);
+    return _this;
   }
   (0, _inherits2["default"])(WaitingRoomLayout, _UIModule);
   return (0, _createClass2["default"])(WaitingRoomLayout, [{
+    key: "store",
+    get: function get() {
+      if (!this._store) {
+        throw new Error('LayoutStore is not initialized');
+      }
+      return this._store;
+    }
+  }, {
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      var _this$currentRoomCont;
-      this._store = new _store["default"]({
-        deviceProvider: this.deviceProvider,
-        localVideoRenderProvider: this.localVideoRenderProvider,
-        userControl: (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl.getUserControl(),
-        roomProvider: this.roomProvider
-      });
+      var args = {
+        objectManager: this.objectManager
+      };
+      this._store = new _store["default"](args);
     }
   }, {
     key: "onNodeWillInactive",
     value: function onNodeWillInactive() {
-      var _this$_store;
-      (_this$_store = this._store) === null || _this$_store === void 0 || _this$_store.release();
+      this.store.release();
     }
   }, {
     key: "getComponent",
     value: function getComponent() {
       var slots = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var store = this._store;
       var globalToast = slots.globalToast,
         confirm = slots.confirm,
         restSlots = (0, _objectWithoutProperties2["default"])(slots, _excluded);
-      store.updateSlots(restSlots);
-      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_store.StoreContext.Provider, {
-        value: store,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_view["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_toast["default"], {
-          children: globalToast
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.ConfirmDialog, {
-          children: confirm
-        })]
+      this.store.updateSlots(restSlots);
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
+        value: this.store,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view["default"], {})
       });
     }
   }]);

package/lib/modules/waiting-room-layout/store.d.ts

@@ -1,19 +1,13 @@
-import { FcrUserControl } from 'fcr-core';
-import { FcrUIDeviceProvider } from '../../providers/device-provider';
-import { FcrUILocalVideoRenderProvider } from '../../providers/renderer-provider';
-import { FcrUIRoomProvider } from '../../providers/room-provider';
 import { FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUIObjectManager } from '../../object-manager';
 export interface FcrLayoutSlots {
     chat: React.ReactNode;
     stateBar: React.ReactNode;
     actionBar: React.ReactNode;
     layers: React.ReactNode;
 }
-export interface LayoutStoreParams {
-    deviceProvider: FcrUIDeviceProvider;
-    localVideoRenderProvider: FcrUILocalVideoRenderProvider;
-    userControl: FcrUserControl;
-    roomProvider: FcrUIRoomProvider;
+export interface LayoutStoreArgs {
+    objectManager: FcrUIObjectManager;
 }
 export default class LayoutStore implements FcrLayoutSlots {
     private _deviceProvider;
@@ -31,7 +25,7 @@ export default class LayoutStore implements FcrLayoutSlots {
     accessor layers: React.ReactNode;
     accessor whiteboard: React.ReactNode;
     accessor isJbhToMainRoom: boolean;
-    constructor(params: LayoutStoreParams);
+    constructor({ objectManager }: LayoutStoreArgs);
     get localUser(): FcrUserInfo;
     get cameraId(): string;
     get cameraEnabled(): boolean;

package/lib/modules/waiting-room-layout/store.js

@@ -52,6 +52,7 @@ var _mobx = require("mobx");
 var _react = require("react");
 var _decorator = require("agora-foundation/lib/decorator");
 var _type = require("fcr-core/lib/room-control/type");
+var _objectManager = require("../../object-manager");
 var _LayoutStore;
 var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _isJbhToMainRoomDecs, _init_isJbhToMainRoom, _updateSlotsDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -73,8 +74,9 @@ var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 _ref = (_participantDecs = [_mobx.observable, _mobx.observable.ref], _chatDecs = [_mobx.observable, _mobx.observable.ref], _stateBarDecs = [_mobx.observable, _mobx.observable.ref], _actionBarDecs = [_mobx.observable, _mobx.observable.ref], _layersDecs = [_mobx.observable, _mobx.observable.ref], _whiteboardDecs = [_mobx.observable, _mobx.observable.ref], _isJbhToMainRoomDecs = [_mobx.observable, _mobx.observable.ref], _updateSlotsDecs = [_mobx.action, _mobx.action.bound], "_deviceProvider");
 var LayoutStore = exports["default"] = /*#__PURE__*/function () {
-  function LayoutStore(params) {
+  function LayoutStore(_ref2) {
     var _this = this;
+    var objectManager = _ref2.objectManager;
     (0, _classCallCheck2["default"])(this, LayoutStore);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
     (0, _defineProperty2["default"])(this, "_roomProviderObserver", {
@@ -90,14 +92,15 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _E, _init_layers(this, null));
     _classPrivateFieldInitSpec(this, _F, _init_whiteboard(this, null));
     _classPrivateFieldInitSpec(this, _G, _init_isJbhToMainRoom(this, false));
-    this._deviceProvider = params.deviceProvider;
-    this._localVideoRenderProvider = params.localVideoRenderProvider;
-    this._userControl = params.userControl;
-    this._roomControl = params.roomProvider.currentRoomControl;
-    this._roomProvider = params.roomProvider;
-    this._roomProvider.addObserver(this._roomProviderObserver);
+    this._deviceProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
+    this._localVideoRenderProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER);
+    var currentRoomProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER);
+    this._roomProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
+    this._roomControl = currentRoomProvider.currentRoomControl;
+    this._userControl = this._roomControl.getUserControl();
     this._localUser = this._userControl.getLocalUser();
     this._roomInfo = this._roomControl.getRoomInfo();
+    this._roomProvider.addObserver(this._roomProviderObserver);
   }
   return (0, _createClass2["default"])(LayoutStore, [{
     key: "participant",

package/lib/modules/whiteboard/components/control-bar/store.d.ts

@@ -2,8 +2,6 @@ import { FcrUIEventProvider } from '../../../../providers/event-provider';
 import { FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrUIPrivilegeProvider } from '../../../../providers/privilege-provider';
-import { FcrUIAnnotationProvider } from '../../../../providers/annotation-provider';
-import { FcrUISharedAnnotationSource } from '../../../../shared-data-source/annotation-data';
 export declare class WhiteboardControlBarStore {
     accessor ownerUser: FcrUserInfo | undefined;
     accessor currentUser: FcrUserInfo | undefined;
@@ -15,22 +13,16 @@ export declare class WhiteboardControlBarStore {
     accessor scaleValue: number;
     accessor controlEnabled: boolean;
     accessor isHost: boolean;
-    private _uiEventStore;
+    private _eventProvider;
     private _userControl;
-    private _securityStore;
-    private _annotationProvider;
-    private _sharedAnnotationDataSource;
-    private _uiEventObserver;
-    private _userObserver;
-    constructor({ uiEventStore, userControl, securityStore, annotationProvider, sharedAnnotationDataSource, }: {
-        uiEventStore: FcrUIEventProvider;
+    private _privilegeProvider;
+    constructor({ eventProvider, userControl, privilegeProvider, }: {
+        eventProvider: FcrUIEventProvider;
         streamControl: FcrStreamControl;
         userControl: FcrUserControl;
-        securityStore: FcrUIPrivilegeProvider;
-        annotationProvider: FcrUIAnnotationProvider;
-        sharedAnnotationDataSource: FcrUISharedAnnotationSource;
+        privilegeProvider: FcrUIPrivilegeProvider;
     });
-    get annotationHasStart(): boolean;
+    get annotationHasStart(): any;
     get canWriteBoard(): boolean;
     onZoomin(): void;
     onZoomout(): void;

package/lib/modules/whiteboard/components/control-bar/store.js

@@ -48,7 +48,6 @@ require("core-js/modules/web.dom-collections.iterator.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"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _constant = require("../../../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
@@ -79,14 +78,15 @@ var _I = /*#__PURE__*/new WeakMap();
 var _J = /*#__PURE__*/new WeakMap();
 _ref = (_setOwnerUserDecs = [_mobx.action, _mobx.action.bound], _onEnableDecs = [_mobx.action, _mobx.action.bound], "ownerUser");
 var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*/function () {
+  // private _annotationProvider: FcrUIAnnotationProvider;
+  // private _sharedAnnotationDataSource: FcrUISharedAnnotationSource;
+
   function WhiteboardControlBarStore(_ref2) {
-    var _this = this,
-      _userControl$getLocal;
-    var uiEventStore = _ref2.uiEventStore,
+    var _userControl$getLocal,
+      _this = this;
+    var eventProvider = _ref2.eventProvider,
       userControl = _ref2.userControl,
-      securityStore = _ref2.securityStore,
-      annotationProvider = _ref2.annotationProvider,
-      sharedAnnotationDataSource = _ref2.sharedAnnotationDataSource;
+      privilegeProvider = _ref2.privilegeProvider;
     (0, _classCallCheck2["default"])(this, WhiteboardControlBarStore);
     _classPrivateFieldInitSpec(this, _A, (_initProto(this), _init_ownerUser(this, undefined)));
     _classPrivateFieldInitSpec(this, _B, _init_currentUser(this, undefined));
@@ -98,7 +98,14 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
     _classPrivateFieldInitSpec(this, _H, _init_scaleValue(this, 1));
     _classPrivateFieldInitSpec(this, _I, _init_controlEnabled(this, false));
     _classPrivateFieldInitSpec(this, _J, _init_isHost(this, false));
-    (0, _defineProperty2["default"])(this, "_uiEventObserver", {
+    this._eventProvider = eventProvider;
+    this._userControl = userControl;
+    this.currentUser = userControl.getLocalUser();
+    this._privilegeProvider = privilegeProvider;
+    // this._annotationProvider = annotationProvider;
+    // this._sharedAnnotationDataSource = sharedAnnotationDataSource;
+    this.isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes((_userControl$getLocal = userControl.getLocalUser()) === null || _userControl$getLocal === void 0 ? void 0 : _userControl$getLocal.userRole);
+    eventProvider.addObserver({
       onEvent: function onEvent(action, payload) {
         if (action === _constant.FcrUIAction.WHITEBOARD_CHANGED) {
           if (payload.action === _type.WhiteboardBaseEvents.SET_OWNER_USER_ID) {
@@ -114,7 +121,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
         }
       }
     });
-    (0, _defineProperty2["default"])(this, "_userObserver", {
+    userControl.addObserver({
       onUserInfoUpdated: function onUserInfoUpdated(_, event) {
         var localUser = _this._userControl.getLocalUser();
         if (event.modifiedUser.userId === localUser.userId) {
@@ -122,15 +129,6 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
         }
       }
     });
-    this._uiEventStore = uiEventStore;
-    this._userControl = userControl;
-    this.currentUser = userControl.getLocalUser();
-    this._securityStore = securityStore;
-    this._annotationProvider = annotationProvider;
-    this._sharedAnnotationDataSource = sharedAnnotationDataSource;
-    this.isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes((_userControl$getLocal = userControl.getLocalUser()) === null || _userControl$getLocal === void 0 ? void 0 : _userControl$getLocal.userRole);
-    this._uiEventStore.addObserver(this._uiEventObserver);
-    this._userControl.addObserver(this._userObserver);
   }
   return (0, _createClass2["default"])(WhiteboardControlBarStore, [{
     key: _ref,
@@ -217,48 +215,49 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
   }, {
     key: "annotationHasStart",
     get: function get() {
+      // @ts-ignore
       return this._sharedAnnotationDataSource.annotationHasStart;
     }
   }, {
     key: "canWriteBoard",
     get: function get() {
-      var _this$_securityStore;
-      var cando = (_this$_securityStore = this._securityStore) === null || _this$_securityStore === void 0 ? void 0 : _this$_securityStore.hasWriteBoardPermission();
+      var _this$_privilegeProvi;
+      var cando = (_this$_privilegeProvi = this._privilegeProvider) === null || _this$_privilegeProvi === void 0 ? void 0 : _this$_privilegeProvi.hasWriteBoardPermission();
       if (!cando && !this.isHost) this.onEnable(cando);
       return cando;
     }
   }, {
     key: "onZoomin",
     value: function onZoomin() {
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
+      this._eventProvider.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ZOOMIN
       });
     }
   }, {
     key: "onZoomout",
     value: function onZoomout() {
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
+      this._eventProvider.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ZOOMOUT
       });
     }
   }, {
     key: "onAdaptive",
     value: function onAdaptive() {
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
+      this._eventProvider.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ADAPTIVE
       });
     }
   }, {
     key: "onOrigin",
     value: function onOrigin() {
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
+      this._eventProvider.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ORIGIN
       });
     }
   }, {
     key: "onLonelyWindow",
     value: function onLonelyWindow() {
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
+      this._eventProvider.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.LONEYWINDOW,
         payload: !this.lonelywindowOpened
       });
@@ -266,8 +265,8 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
   }, {
     key: "onClose",
     value: function onClose() {
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.RESET_WHITEBOARD_TOOLBAR_VARS);
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.CLOSE_WHITEBOARD);
+      this._eventProvider.sendEvent(_constant.FcrUIAction.RESET_WHITEBOARD_TOOLBAR_VARS);
+      this._eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_WHITEBOARD);
     }
   }, {
     key: "setOwnerUser",
@@ -277,17 +276,16 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
   }, {
     key: "onEnable",
     value: function onEnable(controlEnabled) {
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
+      this._eventProvider.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ENABLE_CONTROL,
         payload: controlEnabled
       });
-      this._uiEventStore.sendEvent(_constant.FcrUIAction.RESET_WHITEBOARD_TOOLBAR_VARS);
+      this._eventProvider.sendEvent(_constant.FcrUIAction.RESET_WHITEBOARD_TOOLBAR_VARS);
     }
   }, {
     key: "release",
     value: function release() {
-      this._uiEventStore.removeObserver(this._uiEventObserver);
-      this._userControl.removeObserver(this._userObserver);
+      // this._userControl.removeObserver(this._userObserver);
     }
   }]);
 }();

package/lib/modules/whiteboard/components/loading/index.d.ts

@@ -1,2 +1,8 @@
+import { FcrConnectionState } from 'fcr-core';
 import './index.css';
-export declare const Loading: () => import("react/jsx-runtime").JSX.Element;
+export declare const Loading: (props: {
+    connectionState: FcrConnectionState;
+    joinSuccessed: boolean;
+    canOperate: boolean;
+    handleClose: () => void;
+}) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/whiteboard/components/loading/index.js

@@ -7,24 +7,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Loading = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-require("./index.css");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _loading = _interopRequireDefault(require("./loading.png"));
 var _mobxReact = require("mobx-react");
-var _context = require("../../context");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _button = require("agora-ui-foundation/lib/components/button");
 var _fcrCore = require("fcr-core");
+require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
-var Loading = exports.Loading = (0, _mobxReact.observer)(function () {
+var Loading = exports.Loading = (0, _mobxReact.observer)(function (props) {
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_context.BoardUIContext),
-    _useContext$observabl = _useContext.observables,
-    connectionState = _useContext$observabl.connectionState,
-    joinSuccessed = _useContext$observabl.joinSuccessed,
-    canOperate = _useContext$observabl.canOperate,
-    handleClose = _useContext.handleClose;
+  var connectionState = props.connectionState,
+    joinSuccessed = props.joinSuccessed,
+    canOperate = props.canOperate,
+    handleClose = props.handleClose;
   var isReconnecting = connectionState === _fcrCore.FcrConnectionState.RECONNECTING || connectionState === _fcrCore.FcrConnectionState.CONNECTING && joinSuccessed;
   var _useState = (0, _react.useState)(!isReconnecting || !canOperate),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),

package/lib/modules/whiteboard/components/multi-window/index.js

@@ -11,7 +11,7 @@ var _controlBar = require("../control-bar");
 var _react = require("react");
 var _context = require("../../context");
 require("./index.css");
-var _boardContext = _interopRequireDefault(require("../../../../utilities/board-context"));
+var _boardContext = _interopRequireDefault(require("../../../../shared-context/board-context"));
 var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var MultiWindowWidgetDialog = exports.MultiWindowWidgetDialog = (0, _mobxReact.observer)(function (_ref) {

package/lib/modules/whiteboard/components/toolbar/store.d.ts

@@ -3,15 +3,11 @@ import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/e
 import { FcrBoardMainWindow } from 'fcr-core/lib/room-control/whiteboard-control/types';
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
-import { FcrUIAnnotationProvider } from '../../../../providers/annotation-provider';
 import { FcrUIEventProvider } from '../../../../providers/event-provider';
-import { FcrUISharedAnnotationSource } from '../../../../shared-data-source/annotation-data';
 export declare class ToolbarStore {
     private _whiteboardControl;
     private _roomControl;
-    private _annotationProvider;
     private _eventProvider;
-    private _sharedAnnotationDataSource;
     private _boardMainWindow;
     private _lastStrokeWidth;
     private _boardObserver;
@@ -47,10 +43,9 @@ export declare class ToolbarStore {
     };
     get roomInfo(): import("fcr-core/lib/type").FcrRoomInfo | undefined;
     get boardMainWindow(): FcrBoardMainWindow | undefined;
-    constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider, _eventProvider: FcrUIEventProvider, _sharedAnnotationDataSource: FcrUISharedAnnotationSource);
+    constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _roomControl: FcrBaseRoomControl, _eventProvider: FcrUIEventProvider);
     private _onUiEvent;
     resetToolbarVars(): void;
-    get annotationHasStart(): boolean;
     redo(): void;
     undo(): void;
     clean(): void;

package/lib/modules/whiteboard/components/toolbar/store.js

@@ -79,7 +79,7 @@ var colors = ['#EFEFEF', '#FFEC42', '#FFB545', '#E44A19', '#4A4C5F', '#A1C573',
 var _A = /*#__PURE__*/new WeakMap();
 _ref = (_resetToolbarVarsDecs = [_mobx.action, _mobx.action.bound], _redoDecs = [_mobx.action, _mobx.action.bound], _undoDecs = [_mobx.action, _mobx.action.bound], _cleanDecs = [_mobx.action, _mobx.action.bound], _setToolDecs = [_mobx.action, _mobx.action.bound], _setPenDecs = [_mobx.action, _mobx.action.bound], _setShapeDecs = [_mobx.action, _mobx.action.bound], _setStrokeColorDecs = [_mobx.action, _mobx.action.bound], _setStrokeWidthDecs = [_mobx.action, _mobx.action.bound], _clickExpansionToolDecs = [_mobx.action, _mobx.action.bound], _setToolbarPositionDecs = [_mobx.action, _mobx.action.bound], _dragToolbarDecs = [_mobx.action, _mobx.action.bound], _releaseToolbarDecs = [_mobx.action, _mobx.action.bound], _captureScreenDecs = [_mobx.action, _mobx.action.bound], _saveDraftDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setCommonColorDecs = [_mobx.action, _mobx.action.bound], _repositionToolbarDecs = [_mobx.action, _mobx.action.bound], _getSnapshotImageDecs = [_mobx.action, _mobx.action.bound], "_boardMainWindow");
 var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
-  function ToolbarStore(_whiteboardControl, _roomControl, _annotationProvider, _eventProvider, _sharedAnnotationDataSource) {
+  function ToolbarStore(_whiteboardControl, _roomControl, _eventProvider) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, ToolbarStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), undefined));
@@ -141,9 +141,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
     }));
     this._whiteboardControl = _whiteboardControl;
     this._roomControl = _roomControl;
-    this._annotationProvider = _annotationProvider;
     this._eventProvider = _eventProvider;
-    this._sharedAnnotationDataSource = _sharedAnnotationDataSource;
     this._whiteboardControl.addObserver(this._whiteboardObserver);
     this._eventProvider.addObserver(this._uiEventObserver);
   }
@@ -199,11 +197,6 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
         this.setPen(_type.FcrBoardShape.Curve);
       }
     }
-  }, {
-    key: "annotationHasStart",
-    get: function get() {
-      return this._sharedAnnotationDataSource.annotationHasStart;
-    }
   }, {
     key: "redo",
     value: function redo() {
@@ -290,10 +283,8 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
     key: "captureScreen",
     value: function captureScreen() {
       var hideWindow = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      window.runtime.captureScreen({
-        hideWindow: hideWindow
-      });
-    }
+    } // TODO:
+    // renderer.captureScreen({ hideWindow });
   }, {
     key: "saveDraft",
     value: function saveDraft() {
@@ -451,7 +442,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
                   var fileName = "".concat((_this5$roomInfo = _this5.roomInfo) === null || _this5$roomInfo === void 0 ? void 0 : _this5$roomInfo.roomName, "_").concat((0, _dayjs["default"])().format('YYYYMMDD_HHmmSSS'), ".jpg");
                   (0, _utils.downloadImageData)(imageData, fileName);
 
-                  // this._uiEventStore?.showToast({
+                  // this._eventProvider?.showToast({
                   //   type: 'info',
                   //   message: transI18n('fmt_screenshare_whiteboard_tips_savedsuccessfully'),
                   // });

package/lib/modules/whiteboard/index.d.ts

@@ -1,98 +1,10 @@
-import { WhiteboardBaseEvents, WhiteboardControlbarEvents } from './type';
-import { FcrUIDialogKey, FcrUIAction } from '../../utilities/constant';
 import { UIModule } from '../../base';
-import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIVideoWindowLayoutType } from '../layout/type';
-import { FcrUICurrentRoomControlProvider } from '../../providers/room-provider';
-import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
-import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
-import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
-import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
+import WhitebaordStoreBase from './store';
 export declare class FcrWhiteboardUIModule extends UIModule {
     protected logger: import("agora-foundation/lib/logger").Logger;
-    private _disposers;
-    private _uiEventStore?;
-    private _userControl?;
-    private _roomControl?;
-    private _streamControl?;
-    private _securityStore?;
-    private _whiteboardControl?;
-    private _boardStore?;
-    private _connectionState;
-    private _boardMainWindow;
-    private _toolbarStore?;
-    private _controlbarStore?;
-    private _initWidth;
-    private _initHeight;
-    private _joinSuccessed;
-    private _isActive;
-    private _timer;
-    private _isMyBoard;
-    private _boardObserver;
-    private _multiDisplayObserver;
-    private _streamObserver;
-    private _userObserver;
-    private _eventObserver;
-    private _mounted;
-    private _initialized;
-    private _joined;
-    private _boardDom?;
-    private _collectorDom?;
-    private _grantedUsers;
-    private _outerDom?;
-    private _initArgs?;
-    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
-    eventProvider?: FcrUIEventProvider;
-    privilegeProvider?: FcrUIPrivilegeProvider;
-    annotationProvider: FcrUIAnnotationProvider;
-    sharedAnnotationDataSource: FcrUISharedAnnotationSource;
-    multiDisplayProvider?: FcrUIMultiDisplayProvider;
-    private accessor _isMultiDisplay;
-    private accessor _lonelyWindowState;
-    private accessor _ownerUser;
-    private accessor _isHost;
-    private accessor _boardBackground;
-    private accessor _localUser;
-    get hasPrivilege(): boolean | undefined;
-    get contentAreaSize(): {
-        width: number;
-        height: number;
-        top: number;
-        left: number;
-    };
+    private _store;
+    get store(): WhitebaordStoreBase;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
-    getComponent(dom?: Element | null): React.ReactNode;
-    onEvent(event: FcrUIAction, payload: {
-        dialogKey: FcrUIDialogKey;
-        dialogId?: string;
-    } & {
-        action: WhiteboardControlbarEvents | WhiteboardBaseEvents;
-        payload?: boolean | FcrUIVideoWindowLayoutType | WhiteboardControlbarEvents;
-    } & {
-        layout: FcrUIVideoWindowLayoutType;
-    }): void;
-    private _handleActive;
-    onDestroy(params?: {
-        operatorUser?: FcrUserInfo;
-    }): void;
-    mount(): void;
-    unmount(): void;
-    unload(): void;
-    release(): void;
-    private _setBackground;
-    private _checkBoard;
-    private _boardUIEvents;
-    private _setCanvasBound;
-    private _resetCanvasPosition;
-    private _resetScaleState;
-    private _createBoardUIContext;
-    private _repositionToolbar;
-    private _setConnectionState;
-    private _open;
-    private _close;
-    private _setJoinSuccessed;
-    private _addDisposers;
-    private _alertWhenBeenStopByOthers;
+    getComponent(): React.ReactNode;
 }