fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/modules/layout/components/Carousel.js

@@ -14,7 +14,7 @@ var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
-var _hooks = require("../../../utilities/hooks");
+var _hooks = require("agora-ui-foundation/lib/utilities/hooks");
 var _store = require("../store.base");
 var _type2 = require("../type");
 var _utils = require("./utils");

package/lib/modules/layout/components/CommonVideoRenderer.js

@@ -112,7 +112,11 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
     localUser = _useContext3.localUser,
     hasMutePermission = _useContext3.hasMutePermission,
     hasUnmutePermission = _useContext3.hasUnmutePermission,
-    hasRequestStartAudioPermission = _useContext3.hasRequestStartAudioPermission;
+    hasRequestStartAudioPermission = _useContext3.hasRequestStartAudioPermission,
+    setControlbarEnabled = _useContext3.setControlbarEnabled,
+    controlbarEnabled = _useContext3.controlbarEnabled,
+    isAnnotationOpened = _useContext3.isAnnotationOpened,
+    hasAnnotationWritePermission = _useContext3.hasAnnotationWritePermission;
   var getFormatWindowData = useFormatWindowData();
   var commonProps = useCommonProps(layoutType);
   var toggleFullScreen = function toggleFullScreen() {
@@ -204,6 +208,8 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
     setScaleValue(1);
     return false;
   }, [scalcValue]);
