fcr-ui-scene 3.4.5 → 3.5.1

package/lib/modules/participant/type.d.ts

@@ -1,8 +1,7 @@
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import { User } from 'agora-ui-foundation/lib/components/participants/attendee';
-import { FcrInterpreterUserInfo, FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
-import { FcrRoomType } from 'fcr-core/lib/room-control/type';
 import { FcrStreamInfo, FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrUIMemberDataImpl } from './member-list-data-source';
 export declare enum FcrUIMemberSortingPriority {
     MYSELF = 100,
     HOST = 99,
@@ -15,6 +14,7 @@ export declare enum FcrUIMemberSortingPriority {
 export interface FcrUIMemberListDataSource {
     list: FcrUIMemberData[];
     resetList: (users: FcrUserInfo[], streams: Record<string, FcrStreamInfo[]>) => boolean;
+    init: (memberDatas: FcrUIMemberDataImpl[]) => boolean;
     add: (user: FcrUserInfo, streams: FcrStreamInfo[], isMySelf: boolean) => boolean;
     updateWithStreamAdd: (stream: FcrStreamInfo) => boolean;
     updateWithStreamRemove: (stream: FcrStreamInfo) => boolean;
@@ -39,13 +39,6 @@ export interface FcrUIRequestOpenDevicePayload {
 }
 export interface ParticipantAttendeeProps {
     user: User;
-    enableSpotlight: boolean;
-    isBoardActive?: boolean;
-    activeTab: FcrRoomType;
-    interpreterUsers?: FcrInterpreterUserInfo[] | null;
-    interpreterState: boolean;
-    interpreterInputLanguage: FcrLanguage | undefined;
-    type: 'modal' | 'window';
 }
 export type OperateWaitingRoomMemberDialogProps = {
     type: 'remove' | 'removeAll' | 'admitAll';

package/lib/modules/pc-audio-connect/store.d.ts

@@ -16,7 +16,7 @@ export default class ConnectionGatewayStore {
     private _devicePrivilegeProvider?;
     private _sharedDevicePrivilegeDataSource?;
     private _dialogProvider;
-    private _isFirstConnecting;
+    private _needShowConfirmDialog;
     accessor phoneCallState: FcrRoomConnectorSessionState;
     accessor phoneCallReason: FcrRoomConnectorSessionReason;
     accessor connectSession: FcrPhoneConnectorSession | null;

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

@@ -91,7 +91,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
     (0, _defineProperty2["default"])(this, "_disposers", (_initProto(this), []));
     (0, _defineProperty2["default"])(this, "_failureTimer", null);
-    (0, _defineProperty2["default"])(this, "_isFirstConnecting", true);
+    (0, _defineProperty2["default"])(this, "_needShowConfirmDialog", true);
     _classPrivateFieldInitSpec(this, _A, _init_phoneCallState(this, _type.FcrRoomConnectorSessionState.CALLING));
     _classPrivateFieldInitSpec(this, _B, _init_phoneCallReason(this, _type.FcrRoomConnectorSessionReason.NONE));
     _classPrivateFieldInitSpec(this, _C, _init_connectSession(this, null));
@@ -104,6 +104,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     this._sharedDevicePrivilegeDataSource = sharedDevicePrivilegeDataSource;
     this._deviceObserver = {
       onAudioConnected: function onAudioConnected() {
+        _this._needShowConfirmDialog = false;
         _this.closeConnectionDialog();
       }
     };
@@ -200,7 +201,11 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     value: function _handleInterceptorCloseDialog(dialogKey) {
       var _this2 = this;
       if (dialogKey === _constant.FcrUIDialogKey.CONNECTION_GATEWAY) {
-        if (this.hasOwnPstnStream || !this._isFirstConnecting) {
+        if (!this._needShowConfirmDialog) {
+          return false;
+        }
+        this._needShowConfirmDialog = false;
+        if (this.hasOwnPstnStream) {
           return false;
         }
         var _dialogKey = this._eventProvider.openConfirmDialog({
@@ -211,16 +216,15 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
           alignCenter: true,
           showCancel: true,
           width: 255,
-          height: 255,
           cancelButtonProps: {
             block: true,
             type: 'secondary',
-            shape: 'circle'
+            shape: 'rounded'
           },
           okButtonProps: {
             block: true,
             type: 'primary',
-            shape: 'circle'
+            shape: 'rounded'
           },
           closable: false,
           onCancel: function onCancel() {
@@ -249,7 +253,6 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
             return onOk;
           }()
         });
-        this._isFirstConnecting = false;
         return true;
       }
       return false;

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

@@ -89,7 +89,7 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: ns.b(),
     ref: containerRef,
-    children: [(0, _env.isElectron)() ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: (0, _classnames["default"])(ns.e('section'), ns.e('section-speaker')),
       id: _constant.FcrUIHighlightElement.AUDIO_SPEAKER,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -114,7 +114,7 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
           value: speakerTestVolumeLevel / 100,
           barCount: 13
         })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      }), (0, _env.isElectron)() && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: ns.e('form-item'),
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: ns.e('form-label'),
@@ -128,7 +128,7 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
           draggableDom: containerDom
         })]
       })]
