fcr-ui-scene 3.7.5 → 3.7.6

package/lib/modules/participant/store.browser.js

@@ -93,15 +93,16 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function (_ParticipantS
   }, {
     key: "_openChangeNameDialog",
     value: function _openChangeNameDialog(userId) {
-      this._operatorRenameUserId = userId;
-      var user = this.userMap.get(this._operatorRenameUserId);
+      this._renamingUserId = userId;
+      var user = this.userMap.get(this._renamingUserId);
       if (!user) {
         this.logger.error('User not found', {
           userId: userId
         });
         return;
       }
-      this._operatorRenameUserName = user.userInfo.userName;
+      this._renamingUserName = user.userInfo.userName;
+      this.newName = user.userInfo.userName;
       this._openDialog(_constant.FcrUIDialogKey.RENAME);
     }
   }, {

package/lib/modules/participant/store.electron.js

@@ -91,17 +91,19 @@ var ParticipantStore = exports["default"] = /*#__PURE__*/function (_ParticipantS
   }, {
     key: "_openChangeNameDialog",
     value: function _openChangeNameDialog(userId) {
-      this._operatorRenameUserId = userId;
-      var user = this.userMap.get(this._operatorRenameUserId);
+      this._renamingUserId = userId;
+      var user = this.userMap.get(this._renamingUserId);
       if (!user) {
         this.logger.error('User not found', {
           userId: userId
         });
         return;
       }
-      this._operatorRenameUserName = user.userInfo.userName;
+      this._renamingUserName = user.userInfo.userName;
+      this.newName = user.userInfo.userName;
       this._openDialog(_constant.FcrUIDialogKey.RENAME);
       var renameWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.RENAME);
+      this.logger.info('windows_index setAlwaysOnTop in participant openChangeNameDialog');
       renameWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.RENAME_WINDOW_LEVEL);
     }
   }, {

package/lib/modules/pc-audio-connect/main-scene/store.js

@@ -279,6 +279,7 @@ var ConnectionGatewayStoreMainScene = exports["default"] = /*#__PURE__*/function
               hasOpenMicrophonePrivilege = _context2.sent;
               includeMicrophone = shouldIncludeMicrophone && hasOpenMicrophonePrivilege;
               this._deviceProvider.connectAudio(includeMicrophone);
+              this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.CONNECTION_GATEWAY);
             case 2:
             case "end":
               return _context2.stop();

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

@@ -47,6 +47,7 @@ export declare class SecondaryWindowStore {
     get isSharingWithAudio(): boolean;
     get videoRenderContext(): FcrVideoTrackRenderer;
     get isActive(): boolean;
+    get baseUrl(): string;
     constructor({ objectManager }: SecondaryWindowStoreArgs);
     getContent(): void;
     handleIframeLoad(iframe: HTMLIFrameElement): void;

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

@@ -327,6 +327,11 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     get: function get() {
       return this._boardShareProvider.isActive;
     }
+  }, {
+    key: "baseUrl",
+    get: function get() {
+      return this._renderer.getBaseUrl();
+    }
   }, {
     key: "getContent",
     value: function getContent() {}

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

@@ -47,6 +47,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
     isAspectRatioPreserved = store.isAspectRatioPreserved,
     isShowToolbar = store.isShowToolbar,
     isActive = store.isActive,
+    baseUrl = store.baseUrl,
     iframeLoaded = store.iframeLoaded,
     setOriginScalc = store.setOriginScalc,
     zoomIn = store.zoomIn,
@@ -130,12 +131,10 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
           ref: handleIframeLoad,
           allow: "webview",
-          src: "/whiteboard.html?type=whiteboard",
+          src: "".concat(baseUrl, "/whiteboard.html?type=whiteboard"),
           style: {
             width: '100vw',
-            height: '100vh',
-            minWidth: '100vw',
-            minHeight: '100vh'
+            height: 'calc(100vh - 28px)'
           }
         })
       })]
@@ -181,7 +180,7 @@ var SubWindowView = exports.SubWindowView = (0, _mobxReact.observer)(function (p
       }), secondaryWindowContentType === _type2.FcrUIDisplayDistributionContentType.SHARING_SCREEN_WITH_ANNOTATION && annotationHasStart && /*#__PURE__*/(0, _jsxRuntime.jsx)("iframe", {
         ref: handleIframeLoad,
         allow: "webview",
-        src: "/whiteboard.html?type=annotation",
+        src: "".concat(baseUrl, "/whiteboard.html?type=annotation"),
         style: {
           width: '100%',
           height: '100%',

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

@@ -177,23 +177,6 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
           value: microphoneVolumeLevel,
           barCount: 13
         })]
