fcr-ui-scene 3.7.6 → 3.7.7-rc.1

package/lib/creator/index.js

@@ -113,7 +113,7 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_registeredWidgetConfigs", new Map([]));
     (0, _defineProperty2["default"])(this, "_released", false);
     (0, _defineProperty2["default"])(this, "_scene", null);
-    (0, _defineProperty2["default"])(this, "_microphoneKeepRecording", false);
+    (0, _defineProperty2["default"])(this, "_microphoneKeepRecording", true);
     (0, _defineProperty2["default"])(this, "_sceneObserver", null);
     (0, _defineProperty2["default"])(this, "_settingModule", null);
     (0, _defineProperty2["default"])(this, "_eventToastModule", null);
@@ -183,11 +183,17 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
             type: _type.FcrUIGlobalNodeEventType.LAUNCH_SUCCESS,
             data: args
           });
-          if ((0, _env.isElectron)()) {
-            var windowProvider = _this._objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
-            var mainWindow = windowProvider.getCurrentWindow();
-            (0, _focusHelper.focusWindow)(mainWindow);
-          }
+
+          // if (isElectron()) {
+          //   const windowProvider = this._objectManager.getObject<FcrUIWindowProvider>(
+          //     FcrUIObjectKeys.P_WINDOW_PROVIDER,
+          //   );
+
+          //   const mainWindow = windowProvider.getCurrentWindow();
+
+          //   focusWindow(mainWindow);
+          // }
+
           onSuccess.apply(void 0, args);
         },
         onLaunchFailure: function onLaunchFailure() {

package/lib/creator/provider-initializer.browser.js

@@ -176,8 +176,6 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER, interpreterProvider);
       var currentRoomControlProvider = new _roomProvider.FcrUICurrentRoomControlProviderImpl(mainRoomControl);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER, currentRoomControlProvider);
-      var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER, connectionProvider);
       var sessionProvider = new _sessionProvider.FcrUISessionProviderImpl(engine);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
@@ -236,7 +234,6 @@ var FcrUIBrowserProviderInitializer = exports.FcrUIBrowserProviderInitializer =
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER);
-      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER);

package/lib/creator/provider-initializer.electron.js

@@ -203,8 +203,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER, interpreterProvider);
       var currentRoomControlProvider = new _roomProvider.FcrUICurrentRoomControlProviderImpl(mainRoomControl);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER, currentRoomControlProvider);
-      var connectionProvider = new _roomProvider.FcrUIConnectionProviderImpl(engine);
-      objectManager.setObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER, connectionProvider);
       var sessionProvider = new _sessionProvider.FcrUISessionProviderImpl(engine);
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER, sessionProvider);
       var sharedDevicePrivilegeDataSource = new _devicePrivilegeData.FcrUISharedDevicePrivilegeDataSourceImpl();
@@ -256,7 +254,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
         windowProvider: windowProvider,
         sharingControl: sharingControl,
         whiteboardProvider: whiteboardProvider,
-        fcrUIMainWindowRenderer: fcrUIMainWindowRenderer,
         screenShareProvider: screenShareProvider
       });
       objectManager.setObject(_objectManager.FcrUIObjectKeys.P_MULTI_DISPLAY_PROVIDER, multiDisplayProvider);
@@ -277,7 +274,6 @@ var FcrUIElectronProviderInitializer = exports.FcrUIElectronProviderInitializer
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_INTERPRETER_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER);
-      objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_CONNECTION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_SESSION_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_DEVICE_STREAM_PROVIDER);
       objectManager.deleteObject(_objectManager.FcrUIObjectKeys.P_WAITING_ROOM_CONTROL_PROVIDER);

package/lib/electron/bootstrap-sdk.js

@@ -49,6 +49,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var mainWindow;
 var mainWindowReady = false;
 var userMinimize = false;
