fcr-ui-scene 3.4.1 → 3.4.2

package/lib/modules/dialog/index.js

@@ -1,9 +1,17 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -12,8 +20,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DialogUIModule = void 0;
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
@@ -46,29 +56,66 @@ var _react = _interopRequireDefault(require("react"));
 var _base = require("../../base");
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
+var _type = require("fcr-core/lib/room-control/type");
+var _constant = require("../../utilities/constant");
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _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 DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule) {
-  function DialogUIModule(args) {
+  function DialogUIModule() {
     var _this;
     (0, _classCallCheck2["default"])(this, DialogUIModule);
-    _this = _callSuper(this, DialogUIModule);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, DialogUIModule, [].concat(args));
     (0, _defineProperty2["default"])(_this, "_dialogs", new Map());
-    _this._store = new _store["default"](args);
     return _this;
   }
   (0, _inherits2["default"])(DialogUIModule, _UIModule);
   return (0, _createClass2["default"])(DialogUIModule, [{
-    key: "onUnload",
-    value: function onUnload() {
-      this._store.release();
+    key: "onNodeWillActive",
+    value: function onNodeWillActive() {
+      var _this$currentRoomCont, _this$currentRoomCont2, _this$currentRoomCont3;
+      this.streamControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl.getStreamControl();
+      this.userControl = (_this$currentRoomCont2 = this.currentRoomControlProvider) === null || _this$currentRoomCont2 === void 0 ? void 0 : _this$currentRoomCont2.currentRoomControl.getUserControl();
+      this.chatRoomControl = (_this$currentRoomCont3 = this.currentRoomControlProvider) === null || _this$currentRoomCont3 === void 0 ? void 0 : _this$currentRoomCont3.currentRoomControl.getChatRoomControl();
+      if (this.userControl && this.deviceProvider && this.streamControl && this.remoteVideoRenderProvider && this.chatRoomControl && this.eventProvider && this.localVideoRenderProvider && this.sharedLayoutDataSource && this.dialogProvider && this.phoneAudioConnectorProvider) {
+        var _this$currentRoomCont4, _this$mainRoomControl, _this$waitingRoomCont;
+        this._store = new _store["default"]({
+          userControl: this.userControl,
+          chatRoomControl: this.chatRoomControl,
+          streamControl: this.streamControl,
+          deviceStore: this.deviceProvider,
+          remoteVideoRenderManager: this.remoteVideoRenderProvider,
+          localVideoRenderProvider: this.localVideoRenderProvider,
+          securityStore: ((_this$currentRoomCont4 = this.currentRoomControlProvider) === null || _this$currentRoomCont4 === void 0 || (_this$currentRoomCont4 = _this$currentRoomCont4.currentRoomControl.getRoomInfo()) === null || _this$currentRoomCont4 === void 0 ? void 0 : _this$currentRoomCont4.roomType) === _type.FcrRoomType.Mainroom ? (_this$mainRoomControl = this.mainRoomControlProvider) === null || _this$mainRoomControl === void 0 ? void 0 : _this$mainRoomControl.privilegeProvider : (_this$waitingRoomCont = this.waitingRoomControlProvider) === null || _this$waitingRoomCont === void 0 ? void 0 : _this$waitingRoomCont.privilegeProvider,
+          uiEventStore: this.eventProvider,
+          sharedLayoutDataSource: this.sharedLayoutDataSource,
+          dialogProvider: this.dialogProvider,
+          phoneAudioConnectorProvider: this.phoneAudioConnectorProvider
+        });
+        this.eventProvider.addObserver({
+          onEvent: this.onUiEvent.bind(this)
+        });
+      }
+    }
+  }, {
+    key: "onNodeWillInactive",
+    value: function onNodeWillInactive() {
+      var _this$_store;
+      (_this$_store = this._store) === null || _this$_store === void 0 || _this$_store.release();
     }
   }, {
     key: "getComponent",
     value: function getComponent() {
+      if (!this._store) {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+      }
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {
@@ -84,5 +131,14 @@ var DialogUIModule = exports.DialogUIModule = /*#__PURE__*/function (_UIModule)
         _this2._dialogs.set(dialog.key, dialog.component);
       });
     }
+  }, {
+    key: "onUiEvent",
+    value: function onUiEvent(event, payload) {
+      switch (event) {
+        case _constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN:
+          this._store.updateCurrentShareContent(_objectSpread({}, payload));
+          break;
+      }
+    }
   }]);
 }(_base.UIModule);