-      }), /*#__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_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/index.css

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

package/lib/modules/setting/index.js

@@ -87,7 +87,7 @@ var SettingUIModule = exports.SettingUIModule = /*#__PURE__*/function (_UIModule
         _this.store.handleExitRoom();
       },
       onRoutingChanged: function onRoutingChanged() {
-        _this.store.handleExitRoom();
+        _this.store.handleExitRoom(true);
         _this.store.handleJoinRoom();
       }
     });

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

@@ -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
       })]
     })]

package/lib/modules/setting/store.base.d.ts

@@ -35,6 +35,7 @@ export declare abstract class SettingStoreBase implements FcrUIManagedObject {
     private _monitorObserver;
     private _roomObserver;
     private _streamObserver;
+    private _deviceProviderObserver;
     private _objectManager;
     private _interpreterRoomControlReaction;
     private _streamControl;
@@ -179,7 +180,7 @@ export declare abstract class SettingStoreBase implements FcrUIManagedObject {
     clearGetSystemInfoInterval(): void;
     changeMediaSetting(key: keyof typeof this._sharedSettingDataSource.media, value: any): void;
     handleJoinRoom(): void;
-    handleExitRoom(): void;
+    handleExitRoom(isRoutingChange?: boolean): void;
     private _onNetworkStatsUpdated;
     private _onLocalAudioStatsUpdated;
     private _onRemoteAudioStatsUpdated;
@@ -190,9 +191,11 @@ export declare abstract class SettingStoreBase implements FcrUIManagedObject {
     private _onStreamsRemoved;
     private _onPerformanceUpdated;
     private _handleCameraChanged;
-    private _handleCameraListUpdated;
     private _onAudioVolumeUpdated;
     private _preHandleSetting;
     private _setMeetingSettingsToLocalStorage;
+    private _handleSystemSelectedDeviceChanged;
+    private _showSystemSelectedDeviceChangedToast;
+    private _windows10UnsupportAirPods;
 }
 export declare const StoreContext: import("react").Context<SettingStoreBase>;

package/lib/modules/setting/store.base.js

@@ -16,7 +16,6 @@ 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.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.regexp.to-string.js");
 require("core-js/modules/esnext.function.metadata.js");
@@ -41,6 +40,7 @@ require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.from.js");
+require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
@@ -54,7 +54,10 @@ require("core-js/modules/es.object.assign.js");
 require("core-js/modules/es.object.entries.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
@@ -93,6 +96,7 @@ var _roomProvider = require("../../providers/room-provider/room-provider");
 var _type = require("./type");
 var _objectManager = require("../../object-manager");
 var _react = require("react");
+var _env = require("agora-foundation/lib/utilities/env");
 var _SettingStoreBase;
 var _initProto, _init_loudestStreamVolumeLevel, _init_microphoneVolumeLevel, _init_isWifiConnected, _init_dialogConfig, _init_networkState, _init_performanceState, _init_localAudioStreamMap, _init_remoteAudioStreamMap, _init_localVideoStreamMap, _init_remoteVideoStreamMap, _init_systemMemorySize, _init_systemCpuDesc, _init_getSystemInfoTimer, _init_isHiddenStateTab, _setDialogConfigDecs, _setSettingDecs, _clearGetSystemInfoIntervalDecs, _changeMediaSettingDecs, _handleJoinRoomDecs, _handleExitRoomDecs, _onNetworkStatsUpdatedDecs, _onLocalAudioStatsUpdatedDecs, _onRemoteAudioStatsUpdatedDecs, _onLocalVideoStatsUpdatedDecs, _onRemoteVideoStatsUpdatedDecs, _onStreamsAddedDecs, _onStreamsUpdatedDecs, _onStreamsRemovedDecs, _onPerformanceUpdatedDecs, _onAudioVolumeUpdatedDecs, _preHandleSettingDecs, _setMeetingSettingsToLocalStorageDecs, _ref;
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -161,7 +165,6 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_settingVideoOpened", false);
     (0, _defineProperty2["default"])(this, "_deviceStoreObserver", {
-      onCameraListUpdated: this._handleCameraListUpdated,
       onCameraChanged: this._handleCameraChanged
     });
     (0, _defineProperty2["default"])(this, "_streamVolumeMap", new Map());
@@ -184,6 +187,9 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
       onStreamsAdded: this._onStreamsAdded,
       onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated
     });
+    (0, _defineProperty2["default"])(this, "_deviceProviderObserver", {
+      onSystemSelectedDeviceChanged: this._handleSystemSelectedDeviceChanged
+    });
     (0, _defineProperty2["default"])(this, "_interpreterRoomControlReaction", null);
     (0, _defineProperty2["default"])(this, "_streamControl", null);
     _classPrivateFieldInitSpec(this, _A, _init_loudestStreamVolumeLevel(this, 0));
@@ -1079,10 +1085,23 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
       this._interpreterRoomControlReaction = this._createInterpreterRoomControlReaction();
       this._disposers.push(this._interpreterRoomControlReaction);
       this.isHiddenStateTab = false;
+      if (this._deviceProvider.followSystemSpeakerDevice) {
+        this._showSystemSelectedDeviceChangedToast({
+          deviceId: this._deviceProvider.currentDeviceId.speakerDeviceId,
+          deviceName: this._deviceProvider.currentDeviceName.speakerDeviceName
+        });
+      }
+      if (this._deviceProvider.followSystemMicrophoneDevice) {
+        this._showSystemSelectedDeviceChangedToast({
+          deviceId: this._deviceProvider.currentDeviceId.microphoneDeviceId,
+          deviceName: this._deviceProvider.currentDeviceName.microphoneDeviceName
+        });
+      }
+      this._deviceProvider.addObserver(this._deviceProviderObserver);
     }
   }, {
     key: "handleExitRoom",
-    value: function handleExitRoom() {
+    value: function handleExitRoom(isRoutingChange) {
       var _this8 = this,
         _this$_streamControl,
         _this$_currentRoomCon3,
@@ -1097,10 +1116,13 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
       (_this$_streamControl = this._streamControl) === null || _this$_streamControl === void 0 || _this$_streamControl.removeObserver(this._streamObserver);
       (_this$_currentRoomCon3 = this._currentRoomControl) === null || _this$_currentRoomCon3 === void 0 || _this$_currentRoomCon3.removeObserver(this._roomObserver);
       (_this$_interpreterRoo = this._interpreterRoomControl) === null || _this$_interpreterRoo === void 0 || _this$_interpreterRoo.removeObserver(this._roomObserver);
-      this._deviceProvider.resetDevice();
+      if (!isRoutingChange) {
+        this._deviceProvider.resetDevice();
+      }
       this.isHiddenStateTab = true;
       this._currentRoomControl = undefined;
       this._interpreterRoomControl = undefined;
+      this._deviceProvider.removeObserver(this._deviceProviderObserver);
     }
   }, {
     key: "_onNetworkStatsUpdated",
@@ -1235,27 +1257,6 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
         this._deviceProvider.toggleLocalCameraPreview(true);
       }
     }
