fcr-ui-scene 3.9.0-alpha → 3.9.1-alpha

package/lib-es/modules/components/device-control/store.base.js

@@ -35,7 +35,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _DeviceControlStoreBase;
-var _initProto, _init_isPstnUser, _init_phoneMicEnabled, _openDeviceSettingDialogDecs, _openConnectionDecs, _closeConnectionDecs, _checkMediaPermissionDecs, _setSpeakerIdDecs, _setMicrophoneIdDecs, _setCameraIdDecs, _ref;
+var _initProto, _init_isPstnUser, _init_phoneMicEnabled, _init_isVolteUser, _openDeviceSettingDialogDecs, _openConnectionDecs, _closeConnectionDecs, _checkMediaPermissionDecs, _setSpeakerIdDecs, _setMicrophoneIdDecs, _setCameraIdDecs, _ref;
 import "core-js/modules/es.array.find.js";
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.object.to-string.js";
@@ -65,6 +65,7 @@ import { FcrUIDialogKey } from '../../../utilities/constant';
 import { FcrUIObjectKeys } from '../../../object-manager';
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
 _ref = (_openDeviceSettingDialogDecs = [action, action.bound], _openConnectionDecs = [action, action.bound], _closeConnectionDecs = [action, action.bound], _checkMediaPermissionDecs = [action, action.bound], _setSpeakerIdDecs = [action, action.bound], _setMicrophoneIdDecs = [action, action.bound], _setCameraIdDecs = [action, action.bound], "_deviceProvider");
 export var DeviceControlStoreBase = /*#__PURE__*/function () {
   function DeviceControlStoreBase(_ref2) {
@@ -78,6 +79,7 @@ export var DeviceControlStoreBase = /*#__PURE__*/function () {
     });
     _classPrivateFieldInitSpec(this, _A, _init_isPstnUser(this, false));
     _classPrivateFieldInitSpec(this, _B, _init_phoneMicEnabled(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_isVolteUser(this, false));
     this._dialogProvider = objectManager.getObject(FcrUIObjectKeys.P_DIALOG_PROVIDER);
     this._deviceProvider = objectManager.getObject(FcrUIObjectKeys.P_DEVICE_PROVIDER);
     this._abilityProvider = objectManager.getObject(FcrUIObjectKeys.P_ABILITY_PROVIDER);
@@ -103,6 +105,14 @@ export var DeviceControlStoreBase = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_B, this, v);
     }
+  }, {
+    key: "isVolteUser",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
   }, {
     key: "microphoneId",
     get: function get() {
@@ -242,17 +252,26 @@ export var DeviceControlStoreBase = /*#__PURE__*/function () {
         var connectorType = _ref3.connectorType;
         return connectorType === FcrRoomConnectorType.PSTN;
       });
+      var volteStream = streams.find(function (_ref4) {
+        var connectorType = _ref4.connectorType;
+        return connectorType === FcrRoomConnectorType.VOLTE;
+      });
       var hasPstnStream = !!pstnStream;
+      var hasVolteStream = !!volteStream;
       this.isPstnUser = hasPstnStream;
+      this.isVolteUser = hasVolteStream;
       if (hasPstnStream) {
         this.phoneMicEnabled = pstnStream.streamType === FcrStreamType.BOTH || pstnStream.audioSourceState === FcrMediaSourceState.OPEN;
+      } else if (hasVolteStream) {
+        this.phoneMicEnabled = volteStream.streamType === FcrStreamType.BOTH || volteStream.audioSourceState === FcrMediaSourceState.OPEN;
       }
     }
   }]);
 }();
 _DeviceControlStoreBase = DeviceControlStoreBase;
