fcr-ui-scene 3.6.0 → 3.6.2

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

@@ -55,8 +55,6 @@ require("core-js/modules/esnext.typed-array.filter-reject.js");
 require("core-js/modules/esnext.typed-array.group-by.js");
 require("core-js/modules/esnext.typed-array.to-spliced.js");
 require("core-js/modules/esnext.typed-array.unique-by.js");
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 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");
@@ -80,7 +78,7 @@ var ShareSelectionWindowType = /*#__PURE__*/function (ShareSelectionWindowType)
 }(ShareSelectionWindowType || {});
 var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    currentSelection = _useContext.currentSelection,
+    currentSelectionId = _useContext.currentSelectionId,
     applicationCaptureSources = _useContext.applicationCaptureSources,
     screenCaptureSources = _useContext.screenCaptureSources,
     currentSelectionType = _useContext.currentSelectionType,
@@ -96,7 +94,8 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
     openRelaunchTipsDialog = _useContext.openRelaunchTipsDialog,
     shareWithAudio = _useContext.shareWithAudio,
     setShareWithAudioState = _useContext.setShareWithAudioState,
-    currentSelectionBounds = _useContext.currentSelectionBounds;
+    currentSelectionBounds = _useContext.currentSelectionBounds,
+    handleToggleScreenShareWithAudio = _useContext.handleToggleScreenShareWithAudio;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     loading = _useState2[0],
@@ -109,37 +108,14 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
       setLoading(false);
     };
   }, []);
-  var toggleShareWithAudio = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(target) {
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (target) {
-              _context.next = 3;
-              break;
-            }
-            setShareWithAudioState(target);
-            return _context.abrupt("return");
-          case 3:
-            setShareWithAudioState(target);
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function toggleShareWithAudio(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
   var handleOkClick = (0, _react.useCallback)((0, _debounce["default"])(function () {
-    if (currentSelection) {
+    if (currentSelectionId) {
       setLoading(true);
-      handleStartShare(currentSelection, currentSelectionType, shareWithAudio, _shareAudio.AudioProcessingChannel.MONO, currentSelectionBounds)["finally"](function () {
+      handleStartShare(currentSelectionId, currentSelectionType, shareWithAudio, _shareAudio.AudioProcessingChannel.MONO, currentSelectionBounds)["finally"](function () {
         setLoading(false);
       });
     }
-  }, 300), [currentSelection, currentSelectionType, shareWithAudio, handleStartShare]);
+  }, 300), [currentSelectionId, currentSelectionType, shareWithAudio, handleStartShare]);
   var transI18n = (0, _i18n.useI18n)();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "share-selection-window",
@@ -154,7 +130,7 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
           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,
+            active: currentSelectionType === type && screen.id === currentSelectionId || screen.id === currentSelectionId,
             onCardClick: function onCardClick() {
               handleChooseScreen(screen.id, type, screenWithBounds.bounds);
             },
@@ -197,7 +173,7 @@ 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 === currentSelection,
+              active: currentSelectionType === _type.AgoraRtcScreenCaptureType.WINDOW && application.id === currentSelectionId,
               onCardClick: function onCardClick() {
                 handleChooseScreen(application.id, _type.AgoraRtcScreenCaptureType.WINDOW, application.bounds);
               },
@@ -219,14 +195,14 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
       className: "share-selection-window__footer",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "share-selection-window__footer-action",
-        children: currentSelection.split('-')[0] !== 'whiteboard' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareAudio.ShareAudio, {
+        children: currentSelectionId.split('-')[0] !== 'whiteboard' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareAudio.ShareAudio, {
           shareWithAudio: shareWithAudio,
-          toggleShareWithAudio: toggleShareWithAudio,
+          toggleShareWithAudio: handleToggleScreenShareWithAudio,
           currentAudioChannel: currentShareAudioProcessingChannel,
           onSwitchAudioChannel: setShareAudioProcessingChannel
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
-        disabled: currentSelection.split('-')[0] === 'whiteboard' && !!(boardOwnerUser !== null && boardOwnerUser !== void 0 && boardOwnerUser.userId) || loading,
+        disabled: currentSelectionId.split('-')[0] === 'whiteboard' && !!(boardOwnerUser !== null && boardOwnerUser !== void 0 && boardOwnerUser.userId) || loading,
         type: "primary",
         shape: "rounded",
         size: "XS",
@@ -240,13 +216,13 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
     })]
   });
 });
