fcr-ui-scene 3.6.1 → 3.6.3

package/lib/modules/whiteboard/index.js

@@ -179,7 +179,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       onBackgroundColorUpdated: _this._setBackground,
       onConnectionStateUpdated: function () {
         var _onConnectionStateUpdated = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(state) {
-          var _this$_whiteboardCont, _this$_whiteboardCont2, mainWindow, _this$_whiteboardCont3, ownerUserId, isActive, _this$_userControl, ownerUser;
+          var _this$_whiteboardCont, _this$_whiteboardCont2, mainWindow, isActive, ownerUserId, _this$_userControl, ownerUser;
           return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -198,7 +198,8 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
                   mainWindow = (_this$_whiteboardCont2 = _this._whiteboardControl) === null || _this$_whiteboardCont2 === void 0 ? void 0 : _this$_whiteboardCont2.getMainWindow();
                   _this.logger.info('Fcr board join success');
                   if (_this._whiteboardControl) {
-                    _this$_whiteboardCont3 = _this._whiteboardControl.getBoardActiveInfo(), ownerUserId = _this$_whiteboardCont3.ownerUserId, isActive = _this$_whiteboardCont3.isActive;
+                    isActive = _this._whiteboardControl.getActivity();
+                    ownerUserId = _this._whiteboardControl.getOwnerId();
                     if (isActive) {
                       ownerUser = (_this$_userControl = _this._userControl) === null || _this$_userControl === void 0 ? void 0 : _this$_userControl.getUser(ownerUserId);
                       _this._controlbarStore.ownerUser = ownerUser;
@@ -312,8 +313,8 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       this._uiEventStore = this.eventProvider;
       this._roomControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl;
       this._securityStore = this.privilegeProvider;
-      this._whiteboardControl = this._roomControl.getBoardControl();
-      this._toolbarStore = new _store.ToolbarStore(this._whiteboardControl, this._roomControl);
+      this._whiteboardControl = this._roomControl.getSharingControl().getBoardControl();
+      this._toolbarStore = new _store.ToolbarStore(this._whiteboardControl, this._roomControl, this.annotationProvider, this.eventProvider);
       var streamControl = this._roomControl.getStreamControl();
       var userControl = this._roomControl.getUserControl();
       this._userControl = userControl;
@@ -321,7 +322,8 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         uiEventStore: this.eventProvider,
         streamControl: streamControl,
         userControl: userControl,
-        securityStore: this.privilegeProvider
+        securityStore: this.privilegeProvider,
+        annotationProvider: this.annotationProvider
       });
       this._whiteboardControl.addObserver(this._boardObserver);
       streamControl.addObserver({
@@ -366,9 +368,8 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       this._localUser = this._userControl.getLocalUser();
       this._isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes(this._localUser.userRole);
       window.addEventListener('resize', this._resetCanvasPosition);
-      var _this$_whiteboardCont4 = this._whiteboardControl.getBoardActiveInfo(),
-        ownerUserId = _this$_whiteboardCont4.ownerUserId,
-        isActive = _this$_whiteboardCont4.isActive;
+      var isActive = this._whiteboardControl.getActivity();
+      var ownerUserId = this._whiteboardControl.getOwnerId();
       this._isActive = isActive;
       if (isActive) {
         this._checkBoard();
@@ -409,16 +410,16 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
   }, {
     key: "onEvent",
     value: function onEvent(event, payload) {
-      var _this$_whiteboardCont6;
+      var _this$_whiteboardCont4;
       switch (event) {
         case _constant.FcrUIAction.OPEN_WHITEBOARD:
           if (!this._isActive) {
-            var _this$_whiteboardCont5;
-            (_this$_whiteboardCont5 = this._whiteboardControl) === null || _this$_whiteboardCont5 === void 0 || _this$_whiteboardCont5.active();
+            var _this$_whiteboardCont3;
+            (_this$_whiteboardCont3 = this._whiteboardControl) === null || _this$_whiteboardCont3 === void 0 || _this$_whiteboardCont3.active();
           }
           break;
         case _constant.FcrUIAction.CLOSE_WHITEBOARD:
-          (_this$_whiteboardCont6 = this._whiteboardControl) === null || _this$_whiteboardCont6 === void 0 || _this$_whiteboardCont6.inactive();
+          (_this$_whiteboardCont4 = this._whiteboardControl) === null || _this$_whiteboardCont4 === void 0 || _this$_whiteboardCont4.inactive();
           break;
         case _constant.FcrUIAction.WHITEBOARD_CHANGED:
           this._setCanvasBound(payload.action);
@@ -498,18 +499,17 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         this._addDisposers();
         this._repositionToolbar();
         if (this._boardMainWindow) {
-          var _this$_whiteboardCont7;
-          this._setBackground(((_this$_whiteboardCont7 = this._whiteboardControl) === null || _this$_whiteboardCont7 === void 0 ? void 0 : _this$_whiteboardCont7.getBackgroundColor()) || this._boardBackground);
+          var _this$_whiteboardCont5, _this$_whiteboardCont6;
+          this._setBackground(((_this$_whiteboardCont5 = this._whiteboardControl) === null || _this$_whiteboardCont5 === void 0 ? void 0 : _this$_whiteboardCont5.getBackgroundColor()) || this._boardBackground);
           // this._toolbarStore!.observables.layoutReady = [
           //   LonelyWindowState.CLOSE,
           //   LonelyWindowState.DEFAULT,
           // ].includes(this._lonelyWindowState);
 
-          var _getBoardActiveInfo = this._whiteboardControl.getBoardActiveInfo(),
-            ownerUserId = _getBoardActiveInfo.ownerUserId,
-            isActive = _getBoardActiveInfo.isActive;
-          if (isActive) {
-            var _this$_userControl2, _this$_ownerUser3, _this$_localUser3, _this$_boardStore2, _this$_boardStore3, _this$_uiEventStore3;
+          var isActive = (_this$_whiteboardCont6 = this._whiteboardControl) === null || _this$_whiteboardCont6 === void 0 ? void 0 : _this$_whiteboardCont6.getActivity();
+          if (isActive && this._whiteboardControl) {
+            var _this$_userControl2, _this$_ownerUser3, _this$_localUser3, _this$_boardStore2, _this$_boardStore3, _this$_uiEventStore3, _this$_toolbarStore;
+            var ownerUserId = this._whiteboardControl.getOwnerId();
             this._ownerUser = (_this$_userControl2 = this._userControl) === null || _this$_userControl2 === void 0 ? void 0 : _this$_userControl2.getUser(ownerUserId);
             this._isMyBoard = ((_this$_ownerUser3 = this._ownerUser) === null || _this$_ownerUser3 === void 0 ? void 0 : _this$_ownerUser3.userId) === ((_this$_localUser3 = this._localUser) === null || _this$_localUser3 === void 0 ? void 0 : _this$_localUser3.userId);
             (_this$_boardStore2 = this._boardStore) === null || _this$_boardStore2 === void 0 || _this$_boardStore2.setPrivilege(this._isMyBoard || this._isHost);
@@ -518,6 +518,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
               action: _type.WhiteboardBaseEvents.SET_OWNER_USER_ID,
               payload: ownerUserId
             });
+            (_this$_toolbarStore = this._toolbarStore) === null || _this$_toolbarStore === void 0 || _this$_toolbarStore.resetToolbarVars();
           } else {
             this.logger.warn('whiteboard mount, getBoardActiveInfo activeInfo isActive is false , ownerUserId is null');
           }
@@ -736,10 +737,10 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
   }, {
     key: "_open",
     value: function _open() {
-      var _this$_whiteboardCont8;
+      var _this$_whiteboardCont7;
       this._joined = true;
       this._initialized = true;
-      (_this$_whiteboardCont8 = this._whiteboardControl) === null || _this$_whiteboardCont8 === void 0 || _this$_whiteboardCont8.open();
+      (_this$_whiteboardCont7 = this._whiteboardControl) === null || _this$_whiteboardCont7 === void 0 || _this$_whiteboardCont7.open();
     }
   }, {
     key: "_close",

package/lib/modules/whiteboard/style.css

@@ -7,10 +7,6 @@
   pointer-events: all;
 }
 
-.board-widget-app {
-  height: 100%;
-}
-
 .fcr-board-pagination {
   position: absolute;
   left: 10px;

package/lib/modules/whiteboard/view.js

@@ -17,12 +17,16 @@ var _boardContext = _interopRequireDefault(require("../../utilities/board-contex
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _fcrCore = require("fcr-core");
 var _store = require("./components/toolbar/store");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_boardContext["default"]),
     showToolbar = _useContext.showToolbar;
   var _useContext2 = (0, _react.useContext)(_store.ToolbarContext),
-    progress = _useContext2.observables.progress;
+    _useContext2$observab = _useContext2.observables,
+    progress = _useContext2$observab.progress,
+    currentTool = _useContext2$observab.currentTool;
   var transI18n = (0, _i18n.useI18n)();
   var _useContext3 = (0, _react.useContext)(_context.BoardUIContext),
     _useContext3$observab = _useContext3.observables,
@@ -34,9 +38,11 @@ var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
     handleClose = _useContext3.handleClose,
     handleOpen = _useContext3.handleOpen;
   var loading = connectionState === _fcrCore.FcrConnectionState.CONNECTING || connectionState === _fcrCore.FcrConnectionState.RECONNECTING;
+  var cursorClassname = "board-widget-cursor-".concat([_enums.FcrBoardToolType[currentTool || _enums.FcrBoardToolType.NONE]]);
+  var boardWidgetAppCls = (0, _classnames["default"])('board-widget-app', cursorClassname.toLowerCase());
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "board-widget-app",
+      className: boardWidgetAppCls,
       ref: handleBoardDomLoad
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "window-manager-collector",

package/lib/plugins/browser-runtime-plugin.js

@@ -81,6 +81,12 @@ if (!window.runtime) {
       return {};
     },
     setUserSettingData: function setUserSettingData() {},
+    getActiveWindow: function getActiveWindow() {
+      return undefined;
+    },
+    getWindows: function getWindows() {
+      return [];
+    },
     initSDK: function initSDK() {},
     getIsSDKReady: function getIsSDKReady() {
       return Promise.resolve(false);
@@ -96,6 +102,9 @@ if (!window.runtime) {
     launchSuccess: function launchSuccess(roomId) {},
     launchFailure: function launchFailure(roomId, errorCode) {},
     onSetParameters: function onSetParameters(parameters) {},
-    setParameters: function setParameters(parameters) {}
+    setParameters: function setParameters(parameters) {},
+    getIsMeetingLaunched: function getIsMeetingLaunched() {
+      return Promise.resolve(false);
+    }
   };
 }

package/lib/providers/annotation-provider.d.ts

@@ -0,0 +1,128 @@
+import { FcrAnnotationControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/annotation-control/type';
+import { FcrUIDialogProvider } from './dialog-provider';
+import { CurrentShareScreenTypes } from '../modules/share-screen/types';
+import { FcrUISharingProvider } from './sharing-provider';
+import { FcrUIMemberSharedDataSource } from '../shared-data-source/member-data';
+import { FcrBoardMainWindow } from 'fcr-core/lib/room-control/whiteboard-control/types';
+import { FcrUIVideoWindowDataSource } from '../shared-data-source/video-window';
+import { FcrUIVideoWindowData } from '../type';
+import { FcrUIScreenShareProvider } from './screen-share-provider';
+import { FcrUIDeviceProvider } from './device-provider';
+export interface FcrUIAnnotationProvider {
+    /**
+     * 接收端属性，用于获取当前标注窗口的缩放比例
+     */
+    get scalcValue(): number;
+    /**
+     * 接收端方法，用于获取标注功能的 Control 对象
+     */
+    get annotationControl(): FcrAnnotationControl | undefined;
+    /**
+     * 接收端方法，用于获取标注窗口的 MainWindow 对象
+     */
+    get boardMainWindow(): FcrBoardMainWindow | undefined;
+    /**
+     * 接收端属性，用于获取当前共享窗口数据
+     */
+    get screenShareWindowData(): FcrUIVideoWindowData | undefined;
+    /**
+     * 接收端属性，用于获取当前标注启动状态
+     */
+    get annotationHasStart(): boolean;
+    /**
+     * 接收端属性，用于获取当前标注状态
+     */
+    get annotationState(): FcrAnnotationState;
+    /**
+     * 发起端状态，用于获取当前是否正在标注
+     */
+    get annotating(): boolean;
+    /**
+     * 发起端数据，当前共享屏幕信息
+     */
+    get currentShareInfo(): CurrentShareScreenTypes;
+    /**
+     * 发起端方法，用于打开关闭标注，由用户触发，此操切换标注工具栏打开状态合窗口的鼠标穿透模式
+     */
+    toggleAnnotation(): void;
+    /**
+     * 发起端方法，启动标注窗口，在主窗口启动时调用
+     */
+    openAnnotationWindow(): void;
+    /**
+     * 发起端方法，用于隐藏标注窗口，不是关闭
+     */
+    hideAnnotationWindow(): void;
+    /**
+     * 发起端方法，用于设置当前共享屏幕信息
+     */
+    setCurrentShareInfo(info: CurrentShareScreenTypes): void;
+    /**
+     * 发起端方法，用通知标注窗口更新当前共享屏幕信息
+     */
+    setBoundsToAnnotationWindow(info?: CurrentShareScreenTypes): void;
+    /**
+     * 接收端方法，用于放大标注窗口
+     */
+    zoomIn(): void;
+    /**
+     * 接收端方法，用于缩小标注窗口
+     */
+    zoomOut(): void;
+    /**
+     * 接收端方法，用于设置标注窗口的缩放比例
+     */
+    fullContainer(scalc: number): void;
+    /**
+     * 接收端方法，用于设置标注窗口的缩放比例
+     */
+    setOriginScalc(): void;
+}
+export declare enum FcrAnnotationState {
+    START = "start",
+    END = "end"
+}
+export declare class FcrUIAnnotationProviderImpl implements FcrUIAnnotationProvider {
+    private _dialogProvider;
+    private _sharingProvider;
+    private _memberDataSource;
+    private _videoWindowDataSource;
+    private _screenShareProvider;
+    private _deviceProvider;
+    private _annotationDialogId;
+    private _annotationToolDialogId;
+    private _disposers;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _annotationControl;
+    private _boardMainWindow;
+    private _shareScreenOwnerId;
+    private _maxScalcValue;
+    private _minScalcValue;
+    private _annotationObserver;
+    private _currentScreenShareOwnerCanStartAnnotation;
+    private _observer;
+    private get _localUser();
+    accessor scalcValue: number;
+    accessor annotationState: FcrAnnotationState;
+    accessor annotating: boolean;
+    accessor currentShareInfo: CurrentShareScreenTypes;
+    get screenShareWindowData(): import("../shared-data-source/video-window").FcrUIVideoWindowDataImpl | undefined;
+    get boardMainWindow(): FcrBoardMainWindow | undefined;
+    get annotationControl(): FcrAnnotationControl | undefined;
+    get annotationHasStart(): boolean;
+    constructor(_dialogProvider: FcrUIDialogProvider, _sharingProvider: FcrUISharingProvider, _memberDataSource: FcrUIMemberSharedDataSource, _videoWindowDataSource: FcrUIVideoWindowDataSource, _screenShareProvider: FcrUIScreenShareProvider, _deviceProvider: FcrUIDeviceProvider);
+    zoomIn(): void;
+    zoomOut(): void;
+    fullContainer(scalc: number): void;
+    setOriginScalc(): void;
+    toggleAnnotation(): Promise<void>;
+    getAnnotationControl(): FcrAnnotationControl | undefined;
+    openAnnotationWindow(): void;
+    hideAnnotationWindow(): void;
+    setCurrentShareInfo(info: CurrentShareScreenTypes): void;
+    setBoundsToAnnotationWindow(info?: CurrentShareScreenTypes): Promise<void>;
+    release(): void;
+    private _openToolbar;
+    private _closeToolbar;
+    private _initAnnotationTransaction;
+}