fcr-ui-scene 3.3.1 → 3.4.1

package/lib/modules/waiting-room-layout/view.js

@@ -6,61 +6,71 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _react = require("react");
-var _context = require("./context");
+var _store = require("./store");
 var _localVideoPlayer = require("agora-ui-foundation/lib/components/local-video-player");
 require("./index.css");
 var _mobxReact = require("mobx-react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
 var View = (0, _mobxReact.observer)(function () {
   var t = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_context.StoreContext),
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
     stateBar = _useContext.stateBar,
     actionBar = _useContext.actionBar,
     chat = _useContext.chat,
+    layers = _useContext.layers,
     cameraDeviceId = _useContext.cameraId,
     startPlayLocalVideo = _useContext.startPlayLocalVideo,
     stopPlayLocalVideo = _useContext.stopPlayLocalVideo,
     cameraEnabled = _useContext.cameraEnabled,
-    localUser = _useContext.localUser;
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: "waiting-room-layout",
+    localUser = _useContext.localUser,
+    setVideoOrientation = _useContext.setVideoOrientation;
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "waiting-room-module",
       children: stateBar
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "waiting-room-title",
-      children: t('fmt_waitingroom_attendie_overview_label_waitingroom')
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "waiting-room-desc",
-      children: t('fmt_waitingroom_attendie_overview_label_wait_moment')
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "waiting-room-content",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "waiting-room-video-content",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_localVideoPlayer.LocalVideoPlayer, {
-          isLocalMirrorEnabled: false,
-          userName: localUser.userName,
-          showSlider: false,
-          cameraDeviceId: cameraDeviceId,
-          showCameraPreview: cameraEnabled,
-          showTopTips: false,
-          startLocalVideo: startPlayLocalVideo,
-          stopLocalVideo: stopPlayLocalVideo
-        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-          className: "waiting-room-attendee-name",
-          children: [localUser.userName, /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-            className: "attendee__me-badge",
-            children: ["(", t('fmt_participant_label_Me'), ")"]
+      className: "waiting-room-layout",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "waiting-room-title",
+        children: t('fmt_waitingroom_attendie_overview_label_waitingroom')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "waiting-room-desc",
+        children: t('fmt_waitingroom_attendie_overview_label_wait_moment')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "waiting-room-content",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "waiting-room-video-content",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_localVideoPlayer.LocalVideoPlayer, {
+            isLocalMirrorEnabled: false,
+            userName: localUser.userName,
+            showSlider: false,
+            cameraDeviceId: cameraDeviceId,
+            showCameraPreview: cameraEnabled,
+            showTopTips: false,
+            startLocalVideo: startPlayLocalVideo,
+            stopLocalVideo: stopPlayLocalVideo,
+            setVideoOrientation: setVideoOrientation,
+            showRotation: (0, _env.isElectron)()
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            className: "waiting-room-attendee-name",
+            children: [localUser.userName, /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+              className: "attendee__me-badge",
+              children: ["(", t('fmt_participant_label_Me'), ")"]
+            })]
           })]
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "waiting-room-chat-content",
+          children: chat
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "waiting-room-chat-content",
-        children: chat
+        className: "waiting-room-module waiting-room-bottom",
+        children: actionBar
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "waiting-room-layer",
+        children: layers
       })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "waiting-room-module waiting-room-bottom",
-      children: actionBar
     })]
   });
 });

package/lib/modules/whiteboard/app.js

