fcr-ui-scene 3.6.2 → 3.6.4-rc.1

package/lib/providers/widget-provider.js

@@ -29,7 +29,6 @@ require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.map.delete-all.js");

package/lib/scenes/main-scene.js

@@ -48,8 +48,6 @@ require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.entries.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.filter.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -176,7 +174,6 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var devicePrivilegeProvider = new _devicePrivilegeProvider.FcrUIDevicePrivilegeProviderImpl(privilegeControl, streamControl, userControl, deviceProvider, messageProvider);
     var sharedInterpreterDataSource = new _interpreter3.FcrUISharedInterpreterDataSourceImpl(interpreterControl, userControl);
     var localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
-    var localVideoRenderProvider = new _rendererProvider.FcrUILocalVideoRenderProviderImpl(deviceProvider);
     var remoteVideoRenderProvider = new _rendererProvider.FcrUIRemoteVideoRenderProviderImpl(mainRoomControl.getStreamControl());
     var mainRoomControlProvider = new _roomProvider.FcrUIMainRoomControlProviderImpl(mainRoomControl, eventProvider, messageProvider, dialogProvider, sharedInterpreterDataSource);
     var privilegeProvider = mainRoomControlProvider.privilegeProvider;
@@ -196,7 +193,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
     var monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(engine.getMonitorControl());
     var chatProvider = new _chatProvider.FcrUIChatProviderImpl(currentRoomControlProvider.currentRoomControl, roomProvider);
-    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl);
+    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource);
     var sharedWaitingRoomDataSource = new _waitingRoom.FcrUISharedWaitingRoomDataSourceImpl(roomProvider, eventProvider);
     var phoneAudioConnectorProvider = new _phoneAudioProvider.FcrUIPhoneAudioConnectorProviderImpl({
       roomControl: mainRoomControl,
@@ -211,6 +208,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
     var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
     var annotationProvider = new _annotationProvider.FcrUIAnnotationProviderImpl(dialogProvider, sharingProvider, sharedMemberDataSource, sharedVideoWindowDataSource, screenShareProvider, deviceProvider);
     var sharedSecurityDataSource = new _securityData.FcrUISecuritySharedDataSourceImpl(privilegeProvider, sharedMemberDataSource);
+    var localVideoRenderProvider = new _rendererProvider.FcrUILocalVideoRenderProviderImpl(deviceProvider, sharedScreenShareSharedDataSource);
     _this.messageProvider = messageProvider;
     _this.dialogProvider = dialogProvider;
     _this.eventProvider = eventProvider;
@@ -461,8 +459,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
           key: _constant.FcrUIDialogKey.CONTROL_BAR,
           component: function component(props) {
             return (0, _env.isElectron)() ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar2.ControlBarDialog, {
-              module: controlbarUIModule,
-              params: props.params
+              module: controlbarUIModule
             }, "ControlBar") : shareScreenModule.getComponent();
           }
         }, {
@@ -493,17 +490,17 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmLeaveMeeting.ConfirmLeaveMeetingDialog, {
               title: (0, _i18n.transI18n)('fmt_actionbar_labels_endmeeting'),
               onOk: /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-                return _regenerator["default"].wrap(function _callee$(_context) {
+                return _regenerator["default"].wrap(function (_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
                       _this3.roomProvider.setIsSelfEndMeeting(true);
-                      _context.next = 3;
+                      _context.next = 1;
                       return _this3.mainRoomControlProvider.mainRoomControl.close();
-                    case 3:
+                    case 1:
                       _this3.eventProvider.sendEvent(_constant.FcrUIAction.CLOSE_DIALOG, {
                         dialogKey: _constant.FcrUIDialogKey.LEAVE_MEETING
                       });
-                    case 4:
+                    case 2:
                     case "end":
                       return _context.stop();
                   }
@@ -587,7 +584,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
       var _runSettingConfig2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this4 = this;
         var deviceProvider, settingConfig, showToast, allowJoinWithCloseVideo, hasOpenCameraPrivilege, isJoinWithCloseVideo, allowJoinWithMuteAudio, hasOpenMicrophonePrivilege, isJoinWithMuteAudio;
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
+        return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               deviceProvider = this.deviceProvider;
@@ -600,9 +597,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
                 });
               };
               allowJoinWithCloseVideo = this.privilegeProvider.allowJoinWithMutedVideo();
-              _context2.next = 7;
+              _context2.next = 1;
               return this.devicePrivilegeProvider.hasOpenCameraPrivilege();
-            case 7:
+            case 1:
               hasOpenCameraPrivilege = _context2.sent;
               if (this.deviceProvider.ifNeedExecuteOpenCamera()) {
                 isJoinWithCloseVideo = allowJoinWithCloseVideo && !hasOpenCameraPrivilege;
@@ -619,9 +616,9 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
                 }
               }
               allowJoinWithMuteAudio = this.privilegeProvider.allowJoinWithMuteAudio();
-              _context2.next = 12;
+              _context2.next = 2;
               return this.devicePrivilegeProvider.hasOpenMicrophonePrivilege();
-            case 12:
+            case 2:
               hasOpenMicrophonePrivilege = _context2.sent;
               if (this.deviceProvider.ifNeedExecuteAutoConnectAudio()) {
                 isJoinWithMuteAudio = allowJoinWithMuteAudio && !hasOpenMicrophonePrivilege && this.deviceProvider.shouldEnableMicBeforeSession;
@@ -645,7 +642,7 @@ var FcrMainUIScene = exports.FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIS
                   });
                 });
               }