package/lib/modules/dialog/store.d.ts

@@ -1,9 +1,18 @@
-import { FcrStreamControl } from 'fcr-core';
-import { DialogKey } from '../../utilities/constant';
-import { FcrDeviceStore } from '../../common/device-store';
-import { FcrChatRoomConnectionState } from 'fcr-core/lib/room-control/chatroom-control/type';
-import { FcrRemoteVideoRenderManager } from '../../common/remote-renderer';
-import { StoreConfig } from '../../type';
+import { FcrStreamControl, FcrUserControl } from 'fcr-core';
+import { FcrChatRoomConnectionState, FcrChatRoomControl } from 'fcr-core/lib/room-control/chatroom-control/type';
+import { FcrUIDialogKey } from '../../utilities/constant';
+import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { FcrUILocalVideoRenderProvider, FcrUIRemoteVideoRenderProvider } from '../../providers/renderer-provider';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIPhoneAudioConnectorProvider } from '../../providers/phone-audio-provider';
+import { AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
+import { CurrentShareBounds } from '../control-bar/types';
+import { CurrentShareScreenTypes } from '../share-screen/types';
+export declare const HIGH_LEVEL_DIALOG_LAYER: FcrUIDialogKey[];
+export declare const TOP_LEVEL_DIALOG_LAYER: FcrUIDialogKey[];
 export default class DialogStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _uiEventStore;
@@ -12,9 +21,14 @@ export default class DialogStore {
     private _userControl;
     private _deviceStore;
     private _securityStore;
+    private _localVideoRenderProvider;
     private _remoteVideoRenderManager;
+    private _dialogProvider;
     private _chatRoomControl;
     private _connnectBeforeCloseDetect;
+    private _sharedLayoutDataSource;
+    private _phoneAudioConnectorProvider;
+    private _handleDialogEventObserver;
     private _userObserver;
     private _chatRoomObserver;
     accessor openedDialogs: {
@@ -26,25 +40,45 @@ export default class DialogStore {
     accessor userCount: number;
     accessor participantElectronDialogContainer: HTMLElement | null;
     accessor chatRoomState: FcrChatRoomConnectionState;
-    accessor currentDialogBounds: Map<DialogKey, number>;
+    accessor currentDialogBounds: Map<FcrUIDialogKey, number>;
     accessor videoWindowBounds: any;
+    accessor currentShareId: string;
+    accessor currentShareType: AgoraRtcScreenCaptureType;
+    accessor currentShareBounds: CurrentShareBounds;
     get participantCount(): number;
     get isManager(): boolean;
     get streamControl(): FcrStreamControl;
-    get deviceStore(): FcrDeviceStore;
-    get remoteVideoRenderManager(): FcrRemoteVideoRenderManager;
+    get deviceStore(): FcrUIDeviceProvider;
+    get remoteVideoRenderManager(): FcrUIRemoteVideoRenderProvider;
+    get localVideoRenderProvider(): FcrUILocalVideoRenderProvider;
     get waitingRoomState(): boolean;
-    constructor({ uiEventStore, userControl, chatRoomControl, deviceStore, streamControl, remoteVideoRenderManager, securityStore, }: StoreConfig);
+    get connectType(): import("../../type").FcrUIConnectType;
+    get hasOwnPstnStream(): boolean;
+    constructor({ uiEventStore, userControl, chatRoomControl, deviceStore, streamControl, localVideoRenderProvider, remoteVideoRenderManager, securityStore, sharedLayoutDataSource, dialogProvider, phoneAudioConnectorProvider, }: {
+        streamControl: FcrStreamControl;
+        userControl: FcrUserControl;
+        chatRoomControl: FcrChatRoomControl;
+        uiEventStore: FcrUIEventProvider;
+        securityStore: FcrUIPrivilegeProvider;
+        deviceStore: FcrUIDeviceProvider;
+        localVideoRenderProvider: FcrUILocalVideoRenderProvider;
+        remoteVideoRenderManager: FcrUIRemoteVideoRenderProvider;
+        sharedLayoutDataSource: FcrUISharedLayoutDataSource;
+        dialogProvider: FcrUIDialogProvider;
+        phoneAudioConnectorProvider: FcrUIPhoneAudioConnectorProvider;
+    });
     setParticipantElectronDialogContainer(dom: HTMLElement | null): void;
     setVideoWindowBounds(payload: any): void;
-    closeDialogByKey(dialogKey: DialogKey): void;
+    closeDialogByKey(dialogKey: FcrUIDialogKey): void;
     closeSystemPreferenceDialog(): void;
     closeChatFromDialog(): void;
     moveChatFromDialogToAside(): void;
-    closeConnectionDialog(isUserClose?: boolean): void;
+    closeConnectionDialog(): boolean;
+    closeParticipantDialog(): void;
     moveParticipantFromDialogToAside(): void;
     release(): void;
     resizeVideoWindow(width: number, height: number): void;
+    updateCurrentShareContent(payload: CurrentShareScreenTypes): void;
     private _handleDialogEvent;
     private _handleConnectionUpdated;
     private _hanleAllUserCountUpdated;

package/lib/modules/dialog/store.js

@@ -19,7 +19,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.StoreContext = void 0;
+exports["default"] = exports.TOP_LEVEL_DIALOG_LAYER = exports.StoreContext = exports.HIGH_LEVEL_DIALOG_LAYER = void 0;
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
@@ -66,14 +66,15 @@ var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("agora-foundation/lib/logger");
 var _env = require("agora-foundation/lib/utilities/env");
 var _mobx = require("mobx");
-var _constant = require("../../utilities/constant");
 var _dialogs = require("./dialogs");
-var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
 var _react = require("react");
 var _platform = require("../../utilities/platform");
+var _constant = require("../../utilities/constant");
+var _dialogProvider = require("../../providers/dialog-provider");
+var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
 var _DialogStore;
-var _initProto, _init_openedDialogs, _init_payloadDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_chatRoomState, _init_currentDialogBounds, _init_videoWindowBounds, _setVideoWindowBoundsDecs, _handleDialogEventDecs, _handleConnectionUpdatedDecs, _hanleAllUserCountUpdatedDecs, _ref;
+var _initProto, _init_openedDialogs, _init_payloadDialogs, _init_confirmDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_chatRoomState, _init_currentDialogBounds, _init_videoWindowBounds, _init_currentShareId, _init_currentShareType, _init_currentShareBounds, _setVideoWindowBoundsDecs, _updateCurrentShareContentDecs, _handleDialogEventDecs, _handleConnectionUpdatedDecs, _hanleAllUserCountUpdatedDecs, _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; }
@@ -84,6 +85,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var HIGH_LEVEL_DIALOG_LAYER = exports.HIGH_LEVEL_DIALOG_LAYER = [_constant.FcrUIDialogKey.CHAT, _constant.FcrUIDialogKey.PARTICIPANT, _constant.FcrUIDialogKey.SHARE_SCREEN];
+var TOP_LEVEL_DIALOG_LAYER = exports.TOP_LEVEL_DIALOG_LAYER = [_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.CONFIRM, _constant.FcrUIDialogKey.CONTROL_BAR, _constant.FcrUIDialogKey.VIDEO_WINDOW];
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -92,7 +95,10 @@ var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
-_ref = (_setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _handleDialogEventDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], _hanleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+var _I = /*#__PURE__*/new WeakMap();
+var _J = /*#__PURE__*/new WeakMap();
+var _K = /*#__PURE__*/new WeakMap();
+_ref = (_setVideoWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _updateCurrentShareContentDecs = [_mobx.action, _mobx.action.bound], _handleDialogEventDecs = [_mobx.action, _mobx.action.bound], _handleConnectionUpdatedDecs = [_mobx.action, _mobx.action.bound], _hanleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var DialogStore = exports["default"] = /*#__PURE__*/function () {
   function DialogStore(_ref2) {
     var _this = this;
@@ -101,11 +107,18 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       chatRoomControl = _ref2.chatRoomControl,
       deviceStore = _ref2.deviceStore,
       streamControl = _ref2.streamControl,
+      localVideoRenderProvider = _ref2.localVideoRenderProvider,
       remoteVideoRenderManager = _ref2.remoteVideoRenderManager,
-      securityStore = _ref2.securityStore;
+      securityStore = _ref2.securityStore,
+      sharedLayoutDataSource = _ref2.sharedLayoutDataSource,
+      dialogProvider = _ref2.dialogProvider,
+      phoneAudioConnectorProvider = _ref2.phoneAudioConnectorProvider;
     (0, _classCallCheck2["default"])(this, DialogStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
     (0, _defineProperty2["default"])(this, "_connnectBeforeCloseDetect", true);
+    (0, _defineProperty2["default"])(this, "_handleDialogEventObserver", {
+      onEvent: this._handleDialogEvent.bind(this)
+    });
     (0, _defineProperty2["default"])(this, "_userObserver", {
       onAllUserCountUpdated: this._hanleAllUserCountUpdated.bind(this)
     });
@@ -122,19 +135,30 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _F, _init_chatRoomState(this, _type2.FcrChatRoomConnectionState.Disconnected));
     _classPrivateFieldInitSpec(this, _G, _init_currentDialogBounds(this, new Map()));
     _classPrivateFieldInitSpec(this, _H, _init_videoWindowBounds(this, {}));
+    _classPrivateFieldInitSpec(this, _I, _init_currentShareId(this, ''));
+    _classPrivateFieldInitSpec(this, _J, _init_currentShareType(this, _type3.AgoraRtcScreenCaptureType.SCREEN));
+    _classPrivateFieldInitSpec(this, _K, _init_currentShareBounds(this, {
+      width: 0,
+      height: 0,
+      x: 0,
+      y: 0
+    }));
     this._uiEventStore = uiEventStore;
     this._userInfo = userControl.getLocalUser();
     this._streamControl = streamControl;
     this._userControl = userControl;
     this._remoteVideoRenderManager = remoteVideoRenderManager;
+    this._localVideoRenderProvider = localVideoRenderProvider;
     this._deviceStore = deviceStore;
     this._chatRoomControl = chatRoomControl;
     this._securityStore = securityStore;
-    userControl.addObserver(this._userObserver);
-    uiEventStore.addObserver({
-      onEvent: this._handleDialogEvent.bind(this)
-    });
-    chatRoomControl.addObserver(this._chatRoomObserver);
+    this._sharedLayoutDataSource = sharedLayoutDataSource;
+    this._dialogProvider = dialogProvider;
+    this._phoneAudioConnectorProvider = phoneAudioConnectorProvider;
+    this._userControl.addObserver(this._userObserver);
+    this._uiEventStore.addObserver(this._handleDialogEventObserver);
+    this._dialogProvider.addObserver(this._handleDialogEventObserver);
+    this._chatRoomControl.addObserver(this._chatRoomObserver);
     (0, _mobx.runInAction)(function () {
       _this.userCount = _this._userControl.getAllUserCount();
     });
@@ -203,6 +227,30 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_H, this, v);
     }
+  }, {
+    key: "currentShareId",
+    get: function get() {
+      return _classPrivateFieldGet(_I, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_I, this, v);
+    }
+  }, {
+    key: "currentShareType",
+    get: function get() {
+      return _classPrivateFieldGet(_J, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_J, this, v);
+    }
+  }, {
+    key: "currentShareBounds",
+    get: function get() {
+      return _classPrivateFieldGet(_K, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_K, this, v);
+    }
   }, {
     key: "participantCount",
     get: function get() {
@@ -228,11 +276,26 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._remoteVideoRenderManager;
     }
+  }, {
+    key: "localVideoRenderProvider",
+    get: function get() {
+      return this._localVideoRenderProvider;
+    }
   }, {
     key: "waitingRoomState",
     get: function get() {
       return this._securityStore.isWaitingRoomEnabled();
     }
+  }, {
+    key: "connectType",
+    get: function get() {
+      return this._deviceStore.connectType;
+    }
+  }, {
+    key: "hasOwnPstnStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasOwnPstnStream;
+    }
   }, {
     key: "setParticipantElectronDialogContainer",
     value: function setParticipantElectronDialogContainer(dom) {
@@ -255,66 +318,44 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "closeSystemPreferenceDialog",
     value: function closeSystemPreferenceDialog() {
-      this.closeDialogByKey(_constant.DialogKey.SYSTEM_PREFERENCE);
+      this.closeDialogByKey(_constant.FcrUIDialogKey.SYSTEM_PREFERENCE);
     }
   }, {
     key: "closeChatFromDialog",
     value: function closeChatFromDialog() {
-      this.closeDialogByKey(_constant.DialogKey.CHAT);
+      this.closeDialogByKey(_constant.FcrUIDialogKey.CHAT);
+      this._sharedLayoutDataSource.setAsideLayout({
+        chat: false
+      });
     }
   }, {
     key: "moveChatFromDialogToAside",
     value: function moveChatFromDialogToAside() {
       this.closeChatFromDialog();
-      this._uiEventStore.updateAside({
+      this._sharedLayoutDataSource.setChatRenderAt('aside');
+      this._sharedLayoutDataSource.setAsideLayout({
         chat: true
       });
     }
   }, {
     key: "closeConnectionDialog",
     value: function closeConnectionDialog() {
-      var _this2 = this;
-      var isUserClose = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      if (this._connnectBeforeCloseDetect && !this._deviceStore.microphoneId && isUserClose) {
-        this._connnectBeforeCloseDetect = false;
-        var dialogKey = this._uiEventStore.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'),
-          okText: (0, _i18n.transI18n)('fmt_actionbar_option_connectaudio'),
-          alignCenter: true,
-          showCancel: true,
-          width: 255,
-          height: 255,
-          cancelButtonProps: {
-            block: true,
-            type: 'secondary',
-            shape: 'circle'
-          },
-          okButtonProps: {
-            block: true,
-            type: 'primary',
-            shape: 'circle'
-          },
-          closable: false,
-          onCancel: function onCancel() {
-            _this2._uiEventStore.closeConfirm(dialogKey);
-            _this2.closeDialogByKey(_constant.DialogKey.CONNECTION_GATEWAY);
-          },
-          onOk: function onOk() {
-            _this2._uiEventStore.closeConfirm(dialogKey);
-            _this2._deviceStore.joinAudioByComputer();
-          }
-        });
-      } else {
-        this.closeDialogByKey(_constant.DialogKey.CONNECTION_GATEWAY);
-      }
+      return this._dialogProvider.emitIntercepter(_dialogProvider.FcrDialogInterceptorEventName.ON_CLOSE, _constant.FcrUIDialogKey.CONNECTION_GATEWAY);
+    }
+  }, {
+    key: "closeParticipantDialog",
+    value: function closeParticipantDialog() {
+      this.closeDialogByKey(_constant.FcrUIDialogKey.PARTICIPANT);
+      this._sharedLayoutDataSource.setAsideLayout({
+        participant: false
+      });
     }
   }, {
     key: "moveParticipantFromDialogToAside",
     value: function moveParticipantFromDialogToAside() {
-      this.closeDialogByKey(_constant.DialogKey.PARTICIPANT);
-      this._uiEventStore.updateAside({
+      this.closeParticipantDialog();
+      this._sharedLayoutDataSource.setParticipantsRenderAt('aside');
+      this._sharedLayoutDataSource.setAsideLayout({
         participant: true
       });
     }
@@ -323,15 +364,27 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     value: function release() {
       this._userControl.removeObserver(this._userObserver);
       this._chatRoomControl.removeObserver(this._chatRoomObserver);
+      this._dialogProvider.removeObserver(this._handleDialogEventObserver);
+      this._uiEventStore.removeObserver(this._handleDialogEventObserver);
     }
   }, {
     key: "resizeVideoWindow",
     value: function resizeVideoWindow(width, height) {
-      this._uiEventStore.sendEvent(_constant.UIAction.VIDEO_WINDOW_RESIZE, {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.VIDEO_WINDOW_RESIZE, {
         width: width,
         height: height
       });
     }
+  }, {
+    key: "updateCurrentShareContent",
+    value: function updateCurrentShareContent(payload) {
+      var id = payload.id,
+        type = payload.type,
+        bounds = payload.bounds;
+      this.currentShareId = id;
+      this.currentShareType = type;
+      this.currentShareBounds = bounds;
+    }
   }, {
     key: "_handleDialogEvent",
     value: function _handleDialogEvent(action, payload) {
@@ -342,13 +395,13 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
         _ref3$params = _ref3.params,
         params = _ref3$params === void 0 ? {} : _ref3$params;
       switch (action) {
-        case _constant.UIAction.OPEN_DIALOG:
+        case _constant.FcrUIAction.OPEN_DIALOG:
           // 因为窗口可能会移动，因此需要矫正 global toast 和 confirm 的 Bounds
-          if ([_constant.DialogKey.SHOW_TOAST, _constant.DialogKey.CONFIRM].includes(dialogKey) && (0, _env.isElectron)()) {
+          if ([_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.CONFIRM].includes(dialogKey) && (0, _env.isElectron)()) {
             var _dialogWindows$get, _dialogWindows$get2;
-            var toastWindow = _dialogs.dialogWindows.get(_constant.DialogKey.SHOW_TOAST);
-            var confirmWindow = _dialogs.dialogWindows.get(_constant.DialogKey.CONFIRM);
-            var controlbar = _dialogs.dialogWindows.get(_constant.DialogKey.CONTROL_BAR);
+            var toastWindow = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.SHOW_TOAST);
+            var confirmWindow = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONFIRM);
+            var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
             var nearDispaly = window.runtime.screen.getDisplayNearestPoint((controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds()) || window.runtime.browserWindow.getBounds()).bounds;
             var bounds = {
               x: Math.floor(nearDispaly.x),
@@ -359,8 +412,8 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
             toastWindow === null || toastWindow === void 0 || toastWindow.setBounds(bounds);
             confirmWindow === null || confirmWindow === void 0 || confirmWindow.setBounds(bounds);
             !(0, _platform.isWindows)() && _dialogs.dialogWindows.forEach(function (window, key) {
-              if (key === dialogKey) return;
-              window.setAlwaysOnTop(true, 'floating');
+              if (key === dialogKey || HIGH_LEVEL_DIALOG_LAYER.includes(key) || TOP_LEVEL_DIALOG_LAYER.includes(key)) return;
+              window.setAlwaysOnTop(true, 'normal');
             });
             (_dialogWindows$get = _dialogs.dialogWindows.get(dialogKey)) === null || _dialogWindows$get === void 0 || _dialogWindows$get.focus();
             (_dialogWindows$get2 = _dialogs.dialogWindows.get(dialogKey)) === null || _dialogWindows$get2 === void 0 || _dialogWindows$get2.setAlwaysOnTop(true, 'screen-saver');
@@ -378,15 +431,15 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
           });
           this.payloadDialogs.set(dialogKey, params);
           break;
-        case _constant.UIAction.CLOSE_DIALOG:
+        case _constant.FcrUIAction.CLOSE_DIALOG:
           this.openedDialogs = this.openedDialogs.filter(function (dialog) {
             return dialog.dialogId !== dialogId;
           });
           break;
-        case _constant.UIAction.VIDEO_WINDOW_BOUNDS:
+        case _constant.FcrUIAction.VIDEO_WINDOW_BOUNDS:
           this.setVideoWindowBounds(payload);
           break;
-        case _constant.UIAction.SET_DIALOG_BOUNDS:
+        case _constant.FcrUIAction.SET_DIALOG_BOUNDS:
           var _ref4 = payload,
             height = _ref4.height;
           if (dialogKey) this.currentDialogBounds.set(dialogKey, height);
@@ -406,7 +459,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _DialogStore = DialogStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_DialogStore, [[_mobx.observable, 1, "openedDialogs"], [_mobx.observable, 1, "payloadDialogs"], [_mobx.observable, 1, "confirmDialogs"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "participantElectronDialogContainer"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "currentDialogBounds"], [_mobx.observable, 1, "videoWindowBounds"], [_mobx.action, 2, "setParticipantElectronDialogContainer"], [_setVideoWindowBoundsDecs, 18, "setVideoWindowBounds"], [_decorator.bound, 2, "closeDialogByKey"], [_decorator.bound, 2, "closeSystemPreferenceDialog"], [_decorator.bound, 2, "closeChatFromDialog"], [_decorator.bound, 2, "moveChatFromDialogToAside"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "moveParticipantFromDialogToAside"], [_decorator.bound, 2, "resizeVideoWindow"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"]], []).e, 9);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_DialogStore, [[_mobx.observable, 1, "openedDialogs"], [_mobx.observable, 1, "payloadDialogs"], [_mobx.observable, 1, "confirmDialogs"], [_mobx.observable, 1, "userCount"], [_mobx.observable, 1, "participantElectronDialogContainer"], [_mobx.observable, 1, "chatRoomState"], [_mobx.observable, 1, "currentDialogBounds"], [_mobx.observable, 1, "videoWindowBounds"], [_mobx.observable, 1, "currentShareId"], [_mobx.observable, 1, "currentShareType"], [_mobx.observable, 1, "currentShareBounds"], [_mobx.computed, 3, "connectType"], [_mobx.computed, 3, "hasOwnPstnStream"], [_mobx.action, 2, "setParticipantElectronDialogContainer"], [_setVideoWindowBoundsDecs, 18, "setVideoWindowBounds"], [_decorator.bound, 2, "closeDialogByKey"], [_decorator.bound, 2, "closeSystemPreferenceDialog"], [_decorator.bound, 2, "closeChatFromDialog"], [_decorator.bound, 2, "moveChatFromDialogToAside"], [_decorator.bound, 2, "closeConnectionDialog"], [_decorator.bound, 2, "closeParticipantDialog"], [_decorator.bound, 2, "moveParticipantFromDialogToAside"], [_decorator.bound, 2, "resizeVideoWindow"], [_updateCurrentShareContentDecs, 18, "updateCurrentShareContent"], [_handleDialogEventDecs, 18, "_handleDialogEvent"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_hanleAllUserCountUpdatedDecs, 18, "_hanleAllUserCountUpdated"]], []).e, 12);
 _init_openedDialogs = _applyDecs$e[0];
 _init_payloadDialogs = _applyDecs$e[1];
 _init_confirmDialogs = _applyDecs$e[2];
@@ -415,5 +468,8 @@ _init_participantElectronDialogContainer = _applyDecs$e[4];
 _init_chatRoomState = _applyDecs$e[5];
 _init_currentDialogBounds = _applyDecs$e[6];
 _init_videoWindowBounds = _applyDecs$e[7];
-_initProto = _applyDecs$e[8];
+_init_currentShareId = _applyDecs$e[8];
+_init_currentShareType = _applyDecs$e[9];
+_init_currentShareBounds = _applyDecs$e[10];
+_initProto = _applyDecs$e[11];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/dialog/types/index.d.ts

@@ -19,6 +19,7 @@ type FcrUIDialogHooksProps = {
     browserWindow: Electron.BrowserWindow;
     store: DialogStore;
     setBounds: (bounds: Partial<Electron.Rectangle>, animate?: boolean) => void;
+    nearDisplayBounds: Electron.Rectangle;
   }) => void;
   /**
    * * @param onUnmounted - 当 dialog 卸载时的回调函数，函数签名为 dialog 的 store
@@ -41,9 +42,19 @@ type FcrUIDialogHooksProps = {
    */
   ignoreMouseEvents?: boolean | Electron.IgnoreMouseEventsOptions;
   /**
-   * @param alwaysOnTop - 在 dialog 窗口打开之后，主动调用一次 browserWindow 的 setAlwaysOnTop(true, 'screen-saver') 方法，默认为true
+   * @param alwaysOnTop - 在 dialog 窗口打开之后，主动调用一次 browserWindow 的 setAlwaysOnTop(true, 'normal') 方法，默认为true
+   * @type boolean | 'normal' | 'floating' | 'torn-off-menu' | 'modal-panel' | 'main-menu' | 'status' | 'pop-up-menu' | 'screen-saver'
    */
-  alwaysOnTop?: boolean;
+  alwaysOnTop?:
+    | boolean
+    | 'normal'
+    | 'floating'
+    | 'torn-off-menu'
+    | 'modal-panel'
+    | 'main-menu'
+    | 'status'
+    | 'pop-up-menu'
+    | 'screen-saver';
   /**
    * @param fullScreen - 自定义全屏设置，和 electron 的全屏设置不同，它会以主窗口的位置为基准，给新打开的窗口设置和屏幕一样的大小
    */
@@ -53,7 +64,7 @@ type FcrUIDialogHooksProps = {
    */
   polyfills?: string[];
   /**
-   * @param hasCustomShadow - 默认值 true, 目前窗口有两种，一种是作为 toast 和 confirm 容器的窗口，这种窗口没有阴影，另外一种是独立的窗口，这种窗口有阴影，配置为 true 时，窗口会给宽高加上阴影的偏移量，所以 toast 和 confirm 窗口需要设置为 false
+   * @param hasCustomShadow - 通过缩小 electron 容器内的容器宽度加 css 样式阴影实现，所以会让原生 electron 的拖动响应的边产生偏移，所以如果窗口是可拖动的，需要设置为 false。默认值 true。目前窗口有三种，一种是作为 toast 和 confirm 容器的窗口，这种窗口因为是全屏显示不需要阴影，一种是 participant 和 chat 窗口，这俩窗口需要拉伸操作，所以用系统阴影，不用自定义阴影。还有一种是独立的窗口，这种窗口不需要拉伸，所以用自定义阴影，配置为 true 时，窗口会给宽高加上阴影的偏移量，所以 toast 和 confirm 窗口需要设置为 false
    * */
   hasCustomShadow?: boolean;
 };

package/lib/modules/event-confirm/index.css

@@ -4,7 +4,7 @@
   position: absolute;
   top: 0;
   left: 0;
-  z-index: 10;
+  z-index: 2000;
   pointer-events: none;
 }
 .confirm-wrapper div {

package/lib/modules/event-confirm/index.d.ts

@@ -1,10 +1,17 @@
 import { UIModule } from '../../base';
-import { FcrUIEventStore } from '../../common/event-store';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
+import { FcrUICurrentRoomControlProvider, FcrUIRoomProvider } from '../../providers/room-provider';
 export declare class EventConfirmUIModule extends UIModule {
-    private _store;
-    constructor(args: {
-        uiEventStore: FcrUIEventStore;
-    });
-    protected onUnload(): void;
+    private _store?;
+    private _leaveMeetingStore?;
+    eventProvider?: FcrUIEventProvider;
+    dialogProvider?: FcrUIDialogProvider;
+    privilegeProvider?: FcrUIPrivilegeProvider;
+    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
+    roomProvider?: FcrUIRoomProvider;
+    onNodeWillActive(): void;
+    onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
 }