fcr-ui-scene 3.7.4 → 3.7.6

package/lib/modules/invite/store.js

@@ -8,6 +8,7 @@ require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.number.constructor.js");
@@ -39,7 +40,6 @@ exports["default"] = exports.StoreContext = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
@@ -57,12 +57,13 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _mobx = require("mobx");
 var _type = require("fcr-core/lib/room-control/room-connector-control/type");
-var _type2 = require("fcr-core/lib/room-control/type");
 var _react = require("react");
-var _constant = require("../../utilities/constant");
 var _enums = require("./enums");
+var _objectManager = require("../../object-manager");
+var _logger = require("../../utilities/logger");
+var _meetingDetail = require("../../utilities/meeting-detail");
 var _InviteStore;
-var _initProto, _init_InviteStatus, _init_isPstnCalling, _init_isVoipCalling, _init_ipInfo, _init_phoneInfo, _init_calledPstnInfo, _init_calledVoipInfo, _init_roomInfo, _init_meetingId, _stopSessionDecs, _startSessionByPhoneDecs, _startSessionByVoipDecs, _showToastDecs, _getRoomConnectorIpInfoDecs, _getRoomConnectorPhoneInfoDecs, _handleErrorDecs, _updateInviteStatusDecs, _resetpstnStatusDecs, _resetVoipStatusDecs, _handlePhoneConnectorSessionStateUpdatedDecs, _handleIPConnectorSessionStateUpdatedDecs, _onUiEventDecs, _ref;
+var _initProto, _init_InviteStatus, _init_isPstnCalling, _init_isVoipCalling, _init_ipInfo, _init_phoneInfo, _init_calledPstnInfo, _init_calledVoipInfo, _stopSessionDecs, _startSessionByPhoneDecs, _startSessionByVoipDecs, _showToastDecs, _getRoomConnectorIpInfoDecs, _getRoomConnectorPhoneInfoDecs, _handleErrorDecs, _updateInviteStatusDecs, _resetpstnStatusDecs, _resetVoipStatusDecs, _handlePhoneConnectorSessionStateUpdatedDecs, _handleIPConnectorSessionStateUpdatedDecs, _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; }
@@ -82,64 +83,59 @@ var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
 var _I = /*#__PURE__*/new WeakMap();
-_ref = (_stopSessionDecs = [_mobx.action, _mobx.action.bound], _startSessionByPhoneDecs = [_mobx.action, _mobx.action.bound], _startSessionByVoipDecs = [_mobx.action, _mobx.action.bound], _showToastDecs = [_mobx.action, _mobx.action.bound], _getRoomConnectorIpInfoDecs = [_mobx.action, _mobx.action.bound], _getRoomConnectorPhoneInfoDecs = [_mobx.action, _mobx.action.bound], _handleErrorDecs = [_mobx.action, _mobx.action.bound], _updateInviteStatusDecs = [_mobx.action, _mobx.action.bound], _resetpstnStatusDecs = [_mobx.action, _mobx.action.bound], _resetVoipStatusDecs = [_mobx.action, _mobx.action.bound], _handlePhoneConnectorSessionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleIPConnectorSessionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _onUiEventDecs = [_mobx.action, _mobx.action.bound], "_uiEventStore");
+var _J = /*#__PURE__*/new WeakMap();
+var _K = /*#__PURE__*/new WeakMap();
+_ref = (_stopSessionDecs = [_mobx.action, _mobx.action.bound], _startSessionByPhoneDecs = [_mobx.action, _mobx.action.bound], _startSessionByVoipDecs = [_mobx.action, _mobx.action.bound], _showToastDecs = [_mobx.action, _mobx.action.bound], _getRoomConnectorIpInfoDecs = [_mobx.action, _mobx.action.bound], _getRoomConnectorPhoneInfoDecs = [_mobx.action, _mobx.action.bound], _handleErrorDecs = [_mobx.action, _mobx.action.bound], _updateInviteStatusDecs = [_mobx.action, _mobx.action.bound], _resetpstnStatusDecs = [_mobx.action, _mobx.action.bound], _resetVoipStatusDecs = [_mobx.action, _mobx.action.bound], _handlePhoneConnectorSessionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleIPConnectorSessionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var InviteStore = exports["default"] = /*#__PURE__*/function () {
   function InviteStore(_ref2) {
-    var roomControl = _ref2.roomControl,
-      uiEventStore = _ref2.uiEventStore,
-      sharedMemberDataSource = _ref2.sharedMemberDataSource,
-      sharedMeetingTimeDataSource = _ref2.sharedMeetingTimeDataSource,
-      roomProvider = _ref2.roomProvider;
+    var _ref3;
+    var objectManager = _ref2.objectManager;
     (0, _classCallCheck2["default"])(this, InviteStore);
-    (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
-    (0, _defineProperty2["default"])(this, "_uiEventObserver", {
-      onEvent: this._onUiEvent.bind(this)
-    });
-    (0, _defineProperty2["default"])(this, "_inviteDialogId", '');
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'InviteStore'
+    })));
     (0, _defineProperty2["default"])(this, "_pstnSessionId", '');
     (0, _defineProperty2["default"])(this, "_voipSessionId", '');
     (0, _defineProperty2["default"])(this, "_roomConnectorObserver", {
-      onPhoneConnectorSessionStateUpdated: this._handlePhoneConnectorSessionStateUpdated.bind(this),
-      onIPConnectorSessionStateUpdated: this._handleIPConnectorSessionStateUpdated.bind(this)
+      onPhoneConnectorSessionStateUpdated: this._handlePhoneConnectorSessionStateUpdated,
+      onIPConnectorSessionStateUpdated: this._handleIPConnectorSessionStateUpdated
     });