-  }, {
-    key: "_handleCameraListUpdated",
-    value: function () {
-      var _handleCameraListUpdated2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(cameraList) {
-        return _regenerator["default"].wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              if (cameraList.length > 0) {
-                this._settingVideoOpened && this._deviceProvider.startOrStopCamera(true);
-              }
-            case 1:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function _handleCameraListUpdated(_x) {
-        return _handleCameraListUpdated2.apply(this, arguments);
-      }
-      return _handleCameraListUpdated;
-    }()
   }, {
     key: "_onAudioVolumeUpdated",
     value: function _onAudioVolumeUpdated(roomId, streamId, volume) {
@@ -1277,10 +1278,49 @@ var SettingStoreBase = exports.SettingStoreBase = /*#__PURE__*/function () {
     value: function _setMeetingSettingsToLocalStorage(value) {
       this._sharedSettingDataSource.setSetting(value);
     }
+  }, {
+    key: "_handleSystemSelectedDeviceChanged",
+    value: function _handleSystemSelectedDeviceChanged(device) {
+      this._showSystemSelectedDeviceChangedToast(device);
+    }
+  }, {
+    key: "_showSystemSelectedDeviceChangedToast",
+    value: function _showSystemSelectedDeviceChangedToast(defaultDevice) {
+      var message = (0, _i18n.transI18n)('fmt_device_toast_switch_device');
+      message = message.replace('{reason1}', defaultDevice.deviceName);
+      this._messageProvider.showToast({
+        type: 'normal',
+        message: message
+      });
+      this._windows10UnsupportAirPods(defaultDevice);
+    }
+  }, {
+    key: "_windows10UnsupportAirPods",
+    value: function _windows10UnsupportAirPods(defaultDevice) {
+      if (!(0, _env.isWindows)()) {
+        return;
+      }
+      var version = (0, _env.windowsVersion)();
+      if (!version) {
+        return;
+      }
+      version = version.split('.')[0];
+      if (version !== '10') {
+        return;
+      }
+      if (!defaultDevice.deviceName.includes('AirPods')) {
+        return;
+      }
+      var message = "windows 10 maybe not support ".concat(defaultDevice.deviceName);
+      this._messageProvider.showToast({
+        type: 'warn',
+        message: message
+      });
+    }
   }]);
 }();
 _SettingStoreBase = SettingStoreBase;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SettingStoreBase, [[_mobx.observable, 1, "loudestStreamVolumeLevel"], [_mobx.observable, 1, "microphoneVolumeLevel"], [_mobx.observable, 1, "isWifiConnected"], [_mobx.observable, 1, "dialogConfig"], [_mobx.observable, 1, "networkState"], [_mobx.observable, 1, "performanceState"], [_mobx.observable, 1, "localAudioStreamMap"], [_mobx.observable, 1, "remoteAudioStreamMap"], [_mobx.observable, 1, "localVideoStreamMap"], [_mobx.observable, 1, "remoteVideoStreamMap"], [_mobx.observable, 1, "systemMemorySize"], [_mobx.observable, 1, "systemCpuDesc"], [_mobx.observable, 1, "getSystemInfoTimer"], [_mobx.observable, 1, "isHiddenStateTab"], [_mobx.computed, 3, "maxVideoSendInfo"], [_mobx.computed, 3, "maxVideoReceiveInfo"], [_mobx.computed, 3, "sendScreenShareInfo"], [_mobx.computed, 3, "receiveScreenShareInfo"], [_mobx.computed, 3, "microphoneVolumeDb"], [_mobx.computed, 3, "speakerVolumeDb"], [_mobx.computed, 3, "speakerTestVolumeLevel"], [_mobx.computed, 3, "microphoneTestVolumeLevel"], [_mobx.computed, 3, "speakerVolume"], [_mobx.computed, 3, "microphoneVolume"], [_mobx.computed, 3, "isLocalMirrorEnabled"], [_mobx.computed, 3, "isLocalEditBeautyOptions"], [_mobx.computed, 3, "currentBeautyKey"], [_mobx.computed, 3, "beautyOptions"], [_mobx.computed, 3, "cameraDeviceId"], [_mobx.computed, 3, "cameraEnabled"], [_mobx.computed, 3, "showForceOpenEffectDialog"], [_mobx.computed, 3, "currentVirtualBackgroundName"], [_mobx.computed, 3, "cameraDeviceList"], [_mobx.computed, 3, "microphoneDeviceId"], [_mobx.computed, 3, "speakerDeviceId"], [_mobx.computed, 3, "speakerDeviceList"], [_mobx.computed, 3, "microphoneDeviceList"], [_mobx.computed, 3, "enableBeauty"], [_mobx.computed, 3, "virtualBackgroundList"], [_mobx.computed, 3, "currentIsMirror"], [_mobx.computed, 3, "microphoneDetecting"], [_mobx.computed, 3, "speakerDetecting"], [_mobx.computed, 3, "setting"], [_mobx.computed, 3, "media"], [_mobx.computed, 3, "sceneConfig"], [_mobx.computed, 3, "sharedInterpreterDataSource"], [_mobx.computed, 3, "currentRoomControl"], [_mobx.computed, 3, "interpreterRoomControl"], [_decorator.bound, 2, "_syncSystemInfo"], [_decorator.bound, 2, "initSettingConfig"], [_decorator.bound, 2, "enableVirtualBackground"], [_decorator.bound, 2, "setEditBeautyKey"], [_decorator.bound, 2, "enableBeautyEffect"], [_decorator.bound, 2, "_initReactions"], [_decorator.bound, 2, "setCameraDevice"], [_decorator.bound, 2, "setMicrophoneDevice"], [_decorator.bound, 2, "stopSpeakerTest"], [_decorator.bound, 2, "startSpeakerTest"], [_decorator.bound, 2, "setSpeakerDevice"], [_decorator.bound, 2, "setSpeakerVolume"], [_decorator.bound, 2, "setMicrophoneVolume"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "setBeautyOptions"], [_decorator.bound, 2, "toggleLocalMirrorPreview"], [_decorator.bound, 2, "startVideo"], [_decorator.bound, 2, "stopVideo"], [_decorator.bound, 2, "handleForceOpenVideoEffect"], [_decorator.bound, 2, "handleCancelForceOpenVideoEffect"], [_decorator.bound, 2, "toggleLocalMirror"], [_decorator.bound, 2, "setSettingVideoOpened"], [_decorator.bound, 2, "startCameraTest"], [_decorator.bound, 2, "stopCameraTest"], [_decorator.bound, 2, "startMicrophoneTest"], [_decorator.bound, 2, "stopMicrophoneTest"], [_setDialogConfigDecs, 18, "setDialogConfig"], [_setSettingDecs, 18, "setSetting"], [_clearGetSystemInfoIntervalDecs, 18, "clearGetSystemInfoInterval"], [_changeMediaSettingDecs, 18, "changeMediaSetting"], [_handleJoinRoomDecs, 18, "handleJoinRoom"], [_handleExitRoomDecs, 18, "handleExitRoom"], [_onNetworkStatsUpdatedDecs, 18, "_onNetworkStatsUpdated"], [_onLocalAudioStatsUpdatedDecs, 18, "_onLocalAudioStatsUpdated"], [_onRemoteAudioStatsUpdatedDecs, 18, "_onRemoteAudioStatsUpdated"], [_onLocalVideoStatsUpdatedDecs, 18, "_onLocalVideoStatsUpdated"], [_onRemoteVideoStatsUpdatedDecs, 18, "_onRemoteVideoStatsUpdated"], [_onStreamsAddedDecs, 18, "_onStreamsAdded"], [_onStreamsUpdatedDecs, 18, "_onStreamsUpdated"], [_onStreamsRemovedDecs, 18, "_onStreamsRemoved"], [_onPerformanceUpdatedDecs, 18, "_onPerformanceUpdated"], [_decorator.bound, 2, "_handleCameraChanged"], [_decorator.bound, 2, "_handleCameraListUpdated"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_preHandleSettingDecs, 18, "_preHandleSetting"], [_setMeetingSettingsToLocalStorageDecs, 18, "_setMeetingSettingsToLocalStorage"]], []).e, 15);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SettingStoreBase, [[_mobx.observable, 1, "loudestStreamVolumeLevel"], [_mobx.observable, 1, "microphoneVolumeLevel"], [_mobx.observable, 1, "isWifiConnected"], [_mobx.observable, 1, "dialogConfig"], [_mobx.observable, 1, "networkState"], [_mobx.observable, 1, "performanceState"], [_mobx.observable, 1, "localAudioStreamMap"], [_mobx.observable, 1, "remoteAudioStreamMap"], [_mobx.observable, 1, "localVideoStreamMap"], [_mobx.observable, 1, "remoteVideoStreamMap"], [_mobx.observable, 1, "systemMemorySize"], [_mobx.observable, 1, "systemCpuDesc"], [_mobx.observable, 1, "getSystemInfoTimer"], [_mobx.observable, 1, "isHiddenStateTab"], [_mobx.computed, 3, "maxVideoSendInfo"], [_mobx.computed, 3, "maxVideoReceiveInfo"], [_mobx.computed, 3, "sendScreenShareInfo"], [_mobx.computed, 3, "receiveScreenShareInfo"], [_mobx.computed, 3, "microphoneVolumeDb"], [_mobx.computed, 3, "speakerVolumeDb"], [_mobx.computed, 3, "speakerTestVolumeLevel"], [_mobx.computed, 3, "microphoneTestVolumeLevel"], [_mobx.computed, 3, "speakerVolume"], [_mobx.computed, 3, "microphoneVolume"], [_mobx.computed, 3, "isLocalMirrorEnabled"], [_mobx.computed, 3, "isLocalEditBeautyOptions"], [_mobx.computed, 3, "currentBeautyKey"], [_mobx.computed, 3, "beautyOptions"], [_mobx.computed, 3, "cameraDeviceId"], [_mobx.computed, 3, "cameraEnabled"], [_mobx.computed, 3, "showForceOpenEffectDialog"], [_mobx.computed, 3, "currentVirtualBackgroundName"], [_mobx.computed, 3, "cameraDeviceList"], [_mobx.computed, 3, "microphoneDeviceId"], [_mobx.computed, 3, "speakerDeviceId"], [_mobx.computed, 3, "speakerDeviceList"], [_mobx.computed, 3, "microphoneDeviceList"], [_mobx.computed, 3, "enableBeauty"], [_mobx.computed, 3, "virtualBackgroundList"], [_mobx.computed, 3, "currentIsMirror"], [_mobx.computed, 3, "microphoneDetecting"], [_mobx.computed, 3, "speakerDetecting"], [_mobx.computed, 3, "setting"], [_mobx.computed, 3, "media"], [_mobx.computed, 3, "sceneConfig"], [_mobx.computed, 3, "sharedInterpreterDataSource"], [_mobx.computed, 3, "currentRoomControl"], [_mobx.computed, 3, "interpreterRoomControl"], [_decorator.bound, 2, "_syncSystemInfo"], [_decorator.bound, 2, "initSettingConfig"], [_decorator.bound, 2, "enableVirtualBackground"], [_decorator.bound, 2, "setEditBeautyKey"], [_decorator.bound, 2, "enableBeautyEffect"], [_decorator.bound, 2, "_initReactions"], [_decorator.bound, 2, "setCameraDevice"], [_decorator.bound, 2, "setMicrophoneDevice"], [_decorator.bound, 2, "stopSpeakerTest"], [_decorator.bound, 2, "startSpeakerTest"], [_decorator.bound, 2, "setSpeakerDevice"], [_decorator.bound, 2, "setSpeakerVolume"], [_decorator.bound, 2, "setMicrophoneVolume"], [_decorator.bound, 2, "setVideoOrientation"], [_decorator.bound, 2, "setBeautyOptions"], [_decorator.bound, 2, "toggleLocalMirrorPreview"], [_decorator.bound, 2, "startVideo"], [_decorator.bound, 2, "stopVideo"], [_decorator.bound, 2, "handleForceOpenVideoEffect"], [_decorator.bound, 2, "handleCancelForceOpenVideoEffect"], [_decorator.bound, 2, "toggleLocalMirror"], [_decorator.bound, 2, "setSettingVideoOpened"], [_decorator.bound, 2, "startCameraTest"], [_decorator.bound, 2, "stopCameraTest"], [_decorator.bound, 2, "startMicrophoneTest"], [_decorator.bound, 2, "stopMicrophoneTest"], [_setDialogConfigDecs, 18, "setDialogConfig"], [_setSettingDecs, 18, "setSetting"], [_clearGetSystemInfoIntervalDecs, 18, "clearGetSystemInfoInterval"], [_changeMediaSettingDecs, 18, "changeMediaSetting"], [_handleJoinRoomDecs, 18, "handleJoinRoom"], [_handleExitRoomDecs, 18, "handleExitRoom"], [_onNetworkStatsUpdatedDecs, 18, "_onNetworkStatsUpdated"], [_onLocalAudioStatsUpdatedDecs, 18, "_onLocalAudioStatsUpdated"], [_onRemoteAudioStatsUpdatedDecs, 18, "_onRemoteAudioStatsUpdated"], [_onLocalVideoStatsUpdatedDecs, 18, "_onLocalVideoStatsUpdated"], [_onRemoteVideoStatsUpdatedDecs, 18, "_onRemoteVideoStatsUpdated"], [_onStreamsAddedDecs, 18, "_onStreamsAdded"], [_onStreamsUpdatedDecs, 18, "_onStreamsUpdated"], [_onStreamsRemovedDecs, 18, "_onStreamsRemoved"], [_onPerformanceUpdatedDecs, 18, "_onPerformanceUpdated"], [_decorator.bound, 2, "_handleCameraChanged"], [_onAudioVolumeUpdatedDecs, 18, "_onAudioVolumeUpdated"], [_preHandleSettingDecs, 18, "_preHandleSetting"], [_setMeetingSettingsToLocalStorageDecs, 18, "_setMeetingSettingsToLocalStorage"], [_decorator.bound, 2, "_handleSystemSelectedDeviceChanged"]], []).e, 15);
 _init_loudestStreamVolumeLevel = _applyDecs$e[0];
 _init_microphoneVolumeLevel = _applyDecs$e[1];
 _init_isWifiConnected = _applyDecs$e[2];