-var _applyDecs$e = _slicedToArray(_applyDecs(_DeviceControlStoreBase, [[observable, 1, "isPstnUser"], [observable, 1, "phoneMicEnabled"], [computed, 3, "microphoneId"], [computed, 3, "speakerId"], [computed, 3, "speakerList"], [computed, 3, "isCallOutAbilitySupported"], [computed, 3, "isVirtualBackgroundSupported"], [computed, 3, "isBeautyModeAbilitySupported"], [computed, 3, "microphoneEnabled"], [computed, 3, "microphoneState"], [computed, 3, "microphoneDetecting"], [computed, 3, "cameraId"], [computed, 3, "cameraEnabled"], [computed, 3, "microphoneVolumeLevel"], [computed, 3, "microphoneList"], [computed, 3, "cameraList"], [computed, 3, "connectType"], [_openDeviceSettingDialogDecs, 18, "openDeviceSettingDialog"], [_openConnectionDecs, 18, "openConnection"], [_closeConnectionDecs, 18, "closeConnection"], [_checkMediaPermissionDecs, 18, "checkMediaPermission"], [_setSpeakerIdDecs, 18, "setSpeakerId"], [_setMicrophoneIdDecs, 18, "setMicrophoneId"], [_setCameraIdDecs, 18, "setCameraId"], [bound, 2, "stopAudioByComputer"], [bound, 2, "release"], [bound, 2, "_handleStreamUpdate"]], []).e, 3);
+var _applyDecs$e = _slicedToArray(_applyDecs(_DeviceControlStoreBase, [[observable, 1, "isPstnUser"], [observable, 1, "phoneMicEnabled"], [observable, 1, "isVolteUser"], [computed, 3, "microphoneId"], [computed, 3, "speakerId"], [computed, 3, "speakerList"], [computed, 3, "isCallOutAbilitySupported"], [computed, 3, "isVirtualBackgroundSupported"], [computed, 3, "isBeautyModeAbilitySupported"], [computed, 3, "microphoneEnabled"], [computed, 3, "microphoneState"], [computed, 3, "microphoneDetecting"], [computed, 3, "cameraId"], [computed, 3, "cameraEnabled"], [computed, 3, "microphoneVolumeLevel"], [computed, 3, "microphoneList"], [computed, 3, "cameraList"], [computed, 3, "connectType"], [_openDeviceSettingDialogDecs, 18, "openDeviceSettingDialog"], [_openConnectionDecs, 18, "openConnection"], [_closeConnectionDecs, 18, "closeConnection"], [_checkMediaPermissionDecs, 18, "checkMediaPermission"], [_setSpeakerIdDecs, 18, "setSpeakerId"], [_setMicrophoneIdDecs, 18, "setMicrophoneId"], [_setCameraIdDecs, 18, "setCameraId"], [bound, 2, "stopAudioByComputer"], [bound, 2, "release"], [bound, 2, "_handleStreamUpdate"]], []).e, 4);
 _init_isPstnUser = _applyDecs$e[0];
 _init_phoneMicEnabled = _applyDecs$e[1];
-_initProto = _applyDecs$e[2];
+_init_isVolteUser = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
 export var DeviceControlStoreContext = /*#__PURE__*/createContext(null);

package/lib-es/modules/components/leave-meeting/index.js

