fcr-ui-scene 3.7.2 → 3.7.4-rc.1

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

@@ -56,20 +56,19 @@ require("core-js/modules/esnext.typed-array.to-spliced.js");
 require("core-js/modules/esnext.typed-array.unique-by.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _card = require("agora-ui-foundation/lib/components/card");
-var _type = require("agora-rte-sdk/lib/core/rtc/type");
+var _type = require("fcr-core/lib/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 _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _tools = require("../../../../utilities/tools");
 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 _shareScenario = require("../share-scenario");
+var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
+require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
@@ -92,18 +91,18 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
     toggleShareWithScenarioType = _useContext.toggleShareWithScenarioType,
     cardChooseBounds = _useContext.cardChooseBounds,
     setCardChooseBounds = _useContext.setCardChooseBounds;
+  var transI18n = (0, _i18n.useI18n)();
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     currentInAudio = _useState2[0],
     setCurrentInAudio = _useState2[1];
-  var handleToggleScreenShareWithAudioBeforeShare = function handleToggleScreenShareWithAudioBeforeShare() {
-    setCurrentInAudio(!currentInAudio);
-  };
   var _useState3 = (0, _react.useState)(false),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     loading = _useState4[0],
     setLoading = _useState4[1];
-  var t = (0, _i18n.useI18n)();
+  var handleToggleScreenShareWithAudioBeforeShare = function handleToggleScreenShareWithAudioBeforeShare() {
+    setCurrentInAudio(!currentInAudio);
+  };
   (0, _react.useEffect)(function () {
     setLoading(false);
     setShareWithAudioState(shareWithAudio);
@@ -111,10 +110,7 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
       setLoading(false);
     };
   }, []);
-  var handleOkClick = (0, _react.useCallback)((0, _debounce["default"])(function () {
-    // 不能判断 cardChooseBounds 是否为空值，白板一定是空值
-    // 注意此处 case 应该覆盖双击共享屏幕和选择共享屏幕后点击 “开始共享” 按钮，同时在屏幕共享时，能双击和点击“开始共享“按钮发起白板共享”
-    // 测试标注时，发起端和接收端都需要可绘制，尺寸一致，并可同步画笔轨迹
+  var handleOkClick = (0, _react.useCallback)(function () {
     if (currentSelectionId) {
       handleToggleScreenShareWithAudio(currentInAudio);
       setLoading(true);
@@ -122,8 +118,7 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
         setLoading(false);
       });
     }
-  }, 300), [currentSelectionId, currentSelectionType, shareWithAudio, handleStartShare, currentInAudio]);
-  var transI18n = (0, _i18n.useI18n)();
+  }, [currentSelectionId, currentSelectionType, shareWithAudio, handleStartShare, currentInAudio]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "share-selection-window",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -131,12 +126,12 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
       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 type = _type.FcrScreenCaptureType.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,