package/lib/modules/setting/view.js

@@ -111,6 +111,9 @@ var DeviceSettingsView = exports.DeviceSettingsView = (0, _mobxReact.observer)(f
   }];
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: ns.b(),
+    onMouseDown: function onMouseDown(e) {
+      return e.stopPropagation();
+    },
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: ns.e('nav'),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {

package/lib/modules/share-screen/components/selection/index.css

@@ -31,6 +31,10 @@
   -webkit-app-region: no-drag;
 }
 
+.share-selection-window__share-content::--webkit-scrollbar {
+  display: none;
+}
+
 .share-selection-window__header {
   height: 46px;
 }

package/lib/modules/share-screen/store.base.js

@@ -108,6 +108,9 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_dom", null);
     (0, _defineProperty2["default"])(this, "_asyncLock", false);
     (0, _defineProperty2["default"])(this, "_screenShareObserver", {
+      onPrepreScreenCapture: function onPrepreScreenCapture() {
+        _this.dialogProvider.setSharingDisplayBounds(_this.screenShareProvider.sharingDisplayBounds);
+      },
       onScreenShareStarted: function onScreenShareStarted() {
         (0, _mobx.runInAction)(function () {
           _this.isSharing = true;
@@ -117,6 +120,7 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
         (0, _mobx.runInAction)(function () {
           _this.isSharing = false;
         });
+        _this.dialogProvider.setSharingDisplayBounds(null);
         if (reason === _struct.FcrUIScreenShareStopReason.STOPPED_BY_OTHER) {
           _this.messageProvider.showToast({
             type: 'info',
@@ -125,6 +129,9 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
           _this._replaceShareConfirmDialog(operator);
         }
       },
+      onShareSourceReplaced: function onShareSourceReplaced() {
+        _this.dialogProvider.setSharingDisplayBounds(_this.screenShareProvider.sharingDisplayBounds);
+      },
       onScreenShareErrorOccurred: function onScreenShareErrorOccurred(code) {
         if (code === _struct.FcrUIScreenShareErrorCode.NETWORK_DISCONNECTED) {
           if (!_this.facilityProvider.isNetworkConnected) {
@@ -311,7 +318,7 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
     key: "startShareScreen",
     value: function () {
       var _startShareScreen = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var params, captureType, videoSourceId;
+        var params, captureType, videoSourceId, _t;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -373,15 +380,21 @@ var ShareScreenStoreBase = exports["default"] = /*#__PURE__*/function () {
               });
             case 6:
               this.dialogProvider.closeDialog(_constant.FcrUIDialogKey.SHARE_SCREEN_SELECTION);
+              _context2.next = 8;
+              break;
             case 7:
               _context2.prev = 7;
-              this._asyncLock = false;
-              return _context2.finish(7);
+              _t = _context2["catch"](2);
+              this.screenShareProvider.stopShare();
             case 8:
+              _context2.prev = 8;
+              this._asyncLock = false;
+              return _context2.finish(8);
+            case 9:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[2,, 7, 8]]);
+        }, _callee2, this, [[2, 7, 8, 9]]);
       }));
       function startShareScreen() {
         return _startShareScreen.apply(this, arguments);

package/lib/modules/share-screen/store.electron.js

@@ -170,7 +170,10 @@ var ElectronShareScreenStore = exports["default"] = /*#__PURE__*/function (_Shar
       } else {
         controlBarWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR);
       }
-      controlBarWindow.setBounds(sharingDisplayBounds);
+
+      // 不在这里控制，在control bar模块中控制
+      // controlBarWindow.setBounds(sharingDisplayBounds);
+
       if (!isMultiDisplayActive) {
         var videoWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
         (0, _videoWindow.setVideoWindowDialogPosition)(sharingDisplayBounds, videoWindow);

package/lib/modules/video-window/popover-watcher.d.ts

@@ -1,17 +1,9 @@
-import { FcrVideoWindowPreviewType } from './type';
 /**
  * popoverWatcher 监听 popover 的出现和消失，并通过回调通知外部如何调整窗口
  *
  */
-export declare function usePopoverWatcher({ rootDom, type, callbacks, }: {
+export declare function usePopoverWatcher({ rootDom, setVideoWindowSize, resetVideoWindowSize, }: {
     rootDom: HTMLElement | null;
-    type: FcrVideoWindowPreviewType;
-    callbacks: {
-        onResize: (size: {
-            width: number;
-            height: number;
-        }) => void;
-        onResetSize: () => void;
-        onSetResizable: (resizable: boolean) => void;
-    };
+    setVideoWindowSize: (width: number, height: number) => void;
+    resetVideoWindowSize: () => void;
 }): void;

package/lib/modules/video-window/popover-watcher.js

@@ -5,66 +5,56 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.usePopoverWatcher = usePopoverWatcher;
-require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.object.to-string.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 _react = require("react");
-var _type = require("./type");
+var HEAD_HEIGHT_OFFSET = 150;
+var WIDTH_RIGHT_OFFSET = 30;
+
 /**
  * popoverWatcher 监听 popover 的出现和消失，并通过回调通知外部如何调整窗口
  *
  */
 function usePopoverWatcher(_ref) {
   var rootDom = _ref.rootDom,
-    type = _ref.type,
-    callbacks = _ref.callbacks;
+    setVideoWindowSize = _ref.setVideoWindowSize,
+    resetVideoWindowSize = _ref.resetVideoWindowSize;
   (0, _react.useEffect)(function () {
     if (rootDom === null) return;
-    var HEAD_HEIGHT_OFFSET = 150;
-    var WIDTH_RIGHT_OFFSET = 30;
+    var dialogWrapper = rootDom;
+    var body = dialogWrapper.ownerDocument.body;
+    var popoverClassName = 'fcr-popover';
     var observer = new MutationObserver(function (mutationsList) {
-      var popover = rootDom.querySelector('.fcr-popover');
-      var wrapper = rootDom.querySelector('.fcr-video-window-dialog-wrapper');
+      var popover = body.querySelector(".".concat(popoverClassName));
       mutationsList.forEach(function (mutation) {
         if (mutation.type === 'childList') {
-          mutation.addedNodes.forEach(function (node) {
-            if (node.nodeType === Node.ELEMENT_NODE && node.contains(popover)) {
-              if (popover && wrapper) {
-                var wrapperHeight = wrapper.offsetHeight,
-                  wrapperWidth = wrapper.offsetWidth;
-                var popoverHeight = popover.offsetHeight,
-                  popoverWidth = popover.offsetWidth;
-                // 通过回调通知外部调整窗口尺寸
-                callbacks.onResize({
-                  height: Math.max(wrapperHeight, popoverHeight + HEAD_HEIGHT_OFFSET),
-                  width: wrapperWidth + popoverWidth - WIDTH_RIGHT_OFFSET
-                });
-                var rect = wrapper.getBoundingClientRect();
-                wrapper.setAttribute('style', "height: ".concat(rect.height, "px;width: ").concat(rect.width, "px"));
-              }
+          mutation.removedNodes.forEach(function (node) {
+            if (node.nodeType === Node.ELEMENT_NODE && node.classList.contains(popoverClassName)) {
+              resetVideoWindowSize();
             }
           });
-          mutation.removedNodes.forEach(function (node) {
-            var _classList;
-            if ((_classList = node.classList) !== null && _classList !== void 0 && _classList.contains('fcr-popover')) {
-              callbacks.onResetSize();
-              if (type === _type.FcrVideoWindowPreviewType.SMALL) {
-                callbacks.onSetResizable(true);
-              }
+          if (!popover) {
+            return;
+          }
+          mutation.addedNodes.forEach(function (node) {
+            if (node.nodeType === Node.ELEMENT_NODE && node.contains(popover)) {
+              var width = popover.offsetWidth + dialogWrapper.offsetWidth - WIDTH_RIGHT_OFFSET;
+              var height = Math.max(popover.offsetHeight + HEAD_HEIGHT_OFFSET, dialogWrapper.offsetHeight);
+              setVideoWindowSize(width, height);
             }
           });
         }
       });
     });
-    observer.observe(rootDom, {
+    observer.observe(dialogWrapper.ownerDocument.body, {
       childList: true,
       subtree: true
     });
     return function () {
       observer.disconnect();
     };
-  }, [rootDom, type, callbacks]);
+  }, [rootDom]);
 }

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

@@ -19,7 +19,9 @@ export default class VideoWindowStore {
     private _dialogProvider;
     private _videoRenderContext;
     private _dialogObserver;
-    private _sharedVideoWindowDataSourceObserver;
+    private _windowOpened;
+    private _isWindowApiResize;
+    private accessor _videoWindowSmallTypeStyleSize;
     accessor userVolumeMap: Map<string, number>;
     accessor wrapperHovering: boolean;
     accessor videoWindowPreviewType: FcrVideoWindowPreviewType;
@@ -33,10 +35,13 @@ export default class VideoWindowStore {
     get hasPinnedStream(): boolean;
     get interpreterUserList(): import("fcr-core/lib/room-control/interpreter-control/types").FcrInterpreterUserInfo[] | null;
     get isInterpreterEnabled(): boolean;
-    get shouldHaveListView(): boolean;
     get localUserRole(): FcrUserRole;
     get deviceMicrophoneEnabled(): boolean;
     get deviceCameraEnabled(): boolean;
+    get videoWindowStyleSize(): {
+        width: number;
+        height: number;
+    };
     constructor({ objectManager }: VideoWindowStoreArgs);
     setVideoOrientation(): void;
     release(): void;
@@ -53,9 +58,14 @@ export default class VideoWindowStore {
     setVideoWindowPreviewType(type: FcrVideoWindowPreviewType): void;
     setWrapperHover(hover: boolean): void;
     getAllowedOperations(targetRole: FcrUserRole, isSelf: boolean): string[];
-    private _updateWindowProperties;
+    handleVideowWindowResize(size: {
+        width: number;
+        height: number;
+    }): void;
+    setVideoWindowSize(width: number, height: number): void;
+    resetVideoWindowSize(): void;
     private _onAudioVolumeUpdated;
-    private _handleFoldListUpdated;
-    private _handleDialogSwitch;
+    private _handleDialogOpen;
+    private _handleDialogClose;
 }
 export declare const StoreContext: import("react").Context<VideoWindowStore>;