fcr-ui-scene 3.4.4 → 3.5.0

package/lib/modules/video-window/index.d.ts

@@ -13,8 +13,12 @@ import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
 import { FcrUIChatProvider } from '../../providers/chat-provider';
 import { FcrUIVideoWindowDataSource } from '../../shared-data-source/video-window';
 import { FcrUIRemoteVideoRenderProvider } from '../../providers/renderer-provider';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
+import { FcrUISharedDevicePrivilegeDataSource } from '../../shared-data-source/device-privilege-data';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 export declare class VideoWindowUIModule extends UIModule {
     private _store?;
+    private _deviceStore?;
     eventProvider?: FcrUIEventProvider;
     deviceProvider?: FcrUIDeviceProvider;
     currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
@@ -30,6 +34,9 @@ export declare class VideoWindowUIModule extends UIModule {
     chatProvider?: FcrUIChatProvider;
     sharedVideoWindowDataSource?: FcrUIVideoWindowDataSource;
     remoteRenderProvider?: FcrUIRemoteVideoRenderProvider;
+    sharedMemberDataSource?: FcrUIMemberSharedDataSource;
+    sharedDevicePrivilegeDataSource?: FcrUISharedDevicePrivilegeDataSource;
+    dialogProvider?: FcrUIDialogProvider;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

package/lib/modules/video-window/index.js

@@ -27,7 +27,7 @@ var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
 var _constant = require("../../utilities/constant");
 var _type = require("./type");
-var _env = require("agora-foundation/lib/utilities/env");
+var _store2 = require("../components/device-control/store");
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
@@ -42,14 +42,12 @@ var VideoWindowUIModule = exports.VideoWindowUIModule = /*#__PURE__*/function (_
   return (0, _createClass2["default"])(VideoWindowUIModule, [{
     key: "onNodeWillActive",
     value: function onNodeWillActive() {
-      var _this$currentRoomCont, _this$currentRoomCont2;
+      var _this$currentRoomCont, _this$mainRoomControl;
       this.eventProvider = this.eventProvider;
-      var userControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 || (_this$currentRoomCont = _this$currentRoomCont.currentRoomControl) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.getUserControl();
-      var streamControl = (_this$currentRoomCont2 = this.currentRoomControlProvider) === null || _this$currentRoomCont2 === void 0 || (_this$currentRoomCont2 = _this$currentRoomCont2.currentRoomControl) === null || _this$currentRoomCont2 === void 0 ? void 0 : _this$currentRoomCont2.getStreamControl();
+      var streamControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 || (_this$currentRoomCont = _this$currentRoomCont.currentRoomControl) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.getStreamControl();
       var securityStore = this.privilegeProvider;
       this._store = new _store["default"]({
         uiEventStore: this.eventProvider,
-        userControl: userControl,
         streamControl: streamControl,
         securityStore: securityStore,
         deviceStore: this.deviceProvider,
@@ -61,8 +59,9 @@ var VideoWindowUIModule = exports.VideoWindowUIModule = /*#__PURE__*/function (_
         sharedSettingDataSource: this.sharedSettingDataSource,
         chatProvider: this.chatProvider,
         sharedVideoWindowDataSource: this.sharedVideoWindowDataSource,
-        remoteRenderProvider: this.remoteRenderProvider
+        sharedMemberDataSource: this.sharedMemberDataSource
       });
+      this._deviceStore = new _store2.DeviceControlStore((_this$mainRoomControl = this.mainRoomControlProvider) === null || _this$mainRoomControl === void 0 ? void 0 : _this$mainRoomControl.mainRoomControl, this.deviceProvider, this.dialogProvider, this.deviceStreamProvider, this.sharedDevicePrivilegeDataSource);
       this.eventProvider.addObserver({
         onEvent: this.onUiEvent.bind(this)
       });
@@ -77,13 +76,15 @@ var VideoWindowUIModule = exports.VideoWindowUIModule = /*#__PURE__*/function (_
     value: function getComponent() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_store2.DeviceControlStoreContext.Provider, {
+          value: this._deviceStore,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {})
+        })
       });
     }
   }, {
     key: "onUiEvent",
     value: function onUiEvent(event, payload) {
-      var _this$_store;
       switch (event) {
         case _constant.FcrUIAction.STOP_SHARE_SCREEN:
           this._store.closeVideoWindow();
@@ -91,24 +92,17 @@ var VideoWindowUIModule = exports.VideoWindowUIModule = /*#__PURE__*/function (_
         case _constant.FcrUIAction.CLOSE_VIDEO_WINDOW:
           this._store.closeVideoWindow();
           break;
-        case _constant.FcrUIAction.SET_CURRENT_SHARE_SCREEN:
-          var _ref = payload,
-            id = _ref.id,
-            type = _ref.type,
-            bounds = _ref.bounds;
-          (0, _env.isElectron)() && ((_this$_store = this._store) === null || _this$_store === void 0 ? void 0 : _this$_store.getCurrentDisplayBounds(id, type, bounds));
-          break;
         case _constant.FcrUIAction.VIDEO_WINDOW_RESIZE:
-          var _ref2 = payload,
-            width = _ref2.width,
-            height = _ref2.height;
+          var _ref = payload,
+            width = _ref.width,
+            height = _ref.height;
           this._store.videoWindowCurrentHeight = height;
           this._store.videoWindowCurrentWidth = width;
           break;
         case _constant.FcrUIAction.FOLD_LIST_CHANGED:
           this._store.foldList = payload || [];
-          // 没有远端可以看了，如果当前在middle模式，切换到small模式
-          if (!this._store.shouldHaveMiddleView && this._store.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.MIDDLE) {
+          // 没有远端可以看了，如果当前在list模式，切换到small模式
+          if (!this._store.shouldHaveListView && this._store.videoWindowPreviewType === _type.FcrVideoWindowPreviewType.LIST) {
             this._store.setVideoWindowPreviewType(_type.FcrVideoWindowPreviewType.SMALL);
           } else {
             this._store.handleFoldListChanged();

package/lib/modules/video-window/members/index.js

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Members = void 0;
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.timers.js");
 var _react = require("react");

package/lib/modules/video-window/store.d.ts

@@ -1,42 +1,10 @@
-import { FcrUserControl, FcrStreamControl, FcrPrivilegeUserRole } from 'fcr-core';
-import { FcrUIConnectType } from '../../type';
-import { FcrVideoWindowPreviewType } from './type';
+import { FcrPrivilegeUserRole } from 'fcr-core';
+import { FcrVideoWindowPreviewType, VideoWindowStoreParams } from './type';
 import { FcrUIVideoWindowData } from '../layout/type';
-import { AgoraRtcRenderMode, AgoraRtcVideoStreamType, AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
 import { FcrUserRole } from 'fcr-core/lib/type';
-import { ConnectionTabType } from './type';
-import { FcrUIDeviceStreamProvider } from '../../providers/device-stream-provider';
-import { FcrUserUpdatedEvent } from 'fcr-core/lib/room-control/user-control/type';
-import { FcrUIEventProvider } from '../../providers/event-provider';
-import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
-import { FcrUIDeviceProvider } from '../../providers/device-provider';
-import { FcrUISharedSpeakerSpotlightDataSource } from '../../shared-data-source/speaker-spotlight';
-import { FcrUISharedPinDataSource } from '../../shared-data-source/pin-data';
-import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
-import { FcrUISharedInterpreterDataSource } from '../../shared-data-source/interpreter';
-import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
-import { FcrUIChatProvider } from '../../providers/chat-provider';
-import { FcrUIVideoWindowDataSource } from '../../shared-data-source/video-window';
-import { FcrUIRemoteVideoRenderProvider } from '../../providers/renderer-provider';
-import { CurrentShareBounds } from '../control-bar/types';
-export interface VideoWindowStoreParams {
-    uiEventStore: FcrUIEventProvider;
-    userControl: FcrUserControl;
-    streamControl: FcrStreamControl;
-    mediaControl: FcrUIDeviceProvider;
-    securityStore: FcrUIPrivilegeProvider;
-    deviceStore: FcrUIDeviceProvider;
-    deviceStreamStore: FcrUIDeviceStreamProvider;
-    sharedSpeakerSpotlightDataSource: FcrUISharedSpeakerSpotlightDataSource;
-    sharedPinDataSource: FcrUISharedPinDataSource;
-    sharedLayoutDataSource: FcrUISharedLayoutDataSource;
-    sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
-}
 export default class VideoWindowStore {
     private _uiEventStore;
-    private _userControl;
     private _deviceStore;
-    private _deviceStreamStore;
     private _streamControl;
     private _securityStore;
     private _subscriptions;
@@ -45,85 +13,48 @@ export default class VideoWindowStore {
     private _sharedSettingDataSource;
     private _chatProvider;
     private _sharedVideoWindowDataSource;
-    private _remoteRenderProvider;
-    private _isPopoverVisible;
+    private _sharedMemberDataSource;
     accessor userVolumeMap: Map<string, number>;
-    accessor speakHover: boolean;
+    accessor wrapperHovering: boolean;
     accessor videoWindowPreviewType: FcrVideoWindowPreviewType;
     accessor videoWindowCurrentWidth: number;
     accessor videoWindowCurrentHeight: number;
     accessor foldList: FcrUIVideoWindowData[];
-    accessor workareaX: number;
-    accessor workareaY: number;
-    accessor workareaWidth: number;
-    accessor workareaHeight: number;
-    accessor localUserRole: FcrUserRole;
-    accessor _spotlightStreamId: string;
-    accessor connectType: FcrUIConnectType;
-    accessor bounds: {
+    accessor innerFrameBounds: {
         width: number;
         height: number;
     };
-    setPopoverVisible(visible: boolean): void;
-    setBounds(width: number, height: number): void;
-    constructor(params: {
-        uiEventStore: FcrUIEventProvider;
-        userControl: FcrUserControl;
-        streamControl: FcrStreamControl;
-        securityStore: FcrUIPrivilegeProvider;
-        deviceStore: FcrUIDeviceProvider;
-        deviceStreamStore: FcrUIDeviceStreamProvider;
-        sharedSpeakerSpotlightDataSource: FcrUISharedSpeakerSpotlightDataSource;
-        sharedPinDataSource: FcrUISharedPinDataSource;
-        sharedLayoutDataSource: FcrUISharedLayoutDataSource;
-        sharedInterpreterDataSource: FcrUISharedInterpreterDataSource;
-        sharedSettingDataSource: FcrUISharedSettingDataSource;
-        chatProvider: FcrUIChatProvider;
-        sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
-        remoteRenderProvider: FcrUIRemoteVideoRenderProvider;
-    });
-    setVideoOrientation(): void;
-    release(): void;
     get shouldHideNonVideoParticipants(): boolean;
-    private _onAudioVolumeUpdated;
     get foldListRenderData(): FcrUIVideoWindowData[];
     get spotlightStreamId(): string;
     get findSpotlightUser(): FcrUIVideoWindowData | null | undefined;
     get hasPinnedStream(): boolean;
-    getLocalUserId(): string | undefined;
+    get videoWindowHeight(): number;
+    get interpreterUserList(): import("fcr-core/lib/room-control/interpreter-control/types").FcrInterpreterUserInfo[] | null;
+    get isInterpreterEnabled(): boolean;
+    get filterFoldList(): FcrUIVideoWindowData[];
+    get shouldHaveListView(): boolean;
+    get localUserRole(): FcrUserRole;
+    constructor(params: VideoWindowStoreParams);
+    setVideoOrientation(): void;
+    release(): void;
     removePin(streamId: string): void;
     addPin(streamId: string): void;
-    startPlayLocalVideo(element: HTMLElement, isMirror: boolean): void;
-    stopPlayLocalVideo(element: HTMLElement): void;
-    startRenderRemoteVideo(streamId: string, type: AgoraRtcVideoStreamType, renderMode: AgoraRtcRenderMode, isMirror: boolean, element: HTMLElement): void;
-    stopRenderRemoteVideo(streamId: string, element: HTMLElement): void;
     sendParticipantEvent(payload: unknown): void;
     muteAudio(mute: boolean, userId: string): void;
-    setLocalUserRole(role: FcrUserRole): void;
-    computedVideoWindowHeight(list: FcrUIVideoWindowData[], previewType: FcrVideoWindowPreviewType): number;
-    sliceFoldList(list: FcrUIVideoWindowData[], previewType: FcrVideoWindowPreviewType): FcrUIVideoWindowData[];
-    changeVideoWindowBounds(x: number, y: number, width: number, height: number, list: FcrUIVideoWindowData[]): void;
+    computedVideoWindowHeight(): number;
+    changeVideoWindowBounds(): void;
     openPrivateChat(userId: string): void;
     openRenameDialog(userId: string): void;
     hasMutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
     hasUnmutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
     hasRequestStartAudioPermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
-    onUserInfoUpdated(roomId: string, event: FcrUserUpdatedEvent): void;
     setVideoWindowPreviewType(type: FcrVideoWindowPreviewType): void;
     handleFoldListChanged(): void;
     closeVideoWindow(): void;
-    get microphoneEnabled(): boolean;
-    get microphoneVolumeLevel(): number;
-    filterFoldList(list: FcrUIVideoWindowData[], shouldHideNonVideoParticipants: boolean): FcrUIVideoWindowData[];
-    get videoWindowHeight(): number;
-    get interpreterUsers(): import("fcr-core/lib/room-control/interpreter-control/types").FcrInterpreterUserInfo[] | null;
-    get interpreterState(): boolean;
-    setSpeakHover(hover: boolean): void;
+    setWrapperHover(hover: boolean): void;
     getAllowedOperations(targetRole: FcrUserRole, isSelf: boolean): string[];
-    get shouldHaveMiddleView(): boolean;
-    getCurrentDisplayBounds(id: string, type: AgoraRtcScreenCaptureType, bounds: CurrentShareBounds): Promise<void>;
-    private _handleStreamsAddedOrUpdated;
-    openConnection(type: ConnectionTabType): void;
-    enableMicrophone(enable: boolean): void;
+    private _onAudioVolumeUpdated;
+    private _sliceFoldList;
 }
 export declare const StoreContext: import("react").Context<VideoWindowStore>;