fcr-ui-scene 3.6.4-rc.1 → 3.7.0

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useVisibleTools = exports.useAnnotationVisibleTools = void 0;
+exports.useVisibleTools = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.map.js");
@@ -41,8 +41,7 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
     maxCountVisibleTools = _useContext$observabl.maxCountVisibleTools,
     toolbarDockPosition = _useContext$observabl.toolbarDockPosition,
     setTool = _useContext.setTool,
-    saveDraft = _useContext.saveDraft,
-    annotationHasStart = _useContext.annotationHasStart;
+    saveDraft = _useContext.saveDraft;
   var transI18n = (0, _i18n.useI18n)();
   var handleToolChange = function handleToolChange(tool) {
     return function () {
@@ -200,7 +199,7 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
   //     ]
   //   : []),
   ];
-  var baseMainTools = annotationHasStart ? annontationMainTools : whiteboardMainTools;
+  var baseMainTools = whiteboardMainTools;
   var divider = {
     renderItem: function renderItem() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -266,7 +265,7 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
   // }
 
   var maxCountAvailableToDisplay = maxCountVisibleTools;
-  var resultFixedTools = annotationHasStart ? fixedAnnotationTools : fixedTools;
+  var resultFixedTools = fixedTools;
   var mainTools = isShinked && diraction !== 'horizontal' ? (0, _range["default"])(0, (0, _max["default"])([0, (0, _min["default"])([maxCountAvailableToDisplay, baseMainTools.length])])).map(function (index) {
     return baseMainTools[index];
   }).concat([additionTool]).concat(resultFixedTools) : baseMainTools.concat(resultFixedTools);
@@ -282,156 +281,6 @@ var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diracti
   //   additionTools.unshift(colorTool);
   // }
 
-  additionTools = additionTools.reverse();
-  return {
-    mainTools: mainTools,
-    additionTools: additionTools,
-    showColorCount: showColorCount,
-    isShinked: isShinked
-  };
-};
-var useAnnotationVisibleTools = exports.useAnnotationVisibleTools = function useAnnotationVisibleTools(diraction) {
-  var _useContext2 = (0, _react.useContext)(_store.ToolbarContext),
-    _useContext2$observab = _useContext2.observables,
-    currentTool = _useContext2$observab.currentTool,
-    maxCountVisibleTools = _useContext2$observab.maxCountVisibleTools,
-    toolbarDockPosition = _useContext2$observab.toolbarDockPosition,
-    setTool = _useContext2.setTool,
-    saveDraft = _useContext2.saveDraft;
-  var transI18n = (0, _i18n.useI18n)();
-  var handleToolChange = function handleToolChange(tool) {
-    return function () {
-      setTool(tool);
-    };
-  };
-  var annontationMainTools = [{
-    renderItem: function renderItem() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
-        tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
-        tooltip: transI18n('fmt_screenshare_whiteboard_button_laserpen'),
-        icon: _type.FcrIconType.FCR_WHITEBOARD_LASERPEN1,
-        onClick: handleToolChange(_enums.FcrBoardToolType.LASER_POINTER),
-        isActive: currentTool === _enums.FcrBoardToolType.LASER_POINTER,
-        diraction: diraction,
-        iconColor: "#FF0005"
-      });
-    }
-  }, {
-    renderItem: function renderItem() {
-      var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        offset = _ref8.offset;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_penPicker.PenPickerItem, {
-        offset: offset
-      });
-    }
-  }, {
-    renderItem: function renderItem() {
-      var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        offset = _ref9.offset;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_shapePicker.ShapePickerItem, {
-        offset: offset
-      });
-    }
-  },
-  // {
-  //   renderItem: () => (
-  //     <ToolbarItem
-  //       tooltipPlacement={toolbarDockPosition.placement === 'left' ? 'right' : 'left'}
-  //       tooltip={transI18n('fmt_screenshare_whiteboard_button_text')}
-  //       icon={FcrIconType.FCR_WHITEBOARD_TEXT}
-  //       onClick={handleToolChange(FcrBoardToolType.TEXT)}
-  //       isActive={currentTool === FcrBoardToolType.TEXT}
-  //       diraction={diraction}
-  //     />
-  //   ),
-  // },
-  {
-    renderItem: function renderItem() {
-      var _ref0 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        offset = _ref0.offset;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_eraserPicker.EraserPickerItem, {
-        offset: offset
-      });
-    }
-  }
-  // ...(isElectron()
-  //   ? [
-  //       {
-  //         renderItem: ({ offset }: { offset?: number } = {}) => (
-  //           <ScreenCapturePickerItem offset={offset} />
-  //         ),
-  //       },
-  //     ]
-  //   : []),
-  ];
-  var baseMainTools = annontationMainTools;
-  var divider = {
-    renderItem: function renderItem() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "fcr-divider-vertical"
-      });
-    }
-  };
-  var colorTool = {
-    renderItem: function renderItem() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.ColorPickerItem, {});
-    }
-  };
-  var fixedTools = [divider, colorTool, divider, {
-    renderItem: function renderItem() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ToolbarItem, {
-        tooltipPlacement: toolbarDockPosition.placement === 'left' ? 'right' : 'left',
-        tooltip: transI18n('fmt_screenshare_whiteboard_button_savescript'),
-        icon: _type.FcrIconType.FCR_DOWNLOAD,
-        onClick: saveDraft,
-        isActive: false,
-        diraction: diraction
-      });
-    }
-  }, divider, {
-    renderItem: function renderItem() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_history.UndoItem, {});
-    }
-  }, {
-    renderItem: function renderItem() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_history.RedoItem, {});
-    }
-  }, {
-    renderItem: function renderItem() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_moveHandle.MoveHandleItem, {});
-    }
-  }];
-  var additionTool = {
-    renderItem: function renderItem() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_extraToolPicker.AdditionToolPickerItem, {});
-    }
-  };
-
-  // whether toolbar needs to shrink in vertical direction
-  var isShinked = maxCountVisibleTools < baseMainTools.length + 1;
-  var showColorCount = isShinked ? 0 : maxCountVisibleTools - baseMainTools.length; /* addition tool */
-
-  // if (showColorCount) {
-  //   baseMainTools.push(divider);
-  //   baseMainTools.push(colorTool);
-  // }
-
-  var maxCountAvailableToDisplay = maxCountVisibleTools;
-  var mainTools = isShinked && diraction !== 'horizontal' ? (0, _range["default"])(0, (0, _max["default"])([0, (0, _min["default"])([maxCountAvailableToDisplay, baseMainTools.length])])).map(function (index) {
-    return baseMainTools[index];
-  }).concat([additionTool]).concat(fixedTools) : baseMainTools.concat(fixedTools);
-  var additionToolsCount = baseMainTools.length - maxCountAvailableToDisplay;
-  var additionTools = [].concat(baseMainTools).reverse().filter(function (tool, index) {
-    if (index < additionToolsCount) {
-      return true;
-    }
-    return false;
-  });
-
-  // if (isShinked) {
-  //   additionTools.unshift(colorTool);
-  // }
-
   additionTools = additionTools.reverse();
   return {
     mainTools: mainTools,

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

@@ -5,11 +5,13 @@ import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { FcrUIAnnotationProvider } from '../../../../providers/annotation-provider';
 import { FcrUIEventProvider } from '../../../../providers/event-provider';
+import { FcrUISharedAnnotationSource } from '../../../../shared-data-source/annotation-data';
 export declare class ToolbarStore {
     private _whiteboardControl;
     private _roomControl;
     private _annotationProvider;
     private _eventProvider;
+    private _sharedAnnotationDataSource;
     private _boardMainWindow;
     private _lastStrokeWidth;
     private _boardObserver;
@@ -44,8 +46,8 @@ export declare class ToolbarStore {
         progress: number;
     };
     get roomInfo(): import("fcr-core/lib/type").FcrRoomInfo | undefined;
-    get boardMainWindow(): FcrBoardMainWindow;
-    constructor(_whiteboardControl: FcrWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider, _eventProvider: FcrUIEventProvider);
+    get boardMainWindow(): FcrBoardMainWindow | undefined;
+    constructor(_whiteboardControl: FcrWhiteboardControl, _roomControl: FcrBaseRoomControl, _annotationProvider: FcrUIAnnotationProvider, _eventProvider: FcrUIEventProvider, _sharedAnnotationDataSource: FcrUISharedAnnotationSource);
     private _onUiEvent;
     resetToolbarVars(): void;
     get annotationHasStart(): boolean;

package/lib/modules/whiteboard/components/toolbar/store.js

@@ -3,6 +3,8 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
+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.name.js");
@@ -34,8 +36,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ToolbarStore = exports.ToolbarContext = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -79,7 +79,7 @@ var colors = ['#EFEFEF', '#FFEC42', '#FFB545', '#E44A19', '#4A4C5F', '#A1C573',
 var _A = /*#__PURE__*/new WeakMap();
 _ref = (_resetToolbarVarsDecs = [_mobx.action, _mobx.action.bound], _redoDecs = [_mobx.action, _mobx.action.bound], _undoDecs = [_mobx.action, _mobx.action.bound], _cleanDecs = [_mobx.action, _mobx.action.bound], _setToolDecs = [_mobx.action, _mobx.action.bound], _setPenDecs = [_mobx.action, _mobx.action.bound], _setShapeDecs = [_mobx.action, _mobx.action.bound], _setStrokeColorDecs = [_mobx.action, _mobx.action.bound], _setStrokeWidthDecs = [_mobx.action, _mobx.action.bound], _clickExpansionToolDecs = [_mobx.action, _mobx.action.bound], _setToolbarPositionDecs = [_mobx.action, _mobx.action.bound], _dragToolbarDecs = [_mobx.action, _mobx.action.bound], _releaseToolbarDecs = [_mobx.action, _mobx.action.bound], _captureScreenDecs = [_mobx.action, _mobx.action.bound], _saveDraftDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setCommonColorDecs = [_mobx.action, _mobx.action.bound], _repositionToolbarDecs = [_mobx.action, _mobx.action.bound], _getSnapshotImageDecs = [_mobx.action, _mobx.action.bound], "_boardMainWindow");
 var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
-  function ToolbarStore(_whiteboardControl, _roomControl, _annotationProvider, _eventProvider) {
+  function ToolbarStore(_whiteboardControl, _roomControl, _annotationProvider, _eventProvider, _sharedAnnotationDataSource) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, ToolbarStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), undefined));
@@ -94,10 +94,17 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
     });
     (0, _defineProperty2["default"])(this, "_whiteboardObserver", {
       onConnectionStateUpdated: function onConnectionStateUpdated(state) {
-        if (state === _imports.AgoraRteConnectionState.CONNECTED && _this._whiteboardControl) {
+        if (!_this._whiteboardControl) {
+          return;
+        }
+        if (state === _imports.AgoraRteConnectionState.CONNECTED) {
+          var _this$_boardMainWindo;
           _this._boardMainWindow = _this._whiteboardControl.getMainWindow();
           _this._lastStrokeWidth = 0;
-          _this.boardMainWindow.addObserver(_this._boardObserver);
+          (_this$_boardMainWindo = _this._boardMainWindow) === null || _this$_boardMainWindo === void 0 || _this$_boardMainWindo.addObserver(_this._boardObserver);
+        } else {
+          var _this$_boardMainWindo2;
+          (_this$_boardMainWindo2 = _this._boardMainWindow) === null || _this$_boardMainWindo2 === void 0 || _this$_boardMainWindo2.removeObserver(_this._boardObserver);
         }
       }
     });
@@ -136,6 +143,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
     this._roomControl = _roomControl;
     this._annotationProvider = _annotationProvider;
     this._eventProvider = _eventProvider;
+    this._sharedAnnotationDataSource = _sharedAnnotationDataSource;
     this._whiteboardControl.addObserver(this._whiteboardObserver);
     this._eventProvider.addObserver(this._uiEventObserver);
   }