-    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: (0, _classnames["default"])(ns.e('section'), ns.e('section-microphones')),
       id: _constant.FcrUIHighlightElement.AUDIO_MICROPHONE,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -151,7 +151,7 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
           className: ns.e('form-label'),
           children: t('fmt_internalsetting_label_inputlevel')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_volumeIndicator.FcrVolumeIndicator, {
-          value: microphoneTestVolumeLevel / 100,
+          value: microphoneDetecting ? microphoneTestVolumeLevel / 100 : 0,
           barCount: 13
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -219,6 +219,7 @@ var AudioSettings = exports.AudioSettings = (0, _mobxReact.observer)(function ()
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: ns.e('switch-wrapper'),
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: ns.e('switch-wrapper-orinalvoise-tip'),
           children: t('fmt_setting_option_orinalvoise')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: ns.e('switch-wrapper-switch'),

package/lib/modules/setting/audio-settings/index.css

@@ -33,10 +33,15 @@
   align-items: center;
   justify-content: space-between;
 }
+
 .fcr-device-settings-audio__switch-wrapper-switch {
   flex-shrink: 0;
 }
 
+.fcr-device-settings-audio__switch-wrapper-orinalvoise-tip {
+  font-size: 12px;
+}
+
 .fcr-device-settings-audio__switch-title {
   padding: 0 10px 0 12px;
   font-size: 12px;
@@ -68,8 +73,12 @@
 
 .fcr-device-settings-audio__section .fcr-radio {
   min-width: 100px;
-  height: 28px;
-  padding: 0 8px;
+  padding: 6px 10px;
+  align-items: start;
+}
+.fcr-device-settings-audio__section .fcr-radio .fcr-radio-label {
+  padding-left: 6px;
+  line-height: 20px;
 }
 .fcr-device-settings-audio__section-title + .fcr-radio {
   margin-top: 4px;

package/lib/modules/setting/config.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.hdCameraVideoEncoderConfig = exports.defaultCameraVideoEncoderConfig = void 0;
 var _defaultConfig = require("../../utilities/default-config");
-var defaultCameraVideoEncoderConfig = exports.defaultCameraVideoEncoderConfig = _defaultConfig.cameraVideoHighStreamEncoderLowConfig;
+var defaultCameraVideoEncoderConfig = exports.defaultCameraVideoEncoderConfig = _defaultConfig.cameraVideoHighStreamEncoderConfig;
 var hdCameraVideoEncoderConfig = exports.hdCameraVideoEncoderConfig = {
   dimensions: {
     width: 1920,

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

@@ -60,6 +60,7 @@ export { DEFAULT_BEAUTY_VALUE };
 export type BeautyKey = 'none' | 'smoothnessLevel' | 'lighteningLevel' | 'lighteningLevel';
 export default class SettingStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
+    private _enableRemoteVideoStatsDebugLog;
     private _disposers;
     private _currentDialogId;
     private _monitorControl;

package/lib/modules/setting/store.js

@@ -50,7 +50,9 @@ require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.reduce.js");
+require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.math.log10.js");
 require("core-js/modules/es.number.constructor.js");
@@ -92,7 +94,6 @@ require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/web.timers.js");
 var _fcrCore = require("fcr-core");
-var _logger = require("agora-foundation/lib/logger");
 var _mobx = require("mobx");
 var _decorator = require("agora-foundation/lib/decorator");
 var _constant = require("../../utilities/constant");
@@ -102,6 +103,7 @@ var _config = require("./config");
 var _parameters = require("../../utilities/parameters");
 var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _logger = require("../../utilities/logger");
 var _excluded = ["dialogId"];
 var _SettingStore;
 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_config, _init_getSystemInfoTimer, _setDialogConfigDecs, _setSettingDecs, _onEventDecs, _onNetworkStatsUpdatedDecs, _calculateSystemInfoDecs, _getSystemInformationDecs, _clearGetSystemInfoIntervalDecs, _closeDialogDecs, _onLocalAudioStatsUpdatedDecs, _onRemoteAudioStatsUpdatedDecs, _onLocalVideoStatsUpdatedDecs, _onRemoteVideoStatsUpdatedDecs, _onStreamsAddedDecs, _onStreamsUpdatedDecs, _onStreamsRemovedDecs, _onPerformanceUpdatedDecs, _onAudioVolumeUpdatedDecs, _preHandleSettingDecs, _ref;
@@ -166,7 +168,10 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
       sharedSettingDataSource = _ref2.sharedSettingDataSource,
       settingConfig = _ref2.settingConfig;
     (0, _classCallCheck2["default"])(this, SettingStore);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'SettingStore'
+    })));
+    (0, _defineProperty2["default"])(this, "_enableRemoteVideoStatsDebugLog", false);
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_currentDialogId", '');
     (0, _defineProperty2["default"])(this, "_settingVideoOpened", false);
@@ -272,6 +277,13 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
     if (this.dialogConfig.activeTab === DeviceSettingTab.STATE) {
       this._setupAudioVolumeAnalyzerTask();
     }
+    var streamInfoList = new Map();
+    this._streamControl.getStreamList().forEach(function (streamInfo) {
+      streamInfoList.set(streamInfo.streamId, streamInfo);
+    });
+    this._streamInfoList = streamInfoList;
+    // @ts-ignore
+    window._settingStore = this;
   }
   return (0, _createClass2["default"])(SettingStore, [{
     key: "loudestStreamVolumeLevel",
@@ -1040,6 +1052,12 @@ var SettingStore = exports["default"] = /*#__PURE__*/function () {
     key: "_onRemoteVideoStatsUpdated",
     value: function _onRemoteVideoStatsUpdated(roomId, streamId, stats) {
       var streamInfo = this._streamInfoList.get(streamId);
+      if (this._enableRemoteVideoStatsDebugLog) {
+        this.logger.debug('_onRemoteVideoStatsUpdated', JSON.stringify({
+          streamId: streamId,
+          stats: stats
+        }));
+      }
       // console.log('onRemoteVideoStatsUpdated', streamId, stats, streamInfo);
       if ((streamInfo === null || streamInfo === void 0 ? void 0 : streamInfo.videoSourceState) === _fcrCore.FcrMediaSourceState.OPEN) {
         this.remoteVideoStreamMap.set(streamId, _objectSpread(_objectSpread({}, stats), {}, {

package/lib/modules/setting/video-settings/index.css

@@ -70,14 +70,6 @@
   background: var(--fcr_ui_scene_click);
 }
 
-.fcr-device-settings-video__tab-wrapper {
-  margin-top: 20px;
-}
-
-.fcr-device-settings-video__tab-wrapper .fcr-fashion-tabs {
-  width: 100%;
-}
-
 .fcr-video-settings-basic__basic-form {
   margin-top: 10px;
   margin-bottom: 10px;
@@ -92,7 +84,7 @@
 }
 
 .fcr-video-settings-basic__basic-form .fcr-checkbox {
-  height: 32px;
+  min-height: 32px;
 }
 
 .fcr-video-settings-basic__basic-form.fcr-video-settings-basic__max-person-form {
@@ -100,9 +92,7 @@
 }
 
 .fcr-video-settings-basic__max-person-label {
-  height: 32px;
-  font-size: 12px;
-  line-height: 32px;
+  min-height: 32px;
   font-weight: 300;
   color: var(--fcr_ui_scene_icontext1);
 }
@@ -152,6 +142,11 @@
   max-height: 296px;
   min-height: 279px;
   position: relative;
+  margin-top: 20px;
+}
+
+.fcr-device-settings-video__tab-wrapper .fcr-fashion-tabs {
+  width: 100%;
 }
 
 .fcr-device-settings-video__active-tab-wrapper {
@@ -170,13 +165,14 @@
 .fcr-device-settings-video__tips {
   background-color: var(--fcr_mobile_ui_scene_color_popup_block5);
   border-radius: var(--fcr_cornerradius_s);
-  line-height: 14px;
+  line-height: 17px;
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: 20px 0px;
+  margin: 10px 0px;
   color: var(--fcr_ui_scene_icontext7);
-  padding: 10px;
+  padding: 8px;
+  font-size: 12px;
 }
 
 .fcr-virtual-background-setting__virtual-list {
@@ -199,6 +195,7 @@
 
 .fcr-virtual-background-setting__virtual-none {
   color: var(--fcr_web_ui_scene_mainicon1);
+  font-size: 12px;
 }
 .fcr-virtual-background-setting__virtual-item.is-active {
   border: 2px solid var(--fcr_ui_scene_ramp_brand6);
@@ -343,8 +340,6 @@
 
 .fcr-video-settings-basic__checkbox-item {
   gap: 8px;
-  font-size: 12px;
-  line-height: 32px;
   color: var(--fcr_ui_scene_icontext1);
   display: flex;
   align-items: center;

package/lib/modules/setting/video-settings/video-settings-basic.js

@@ -106,52 +106,48 @@ var VideoSettingsBasic = exports.VideoSettingsBasic = (0, _mobxReact.observer)(f
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: ns.e('device-select-title'),
         children: t('fmt_internalsetting_labels_advancedsetting')
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-          size: "small",
-          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-            className: ns.e('checkbox-item'),
-            children: [t('fmt_internalsetting_options_videonoisereduction'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-              mouseEnterDelay: 0,
-              content: t('fmt_internalsetting_tips_optimizevideo'),
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-                  type: _type.FcrIconType.FCR_HELPQUESTION,
-                  size: 14
-                })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+        size: "small",
+        label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: ns.e('checkbox-item'),
+          children: [t('fmt_internalsetting_options_videonoisereduction'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+            mouseEnterDelay: 0,
+            content: t('fmt_internalsetting_tips_optimizevideo'),
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+                type: _type.FcrIconType.FCR_HELPQUESTION,
+                size: 14
               })
-            })]
-          }),
-          checked: setting.videoNoise,
-          onChange: function onChange(v) {
-            return setSetting({
-              videoNoise: v
-            });
-          }
-        })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-          size: "small",
-          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-            className: ns.e('checkbox-item'),
-            children: [t('fmt_internalsetting_options_hardwareacceleration'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-              mouseEnterDelay: 0,
-              content: t('fmt_internalsetting_tips_reducevideo'),
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-                  type: _type.FcrIconType.FCR_HELPQUESTION,
-                  size: 14
-                })
+            })
+          })]
+        }),
+        checked: setting.videoNoise,
+        onChange: function onChange(v) {
+          return setSetting({
+            videoNoise: v
+          });
+        }
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+        size: "small",
+        label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: ns.e('checkbox-item'),
+          children: [t('fmt_internalsetting_options_hardwareacceleration'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+            mouseEnterDelay: 0,
+            content: t('fmt_internalsetting_tips_reducevideo'),
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+                type: _type.FcrIconType.FCR_HELPQUESTION,
+                size: 14
               })
