fcr-ui-scene 3.7.4 → 3.7.5

package/lib/modules/pc-audio-connect/{store.js → waiting-scene/store.js}

@@ -36,7 +36,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.StoreContext = void 0;
+exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
@@ -55,13 +55,13 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _mobx = require("mobx");
-var _react = require("react");
 var _decorator = require("agora-foundation/lib/decorator");
-var _store = require("../setting/store");
 var _type = require("fcr-core/lib/room-control/room-connector-control/type");
-var _constant = require("../../utilities/constant");
-var _dialogProvider = require("../../providers/dialog-provider");
+var _constant = require("../../../utilities/constant");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _objectManager = require("../../../object-manager");
+var _type2 = require("../../../providers/dialog/type");
+var _type3 = require("../../setting/type");
 var _ConnectionGatewayStore;
 var _initProto, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -81,12 +81,7 @@ var _D = /*#__PURE__*/new WeakMap();
 var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   function ConnectionGatewayStore(_ref) {
     var _this = this;
-    var eventProvider = _ref.eventProvider,
-      deviceProvider = _ref.deviceProvider,
-      phoneAudioConnectorProvider = _ref.phoneAudioConnectorProvider,
-      devicePrivilegeProvider = _ref.devicePrivilegeProvider,
-      sharedDevicePrivilegeDataSource = _ref.sharedDevicePrivilegeDataSource,
-      dialogProvider = _ref.dialogProvider;
+    var objectManager = _ref.objectManager;
     (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
     (0, _defineProperty2["default"])(this, "_disposers", (_initProto(this), []));
     (0, _defineProperty2["default"])(this, "_failureTimer", null);
@@ -95,12 +90,17 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _B, _init_phoneCallReason(this, _type.FcrRoomConnectorSessionReason.NONE));
     _classPrivateFieldInitSpec(this, _C, _init_connectSession(this, null));
     _classPrivateFieldInitSpec(this, _D, _init_calling(this, false));
-    this._dialogProvider = dialogProvider;
-    this._eventProvider = eventProvider;
-    this._deviceProvider = deviceProvider;
-    this._phoneAudioConnectorProvider = phoneAudioConnectorProvider;
-    this._devicePrivilegeProvider = devicePrivilegeProvider;
-    this._sharedDevicePrivilegeDataSource = sharedDevicePrivilegeDataSource;
+    // Get all required objects from objectManager
+    this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
+    this._deviceProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
+
+    // Optional providers with try-catch
+    try {
+      this._devicePrivilegeProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PRIVILEGE_PROVIDER);
+      this._sharedDevicePrivilegeDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_DEVICE_PRIVILEGE_DATA_SOURCE);
+    } catch (_unused) {
+      // Optional providers may not exist in all scenarios
+    }
     this._deviceObserver = {
       onAudioConnected: function onAudioConnected() {
         _this._needShowConfirmDialog = false;
@@ -108,7 +108,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       }
     };
     this._deviceProvider.addObserver(this._deviceObserver);
