fcr-ui-scene 3.7.5 → 3.7.7

package/lib/modules/event-toast/store.electron.js

@@ -55,7 +55,6 @@ var _logger = require("../../utilities/logger");
 var _objectManager = require("../../object-manager");
 var _store = _interopRequireDefault(require("./store.base"));
 var _decorator = require("agora-foundation/lib/decorator");
-var _levelConfig = require("../dialog/level-config");
 var _ToastStore;
 var _initProto;
 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)); }
@@ -80,24 +79,22 @@ var ToastStore = exports["default"] = /*#__PURE__*/function (_ToastStoreBase) {
     (0, _defineProperty2["default"])(_this, "_screenShareProvider", null);
     (0, _defineProperty2["default"])(_this, "_screenShareObserver", {
       onScreenShareStarted: function onScreenShareStarted() {
-        var toastWindow = _this._windowProvider.getWindowById(_constant.FcrUIDialogKey.TOAST);
         var screenShareProvider = _this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER);
         var workarea = screenShareProvider.sharingDisplayBounds;
-        toastWindow.setBounds(workarea);
-        toastWindow.setAlwaysOnTop(true, 'screen-saver', _levelConfig.WindowRelativeLevel.TOAST_LEVEL);
-        toastWindow.setIgnoreMouseEvents(true);
-        toastWindow.show();
+        _this._followCorrectDisplay(workarea);
       },
       onScreenShareStopped: function onScreenShareStopped() {
-        var toastWindow = _this._windowProvider.getWindowById(_constant.FcrUIDialogKey.TOAST);
-        toastWindow.hide();
+        _this._followCorrectDisplay();
       }
     });
     _this._objectManager = objectManager;
     _this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
     _this._windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
+    _this._renderer = objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
     _this._dialogProvider.openDialog(_constant.FcrUIDialogKey.TOAST);
-    _this._windowProvider.getWindowById(_constant.FcrUIDialogKey.TOAST).hide();
+    var toastWindow = _this._windowProvider.getWindowById(_constant.FcrUIDialogKey.TOAST);
+    toastWindow.setIgnoreMouseEvents(true);
+    _this._followCorrectDisplay();
     return _this;
   }
   (0, _inherits2["default"])(ToastStore, _ToastStoreBase);
@@ -127,6 +124,19 @@ var ToastStore = exports["default"] = /*#__PURE__*/function (_ToastStoreBase) {
       this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.TOAST);
       _superPropGet(ToastStore, "release", this, 3)([]);
     }
+  }, {
+    key: "_followCorrectDisplay",
+    value: function _followCorrectDisplay(workarea) {
+      var toastWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.TOAST);
+      if (workarea) {
+        toastWindow.setBounds(workarea);
+      } else {
+        var currentWindow = this._windowProvider.getCurrentWindow();
+        var currentWindowBounds = currentWindow.getBounds();
+        var display = this._renderer.getDisplayMatching(currentWindowBounds);
+        toastWindow.setBounds(display.bounds);
+      }
+    }
   }]);
 }(_store["default"]);
 _ToastStore = ToastStore;

package/lib/modules/event-toast/store.js

@@ -7,7 +7,6 @@ require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.date.to-primitive.js");
-require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
@@ -27,6 +26,7 @@ require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.keys.js");
@@ -65,9 +65,9 @@ var _constant = require("../../utilities/constant");
 var _toast = require("agora-ui-foundation/lib/components/toast");
 var _react = require("react");
 var _logger = require("../../utilities/logger");
-var _objectManager = require("../../object-manager");
-var _struct = require("../../providers/message/struct");
-var _chat = require("../chat");
+var _dialogUtils = require("../../utilities/dialog-utils");
+var _store = require("../dialog/store");
+var _platform = require("../../utilities/platform");
 var _ToastStore;
 var _initProto, _init_toasts, _addToastDecs, _handleToastEventDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -85,20 +85,21 @@ _ref = (_addToastDecs = [_mobx.action, _mobx.action.bound], _handleToastEventDec
 var ToastStore = exports["default"] = /*#__PURE__*/function () {
   function ToastStore(_ref2) {
     var _this = this;
-    var objectManager = _ref2.objectManager;
+    var uiEventStore = _ref2.uiEventStore,
+      messageProvider = _ref2.messageProvider;
     (0, _classCallCheck2["default"])(this, ToastStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ToastStore'
     })));
     (0, _defineProperty2["default"])(this, "_disposers", []);