+var mainWindowDisplayState = _struct.DisplayState.HIDE;
 (0, _main.initialize)();
 var port = (_process$argv$find = process.argv.find(function (arg) {
   return arg.startsWith('--port=');
@@ -103,15 +104,17 @@ ipcClient.addObserver({
           mainWindow.moveTop();
           var platform = _os["default"].platform();
           if (platform === 'win32') {
-            // getLogger().info('windows_index setAlwaysOnTop in bootstrap-sdk');
-            // mainWindow.setAlwaysOnTop(true, 'pop-up-menu');
+            (0, _logger.getLogger)().info('windows_index setAlwaysOnTop in bootstrap-sdk');
+            mainWindow.setAlwaysOnTop(true, 'pop-up-menu');
             setTimeout(function () {
-              // getLogger().info('windows_index setAlwaysOnTop in bootstrap-sdk');
-              // mainWindow.setAlwaysOnTop(false, 'pop-up-menu');
-              mainWindow.moveTop();
-              mainWindow.show();
-              mainWindow.focus();
+              (0, _logger.getLogger)().info("windows_index set main window in bootstrap-sdk,current display state: ".concat(mainWindowDisplayState));
+              if (mainWindowDisplayState === _struct.DisplayState.SHOW) {
+                mainWindow.moveTop();
+                mainWindow.show();
+                mainWindow.focus();
+              }
             }, 300);
+            mainWindow.setAlwaysOnTop(false, 'pop-up-menu');
           }
         }
         break;
@@ -272,10 +275,12 @@ _electron.app.addListener('ready', function () {
   });
   mainWindow.addListener('minimize', function () {
     (0, _logger.getLogger)().info('windows_release main window minimized');
+    mainWindowDisplayState = _struct.DisplayState.MINIMIZE;
     userMinimize = true;
   });
   mainWindow.addListener('show', function () {
     (0, _logger.getLogger)().info('windows_release main window show');
+    mainWindowDisplayState = _struct.DisplayState.SHOW;
     mainWindow.focus();
     userMinimize = false;
   });
@@ -284,22 +289,31 @@ _electron.app.addListener('ready', function () {
   });
   mainWindow.addListener('hide', function () {
     (0, _logger.getLogger)().info("windows_release main window hidden, current launch state: ".concat(_struct.FcrUISceneLaunchState[_eventManager.eventManager.launchState]));
+    mainWindowDisplayState = _struct.DisplayState.HIDE;
     if (userMinimize) {
       (0, _logger.getLogger)().info('windows_release main window hidden, but user minimize, ignore this event');
       return;
     }
-    if (_eventManager.eventManager.launchState === _struct.FcrUISceneLaunchState.END && _eventManager.eventManager.endReason === _struct.FcrUISceneLaunchEndReason.LAUNCH_SUCCESS) {
-      (0, _logger.getLogger)().info('windows_release main window hidden, but launch state is END, send error Event');
-      ipcClient.sendMessage({
-        cmd: _type.IPCMessageCMD.Error,
-        data: {
-          roomId: _eventManager.eventManager.roomId,
-          errorCode: _until.mainWindowHiddenOnLaunchSuccessErrorCode,
-          message: 'main window hidden on launch success'
-        }
-      });
-      return;
-    }
+
+    // if (
+    //   eventManager.launchState === LaunchState.END &&
+    //   eventManager.endReason === FcrUISceneLaunchEndReason.LAUNCH_SUCCESS
+    // ) {
+    //   getLogger().info(
+    //     'windows_release main window hidden, but launch state is END, send error Event',
+    //   );
+
+    //   ipcClient.sendMessage({
+    //     cmd: IPCMessageCMD.Error,
+    //     data: {
+    //       roomId: eventManager.roomId,
+    //       errorCode: mainWindowHiddenOnLaunchSuccessErrorCode,
+    //       message: 'main window hidden on launch success',
+    //     },
+    //   });
+    //   return;
+    // }
+
     if (_eventManager.eventManager.launchState !== _struct.FcrUISceneLaunchState.PROCESSING) {
       return;
     }
@@ -319,6 +333,7 @@ _electron.app.addListener('ready', function () {
     _electron.app.exit(_exitCodes.AppExitCode.NORMAL_EXIT);
   });
   mainWindow.addListener('close', function (e) {
+    mainWindowDisplayState = _struct.DisplayState.HIDE;
     var closeListenerCount = mainWindow.listenerCount('close');
     (0, _logger.getLogger)().info("windows_release main window close listener count: ".concat(closeListenerCount, ", isInMeeting: ").concat(_meetingState.isInMeeting));
     if (_meetingState.isInMeeting === 0) {
@@ -344,6 +359,14 @@ _electron.app.addListener('ready', function () {
       }, 300);
     }
   });
+  mainWindow.addListener('unresponsive', function () {
+    (0, _logger.getLogger)().warn("main window unresponsive in bootstrap-sdk");
+    handleUnresponsive();
+  });
+  mainWindow.addListener('responsive', function () {
+    (0, _logger.getLogger)().warn("main window responsive in bootstrap-sdk");
+    handleResponsive();
+  });
   if (_env.isDev) {
     mainWindow.webContents.openDevTools({
       mode: 'detach'
@@ -370,4 +393,31 @@ _electron.app.addListener('quit', function (event, exitCode) {
   (0, _logger.getLogger)().info("app quit event triggered with exit code: ".concat(exitCode));
   // 清理 EventManager 资源
   _eventManager.eventManager.dispose();
-});
+});
+var HANG_DETECTION_TIMEOUT = 60 * 1000; // 1分钟（毫s秒）
+var hangDetectionTimer = null;
+function handleUnresponsive() {
+  (0, _logger.getLogger)().warn('Window became unresponsive, starting hang detection timer');
+  clearHangDetectionTimer();
+  hangDetectionTimer = setTimeout(function () {
+    (0, _logger.getLogger)().error('Window has been unresponsive for 1 minute, forcing application exit');
+    _eventManager.eventManager.onExitedMeeting(_eventManager.eventManager.roomId, _struct.FcrUISceneLaunchEndReason.HANG_DETECTION);
+    ipcClient.sendMessage({
+      cmd: _type.IPCMessageCMD.ExitedMeeting,
+      data: {
+        roomId: _eventManager.eventManager.roomId,
+        reason: _until.hangDetectionErrorCode
+      }
+    });
+  }, HANG_DETECTION_TIMEOUT);
+}
+function handleResponsive() {
+  (0, _logger.getLogger)().info('Window became responsive again, clearing hang detection timer');
+  clearHangDetectionTimer();
+}
+function clearHangDetectionTimer() {
+  if (hangDetectionTimer) {
+    clearTimeout(hangDetectionTimer);
+    hangDetectionTimer = null;
+  }
+}

package/lib/electron/struct.d.ts

@@ -8,5 +8,11 @@ export declare enum FcrUISceneLaunchEndReason {
     LAUNCH_FAILURE = "launchFailure",
     CLOSE_WINDOW = "closeWindow",
     EXITED = "exited",
-    CRASHED = "crashed"
+    CRASHED = "crashed",
+    HANG_DETECTION = "hangDetection"
+}
+export declare enum DisplayState {
+    SHOW = "show",
+    HIDE = "hide",
+    MINIMIZE = "minimize"
 }

package/lib/electron/struct.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUISceneLaunchState = exports.FcrUISceneLaunchEndReason = void 0;
+exports.FcrUISceneLaunchState = exports.FcrUISceneLaunchEndReason = exports.DisplayState = void 0;
 var FcrUISceneLaunchState = exports.FcrUISceneLaunchState = /*#__PURE__*/function (FcrUISceneLaunchState) {
   FcrUISceneLaunchState[FcrUISceneLaunchState["DEFAULT"] = 0] = "DEFAULT";
   FcrUISceneLaunchState[FcrUISceneLaunchState["PROCESSING"] = 1] = "PROCESSING";
@@ -17,5 +17,12 @@ var FcrUISceneLaunchEndReason = exports.FcrUISceneLaunchEndReason = /*#__PURE__*
   FcrUISceneLaunchEndReason["CLOSE_WINDOW"] = "closeWindow";
   FcrUISceneLaunchEndReason["EXITED"] = "exited";
   FcrUISceneLaunchEndReason["CRASHED"] = "crashed";
+  FcrUISceneLaunchEndReason["HANG_DETECTION"] = "hangDetection";
   return FcrUISceneLaunchEndReason;
+}({});
+var DisplayState = exports.DisplayState = /*#__PURE__*/function (DisplayState) {
+  DisplayState["SHOW"] = "show";
+  DisplayState["HIDE"] = "hide";
+  DisplayState["MINIMIZE"] = "minimize";
+  return DisplayState;
 }({});

package/lib/electron/until.d.ts

@@ -21,7 +21,8 @@ declare enum DetailErrorCode {
     closeWindowBeforeLaunchSuccess = 83,
     meetingLaunchProcessing = 84,
     mainWindowHiddenAfterLaunchSuccess = 85,
-    crashed = 86
+    crashed = 86,
+    hangDetection = 87
 }
 export declare const generaErrorCode: (serviceCode: ServiceErrorCode, uiSceneCode: UISceneErrorCode, detailCode: DetailErrorCode) => number;
 export declare const windowHideErrorCode: number;
@@ -29,4 +30,5 @@ export declare const closeWindowBeforeLaunchSuccessErrorCode: number;
 export declare const meetingLaunchProcessingErrorCode: number;
 export declare const mainWindowHiddenOnLaunchSuccessErrorCode: number;
 export declare const crashedErrorCode: number;
+export declare const hangDetectionErrorCode: number;
 export {};

package/lib/electron/until.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = exports.generaErrorCode = exports.crashedErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
+exports.windowHideErrorCode = exports.meetingLaunchProcessingErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = exports.hangDetectionErrorCode = exports.generaErrorCode = exports.crashedErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = void 0;
 // 错误代码枚举定义
 var ServiceErrorCode = /*#__PURE__*/function (ServiceErrorCode) {
   ServiceErrorCode[ServiceErrorCode["FcrUIScene"] = 800] = "FcrUIScene";
@@ -44,8 +44,12 @@ var DetailErrorCode = /*#__PURE__*/function (DetailErrorCode) {
   DetailErrorCode[DetailErrorCode["closeWindowBeforeLaunchSuccess"] = 83] = "closeWindowBeforeLaunchSuccess";
   // 会议启动中
   DetailErrorCode[DetailErrorCode["meetingLaunchProcessing"] = 84] = "meetingLaunchProcessing";
+  // 窗口在会议启动后隐藏
   DetailErrorCode[DetailErrorCode["mainWindowHiddenAfterLaunchSuccess"] = 85] = "mainWindowHiddenAfterLaunchSuccess";
+  // 窗口崩溃
   DetailErrorCode[DetailErrorCode["crashed"] = 86] = "crashed";
+  // 窗口无响应
+  DetailErrorCode[DetailErrorCode["hangDetection"] = 87] = "hangDetection";
   return DetailErrorCode;
 }(DetailErrorCode || {}); // 格式：ServiceErrorCode(3位) + UISceneErrorCode(3位) + DetailErrorCode(3位)
 var generaErrorCode = exports.generaErrorCode = function generaErrorCode(serviceCode, uiSceneCode, detailCode) {
@@ -55,4 +59,5 @@ var windowHideErrorCode = exports.windowHideErrorCode = generaErrorCode(ServiceE
 var closeWindowBeforeLaunchSuccessErrorCode = exports.closeWindowBeforeLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.closeWindowBeforeLaunchSuccess);
 var meetingLaunchProcessingErrorCode = exports.meetingLaunchProcessingErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.meetingLaunchProcessing);
 var mainWindowHiddenOnLaunchSuccessErrorCode = exports.mainWindowHiddenOnLaunchSuccessErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.mainWindowHiddenAfterLaunchSuccess);
-var crashedErrorCode = exports.crashedErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.crashed);
+var crashedErrorCode = exports.crashedErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.crashed);
+var hangDetectionErrorCode = exports.hangDetectionErrorCode = generaErrorCode(ServiceErrorCode.FcrUIScene, UISceneErrorCode.Creator, DetailErrorCode.hangDetection);

package/lib/modules/action-bar/components/item/index.js

@@ -108,6 +108,7 @@ var ActionBarItem = exports.ActionBarItem = function ActionBarItem(props) {
     }), props.submenu && /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
       showArrow: false,
       overlayClassName: "fcr-action-bar--popover",
+      visible: props.submenu.active,
       onVisibleChange: props.submenu.onVisibleChange,
       trigger: "click",
       content: props.submenu.children,

package/lib/modules/action-bar/components/screen-share/submenu.js

@@ -165,8 +165,8 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
     key: 'enable_whiteboard',
     classNames: 'fcr-drop-menu-option-primary-no-hover',
     onButtonClick: function onButtonClick() {
-      // TODO: 主持人停用别人的共享后，应该把菜单关闭或者是更新菜单项
       closeWhiteboard();
+      setMenuVisible(false);
     }
   }];
   var shareScreenControlMenus = [{

package/lib/modules/chat/index.css

@@ -108,6 +108,10 @@
   width: 100%;
 }
 
-.fcr-chat-container-box {
+.fcr-chat-container-box-web {
+  height: 100%;
+}
+
+.fcr-chat-container-box-electron {
   height: calc(100% - 46px);
 }

package/lib/modules/chat/view.js

@@ -50,6 +50,8 @@ var _fcrCore = require("fcr-core");
 var _types = require("./types");
 var _chatTabs = _interopRequireDefault(require("./components/chat-tabs"));
 var _browserApi = require("../../utilities/browser-api");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -195,7 +197,10 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: "fcr-chat-container-box",
+    className: (0, _classnames["default"])({
+      'fcr-chat-container-box-web': !(0, _env.isElectron)(),
+      'fcr-chat-container-box-electron': (0, _env.isElectron)()
+    }),
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_chatTabs["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       style: _objectSpread({}, styles),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatWrapper.ChatWrapper, {

package/lib/modules/components/control-bar/components/switch-theme/index.css

@@ -11,6 +11,8 @@
 .fcr-whiteboard-switch-theme-popover {
   max-width: 100%;
   width: 100%;
+  z-index: 1;
+  padding: 0;
 }
 .fcr-whiteboard-switch-theme-popover .fcr-tooltip-inner {
   border-radius: 0 !important;

package/lib/modules/components/control-bar/components/switch-theme/index.js

@@ -38,13 +38,11 @@ var WhiteboardSwitchTheme = function WhiteboardSwitchTheme(props) {
       width: '100%'
     },
     overlayOffset: 4,
-    showArrow: false
-    // getTooltipContainer={() => {
-    //   const target = document.getElementById('fcr-whiteboard-controlbar') as HTMLElement;
-    //   console.log({ target });
-    //   return target;
-    // }}
-    ,
+    showArrow: false,
+    getTooltipContainer: function getTooltipContainer() {
+      var target = document.getElementById('fcr-whiteboard-controlbar');
+      return target;
+    },
     visible: whiteboardVisible,
     content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-whiteboard-switch-theme",

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

@@ -90,6 +90,10 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
     setContianHeight(height);
   }, []);
   var resetHeightDebounce = (0, _react.useCallback)((0, _debounce["default"])(resetHeight, 100), []);
+  var ratio = (0, _react.useMemo)(function () {
+    var ratio = contianHeight / initHeight;
+    return ratio;
+  }, [contianHeight, initHeight]);
   (0, _react.useEffect)(function () {
     window.addEventListener('resize', resetHeightDebounce);
     return function () {
@@ -117,16 +121,18 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
     setIsMaxmum(false);
     setIsAdaptived(false);
     setIsOriginal(false);
-    var step = 3;
+    var max = 3;
+    var step = 0.5;
     if (oprate === _type2.WhiteboardControlbarEvents.ZOOMIN) {
       if (onZoomIn) {
         var result = onZoomIn();
         setIsMaxmum(!result);
         return;
       }
-      if (scaleValue < step) {
+      if (scaleValue < max) {
         setIsMaxmum(false);
-        setScaleValue(scaleValue + 1);
+        var zoomIn = scaleValue + step;
+        setScaleValue(zoomIn);
       } else {
         setIsMaxmum(true);
       }
@@ -138,7 +144,9 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
         return;
       }
       if (scaleValue > 1) {
-        setScaleValue(scaleValue - 1);
+        var zoomOut = scaleValue - step;
+        var diff = zoomOut % step;
+        setScaleValue(diff === 0 ? zoomOut : zoomOut - diff);
       } else {
         setIsMinimum(true);
       }
@@ -149,8 +157,11 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
         setIsOriginal(!_result2);
         return;
       }
+      // 如果容器高和画布原始高度的比值小于1，代表画布原始高比容器大，则设置放大倍率用 1 + 比率
+      // 如果容器高和画布原始告诉的比值大于1，代表容器比画布原始高度大，则设置放大倍率为原始高度和容器高度的比率
+      var origin = ratio < 1 ? 1 + ratio : initHeight / contianHeight;
       setIsOriginal(true);
-      setScaleValue(1);
+      setScaleValue(origin);
     }
     if (oprate === _type2.WhiteboardControlbarEvents.ADAPTIVE) {
       if (onAdaptive) {
@@ -159,15 +170,23 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
         return;
       }
       setIsAdaptived(true);
-      setScaleValue(2);
+      setScaleValue(1);
     }
   }
   var width = (0, _react.useMemo)(function () {
+    if (scaleValue === ratio) return initWidth;
     return initWidth * (contianHeight / initHeight) * scaleValue;
   }, [contianHeight, scaleValue]);
   var height = (0, _react.useMemo)(function () {
+    if (scaleValue === ratio) return initHeight;
     return initHeight * (contianHeight / initHeight) * scaleValue;
   }, [contianHeight, scaleValue]);
+  var top = (0, _react.useMemo)(function () {
+    if (contianHeight > height) return (contianHeight - height) / 2;
+    if (height === contianHeight) return 0;
+    if (scaleValue === 1) return 0;
+    return "-".concat((height - contianHeight) / 2, "px");
+  }, [height, contianHeight, scaleValue]);
   var preventAction = (0, _react.useMemo)(function () {
     var prevent = true;
 
@@ -334,7 +353,7 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = function WhiteboardCon
           position: 'absolute',
           left: "-".concat(width / 2, "px"),
           marginLeft: '50%',
-          top: "-".concat(height === contianHeight ? 0 : (height - contianHeight) / 2, "px")
+          top: top
         },
         children: [onBoardDomLoaded && preventAction && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "whiteboard-action-prevent"

package/lib/modules/components/toolbar/components/capture-tool/index.d.ts

@@ -1,6 +1,5 @@
 import { ToolTipProps } from 'agora-ui-foundation/lib/components/tooltip';
 export declare const AnnotationCaptureTool: (props: {
-    popoverVisible?: boolean;
     placement: ToolTipProps["placement"];
     size?: number;
     hideTitle?: boolean;

package/lib/modules/components/toolbar/components/capture-tool/index.js

@@ -17,7 +17,6 @@ var AnnotationCaptureTool = exports.AnnotationCaptureTool = function AnnotationC
   var t = (0, _i18n.useI18n)();
   var size = props.size,
     hideTitle = props.hideTitle,
-    popoverVisible = props.popoverVisible,
     placement = props.placement,
     direction = props.direction,
     setPopoverVisible = props.setPopoverVisible,
@@ -43,7 +42,7 @@ var AnnotationCaptureTool = exports.AnnotationCaptureTool = function AnnotationC
     iconType: _type.FcrIconType.FCR_WHITEBOARD_SLICE,
     title: t('fmt_screenshare_whiteboard_button_cutting'),
     lineColor: "transparent",
-    visible: visible && popoverVisible,
+    visible: visible,
     onVisibleChange: handleVisibleChange,
     showArrow: true,
     content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_panel.AnnotationToolPanel, {

package/lib/modules/components/toolbar/components/vertical-frame/index.js

@@ -126,7 +126,7 @@ function VerticalBar(props) {
       api.start(_position);
     }
   }, []);
-  var handleRefMount = function handleRefMount(dom) {
+  var handleRefMount = (0, _react2.useCallback)(function (dom) {
     if (dom) {
       var top = dom.getBoundingClientRect().top;
       if (topTemp !== top) {
@@ -135,7 +135,7 @@ function VerticalBar(props) {
         toolbarDom.current = dom;
       }
     }
-  };
+  }, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       onClick: function onClick() {

package/lib/modules/components/toolbar/hooks/use-resize-visible.js

@@ -6,62 +6,63 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useResizeVisible = void 0;
-require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _item = require("../components/item");
-var _constants = require("../../../action-bar/constants");
+var _lodash = require("lodash");
 var useResizeVisible = exports.useResizeVisible = function useResizeVisible() {
-  var toolbar = (0, _react.useRef)();
-  var _useState = (0, _react.useState)(0),
+  var _useState = (0, _react.useState)(-1),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    threshold = _useState2[0],
-    setThreshold = _useState2[1];
-  var _useState3 = (0, _react.useState)(-1),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    coverCount = _useState4[0],
-    setCoverCount = _useState4[1];
-  var _useState5 = (0, _react.useState)(0),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    itemHeight = _useState6[0],
-    setItemHeight = _useState6[1];
-  var actionbar = document.querySelector(".".concat(_constants.actionBarClassName));
-  var actionBarHeight = (actionbar === null || actionbar === void 0 ? void 0 : actionbar.getBoundingClientRect().height) || 0;
+    coverCount = _useState2[0],
+    setCoverCount = _useState2[1];
   var bottomHeight = 20;
-  var timer = (0, _react.useRef)(null);
+  var toolbarRef = (0, _react.useRef)();
+  var containerRef = (0, _react.useRef)(null);
+  var thresholdRef = (0, _react.useRef)(0);
+  var itemHeightRef = (0, _react.useRef)(0);
   var handleResize = (0, _react.useCallback)(function () {
-    var _document$documentEle = document.documentElement.getBoundingClientRect(),
-      height = _document$documentEle.height;
-    var coverSize = threshold - height;
-    var coverCount = Math.floor(coverSize / itemHeight);
-    setCoverCount(coverCount);
-  }, [threshold]);
+    var container = containerRef.current;
+    var _ref = (container === null || container === void 0 ? void 0 : container.getBoundingClientRect()) || document.documentElement.getBoundingClientRect(),
+      height = _ref.height;
+    var threshold = thresholdRef.current;
+    var itemHeight = itemHeightRef.current;
+    var coverSize = 0;
+    var coverCountTemp = -1;
+    coverSize = threshold - height;
+    coverCountTemp = Math.round(coverSize / itemHeight);
+    setCoverCount(coverCountTemp);
+  }, []);
+  (0, _react.useEffect)(function () {
+    handleResize();
+  }, []);
+  var handleResizeDebounce = (0, _react.useCallback)((0, _lodash.debounce)(handleResize, 200), []);
   (0, _react.useEffect)(function () {
-    window.addEventListener('resize', handleResize);
-    window.addEventListener('animationend', handleResize);
-    if (timer.current) {
-      window.clearTimeout(timer.current);
+    var container = containerRef.current;
+    if (container) {
+      container.addEventListener('transitionend', handleResizeDebounce);
     }
-    timer.current = window.setTimeout(handleResize);
     return function () {
-      window.removeEventListener('resize', handleResize);
-      window.removeEventListener('animationend', handleResize);
-      if (timer.current) {
-        window.clearTimeout(timer.current);
+      if (container) {
+        container.removeEventListener('transitionend', handleResizeDebounce);
       }
     };
-  }, [threshold]);
+  }, []);
+  var reCalcThreshold = (0, _react.useCallback)(function () {
+    var toolbar = toolbarRef.current;
+    if (toolbar) {
+      var _toolbar$getBoundingC = toolbar.getBoundingClientRect(),
+        height = _toolbar$getBoundingC.height;
+      var items = toolbar.querySelectorAll(".".concat(_item.toolBarItemClassName));
+      itemHeightRef.current = items[0].getBoundingClientRect().height;
+      var threshold = height + bottomHeight;
+      thresholdRef.current = threshold;
+    }
+  }, []);
   var setToolbarDom = (0, _react.useCallback)(function (dom) {
     if (dom) {
-      var _items$;
-      toolbar.current = dom;
-      var _dom$getBoundingClien = dom.getBoundingClientRect(),
-        top = _dom$getBoundingClien.top,
-        height = _dom$getBoundingClien.height;
-      var items = dom.querySelectorAll(".".concat(_item.toolBarItemClassName));
-      setItemHeight((_items$ = items[0]) === null || _items$ === void 0 ? void 0 : _items$.getBoundingClientRect().height);
-      var _threshold = height + top + actionBarHeight + bottomHeight;
-      setThreshold(_threshold);
+      toolbarRef.current = dom;
+      containerRef.current = document.querySelector('.fcr-whiteboard-controlbar-body-content');
+      reCalcThreshold();
     }
   }, []);
   return {