-            })]
-          }),
-          checked: setting.hardwareForReception,
-          onChange: function onChange(v) {
-            return setSetting({
-              hardwareForReception: v
-            });
-          }
-        })
+            })
+          })]
+        }),
+        checked: setting.hardwareForReception,
+        onChange: function onChange(v) {
+          return setSetting({
+            hardwareForReception: v
+          });
+        }
       })]
     })]
   });

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

@@ -70,7 +70,6 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 require("./index.css");
 var _store = require("../../store");
 var _icon = require("agora-ui-foundation/lib/components/icon");
-var _tabFrame = _interopRequireDefault(require("../../../components/tab-frame"));
 var _jsxRuntime = require("react/jsx-runtime");
 var ShareSelectionWindowType = /*#__PURE__*/function (ShareSelectionWindowType) {
   ShareSelectionWindowType["BASIC"] = "basic";
@@ -103,6 +102,7 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
   var t = (0, _i18n.useI18n)();
   (0, _react.useEffect)(function () {
     setLoading(false);
+    setShareWithAudioState(false);
     return function () {
       setLoading(false);
     };
@@ -139,88 +139,78 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
   var transI18n = (0, _i18n.useI18n)();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "share-selection-window",
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_tabFrame["default"], {
-      activeKey: ShareSelectionWindowType.BASIC,
-      tabs: [{
-        label: transI18n('fmt_screenshare_window_tab_basic'),
-        key: ShareSelectionWindowType.BASIC,
-        content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-          className: "share-selection-window__share-content frc-flex",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: "share-selection-window__share-windows share-selection-window__share-card",
-            children: screenCaptureSources.map(function (screen) {
-              var type = _type.AgoraRtcScreenCaptureType.SCREEN;
-              var isWhiteboard = screen.id.split('-')[0] === 'whiteboard';
-              var screenWithBounds = screen;
-              return /*#__PURE__*/(0, _jsxRuntime.jsx)(_card.FcrCard, {
-                disabled: isWhiteboard && !!(boardOwnerUser !== null && boardOwnerUser !== void 0 && boardOwnerUser.userId),
-                title: isWhiteboard ? t('fmt_share_options_whiteboard') : screen.title,
-                active: currentSelectionType === type && screen.id === currentSelection || screen.id === currentSelection,
-                onCardClick: function onCardClick() {
-                  handleChooseScreen(screen.id, type, screenWithBounds.bounds);
-                },
-                onDoubleClickCard: function onDoubleClickCard() {
-                  if (boardOwnerUser) return;
-                  handleStartShare(screen.id, type, shareWithAudio, _shareAudio.AudioProcessingChannel.MONO, screenWithBounds.bounds);
-                },
-                content: screen.image instanceof Uint8Array ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ThumbnailRender, {
-                  image: screen.image,
-                  width: screen.imageWidth,
-                  height: screen.imageHeight,
-                  title: screen.title
-                }) : [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes(localUserRole) && isWhiteboard && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) !== (localUser === null || localUser === void 0 ? void 0 : localUser.userId) && boardOwnerUser ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-                  trigger: "hover",
-                  content: transI18n('fmt_screenshare_tips_alreadyopened'),
-                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
-                    styleType: "danger",
-                    size: "XXS",
-                    shape: "rounded",
-                    onClick: handlerBoardShareStop,
-                    children: transI18n('fmt_screenshare_button_stopshare')
-                  })
-                }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-                  type: screen.image,
-                  size: 48,
-                  colors: {
-                    iconPrimary: '#4262FF'
-                  }
-                })
-              }, "screen-".concat(screen.id));
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "share-selection-window__share-content frc-flex",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "share-selection-window__share-windows share-selection-window__share-card",
+        children: screenCaptureSources.map(function (screen) {
+          var type = _type.AgoraRtcScreenCaptureType.SCREEN;
+          var isWhiteboard = screen.id.split('-')[0] === 'whiteboard';
+          var screenWithBounds = screen;
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_card.FcrCard, {
+            disabled: isWhiteboard && !!(boardOwnerUser !== null && boardOwnerUser !== void 0 && boardOwnerUser.userId),
+            title: isWhiteboard ? t('fmt_share_options_whiteboard') : screen.title,
+            active: currentSelectionType === type && screen.id === currentSelection || screen.id === currentSelection,
+            onCardClick: function onCardClick() {
+              handleChooseScreen(screen.id, type, screenWithBounds.bounds);
+            },
+            onDoubleClickCard: function onDoubleClickCard() {
+              if (boardOwnerUser) return;
+              handleStartShare(screen.id, type, shareWithAudio, _shareAudio.AudioProcessingChannel.MONO, screenWithBounds.bounds);
+            },
+            content: screen.image instanceof Uint8Array ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ThumbnailRender, {
+              image: screen.image,
+              width: screen.imageWidth,
+              height: screen.imageHeight,
+              title: screen.title
+            }) : [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes(localUserRole) && isWhiteboard && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) !== (localUser === null || localUser === void 0 ? void 0 : localUser.userId) && boardOwnerUser ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+              trigger: "hover",
+              content: transI18n('fmt_screenshare_tips_alreadyopened'),
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+                styleType: "danger",
+                size: "XXS",
+                shape: "rounded",
+                onClick: handlerBoardShareStop,
+                children: transI18n('fmt_screenshare_button_stopshare')
+              })
+            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+              type: screen.image,
+              size: 48,
+              colors: {
+                iconPrimary: '#4262FF'
+              }
             })