-    this._dialogProvider.addInterceptor(_dialogProvider.FcrDialogInterceptorEventName.ON_CLOSE, this._handleInterceptorCloseDialog);
+    this._dialogProvider.addInterceptor(_type2.FcrDialogInterceptorEventName.ON_CLOSE, this._handleInterceptorCloseDialog);
   }
   return (0, _createClass2["default"])(ConnectionGatewayStore, [{
     key: "phoneCallState",
@@ -150,44 +150,45 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "hasNeedMergedStream",
     get: function get() {
-      return this._phoneAudioConnectorProvider.hasNeedMergedStream;
+      return false;
     }
   }, {
     key: "hasOwnPstnStream",
     get: function get() {
-      return this._phoneAudioConnectorProvider.hasOwnPstnStream;
+      return false;
     }
   }, {
     key: "outgoingCall",
     get: function get() {
-      return this._phoneAudioConnectorProvider.outgoingCall;
+      return false;
     }
   }, {
     key: "hasPstnStream",
     get: function get() {
-      return this._phoneAudioConnectorProvider.hasPstnStream;
+      return false;
     }
   }, {
     key: "connectInfo",
     get: function get() {
-      return this._phoneAudioConnectorProvider.connectInfo;
+      return {};
     }
   }, {
     key: "openAudioSettings",
     value: function openAudioSettings() {
-      this._dialogProvider.openDeviceSettingDialog({
-        activeTab: _store.DeviceSettingTab.AUDIO,
+      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SETTINGS, {
+        activeTab: _type3.DeviceSettingTab.AUDIO,
         highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       });
     }
   }, {
     key: "closeConnectionDialog",
     value: function closeConnectionDialog() {
-      this._eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_CONNECTION_DIALOG);
+      this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONNECTION_GATEWAY);
     }
   }, {
     key: "release",
     value: function release() {
+      this._dialogProvider.removeInterceptor(_type2.FcrDialogInterceptorEventName.ON_CLOSE, this._handleInterceptorCloseDialog);
       this._disposers.forEach(function (disposer) {
         return disposer();
       });
@@ -204,10 +205,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
           return false;
         }
         this._needShowConfirmDialog = false;
-        if (this.hasOwnPstnStream) {
-          return false;
-        }
-        var _dialogKey = this._eventProvider.openConfirmDialog({
+        var dialogId = this._dialogProvider.openConfirmDialog({
           title: (0, _i18n.transI18n)('fmt_actionbar_tips_joinroom_noaudio'),
           content: (0, _i18n.transI18n)('fmt_actionbar_tips_canthear'),
           cancelText: (0, _i18n.transI18n)('fmt_actionbar_button_continue'),
@@ -227,7 +225,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
           },
           closable: false,
           onCancel: function onCancel() {
-            _this2._eventProvider.closeConfirm(_dialogKey);
+            _this2._dialogProvider.closeConfirmDialog(dialogId);
             _this2.closeConnectionDialog();
           },
           onOk: function () {
@@ -235,7 +233,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
               return _regenerator["default"].wrap(function (_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
-                    _this2._eventProvider.closeConfirm(_dialogKey);
+                    _this2._dialogProvider.closeDialogById(dialogId);
                     _context.next = 1;
                     return _this2.joinAudioByComputer();
                   case 1:
@@ -261,22 +259,11 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     key: "joinAudioByComputer",
     value: function () {
       var _joinAudioByComputer = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var shouldIncludeMicrophone, hasOpenMicrophonePrivilege, includeMicrophone;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(this._sharedDevicePrivilegeDataSource && this._devicePrivilegeProvider)) {
-                _context2.next = 2;
-                break;
-              }
-              shouldIncludeMicrophone = this._sharedDevicePrivilegeDataSource.shouldIncludeMicrophone;
-              _context2.next = 1;
-              return this._devicePrivilegeProvider.hasOpenMicrophonePrivilege();
+              this._deviceProvider.connectAudio(true);
             case 1:
-              hasOpenMicrophonePrivilege = _context2.sent;
-              includeMicrophone = shouldIncludeMicrophone && hasOpenMicrophonePrivilege;
-              this._deviceProvider.connectAudio(includeMicrophone);
-            case 2:
             case "end":
               return _context2.stop();
           }
@@ -292,13 +279,17 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     value: function stopAudioByComputer() {
       this._deviceProvider.disconnectAudio();
     }
+  }, {
+    key: "openInviteDialog",
+    value: function openInviteDialog() {
+      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.INVITE);
+    }
   }]);
 }();
 _ConnectionGatewayStore = ConnectionGatewayStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConnectionGatewayStore, [[_mobx.observable, 1, "phoneCallState"], [_mobx.observable, 1, "phoneCallReason"], [_mobx.observable, 1, "connectSession"], [_mobx.observable, 1, "calling"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasNeedMergedStream"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "outgoingCall"], [_mobx.computed, 3, "hasPstnStream"], [_mobx.computed, 3, "connectInfo"], [_decorator.bound, 2, "openAudioSettings"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "_handleInterceptorCloseDialog"], [_decorator.bound, 2, "joinAudioByComputer"], [_decorator.bound, 2, "stopAudioByComputer"]], []).e, 5);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConnectionGatewayStore, [[_mobx.observable, 1, "phoneCallState"], [_mobx.observable, 1, "phoneCallReason"], [_mobx.observable, 1, "connectSession"], [_mobx.observable, 1, "calling"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasNeedMergedStream"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.computed, 3, "outgoingCall"], [_mobx.computed, 3, "hasPstnStream"], [_mobx.computed, 3, "connectInfo"], [_decorator.bound, 2, "openAudioSettings"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "_handleInterceptorCloseDialog"], [_decorator.bound, 2, "joinAudioByComputer"], [_decorator.bound, 2, "stopAudioByComputer"], [_decorator.bound, 2, "openInviteDialog"]], []).e, 5);
 _init_phoneCallState = _applyDecs$e[0];
 _init_phoneCallReason = _applyDecs$e[1];
 _init_connectSession = _applyDecs$e[2];
 _init_calling = _applyDecs$e[3];
