fcr-ui-scene 3.7.4 → 3.7.6

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

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SubWindowView = void 0;
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.date.to-string.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.regexp.to-string.js");
 var _mobxReact = require("mobx-react");
-var _useElectron = require("../dialog/hooks/useElectron");
 var _react = require("react");
 var _store = require("./store");
 var _type = require("fcr-core/lib/type");
@@ -20,61 +23,73 @@ var _type2 = require("./type");
 var _progress = _interopRequireDefault(require("../components/control-bar/components/progress"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _portal = require("../components/leave-meeting/portal");
+var _videoTrackRenderContext = require("../../shared-context/video-track-render-context");
 var _jsxRuntime = require("react/jsx-runtime");
 var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (props) {
   var renderScreenShareControl = props.renderScreenShareControl;
-  var _useContext = (0, _react.useContext)(_useElectron.DialogInstanceContext),
-    continueClose = _useContext.continueClose,
-    baseUrl = _useContext.baseUrl,
-    interceptedClose = _useContext.interceptedClose,
-    setInterceptedClose = _useContext.setInterceptedClose,
-    newRendererWindow = _useContext.newRendererWindow;
-  var _useContext2 = (0, _react.useContext)(_store.SecondaryWindowStoreContext),
-    joinSuccess = _useContext2.joinSuccess,
-    currentUser = _useContext2.currentUser,
-    isHost = _useContext2.isHost,
-    canWriteBoard = _useContext2.canWriteBoard,
-    videoWindowData = _useContext2.videoWindowData,
-    toolbarState = _useContext2.toolbarState,
-    scalValue = _useContext2.scalValue,
-    currentTheme = _useContext2.currentTheme,
-    secondaryWindowContentType = _useContext2.secondaryWindowContentType,
-    connectionState = _useContext2.connectionState,
-    showLoading = _useContext2.showLoading,
-    isScreenShare = _useContext2.isScreenShare,
-    isBoardShare = _useContext2.isBoardShare,
-    annotationHasStart = _useContext2.annotationHasStart,
-    isZoomMinimum = _useContext2.isZoomMinimum,
-    isZoomMaxmum = _useContext2.isZoomMaxmum,
-    isCurrentOriginal = _useContext2.isCurrentOriginal,
-    isAspectRatioPreserved = _useContext2.isAspectRatioPreserved,
-    isShowToolbar = _useContext2.isShowToolbar,
-    setOriginScalc = _useContext2.setOriginScalc,
-    zoomIn = _useContext2.zoomIn,
-    zoomOut = _useContext2.zoomOut,
-    fullContainer = _useContext2.fullContainer,
-    setTheme = _useContext2.setTheme,
-    setScaleValue = _useContext2.setScaleValue,
-    handleIframeLoad = _useContext2.handleIframeLoad,
-    setControlEnable = _useContext2.setControlEnable,
-    setWhiteboardTool = _useContext2.setWhiteboardTool,
-    setShowLoading = _useContext2.setShowLoading,
-    setCommonColors = _useContext2.setCommonColors,
-    saveWhiteboardDraft = _useContext2.saveWhiteboardDraft,
-    setProgress = _useContext2.setProgress,
-    log = _useContext2.log,
-    setSpeakerViewSize = _useContext2.setSpeakerViewSize;
+  var store = (0, _react.useContext)(_store.SecondaryWindowStoreContext);
+  var joinSuccess = store.joinSuccess,
+    isHost = store.isHost,
+    canWriteBoard = store.canWriteBoard,
+    videoWindowData = store.videoWindowData,
+    toolbarState = store.toolbarState,
+    scalValue = store.scalValue,
+    currentTheme = store.currentTheme,
+    secondaryWindowContentType = store.secondaryWindowContentType,
+    connectionState = store.connectionState,
+    showLoading = store.showLoading,
+    isScreenShare = store.isScreenShare,
+    isBoardShare = store.isBoardShare,
+    annotationHasStart = store.annotationHasStart,
+    isZoomMinimum = store.isZoomMinimum,
+    isZoomMaxmum = store.isZoomMaxmum,
+    isCurrentOriginal = store.isCurrentOriginal,
+    isAspectRatioPreserved = store.isAspectRatioPreserved,
+    isShowToolbar = store.isShowToolbar,
+    isActive = store.isActive,
+    baseUrl = store.baseUrl,
+    iframeLoaded = store.iframeLoaded,
+    setOriginScalc = store.setOriginScalc,
+    zoomIn = store.zoomIn,
+    zoomOut = store.zoomOut,
+    fullContainer = store.fullContainer,
+    setTheme = store.setTheme,
+    setScaleValue = store.setScaleValue,
+    handleIframeLoad = store.handleIframeLoad,
+    setControlEnable = store.setControlEnable,
+    setWhiteboardTool = store.setWhiteboardTool,
+    setShowLoading = store.setShowLoading,
+    setCommonColors = store.setCommonColors,
+    saveWhiteboardDraft = store.saveWhiteboardDraft,
+    setProgress = store.setProgress,
+    setSpeakerViewSize = store.setSpeakerViewSize,
+    interceptedClose = store.interceptedClose,
+    setInterceptedClose = store.setInterceptedClose,
+    videoRenderContext = store.videoRenderContext,
+    isSharingWithAudio = store.isSharingWithAudio;
   var videoWindowContainer = (0, _react.useRef)(null);
-  var handleClick = function handleClick() {
-    setInterceptedClose(false);
-  };
   (0, _react.useEffect)(function () {
-    log("[SubWindowView]: baseUrl: ".concat(baseUrl));
-    newRendererWindow.addEventListener('click', handleClick);
+    if (!interceptedClose) return;
+    if (!videoWindowContainer.current) {
+      console.error('videoWindowContainer is null');
+      return;
+    }
+    var ownerDocument = videoWindowContainer.current.ownerDocument;
+    var container = ownerDocument.getElementById('fcr-action-bar--leave-meeting-portal');
+    var handleClickOutside = function handleClickOutside(event) {
+      if (!container) {
+        console.error('leave-meeting container is null');
+        return;
+      }
+      if (!container.contains(event.target)) {
+        setInterceptedClose(false);
+      }
+    };
+    ownerDocument.addEventListener('mousedown', handleClickOutside);
     return function () {
-      newRendererWindow.removeEventListener('click', handleClick);
+      ownerDocument.removeEventListener('mousedown', handleClickOutside);
     };
-  }, []);
+  }, [interceptedClose]);
   (0, _react.useLayoutEffect)(function () {
     var _videoWindowContainer;
     var rect = (_videoWindowContainer = videoWindowContainer.current) === null || _videoWindowContainer === void 0 ? void 0 : _videoWindowContainer.getBoundingClientRect();
@@ -90,7 +105,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
   var content = null;
   if (isBoardShare) {
     content = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [showLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
+      children: [showLoading && !iframeLoaded && /*#__PURE__*/(0, _jsxRuntime.jsx)(_loading.Loading, {
         joined: joinSuccess,
         connectionState: connectionState,
         canOperate: canWriteBoard,
@@ -106,44 +121,62 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
           setControlEnable(enable);
         },
         setTheme: setTheme,
-        ownerUser: {
-          userId: videoWindowData.userId,
-          userName: videoWindowData.userName
-        },
-        currentUser: currentUser,
         canWriteBoard: canWriteBoard,
         controlEnabled: toolbarState.controlEnable,
         isHost: isHost,
         currentTheme: currentTheme,
         sharingType: 'whiteboard',
+        ownerUserName: videoWindowData.userName,
+        isMyBoard: isActive && store.isMyBoard,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
           ref: handleIframeLoad,
           allow: "webview",
           src: "".concat(baseUrl, "/whiteboard.html?type=whiteboard"),
           style: {
             width: '100vw',
-            height: '100vh',
-            minWidth: '100vw',
-            minHeight: '100vh'
+            height: 'calc(100vh - 28px)'
           }
         })
       })]
     });
   } else {
     content = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
-        onRemovePin: function onRemovePin() {},
-        canShowSpeakerSpotlight: true,
-        width: Infinity,
-        height: Infinity,
-        videoRenderMode: _type.FcrVideoRenderMode.FIT,
-        videoStreamType: _type.FcrVideoStreamType.HIGH_STREAM,
-        windowData: videoWindowData,
-        showAvatar: true,
-        isVideoSuspended: false,
-        enableZoom: true,
-        scalcValue: scalValue,
-        onScaleChange: setScaleValue
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_videoTrackRenderContext.FcrVideoTrackRenderContext.Provider, {
+        value: videoRenderContext,
+        children: [isScreenShare && /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.WhiteboardControlbar, {
+          ownerUserName: videoWindowData.userName,
+          sharingType: 'annotation',
+          onZoomIn: function onZoomIn() {
+            zoomIn();
+            return isZoomMaxmum;
+          },
+          onZoomOut: function onZoomOut() {
+            zoomOut();
+            return isZoomMinimum;
+          },
+          onAdaptive: function onAdaptive() {
+            fullContainer();
+            return isAspectRatioPreserved;
+          },
+          onOrigin: function onOrigin() {
+            setOriginScalc();
+            return isCurrentOriginal;
+          },
+          isSharingWithAudio: isSharingWithAudio
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
+          onRemovePin: function onRemovePin() {},
+          canShowSpeakerSpotlight: true,
+          width: Infinity,
+          height: Infinity,
+          videoRenderMode: _type.FcrVideoRenderMode.FIT,
+          videoStreamType: _type.FcrVideoStreamType.HIGH_STREAM,
+          windowData: videoWindowData,
+          showAvatar: true,
+          isVideoSuspended: false,
+          enableZoom: true,
+          scalcValue: scalValue,
+          onScaleChange: setScaleValue
+        })]
       }), secondaryWindowContentType === _type2.FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION && annotationHasStart && /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
         ref: handleIframeLoad,
         allow: "webview",