+            title: isWhiteboard ? transI18n('fmt_share_options_whiteboard') : screen.title,
             active: currentSelectionType === type && screen.id === currentSelectionId || screen.id === currentSelectionId,
             onCardClick: function onCardClick() {
               if (screenWithBounds) {
@@ -145,8 +140,8 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
               handleChooseScreen(screen.id, type);
             },
             onDoubleClickCard: function onDoubleClickCard() {
-              if (boardOwnerUser) return;
-              handleStartShare(screen.id, type, shareWithAudio, _shareAudio.AudioProcessingChannel.MONO, screenWithBounds.bounds);
+              if (boardOwnerUser && isWhiteboard) return;
+              handleOkClick();
             },
             content: screen.image instanceof Uint8Array ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ThumbnailRender, {
               image: screen.image,
@@ -183,16 +178,14 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
           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 === currentSelectionId,
+              active: currentSelectionType === _type.FcrScreenCaptureType.WINDOW && application.id === currentSelectionId,
               onCardClick: function onCardClick() {
                 if (application.bounds) {
                   setCardChooseBounds(application.bounds);
                 }
-                handleChooseScreen(application.id, _type.AgoraRtcScreenCaptureType.WINDOW);
-              },
-              onDoubleClickCard: function onDoubleClickCard() {
-                handleStartShare(application.id, _type.AgoraRtcScreenCaptureType.WINDOW, shareWithAudio, _shareAudio.AudioProcessingChannel.MONO, application.bounds);
+                handleChooseScreen(application.id, _type.FcrScreenCaptureType.WINDOW);
               },
+              onDoubleClickCard: handleOkClick,
               title: application.title,
               content: /*#__PURE__*/(0, _jsxRuntime.jsx)(ThumbnailRender, {
                 image: application.image,

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

@@ -11,8 +11,10 @@ import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
 import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
+import { FcrScreenShareControlBarProps } from './components/control-bar';
 import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
 import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
+import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
 export declare class ShareScreenUIModule extends UIModule {
     private _store?;
     mainRoomControlProvider?: FcrUIMainRoomControlProvider;
@@ -29,9 +31,10 @@ export declare class ShareScreenUIModule extends UIModule {
     sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
     abilityProvider?: FcrUIAbilityProviderImpl;
     sharedAnnotationDataSource?: FcrUISharedAnnotationSource;
+    multiDisplayProvider?: FcrUIMultiDisplayProvider;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
-    getControlComponent(): import("react/jsx-runtime").JSX.Element;
+    getControlComponent(secondaryWindowProprs?: FcrScreenShareControlBarProps['secondaryWindowProprs']): import("react/jsx-runtime").JSX.Element;
     getSelectionComponent(): import("react/jsx-runtime").JSX.Element;
 }

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

@@ -55,7 +55,8 @@ var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_
         annotationProvider: this.annotationProvider,
         sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource,
         abilityProvider: this.abilityProvider,
-        sharedAnnotationDataSource: this.sharedAnnotationDataSource
+        sharedAnnotationDataSource: this.sharedAnnotationDataSource,
+        multiDisplayProvider: this.multiDisplayProvider
       });
     }
   }, {
@@ -74,10 +75,12 @@ var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_
     }
   }, {
     key: "getControlComponent",
-    value: function getControlComponent() {
+    value: function getControlComponent(secondaryWindowProprs) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar["default"], {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar["default"], {
+          secondaryWindowProprs: secondaryWindowProprs
+        })
       });
     }
   }, {

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

@@ -1,7 +1,7 @@
 import { FcrConnectionState, FcrMediaSourceState } from 'fcr-core';
 import { FcrScreenTrack } from 'fcr-core/lib/media-control/type';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { AgoraRtcDisplayInfo, AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
+import { FcrScreenCaptureType } from 'fcr-core/lib/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 { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
@@ -18,6 +18,7 @@ import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/scree
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUIAbilityProvider } from '../../providers/ability-provider';
 import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
+import { FcrUIMultiDisplayProvider } from '../../providers/multi-display-provider';
 export default class ShareScreenStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
@@ -30,7 +31,6 @@ export default class ShareScreenStore {
     private _userControl;
     private _boardControl;
     private _screenShareProvider;
-    private _controlBarWindowId;
     private _sharedMemberDataSource;
     private _sharedScreenShareSharedDataSource;
     private _abilityProvider;
@@ -43,6 +43,9 @@ export default class ShareScreenStore {
     private _uiEventObserver;
     private _screenCaptureStateObserver;
     private _boardObserver;
+    private _handleOnScreenCaptureStopped;
+    private _handleOnScreenCaptureStarted;
+    private _hasScreenSharePermission;
     private _shareSelectionDialogId;
     private _controlBarDialogId;
     private _videoWindowDialogId;
@@ -50,23 +53,23 @@ export default class ShareScreenStore {
     private _sharedAnnotationDataSource;
     accessor boardOwnerUser: FcrUserInfo | undefined;
     get cardChooseBounds(): CurrentShareBounds;
-    get currentShareStreamId(): string;
+    get currentShareStreamId(): string | undefined;
     get screenTrack(): FcrScreenTrack | null;
-    get currentShareType(): AgoraRtcScreenCaptureType;
+    get currentShareType(): FcrScreenCaptureType;
     get isCurrentOriginal(): boolean;
     get localUser(): FcrUserInfo;
     get localUserRole(): import("fcr-core").FcrUserRole;
     get isHost(): boolean;
     get supportEnumScreen(): boolean;
-    get appWindowList(): Promise<AgoraRtcWindowInfo[]>;
-    get displayList(): Promise<AgoraRtcDisplayInfo[]>;
+    get appWindowList(): Promise<import("fcr-core/lib/imports").AgoraRtcWindowInfo[]>;
+    get displayList(): Promise<import("fcr-core/lib/imports").AgoraRtcDisplayInfo[]>;
     get connectionState(): FcrConnectionState;
     get localUserScreenSharingState(): FcrMediaSourceState;
-    get applicationCaptureSources(): AgoraRtcWindowInfo[];
+    get applicationCaptureSources(): import("fcr-core/lib/imports").AgoraRtcWindowInfo[];
     get screenCaptureSources(): import("./types").FcrUIDisplayCaptureSource[];
     get currentShareAudioProcessingChannel(): AudioProcessingChannel;
     get currentSelectionId(): string;
-    get currentSelectionType(): AgoraRtcScreenCaptureType;
+    get currentSelectionType(): FcrScreenCaptureType;
     get shareWithAudio(): boolean;
     get currentSelectionBounds(): CurrentShareBounds;
     get shareLock(): boolean;
@@ -79,7 +82,10 @@ export default class ShareScreenStore {
     get isAspectRatioPreserved(): boolean;
     get isCurrentScreenShareInSmoothType(): boolean;
     get _screenShareInfoForLog(): string;
-    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, sharedMemberDataSource, roomProvider, sharedConfigDataSource, screenShareProvider, annotationProvider, sharedScreenShareSharedDataSource, abilityProvider, sharedAnnotationDataSource, }: {
+    get allowAnnotationSelfWriteState(): boolean;
+    get isShowToolbar(): boolean;
+    get isAnnotationSupported(): boolean;
+    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, sharedMemberDataSource, roomProvider, sharedConfigDataSource, screenShareProvider, annotationProvider, sharedScreenShareSharedDataSource, abilityProvider, sharedAnnotationDataSource, multiDisplayProvider, }: {
         roomControl: FcrMainRoomControl;
         deviceProvider: FcrUIDeviceProvider;
         privilegeProvider: FcrUIPrivilegeProvider;
@@ -94,20 +100,15 @@ export default class ShareScreenStore {
         sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
         abilityProvider: FcrUIAbilityProvider;
         sharedAnnotationDataSource: FcrUISharedAnnotationSource;
+        multiDisplayProvider: FcrUIMultiDisplayProvider;
     });
-    private _handleOnScreenCaptureStopped;
-    private _handleOnScreenCaptureStarted;
-    private _hasScreenSharePermission;
-    get allowAnnotationSelfWriteState(): boolean;
-    get isShowToolbar(): boolean;
     toggleIsShowToolbar(): void;
-    handleChooseScreen: (id: string, type?: AgoraRtcScreenCaptureType) => void;
+    handleChooseScreen: (id: string, type?: FcrScreenCaptureType) => void;
     setShareWithAudioState(withAudio: boolean): void;
     zoomIn(): void;
     zoomOut(): void;
     fullContainer(): void;
     setOriginScalc(): void;
-    hasLoopbackDevice(): Promise<boolean>;
     setShareAudioProcessingChannel(currentShareAudioProcessingChannel: AudioProcessingChannel): void;
     setCardChooseBounds(bounds: CurrentShareBounds): void;
     handlerBoardShareStop(): void;
@@ -119,11 +120,9 @@ export default class ShareScreenStore {
     handleStopShareByExitRoom(): void;
     participantShareCanWeAnnotation(): boolean;
     prepareShareScreen(): Promise<void>;
-    handleStartShare(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, audioProcessingChannel: AudioProcessingChannel | undefined, bounds: CurrentShareBounds): Promise<void>;
-    isAnnotationSupported(): boolean;
+    handleStartShare(id: string, type: FcrScreenCaptureType, withAudio: boolean, audioProcessingChannel: AudioProcessingChannel | undefined, bounds: CurrentShareBounds): Promise<void>;
     private _openShareScreenSelection;
     private _closeShareScreenSelection;
-    private _setControlBarWindowId;
     private _openVideoWindowDialog;
     private _closeControlBar;
     private _closeVideoWindowDialog;