@@ -15,7 +15,7 @@ var _progress = _interopRequireDefault(require("./components/progress"));
 require("./style.css");
 var _boardContext = _interopRequireDefault(require("../../utilities/board-context"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _agoraEduCore = require("agora-edu-core");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_boardContext["default"]),
@@ -31,7 +31,7 @@ var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
     handleCollectorDomLoad = _useContext2.handleCollectorDomLoad,
     handleClose = _useContext2.handleClose,
     handleOpen = _useContext2.handleOpen;
-  var loading = connectionState === _agoraEduCore.FcrConnectionState.CONNECTING || connectionState === _agoraEduCore.FcrConnectionState.RECONNECTING;
+  var loading = connectionState === _fcrCore.FcrConnectionState.CONNECTING || connectionState === _fcrCore.FcrConnectionState.RECONNECTING;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "board-widget-app",

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

@@ -51,6 +51,7 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = (0, _mobxReact.observe
   var isSponsor = (ownerUser === null || ownerUser === void 0 ? void 0 : ownerUser.userId) === (currentUser === null || currentUser === void 0 ? void 0 : currentUser.userId);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "whiteboard-controlbar",
+    id: "whiteboard-controlbar",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "whiteboard-controlbar-left",
       children: transI18n('fmt_screenshare_whiteboard_tips_someonesharing', {
@@ -113,12 +114,9 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = (0, _mobxReact.observe
       }), (canWriteBoard || isSponsor || isHost) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
           type: "vertical"
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-          content: transI18n('fmt_screenshare_whiteboard_options_changetheme'),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: "whiteboard-controlbar-item",
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_switchTheme["default"], {})
-          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "whiteboard-controlbar-item",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_switchTheme["default"], {})
         })]
       })]
     }), !controlEnabled && !isSponsor && !isHost && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {

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

@@ -1,6 +1,6 @@
 import { FcrUIEventStore } from '../../../../common/event-store';
-import { FcrUserInfo } from 'agora-edu-core/lib/type';
-import { FcrStreamControl, FcrUserControl } from 'agora-edu-core';
+import { FcrUserInfo } from 'fcr-core/lib/type';
+import { FcrStreamControl, FcrUserControl } from 'fcr-core';
 import { FcrSecurityStore } from '../../../../common/security-store';
 export declare class WhiteboardControlBarStore {
     accessor ownerUser: FcrUserInfo | undefined;

package/lib/modules/whiteboard/components/control-bar/store.js

@@ -54,7 +54,7 @@ var _constant = require("../../../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
 var _type = require("../../type");
 var _mobx = require("mobx");
-var _type2 = require("agora-edu-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _WhiteboardControlBarStore;
 var _initProto, _init_ownerUser, _init_currentUser, _init_lonelywindowOpened, _init_isMinimum, _init_isMaxmum, _init_isAdaptived, _init_isOriginal, _init_scaleValue, _init_controlEnabled, _init_isHost, _setOwnerUserDecs, _onEnableDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }

package/lib/modules/whiteboard/components/loading/index.js

@@ -15,7 +15,7 @@ var _mobxReact = require("mobx-react");
 var _context = require("../../context");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _button = require("agora-ui-foundation/lib/components/button");
-var _agoraEduCore = require("agora-edu-core");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var Loading = exports.Loading = (0, _mobxReact.observer)(function () {
   var transI18n = (0, _i18n.useI18n)();
@@ -25,7 +25,7 @@ var Loading = exports.Loading = (0, _mobxReact.observer)(function () {
     joinSuccessed = _useContext$observabl.joinSuccessed,
     canOperate = _useContext$observabl.canOperate,
     handleClose = _useContext.handleClose;
-  var isReconnecting = connectionState === _agoraEduCore.FcrConnectionState.RECONNECTING || connectionState === _agoraEduCore.FcrConnectionState.CONNECTING && joinSuccessed;
+  var isReconnecting = connectionState === _fcrCore.FcrConnectionState.RECONNECTING || connectionState === _fcrCore.FcrConnectionState.CONNECTING && joinSuccessed;
   var _useState = (0, _react.useState)(!isReconnecting || !canOperate),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     minimize = _useState2[0],

package/lib/modules/whiteboard/components/multi-window/index.js

@@ -12,7 +12,7 @@ var _react = require("react");
 var _context = require("../../context");
 require("./index.css");
 var _boardContext = _interopRequireDefault(require("../../../../utilities/board-context"));
-var _agoraEduCore = require("agora-edu-core");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 var MultiWindowWidgetDialog = exports.MultiWindowWidgetDialog = (0, _mobxReact.observer)(function (_ref) {
   var children = _ref.children;
@@ -21,7 +21,7 @@ var MultiWindowWidgetDialog = exports.MultiWindowWidgetDialog = (0, _mobxReact.o
     setWhiteboardVisible = _useContext.setWhiteboardVisible;
   var _useContext2 = (0, _react.useContext)(_boardContext["default"]),
     showToolbar = _useContext2.showToolbar;
-  var showControlbar = connectionState === _agoraEduCore.FcrConnectionState.CONNECTED;
+  var showControlbar = connectionState === _fcrCore.FcrConnectionState.CONNECTED;
   var handleCancel = function handleCancel() {
     setWhiteboardVisible(false);
   };

package/lib/modules/whiteboard/components/progress/electron.js

@@ -1,18 +1,18 @@
 "use strict";
 
 var _mobxReact = require("mobx-react");
-var _context = require("../../../dialog/context");
+var _store = require("../../../dialog/store");
 var _react = require("react");
 var _reactDom = require("react-dom");
 var _jsxRuntime = require("react/jsx-runtime");
 var ProgressElectronDialog = (0, _mobxReact.observer)(function (_ref) {
   var children = _ref.children;
-  var store = (0, _react.useContext)(_context.StoreContext);
+  var store = (0, _react.useContext)(_store.StoreContext);
   (0, _react.useEffect)(function () {
     var node;
     window.runtime.openRendererWindow('progress-dialog', function (dom) {
       node = dom;
-      (0, _reactDom.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_context.StoreContext.Provider, {
+      (0, _reactDom.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: store,
         children: children
       }), dom);

package/lib/modules/whiteboard/components/switch-theme/index.css

@@ -31,6 +31,7 @@
   color: var(--fcr_ui_scene_icontext1);
 }
 .whiteboard-switch-theme_item-active {
+  color: var(--fcr_ui_scene_white10);
   background-color: var(--fcr_ui_scene_ramp_brand6);
 }
 

package/lib/modules/whiteboard/components/switch-theme/index.js

@@ -25,6 +25,7 @@ var _store = require("../toolbar/store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _context = require("../../context");
 var _mobxReact = require("mobx-react");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var WhiteboardSwitchTheme = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
@@ -45,6 +46,10 @@ var WhiteboardSwitchTheme = (0, _mobxReact.observer)(function () {
       width: '100%'
     },
     overlayOffset: 2,
+    showArrow: false,
+    getTooltipContainer: function getTooltipContainer() {
+      return document.getElementById('whiteboard-controlbar');
+    },
     visible: whiteboardVisible,
     content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "whiteboard-switch-theme",
@@ -74,15 +79,20 @@ var WhiteboardSwitchTheme = (0, _mobxReact.observer)(function () {
         })
       })]
     }),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-      type: _type.FcrIconType.FCR_WHITEBOARD_BG,
-      size: 22,
-      colors: {
-        iconPrimary: 'var(--fcr_ui_scene_icontext1)'
-      },
-      onClick: function onClick() {
-        return setWhiteboardVisible(!whiteboardVisible);
-      }
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+      content: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_options_changetheme'),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+          type: _type.FcrIconType.FCR_WHITEBOARD_BG,
+          size: 22,
+          colors: {
+            iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+          },
+          onClick: function onClick() {
+            return setWhiteboardVisible(!whiteboardVisible);
+          }
+        })
+      })
     })
   });
 });

package/lib/modules/whiteboard/components/toolbar/components/eraser-picker.js

@@ -24,7 +24,7 @@ var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _store = require("../store");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 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; }

package/lib/modules/whiteboard/components/toolbar/hooks/index.js

@@ -34,7 +34,7 @@ var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _store = require("../store");
 var _screenCapturePicker = require("../components/screen-capture-picker");
 var _env = require("agora-foundation/lib/utilities/env");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diraction) {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),

