fcr-ui-scene 3.4.5 → 3.5.1

package/lib/modules/control-bar/components/share-state-nav/index.js

@@ -1,6 +1,7 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -14,9 +15,9 @@ require("./index.css");
 var _mobxReact = require("mobx-react");
 var _store = require("../../store");
 var _react = require("react");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _type2 = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _meetingTime = require("../../../../hooks/meeting-time");
 var _enums = require("../../enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var DragIcon = exports.DragIcon = function DragIcon() {
@@ -43,16 +44,11 @@ var ShareStateNav = exports.ShareStateNav = (0, _mobxReact.observer)(function (p
     currentPosition = props.currentPosition;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     roomDuration = _useContext.roomDuration,
-    startTime = _useContext.startTime,
     isMuteAudio = _useContext.isMuteAudio,
-    cloudRecordingState = _useContext.cloudRecordingState;
-  var _useMeetingTime = (0, _meetingTime.useMeetingTime)({
-      duration: roomDuration,
-      startTime: startTime
-    }),
-    meetingTime = _useMeetingTime.meetingTime,
-    totalHourText = _useMeetingTime.totalHourText,
-    totalMinuteText = _useMeetingTime.totalMinuteText;
+    cloudRecordingState = _useContext.cloudRecordingState,
+    meetingTime = _useContext.meetingTime,
+    totalHourText = _useContext.totalHourText,
+    totalMinuteText = _useContext.totalMinuteText;
   var totalMins = (0, _react.useMemo)(function () {
     return Math.floor(roomDuration / 1000 / 60);
   }, [roomDuration]);
@@ -76,6 +72,22 @@ var ShareStateNav = exports.ShareStateNav = (0, _mobxReact.observer)(function (p
         })
       })
     }), cloudRecordingState !== _type2.FcrRecordingState.Stopped && cloudRecordingState !== _type2.FcrRecordingState.Paused && /*#__PURE__*/(0, _jsxRuntime.jsx)(RecordingOn, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "share-state-nav__meeting-elapsed-time",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        className: (0, _classnames["default"])(),
+        children: meetingTime
+      }), roomDuration > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+        trigger: "hover",
+        mouseEnterDelay: 0,
+        content: transI18n('fmt_popup_label_meetingduration', {
+          reason1: totalMins
+        }),
+        placement: "bottom",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+          children: ["(", totalHourText, totalMinuteText, ")"]
+        })
+      })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "share-state-nav__stop-share fcr-flex fcr-items-center fcr-justify-center",
       onClick: props.onStopShare,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {

package/lib/modules/control-bar/index.css

@@ -284,8 +284,7 @@
 
   cursor: pointer;
 }