-            case 15:
+            case 3:
             case "end":
               return _context2.stop();
           }

package/lib/scenes/waiting-scene.js

@@ -76,7 +76,6 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     var devicePrivilegeProvider = new _devicePrivilegeProvider.FcrUIDevicePrivilegeProviderImpl(privilegeControl, streamControl, userControl, deviceProvider, messageProvider);
     var sharedWaitingRoomDataSource = new _waitingRoom.FcrUISharedWaitingRoomDataSourceImpl(roomProvider, eventProvider);
     var localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
-    var localVideoRenderProvider = new _rendererProvider.FcrUILocalVideoRenderProviderImpl(deviceProvider);
     var waitingRoomControlProvider = new _roomProvider.FcrUIWaitingRoomControlProviderImpl(roomProvider, eventProvider);
     var abilityControl = waitingRoomControl.getAbilityControl();
     var abilityProvider = new _abilityProvider.FcrUIAbilityProviderImpl(abilityControl);
@@ -92,10 +91,11 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
     var deviceStreamProvider = new _deviceStreamProvider.FcrUIDeviceStreamProviderImpl(waitingRoomControl, deviceProvider, messageProvider, dialogProvider, devicePrivilegeProvider, sharedDevicePrivilegeDataSource);
     var sharedChatDataSource = new _chatData.FcrUISharedChatDataSourceImpl(chatProvider);
     var sharingControl = waitingRoomControl.getSharingControl();
-    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl);
+    var sharingProvider = new _sharingProvider.FcrUISharingProviderImpl(sharingControl, sharedScreenShareSharedDataSource);
     var sharedInterpreterDataSource = new _interpreter.FcrUISharedInterpreterDataSourceImpl();
     var sharedMemberDataSource = new _memberData.FcrUIMemberSharedDataSourceImpl(userControl, streamControl, sharedScreenShareSharedDataSource);
     var screenShareProvider = new _screenShareProvider.FcrUIScreenShareProviderImpl(deviceProvider, eventProvider, roomProvider, sharingProvider, sharedScreenShareSharedDataSource, sharedMemberDataSource);
+    var localVideoRenderProvider = new _rendererProvider.FcrUILocalVideoRenderProviderImpl(deviceProvider, sharedScreenShareSharedDataSource);
     _this.eventProvider = eventProvider;
     _this.devicePrivilegeProvider = devicePrivilegeProvider;
     _this.sharedSettingDataSource = sharedSettingDataSource;
@@ -212,7 +212,7 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
       var _runSettingConfig2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var _this3 = this;
         var deviceProvider, settingConfig;
-        return _regenerator["default"].wrap(function _callee$(_context) {
+        return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               deviceProvider = this.deviceProvider;
@@ -235,7 +235,7 @@ var FcrWaitingUIScene = exports.FcrWaitingUIScene = /*#__PURE__*/function (_FcrB
                   });
                 });
               }
-            case 6:
+            case 1:
             case "end":
               return _context.stop();
           }