@@ -17,6 +17,7 @@ export var LeaveMeeting = observer(function (props) {
     isLocked = _useContext.isLocked,
     hasEndRoomPermission = _useContext.hasEndRoomPermission,
     isPstnUser = _useContext.isPstnUser,
+    isVolteUser = _useContext.isVolteUser,
     loading = _useContext.loading,
     exitMeeting = _useContext.exitMeeting,
     assignHost = _useContext.assignHost,
@@ -66,7 +67,7 @@ export var LeaveMeeting = observer(function (props) {
         onChange: function onChange(checked) {
           return setKeepConnect(checked);
         },
-        isHidden: !isPstnUser
+        isHidden: !isPstnUser && !isVolteUser
       },
       confirmBtnProps: {
         text: t('fmt_popup_button_endmeeting'),
@@ -95,7 +96,7 @@ export var LeaveMeeting = observer(function (props) {
       onChange: function onChange(checked) {
         return setKeepConnect(checked);
       },
-      isHidden: !isPstnUser
+      isHidden: !isPstnUser && !isVolteUser
     },
     confirmBtnProps: {
       text: t('fmt_actionbar__button_leaveyes'),

package/lib-es/modules/components/leave-meeting/main-scene/store.js

@@ -94,6 +94,11 @@ var LeaveMeetingStoreMain = /*#__PURE__*/function (_LeaveMeetingStoreBas) {
     get: function get() {
       return this._sharedMemberDataSource.hasOwnPstnStream;
     }
+  }, {
+    key: "isVolteUser",
+    get: function get() {
+      return this._sharedMemberDataSource.hasOwnVolteStream;
+    }
   }, {
     key: "isHostSupportedByPlatform",
     value: function isHostSupportedByPlatform(platform) {
@@ -102,6 +107,6 @@ var LeaveMeetingStoreMain = /*#__PURE__*/function (_LeaveMeetingStoreBas) {
   }]);
 }(LeaveMeetingStoreBase);
 _LeaveMeetingStoreMain = LeaveMeetingStoreMain;
-var _applyDecs$e = _slicedToArray(_applyDecs(_LeaveMeetingStoreMain, [[computed, 3, "hostAvailibleRemoteUsers"], [computed, 3, "isPstnUser"], [_isHostSupportedByPlatformDecs, 18, "isHostSupportedByPlatform"]], [], 0, void 0, LeaveMeetingStoreBase).e, 1);
+var _applyDecs$e = _slicedToArray(_applyDecs(_LeaveMeetingStoreMain, [[computed, 3, "hostAvailibleRemoteUsers"], [computed, 3, "isPstnUser"], [computed, 3, "isVolteUser"], [_isHostSupportedByPlatformDecs, 18, "isHostSupportedByPlatform"]], [], 0, void 0, LeaveMeetingStoreBase).e, 1);
 _initProto = _applyDecs$e[0];
 export { LeaveMeetingStoreMain as default };

package/lib-es/modules/components/leave-meeting/store.base.js

@@ -179,7 +179,7 @@ export var LeaveMeetingStoreBase = /*#__PURE__*/function () {
               return this._checkIfQuitFullScreen();
             case 1:
               this.loading = true;
-              _t = this.keepConnect && this.isPstnUser;
+              _t = this.keepConnect && (this.isPstnUser || this.isVolteUser);
               if (!_t) {
                 _context2.next = 2;
                 break;

package/lib-es/modules/components/leave-meeting/waiting-scene/store.js

@@ -85,6 +85,11 @@ var LeaveMeetingStoreWaiting = /*#__PURE__*/function (_LeaveMeetingStoreBas) {
     get: function get() {
       return false;
     }
+  }, {
+    key: "isVolteUser",
+    get: function get() {
+      return false;
+    }
   }, {
     key: "isHostSupportedByPlatform",
     value: function isHostSupportedByPlatform(platform) {
@@ -93,6 +98,6 @@ var LeaveMeetingStoreWaiting = /*#__PURE__*/function (_LeaveMeetingStoreBas) {
   }]);
 }(LeaveMeetingStoreBase);
 _LeaveMeetingStoreWaiting = LeaveMeetingStoreWaiting;
-var _applyDecs$e = _slicedToArray(_applyDecs(_LeaveMeetingStoreWaiting, [[computed, 3, "hostAvailibleRemoteUsers"], [computed, 3, "isPstnUser"], [_isHostSupportedByPlatformDecs, 18, "isHostSupportedByPlatform"]], [], 0, void 0, LeaveMeetingStoreBase).e, 1);
+var _applyDecs$e = _slicedToArray(_applyDecs(_LeaveMeetingStoreWaiting, [[computed, 3, "hostAvailibleRemoteUsers"], [computed, 3, "isPstnUser"], [computed, 3, "isVolteUser"], [_isHostSupportedByPlatformDecs, 18, "isHostSupportedByPlatform"]], [], 0, void 0, LeaveMeetingStoreBase).e, 1);
 _initProto = _applyDecs$e[0];
 export { LeaveMeetingStoreWaiting as default };

package/lib-es/modules/components/member-window/components/member-actions/components/icon-status.js

@@ -5,8 +5,8 @@ import { useI18n } from 'agora-ui-foundation/lib/i18n';
 import classNames from 'classnames';
 import { MicVolume } from '../../mic-volume';
 import { NoMuteIconButton, SipDeviceIconButton } from './icon-buttons';
-import { FcrIconPhoneCall } from 'agora-ui-foundation/lib/components/icon-phone-call';
 import { useMemberWindowActionsStore } from '../provider';
+import { MicrophoneState } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/microphone-state';
 import { jsx as _jsx } from "react/jsx-runtime";
 export var IconStatus = observer(function (_ref) {
   var iconSize = _ref.iconSize,
@@ -45,15 +45,12 @@ export var IconStatus = observer(function (_ref) {
   };
   var renderPhoneStatus = function renderPhoneStatus() {
     if (!isPurePhone) {
-      return /*#__PURE__*/_jsx("button", {
-        className: "fcr-user-window-actions-microphone",
-        children: /*#__PURE__*/_jsx(FcrIconPhoneCall, {
-          size: iconSize,
-          isMuted: !phoneMicEnabled,
-          iconColors: {
-            iconPrimary: store.ownerRoleType === FcrUserRole.HOST ? 'var(--fcr_ui_scene_white10)' : 'var(--fcr_ui_scene_ramp_lightgreen6)'
-          }
-        })
+      return /*#__PURE__*/_jsx(MicrophoneState, {
+        isPhoneMic: true,
+        isMicrophoneMuted: !phoneMicEnabled,
+        size: iconSize,
+        voicePercent: volume,
+        activeColor: store.ownerRoleType === FcrUserRole.HOST ? 'var(--fcr_ui_scene_white10)' : 'var(--fcr_ui_scene_ramp_lightgreen6)'
       });
     }
   };

package/lib-es/modules/components/member-window/components/member-actions/components/more-actions.js

@@ -41,8 +41,8 @@ export var MoreActions = observer(function (_ref) {
     isShowActionAudio = _actionMute.isShowActionAudio,
     actionAudioTag = _actionMute.actionAudioTag;
   var connectorType = audioStreamConnectorType !== FcrRoomConnectorType.NONE ? audioStreamConnectorType : videoStreamConnectorType;
-  var isPhone = connectorType === FcrRoomConnectorType.PSTN;
-  var userType = audioStreamConnectorType === FcrRoomConnectorType.PSTN && !hasVideoStream ? 'phone' : isMeeting ? 'meeting-system' : 'normal';
+  var isPhone = connectorType === FcrRoomConnectorType.PSTN || connectorType === FcrRoomConnectorType.VOLTE;
+  var userType = (audioStreamConnectorType === FcrRoomConnectorType.PSTN || audioStreamConnectorType === FcrRoomConnectorType.VOLTE) && !hasVideoStream ? 'phone' : isMeeting ? 'meeting-system' : 'normal';
   var isHost = ownerRoleType === FcrUserRole.HOST;
   var audioDeviceType = isPhone ? 'phone-mic' : 'computer-mic';
   var userData = {

package/lib-es/modules/components/member-window/components/member-actions/index.js

@@ -2,7 +2,6 @@ import "core-js/modules/es.array.find.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.find.js";
-import { FcrRoomConnectorType } from 'fcr-core';
 import { MemberWindowActionsProvider } from './provider';
 import { MemberActionsLayout } from './components/layout/index';
 import { MoreActions } from './components/more-actions';
@@ -38,12 +37,6 @@ export var MemberWindowActions = function MemberWindowActions(_ref) {
     hasMutePermission = _ref.hasMutePermission,
     hasUnmutePermission = _ref.hasUnmutePermission,
     hasRequestStartAudioPermission = _ref.hasRequestStartAudioPermission;
-  var audioStreamConnectorType = windowData.audioStreamConnectorType,
-    videoStreamConnectorType = windowData.videoStreamConnectorType,
-    hasMicrophoneAudioStream = windowData.hasMicrophoneAudioStream,
-    phoneMicEnabled = windowData.phoneMicEnabled;
-  var connectorType = audioStreamConnectorType !== FcrRoomConnectorType.NONE ? audioStreamConnectorType : videoStreamConnectorType;
-  var hideAudioConnectIcon = !!(connectorType === FcrRoomConnectorType.NONE ? hasMicrophoneAudioStream : connectorType === FcrRoomConnectorType.PSTN ? phoneMicEnabled : false);
   return /*#__PURE__*/_jsx(MemberWindowActionsProvider, {
     windowData: windowData,
     sendParticipantEvent: sendParticipantEvent,

package/lib-es/modules/components/member-window/components/member-actions/store.js

@@ -297,7 +297,7 @@ export var MemberWindowActionsStore = /*#__PURE__*/function () {
   }, {
     key: "isPhone",
     get: function get() {
-      return this.connectorType === FcrRoomConnectorType.PSTN;
+      return this.connectorType === FcrRoomConnectorType.PSTN || this.connectorType === FcrRoomConnectorType.VOLTE;
     }
   }, {
     key: "isInterpreter",

package/lib-es/modules/components/member-window/index.js

@@ -80,7 +80,7 @@ export var MemberWindow = observer(function (_ref) {
     avatar = windowData.avatar;
   var t = useI18n();
   var connectorType = audioStreamConnectorType !== FcrRoomConnectorType.NONE ? audioStreamConnectorType : videoStreamConnectorType;
-  var isPhone = audioStreamConnectorType === FcrRoomConnectorType.PSTN;
+  var isPhone = audioStreamConnectorType === FcrRoomConnectorType.PSTN || audioStreamConnectorType === FcrRoomConnectorType.VOLTE;
   var isPhoneOnlyAudio = isPhone && !videoStreamId;
   var isMeeting = meetingConnectorTypes.has(connectorType);
   var suffixedName = userName + (isMySelf ? t('fmt_attendies_labels_setting_mine') : '');

package/lib-es/modules/components/tab-frame/index.css

@@ -6,7 +6,7 @@
 }
 
 .fcr-tabs-frame-tabs {
-  padding: 9px 0;
+  padding: 6px 0;
   display: flex;
   justify-content: center;
   -webkit-app-region: drag;
@@ -38,3 +38,14 @@
   justify-content: center;
   padding: 0px 12px 12px 12px;
 }
+
+.fcr-tabs-frame-tabs-single {
+  font-weight: 600;
+  font-size: 14px;
+  line-height: 20px;
+  color: var(--fcr_ui_scene_icontext1);
+  height: 34px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

package/lib-es/modules/components/tab-frame/index.js

@@ -28,7 +28,7 @@ function FcrDialogTabFrame(props) {
       className: "fcr-tabs-frame-tabs"
       // {...bind?.()}
       ,
-      children: /*#__PURE__*/_jsx(FcrTabs, {
+      children: tabs.length > 1 ? /*#__PURE__*/_jsx(FcrTabs, {
         activeKey: currentKey,
         items: tabs,
         onChange: function onChange(key) {
@@ -37,6 +37,9 @@ function FcrDialogTabFrame(props) {
             return tab.key === key;
           })) === null || _tabs$find === void 0 ? void 0 : _tabs$find.content) && setCurrentKey(key);
         }
+      }) : /*#__PURE__*/_jsx("div", {
+        className: "fcr-tabs-frame-tabs-single",
+        children: tabs[0].label
       })
     }), tabs.map(function (_ref) {
       var key = _ref.key,

package/lib-es/modules/control-bar/components/share-state-nav/index.js

@@ -34,8 +34,7 @@ export var DragIcon = function DragIcon() {
 export var ShareStateNav = observer(function (props) {
   var onShareStateNavTransferPosition = props.onShareStateNavTransferPosition,
     currentPosition = props.currentPosition,
-    onMouseEnter = props.onMouseEnter,
-    onMouseLeave = props.onMouseLeave;
+    onMouseEnter = props.onMouseEnter;
   var _useContext = useContext(StoreContext),
     isMuteAudio = _useContext.isMuteAudio,
     isInSmoothMode = _useContext.isInSmoothMode,
@@ -45,7 +44,6 @@ export var ShareStateNav = observer(function (props) {
   var transI18n = useI18n();
   return /*#__PURE__*/_jsxs("div", {
     onMouseEnter: onMouseEnter,
-    onMouseLeave: onMouseLeave,
     className: "share-state-nav fcr-flex fcr-items-center \n                 fcr-justify-center share-action-nav__can-draggable \n                ".concat(currentPosition === TransferPosition.TOP ? 'share-state-nav-top' : 'share-state-nav-bottom'),
     children: [/*#__PURE__*/_jsx(DragIcon, {}), /*#__PURE__*/_jsx(TransferPositionIcon, {
       onTransferPositionButtonClick: onShareStateNavTransferPosition,

package/lib-es/modules/control-bar/mouse-event-bridge.js

@@ -0,0 +1,79 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import { FcrUIDetectAreaID } from '../../providers/mouse-detect/struct';
+export var ControlBarMouseEventBridge = /*#__PURE__*/function () {
+  function ControlBarMouseEventBridge(_ref) {
+    var _this = this;
+    var controlBarWindow = _ref.controlBarWindow,
+      mouseDetectProvider = _ref.mouseDetectProvider,
+      logger = _ref.logger;
+    _classCallCheck(this, ControlBarMouseEventBridge);
+    this._controlBarWindow = controlBarWindow;
+    this._mouseDetectProvider = mouseDetectProvider;
+    this._logger = logger;
+    this._mouseDetectObserver = {
+      onMouseEnterDetectArea: function onMouseEnterDetectArea(areaId) {
+        if (areaId !== FcrUIDetectAreaID.ControlBar) return;
+        if (!_this._shouldUseMouseDetect()) return;
+        _this._controlBarWindow.setIgnoreMouseEvents(false);
+        _this._controlBarWindow.focus();
+      },
+      onMouseLeaveDetectArea: function onMouseLeaveDetectArea(areaId) {
+        if (areaId !== FcrUIDetectAreaID.ControlBar) return;
+        if (!_this._shouldUseMouseDetect()) return;
+        _this._controlBarWindow.setIgnoreMouseEvents(true, {
+          forward: true
+        });
+      }
+    };
+    this._windowObserver = {
+      onBlurred: function onBlurred() {
+        if (!_this._shouldUseMouseDetect()) return;
+        _this._controlBarWindow.setIgnoreMouseEvents(true, {
+          forward: true
+        });
+      }
+    };
+    this._logger.info('should use dom mouse:', this._shouldUseDomMouse());
+    this._logger.info('should use mouse detect:', this._shouldUseMouseDetect());
+  }
+  return _createClass(ControlBarMouseEventBridge, [{
+    key: "initialize",
+    value: function initialize() {
+      this._mouseDetectProvider.addObserver(this._mouseDetectObserver);
+      this._controlBarWindow.addObserver(this._windowObserver);
+    }
+  }, {
+    key: "dispose",
+    value: function dispose() {
+      this._mouseDetectProvider.removeObserver(this._mouseDetectObserver);
+      this._controlBarWindow.removeObserver(this._windowObserver);
+    }
+  }, {
+    key: "handleDomMouseEnter",
+    value: function handleDomMouseEnter() {
+      if (!this._shouldUseDomMouse()) return;
+      this._logger.info('handleMouseEnter');
+      this._controlBarWindow.setIgnoreMouseEvents(false);
+    }
+  }, {
+    key: "handleDomMouseLeave",
+    value: function handleDomMouseLeave() {
+      if (!this._shouldUseDomMouse()) return;
+      this._logger.info('handleMouseLeave');
+      this._controlBarWindow.setIgnoreMouseEvents(true, {
+        forward: true
+      });
+    }
+  }, {
+    key: "_shouldUseMouseDetect",
+    value: function _shouldUseMouseDetect() {
+      return this._mouseDetectProvider.isMouseDetectEnabled();
+    }
+  }, {
+    key: "_shouldUseDomMouse",
+    value: function _shouldUseDomMouse() {
+      return !this._mouseDetectProvider.isMouseDetectEnabled();
+    }
+  }]);
+}();

package/lib-es/modules/control-bar/store.js

@@ -74,11 +74,12 @@ import { MoreAction } from './enums';
 import { cloudRecordingConfig } from '../../utilities/default-config';
 import { copyText } from 'agora-ui-foundation/lib/utilities/copy-text';
 import { electronWindowConfig as controlBarWindowConfig } from '../dialog/dialogs/control-bar';
-import { isWindows, isMac } from 'agora-foundation/lib/utilities/env';
+import { isWindows } from 'agora-foundation/lib/utilities/env';
 import { FcrUIDetectAreaID } from '../../providers/mouse-detect/struct';
 import { FcrSharePermissionState } from 'fcr-core/lib/room-control/sharing-control/type';
 import { WhiteboardToolAction } from '../secondary-window/type';
 import { FcrUIToastKey } from '../../modules/toast-manager/type';
+import { ControlBarMouseEventBridge } from './mouse-event-bridge';
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 var _H = /*#__PURE__*/new WeakMap();
@@ -160,23 +161,6 @@ var ControlBarStore = /*#__PURE__*/function () {
         _this.updateWindowBounds(sharingDisplayBounds);
       }
     });
-    _defineProperty(this, "_mouseDetectObserver", {
-      onMouseEnterDetectArea: function onMouseEnterDetectArea(areaId) {
-        if (areaId === FcrUIDetectAreaID.ControlBar) {
-          _this._controlBarWindow.setIgnoreMouseEvents(false);
-          if (isWindows()) {
-            _this._controlBarWindow.focus();
-          }
-        }
-      },
-      onMouseLeaveDetectArea: function onMouseLeaveDetectArea(areaId) {
-        if (areaId === FcrUIDetectAreaID.ControlBar) {
-          _this._controlBarWindow.setIgnoreMouseEvents(true, {
-            forward: true
-          });
-        }
-      }
-    });
     _defineProperty(this, "_stateNavArea", {
       x: 0,
       y: 0,
@@ -281,7 +265,12 @@ var ControlBarStore = /*#__PURE__*/function () {
         _this.boardOwnerUser = '';
       }
     };
-    this._mouseDetectProvider.addObserver(this._mouseDetectObserver);
+    this._mouseEventBridge = new ControlBarMouseEventBridge({
+      controlBarWindow: this._controlBarWindow,
+      mouseDetectProvider: this._mouseDetectProvider,
+      logger: this.logger
+    });
+    this._mouseEventBridge.initialize();
     this._screenShareProvider.addObserver(this._screenShareObserver);
     this._mainRoomControl.addObserver(this._roomObserver);
     this._mainRoomControl.getSharingControl().getBoardControl().addObserver(this._boardObserver);
@@ -485,6 +474,11 @@ var ControlBarStore = /*#__PURE__*/function () {
     get: function get() {
       return this._abilityProvider.isRecordingSupported();
     }
+  }, {
+    key: "isAnnotationSupported",
+    get: function get() {
+      return this._abilityProvider.isAnnotationSupported();
+    }
   }, {
     key: "meetingTimeKey",
     get: function get() {
@@ -511,9 +505,9 @@ var ControlBarStore = /*#__PURE__*/function () {
       return this._privilegeProvider.hasAnnotationAllowWritePermission();
     }
   }, {
-    key: "hasAnnotationStartPermission",
+    key: "hasAnnotationWritePermission",
     get: function get() {
-      return this._privilegeProvider.hasAnnotationStartPermission();
+      return this._privilegeProvider.hasAnnotationWritePermission();
     }
   }, {
     key: "liveStreamingButtonVisible",
@@ -621,18 +615,12 @@ var ControlBarStore = /*#__PURE__*/function () {
   }, {
     key: "handleMouseEnter",
     value: function handleMouseEnter() {
-      if (isMac()) {
-        this._controlBarWindow.setIgnoreMouseEvents(false);
-      }
+      this._mouseEventBridge.handleDomMouseEnter();
     }
   }, {
     key: "handleMouseLeave",
     value: function handleMouseLeave() {
-      if (isMac()) {
-        this._controlBarWindow.setIgnoreMouseEvents(true, {
-          forward: true
-        });
-      }
+      this._mouseEventBridge.handleDomMouseLeave();
     }
   }, {
     key: "openLiveStreamingDialog",
@@ -710,7 +698,7 @@ var ControlBarStore = /*#__PURE__*/function () {
       this._mainRoomControl.getSharingControl().getBoardControl().removeObserver(this._boardObserver);
       this._mainRoomControl.removeObserver(this._roomObserver);
       this._screenShareProvider.removeObserver(this._screenShareObserver);
-      this._mouseDetectProvider.removeObserver(this._mouseDetectObserver);
+      this._mouseEventBridge.dispose();
       this._mouseDetectProvider.deleteDetectArea(FcrUIDetectAreaID.ControlBar);
     }
   }, {

package/lib-es/modules/control-bar/view.js

@@ -281,11 +281,13 @@ var ControlBar = observer(function () {
     currentShareDisplayId = _useContext5.currentShareDisplayId,
     updateWindowBounds = _useContext5.updateWindowBounds,
     setPopoverArea = _useContext5.setPopoverArea,
-    resetPopoverArea = _useContext5.resetPopoverArea;
+    resetPopoverArea = _useContext5.resetPopoverArea,
+    handleMouseLeave = _useContext5.handleMouseLeave;
   var updatePosition = useContext(DragStateUpdaterContext);
   var _useContext6 = useContext(ControlBarCalculationUpdaterContext),
     setDimensions = _useContext6.setDimensions,
-    setNavPosition = _useContext6.setNavPosition;
+    setNavPosition = _useContext6.setNavPosition,
+    restartActiveTask = _useContext6.restartActiveTask;
   var _useState9 = useState('hidden'),
     _useState0 = _slicedToArray(_useState9, 2),
     visibility = _useState0[0],
@@ -339,12 +341,17 @@ var ControlBar = observer(function () {
     }
   }, [visibility]);
   usePopoverWatcher(containerRef, setPopoverArea, resetPopoverArea);
+  var handleControlBarMouseLeave = useCallback(function () {
+    handleMouseLeave();
+    restartActiveTask();
+  }, [handleMouseLeave, restartActiveTask]);
   return /*#__PURE__*/_jsxs("div", {
     ref: containerRef,
     className: rootClassNames,
     style: {
       visibility: visibility
     },
+    onMouseLeave: handleControlBarMouseLeave,
     children: [/*#__PURE__*/_jsx(ControlBarContent, {}), /*#__PURE__*/_jsx(ShareStateNavigation, {})]
   });
 });
@@ -353,11 +360,9 @@ var ControlBar = observer(function () {
 var ControlBarContent = /*#__PURE__*/memo(function () {
   var _useContext7 = useContext(StoreContext),
     handleMouseEnter = _useContext7.handleMouseEnter,
-    handleMouseLeave = _useContext7.handleMouseLeave,
     setControlBarContentArea = _useContext7.setControlBarContentArea;
   var _useContext8 = useContext(ControlBarCalculationUpdaterContext),
     setIsShareActionNavHidden = _useContext8.setIsShareActionNavHidden,
-    restartActiveTask = _useContext8.restartActiveTask,
     cancelActiveTask = _useContext8.cancelActiveTask;
   var calculation = useContext(ControlBarCalculationContext);
   var navClassName = useMemo(function () {
@@ -368,10 +373,6 @@ var ControlBarContent = /*#__PURE__*/memo(function () {
     handleMouseEnter();
     cancelActiveTask();
   }, []);
-  var handleMouseLeaveNav = useCallback(function () {
-    handleMouseLeave();
-    restartActiveTask();
-  }, []);
   var handleBoundariesChanged = useCallback(function (boundaries) {
     console.log('ControlBarContent boundaries changed');
     setControlBarContentArea(boundaries);
@@ -407,7 +408,6 @@ var ControlBarContent = /*#__PURE__*/memo(function () {
     children: /*#__PURE__*/_jsxs("div", {
       className: navClassName,
       onMouseEnter: handleMouseEnterNav,
-      onMouseLeave: handleMouseLeaveNav,
       children: [/*#__PURE__*/_jsx(MediaControlGroup, {}), /*#__PURE__*/_jsx(FcrDivider, {
         style: {
           marginRight: 24,
@@ -519,7 +519,8 @@ var AnnotationSection = observer(function () {
     clearAnnotation = _useContext11.clearAnnotation,
     isWriteAnnotationAllowed = _useContext11.isWriteAnnotationAllowed,
     hasPermissionAllowWriteAnnotation = _useContext11.hasPermissionAllowWriteAnnotation,
-    hasAnnotationStartPermission = _useContext11.hasAnnotationStartPermission;
+    isAnnotationSupported = _useContext11.isAnnotationSupported,
+    hasAnnotationWritePermission = _useContext11.hasAnnotationWritePermission;
   var _useContext12 = useContext(ControlBarCalculationContext),
     isShareActionNavHidden = _useContext12.isShareActionNavHidden;
   var _useState11 = useState(false),
@@ -531,6 +532,16 @@ var AnnotationSection = observer(function () {
       setVisible(false);
     }
   }, [isShareActionNavHidden]);
+
+  // 不支持标注的能力, 不显示按钮
+  if (!isAnnotationSupported) {
+    return null;
+  }
+
+  // 没有标注写权限, 不显示按钮
+  if (!hasAnnotationWritePermission) {
+    return null;
+  }
   return /*#__PURE__*/_jsx(AnnotationButton, {
     onAllowWriteClick: allowWriteAnnotation,
     onCleanAnnotationClick: clearAnnotation,
@@ -634,7 +645,6 @@ var ShareStateNavigation = /*#__PURE__*/memo(function () {
   var _useContext17 = useContext(StoreContext),
     handlerStopShare = _useContext17.handlerStopShare,
     handleMouseEnter = _useContext17.handleMouseEnter,
-    handleMouseLeave = _useContext17.handleMouseLeave,
     setStateNavArea = _useContext17.setStateNavArea;
   var calculation = useContext(ControlBarCalculationContext);
   var _useContext18 = useContext(ControlBarCalculationUpdaterContext),
@@ -642,7 +652,6 @@ var ShareStateNavigation = /*#__PURE__*/memo(function () {
     setNavPosition = _useContext18.setNavPosition,
     moveBottom = _useContext18.moveBottom,
     moveTop = _useContext18.moveTop,
-    restartActiveTask = _useContext18.restartActiveTask,
     cancelActiveTask = _useContext18.cancelActiveTask;
 
   // 从store获取当前位置和相关方法
@@ -661,10 +670,6 @@ var ShareStateNavigation = /*#__PURE__*/memo(function () {
     handleMouseEnter();
     cancelActiveTask();
   }, [setIsShareActionNavHidden, handleMouseEnter, cancelActiveTask]);
-  var handleMouseLeaveNav = useCallback(function () {
-    handleMouseLeave();
-    restartActiveTask();
-  }, [handleMouseLeave, restartActiveTask]);
   var handleBoundariesChanged = useCallback(function (boundaries) {
     console.log('ShareStateNavigation boundaries changed');
     setStateNavArea(boundaries);
@@ -687,7 +692,6 @@ var ShareStateNavigation = /*#__PURE__*/memo(function () {
     ref: detector,
     children: /*#__PURE__*/_jsx(ShareStateNav, {
       onMouseEnter: handleMouseEnterNav,
-      onMouseLeave: handleMouseLeaveNav,
       onShareStateNavTransferPosition: handleTransferPosition,
       currentPosition: navCurrentPosition,
       onStopShare: handlerStopShare

package/lib-es/modules/dialog/dialogs/connection-gateway/tabs.js

@@ -13,7 +13,8 @@ export var GatewayConnectorTabs = observer(function (props) {
     phoneChildren = props.phoneChildren;
   var _useContext = useContext(StoreContext),
     connectType = _useContext.connectType,
-    hasOwnPstnStream = _useContext.hasOwnPstnStream;
+    hasOwnPstnStream = _useContext.hasOwnPstnStream,
+    hasOwnVolteStream = _useContext.hasOwnVolteStream;
   var _useState = useState("".concat(type)),
     _useState2 = _slicedToArray(_useState, 2),
     activeTabKey = _useState2[0],
@@ -23,7 +24,7 @@ export var GatewayConnectorTabs = observer(function (props) {
     key: 'computer',
     content: computerChildren
   }, {
-    label: "".concat(transI18n('fmt_pstn_options_phoneaudio')).concat(hasOwnPstnStream ? "-".concat(transI18n('fmt_PSTN_status_connected')) : ''),
+    label: "".concat(transI18n('fmt_pstn_options_phoneaudio')).concat(hasOwnPstnStream || hasOwnVolteStream ? "-".concat(transI18n('fmt_PSTN_status_connected')) : ''),
     key: 'phone',
     content: phoneChildren
   }];