-    _classPrivateFieldInitSpec(this, _A, _init_InviteStatus(this, 1));
-    _classPrivateFieldInitSpec(this, _B, _init_isPstnCalling(this, false));
-    _classPrivateFieldInitSpec(this, _C, _init_isVoipCalling(this, false));
-    _classPrivateFieldInitSpec(this, _D, _init_ipInfo(this, null));
-    _classPrivateFieldInitSpec(this, _E, _init_phoneInfo(this, null));
-    _classPrivateFieldInitSpec(this, _F, _init_calledPstnInfo(this, {
+    _classPrivateFieldInitSpec(this, _A, void 0);
+    _classPrivateFieldInitSpec(this, _B, void 0);
+    _classPrivateFieldInitSpec(this, _C, '');
+    _classPrivateFieldInitSpec(this, _D, '');
+    _classPrivateFieldInitSpec(this, _E, _init_InviteStatus(this, 1));
+    _classPrivateFieldInitSpec(this, _F, _init_isPstnCalling(this, false));
+    _classPrivateFieldInitSpec(this, _G, _init_isVoipCalling(this, false));
+    _classPrivateFieldInitSpec(this, _H, _init_ipInfo(this, null));
+    _classPrivateFieldInitSpec(this, _I, _init_phoneInfo(this, null));
+    _classPrivateFieldInitSpec(this, _J, _init_calledPstnInfo(this, {
       phoneNumber: '',
       userName: '',
       zone: ''
     }));
-    _classPrivateFieldInitSpec(this, _G, _init_calledVoipInfo(this, {
+    _classPrivateFieldInitSpec(this, _K, _init_calledVoipInfo(this, {
       address: '',
       addressType: _type.FcrIPConnectorSessionType.H323,
       state: _enums.InviteStatus.DEFAULT
     }));
-    _classPrivateFieldInitSpec(this, _H, _init_roomInfo(this, {
-      roomId: '',
-      roomName: '',
-      roomType: _type2.FcrRoomType.Mainroom,
-      password: '',
-      inviteLink: ''
-    }));
-    _classPrivateFieldInitSpec(this, _I, _init_meetingId(this, undefined));
-    this._roomControl = roomControl;
-    this._uiEventStore = uiEventStore;
-    this._roomProvider = roomProvider;
-    this._roomConnectorControl = roomControl.getRoomConnectorControl();
-    this._sharedMemberDataSource = sharedMemberDataSource;
-    this._sharedMeetingTimeDataSource = sharedMeetingTimeDataSource;
+    // Get all required objects from objectManager
+
+    this._mainRoomControl = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MAIN_ROOM_CONTROL_PROVIDER).mainRoomControl;
+    this._messageProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
+    this._roomConnectorControl = this._mainRoomControl.getRoomConnectorControl();
+    this._sharedMemberDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEMBER_DATA_SOURCE);
+    this._sharedMeetingTimeDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEETING_TIME_DATA_SOURCE);
     this._roomConnectorControl.addObserver(this._roomConnectorObserver);
-    this._uiEventStore.addObserver(this._uiEventObserver);
     this._getRoomConnectorPhoneInfo();
     this._getRoomConnectorIpInfo();
-    this.roomInfo = roomControl.getRoomInfo();
-    this.meetingId = roomControl.getRoomPropertiesByKeyPath('meetingId');
+    this.roomInfo = this._mainRoomControl.getRoomInfo();
+    this.roomSchedule = this._mainRoomControl.getRoomSchedule();
+    this.meetingId = (_ref3 = this._mainRoomControl.getRoomPropertiesByKeyPath('meetingId')) !== null && _ref3 !== void 0 ? _ref3 : this.roomId;
+    this.localUserName = this._mainRoomControl.getUserControl().getLocalUser().userName;
   }
   return (0, _createClass2["default"])(InviteStore, [{
-    key: "InviteStatus",
+    key: "roomInfo",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -147,7 +143,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "isPstnCalling",
+    key: "roomSchedule",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -155,7 +151,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "isVoipCalling",
+    key: "meetingId",
     get: function get() {
       return _classPrivateFieldGet(_C, this);
     },
@@ -163,7 +159,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_C, this, v);
     }
   }, {
-    key: "ipInfo",
+    key: "localUserName",
     get: function get() {
       return _classPrivateFieldGet(_D, this);
     },
@@ -171,7 +167,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_D, this, v);
     }
   }, {
-    key: "phoneInfo",
+    key: "InviteStatus",
     get: function get() {
       return _classPrivateFieldGet(_E, this);
     },
@@ -179,7 +175,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_E, this, v);
     }
   }, {
-    key: "calledPstnInfo",
+    key: "isPstnCalling",
     get: function get() {
       return _classPrivateFieldGet(_F, this);
     },
@@ -187,7 +183,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_F, this, v);
     }
   }, {
-    key: "calledVoipInfo",
+    key: "isVoipCalling",
     get: function get() {
       return _classPrivateFieldGet(_G, this);
     },
@@ -195,7 +191,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_G, this, v);
     }
   }, {
-    key: "roomInfo",
+    key: "ipInfo",
     get: function get() {
       return _classPrivateFieldGet(_H, this);
     },
@@ -203,7 +199,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_H, this, v);
     }
   }, {
-    key: "meetingId",
+    key: "phoneInfo",
     get: function get() {
       return _classPrivateFieldGet(_I, this);
     },
@@ -211,14 +207,20 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_I, this, v);
     }
   }, {
-    key: "roomSchedule",
+    key: "calledPstnInfo",
     get: function get() {
-      return this._roomControl.getRoomSchedule();
+      return _classPrivateFieldGet(_J, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_J, this, v);
     }
   }, {
-    key: "localUser",
+    key: "calledVoipInfo",
     get: function get() {
-      return this._sharedMemberDataSource.localUser;
+      return _classPrivateFieldGet(_K, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_K, this, v);
     }
   }, {
     key: "pstnCountryCodeList",
@@ -246,7 +248,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "roomDetailCopyText",
     get: function get() {
-      return this._roomProvider.getRoomDetailCopyText();
+      return (0, _meetingDetail.getInvitationInfoByRoomInfo)(this.roomInfo, this.roomSchedule, this.meetingId, this._sharedMemberDataSource.localUser.userName);
     }
   }, {
     key: "totalHourText",
@@ -269,9 +271,9 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       return this._sharedMeetingTimeDataSource.meetingTime;
     }
   }, {
-    key: "openInviteDialog",
-    value: function openInviteDialog() {
-      this._inviteDialogId = this._uiEventStore.openDialog(_constant.FcrUIDialogKey.INVITE);
+    key: "roomId",
+    get: function get() {
+      return this.roomInfo.roomId;
     }
   }, {
     key: "closeInviteDialog",
@@ -282,14 +284,11 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       if (this._voipSessionId) {
         this.stopSession('voip');
       }
-      this._uiEventStore.closeDialog(this._inviteDialogId);
-      this._inviteDialogId = '';
     }
   }, {
     key: "release",
     value: function release() {
       this._roomConnectorControl.removeObserver(this._roomConnectorObserver);
-      this._uiEventStore.removeObserver(this._uiEventObserver);
     }
   }, {
     key: "stopSession",
@@ -333,12 +332,12 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "startSessionByPhone",
     value: function () {
-      var _startSessionByPhone = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref3) {
+      var _startSessionByPhone = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref4) {
         var phoneNumber, userName, zone, _t2;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              phoneNumber = _ref3.phoneNumber, userName = _ref3.userName, zone = _ref3.zone;
+              phoneNumber = _ref4.phoneNumber, userName = _ref4.userName, zone = _ref4.zone;
               this.isPstnCalling = true;
               this.calledPstnInfo = {
                 phoneNumber: phoneNumber,
@@ -412,7 +411,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "showToast",
     value: function showToast(params) {
-      this._uiEventStore.showToast(params);
+      this._messageProvider.showToast(params);
     }
   }, {
     key: "_getRoomConnectorIpInfo",
@@ -532,21 +531,10 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
         }, 1.5 * 1000);
       }
     }