-
-.fcr-button {
+.share-action-nav .fcr-button {
   -webkit-app-region: no-drag;
 }
 

package/lib/modules/control-bar/index.d.ts

@@ -12,6 +12,13 @@ import { FcrUISharedChatDataSource } from '../../shared-data-source/chat-data';
 import { FcrUIDevicePrivilegeProvider } from '../../providers/device-privilege-provider';
 import { FcrUISharedDevicePrivilegeDataSource } from '../../shared-data-source/device-privilege-data';
 import { CurrentShareScreenTypes } from '../share-screen/types';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
+import { FcrUILocalStorageProvider } from '../../providers/local-storage-provider';
+import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeting-time';
+import { FcrUIMessageProvider } from '../../providers/message-provider';
+import { FcrUISecuritySharedDataSource } from '../../shared-data-source/security-data';
 export declare class ControlBarUIModule extends UIModule {
     private _store?;
     private _deviceControlStore?;
@@ -27,6 +34,13 @@ export declare class ControlBarUIModule extends UIModule {
     sharedChatDataSource?: FcrUISharedChatDataSource;
     devicePrivilegeProvider?: FcrUIDevicePrivilegeProvider;
     sharedDevicePrivilegeDataSource?: FcrUISharedDevicePrivilegeDataSource;
+    sharedMemberDataSource?: FcrUIMemberSharedDataSource;
+    localStorageProvider?: FcrUILocalStorageProvider;
+    abilityProvider?: FcrUIAbilityProviderImpl;
+    dialogProvider?: FcrUIDialogProvider;
+    sharedMeetingTimeDataSource?: FcrUIMeetingTimeSharedDataSource;
+    messageProvider?: FcrUIMessageProvider;
+    sharedSecuritySharedDataSource?: FcrUISecuritySharedDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(props: {

package/lib/modules/control-bar/index.js

@@ -67,12 +67,18 @@ var ControlBarUIModule = exports.ControlBarUIModule = /*#__PURE__*/function (_UI
         deviceProvider: this.deviceProvider,
         sharedLayoutDataSource: this.sharedLayoutDataSource,
         roomProvider: this.roomProvider,
-        screenShareProvider: this.screenShareProvider,
-        sharedChatDataSource: this.sharedChatDataSource
+        sharedChatDataSource: this.sharedChatDataSource,
+        sharedMemberDataSource: this.sharedMemberDataSource,
+        localStorageProvider: this.localStorageProvider,
+        abilityProvider: this.abilityProvider,
+        sharedMeetingTimeDataSource: this.sharedMeetingTimeDataSource,
+        messageProvider: this.messageProvider,
+        sharedSecuritySharedDataSource: this.sharedSecuritySharedDataSource
       });
       this.privilegeProvider = this.privilegeProvider;
-      this._deviceControlStore = new _store2.DeviceControlStore((_this$mainRoomControl2 = this.mainRoomControlProvider) === null || _this$mainRoomControl2 === void 0 ? void 0 : _this$mainRoomControl2.mainRoomControl, this.deviceProvider, this.eventProvider, this.deviceStreamProvider, this.sharedDevicePrivilegeDataSource);
-      this._leaveMeetingStore = new _store3.LeaveMeetingStore(this.privilegeProvider, this.roomProvider, this.mainRoomControlProvider.mainRoomControl);
+      this.screenShareProvider = this.screenShareProvider;
+      this._deviceControlStore = new _store2.DeviceControlStore((_this$mainRoomControl2 = this.mainRoomControlProvider) === null || _this$mainRoomControl2 === void 0 ? void 0 : _this$mainRoomControl2.mainRoomControl, this.deviceProvider, this.dialogProvider, this.deviceStreamProvider, this.sharedDevicePrivilegeDataSource);
+      this._leaveMeetingStore = new _store3.LeaveMeetingStore(this.privilegeProvider, this.roomProvider, this.mainRoomControlProvider.mainRoomControl, this.sharedMemberDataSource, this.abilityProvider, this.dialogProvider);
       this.eventProvider.addObserver({
         onEvent: this.onUiEvent.bind(this)
       });

package/lib/modules/control-bar/store.d.ts

@@ -1,17 +1,23 @@
 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 { FcrLiveStreamingState, FcrRecordingState, FcrRoomInfo, FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
+import { FcrLiveStreamingState, FcrRecordingState, FcrRoomInfo } from 'fcr-core/lib/type';
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
 import { FcrUIDeviceProvider } from '../../providers/device-provider';
 import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
 import { FcrUIRoomProvider } from '../../providers/room-provider';
 import { MoreAction } from './enums';
-import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
 import { FcrUISharedChatDataSource } from '../../shared-data-source/chat-data';
 import { CurrentShareBounds } from './types';
 import { CurrentShareScreenTypes } from '../share-screen/types';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
+import { FcrUILocalStorageProvider } from '../../providers/local-storage-provider';
+import { FcrUIAbilityProviderImpl } from '../../providers/ability-provider';
+import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeting-time';
+import { CurrentShareScreenWorkArea } from '../../utilities/tools';
+import { FcrUIMessageProvider } from '../../providers/message-provider';
+import { FcrSecurityCheckedStateType, FcrUISecuritySharedDataSource } from '../../shared-data-source/security-data';
 export default class ControlBarStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _screenBounds;
@@ -19,26 +25,27 @@ export default class ControlBarStore {
     private _disposers;
     private _roomControl;
     private _securityStore;
-    private _userControl;
-    private _streamControl;
-    private _streamObserver;
-    private _userObserver;
     private _roomObserver;
     private _boardObserver;
     private _roomProvider;
-    private _screenShareProvider;
     private _sharedChatDataSource;
     private _liveStreamingDialogKey;
     private _sharedLayoutDataSource;
+    private _sharedMemberDataSource;
     private _deviceProvider;
+    private _localStorageProvider;
+    private _abilityProvider;
+    private _sharedMeetingTimeDataSource;
+    private _sharedSecuritySharedDataSource;
+    private _messageProvider;
     accessor leaveConfirmRef: React.ReactNode;
     accessor shareWithAudio: boolean;
     accessor shareAudioProcessingChannel: AudioProcessingChannel;
     accessor currentShareId: string;
     accessor currentShareType: AgoraRtcScreenCaptureType;
     accessor currentShareBounds: CurrentShareBounds;
+    accessor recordShareBounds: Map<CurrentShareBounds, CurrentShareScreenWorkArea>;
     accessor cloudRecordingState: FcrRecordingState;
-    accessor localUserRole: FcrUserRole;
     accessor isHost: boolean;
     accessor roomDuration: number;
     accessor startTime: number;
@@ -47,15 +54,12 @@ export default class ControlBarStore {
     accessor allApplicationWindows: AgoraRtcWindowInfo[];
     accessor roomInfo: FcrRoomInfo;
     accessor isShowMeetingDetailPortal: boolean;
-    accessor users: FcrUserInfo[];
-    accessor isPstnUser: boolean;
     accessor hiddenShareActionNav: boolean;
     accessor boardOwnerUser: string;
-    accessor meetingId: string | undefined;
     accessor currentShareDisplayId: number;
     get privilegeProvider(): FcrUIPrivilegeProvider;
-    get localUser(): FcrUserInfo;
-    get remoteUsers(): FcrUserInfo[];
+    get localUser(): import("fcr-core/lib/type").FcrUserInfo;
+    get remoteUsers(): import("fcr-core/lib/type").FcrUserInfo[];
     get screenBounds(): {
         width: number;
         height: number;
@@ -70,23 +74,42 @@ export default class ControlBarStore {
     get hasStartLiveStreamingPermission(): boolean;
     get hasAssignHostBeforeLeavingPermission(): boolean;
     get hasEndRoomPermission(): boolean;
+    get totalHourText(): string;
+    get totalMinuteText(): string;
+    get meetingTimeStatus(): import("../../shared-data-source/meeting-time").MeetingStatus;
+    get meetingTime(): string;
     get isMuteAudio(): boolean;
     get newMessageCount(): import("../action-bar/types").ChatRoomStoreMap;
     set newMessageCount(value: import("../action-bar/types").ChatRoomStoreMap);
-    constructor({ uiEventStore, securityStore, roomControl, deviceProvider, sharedLayoutDataSource, roomProvider, screenShareProvider, sharedChatDataSource, }: {
+    get isRoomDetailSupported(): boolean;
+    get meetingTimeKey(): string;
+    get roomId(): string | undefined;
+    get meetingId(): string | undefined;
+    get scheduleInfo(): import("fcr-core/lib/type").FcrRoomSchedule | undefined;
+    get isPstnUser(): boolean;
+    get localUserRole(): import("fcr-core").FcrUserRole;
+    get users(): import("fcr-core/lib/type").FcrUserInfo[];
+    constructor({ uiEventStore, securityStore, roomControl, deviceProvider, sharedLayoutDataSource, roomProvider, sharedChatDataSource, sharedMemberDataSource, localStorageProvider, abilityProvider, sharedMeetingTimeDataSource, messageProvider, sharedSecuritySharedDataSource, }: {
         uiEventStore: FcrUIEventProvider;
         securityStore: FcrUIPrivilegeProvider;
         roomControl: FcrMainRoomControl;
         deviceProvider: FcrUIDeviceProvider;
         sharedLayoutDataSource: FcrUISharedLayoutDataSource;
         roomProvider: FcrUIRoomProvider;
-        screenShareProvider: FcrUIScreenShareProvider;
         sharedChatDataSource: FcrUISharedChatDataSource;
+        sharedMemberDataSource: FcrUIMemberSharedDataSource;
+        localStorageProvider: FcrUILocalStorageProvider;
+        abilityProvider: FcrUIAbilityProviderImpl;
+        sharedMeetingTimeDataSource: FcrUIMeetingTimeSharedDataSource;
+        messageProvider: FcrUIMessageProvider;
+        sharedSecuritySharedDataSource: FcrUISecuritySharedDataSource;
     });
+    get checkedStateMap(): FcrSecurityCheckedStateType;
+    setCheckedStateMap(val: FcrSecurityCheckedStateType): void;
     initControlBar(payload: any, browserWindow: Electron.BrowserWindow): void;
     updateCurrentShareContent(payload: CurrentShareScreenTypes): void;
-    setLocalUserRole(role: FcrUserRole): void;
     setShareWithAudioState(withAudio: boolean): void;
+    showLockedRoomToast(enable: boolean): void;
     createNewShare(): void;
     handlerStopShare(): void;
     setShareAudioProcessingChannel(target: AudioProcessingChannel): void;
@@ -100,11 +123,8 @@ export default class ControlBarStore {
     setShowMeetingDetailPortal(show: boolean): void;
     setEnableWaitingRoom(enable: boolean): void;
     handleLeaveRoom(): void;
+    getLocalMeetingTime(): string | null;
     release(): void;
     private _resetMessageCount;
-    private _handleStreamUpdate;
-    private _handleRemoteUsersJoined;
-    private _handleRemoteUsersLeft;
-    private _handleUserInfoUpdated;
 }
 export declare const StoreContext: import("react").Context<ControlBarStore>;