-_initProto = _applyDecs$e[4];
-var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);
+_initProto = _applyDecs$e[4];

package/lib/modules/phone-audio-connect/index.d.ts

@@ -1,17 +1,9 @@
 import { UIModule } from '../../base';
+import ConnectionGatewayStore from './store';
 import './index.css';
-import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUICurrentRoomControlProvider } from '../../providers/room-provider';
-import { FcrUIDeviceProvider } from '../../providers/device-provider';
-import { FcrUIPhoneAudioConnectorProvider } from '../../providers/phone-audio-provider';
-import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 export declare class PhoneAudioConnectionUIModule extends UIModule {
     private _store?;
-    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
-    eventProvider?: FcrUIEventProvider;
-    deviceProvider?: FcrUIDeviceProvider;
-    phoneAudioConnectorProvider?: FcrUIPhoneAudioConnectorProvider;
-    dialogProvider?: FcrUIDialogProvider;
+    get store(): ConnectionGatewayStore;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

package/lib/modules/phone-audio-connect/index.js

@@ -16,6 +16,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PhoneAudioConnectionUIModule = void 0;
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.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"));
@@ -36,26 +38,31 @@ var PhoneAudioConnectionUIModule = exports.PhoneAudioConnectionUIModule = /*#__P
   }
   (0, _inherits2["default"])(PhoneAudioConnectionUIModule, _UIModule);
   return (0, _createClass2["default"])(PhoneAudioConnectionUIModule, [{
+    key: "store",
+    get: function get() {
+      if (!this._store) {
+        throw new Error('ConnectionGatewayStore is not initialized');
+      }
+      return this._store;
+    }
+  }, {
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      this._store = new _store["default"]({
-        eventProvider: this.eventProvider,
-        deviceProvider: this.deviceProvider,
-        phoneAudioConnectorProvider: this.phoneAudioConnectorProvider,
-        dialogProvider: this.dialogProvider
-      });
+      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() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
-        value: this._store,
+        value: this.store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view["default"], {})
       });
     }

package/lib/modules/phone-audio-connect/store.d.ts

@@ -1,9 +1,5 @@
-import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUIDeviceProvider } from '../../providers/device-provider';
 import { ConnectorRegion } from './enums';
-import { FcrUIPhoneAudioConnectorProvider } from '../../providers/phone-audio-provider';
-import { ConnectListType } from './types';
-import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { ConnectionGatewayStoreArgs, ConnectListType } from './types';
 export default class ConnectionGatewayStore {
     private _disposers;
     private _eventProvider;
@@ -26,12 +22,7 @@ export default class ConnectionGatewayStore {
     get hasNeedMergedStream(): boolean;
     get connectInfo(): import("fcr-core/lib/type").FcrRoomConnectorPhoneInfo;
     get connectSession(): import("fcr-core/lib/type").FcrPhoneConnectorSession | null;
-    constructor({ eventProvider, deviceProvider, phoneAudioConnectorProvider, dialogProvider, }: {
-        eventProvider: FcrUIEventProvider;
-        deviceProvider: FcrUIDeviceProvider;
-        phoneAudioConnectorProvider: FcrUIPhoneAudioConnectorProvider;
-        dialogProvider: FcrUIDialogProvider;
-    });
+    constructor({ objectManager }: ConnectionGatewayStoreArgs);
     startCall(): void;
     stopCall(): void;
     openAudioSettings(): void;

package/lib/modules/phone-audio-connect/store.js

@@ -64,11 +64,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _mobx = require("mobx");
 var _react = require("react");
 var _decorator = require("agora-foundation/lib/decorator");
-var _store = require("../setting/store");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _tools = require("../../utilities/tools");
 var _constant = require("../../utilities/constant");
 var _enums = require("./enums");
+var _objectManager = require("../../object-manager");
+var _type = require("../setting/type");
 var _ConnectionGatewayStore;
 var _initProto, _init_rememberMe, _init_rememberedNumberList, _init_currentRegion, _init_currentCallInfo, _startCallDecs, _stopCallDecs, _regionChangeHandlerDecs, _setRememberMeDecs, _initRememberedDataDecs, _rememberNumberDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -89,10 +90,7 @@ _ref = (_startCallDecs = [_mobx.action, _mobx.action.bound], _stopCallDecs = [_m
 var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   function ConnectionGatewayStore(_ref2) {
     var _this = this;
-    var eventProvider = _ref2.eventProvider,
-      deviceProvider = _ref2.deviceProvider,
-      phoneAudioConnectorProvider = _ref2.phoneAudioConnectorProvider,
-      dialogProvider = _ref2.dialogProvider;
+    var objectManager = _ref2.objectManager;
     (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), []));
     (0, _defineProperty2["default"])(this, "_failureTimer", null);
@@ -103,13 +101,14 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       zone: '+86',
       phone: ''
     }));
-    this._eventProvider = eventProvider;
-    this._deviceProvider = deviceProvider;
-    this._phoneAudioConnectorProvider = phoneAudioConnectorProvider;
-    this._dialogProvider = dialogProvider;
+    // Get all required objects from objectManager
+    this._eventProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_EVENT_PROVIDER);
+    this._deviceProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
+    this._phoneAudioConnectorProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_PHONE_AUDIO_CONNECTOR_PROVIDER);
+    this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
     this.initRememberedData();
     this._disposers.push((0, _mobx.reaction)(function () {
-      return phoneAudioConnectorProvider.accepted;
+      return _this._phoneAudioConnectorProvider.accepted;
     }, function (accepted) {
       if (accepted) {
         _this.closeConnectionDialog();
@@ -217,15 +216,15 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "openAudioSettings",
     value: function openAudioSettings() {
-      this._dialogProvider.openDeviceSettingDialog({
-        activeTab: _store.DeviceSettingTab.AUDIO,
+      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SETTINGS, {
+        activeTab: _type.DeviceSettingTab.AUDIO,
         highlightSelector: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE
       });
     }
   }, {
     key: "closeConnectionDialog",
     value: function closeConnectionDialog() {
-      this._eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_CONNECTION_DIALOG);
+      this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONNECTION_GATEWAY);
     }
   }, {
     key: "regionChangeHandler",

package/lib/modules/phone-audio-connect/types.d.ts

@@ -1,4 +1,8 @@
+import { FcrUIObjectManager } from '../../object-manager';
 export type ConnectListType = {
     phone: string;
     zone: string;
 };
+export type ConnectionGatewayStoreArgs = {
+    objectManager: FcrUIObjectManager;
+};

package/lib/modules/secondary-window/index.d.ts

@@ -1,38 +1,17 @@
-import { UIModule } from '../../base';
-import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
+import { FcrUINodeEvent, UIModule } from '../../base';
+import { SecondaryWindowStore } from './store';
 import { FcrUIMainWindowRenderer, FcrUIMainWindowRendererObserver } from './type';
-import { FcrUIVideoWindowDataSource } from '../../shared-data-source/video-window';
-import { FcrUIWhiteboardProvider } from '../../providers/whiteboard-provider';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
-import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
-import { FcrUISharedWhiteboardDataSource } from '../../shared-data-source/whiteboard-data';
 import { ShareScreenUIModule } from '../share-screen';
-import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
-import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
-import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
-import { FcrUIRoomProvider } from '../../providers/room-provider';
-import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
-import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { LeaveMeetingStoreBase } from '../components/leave-meeting/store.base';
 export declare class FcrUISecondaryWindowModule extends UIModule {
-    private _store?;
-    private _leaveMeetingStore?;
-    multiDisplayProvider?: FcrUIMultiDisplayProvider;
-    sharedVideoWindowDataSource?: FcrUIVideoWindowDataSource;
-    eventProvider?: FcrUIEventProvider;
-    whiteboardProvider?: FcrUIWhiteboardProvider;
-    privilegeProvider?: FcrUIPrivilegeProvider;
-    roomProvider?: FcrUIRoomProvider;
-    abilityProvider?: FcrUIAbilityProviderImpl;
-    dialogProvider?: FcrUIDialogProvider;
-    sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
-    sharedMemberDataSource?: FcrUIMemberSharedDataSource;
-    sharedWhiteboardDataSource?: FcrUISharedWhiteboardDataSource;
-    annotationProvider?: FcrUIAnnotationProvider;
-    sharedAnnotationDataSource?: FcrUISharedAnnotationSource;
+    private _store;
+    private _leaveMeetingStore;
+    get store(): SecondaryWindowStore;
+    get leaveMeetingStore(): LeaveMeetingStoreBase;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
+    onNodeReceivedEvent(event: FcrUINodeEvent): void;
     component(shareScreenModule: ShareScreenUIModule): import("react/jsx-runtime").JSX.Element;
 }
 export declare class FcrUIMainWindowRendererImpl implements FcrUIMainWindowRenderer {

package/lib/modules/secondary-window/index.js

@@ -7,45 +7,87 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUISecondaryWindowModule = exports.FcrUIMainWindowRendererImpl = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+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 _store = require("./store");
 var _view = require("./view");
 var _imports = require("fcr-core/lib/imports");
-var _store2 = require("../components/leave-meeting/store");
+var _store2 = require("../components/leave-meeting/store.base");
+var _store3 = _interopRequireDefault(require("../components/leave-meeting/main-scene/store"));
+var _env = require("agora-foundation/lib/utilities/env");
+var _type = require("../../type");
 var _jsxRuntime = require("react/jsx-runtime");
 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; })(); }
 var FcrUISecondaryWindowModule = exports.FcrUISecondaryWindowModule = /*#__PURE__*/function (_UIModule) {
   function FcrUISecondaryWindowModule() {
+    var _this;
     (0, _classCallCheck2["default"])(this, FcrUISecondaryWindowModule);
-    return _callSuper(this, FcrUISecondaryWindowModule, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, FcrUISecondaryWindowModule, [].concat(args));
+    (0, _defineProperty2["default"])(_this, "_store", null);
+    (0, _defineProperty2["default"])(_this, "_leaveMeetingStore", null);
+    return _this;
   }
   (0, _inherits2["default"])(FcrUISecondaryWindowModule, _UIModule);
   return (0, _createClass2["default"])(FcrUISecondaryWindowModule, [{
+    key: "store",
+    get: function get() {
+      if (!this._store) {
+        throw new Error('SecondaryWindowStore is not initialized');
+      }
+      return this._store;
+    }
+  }, {
+    key: "leaveMeetingStore",
+    get: function get() {
+      if (!this._leaveMeetingStore) {
+        throw new Error('LeaveMeetingStore is not initialized');
+      }
+      return this._leaveMeetingStore;
+    }
+  }, {
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      this._store = new _store.SecondaryWindowStore(this.multiDisplayProvider, this.sharedVideoWindowDataSource, this.eventProvider, this.sharedScreenShareSharedDataSource, this.sharedMemberDataSource, this.sharedWhiteboardDataSource, this.sharedAnnotationDataSource, this.annotationProvider);
-      this._leaveMeetingStore = new _store2.LeaveMeetingStore(this.privilegeProvider, this.roomProvider, this.roomProvider.currentRoomControl, this.sharedMemberDataSource, this.abilityProvider, this.dialogProvider);
+      if (!(0, _env.isElectron)()) return;
+      var args = {
+        objectManager: this.objectManager
+      };
+      this._store = new _store.SecondaryWindowStore(args);
+      this._leaveMeetingStore = new _store3["default"](args);
     }
   }, {
     key: "onNodeWillInactive",
     value: function onNodeWillInactive() {
-      var _this$_store;
-      (_this$_store = this._store) === null || _this$_store === void 0 || _this$_store.release();
+      if (!(0, _env.isElectron)()) return;
+      this.store.release();
+      this.leaveMeetingStore.release();
+    }
+  }, {
+    key: "onNodeReceivedEvent",
+    value: function onNodeReceivedEvent(event) {
+      if (!(0, _env.isElectron)()) return;
+      if (event.type === _type.FcrUIGlobalNodeEventType.SCENE_MOUNTED) {
+        this.store.handleSceneMounted();
+      }
     }
   }, {
     key: "component",
     value: function component(shareScreenModule) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.SecondaryWindowStoreContext.Provider, {
-        value: this._store,
+        value: this.store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_store2.LeaveMeetingStoreContext.Provider, {
-          value: this._leaveMeetingStore,
+          value: this.leaveMeetingStore,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.SubWindowView, {
             renderScreenShareControl: function renderScreenShareControl(secondaryWindowProprs) {
               return shareScreenModule.getControlComponent(secondaryWindowProprs);

package/lib/modules/secondary-window/store.d.ts

@@ -1,28 +1,19 @@
-import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
-import { VideoWindowDataReturn, WhiteboardToolAction } from './type';
-import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUIVideoWindowDataSource } from '../../shared-data-source/video-window';
-import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
-import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
-import { FcrUISharedWhiteboardDataSource } from '../../shared-data-source/whiteboard-data';
+import { VideoWindowDataReturn, WhiteboardToolAction, SecondaryWindowStoreArgs } from './type';
 import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 import { WhiteboardThemeType } from '../whiteboard/type';
-import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
-import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
+import { FcrVideoTrackRenderer } from '../../shared-context/video-track-render-context';
 export declare class SecondaryWindowStore {
+    protected logger: import("agora-foundation/lib/logger").Logger;
     private _multiDisplayProvider;
     private _videoWindowDataSource;
-    private _eventProvider;
-    private _sharedScreenShareDataSource;
     private _memberSharedDataSource;
-    private _sharedWhiteboardDataSource;
-    private _sharedAnnotationDataSource;
-    private _annotationProvider;
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    private _observable;
-    private _dialogId;
+    private _boardShareProvider;
+    private _sharedScreenShareDataSource;
+    private _dialogProvider;
+    private _windowProvider;
+    private _renderer;
+    private _videoRenderContext;
     private _disposers;
-    private get _subWindowDialog();
     private _prevFullScalc;
     private _screenShareSpeakerViewSize;
     private _maxScalcValue;
@@ -30,15 +21,17 @@ export declare class SecondaryWindowStore {
     private _diffScalcValue;
     private accessor _screenShareScalcValue;
     accessor isSharingWhiteboard: boolean;
-    get secondaryWindowContentType(): "hidden" | "speaker" | "gallery" | "local-camera" | "remote-camera" | "sharing-screen" | "sharing-screen-with-annotation" | "sharing-whiteboard";
+    accessor iframeLoaded: boolean;
+    accessor interceptedClose: boolean;
+    get secondaryWindowContentType(): "speaker" | "gallery" | "hidden" | "local-camera" | "remote-camera" | "sharing-screen" | "sharing-screen-with-annotation" | "sharing-whiteboard";
     get videoWindowData(): VideoWindowDataReturn<typeof this.secondaryWindowContentType>;
     get isCurrentOriginal(): boolean;
-    get isZoomMaxmum(): boolean;
     get isZoomMinimum(): boolean;
+    get isZoomMaxmum(): boolean;
     get isAspectRatioPreserved(): boolean;
     get scalValue(): number;
     get currentUser(): import("fcr-core/lib/type").FcrUserInfo;
-    get ownerUser(): import("fcr-core/lib/type").FcrUserInfo | undefined;
+    get ownerUser(): import("fcr-core/lib/type").FcrUserInfo;
     get isHost(): boolean;
     get canWriteBoard(): boolean;
     get toolbarState(): import("../components/toolbar/types").FcrToolbarState;
@@ -46,16 +39,21 @@ export declare class SecondaryWindowStore {
     get connectionState(): import("fcr-core").FcrConnectionState;
     get showLoading(): boolean;
     get joinSuccess(): boolean;
+    get isMyBoard(): boolean;
     get isScreenShare(): boolean;
     get isBoardShare(): boolean;
     get annotationHasStart(): boolean;
     get isShowToolbar(): boolean;
-    constructor(_multiDisplayProvider: FcrUIMultiDisplayProvider, _videoWindowDataSource: FcrUIVideoWindowDataSource, _eventProvider: FcrUIEventProvider, _sharedScreenShareDataSource: FcrUIScreenShareSharedDataSource, _memberSharedDataSource: FcrUIMemberSharedDataSource, _sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource, _sharedAnnotationDataSource: FcrUISharedAnnotationSource, _annotationProvider: FcrUIAnnotationProvider);
+    get isSharingWithAudio(): boolean;
+    get videoRenderContext(): FcrVideoTrackRenderer;
+    get isActive(): boolean;
+    constructor({ objectManager }: SecondaryWindowStoreArgs);
     getContent(): void;
     handleIframeLoad(iframe: HTMLIFrameElement): void;
-    zoomOut(): void;
     zoomIn(): void;
+    zoomOut(): void;
     fullContainer(): void;
+    setInterceptedClose(value: boolean): void;
     setScaleValue(scale: number): void;
     setOriginScalc(): void;
     setSpeakerViewSize(width: number, height: number): void;
@@ -70,7 +68,11 @@ export declare class SecondaryWindowStore {
     setShowLoading(show: boolean): void;
     setCommonColors(colors: string[]): void;
     log(message: string): void;
+    handleSceneMounted(): void;
     release(): void;
-    private _handleContentDistributionUpdated;
+    private _setSecondaryWindowBounds;
+    private _openSecondaryWindow;
+    private _closeSecondaryWindow;
+    private _handleSecondaryWindowClosed;
 }
 export declare const SecondaryWindowStoreContext: import("react").Context<SecondaryWindowStore>;