-  }, {
-    key: "_onUiEvent",
-    value: function _onUiEvent(action, payload) {
-      switch (action) {
-        case _constant.FcrUIAction.OPEN_INVITE_DIALOG:
-          this.openInviteDialog();
-          break;
-        case _constant.FcrUIAction.CLOSE_INVITE_DIALOG:
-          this.closeInviteDialog();
-      }
-    }
   }]);
 }();
 _InviteStore = InviteStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_InviteStore, [[_mobx.observable, 1, "InviteStatus"], [_mobx.observable, 1, "isPstnCalling"], [_mobx.observable, 1, "isVoipCalling"], [_mobx.observable, 1, "ipInfo"], [_mobx.observable, 1, "phoneInfo"], [_mobx.observable, 1, "calledPstnInfo"], [_mobx.observable, 1, "calledVoipInfo"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "meetingId"], [_mobx.computed, 3, "totalHourText"], [_mobx.computed, 3, "totalMinuteText"], [_mobx.computed, 3, "meetingTimeStatus"], [_mobx.computed, 3, "meetingTime"], [_stopSessionDecs, 18, "stopSession"], [_startSessionByPhoneDecs, 18, "startSessionByPhone"], [_startSessionByVoipDecs, 18, "startSessionByVoip"], [_showToastDecs, 18, "showToast"], [_getRoomConnectorIpInfoDecs, 18, "_getRoomConnectorIpInfo"], [_getRoomConnectorPhoneInfoDecs, 18, "_getRoomConnectorPhoneInfo"], [_handleErrorDecs, 18, "handleError"], [_updateInviteStatusDecs, 18, "updateInviteStatus"], [_resetpstnStatusDecs, 18, "_resetpstnStatus"], [_resetVoipStatusDecs, 18, "_resetVoipStatus"], [_handlePhoneConnectorSessionStateUpdatedDecs, 18, "_handlePhoneConnectorSessionStateUpdated"], [_handleIPConnectorSessionStateUpdatedDecs, 18, "_handleIPConnectorSessionStateUpdated"], [_onUiEventDecs, 18, "_onUiEvent"]], []).e, 10);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_InviteStore, [[_mobx.observable, 1, "InviteStatus"], [_mobx.observable, 1, "isPstnCalling"], [_mobx.observable, 1, "isVoipCalling"], [_mobx.observable, 1, "ipInfo"], [_mobx.observable, 1, "phoneInfo"], [_mobx.observable, 1, "calledPstnInfo"], [_mobx.observable, 1, "calledVoipInfo"], [_stopSessionDecs, 18, "stopSession"], [_startSessionByPhoneDecs, 18, "startSessionByPhone"], [_startSessionByVoipDecs, 18, "startSessionByVoip"], [_showToastDecs, 18, "showToast"], [_getRoomConnectorIpInfoDecs, 18, "_getRoomConnectorIpInfo"], [_getRoomConnectorPhoneInfoDecs, 18, "_getRoomConnectorPhoneInfo"], [_handleErrorDecs, 18, "handleError"], [_updateInviteStatusDecs, 18, "updateInviteStatus"], [_resetpstnStatusDecs, 18, "_resetpstnStatus"], [_resetVoipStatusDecs, 18, "_resetVoipStatus"], [_handlePhoneConnectorSessionStateUpdatedDecs, 18, "_handlePhoneConnectorSessionStateUpdated"], [_handleIPConnectorSessionStateUpdatedDecs, 18, "_handleIPConnectorSessionStateUpdated"]], []).e, 8);
 _init_InviteStatus = _applyDecs$e[0];
 _init_isPstnCalling = _applyDecs$e[1];
 _init_isVoipCalling = _applyDecs$e[2];