-    (0, _defineProperty2["default"])(this, "_messageObserver", {
-      onToastReceived: this._handleToastEvent
+    (0, _defineProperty2["default"])(this, "_toastEventObserver", {
+      onEvent: this._handleToastEvent.bind(this)
     });
     _classPrivateFieldInitSpec(this, _A, _init_toasts(this, new Map()));
-    this._messageProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MESSAGE_PROVIDER);
-    var windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
-    this._toastWindow = windowProvider.getWindowById(_constant.FcrUIDialogKey.TOAST, _constant.FcrUIDialogKey.TOAST);
-    this._messageProvider.addObserver(this._messageObserver);
+    this._messageProvider = messageProvider;
+    this._uiEventProvider = uiEventStore;
+    this._uiEventProvider.addObserver(this._toastEventObserver);
+    this._messageProvider.addObserver(this._toastEventObserver);
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.toastsList;
     }, function () {
@@ -146,37 +147,54 @@ var ToastStore = exports["default"] = /*#__PURE__*/function () {
       this._disposers.forEach(function (disposer) {
         return disposer();
       });
-      this._messageProvider.removeObserver(this._messageObserver);
+      this._messageProvider.removeObserver(this._toastEventObserver);
+      this._uiEventProvider.removeObserver(this._toastEventObserver);
     }
   }, {
     key: "_handleToastEvent",
-    value: function _handleToastEvent(params, position) {
-      var _params$duration;
-      _toast.FcrToastApi.open({
-        id: params.id,
-        toastProps: {
-          type: params.type,
-          content: params.message
-        },
-        customRootClass: position === _struct.FcrUIToastPosition.CHAT ? _chat.CHAT_WRAPPER_CLASS : params.customRootClass,
-        duration: (_params$duration = params.duration) !== null && _params$duration !== void 0 ? _params$duration : 3000
-      });
-      // if (action === FcrUIAction.OPEN_DIALOG && params.dialogKey === FcrUIDialogKey.SHOW_TOAST) {
-      //   followCorrectDisplay({ dialogKey: FcrUIDialogKey.SHOW_TOAST, alwaysFollowScreen: true });
-
-      //   if (isElectron() && isWindows()) {
-      //     this._toastWindow.setAlwaysOnTop(true, 'screen-saver');
-      //   }
-
-      //   const { type = 'info', message: content, duration } = params.params;
-
-      //   this.addToast({
-      //     type,
-      //     content,
-      //     duration,
-      //     dialogId: params.dialogId,
-      //   });
-      // }
+    value: function _handleToastEvent(action, params) {
+      if (action === _constant.FcrUIAction.SHOW_TOAST) {
+        var _params$duration;
+        _toast.FcrToastApi.open({
+          id: params === null || params === void 0 ? void 0 : params.id,
+          toastProps: {
+            type: params.type,
+            content: params.message
+          },
+          customRootClass: params === null || params === void 0 ? void 0 : params.customRootClass,
+          duration: (_params$duration = params.duration) !== null && _params$duration !== void 0 ? _params$duration : 3000
+        });
+      }
+      if (action === _constant.FcrUIAction.OPEN_DIALOG && params.dialogKey === _constant.FcrUIDialogKey.SHOW_TOAST) {
+        var _dialogWindows$get;
+        (0, _dialogUtils.followCorrectDisplay)({
+          dialogKey: _constant.FcrUIDialogKey.SHOW_TOAST,
+          alwaysFollowScreen: true
+        });
+        (0, _platform.isWindows)() && ((_dialogWindows$get = _store.dialogWindows.get(_constant.FcrUIDialogKey.SHOW_TOAST)) === null || _dialogWindows$get === void 0 ? void 0 : _dialogWindows$get.setAlwaysOnTop(true, 'screen-saver'));
+        var _params$params = params.params,
+          _params$params$type = _params$params.type,
+          type = _params$params$type === void 0 ? 'info' : _params$params$type,
+          content = _params$params.message,
+          duration = _params$params.duration;
+        // if (!isElectron()) {
+        //   return FcrToastApi.open({
+        //     id: Date.now().toString(),
+        //     toastProps: {
+        //       type,
+        //       content,
+        //     },
+        //     customRootClass: params?.customRootClass,
+        //     duration: 30000, // params.duration ?? 3000,
+        //   });
+        // }
+        this.addToast({
+          type: type,
+          content: content,
+          duration: duration,
+          dialogId: params.dialogId
+        });
+      }
     }
   }]);
 }();

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