package/lib/shared-data-source/chat-data.js

@@ -19,8 +19,6 @@ 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.async-iterator.for-each.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");

package/lib/shared-data-source/config.d.ts

@@ -1,4 +1,3 @@
-import { FcrUILocalStorageProvider } from '../providers/local-storage-provider';
 import { FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISettingConfig } from '../type';
 export interface FcrUISharedConfigDataSource {
     get settingConfig(): FcrUISettingConfig;
@@ -6,15 +5,12 @@ export interface FcrUISharedConfigDataSource {
     get sceneConfig(): FcrUISceneConfig;
 }
 export declare class FcrUISharedConfigDataSourceImpl implements FcrUISharedConfigDataSource {
-    private _localStorageProvider;
     settingConfig: FcrUISettingConfig;
     creatorConfig: FcrUISceneCreatorConfig;
     sceneConfig: FcrUISceneConfig;
-    constructor({ settingConfig, creatorConfig, sceneConfig, localStorageProvider, }: {
+    constructor({ settingConfig, creatorConfig, sceneConfig, }: {
         settingConfig: FcrUISettingConfig;
         creatorConfig: FcrUISceneCreatorConfig;
         sceneConfig?: FcrUISceneConfig;
-        localStorageProvider: FcrUILocalStorageProvider;
     });
-    private _initConfig;
 }

package/lib/shared-data-source/config.js

@@ -1,92 +1,22 @@
 "use strict";
 
-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");
-require("core-js/modules/es.date.to-primitive.js");
-require("core-js/modules/es.function.bind.js");
-require("core-js/modules/es.function.name.js");
-require("core-js/modules/es.map.js");
-require("core-js/modules/es.number.constructor.js");
-require("core-js/modules/es.object.create.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.to-string.js");
-require("core-js/modules/es.string.iterator.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");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-require("core-js/modules/esnext.map.merge.js");
-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/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUISharedConfigDataSourceImpl = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _mobx = require("mobx");
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _base = require("../base");
-var _store = require("../modules/setting/store");
-var _FcrUISharedConfigDataSourceImpl;
-var _initProto, _initConfigDecs, _ref;
-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)]; } }; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-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; }
-_ref = (_initConfigDecs = [_mobx.action, _mobx.action.bound], "_localStorageProvider");
-var FcrUISharedConfigDataSourceImpl = exports.FcrUISharedConfigDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUISharedConfigDataSourceImpl(_ref2) {
-    var settingConfig = _ref2.settingConfig,
-      creatorConfig = _ref2.creatorConfig,
-      _ref2$sceneConfig = _ref2.sceneConfig,
-      sceneConfig = _ref2$sceneConfig === void 0 ? {} : _ref2$sceneConfig,
-      localStorageProvider = _ref2.localStorageProvider;
-    (0, _classCallCheck2["default"])(this, FcrUISharedConfigDataSourceImpl);
-    (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
-    this.settingConfig = settingConfig;
-    this.creatorConfig = creatorConfig;
-    this.sceneConfig = sceneConfig;
-    this._localStorageProvider = localStorageProvider;
-    this._initConfig();
-  }
-  return (0, _createClass2["default"])(FcrUISharedConfigDataSourceImpl, [{
-    key: "_initConfig",
-    value: function _initConfig() {
-      var localSetting = this._localStorageProvider.read(_store.SETTING_KEY);
-      if (localSetting) {
-        var _localSetting$cameraE, _localSetting$microph, _localSetting$autoCon;
-        this.settingConfig.media = {
-          cameraExpectedOff: (_localSetting$cameraE = localSetting.cameraExpectedOff) !== null && _localSetting$cameraE !== void 0 ? _localSetting$cameraE : this.settingConfig.media.cameraExpectedOff,
-          microphoneExpectedOff: (_localSetting$microph = localSetting.microphoneExpectedOff) !== null && _localSetting$microph !== void 0 ? _localSetting$microph : this.settingConfig.media.microphoneExpectedOff,
-          autoConnectAudio: (_localSetting$autoCon = localSetting.autoConnectAudio) !== null && _localSetting$autoCon !== void 0 ? _localSetting$autoCon : this.settingConfig.media.autoConnectAudio
-        };
-      }
-    }
-  }]);
-}();
-_FcrUISharedConfigDataSourceImpl = FcrUISharedConfigDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfigDataSourceImpl, [[_initConfigDecs, 18, "_initConfig"]], []).e, 1);
-_initProto = _applyDecs$e[0];
+var FcrUISharedConfigDataSourceImpl = exports.FcrUISharedConfigDataSourceImpl = /*#__PURE__*/(0, _createClass2["default"])(function FcrUISharedConfigDataSourceImpl(_ref) {
+  var settingConfig = _ref.settingConfig,
+    creatorConfig = _ref.creatorConfig,
+    _ref$sceneConfig = _ref.sceneConfig,
+    sceneConfig = _ref$sceneConfig === void 0 ? {} : _ref$sceneConfig;
+  (0, _classCallCheck2["default"])(this, FcrUISharedConfigDataSourceImpl);
+  this.settingConfig = settingConfig;
+  this.creatorConfig = creatorConfig;
+  this.sceneConfig = sceneConfig;
+});
 (0, _base.registerDependency)('sharedConfigDataSource');