@@ -554,7 +542,5 @@ _init_ipInfo = _applyDecs$e[3];
 _init_phoneInfo = _applyDecs$e[4];
 _init_calledPstnInfo = _applyDecs$e[5];
 _init_calledVoipInfo = _applyDecs$e[6];
-_init_roomInfo = _applyDecs$e[7];
-_init_meetingId = _applyDecs$e[8];
-_initProto = _applyDecs$e[9];
+_initProto = _applyDecs$e[7];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/invite/types.d.ts

@@ -1,6 +1,7 @@
 import { FcrIPConnectorSessionType, FcrRoomConnectorPhoneRegion } from 'fcr-core/lib/room-control/room-connector-control/type';
 import { InviteStatus } from './enums';
-export interface pstnInfo {
+import { FcrUIObjectManager } from '../../object-manager';
+export interface PstnInfo {
     phoneNumber: string;
     userName: string;
     countryCode?: FcrRoomConnectorPhoneRegion;
@@ -12,3 +13,6 @@ export interface VoipInfo {
     addressType: FcrIPConnectorSessionType;
     state?: InviteStatus;
 }
+export interface InviteStoreArgs {
+    objectManager: FcrUIObjectManager;
+}

package/lib/modules/layout/components/Aside.js

@@ -15,7 +15,7 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _windowHeader = require("agora-ui-foundation/lib/components/window-header");
 var _hooks = require("../../../utilities/hooks");
-var _store = require("../store");
+var _store = require("../store.base");
 var _utils = require("./utils");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _iconButton = require("agora-ui-foundation/lib/components/icon-button");

package/lib/modules/layout/components/Carousel.js

@@ -15,7 +15,7 @@ var _react = require("react");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _hooks = require("../../../utilities/hooks");
-var _store = require("../store");
+var _store = require("../store.base");
 var _type2 = require("../type");
 var _utils = require("./utils");
 var _CommonVideoRenderer = require("./CommonVideoRenderer");

package/lib/modules/layout/components/CommonVideoRenderer.js

@@ -11,19 +11,20 @@ require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
-var _store = require("../store");
+var _store = require("../store.base");
 var _type = require("../type");
-var _boardContext = _interopRequireDefault(require("../../../utilities/board-context"));
+var _boardContext = _interopRequireDefault(require("../../../shared-context/board-context"));
 var _type2 = require("fcr-core/lib/type");
 var _memberActions = require("../../components/member-window/components/member-actions");
 var _env = require("agora-foundation/lib/utilities/env");
 var _memberWindow = require("../../components/member-window");
-var _screen = require("../../../utilities/screen");
 var _react = require("react");
 var _fcrCore = require("fcr-core");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _mobxReact = require("mobx-react");
 var _Gallery = require("./Gallery");
+var _browserApi = require("../../../utilities/browser-api");
+var _controlBar = require("../../components/control-bar");
 var _jsxRuntime = require("react/jsx-runtime");
 var useFormatWindowData = function useFormatWindowData() {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
@@ -107,17 +108,21 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
     annotation = _useContext3.annotation,
     isLocalCameraInSecondaryWindow = _useContext3.isLocalCameraInSecondaryWindow,
     microphoneEnabled = _useContext3.microphoneEnabled,
+    cameraEnabled = _useContext3.cameraEnabled,
+    localUser = _useContext3.localUser,
+    isSharingWithAudio = _useContext3.isSharingWithAudio,
     hasMutePermission = _useContext3.hasMutePermission,
     hasUnmutePermission = _useContext3.hasUnmutePermission,
     hasRequestStartAudioPermission = _useContext3.hasRequestStartAudioPermission;
   var getFormatWindowData = useFormatWindowData();
   var commonProps = useCommonProps(layoutType);
   var toggleFullScreen = function toggleFullScreen() {
-    (0, _screen.isFullScreen)() ? (0, _screen.exitFullScreen)() : (0, _screen.enterFullScreen)();
+    (0, _browserApi.isFullScreen)() ? (0, _browserApi.exitFullScreen)() : (0, _browserApi.enterFullScreen)();
   };
   var renderBoardContent = function renderBoardContent(windowData, windowId) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_boardContext["default"].Provider, {
       value: {
+        videoWindowLayoutType: layoutType,
         showToolbar: commonProps.showToolbar
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -161,6 +166,7 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
       windowSize: windowSize,
       isLocalCameraInSecondaryWindow: isLocalCameraInSecondaryWindow,
       deviceMicrophoneEnabled: microphoneEnabled,
+      deviceCameraEnabled: cameraEnabled,
       hasMutePermission: hasMutePermission,
       hasUnmutePermission: hasUnmutePermission,
       hasRequestStartAudioPermission: hasRequestStartAudioPermission
@@ -177,6 +183,28 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
     //   }
     // }
   };
+  var handleZoomIn = (0, _react.useCallback)(function () {
+    if (scalcValue < 3) {
+      setScaleValue(scalcValue + 1);
+      return true;
+    }
+    return false;
+  }, [scalcValue]);
+  var handleZoomOut = (0, _react.useCallback)(function () {
+    if (scalcValue > 1) {
+      setScaleValue(scalcValue - 1);
+      return true;
+    }
+    return false;
+  }, [scalcValue]);
+  var handleAdaptive = (0, _react.useCallback)(function () {
+    setScaleValue(3);
+    return false;
+  }, [scalcValue]);
+  var handleOrigin = (0, _react.useCallback)(function () {
+    setScaleValue(1);
+    return false;
+  }, [scalcValue]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: data.map(function (windowData) {
       var windowId = windowData.windowId,
@@ -207,7 +235,15 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
             height: dimensions.height
           },
           className: clsWithShareControlBar,
-          children: [isMainWindowInScreenSharing && screenShareControl, /*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
+          children: [isMainWindowInScreenSharing && screenShareControl, isMainWindowInScreenSharing && /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.WhiteboardControlbar, {
+            ownerUserName: windowData.userName,
+            sharingType: 'annotation',
+            onZoomIn: handleZoomIn,
+            onZoomOut: handleZoomOut,
+            onAdaptive: handleAdaptive,
+            onOrigin: handleOrigin,
+            isSharingWithAudio: isSharingWithAudio
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
             memberWindowPreviewType: commonProps.memberWindowPreviewType,
             canShowSpeakerSpotlight: commonProps.canShowSpeakerSpotlight,
             width: dimensions.width,

package/lib/modules/layout/components/Gallery.js

@@ -32,7 +32,7 @@ var _react = require("react");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _hooks = require("../../../utilities/hooks");
-var _store = require("../store");
+var _store = require("../store.base");
 var _type2 = require("../type");
 var _utils = require("./utils");
 var _fcrCore = require("fcr-core");

package/lib/modules/layout/components/who-is-speaking.js

@@ -12,7 +12,7 @@ var _react = require("react");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _store = require("../store");
+var _store = require("../store.base");
 var _jsxRuntime = require("react/jsx-runtime");
 var CarouselExpandButton = exports.CarouselExpandButton = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),

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

@@ -1,45 +1,9 @@
 import { UIModule } from '../../base';
-import { FcrUIDeviceProvider } from '../../providers/device-provider';
-import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
-import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
-import { FcrUIMainRoomControlProvider } from '../../providers/room-provider';
-import { FcrUISharedSpeakerSpotlightDataSource } from '../../shared-data-source/speaker-spotlight';
-import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
-import { FcrUISharedInterpreterDataSource } from '../../shared-data-source/interpreter';
-import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
-import { FcrUIChatProvider } from '../../providers/chat-provider';
-import { FcrUIVideoWindowDataSource } from '../../shared-data-source/video-window';
-import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
-import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
-import { FcrUISharedPinDataSource } from '../../shared-data-source/pin-data';
-import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
-import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
-import { FcrUIInterpreterProvider } from '../../providers/interpreter-provider';
-import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
+import { LayoutStoreBase } from './store.base';
 import { FcrLayoutSlots } from './type';
-import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
 export declare class LayoutUIModule extends UIModule {
-    private _store?;
-    eventProvider?: FcrUIEventProvider;
-    deviceProvider?: FcrUIDeviceProvider;
-    privilegeProvider?: FcrUIPrivilegeProvider;
-    mainRoomControlProvider?: FcrUIMainRoomControlProvider;
-    sharedConfigDataSource?: FcrUISharedConfigDataSource;
-    sharedSpeakerSpotlightDataSource?: FcrUISharedSpeakerSpotlightDataSource;
-    sharedLayoutDataSource?: FcrUISharedLayoutDataSource;
-    sharedInterpreterDataSource?: FcrUISharedInterpreterDataSource;
-    sharedSettingDataSource?: FcrUISharedSettingDataSource;
-    chatProvider?: FcrUIChatProvider;
-    sharedVideoWindowDataSource?: FcrUIVideoWindowDataSource;
-    sharedMemberDataSource?: FcrUIMemberSharedDataSource;
-    screenShareProvider?: FcrUIScreenShareProvider;
-    sharedPinDataSource?: FcrUISharedPinDataSource;
-    annotationProvider?: FcrUIAnnotationProvider;
-    sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
-    sharedAnnotationDataSource?: FcrUISharedAnnotationSource;
-    multiDisplayProvider?: FcrUIMultiDisplayProvider;
-    interpreterProvider?: FcrUIInterpreterProvider;
+    private _store;
+    get store(): LayoutStoreBase;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(slots?: Partial<FcrLayoutSlots & {

package/lib/modules/layout/index.dev.js

@@ -41,26 +41,26 @@
 //   //   createStreamConfigs: [],
 //   // });
 
-//   // const uiEventStore = new FcrUIEventStore();
-//   // const securityStore = new FcrSecurityStore(
+//   // const eventProvider = new FcreventProvider();
+//   // const privilegeProvider = new FcrprivilegeProvider(
 //   //   roomControl.getPrivilegeControl(),
 //   //   roomControl.getUserControl(),
 //   //   roomControl.getStreamControl(),
 //   //   roomControl.getRoomSessionControl(),
-//   //   uiEventStore,
+//   //   eventProvider,
 //   // );
 
 //   // const params: LayoutStoreParams = {
 //   //   deviceStore: new FcrDeviceStore({
 //   //     roomControl: roomControl,
 //   //     mediaControl: engine.getMediaControl(),
-//   //     securityStore: securityStore,
+//   //     privilegeProvider: privilegeProvider,
 //   //   }),
-//   //   uiEventStore,
+//   //   eventProvider,
 //   //   userControl: roomControl.getUserControl(),
 //   //   streamControl: roomControl.getStreamControl(),
 //   //   mediaControl: engine.getMediaControl(),
-//   //   securityStore: securityStore,
+//   //   privilegeProvider: privilegeProvider,
 //   // };
 
 //   const addObserver = () => void 0;
@@ -76,7 +76,7 @@
 
 //   const params: LayoutStoreParams = {
 //     deviceStore: { addObserver },
-//     uiEventStore: { addObserver, toggleLayout: bool, updateAside: bool },
+//     eventProvider: { addObserver, toggleLayout: bool, updateAside: bool },
 //     userControl: {
 //       addObserver,
 //       getLocalUser() {
@@ -95,7 +95,7 @@
 //       },
 //     },
 //     mediaControl: { addObserver },
-//     securityStore: {
+//     privilegeProvider: {
 //       addObserver,
 //       allowChat: bool,
 //       allowUnmuteSelfVideo: bool,