fcr-ui-scene 3.6.4-rc.1 → 3.7.0

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

@@ -26,6 +26,7 @@ require("./index.css");
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
 var _selection = require("./components/selection");
+var _controlBar = _interopRequireDefault(require("./components/control-bar"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -53,8 +54,8 @@ var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_
         screenShareProvider: this.screenShareProvider,
         annotationProvider: this.annotationProvider,
         sharedScreenShareSharedDataSource: this.sharedScreenShareSharedDataSource,
-        connectionProvider: this.connectionProvider,
-        abilityProvider: this.abilityProvider
+        abilityProvider: this.abilityProvider,
+        sharedAnnotationDataSource: this.sharedAnnotationDataSource
       });
     }
   }, {
@@ -71,6 +72,14 @@ var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {})
       });
     }
+  }, {
+    key: "getControlComponent",
+    value: function getControlComponent() {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
+        value: this._store,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar["default"], {})
+      });
+    }
   }, {
     key: "getSelectionComponent",
     value: function getSelectionComponent() {

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 { AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
+import { AgoraRtcDisplayInfo, 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 { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
@@ -11,12 +11,13 @@ 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 { FcrUIRoomProvider } from '../../providers/room-provider';
 import { FcrUISharedConfigDataSource } from '../../shared-data-source/config';
 import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
 import { FcrUIAbilityProvider } from '../../providers/ability-provider';
+import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
 export default class ShareScreenStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
@@ -30,12 +31,13 @@ export default class ShareScreenStore {
     private _boardControl;
     private _screenShareProvider;
     private _controlBarWindowId;
-    private _removeScreenStreamFailed;
     private _sharedMemberDataSource;
     private _sharedScreenShareSharedDataSource;
-    private _connectionProvider;
     private _abilityProvider;
     private _isOnline;
+    private _windowList;
+    private _displayList;
+    private _streamControl;
     private _cardChooseBounds;
     private _roomObserver;
     private _uiEventObserver;
@@ -45,20 +47,22 @@ export default class ShareScreenStore {
     private _controlBarDialogId;
     private _videoWindowDialogId;
     private _annotationProvider;
+    private _sharedAnnotationDataSource;
     accessor boardOwnerUser: FcrUserInfo | undefined;
     get cardChooseBounds(): CurrentShareBounds;
     get currentShareStreamId(): string;
     get screenTrack(): FcrScreenTrack | null;
     get currentShareType(): AgoraRtcScreenCaptureType;
+    get isCurrentOriginal(): boolean;
     get localUser(): FcrUserInfo;
     get localUserRole(): import("fcr-core").FcrUserRole;
     get isHost(): boolean;
     get supportEnumScreen(): boolean;
-    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 appWindowList(): Promise<AgoraRtcWindowInfo[]>;
+    get displayList(): Promise<AgoraRtcDisplayInfo[]>;
     get connectionState(): FcrConnectionState;
-    get screenSharingState(): FcrMediaSourceState;
-    get applicationCaptureSources(): import("agora-rte-sdk/lib/core/rtc/type").AgoraRtcWindowInfo[];
+    get localUserScreenSharingState(): FcrMediaSourceState;
+    get applicationCaptureSources(): AgoraRtcWindowInfo[];
     get screenCaptureSources(): import("./types").FcrUIDisplayCaptureSource[];
     get currentShareAudioProcessingChannel(): AudioProcessingChannel;
     get currentSelectionId(): string;
@@ -67,8 +71,15 @@ export default class ShareScreenStore {
     get currentSelectionBounds(): CurrentShareBounds;
     get shareLock(): boolean;
     get currentShareId(): string;
+    get annotationHasStart(): boolean;
+    get allowAnnotationWrite(): boolean;
+    get screenShareWindowData(): import("../../type").FcrUIVideoWindowData | undefined;
+    get isZoomMaxmum(): boolean;
+    get isZoomMinimum(): boolean;
+    get isAspectRatioPreserved(): boolean;
+    get isCurrentScreenShareInSmoothType(): boolean;
     get _screenShareInfoForLog(): string;
-    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, sharedMemberDataSource, roomProvider, sharedConfigDataSource, screenShareProvider, annotationProvider, sharedScreenShareSharedDataSource, connectionProvider, abilityProvider, }: {
+    constructor({ roomControl, deviceProvider, privilegeProvider, messageProvider, dialogProvider, eventProvider, sharedMemberDataSource, roomProvider, sharedConfigDataSource, screenShareProvider, annotationProvider, sharedScreenShareSharedDataSource, abilityProvider, sharedAnnotationDataSource, }: {
         roomControl: FcrMainRoomControl;
         deviceProvider: FcrUIDeviceProvider;
         privilegeProvider: FcrUIPrivilegeProvider;
@@ -81,14 +92,21 @@ export default class ShareScreenStore {
         screenShareProvider: FcrUIScreenShareProvider;
         annotationProvider: FcrUIAnnotationProvider;
         sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource;
-        connectionProvider: FcrUIConnectionProvider;
         abilityProvider: FcrUIAbilityProvider;
+        sharedAnnotationDataSource: FcrUISharedAnnotationSource;
     });
     private _handleOnScreenCaptureStopped;
     private _handleOnScreenCaptureStarted;
     private _hasScreenSharePermission;
+    get allowAnnotationSelfWriteState(): boolean;
+    get isShowToolbar(): boolean;
+    toggleIsShowToolbar(): void;
     handleChooseScreen: (id: string, type?: AgoraRtcScreenCaptureType) => void;
     setShareWithAudioState(withAudio: boolean): void;
+    zoomIn(): void;
+    zoomOut(): void;
+    fullContainer(): void;
+    setOriginScalc(): void;
     hasLoopbackDevice(): Promise<boolean>;
     setShareAudioProcessingChannel(currentShareAudioProcessingChannel: AudioProcessingChannel): void;
     setCardChooseBounds(bounds: CurrentShareBounds): void;
@@ -98,6 +116,8 @@ export default class ShareScreenStore {
     startRenderSharePreview(dom: HTMLElement): void;
     stopRenderSharePreview(screenTrack?: FcrScreenTrack | null | undefined): void;
     handleStopShare(): void;
+    handleStopShareByExitRoom(): void;
+    participantShareCanWeAnnotation(): boolean;
     prepareShareScreen(): Promise<void>;
     handleStartShare(id: string, type: AgoraRtcScreenCaptureType, withAudio: boolean, audioProcessingChannel: AudioProcessingChannel | undefined, bounds: CurrentShareBounds): Promise<void>;
     isAnnotationSupported(): boolean;
@@ -109,7 +129,6 @@ export default class ShareScreenStore {
     private _closeVideoWindowDialog;
     private _handleOnScreenShareReplaceBegin;
     private _handleReplaceScreen;
-    private _setShareLock;
     private _closeShareScreenComps;
     private _addEventListeners;
     private _removeEventListeners;
@@ -123,6 +142,8 @@ export default class ShareScreenStore {
     private _initControlbar;
     private _handleBrowserShow;
     private _hendleBrowserHide;
+    private _handleOnScreenShareSeize;
     handleToggleScreenShareWithAudio(withAudio: boolean): void;
+    toggleShareWithScenarioType(isCurrentSmoothType: boolean): void;
 }
 export declare const StoreContext: import("react").Context<ShareScreenStore>;