@@ -189,7 +222,6 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       top: isScreenShare ? 28 : 0
     },
     children: [interceptedClose && /*#__PURE__*/(0, _jsxRuntime.jsx)(_portal.LeaveMeetingPortal, {
-      onLeave: continueClose,
       setPopoverOpened: function setPopoverOpened() {
         return setInterceptedClose(false);
       }
@@ -228,7 +260,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       setStrokeColor: function setStrokeColor(color) {
         setWhiteboardTool({
           action: _type2.WhiteboardToolAction.COLOR,
-          tool: color
+          tool: color.toString()
         });
       },
       undo: function undo() {

package/lib/modules/setting/audio-settings/audio-settings.js

@@ -33,17 +33,17 @@ var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _volumeIndicator = require("agora-ui-foundation/lib/components/volume-indicator");
 var _slider = require("agora-ui-foundation/lib/components/slider");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _useNamespace = require("../common/useNamespace");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _microphoneDetection = require("../../device-pretest/audio-preview/microphone-detection");
 var _speakerDetection = require("../../device-pretest/audio-preview/speaker-detection");
 var _mobxReact = require("mobx-react");
-var _store = require("../store");
+var _store = require("../store.base");
 var _constant = require("../../../utilities/constant");
 var _env = require("agora-foundation/lib/utilities/env");
 var _type = require("../../../type");
 var _view = require("../view");
 require("./index.css");
+var _useNamespace = require("../../../utilities/useNamespace");
 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; }
@@ -136,6 +136,9 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
         })]
       }), (0, _env.isElectron)() && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: ns.e('form-item'),