+  var showEnterBoardEdit = isAnnotationOpened ? !controlbarEnabled : false;
+  var showExitBoardEdit = isAnnotationOpened ? controlbarEnabled : false;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: data.map(function (windowData) {
       var windowId = windowData.windowId,
@@ -234,14 +240,18 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
             height: dimensions.height
           },
           className: clsWithShareControlBar,
-          children: [isMainWindowInScreenSharing && screenShareControl, isMainWindowInScreenSharing && /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.WhiteboardControlbar, {
+          children: [isMainWindowInScreenSharing && screenShareControl, isMainWindowInScreenSharing && /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.ScreenShareControlbar, {
             ownerUserName: windowData.userName,
-            sharingType: 'annotation',
             onZoomIn: handleZoomIn,
             onZoomOut: handleZoomOut,
             onAdaptive: handleAdaptive,
             onOrigin: handleOrigin,
-            isSharingAudio: windowData.hasLoopbackSharing && windowData.hasMicrophoneAudioStream
+            isSharingAudio: windowData.hasLoopbackSharing && windowData.hasMicrophoneAudioStream,
+            onEnable: setControlbarEnabled,
+            controlEnabled: controlbarEnabled,
+            showEnterBoardEdit: showEnterBoardEdit,
+            showExitBoardEdit: showExitBoardEdit,
+            canWriteBoard: hasAnnotationWritePermission
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_memberWindow.MemberWindow, {
             memberWindowPreviewType: commonProps.memberWindowPreviewType,
             canShowSpeakerSpotlight: commonProps.canShowSpeakerSpotlight,

package/lib/modules/layout/components/Gallery.js

@@ -31,7 +31,7 @@ var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
-var _hooks = require("../../../utilities/hooks");
+var _hooks = require("agora-ui-foundation/lib/utilities/hooks");
 var _store = require("../store.base");
 var _type2 = require("../type");
 var _utils = require("./utils");

package/lib/modules/layout/index.css

@@ -26,34 +26,3 @@
   z-index: 1000;
   height: 0;
 }
-
-.login-confirm-dialog-content {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-  padding: 20px;
-}
-
-.login-confirm-dialog-content img {
-  margin-top: -36px;
-  margin-bottom: 24px;
-}
-
-.login-confirm-dialog-title {
-  font-weight: 600;
-  font-size: 16px;
-  margin-bottom: 10px;
-}
-
-.login-confirm-dialog-desc {
-  margin-bottom: 20px;
-}
-
-.login-confirm-dialog-btn {
-  width: 100%;
-}
-
-.login-confirm-dialog-content .fcr-button {
-  width: 100%;
-}

package/lib/modules/layout/store.base.d.ts

@@ -1,6 +1,6 @@
 import { FcrPrivilegeUserRole, FcrStreamControl } from 'fcr-core';
 import { FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
-import { FcrLayoutSlots, FcrUIVideoWindowData, FcrUIVideoWindowLayoutType, LayoutStoreArgs } from './type';
+import { FcrLayoutSlots, FcrUIVideoWindowLayoutType, LayoutStoreArgs } from './type';
 import { FcrChatRoomConnectionState } from 'fcr-core/lib/room-control/chatroom-control/type';
 import { FcrUserUpdatedEvent } from 'fcr-core/lib/room-control/user-control/type';
 import { FcrUIEventObserver, FcrUIEventProvider } from '../../providers/event-provider';
@@ -9,8 +9,9 @@ import { FcrUIManagedObject } from '../../object-manager';
 import { FcrUIDisplayDistributionContentType, SharingType } from '../secondary-window/type';
 import { FcrUIDialogProvider } from '../../providers/dialog/type';
 export declare abstract class LayoutStoreBase implements FcrLayoutSlots, FcrUIEventObserver, FcrUIManagedObject {
-    private readonly logger;
+    protected readonly logger: import("agora-foundation/lib/logger").Logger;
     private _videoWindowDataSource;
+    private _sharedUserAudioVolumeDataSource;
     protected _eventProvider: FcrUIEventProvider;
     private _messageProvider;
     protected _dialogProvider: FcrUIDialogProvider;
@@ -32,10 +33,7 @@ export declare abstract class LayoutStoreBase implements FcrLayoutSlots, FcrUIEv
     private _chatProvider;
     private _pinDataSource;
     private _sharedScreenShareDataSource;
-    private _roomProvider;
-    private _roomProviderObserver;
-    private _roomObserver;
-    private _streamObserverByVolumeIndicationUpdated;
+    private _annotationProvider;
     accessor participant: React.ReactNode;
     accessor chat: React.ReactNode;
     accessor chatAction: React.ReactNode;
@@ -54,7 +52,6 @@ export declare abstract class LayoutStoreBase implements FcrLayoutSlots, FcrUIEv
     accessor barLocked: boolean;
     accessor barHidden: boolean;
     accessor asideWidth: number;
-    accessor userVolumeMap: Map<string, number>;
     accessor chatRoomState: FcrChatRoomConnectionState;
     accessor whiteboardActive: boolean;
     accessor ownerUser: FcrUserInfo | undefined;
@@ -63,17 +60,15 @@ export declare abstract class LayoutStoreBase implements FcrLayoutSlots, FcrUIEv
     get localUser(): FcrUserInfo;
     get shouldHideNonVideoParticipants(): boolean;
     get shouldHideMyVideo(): boolean;
-    get enableSpotlight(): boolean;
+    get userVolumeMap(): Map<string, number>;
     get isWaterMarkEnabled(): boolean;
     get isMulti(): boolean;
     get layout(): import("../../type").FcrUIVideoWindowLayoutType;
     get manualLayout(): import("../../type").FcrUIVideoWindowLayoutType | undefined;
     get scalcValue(): number;
-    get annotationHasStart(): boolean;
     get sourceList(): import("../../shared-data/video-window").FcrUIVideoWindowDataImpl[];
     get layoutMainList(): import("../../shared-data/video-window").FcrUIVideoWindowDataImpl[];
     get mainList(): import("../../shared-data/video-window").FcrUIVideoWindowDataImpl[];
-    get mainListMapByAudioStreamId(): Map<string, FcrUIVideoWindowData>;
     get spotlightStreamId(): string;
     get foldList(): import("../../shared-data/video-window").FcrUIVideoWindowDataImpl[];
     get currentShareData(): import("../../shared-data/video-window").FcrUIVideoWindowDataImpl | undefined;
@@ -113,6 +108,9 @@ export declare abstract class LayoutStoreBase implements FcrLayoutSlots, FcrUIEv
     get participantsRenderAt(): "aside" | "dialog";
     get chatRenderAt(): "aside" | "dialog";
     get subtitlesHistoryRenderAt(): "aside" | "dialog";
+    get controlbarEnabled(): boolean;
+    get isAnnotationOpened(): boolean;
+    get hasAnnotationWritePermission(): boolean;
     getWaterMarkContent(): string;
     hasMutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
     hasUnmutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
@@ -160,6 +158,7 @@ export declare abstract class LayoutStoreBase implements FcrLayoutSlots, FcrUIEv
     setAllowChatWithPayload(type: 'public' | 'private_to_manager'): void;
     setScaleValue(scale: number): void;
     muteAudio(mute: boolean, userId: string): void;
+    setControlbarEnabled(enabled: boolean): void;
     sendParticipantEvent(payload: unknown): void;
     onEvent(action: FcrUIAction.TOGGLE_LAYOUT_BAR_LOCK, payload: boolean): void;
     /**
@@ -180,15 +179,10 @@ export declare abstract class LayoutStoreBase implements FcrLayoutSlots, FcrUIEv
     private _handleConnectionUpdated;
     private _findVideoWindowByUserId;
     private _onRemoteUsersLeft;
-    private _handleRoutingChanged;
-    private _handleRoomProviderLiveStreamingStateUpdated;
     private _handleLiveStreamingStateUpdated;
     private _handleStreamAdded;
     private _onStreamsAdded;
     private _onStreamsUpdated;
     private _onStreamsRemoved;
-    private _onAudioVolumeUpdated;
-    private _setSpotlightStream;
-    private _findSpotlightStream;
 }
 export declare const StoreContext: import("react").Context<LayoutStoreBase>;