@@ -122,6 +122,7 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
   var renderBoardContent = function renderBoardContent(windowData, windowId) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_boardContext["default"].Provider, {
       value: {
+        videoWindowLayoutType: layoutType,
         showToolbar: commonProps.showToolbar
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

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

@@ -0,0 +1,176 @@
+import { FcrPrivilegeUserRole, FcrStreamControl } from 'fcr-core';
+import { FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
+import { FcrLayoutSlots, FcrUIVideoWindowData, FcrUIVideoWindowLayoutType, LayoutStoreParams } 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 } from '../../providers/event-provider';
+import { FcrUIAction } from '../../utilities/constant';
+import { FcrUISetMainSpeakerParams } from '../../type';
+export default class LayoutStore implements FcrLayoutSlots, FcrUIEventObserver {
+    private readonly logger;
+    private _videoWindowDataSource;
+    private _eventProvider;
+    private _deviceProvider;
+    private _privilegeProvider;
+    private _userControl;
+    private _streamControl;
+    private _roomControl;
+    private _whiteBoardControl;
+    private _chatRoomControl;
+    private _localView;
+    private _disposers;
+    private _barLockTimer;
+    private _liveStreamState;
+    private _sharedInterpreterDataSource;
+    private _sharedLayoutDataSource;
+    private _sharedSettingDataSource;
+    private _sharedMemberDataSource;
+    private _chatProvider;
+    private _pinDataSource;
+    private _sharedScreenShareDataSource;
+    private _sharedAnnotationDataSource;
+    private _multiDisplayProvider;
+    accessor participant: React.ReactNode;
+    accessor chat: React.ReactNode;
+    accessor chatAction: React.ReactNode;
+    accessor stateBar: React.ReactNode;
+    accessor actionBar: React.ReactNode;
+    accessor layers: React.ReactNode;
+    accessor whiteboard: React.ReactNode;
+    accessor annotation: React.ReactNode;
+    accessor screenShareControl: React.ReactNode;
+    accessor collapsed: boolean;
+    accessor aside: boolean;
+    accessor barHovering: boolean;
+    accessor barLocked: boolean;
+    accessor barHidden: boolean;
+    accessor asideWidth: number;
+    accessor userVolumeMap: Map<string, number>;
+    accessor chatRoomState: FcrChatRoomConnectionState;
+    accessor whiteboardActive: boolean;
+    accessor ownerUser: FcrUserInfo | undefined;
+    get streamControl(): FcrStreamControl;
+    get localUserRole(): FcrUserRole;
+    get localUser(): FcrUserInfo;
+    get shouldHideNonVideoParticipants(): boolean;
+    get shouldHideMyVideo(): boolean;
+    get enableSpotlight(): boolean;
+    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-source/video-window").FcrUIVideoWindowDataImpl[];
+    get layoutMainList(): import("../../shared-data-source/video-window").FcrUIVideoWindowDataImpl[];
+    get mainList(): import("../../shared-data-source/video-window").FcrUIVideoWindowDataImpl[];
+    get mainListMapByAudioStreamId(): Map<string, FcrUIVideoWindowData>;
+    get spotlightStreamId(): string;
+    get foldList(): import("../../shared-data-source/video-window").FcrUIVideoWindowDataImpl[];
+    get currentShareData(): import("../../shared-data-source/video-window").FcrUIVideoWindowDataImpl | undefined;
+    get galleryList(): import("../../shared-data-source/video-window").FcrUIVideoWindowDataImpl[];
+    get isMainWindow(): boolean;
+    get isMainWindowInScreenSharing(): boolean;
+    get isCurrentUserInBoardSharing(): boolean;
+    get asideLayout(): import("../../type").FcrUIUpdateAsideParams;
+    get carouselList(): import("../../shared-data-source/video-window").FcrUIVideoWindowDataImpl[];
+    get hasPinnedStream(): boolean;
+    get isRobot(): boolean;
+    get findSpotlightUser(): import("../../shared-data-source/video-window").FcrUIVideoWindowDataImpl | null | undefined;
+    get isWhoISpeakingActive(): boolean | "" | undefined;
+    get microphoneEnabled(): boolean;
+    get allowChat(): boolean;
+    get allowUnmuteSelfAudio(): boolean;
+    get allowUnmuteSelfVideo(): boolean;
+    get isHostOrCoHost(): boolean;
+    get galleryMaxSize(): number;
+    get allowedAllChat(): boolean;
+    get allowedPublicChatAndDisallowedPrivateChat(): boolean;
+    get disallowedPublicChatAndDisallowedPrivateChatToParticipant(): boolean;
+    get disallowedAllChat(): boolean;
+    get privilegeOperator(): FcrUserInfo | undefined;
+    get localUserId(): string;
+    get interpreterUserList(): import("fcr-core/lib/room-control/interpreter-control/types").FcrInterpreterUserInfo[] | null;
+    get isInterpreterEnabled(): boolean;
+    get secondaryWindowContentType(): "hidden" | "speaker" | "gallery" | "local-camera" | "remote-camera" | "sharing-screen" | "sharing-screen-with-annotation" | "sharing-whiteboard";
+    get isMultiDisplayActive(): boolean;
+    get isLocalCameraInSecondaryWindow(): boolean;
+    constructor(params: LayoutStoreParams);
+    get participantCount(): number;
+    get isVideoSuspended(): boolean;
+    get asideContent(): import("../../type").FcrUIUpdateAsideParams;
+    get participantsRenderAt(): "aside" | "dialog";
+    get chatRenderAt(): "aside" | "dialog";
+    getWaterMarkContent(): string;
+    hasMutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
+    hasUnmutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
+    hasRequestStartAudioPermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
+    toggleMainStream(streamId: string): void;
+    addPinMessage(streamId: string): void;
+    cancelPinMessage(streamId: string): void;
+    addPin(streamId: string): void;
+    removePin(streamId: string): void;
+    setVideoOrientation(): void;
+    setAllowChat(allowChat: boolean): void;
+    handleSetPinState(userId: string): void;
+    setWhiteboardActive(active: boolean): void;
+    setAsideWidth(val: number): void;
+    /**
+     * Partially update slots, use `null` to delete the slot.
+     * `undefined` is ignored.
+     */
+    updateSlots(slots: Partial<FcrLayoutSlots>): void;
+    closeParticipantFromAside(): void;
+    moveParticipantFromAsideToDialog(): void;
+    closeChatFromAside(): void;
+    closeAsideChat(): void;
+    moveChatFromAsideToDialog(): void;
+    openPrivateChat(userId: string): void;
+    openRenameDialog(userId: string): void;
+    getAllowedOperations: (targetRole: FcrUserRole, isSelf: boolean) => string[];
+    toggleLayout(layout: FcrUIVideoWindowLayoutType, manual?: boolean): void;
+    toggleCollapsed(collapsed?: boolean): void;
+    toggleAside(open?: boolean): void;
+    asideWidthChanged(width: number): void;
+    toggleLayoutBarLock(state: boolean): void;
+    toggleLayoutBarHidden(): void;
+    resetLockTimer(): void;
+    setHoveringHandler(): void;
+    setHoveringLeaveHandler(): false | void;
+    setScreenShareSpeakerViewSize(width: number, height: number): void;
+    handleLiveLayoutChange(modifiedUser: FcrUserInfo): void;
+    release(): void;
+    onUserInfoUpdated(roomId: string, event: FcrUserUpdatedEvent): void;
+    stopLocalPreview(view: HTMLDivElement): void;
+    startLocalPreview(div: HTMLDivElement | null): void;
+    setAllowChatWithPayload(type: 'public' | 'private_to_manager'): void;
+    setScaleValue(scale: number): void;
+    muteAudio(mute: boolean, userId: string): void;
+    sendParticipantEvent(payload: unknown): void;
+    onEvent(action: FcrUIAction.SET_MAIN_SPEAKER, payload: FcrUISetMainSpeakerParams): void;
+    onEvent(action: FcrUIAction.TOGGLE_LAYOUT_BAR_LOCK, payload: boolean): void;
+    private _addListeners;
+    private get _hasVideoStreamUser();
+    private _shouldUnpin;
+    private _isVideoParticipantVisible;
+    private _handleLayoutUpdated;
+    private _handleFoldListChanged;
+    private _handleMainListLengthChanged;
+    private _handleMainListChanged;
+    private _switchToSpeaker;
+    private _switchToGallery;
+    private _setBarHovering;
+    private _initStream;
+    private _handleConnectionUpdated;
+    private _findVideoWindowByUserId;
+    private _onRemoteUsersLeft;
+    private _handleLiveStreamingStateUpdated;
+    private _handleStreamAdded;
+    private _onStreamsAdded;
+    private _onStreamsUpdated;
+    private _onStreamsRemoved;
+    private _onAudioVolumeUpdated;
+    private _setSpotlightStream;
+    private _findSpotlightStream;
+}
+export declare const StoreContext: import("react").Context<LayoutStore>;

package/lib/modules/layout/store.electron.js

@@ -98,7 +98,7 @@ var LayoutStoreElectron = exports["default"] = /*#__PURE__*/function (_LayoutSto
         if (sharingBySelf && isSharingScreen) {
           _this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
           _this._multiDisplayProvider.showMainWindowInIndexLeastDisplay({
-            maximize: true
+            isMaximized: true
           });
         } else {
           _this._multiDisplayProvider.setMainWindowMaximize();