+        onMouseDown: function onMouseDown(e) {
+          return e.stopPropagation();
+        },
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: ns.e('form-label'),
           children: t('fmt_setting_label_volume')
@@ -174,20 +177,6 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
           value: microphoneVolumeLevel,
           barCount: 13
         })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: ns.e('form-item'),
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: ns.e('form-label'),
-          children: t('fmt_internalsetting_label_inputvolume')
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_slider.FcrSlider, {
-          value: microphoneVolume,
-          min: 0,
-          max: 400,
-          step: 1,
-          onChange: setMicrophoneVolume,
-          draggableDom: containerDom
-          // disabled={setting.autoAdjustmentMicrophoneVolume}
-        })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: ns.em('checkbox-wrapper', 'bordered'),
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {

package/lib/modules/setting/general-settings/general-settings.js

@@ -7,16 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = exports.GeneralSettings = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.object.to-string.js");
 var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _useNamespace = require("../common/useNamespace");
 require("./index.css");
 var _mobxReact = require("mobx-react");
-var _store = require("../store");
+var _store = require("../store.base");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _radio = require("agora-ui-foundation/lib/components/radio");
 var _view = require("../view");
+var _useNamespace = require("../../../utilities/useNamespace");
+var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
 var Section = (0, _mobxReact.observer)(function (_ref) {
   var children = _ref.children,
@@ -77,16 +79,19 @@ var GeneralSettings = exports.GeneralSettings = (0, _mobxReact.observer)(functio
         });
       }
     }
