fcr-ui-scene 3.4.4 → 3.5.0

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

@@ -47,7 +47,7 @@ require("core-js/modules/es.typed-array.with.js");
 require("core-js/modules/esnext.array-buffer.detached.js");
 require("core-js/modules/esnext.array-buffer.transfer.js");
 require("core-js/modules/esnext.array-buffer.transfer-to-fixed-length.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.typed-array.filter-reject.js");
 require("core-js/modules/esnext.typed-array.group-by.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;

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

@@ -47,7 +47,10 @@ var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_
         eventProvider: this.eventProvider,
         privilegeProvider: this.privilegeProvider,
         dialogProvider: this.dialogProvider,
-        messageProvider: this.messageProvider
+        messageProvider: this.messageProvider,
+        sharedMemberDataSource: this.sharedMemberDataSource,
+        roomProvider: this.roomProvider,
+        sharedConfigDataSource: this.sharedConfigDataSource
       });
     }
   }, {

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

@@ -20,8 +20,6 @@
   -webkit-app-region: no-drag;
   background-color: #fff;
   border-radius: var(--fcr_cornerradius_l);
-  display: flex;
-  flex-direction: column;
 }
 
 .share-selection-window__share-content {

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

@@ -60,17 +60,19 @@ var _card = require("agora-ui-foundation/lib/components/card");
 var _type = require("agora-rte-sdk/lib/core/rtc/type");
 var _button = require("agora-ui-foundation/lib/components/button");
 var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
+var _tabs = require("agora-ui-foundation/lib/components/tabs");
+var _windowsControl = require("agora-ui-foundation/lib/components/windows-control");
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _tools = require("../../../utilities/tools");
+var _platform = require("../../../utilities/platform");
 var _type2 = require("../../../type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 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";
@@ -147,91 +149,103 @@ 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';
-              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);
-                },
-                onDoubleClickCard: function onDoubleClickCard() {
-                  if (boardOwnerUser) return;
-                  handleStartShare(screen.id, type, shareWithAudio);
-                },
-                content: screen.image instanceof Uint8Array ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-                  src: (0, _tools.uint8ArrayToImageData)({
-                    buffer: screen.image,
-                    width: screen.imageWidth,
-                    height: screen.imageHeight
-                  }),
-                  alt: 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.jsx)("div", {
+      className: "share-selection-window-control draggable",
+      children: (0, _platform.isWindows)() && /*#__PURE__*/(0, _jsxRuntime.jsx)(_windowsControl.FcrWindowControl, {
+        onClose: closeShareScreenSelection,
+        enableMinimize: false,
+        enableMaximize: false
+      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "share-selection-window__header  fcr-flex-center draggable",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabs.FcrTabs, {
+        items: [{
+          label: transI18n('fmt_screenshare_window_tab_basic'),
+          key: ShareSelectionWindowType.BASIC
+        }, {
+          label: transI18n('fmt_screenshare_window_tab_advanced'),
+          key: ShareSelectionWindowType.ADVANCED
+        }],
+        activeKey: ShareSelectionWindowType.BASIC,
+        onChange: function onChange(key) {
+          // throw new Error('Function not implemented.');
+        }
+      })
+    }), /*#__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';
+          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);
+            },
+            onDoubleClickCard: function onDoubleClickCard() {
+              if (boardOwnerUser) return;
+              handleStartShare(screen.id, type, shareWithAudio);
+            },
+            content: screen.image instanceof Uint8Array ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+              src: (0, _tools.uint8ArrayToImageData)({
+                buffer: screen.image,
+                width: screen.imageWidth,
+                height: screen.imageHeight
+              }),
+              alt: 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);
+              },
+              onDoubleClickCard: function onDoubleClickCard() {
+                handleStartShare(application.id, _type.AgoraRtcScreenCaptureType.WINDOW, shareWithAudio);
               },
-              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);
-                  },
-                  onDoubleClickCard: function onDoubleClickCard() {
-                    handleStartShare(application.id, _type.AgoraRtcScreenCaptureType.WINDOW, shareWithAudio);
-                  },
-                  title: application.title,
-                  content: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-                    src: (0, _tools.uint8ArrayToImageData)({
-                      buffer: application.image,
-                      width: application.imageWidth,
-                      height: application.imageHeight
-                    }),
-                    alt: application.title
-                  })
-                }, "application-".concat(application.id));
+              title: application.title,
+              content: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+                src: (0, _tools.uint8ArrayToImageData)({
+                  buffer: application.image,
+                  width: application.imageWidth,
+                  height: application.imageHeight
+                }),
+                alt: 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/store.d.ts

@@ -1,9 +1,8 @@
 import { FcrMediaSourceState } from 'fcr-core';
-import { FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
+import { FcrUserInfo } from 'fcr-core/lib/type';
 import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
 import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
-import { FcrUIDialogKey } from '../../utilities/constant';
 import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIDeviceProvider } from '../../providers/device-provider';
@@ -11,59 +10,66 @@ import { FcrUIDisplayCaptureSource } from './types';
 import { FcrUIMessageProvider } from '../../providers/message-provider';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { CurrentShareBounds } from '../control-bar/types';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
+import { FcrUIRoomProvider } from '../../providers/room-provider';
+import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
 export default class ShareScreenStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
-    private _roomControl;
     private _deviceProvider;
     private _eventProvider;
     private _messageProvider;
     private _dialogProvider;
+    private _roomProvider;
     private _streamControl;
     private _securityStore;
     private _userControl;
+    private _boardControl;
     private _controlBarWindowId;
     private _currentShareStreamId;
     private _removeScreenStreamFailed;
     private _isReplaceScreen;
     private _previewDom;
+    private _sharedMemberDataSource;
+    private _roomObserver;
     private _observer;
     private _uiEventObserver;
     private _streamObserver;
     private _boardObserver;
     private _loopbackAudioSourceId;
-    private accessor _shareSelectionDialogId;
-    private accessor _controlBarDialogId;
-    private accessor _videoWindowDialogId;
-    private accessor _isHost;
-    private accessor _shareLocked;
-    private accessor _screenTrack;
-    private accessor _shareAudioTrack;
+    private _shareSelectionDialogId;
+    private _controlBarDialogId;
+    private _videoWindowDialogId;
+    private _shareLocked;
+    private _screenTrack;
+    private _shareAudioTrack;
+    private _currentShareId;
+    private _currentShareType;
     accessor screenSharingState: FcrMediaSourceState;
     accessor applicationCaptureSources: AgoraRtcWindowInfo[];
     accessor screenCaptureSources: FcrUIDisplayCaptureSource[];
-    accessor hasScreenCapturePermission: boolean;
     accessor currentShareAudioProcessingChannel: AudioProcessingChannel;
-    accessor currentShareId: string;
-    accessor sharerId: string;
-    accessor currentShareType: AgoraRtcScreenCaptureType;
     accessor currentSelection: string;
     accessor currentSelectionType: AgoraRtcScreenCaptureType;
-    accessor currentSelectionBounds: CurrentShareBounds;
     accessor shareWithAudio: boolean;
     accessor boardOwnerUser: FcrUserInfo | undefined;
-    accessor localUser: FcrUserInfo;
-    accessor localUserRole: FcrUserRole;
+    accessor currentSelectionBounds: CurrentShareBounds;
+    get localUser(): FcrUserInfo;
+    get localUserRole(): import("fcr-core").FcrUserRole;
+    get isHost(): boolean;
     get supportEnumScreen(): boolean;
     get appWindowList(): Promise<AgoraRtcWindowInfo[]>;
     get displayList(): Promise<import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcDisplayInfo[]>;
-    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, }: {
+    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, sharedMemberDataSource, roomProvider, sharedConfigDataSource, }: {
         roomControl: FcrMainRoomControl;
         deviceProvider: FcrUIDeviceProvider;
         privilegeProvider: FcrUIPrivilegeProvider;
         messageProvider: FcrUIMessageProvider;
         dialogProvider: FcrUIDialogProvider;
         eventProvider: FcrUIEventProvider;
+        sharedMemberDataSource: FcrUIMemberSharedDataSource;
+        roomProvider: FcrUIRoomProvider;
+        sharedConfigDataSource: FcrUISharedConfigDataSource;
     });
     handleChooseScreen: (id: string, type: AgoraRtcScreenCaptureType | undefined, bounds: CurrentShareBounds) => void;
     setShareWithAudioState(withAudio: boolean): void;
@@ -71,24 +77,22 @@ export default class ShareScreenStore {
     setShareAudioProcessingChannel(currentShareAudioProcessingChannel: any): void;
     handlerBoardShareStop(): void;
     release(): void;
-    handleShareStartWithAudio(): void;
-    handleShareStopWithAudio(): void;
-    startPreview(dom: HTMLElement): void;
-    openDialog(item: FcrUIDialogKey): void;
-    closeDialog(item: FcrUIDialogKey): void;
-    openShareScreenSelection(): Promise<void>;
-    closeShareScreenSelection(): void;
-    setControlBarWindowId(id: number): void;
-    openVideoWindowDialog(): void;
-    closeControlBar(): void;
-    closeVideoWindowDialog(): void;
     openRelaunchTipsDialog(): void;
-    startLoopback(withAudio: boolean): Promise<void>;
-    private _setWithAudioState;
+    startPreview(dom: HTMLElement): void;
+    handleStopShare(): void;
     prepareShareScreen(): Promise<void>;
     handleStartShare(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, audioProcessingChannel: AudioProcessingChannel | undefined, bounds: CurrentShareBounds): Promise<void>;
-    handleReplaceScreen(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, audioProcessingChannel: AudioProcessingChannel | undefined, bounds: CurrentShareBounds): void;
-    handleStopShare(): void;
+    private _startLoopback;
+    private _handleShareStartWithAudio;
+    private _handleShareStopWithAudio;
+    private _openShareScreenSelection;
+    private _closeShareScreenSelection;
+    private _setControlBarWindowId;
+    private _openVideoWindowDialog;
+    private _closeControlBar;
+    private _closeVideoWindowDialog;
+    private _setWithAudioState;
+    private _handleReplaceScreen;
     private _createScreenStream;
     private _handleWebScreenCaptureStateUpdated;
     private _handleScreenCaptureStateUpdated;