package/lib/shared-data-source/interpreter.js

@@ -30,8 +30,6 @@ require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.map.js");

package/lib/shared-data-source/layout-data.js

@@ -20,8 +20,6 @@ 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.async-iterator.for-each.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
@@ -83,7 +81,6 @@ var _D = /*#__PURE__*/new WeakMap();
 _ref = (_setLayoutSizeDecs = [_mobx.action, _mobx.action.bound], "_layoutSize");
 var FcrUISharedLayoutDataSourceImpl = exports.FcrUISharedLayoutDataSourceImpl = /*#__PURE__*/function () {
   function FcrUISharedLayoutDataSourceImpl(sharedConfigDataSource) {
-    var _defaultVideoGalleryS;
     (0, _classCallCheck2["default"])(this, FcrUISharedLayoutDataSourceImpl);
     _classPrivateFieldInitSpec(this, _A, (_initProto(this), _init__layoutSize(this)));
     _classPrivateFieldInitSpec(this, _B, _init_asideLayout(this));
@@ -94,7 +91,7 @@ var FcrUISharedLayoutDataSourceImpl = exports.FcrUISharedLayoutDataSourceImpl =
     if (defaultVideoGallerySize) {
       defaultVideoGallerySize = Math.min(Math.max(defaultVideoGallerySize, 16), 25);
     }
-    this._layoutSize = (_defaultVideoGalleryS = defaultVideoGallerySize) !== null && _defaultVideoGalleryS !== void 0 ? _defaultVideoGalleryS : 16;
+    this._layoutSize = defaultVideoGallerySize !== null && defaultVideoGallerySize !== void 0 ? defaultVideoGallerySize : 16;
     this.asideLayout = {
       participant: false,
       chat: false

package/lib/shared-data-source/member-data.js

@@ -39,10 +39,6 @@ require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.find.js");

package/lib/shared-data-source/pin-data.js

@@ -42,7 +42,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.FcrUISharedPinDataSourceImpl = void 0;
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));

package/lib/shared-data-source/screen-share-data.d.ts

@@ -99,6 +99,10 @@ export interface FcrUIScreenShareSharedDataSource {
      * @returns 如果正在替换屏幕共享内容则返回 true，否则返回 false
      */
     get isReplaceScreen(): boolean;
+    /**
+     * 检查当前是否处于抢占屏幕共享状态
+     * @returns 如果正在抢占屏幕共享内容则返回 true，否则返回 false
+     */
     get isSeizeStream(): boolean;
     /**
      * 检查当前是否正在进行屏幕共享
@@ -182,7 +186,7 @@ export interface FcrUIScreenShareSharedDataSource {
      * @param type - 共享内容的类型
      * @param bounds - 共享区域的边界信息
      */
-    setCurrentSelection(id: string, type: AgoraRtcScreenCaptureType, bounds: CurrentShareBounds): void;
+    setCurrentSelection(id: string, type: AgoraRtcScreenCaptureType, bounds?: CurrentShareBounds): void;
     /**
      * 设置当前屏幕共享的完整信息
      * @param id - 共享会话的唯一标识符
@@ -260,7 +264,7 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
     setApplicationCaptureSources(windowInfos: AgoraRtcWindowInfo[]): void;
     setScreenSharingState(state: FcrMediaSourceState): void;
     setCurrentShareIdInfos(currentShareId: string, type: AgoraRtcScreenCaptureType, bounds: CurrentShareBounds): void;
-    setCurrentSelection(id: string, type: AgoraRtcScreenCaptureType, bounds: CurrentShareBounds): void;
+    setCurrentSelection(id: string, type: AgoraRtcScreenCaptureType, bounds?: CurrentShareBounds): void;
     setCurrentSelectionId(id: string): void;
     setCurrentSelectionType(type: AgoraRtcScreenCaptureType): void;
     setCurrentSelectionBounds(bounds: CurrentShareBounds): void;

package/lib/shared-data-source/screen-share-data.js

@@ -42,7 +42,6 @@ require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-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/esnext.weak-map.delete-all.js");
@@ -257,6 +256,7 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
   }, {
     key: "setIsReplaceScreen",
     value: function setIsReplaceScreen(isReplace) {
+      this.logger.info('[Annotation]: replaceScreenShare: ', isReplace);
       this.isReplaceScreen = isReplace;
     }
   }, {
@@ -331,7 +331,7 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     value: function setCurrentSelection(id, type, bounds) {
       this.currentSelectionId = id;
       this.currentSelectionType = type;
-      this.currentSelectionBounds = bounds;
+      bounds && (this.currentSelectionBounds = bounds);
     }
   }, {
     key: "setCurrentSelectionId",

package/lib/shared-data-source/security-data.js

@@ -42,7 +42,6 @@ require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-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/esnext.weak-map.delete-all.js");

package/lib/shared-data-source/setting.d.ts

@@ -1,6 +1,6 @@
-import { CustomSetting } from '../modules/setting/store';
+import { FcrUICustomSetting } from '../modules/setting/store';
 import { FcrUISceneCreatorConfig } from '../type';
-import { FcrUILocalStorageProvider } from '../providers/local-storage-provider';
+import { FcrUIUserSettingStorageProvider } from '../providers/user-setting-storage-provider';
 /**
  * FcrUISharedSettingDataSource 接口定义了用于获取和修改共享 UI 设置数据的方法。
  * 通过该接口，可以方便地对自定义设置进行读取和更新操作，适用于管理和维护 UI 相关的共享配置。
@@ -8,28 +8,28 @@ import { FcrUILocalStorageProvider } from '../providers/local-storage-provider';
 export interface FcrUISharedSettingDataSource {
     /**
      * 获取当前的自定义设置。
-     * 此属性返回一个 CustomSetting 类型的对象，包含了所有已配置的自定义设置信息。
+     * 此属性返回一个 FcrUICustomSetting 类型的对象，包含了所有已配置的自定义设置信息。
      *
-     * @returns 当前的自定义设置对象，类型为 CustomSetting。
+     * @returns 当前的自定义设置对象，类型为 FcrUICustomSetting。
      */
-    get setting(): CustomSetting;
+    get setting(): FcrUICustomSetting;
     /**
      * 设置新的自定义设置。
-     * 该方法允许传入一个 CustomSetting 类型的部分对象，用于更新当前的自定义设置。
+     * 该方法允许传入一个 FcrUICustomSetting 类型的部分对象，用于更新当前的自定义设置。
      * 传入的 newSetting 中的属性会覆盖当前设置中对应的属性。
      *
-     * @param newSetting - 新的自定义设置对象，类型为 CustomSetting 的部分对象。
+     * @param newSetting - 新的自定义设置对象，类型为 FcrUICustomSetting 的部分对象。
      */
-    setSetting(newSetting: Partial<CustomSetting>): void;
+    setSetting(newSetting: Partial<FcrUICustomSetting>): void;
 }
 export declare class FcrUISharedSettingDataSourceImpl implements FcrUISharedSettingDataSource {
     private _creatorConfig?;
-    private _localStorageProvider;
-    accessor _setting: CustomSetting;
+    private _userSettingStorageProvider;
+    accessor _setting: FcrUICustomSetting;
     private _useDefaultAudioEchoCancellation;
-    constructor(creatorConfig: FcrUISceneCreatorConfig, localStorageProvider: FcrUILocalStorageProvider);
-    get setting(): CustomSetting;
+    constructor(creatorConfig: FcrUISceneCreatorConfig, userSettingStorageProvider: FcrUIUserSettingStorageProvider);
+    get setting(): FcrUICustomSetting;
     private _preHandleSetting;
-    setSetting(assignedSetting: Partial<CustomSetting>): void;
+    setSetting(assignedSetting: Partial<FcrUICustomSetting>): void;
     private _initSetting;
 }

package/lib/shared-data-source/setting.js

@@ -19,8 +19,6 @@ 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.async-iterator.for-each.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
@@ -61,11 +59,11 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _imports = require("agora-rte-sdk/lib/imports");
-var _store = require("../modules/setting/store");
 var _fcrCore = require("fcr-core");
 var _parameters = require("../utilities/parameters");
 var _mobx = require("mobx");
 var _base = require("../base");
+var _merge = _interopRequireDefault(require("lodash/merge"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _tools = require("../utilities/tools");
 var _FcrUISharedSettingDataSourceImpl;
@@ -89,7 +87,7 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 _ref = (_preHandleSettingDecs = [_mobx.action, _mobx.action.bound], _setSettingDecs = [_mobx.action, _mobx.action.bound], _initSettingDecs = [_mobx.action, _mobx.action.bound], "_creatorConfig");
 var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUISharedSettingDataSourceImpl(creatorConfig, localStorageProvider) {
+  function FcrUISharedSettingDataSourceImpl(creatorConfig, userSettingStorageProvider) {
     (0, _classCallCheck2["default"])(this, FcrUISharedSettingDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
     _classPrivateFieldInitSpec(this, _A, _init__setting(this, {
@@ -114,7 +112,7 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
       shouldHideMyVideo: false
     }));
     (0, _defineProperty2["default"])(this, "_useDefaultAudioEchoCancellation", true);
-    this._localStorageProvider = localStorageProvider;
+    this._userSettingStorageProvider = userSettingStorageProvider;
     this._creatorConfig = creatorConfig;
     var defaultVideoGallerySize = (0, _parameters.getDefaultVideoGallerySize)(this._creatorConfig.parameters);
     if (defaultVideoGallerySize) {
@@ -151,15 +149,19 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
     key: "setSetting",
     value: function setSetting(assignedSetting) {
       var newSetting = this._preHandleSetting(assignedSetting);
-      var localSetting = this._localStorageProvider.read(_store.SETTING_KEY) || {};
-      this._localStorageProvider.write(_store.SETTING_KEY, _objectSpread(_objectSpread({}, localSetting), newSetting));
+      var userSetting = this._userSettingStorageProvider.read();
+      var localSetting = (userSetting === null || userSetting === void 0 ? void 0 : userSetting.setting) || {};
+      this._userSettingStorageProvider.write({
+        setting: (0, _merge["default"])(this._setting, localSetting, newSetting)
+      });
       this._setting = newSetting;
     }
   }, {
     key: "_initSetting",
     value: function _initSetting() {
       var _this = this;
-      var localSetting = this._localStorageProvider.read(_store.SETTING_KEY);
+      var userSetting = this._userSettingStorageProvider.read();
+      var localSetting = userSetting === null || userSetting === void 0 ? void 0 : userSetting.setting;
       if (localSetting) {
         var settingKeys = ['spotlightEnabled', 'shouldHideNonVideoParticipants', 'shouldHideMyVideo', 'isPlaySound', 'language', 'autoAdjustmentMicrophoneVolume', 'noiseReduce',
         // 'audioVoiceChanger',

package/lib/shared-data-source/video-window.d.ts

@@ -30,7 +30,7 @@ export interface FcrUIVideoWindowDataSource {
 export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     private _placement;
     private _isMySelf;
-    private _boardUserInfo?;
+    private accessor _boardUserInfo;
     private _layoutType;
     private accessor _videoStream;
     private accessor _audioStream;
@@ -75,6 +75,7 @@ export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     setPin(pin: boolean): void;
     setSpotlightEnabled(enabled: boolean): void;
     setHasBoardSharing(isSharing: boolean): void;
+    setBoardUserInfo(userInfo: FcrUserInfo): void;
     setSpeakerSpotlight(speakerSpotlight: boolean): void;
     setHasScreenSharing(screenSharing: boolean): void;
     setHasLoopbackSharing(hasLoopbackSharing: boolean): void;