fcr-ui-scene 3.4.0 → 3.4.2

package/lib/modules/dialog/hooks/useElectron.js

@@ -1,23 +1,46 @@
 "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/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.iterator.filter.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DialogInstanceContext = void 0;
+exports.shadowOffset = exports.DialogInstanceContext = void 0;
 exports.useElectronDialog = useElectronDialog;
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _store = require("../store");
 var _dialogs = require("../dialogs");
 var _renderer = require("../../../utilities/renderer");
 var _reactDom = require("react-dom");
+var _constant = require("../../../utilities/constant");
 var _jsxRuntime = require("react/jsx-runtime");
+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; }
 var DialogInstanceContext = exports.DialogInstanceContext = /*#__PURE__*/(0, _react.createContext)(null);
+var shadowOffset = exports.shadowOffset = 15 + 15;
 function useElectronDialog(props) {
   var store = (0, _react.useContext)(_store.StoreContext);
-  var config = props.config,
+  var customConfigs = props.config,
     dialogKey = props.dialogKey,
     onClose = props.onClose,
     scroll = props.scroll,
@@ -25,58 +48,120 @@ function useElectronDialog(props) {
     focus = _props$focus === void 0 ? true : _props$focus,
     children = props.children,
     ignoreMouseEvents = props.ignoreMouseEvents,
-    alwaysOnTop = props.alwaysOnTop,
+    _props$alwaysOnTop = props.alwaysOnTop,
+    alwaysOnTop = _props$alwaysOnTop === void 0 ? false : _props$alwaysOnTop,
     fullScreen = props.fullScreen,
     onOpened = props.onOpened,
     onUnmounted = props.onUnmounted,
-    polyfills = props.polyfills;
+    polyfills = props.polyfills,
+    _props$hasCustomShado = props.hasCustomShadow,
+    hasCustomShadow = _props$hasCustomShado === void 0 ? true : _props$hasCustomShado;
   var windowRef = (0, _react.useRef)();
+  var _customConfigs$width = customConfigs.width,
+    w = _customConfigs$width === void 0 ? 0 : _customConfigs$width,
+    _customConfigs$height = customConfigs.height,
+    h = _customConfigs$height === void 0 ? 0 : _customConfigs$height;
+  var config = _objectSpread(_objectSpread({
+    type: 'panel',
+    hasShadow: false,
+    frame: false,
+    transparent: true,
+    resizeble: false
+  }, customConfigs), {}, {
+    setAlwaysOnTop: alwaysOnTop,
+    width: w + (hasCustomShadow ? shadowOffset : 0),
+    height: h + (hasCustomShadow ? shadowOffset : 0)
+  });
   (0, _react.useEffect)(function () {
     var node;
     window.runtime.openRendererWindow(dialogKey, function (dom, browserWindow, newRendererWindow) {
-      var _browserWindow$setBou2;
+      var _window$runtime, _controlbar$isVisible;
       node = dom;
       windowRef.current = browserWindow;
       _dialogs.dialogWindows.set(dialogKey, browserWindow);
-      onOpened === null || onOpened === void 0 || onOpened({
-        browserWindow: browserWindow,
-        store: store
-      });
-      var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
       var thisWindowBounds = browserWindow.getBounds();
+      var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
       var nearDisplayBounds = window.runtime.screen.getDisplayNearestPoint(mainAppWindowBounds).bounds;
-      var isFullScreen = window.runtime.browserWindow.isFullScreen();
-      if (!isFullScreen && browserWindow) {
+      var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
+      var isFullScreen = (_window$runtime = window.runtime) === null || _window$runtime === void 0 ? void 0 : _window$runtime.browserWindow.isFullScreen();
+      if (controlbar && controlbar !== null && controlbar !== void 0 && (_controlbar$isVisible = controlbar.isVisible) !== null && _controlbar$isVisible !== void 0 && _controlbar$isVisible.call(controlbar)) {
+        // 因为打开过的窗口在关闭时是用的 hide 方法，因此只判断 controlbar 是否存在会在关闭 controlbar 时失效，导致窗口依然跟随 controlbar 最后所在屏幕打开，所以要再判断一下 isVisible 状态
+        // 当屏幕共享时会打开 control bar，此时弹窗相对于 control bar 展示
+        var nearDisplay = window.runtime.screen.getDisplayNearestPoint(controlbar.getBounds());
+        var _nearDisplayBounds = nearDisplay.bounds;
+        var _thisWindowBounds = browserWindow.getBounds();
+        console.log({
+          thisWindowBounds: _thisWindowBounds
+        });
+        var centerBounds = {
+          x: Math.floor(_nearDisplayBounds.x + (_nearDisplayBounds.width - _thisWindowBounds.width) / 2),
+          y: Math.floor(_nearDisplayBounds.y + (_nearDisplayBounds.height - _thisWindowBounds.height) / 2)
+        };
+        // resizeble 为 true 的窗口在切换不同分辨率属性的显示器时，会有打开尺寸失真的情况出现，所以暂存一下其原始值，在更改坐标之后还原
+        var resizeble = browserWindow.isResizable();
+        browserWindow.setResizable(false);
+        browserWindow.setBounds(centerBounds);
+        browserWindow.setResizable(resizeble);
+      } else if (isFullScreen) {
         var _browserWindow$setBou;
+        // 当窗口的自定义设置为全屏时，让弹窗追随主窗口所在的屏幕展示
+        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou = browserWindow.setBounds) === null || _browserWindow$setBou === void 0 || _browserWindow$setBou.call(browserWindow, {
+          x: nearDisplayBounds.x,
+          y: (0, _renderer.isWindows)() && polyfills !== null && polyfills !== void 0 && polyfills.includes('fix-toast-window-flash') ? -100 : nearDisplayBounds.y,
+          width: nearDisplayBounds.width,
+          height: (0, _renderer.isWindows)() && polyfills !== null && polyfills !== void 0 && polyfills.includes('fix-toast-window-flash') ? 0 : nearDisplayBounds.height
+        });
+      } else {
+        var _browserWindow$setBou2;
+        // 如果主窗口不是全屏模式，那么新打开的弹窗相对于主窗口弹窗的水平垂直居中显示
         var bounds = {
           x: Math.floor(mainAppWindowBounds.x + (mainAppWindowBounds.width - thisWindowBounds.width) / 2),
           y: Math.floor(mainAppWindowBounds.y + (mainAppWindowBounds.height - thisWindowBounds.height) / 2)
         };
-        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou = browserWindow.setBounds) === null || _browserWindow$setBou === void 0 || _browserWindow$setBou.call(browserWindow, bounds);
-      } else {
-        browserWindow.setVisibleOnAllWorkspaces(true, {
-          visibleOnFullScreen: true,
-          skipTransformProcessType: true
-        });
+        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou2 = browserWindow.setBounds) === null || _browserWindow$setBou2 === void 0 || _browserWindow$setBou2.call(browserWindow, bounds);
       }
-      fullScreen && (browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou2 = browserWindow.setBounds) === null || _browserWindow$setBou2 === void 0 ? void 0 : _browserWindow$setBou2.call(browserWindow, {
-        x: nearDisplayBounds.x,
-        y: (0, _renderer.isWindows)() && polyfills !== null && polyfills !== void 0 && polyfills.includes('fix-toast-window-flash') ? -100 : nearDisplayBounds.y,
-        width: nearDisplayBounds.width,
-        height: (0, _renderer.isWindows)() && polyfills !== null && polyfills !== void 0 && polyfills.includes('fix-toast-window-flash') ? 0 : nearDisplayBounds.height
-      }));
+
+      // 设置所有窗口为所有工作区可见
+      browserWindow.setVisibleOnAllWorkspaces(true, {
+        visibleOnFullScreen: true,
+        skipTransformProcessType: true
+      });
+
+      // @ts-ignore
+      // window._browserWindows = window._browserWindows || {};
+      // @ts-ignore
+      // window._browserWindows[dialogKey] = browserWindow;
+      // @ts-ignore
+      // window._windows = window._windows || {};
+      // @ts-ignore
+      // window._windows[dialogKey] = newRendererWindow;
+
+      // 因为窗口有可能需要单独设置位置，所以，窗口打开的回调需要放置在默认的位置设置之后
+      onOpened === null || onOpened === void 0 || onOpened({
+        browserWindow: browserWindow,
+        store: store,
+        // 重写 setBounds 方法，使得设置 bounds 时，自动加上阴影的宽度
+        setBounds: function setBounds(bounds, animate) {
+          var b = _objectSpread({}, bounds);
+          if (b.width && hasCustomShadow) b.width = b.width + shadowOffset;
+          if (b.height && hasCustomShadow) b.height = b.height + shadowOffset;
+          browserWindow.setBounds(b, animate);
+        },
+        nearDisplayBounds: nearDisplayBounds
+      });
+
+      // 同原生 electron 的 ignoreMouseEvents 一样，设置为 true 时，窗口将不再接收鼠标事件
       if (ignoreMouseEvents) {
         browserWindow.setIgnoreMouseEvents(true, typeof ignoreMouseEvents === 'boolean' ? {
           forward: true
         } : ignoreMouseEvents);
       }
-      alwaysOnTop && browserWindow.setAlwaysOnTop(true);
+      browserWindow.setAlwaysOnTop(typeof alwaysOnTop === 'boolean' ? alwaysOnTop : typeof alwaysOnTop === 'string', typeof alwaysOnTop === 'string' ? alwaysOnTop : 'pop-up-menu');
+      _store.HIGH_LEVEL_DIALOG_LAYER.includes(dialogKey) && browserWindow.setAlwaysOnTop(true, 'pop-up-menu');
       if (!scroll) {
-        browserWindow.webContents.insertCSS("\n            ::-webkit-scrollbar {\n              display: none;\n            }\n          ");
+        browserWindow.webContents.insertCSS("\n            ::-webkit-scrollbar {\n              display: none;\n            }\n            #root {\n              padding: ".concat(hasCustomShadow ? shadowOffset / 2 : 0, "px;\n              display: ").concat(hasCustomShadow ? 'flex' : 'block', ";\n              align-items: center;\n            }\n          "));
       }
       focus && browserWindow.focus();
-      (0, _renderer.isWindows)() && browserWindow.show(); // 修复 windows 下打开白屏的问题
-
       (0, _renderer.handleWillClose)(browserWindow, function () {
         (0, _reactDom.unmountComponentAtNode)(node);
         _dialogs.dialogWindows["delete"](dialogKey);
@@ -87,7 +172,8 @@ function useElectronDialog(props) {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(DialogInstanceContext.Provider, {
           value: {
             browserWindow: browserWindow,
-            newRendererWindow: newRendererWindow
+            newRendererWindow: newRendererWindow,
+            resizable: !!customConfigs.resizable
           },
           children: typeof children === 'function' ? children(browserWindow) : children
         })
@@ -102,6 +188,18 @@ function useElectronDialog(props) {
       onUnmounted === null || onUnmounted === void 0 || onUnmounted(store);
     };
   }, []);
+
+  // 这组监听是为了处理 mac 全屏模式下，弹窗会因为主窗口全屏而变成独立窗口的问题
+  window.runtime.browserWindow.addListener('enter-full-screen', function () {
+    _dialogs.dialogWindows.forEach(function (win, k) {
+      !_store.TOP_LEVEL_DIALOG_LAYER.includes(k) && win.setAlwaysOnTop(true, 'pop-up-menu');
+    });
+  });
+  window.runtime.browserWindow.addListener('leave-full-screen', function () {
+    _dialogs.dialogWindows.forEach(function (win, k) {
+      ![].concat((0, _toConsumableArray2["default"])(_store.TOP_LEVEL_DIALOG_LAYER), (0, _toConsumableArray2["default"])(_store.HIGH_LEVEL_DIALOG_LAYER)).includes(k) && win.setAlwaysOnTop(true, 'normal');
+    });
+  });
   return {
     store: store,
     browserWindow: windowRef.current

package/lib/modules/dialog/index.css

@@ -9,12 +9,10 @@
 .fcr-participant-dialog-wrapper,
 .fcr-livestreaming-dialog-wrapper {
   background: var(--fcr_mobile_ui_scene_color_popup_fill2);
-  border-radius: var(--fcr_cornerradius_m);
   width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
-  box-shadow: var(--fcr_web_light_dropup);
 }
 
 .fcr-livestreaming-dialog-wrapper .frc-window-header {

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

@@ -1,29 +1,40 @@
 import React from 'react';
 import { UIModule } from '../../base';
-import { FcrUIEventStore } from '../../common/event-store';
-import { FcrSecurityStore } from '../../common/security-store';
-import { FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
 import { FcrStreamControl, FcrUserControl } from 'fcr-core';
-import { FcrDeviceStore } from '../../common/device-store';
 import { FcrChatRoomControl } from 'fcr-core/lib/room-control/chatroom-control/type';
-import { FcrRemoteVideoRenderManager } from '../../common/remote-renderer';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUICurrentRoomControlProvider, FcrUIMainRoomControlProvider, FcrUIWaitingRoomControlProvider } from '../../providers/room-provider';
+import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
+import { FcrUILocalVideoRenderProvider, FcrUIRemoteVideoRenderProvider } from '../../providers/renderer-provider';
+import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIPhoneAudioConnectorProvider } from '../../providers/phone-audio-provider';
+import { FcrUIAction } from '../../utilities/constant';
+import { CurrentShareScreenTypes } from '../share-screen/types';
 export declare class DialogUIModule extends UIModule {
     private _dialogs;
-    private _store;
-    constructor(args: {
-        uiEventStore: FcrUIEventStore;
-        userInfo: FcrUserInfo;
-        securityStore: FcrSecurityStore;
-        userControl: FcrUserControl;
-        chatRoomControl: FcrChatRoomControl;
-        deviceStore: FcrDeviceStore;
-        streamControl: FcrStreamControl;
-        remoteVideoRenderManager: FcrRemoteVideoRenderManager;
-    });
-    protected onUnload(): void;
+    private _store?;
+    deviceProvider?: FcrUIDeviceProvider;
+    streamControl?: FcrStreamControl;
+    eventProvider?: FcrUIEventProvider;
+    userControl?: FcrUserControl;
+    remoteVideoRenderProvider?: FcrUIRemoteVideoRenderProvider;
+    localVideoRenderProvider?: FcrUILocalVideoRenderProvider;
+    privilegeProvider?: FcrUIPrivilegeProvider;
+    chatRoomControl?: FcrChatRoomControl;
+    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
+    sharedLayoutDataSource?: FcrUISharedLayoutDataSource;
+    dialogProvider?: FcrUIDialogProvider;
+    phoneAudioConnectorProvider?: FcrUIPhoneAudioConnectorProvider;
+    mainRoomControlProvider?: FcrUIMainRoomControlProvider;
+    waitingRoomControlProvider?: FcrUIWaitingRoomControlProvider;
+    onNodeWillActive(): void;
+    onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
     addDialogs(dialogs: {
         key: string;
         component: (params?: any) => React.JSX.Element;
     }[]): void;
+    onUiEvent(event: FcrUIAction, payload: CurrentShareScreenTypes): void;
 }

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,26 +1,34 @@
 import { FcrStreamControl, FcrUserControl } from 'fcr-core';
-import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIEventStore } from '../../common/event-store';
-import { FcrSecurityStore } from '../../common/security-store';
-import { DialogKey } from '../../utilities/constant';
-import { Rectangle } from 'electron';
-import { FcrDeviceStore } from '../../common/device-store';
-import { AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
 import { FcrChatRoomConnectionState, FcrChatRoomControl } from 'fcr-core/lib/room-control/chatroom-control/type';
-import { FcrRemoteVideoRenderManager } from '../../common/remote-renderer';
+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 _currentShareId;
-    private _currentShareType;
-    private _electronDialogs;
     private _uiEventStore;
     private _userInfo;
     private _streamControl;
     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: {
@@ -32,51 +40,45 @@ export default class DialogStore {
     accessor userCount: number;
     accessor participantElectronDialogContainer: HTMLElement | null;
     accessor chatRoomState: FcrChatRoomConnectionState;
-    accessor currentDialogBounds: Partial<Rectangle>;
+    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;
-    constructor({ uiEventStore, userInfo, userControl, chatRoomControl, deviceStore, streamControl, remoteVideoRenderManager, }: {
-        uiEventStore: FcrUIEventStore;
-        userInfo: FcrUserInfo;
-        securityStore: FcrSecurityStore;
+    get deviceStore(): FcrUIDeviceProvider;
+    get remoteVideoRenderManager(): FcrUIRemoteVideoRenderProvider;
+    get localVideoRenderProvider(): FcrUILocalVideoRenderProvider;
+    get waitingRoomState(): boolean;
+    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;
-        streamControl: FcrStreamControl;
-        deviceStore: FcrDeviceStore;
-        remoteVideoRenderManager: FcrRemoteVideoRenderManager;
+        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;
-    closeInterpreterDialog(): void;
-    setCurrentShareId(id: string, type: AgoraRtcScreenCaptureType): void;
-    getSharingWorkArea(): Promise<{
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-        displayId: number;
-        availTop: number;
-    } | undefined>;
+    closeDialogByKey(dialogKey: FcrUIDialogKey): void;
     closeSystemPreferenceDialog(): void;
     closeChatFromDialog(): void;
-    closeWhiteboardDialog(): void;
-    closeDialogChat(): void;
     moveChatFromDialogToAside(): void;
-    closeLiveStreamingDialog(): void;
-    closeConnectionDialog(isUserClose?: boolean): void;
-    closeInviteDialog(): void;
+    closeConnectionDialog(): boolean;
+    closeParticipantDialog(): void;
     moveParticipantFromDialogToAside(): void;
-    moveToMainRoomAllMember(isOperate: boolean): void;
-    closeWaitingRoomDialog(): void;
-    closeRemoveAdmitWaitingRoomDialog(dialogKey: DialogKey): void;
     release(): void;
     resizeVideoWindow(width: number, height: number): void;
-    private _setDialogBounds;
+    updateCurrentShareContent(payload: CurrentShareScreenTypes): void;
     private _handleDialogEvent;
     private _handleConnectionUpdated;
     private _hanleAllUserCountUpdated;