-          }), !!applicationCaptureSources.length && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-            className: "frc-flex",
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              style: {
-                marginTop: '38px'
+          }, "screen-".concat(screen.id));
+        })
+      }), !!applicationCaptureSources.length && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "frc-flex",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          style: {
+            marginTop: '38px'
+          },
+          children: transI18n('fmt_uimanager_labels_Application')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "share-selection-window__share-application share-selection-window__share-card",
+          children: applicationCaptureSources.map(function (application) {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_card.FcrCard, {
+              active: currentSelectionType === _type.AgoraRtcScreenCaptureType.WINDOW && application.id === currentSelection,
+              onCardClick: function onCardClick() {
+                handleChooseScreen(application.id, _type.AgoraRtcScreenCaptureType.WINDOW, application.bounds);
               },
-              children: transI18n('fmt_uimanager_labels_Application')
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              className: "share-selection-window__share-application share-selection-window__share-card",
-              children: applicationCaptureSources.map(function (application) {
-                return /*#__PURE__*/(0, _jsxRuntime.jsx)(_card.FcrCard, {
-                  active: currentSelectionType === _type.AgoraRtcScreenCaptureType.WINDOW && application.id === currentSelection,
-                  onCardClick: function onCardClick() {
-                    handleChooseScreen(application.id, _type.AgoraRtcScreenCaptureType.WINDOW, application.bounds);
-                  },
-                  onDoubleClickCard: function onDoubleClickCard() {
-                    handleStartShare(application.id, _type.AgoraRtcScreenCaptureType.WINDOW, shareWithAudio, _shareAudio.AudioProcessingChannel.MONO, application.bounds);
-                  },
-                  title: application.title,
-                  content: /*#__PURE__*/(0, _jsxRuntime.jsx)(ThumbnailRender, {
-                    image: application.image,
-                    width: application.imageWidth,
-                    height: application.imageHeight,
-                    title: application.title
-                  })
-                }, "application-".concat(application.id));
+              onDoubleClickCard: function onDoubleClickCard() {
+                handleStartShare(application.id, _type.AgoraRtcScreenCaptureType.WINDOW, shareWithAudio, _shareAudio.AudioProcessingChannel.MONO, application.bounds);
+              },
+              title: application.title,
+              content: /*#__PURE__*/(0, _jsxRuntime.jsx)(ThumbnailRender, {
+                image: application.image,
+                width: application.imageWidth,
+                height: application.imageHeight,
+                title: application.title
               })
-            })]
-          })]
-        })
-      }, {
-        label: transI18n('fmt_screenshare_window_tab_advanced'),
-        key: ShareSelectionWindowType.ADVANCED
-      }]
+            }, "application-".concat(application.id));
+          })
+        })]
+      })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "share-selection-window__footer",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/modules/share-screen/index.d.ts

@@ -2,10 +2,12 @@ import { UIModule } from '../../base';
 import './index.css';
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
-import { FcrUIMainRoomControlProvider } from '../../providers/room-provider';
+import { FcrUIMainRoomControlProvider, FcrUIRoomProvider } from '../../providers/room-provider';
 import { FcrUIDeviceProvider } from '../../providers/device-provider';
 import { FcrUIMessageProvider } from '../../providers/message-provider';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
+import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
 export declare class ShareScreenUIModule extends UIModule {
     private _store?;
     mainRoomControlProvider?: FcrUIMainRoomControlProvider;
@@ -14,6 +16,9 @@ export declare class ShareScreenUIModule extends UIModule {
     privilegeProvider?: FcrUIPrivilegeProvider;
     dialogProvider?: FcrUIDialogProvider;
     messageProvider?: FcrUIMessageProvider;
+    sharedMemberDataSource?: FcrUIMemberSharedDataSource;
+    roomProvider?: FcrUIRoomProvider;
+    sharedConfigDataSource?: FcrUISharedConfigDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;