-  }, {
-    label: t('fmt_settings_general_label_dual_display'),
-    tooltip: t('fmt_settings_tips_dual_display'),
-    checked: setting.isDualDisplayMode,
-    onChange: function onChange(isDualDisplayMode) {
-      setSetting({
-        isDualDisplayMode: isDualDisplayMode
-      });
-    }
   }];
+  if ((0, _env.isElectron)()) {
+    layoutSettingList.push({
+      label: t('fmt_settings_general_label_dual_display'),
+      tooltip: t('fmt_settings_tips_dual_display'),
+      checked: setting.isDualDisplayMode,
+      onChange: function onChange(isDualDisplayMode) {
+        setSetting({
+          isDualDisplayMode: isDualDisplayMode
+        });
+      }
+    });
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: ns.b(),
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Section, {

package/lib/modules/setting/index.css

@@ -34,6 +34,7 @@
   width: 100%;
   min-width: 580px;
   height: 100%;
+  cursor: default;
 }
 
 .fcr-device-settings__nav {

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

@@ -1,32 +1,13 @@
-import { FcrUINode, UIModule } from '../../base';
-import { FcrStreamControl, FcrUserControl } from 'fcr-core';
-import { FcrUIDeviceProvider } from '../../providers/device-provider';
-import { FcrUIRoomProvider } from '../../providers/room-provider';
-import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
-import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
-import { FcrUIMonitorProvider } from '../../providers/monitor-provider';
+import { FcrUINodeEvent, UIModule } from '../../base';
+import { SettingStoreBase } from './store.base';
 import './index.css';
-import { FcrUIMessageProvider } from '../../providers/message-provider';
-import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
-import { FcrUIDialogProvider } from '../../providers/dialog-provider';
-import { FcrUILocalStorageProviderImpl } from '../../providers/local-storage-provider';
+import { DeviceSettingDialogConfig } from './type';
 export declare class SettingUIModule extends UIModule {
-    private _store?;
-    deviceProvider?: FcrUIDeviceProvider;
-    monitorProvider?: FcrUIMonitorProvider;
-    userControl?: FcrUserControl;
-    streamControl?: FcrStreamControl;
-    eventProvider?: FcrUIEventProvider;
-    sharedConfigDataSource?: FcrUISharedConfigDataSource;
-    sharedLayoutDataSource?: FcrUISharedLayoutDataSource;
-    messageProvider?: FcrUIMessageProvider;
-    dialogProvider?: FcrUIDialogProvider;
-    sharedSettingDataSource?: FcrUISharedSettingDataSource;
-    localStorageProvider?: FcrUILocalStorageProviderImpl;
-    roomProvider?: FcrUIRoomProvider;
-    constructor(parentNode: FcrUINode, rootNode: FcrUINode);
+    private _store;
+    private _roomObserver;
+    get store(): SettingStoreBase;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
-    getComponent(): import("react/jsx-runtime").JSX.Element;
+    onNodeReceivedEvent(event: FcrUINodeEvent): void;
+    getComponent(params: DeviceSettingDialogConfig): import("react/jsx-runtime").JSX.Element;
 }

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

@@ -13,7 +13,7 @@
 // import { FcrUIEventProviderImpl } from '../../providers/event-provider';
 // import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
 // import { FcrCoreEngine } from 'fcr-core';
-// import { FcrUISharedConfigDataSourceImpl } from '../../shared-data-source/config';
+// import { FcrUISharedConfigDataSourceImpl } from '../../shared-data/config';
 
 // const App = hot(() => null);
 // ReactDOM.render(<App />, document.querySelector('#root')!);
@@ -25,15 +25,15 @@
 //   }
 
 //   private preRegistDependency() {
-//     registerDependency('mediaProvider');
-//     registerDependency('eventProvider');
-//     registerDependency('deviceProvider');
-//     registerDependency('roomProvider');
-//     registerDependency('mainRoomControlProvider');
-//     registerDependency('waitingRoomControlProvider');
-//     registerDependency('currentRoomControlProvider');
-//     registerDependency('monitorProvider');
-//     registerDependency('sharedConfigDataSource');
+//     mediaProvider');
+//     eventProvider');
+//     deviceProvider');
+//     roomProvider');
+//     mainRoomControlProvider');
+//     waitingRoomControlProvider');
+//     currentRoomControlProvider');
+//     monitorProvider');
+//     sharedConfigDataSource');
 //   }
 
 //   bootstrap(engine: FcrCoreEngine, mainRoomControl: FcrMainRoomControl) {

package/lib/modules/setting/index.js

@@ -3,8 +3,6 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -19,7 +17,6 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
 require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
@@ -36,8 +33,6 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.js");
-require("core-js/modules/esnext.weak-map.delete-all.js");
-require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -45,6 +40,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SettingUIModule = void 0;
+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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -55,12 +53,16 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _decorator = require("agora-foundation/lib/decorator");
 var _base = require("../../base");
 var _view = require("./view");
-var _store = _interopRequireWildcard(require("./store"));
+var _store = require("./store.base");
+var _store2 = _interopRequireDefault(require("./store.electron"));
+var _store3 = _interopRequireDefault(require("./store.browser"));
 require("./index.css");
+var _env = require("agora-foundation/lib/utilities/env");
+var _type = require("../../type");
+var _objectManager = require("../../object-manager");
 var _jsxRuntime = require("react/jsx-runtime");
 var _SettingUIModule;
 var _initProto;
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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; })(); }
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
@@ -69,45 +71,70 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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 SettingUIModule = exports.SettingUIModule = /*#__PURE__*/function (_UIModule) {
-  function SettingUIModule(parentNode, rootNode) {
+  function SettingUIModule() {
     var _this;
     (0, _classCallCheck2["default"])(this, SettingUIModule);
-    _this = _callSuper(this, SettingUIModule, [parentNode, rootNode]);
-    (0, _defineProperty2["default"])(_this, "_store", void _initProto(_this));
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, SettingUIModule, [].concat(args));
+    (0, _defineProperty2["default"])(_this, "_store", (_initProto(_this), null));
+    (0, _defineProperty2["default"])(_this, "_roomObserver", {
+      onRoomClosed: function onRoomClosed() {
+        _this.store.handleExitRoom();
+      },
+      onExitRoom: function onExitRoom() {
+        _this.store.handleExitRoom();
+      },
+      onRoutingChanged: function onRoutingChanged() {
+        _this.store.handleExitRoom(true);
+        _this.store.handleJoinRoom();
+      }
+    });
     return _this;
   }
   (0, _inherits2["default"])(SettingUIModule, _UIModule);
   return (0, _createClass2["default"])(SettingUIModule, [{
+    key: "store",
+    get: function get() {
+      if (!this._store) {
+        throw new Error('SettingStore is not initialized');
+      }
+      return this._store;
+    }
+  }, {
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      if (this.deviceProvider && this.eventProvider && this.monitorProvider && this.sharedConfigDataSource && this.messageProvider && this.dialogProvider && this.sharedSettingDataSource && this.sharedLayoutDataSource) {
-        this._store = new _store["default"]({
-          eventProvider: this.eventProvider,
-          monitorProvider: this.monitorProvider,
-          deviceProvider: this.deviceProvider,
-          roomProvider: this.roomProvider,
-          sharedConfigDataSource: this.sharedConfigDataSource,
-          sharedLayoutDataSource: this.sharedLayoutDataSource,
-          messageProvider: this.messageProvider,
-          sharedSettingDataSource: this.sharedSettingDataSource,
-          dialogProvider: this.dialogProvider
-        });
-      }
+      var args = {
+        objectManager: this.objectManager
+      };
+      this._store = (0, _env.isElectron)() ? new _store2["default"](args) : new _store3["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() {
-      if (!this._store) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+    key: "onNodeReceivedEvent",
+    value: function onNodeReceivedEvent(event) {
+      if (event.type === _type.FcrUIGlobalNodeEventType.SCENE_MOUNTED) {
+        var roomProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
+        roomProvider.addObserver(this._roomObserver);
       }
+      if (event.type === _type.FcrUIGlobalNodeEventType.SCENE_UNMOUNTED) {
+        if (this.objectManager.hasObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER)) {
+          var _roomProvider = this.objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ROOM_PROVIDER);
+          _roomProvider.removeObserver(this._roomObserver);
+        }
+      }
+    }
+  }, {
+    key: "getComponent",
+    value: function getComponent(params) {
+      this.store.setDialogConfig(params);
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
-        value: this._store,
+        value: this.store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.DeviceSettingsView, {})
       });
     }