-var ThumbnailRender = function ThumbnailRender(_ref2) {
-  var image = _ref2.image,
-    _ref2$width = _ref2.width,
-    width = _ref2$width === void 0 ? 100 : _ref2$width,
-    _ref2$height = _ref2.height,
-    height = _ref2$height === void 0 ? 100 : _ref2$height,
-    title = _ref2.title;
+var ThumbnailRender = function ThumbnailRender(_ref) {
+  var image = _ref.image,
+    _ref$width = _ref.width,
+    width = _ref$width === void 0 ? 100 : _ref$width,
+    _ref$height = _ref.height,
+    height = _ref$height === void 0 ? 100 : _ref$height,
+    title = _ref.title;
   var data = (0, _react.useMemo)(function () {
     return (0, _tools.uint8ArrayToImageData)({
       buffer: image,

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

@@ -8,7 +8,9 @@ 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';
-import { FcrUIScreenShareDataSource } from '../../shared-data-source/screen-share-data-source';
+import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
+import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
+import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 export declare class ShareScreenUIModule extends UIModule {
     private _store?;
     mainRoomControlProvider?: FcrUIMainRoomControlProvider;
@@ -21,7 +23,9 @@ export declare class ShareScreenUIModule extends UIModule {
     roomProvider?: FcrUIRoomProvider;
     sharedConfigDataSource?: FcrUISharedConfigDataSource;
     connectionProvider?: FcrUIConnectionProvider;
-    screenShareDataSource?: FcrUIScreenShareDataSource;
+    screenShareProvider?: FcrUIScreenShareProvider;
+    annotationProvider?: FcrUIAnnotationProvider;
+    sharedScreenShareSharedDataSource?: FcrUIScreenShareSharedDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

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

@@ -51,8 +51,10 @@ var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_
         sharedMemberDataSource: this.sharedMemberDataSource,
         roomProvider: this.roomProvider,
         sharedConfigDataSource: this.sharedConfigDataSource,
-        connectionProvider: this.connectionProvider,
-        screenShareDataSource: this.screenShareDataSource
+        screenShareProvider: this.screenShareProvider,
+        annotationProvider: this.annotationProvider,
+        sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource,
+        connectionProvider: this.connectionProvider
       });
     }
   }, {

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

@@ -1,19 +1,21 @@
 import { FcrConnectionState, FcrMediaSourceState } from 'fcr-core';
+import { FcrScreenTrack } from 'fcr-core/lib/media-control/type';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
+import { AgoraRtcScreenCaptureType } 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 { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIDeviceProvider } from '../../providers/device-provider';
-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 { FcrUIConnectionProvider, FcrUIRoomProvider } from '../../providers/room-provider';
 import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
-import { FcrUIScreenShareDataSource } from '../../shared-data-source/screen-share-data-source';
+import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
+import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
+import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 export default class ShareScreenStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
@@ -22,51 +24,46 @@ export default class ShareScreenStore {
     private _messageProvider;
     private _dialogProvider;
     private _roomProvider;
-    private _streamControl;
     private _securityStore;
     private _userControl;
     private _boardControl;
+    private _screenShareProvider;
     private _controlBarWindowId;
-    private _currentShareStreamId;
     private _removeScreenStreamFailed;
-    private _isReplaceScreen;
-    private _previewDom;
     private _sharedMemberDataSource;
-    private _connectionObserver;
+    private _sharedScreenShareSharedDataSource;
+    private _connectionProvider;
+    private _isOnline;
     private _roomObserver;
-    private _observer;
     private _uiEventObserver;
-    private _streamObserver;
+    private _screenCaptureStateObserver;
     private _boardObserver;
-    private _loopbackAudioSourceId;
     private _shareSelectionDialogId;
     private _controlBarDialogId;
     private _videoWindowDialogId;
-    private _shareLocked;
-    private _screenTrack;
-    private _shareAudioTrack;
-    private _currentShareId;
-    private _currentShareType;
-    private _connectionProvider;
-    private _screenShareDataSource;
-    private _isOnline;
-    accessor screenSharingState: FcrMediaSourceState;
-    accessor applicationCaptureSources: AgoraRtcWindowInfo[];
-    accessor screenCaptureSources: FcrUIDisplayCaptureSource[];
-    accessor currentSelection: string;
-    accessor currentSelectionType: AgoraRtcScreenCaptureType;
-    accessor shareWithAudio: boolean;
+    private _annotationProvider;
     accessor boardOwnerUser: FcrUserInfo | undefined;
-    accessor currentSelectionBounds: CurrentShareBounds;
-    accessor connectionState: FcrConnectionState;
+    get currentShareStreamId(): string;
+    get screenTrack(): FcrScreenTrack | null;
+    get currentShareType(): AgoraRtcScreenCaptureType;
     get localUser(): FcrUserInfo;
     get localUserRole(): import("fcr-core").FcrUserRole;
     get isHost(): boolean;
     get supportEnumScreen(): boolean;
-    get appWindowList(): Promise<AgoraRtcWindowInfo[]>;
+    get appWindowList(): Promise<import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcWindowInfo[]>;
     get displayList(): Promise<import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcDisplayInfo[]>;
+    get connectionState(): FcrConnectionState;
+    get screenSharingState(): FcrMediaSourceState;
+    get applicationCaptureSources(): import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcWindowInfo[];
+    get screenCaptureSources(): import("./types").FcrUIDisplayCaptureSource[];
     get currentShareAudioProcessingChannel(): AudioProcessingChannel;
-    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, sharedMemberDataSource, roomProvider, sharedConfigDataSource, connectionProvider, screenShareDataSource, }: {
+    get currentSelectionId(): string;
+    get currentSelectionType(): AgoraRtcScreenCaptureType;
+    get shareWithAudio(): boolean;
+    get currentSelectionBounds(): CurrentShareBounds;
+    get shareLock(): boolean;
+    get currentShareId(): string;
+    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, sharedMemberDataSource, roomProvider, sharedConfigDataSource, screenShareProvider, annotationProvider, sharedScreenShareSharedDataSource, connectionProvider, }: {
         roomControl: FcrMainRoomControl;
         deviceProvider: FcrUIDeviceProvider;
         privilegeProvider: FcrUIPrivilegeProvider;
@@ -76,40 +73,36 @@ export default class ShareScreenStore {
         sharedMemberDataSource: FcrUIMemberSharedDataSource;
         roomProvider: FcrUIRoomProvider;
         sharedConfigDataSource: FcrUISharedConfigDataSource;
+        screenShareProvider: FcrUIScreenShareProvider;
+        annotationProvider: FcrUIAnnotationProvider;
+        sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
         connectionProvider: FcrUIConnectionProvider;
-        screenShareDataSource: FcrUIScreenShareDataSource;
     });
+    private _handleOnScreenCaptureStopped;
+    private _handleOnScreenCaptureStarted;
+    private _hasScreenSharePermission;
     handleChooseScreen: (id: string, type: AgoraRtcScreenCaptureType | undefined, bounds: CurrentShareBounds) => void;
     setShareWithAudioState(withAudio: boolean): void;
     hasLoopbackDevice(): Promise<boolean>;
-    setShareAudioProcessingChannel(channel: AudioProcessingChannel): void;
+    setShareAudioProcessingChannel(currentShareAudioProcessingChannel: AudioProcessingChannel): void;
     handlerBoardShareStop(): void;
     release(): void;
     openRelaunchTipsDialog(): void;
-    startPreview(dom: HTMLElement): void;
+    startRenderSharePreview(dom: HTMLElement): void;
+    stopRenderSharePreview(screenTrack?: FcrScreenTrack | null | undefined): void;
     handleStopShare(): void;
     prepareShareScreen(): Promise<void>;
     handleStartShare(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, audioProcessingChannel: AudioProcessingChannel | undefined, bounds: CurrentShareBounds): Promise<void>;
-    private _startLoopback;
-    private _handleShareStartWithAudio;
-    private _handleShareStopWithAudio;
     private _openShareScreenSelection;
     private _closeShareScreenSelection;
     private _setControlBarWindowId;
     private _openVideoWindowDialog;
     private _closeControlBar;
     private _closeVideoWindowDialog;
-    private _setWithAudioState;
+    private _handleOnScreenShareReplaceBegin;
     private _handleReplaceScreen;
-    private _createScreenStream;
-    private _handleWebScreenCaptureStateUpdated;
-    private _handleScreenCaptureStateUpdated;
     private _setShareLock;
-    private _closeCapture;
-    private _removeScreenStream;
-    private _syncShareStreamState;
-    private _isStoppedFor;
-    private _handleStreamUpdate;
+    private _closeShareScreenComps;
     private _addEventListeners;
     private _removeEventListeners;
     private _handleOnline;
@@ -119,8 +112,7 @@ export default class ShareScreenStore {
     private _validateWindow;
     private _validateDisplay;
     private _validateShareStart;
-    private _hasScreenSharePermission;
-    private _getExcludeWindows;
     private _initControlbar;
+    handleToggleScreenShareWithAudio(withAudio: boolean): void;
 }
 export declare const StoreContext: import("react").Context<ShareScreenStore>;