@@ -155,11 +163,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
   }, {
     key: "boardMainWindow",
     get: function get() {
-      if (this._boardMainWindow) {
-        return this._boardMainWindow;
-      } else {
-        throw new Error('boardMainWindow is not initialized');
-      }
+      return this._boardMainWindow;
     }
   }, {
     key: "_onUiEvent",
@@ -198,61 +202,69 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
   }, {
     key: "annotationHasStart",
     get: function get() {
-      return this._annotationProvider.annotationHasStart;
+      return this._sharedAnnotationDataSource.annotationHasStart;
     }
   }, {
     key: "redo",
     value: function redo() {
-      this.boardMainWindow.redo();
+      var _this$boardMainWindow;
+      (_this$boardMainWindow = this.boardMainWindow) === null || _this$boardMainWindow === void 0 || _this$boardMainWindow.redo();
     }
   }, {
     key: "undo",
     value: function undo() {
-      this.boardMainWindow.undo();
+      var _this$boardMainWindow2;
+      (_this$boardMainWindow2 = this.boardMainWindow) === null || _this$boardMainWindow2 === void 0 || _this$boardMainWindow2.undo();
     }
   }, {
     key: "clean",
     value: function clean() {
-      this.boardMainWindow.clean();
+      var _this$boardMainWindow3;
+      (_this$boardMainWindow3 = this.boardMainWindow) === null || _this$boardMainWindow3 === void 0 || _this$boardMainWindow3.clean();
     }
   }, {
     key: "setTool",
     value: function setTool(tool) {
+      var _this$boardMainWindow4;
       this.observables.currentTool = tool;
       this.observables.currentShape = undefined;
-      this.boardMainWindow.setToolType(tool);
+      (_this$boardMainWindow4 = this.boardMainWindow) === null || _this$boardMainWindow4 === void 0 || _this$boardMainWindow4.setToolType(tool);
     }
   }, {
     key: "setPen",
     value: function setPen(shape) {
+      var _this$boardMainWindow5, _this$boardMainWindow6, _this$boardMainWindow7;
       this.observables.currentShape = shape;
       this.observables.lastPen = shape;
       this.observables.currentTool = this._convertShapeToBoardToolType(shape);
-      this.boardMainWindow.setToolType(this._convertShapeToBoardToolType(shape));
-      this.boardMainWindow.setStrokeWidth(this.observables.currentStrokeWidth);
-      this.boardMainWindow.setStrokeColor((0, _tinycolor["default"])(this.observables.currentColor).toRgb());
+      (_this$boardMainWindow5 = this.boardMainWindow) === null || _this$boardMainWindow5 === void 0 || _this$boardMainWindow5.setToolType(this._convertShapeToBoardToolType(shape));
+      (_this$boardMainWindow6 = this.boardMainWindow) === null || _this$boardMainWindow6 === void 0 || _this$boardMainWindow6.setStrokeWidth(this.observables.currentStrokeWidth);
+      (_this$boardMainWindow7 = this.boardMainWindow) === null || _this$boardMainWindow7 === void 0 || _this$boardMainWindow7.setStrokeColor((0, _tinycolor["default"])(this.observables.currentColor).toRgb());
     }
   }, {
     key: "setShape",
     value: function setShape(shape) {
+      var _this$boardMainWindow8, _this$boardMainWindow9, _this$boardMainWindow0;
       this.observables.currentShape = shape;
       this.observables.lastShape = shape;
       this.observables.currentTool = this._convertShapeToBoardToolType(shape);
-      this.boardMainWindow.setToolType(this._convertShapeToBoardToolType(shape));
-      this.boardMainWindow.setStrokeWidth(this.observables.currentStrokeWidth);
-      this.boardMainWindow.setStrokeColor((0, _tinycolor["default"])(this.observables.currentColor).toRgb());
+      (_this$boardMainWindow8 = this.boardMainWindow) === null || _this$boardMainWindow8 === void 0 || _this$boardMainWindow8.setToolType(this._convertShapeToBoardToolType(shape));
+      (_this$boardMainWindow9 = this.boardMainWindow) === null || _this$boardMainWindow9 === void 0 || _this$boardMainWindow9.setStrokeWidth(this.observables.currentStrokeWidth);
+      (_this$boardMainWindow0 = this.boardMainWindow) === null || _this$boardMainWindow0 === void 0 || _this$boardMainWindow0.setStrokeColor((0, _tinycolor["default"])(this.observables.currentColor).toRgb());
     }
   }, {
     key: "setStrokeColor",
     value: function setStrokeColor(color) {
+      var _this$boardMainWindow1;
       this.observables.currentColor = color;
-      this.boardMainWindow.setStrokeColor((0, _tinycolor["default"])(color).toRgb());
+      (_this$boardMainWindow1 = this.boardMainWindow) === null || _this$boardMainWindow1 === void 0 || _this$boardMainWindow1.setStrokeColor((0, _tinycolor["default"])(color).toRgb());
     }
   }, {
     key: "setStrokeWidth",
     value: function setStrokeWidth(strokeWidth) {
+      var _this$boardMainWindow10;
       this.observables.currentStrokeWidth = strokeWidth;
-      this.boardMainWindow.setStrokeWidth(strokeWidth);
+      (_this$boardMainWindow10 = this.boardMainWindow) === null || _this$boardMainWindow10 === void 0 || _this$boardMainWindow10.setStrokeWidth(strokeWidth);
     }
   }, {
     key: "clickExpansionTool",
@@ -316,9 +328,9 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
   }, {
     key: "release",
     value: function release() {
-      var _this$_boardMainWindo;
+      var _this$_boardMainWindo3;
       this._eventProvider.removeObserver(this._uiEventObserver);
-      (_this$_boardMainWindo = this._boardMainWindow) === null || _this$_boardMainWindo === void 0 || _this$_boardMainWindo.removeObserver(this._boardObserver);
+      (_this$_boardMainWindo3 = this._boardMainWindow) === null || _this$_boardMainWindo3 === void 0 || _this$_boardMainWindo3.removeObserver(this._boardObserver);
       this._whiteboardControl.removeObserver(this._whiteboardObserver);
     }
   }, {

package/lib/modules/whiteboard/components/toolbar/style.css

@@ -7,6 +7,7 @@
   /* box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); */
   box-shadow: var(--fcr_web_light_dropup);
   min-height: 70px;
+  cursor: pointer;
 }
 
 .fcr-board-toolbar .fcr-divider-vertical::before {

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

@@ -7,6 +7,7 @@ import { FcrUICurrentRoomControlProvider } from '../../providers/room-provider';
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
 import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
+import { FcrUISharedAnnotationSource } from '../../shared-data-source/annotation-data';
 export declare class FcrWhiteboardUIModule extends UIModule {
     private _disposers;
     private _uiEventStore?;
@@ -42,6 +43,7 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     eventProvider?: FcrUIEventProvider;
     privilegeProvider?: FcrUIPrivilegeProvider;
     annotationProvider: FcrUIAnnotationProvider;
+    sharedAnnotationDataSource: FcrUISharedAnnotationSource;
     private accessor _lonelyWindowState;
     private accessor _ownerUser;
     private accessor _isHost;
@@ -89,5 +91,5 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     private _openLonelyWindow;
     private _setJoinSuccessed;
     private _addDisposers;
-    private _alertWhenReplace;
+    private _alertWhenBeenStopByOthers;
 }

package/lib/modules/whiteboard/index.js

@@ -163,11 +163,10 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       onInactive: function onInactive(reason, operatorUser) {
         var _this$_localUser, _this$_ownerUser, _this$_ownerUser2;
         var currentUserId = (_this$_localUser = _this._localUser) === null || _this$_localUser === void 0 ? void 0 : _this$_localUser.userId;
-        var isSeize = reason === _types.FcrBoardInactiveReason.SEIZE;
         var isMeOperated = (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) === currentUserId;
         var isMeOwner = ((_this$_ownerUser = _this._ownerUser) === null || _this$_ownerUser === void 0 ? void 0 : _this$_ownerUser.userId) === currentUserId;
         _this.logger.info("Fcr board has inactive effect, the reason is ".concat(reason, ", the operator is ").concat(operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userName, ", the owner is ").concat((_this$_ownerUser2 = _this._ownerUser) === null || _this$_ownerUser2 === void 0 ? void 0 : _this$_ownerUser2.userName));
-        isSeize && !isMeOperated && isMeOwner && _this._alertWhenReplace(operatorUser);
+        !isMeOperated && isMeOwner && _this._alertWhenBeenStopByOthers(operatorUser);
         _this.onDestroy({
           operatorUser: operatorUser
         });
@@ -310,7 +309,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       this._roomControl = (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl;
       this._securityStore = this.privilegeProvider;
       this._whiteboardControl = this._roomControl.getSharingControl().getBoardControl();
-      this._toolbarStore = new _store.ToolbarStore(this._whiteboardControl, this._roomControl, this.annotationProvider, this.eventProvider);
+      this._toolbarStore = new _store.ToolbarStore(this._whiteboardControl, this._roomControl, this.annotationProvider, this.eventProvider, this.sharedAnnotationDataSource);
       var streamControl = this._roomControl.getStreamControl();
       var userControl = this._roomControl.getUserControl();
       this._userControl = userControl;
@@ -319,12 +318,13 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         streamControl: streamControl,
         userControl: userControl,
         securityStore: this.privilegeProvider,
-        annotationProvider: this.annotationProvider
+        annotationProvider: this.annotationProvider,
+        sharedAnnotationDataSource: this.sharedAnnotationDataSource
       });
       this._whiteboardControl.addObserver(this._boardObserver);
       streamControl.addObserver({
         onStreamsRemoved: function onStreamsRemoved(roomId, events) {
-          var isReplaced = events.find(function (event) {
+          var seizeData = events.find(function (event) {
             var _event$cause;
             return ((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.data.reason) === _types.FcrBoardInactiveReason.SEIZE;
           });
@@ -332,26 +332,26 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
             var _this2$_localUser;
             return event.modifiedStream.owner.userId === ((_this2$_localUser = _this2._localUser) === null || _this2$_localUser === void 0 ? void 0 : _this2$_localUser.userId);
           });
-          if (isReplaced && isMyStream) {
-            _this2._alertWhenReplace(isReplaced === null || isReplaced === void 0 ? void 0 : isReplaced.operatorUser);
-          }
-          if (isReplaced && !isMyStream) {
-            var _this2$_uiEventStore, _isReplaced$operatorU;
-            (_this2$_uiEventStore = _this2._uiEventStore) === null || _this2$_uiEventStore === void 0 || _this2$_uiEventStore.showToast({
-              type: 'info',
-              message: "".concat(isReplaced === null || isReplaced === void 0 || (_isReplaced$operatorU = isReplaced.operatorUser) === null || _isReplaced$operatorU === void 0 ? void 0 : _isReplaced$operatorU.userName, " ").concat((0, _i18n.transI18n)('fmt_screenshare_whiteboard_lables_newshare'))
-            });
-          }
-          if (isReplaced && isMyStream && !_this2._isActive) {
-            var _this2$_uiEventStore2;
-            (_this2$_uiEventStore2 = _this2._uiEventStore) === null || _this2$_uiEventStore2 === void 0 || _this2$_uiEventStore2.sendEvent(_constant.FcrUIAction.STOP_SCREEN_CAPTURE);
+          if (seizeData) {
+            var _seizeData$operatorUs, _this2$_localUser2;
+            var operatorIsMe = ((_seizeData$operatorUs = seizeData.operatorUser) === null || _seizeData$operatorUs === void 0 ? void 0 : _seizeData$operatorUs.userId) !== ((_this2$_localUser2 = _this2._localUser) === null || _this2$_localUser2 === void 0 ? void 0 : _this2$_localUser2.userId);
+            if (isMyStream && operatorIsMe) {
+              _this2._alertWhenBeenStopByOthers(seizeData === null || seizeData === void 0 ? void 0 : seizeData.operatorUser);
+            }
+            if (!isMyStream) {
+              var _this2$_uiEventStore, _seizeData$operatorUs2;
+              (_this2$_uiEventStore = _this2._uiEventStore) === null || _this2$_uiEventStore === void 0 || _this2$_uiEventStore.showToast({
+                type: 'info',
+                message: "".concat(seizeData === null || seizeData === void 0 || (_seizeData$operatorUs2 = seizeData.operatorUser) === null || _seizeData$operatorUs2 === void 0 ? void 0 : _seizeData$operatorUs2.userName, " ").concat((0, _i18n.transI18n)('fmt_screenshare_whiteboard_lables_newshare'))
+              });
+            }
           }
         }
       });
       userControl.addObserver({
         onUserInfoUpdated: function onUserInfoUpdated(_, event) {
-          var _this2$_localUser2;
-          if (event.modifiedUser.userId === ((_this2$_localUser2 = _this2._localUser) === null || _this2$_localUser2 === void 0 ? void 0 : _this2$_localUser2.userId)) {
+          var _this2$_localUser3;
+          if (event.modifiedUser.userId === ((_this2$_localUser3 = _this2._localUser) === null || _this2$_localUser3 === void 0 ? void 0 : _this2$_localUser3.userId)) {
             _this2._localUser = event.modifiedUser;
             _this2._isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes(_this2._localUser.userRole);
           }
@@ -789,14 +789,17 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       }));
     }
   }, {
-    key: "_alertWhenReplace",
-    value: function _alertWhenReplace(userInfo) {
+    key: "_alertWhenBeenStopByOthers",
+    value: function _alertWhenBeenStopByOthers(userInfo) {
       var _this6 = this;
       var userRole = userInfo.userRole,
         userName = userInfo.userName;
+      var content = (0, _i18n.transI18n)("fmt_whiteboard_dialog_share_stopped_message_".concat(_type2.FcrUserRole.HOST === userRole ? 'host' : 'cohost'), {
+        reason1: userName
+      });
       var dialogId = this._uiEventStore.openConfirmDialog({
         title: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_stoppedboard'),
-        content: (_type2.FcrUserRole.HOST === userRole ? (0, _i18n.transI18n)('fmt_role_host') : _type2.FcrUserRole.COHOST === userRole ? (0, _i18n.transI18n)('fmt_role_cohost') : '') + "".concat(userName, " ").concat((0, _i18n.transI18n)('fmt_screenshare_whiteboard_lables_newshare')),
+        content: content,
         okText: (0, _i18n.transI18n)('fmt_screenshare_whiteboard_button_gotit'),
         showCancel: false,
         icon: _type3.FcrIconType.FCR_SCREENSHARING,

package/lib/modules/widget/view.js

@@ -13,6 +13,7 @@ var _store = require("./store");
 var _loadingWrapper = require("../interpreter/loading-wrapper");
 var _useElectron = require("../dialog/hooks/useElectron");
 var _env = require("agora-foundation/lib/utilities/env");
+var _type = require("../../type");
 var _jsxRuntime = require("react/jsx-runtime");
 var WebWidgetView = exports.WebWidgetView = (0, _mobxReact.observer)(function () {
   var _widgetConfig$popupSi, _widgetConfig$popupSi2;
@@ -25,6 +26,9 @@ var WebWidgetView = exports.WebWidgetView = (0, _mobxReact.observer)(function ()
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
+  if (widgetConfig.type === _type.FcrWidgetType.eventWidget) {
+    return null;
+  }
   (0, _react.useEffect)(function () {
     if (webWidget) {
       webWidget.init(widgetConfig, (0, _env.isElectron)() ? dialogInstanceContext.newRendererWindow : window);

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

@@ -10,6 +10,8 @@ export interface FcrUIAbilityProvider {
      * @param platform 目标平台
      */
     isHostSupportedByPlatform(platform: FcrPlatform): boolean;
+    isLiveSupported(): boolean;
+    isInterpreterSupported(): boolean;
     /**
      * 检查当前平台是否支持批注
      */