package/lib/modules/setting/minutes-settings/minutes-settings.js

@@ -11,12 +11,12 @@ require("core-js/modules/es.object.to-string.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _useNamespace = require("../common/useNamespace");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _mobxReact = require("mobx-react");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 require("./index.css");
+var _useNamespace = require("../../../utilities/useNamespace");
 var _jsxRuntime = require("react/jsx-runtime");
 var MinutesSettings = exports.MinutesSettings = (0, _mobxReact.observer)(function () {
   var ns = (0, _useNamespace.useNamespace)('minutes-settings');

package/lib/modules/setting/state/index.js

@@ -32,15 +32,15 @@ require("core-js/modules/esnext.iterator.reduce.js");
 var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobxReact = require("mobx-react");
-var _store = require("../store");
+var _store = require("../store.base");
 var _tabs = require("agora-ui-foundation/lib/components/tabs");
 require("./index.css");
-var _useNamespace = require("../common/useNamespace");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _constant = require("../../../utilities/constant");
 var _env = require("agora-foundation/lib/utilities/env");
+var _useNamespace = require("../../../utilities/useNamespace");
 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; }
@@ -184,7 +184,7 @@ var State = exports.State = (0, _mobxReact.observer)(function () {
         title: t('fmt_qualitystatistics_label_video'),
         data: videoData
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(DataCard, {
-        title: t('fmt_screenshare_label_screenshare'),
+        title: t('fmt_screenshare_controlbar_security_list_participant_screenshare'),
         data: screenShareData
       })]
     })]