package/lib/modules/whiteboard/components/toolbar/store.d.ts

@@ -1,5 +1,5 @@
 import { FcrBoardShape, WhiteboardThemeType } from '../../type';
-import { FcrBoardToolType } from 'agora-edu-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 export declare class ToolbarStore {
     accessor observables: {
         currentTool: FcrBoardToolType | undefined;

package/lib/modules/whiteboard/context.d.ts

@@ -1,4 +1,4 @@
-import { FcrConnectionState } from 'agora-edu-core';
+import { FcrConnectionState } from 'fcr-core';
 import React from 'react';
 export interface DraggableHandler {
     getPosition(): {

package/lib/modules/whiteboard/context.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BoardUIContext = void 0;
-var _agoraEduCore = require("agora-edu-core");
+var _fcrCore = require("fcr-core");
 var _react = require("react");
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
@@ -13,7 +13,7 @@ var boardUIContextDefault = {
   observables: {
     canOperate: false,
     minimized: false,
-    connectionState: _agoraEduCore.FcrConnectionState.DISCONNECTED,
+    connectionState: _fcrCore.FcrConnectionState.DISCONNECTED,
     joinSuccessed: false,
     contentAreaSize: {
       width: 0,

package/lib/modules/whiteboard/index.d.ts

@@ -1,13 +1,9 @@
-import { FcrUIEventStore } from '../../common/event-store';
-import { FcrBoardRegion, ToolbarEvents, WhiteboardBaseEvents, WhiteboardControlbarEvents, WhiteboardEvents, WhiteboardUIEvents } from './type';
+import { FcrBoardRegion, WhiteboardBaseEvents, WhiteboardControlbarEvents } from './type';
 import { DialogKey, UIAction } from '../../utilities/constant';
 import { UIModule } from '../../base';
-import { FcrUserInfo } from 'agora-edu-core/lib/type';
-import { FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { FcrSecurityStore } from '../../common/security-store';
-import { FcrWhiteboardControl } from 'agora-edu-core/lib/room-control/whiteboard-control/types';
+import { FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrUIVideoWindowLayoutType } from '../layout/type';
-import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { StoreConfig } from '../../type';
 export declare class FcrWhiteboardUIModule extends UIModule {
     private _disposers;
     private _uiEventStore;
@@ -52,14 +48,7 @@ export declare class FcrWhiteboardUIModule extends UIModule {
         top: number;
         left: number;
     };
-    constructor({ uiEventStore, userControl, roomControl, whiteboardControl, streamControl, securityStore, }: {
-        uiEventStore: FcrUIEventStore;
-        userControl: FcrUserControl;
-        roomControl: FcrBaseRoomControl;
-        whiteboardControl: FcrWhiteboardControl;
-        streamControl: FcrStreamControl;
-        securityStore: FcrSecurityStore;
-    });
+    constructor({ uiEventStore, userControl, roomControl, streamControl, securityStore, }: StoreConfig);
     getComponent(dom?: Element | null): React.ReactNode;
     onEvent(event: UIAction, payload: {
         dialogKey: DialogKey;
@@ -70,10 +59,6 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     } & {
         layout: FcrUIVideoWindowLayoutType;
     }): void;
-    onProcessEvent(event: {
-        action: ToolbarEvents & WhiteboardEvents & WhiteboardUIEvents;
-        payload: never;
-    }): void;
     onPropertiesUpdate(params: {
         operatorUser: FcrUserInfo;
     }): void;
@@ -87,7 +72,6 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     private _resetToolIfNeed;
     private _checkBoard;
     private _boardUIEvents;
-    private _caseToolbarEvents;
     private _setCanvasBound;
     private _resetCanvasPosition;
     private _resetScaleState;