fcr-ui-scene 3.2.0 → 3.3.0

package/lib/modules/action-bar/index.css

@@ -1,6 +1,7 @@
 html {
   --fcr-action-bar-height: 58px;
 }
+
 .fcr-action-bar {
   background: var(--fcr_web_ui_scene_fill2);
   width: 100%;
@@ -14,6 +15,7 @@ html {
   border-top-style: solid;
   z-index: 3;
 }
+
 .fcr-action-bar-hide {
   transform: translateY(var(--fcr-action-bar-height));
 }
@@ -25,9 +27,11 @@ html {
   flex-direction: row;
   align-items: center;
 }
+
 .fcr-action-bar-right {
   padding-right: 12px;
 }
+
 .fcr-action-bar-mid {
   flex: 1;
   flex-shrink: 1;
@@ -35,6 +39,7 @@ html {
   padding: 0 10px;
   justify-content: center;
 }
+
 .fcr-action-bar-collapse {
   display: flex;
   flex-flow: row nowrap;
@@ -42,6 +47,7 @@ html {
   overflow: hidden;
   flex: 1;
 }
+
 .fcr-action-bar-item-wrapper {
   background: transparent;
   width: fit-content;
@@ -55,9 +61,11 @@ html {
   flex-shrink: 0;
   position: relative;
 }
+
 .fcr-action-bar-extra {
   cursor: pointer;
 }
+
 @media screen and (max-width: 430px) {
   .fcr-action-bar-item-wrapper {
     min-width: 55px;
@@ -68,11 +76,16 @@ html {
   outline: 0;
 }
 
-.fcr-action-bar-item:hover,
+.fcr-action-bar-item-wrapper:hover .fcr-action-bar-item {
+  background: var(--fcr_web_ui_scene_hover2);
+  border-radius: var(--fcr_cornerradius_s);
+}
+
 .fcr-action-bar-item-active {
   background: var(--fcr_web_ui_scene_hover2);
   border-radius: var(--fcr_cornerradius_s);
 }
+
 .fcr-action-bar-item {
   flex: 1;
   display: inline-flex;
@@ -81,33 +94,41 @@ html {
   max-width: 100%;
   height: 100%;
 }
+
 .fcr-icon-green path,
 .fcr-icon-green-when-hover:hover path {
   fill: var(--fcr_ui_scene_ramp_green6);
 }
+
 .fcr-icon-blue path {
   fill: var(--fcr_ui_scene_ramp_brand6);
 }
+
 .fcr-checkbox-overlay-style svg path {
   fill: var(--fcr_ui_scene_icontext1);
   transition: all 0.1s ease;
 }
+
 .fcr-checkbox-overlay-style .fcr-checkbox-inner {
   width: 14px;
   height: 14px;
   background: transparent;
 }
+
 .fcr-checkbox-overlay-style .fcr-checkbox-inner svg {
   width: 14px;
   height: 14px;
 }
+
 .fcr-action-bar-item-disabled {
   cursor: not-allowed;
 }
+
 .fcr-action-bar-item-disabled .fcr-action-bar-item-icon,
 .fcr-action-bar-item-disabled .fcr-action-bar-item-text {
   opacity: 0.5;
 }
+
 .fcr-action-bar-item-text {
   color: var(--fcr_ui_scene_icontext2);
   font-weight: 400;
@@ -115,9 +136,11 @@ html {
   line-height: 12px;
   padding: 0 8px;
 }
+
 .fcr-action-bar-item-text span {
   white-space: nowrap;
 }
+
 .fcr-action-bar-cancel-leave {
   margin-right: 15px;
   margin-left: auto;
@@ -128,16 +151,39 @@ html {
   display: flex;
   align-items: center;
 }
+
 .fcr-action-bar--popover .fcr-drop-menu {
   text-align: left;
 }
+
 .fcr-action-bar--popover .fcr-checkbox-input-wrapper {
   border-color: transparent;
 }
+
 .fcr-action-bar--popover .fcr-tooltip-inner {
   border: none;
   box-shadow: var(--fcr_web_light_dropup_m) !important;
 }
+.fcr-screen-share--popover .fcr-button > p {
+  max-width: 140px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.fcr-action-bar--fold-wrap {
+  width: 100%;
+  display: flex;
+  /* position: absolute;
+  inset: auto auto 0px 0px; */
+}
+
+.fcr-action-bar--fold-btn {
+  width: 70px;
+  height: 22px;
+  margin-left: 50%;
+}
+
 .fcr-action-bar--fold {
   width: 70px;
   height: 22px;
@@ -148,26 +194,21 @@ html {
   border-top-right-radius: 8px;
   border: 1px solid var(--fcr_ui_scene_line1);
   border-bottom: none;
-  position: absolute;
-  left: 50%;
-  top: -21px;
-  transform: translateX(-50%);
-  background: #fff;
+  background-color: #fff;
   cursor: pointer;
 }
+
 .fcr-action-bar--fold-hotarea {
-  width: 120px;
-  height: 30px;
+  width: 100%;
+  height: 22px;
   display: flex;
-  position: absolute;
-  left: 50%;
-  top: -30px;
-  transform: translateX(-50%);
 }
+
 .fcr-action-bar--fold svg {
   width: 30px;
   height: 30px;
 }
+
 .fcr-action-bar--unfold {
   width: 52px;
   height: 50px;
@@ -176,18 +217,23 @@ html {
   justify-content: center;
   cursor: pointer;
 }
+
 .fcr-action-bar--unfold svg {
   transform: rotate(90deg);
   width: 40px;
   height: 40px;
 }
+
 .fcr-action-bar-fold-style {
   width: 110px;
   height: 50px;
   position: absolute;
   right: 15px;
   bottom: 15px;
+  border: none;
+  background-color: transparent;
 }
+
 .fcr-action-bar-smaller {
   width: 110px;
   height: 50px;
@@ -200,6 +246,7 @@ html {
   z-index: 1000;
   display: flex;
 }
+
 .fcr-action-bar-smaller-micphone {
   width: 58px;
   height: 50px;

package/lib/modules/action-bar/index.d.ts

@@ -1,12 +1,13 @@
 import { UIModule } from '../../base';
 import './index.css';
-import { FcrDesktopMediaControl, FcrBaseRoomControl, FcrStreamControl, FcrUserControl } from 'agora-edu-core';
+import { FcrDesktopMediaControl, FcrStreamControl, FcrUserControl } from 'agora-edu-core';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrDeviceStore } from '../../common/device-store';
 import { FcrSecurityStore } from '../../common/security-store';
 import { FcrDeviceStreamStore } from '../../common/device-stream-store';
+import { FcrMainRoomControl, FcrWaitingRoomControl } from 'agora-edu-core/lib/room-control/type';
 interface FcrActionBarUIModuleArgs {
-    roomControl: FcrBaseRoomControl;
+    roomControl: FcrMainRoomControl | FcrWaitingRoomControl;
     userControl: FcrUserControl;
     uiEventStore: FcrUIEventStore;
     deviceStore: FcrDeviceStore;

package/lib/modules/action-bar/index.dev.js

@@ -45,7 +45,7 @@ window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default
         _context.next = 4;
         return engine.login();
       case 4:
-        roomControl = engine.createRoomControl(roomId);
+        roomControl = engine.createMainRoomControl(roomId);
         userRole = _type.FcrUserRole.HOST;
         userName = 'host-user';
         _context.next = 9;

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

@@ -79,6 +79,27 @@ var FcrActionBarUIModule = exports.FcrActionBarUIModule = /*#__PURE__*/function
           activeTab: _store2.DeviceSettingTab.AUDIO
         });
       }
+      if (event.action === _constant.RendererEventAction.LEAVE_ROOM) {
+        this._store.leave();
+      }
+      if (event.action === _constant.RendererEventAction.KEEP_PHONE_AUDIO_CONNECTION) {
+        this._store.keepPhoneAudioConnection();
+      }
+      if (event.action === _constant.RendererEventAction.END_ROOM) {
+        this._store.end();
+      }
+      if (event.action === _constant.RendererEventAction.REISSUE_CONTROLBAR_INFO) {
+        this._store.fetchNewestLeavingRoomCompProps();
+      }
+      if (event.action === _constant.RendererEventAction.ASSIGN_HOST) {
+        this._store.assignHost(event.payload);
+      }
+      if (event.action === _constant.RendererEventAction.CALL_CLOSE_MAIN_WINDOW) {
+        this._store.setPopoverOpened(true);
+      }
+      if (event.action === _constant.RendererEventAction.FRAGMENT_SET_ENABLE_WAITING_ROOM) {
+        this._store.setEnableWaitingRoom(event.payload.allow, true);
+      }
     }
   }, {
     key: "onUnload",

package/lib/modules/action-bar/leave/assign-host.d.ts

@@ -1,5 +1,8 @@
 import './index.css';
+import { FcrUserInfo } from 'agora-edu-core/lib/type';
 interface AssignHostProps {
+    remoteUsers: FcrUserInfo[];
+    assignHost: (user: FcrUserInfo) => void;
     setPopoverOpened: React.Dispatch<React.SetStateAction<boolean>>;
     handleKeepConnect: () => void;
 }

package/lib/modules/action-bar/leave/assign-host.js

@@ -13,14 +13,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 require("./index.css");
-var _context2 = require("../context");
 var _chatSelect = require("../../chat/chat-select");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 var AssignHost = exports.AssignHost = (0, _mobxReact.observer)(function (props) {
-  var _useContext = (0, _react.useContext)(_context2.ActionBarContext),
-    remoteUsers = _useContext.remoteUsers,
-    assignHost = _useContext.assignHost;
+  var remoteUsers = props.remoteUsers,
+    assignHost = props.assignHost;
   var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     selected = _useState2[0],

package/lib/modules/action-bar/leave/index.js

@@ -41,15 +41,23 @@ var End = exports.End = (0, _mobxReact.observer)(function (props) {
   var transI18n = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     localUserRole = _useContext.localUserRole,
-    toggleLayoutBarLock = _useContext.toggleLayoutBarLock;
+    toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
+    remoteUsers = _useContext.remoteUsers,
+    end = _useContext.end,
+    leave = _useContext.leave,
+    isLocked = _useContext.isLocked,
+    hasAssignHostBeforeLeavingPermission = _useContext.hasAssignHostBeforeLeavingPermission,
+    hasEndRoomPermission = _useContext.hasEndRoomPermission,
+    keepPhoneAudioConnection = _useContext.keepPhoneAudioConnection,
+    isPstnUser = _useContext.isPstnUser,
+    assignHost = _useContext.assignHost,
+    popoverOpened = _useContext.popoverOpened,
+    _setPopoverOpened = _useContext.setPopoverOpened;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     tooltipOpened = _useState2[0],
     setTooltipOpened = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    popoverOpened = _useState4[0],
-    _setPopoverOpened = _useState4[1];
+  // const [popoverOpened, setPopoverOpened] = useState(false);
   var popOverRef = (0, _react.useRef)(false);
   var onTooltipChanged = function onTooltipChanged(v) {
     if (!popoverOpened) {
@@ -84,6 +92,11 @@ var End = exports.End = (0, _mobxReact.observer)(function (props) {
       window.removeEventListener('resize', reflow);
     };
   }, []);
+  (0, _react.useEffect)(function () {
+    if (popoverOpened) {
+      onPopoverChanged(popoverOpened);
+    }
+  }, [popoverOpened]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
     visible: tooltipOpened,
     onVisibleChange: onTooltipChanged,
@@ -102,7 +115,17 @@ var End = exports.End = (0, _mobxReact.observer)(function (props) {
         setPopoverOpened: function setPopoverOpened(value) {
           _setPopoverOpened(value);
           onPopoverChanged(false);
-        }
+        },
+        localUserRole: localUserRole,
+        leave: leave,
+        isLocked: isLocked,
+        hasAssignHostBeforeLeavingPermission: hasAssignHostBeforeLeavingPermission,
+        hasEndRoomPermission: hasEndRoomPermission,
+        keepPhoneAudioConnection: keepPhoneAudioConnection,
+        isPstnUser: isPstnUser,
+        remoteUsers: remoteUsers,
+        end: end,
+        assignHost: assignHost
       }),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, _objectSpread(_objectSpread({
         shape: "rounded",

package/lib/modules/action-bar/leave/leave-meeting.d.ts

@@ -1,6 +1,17 @@
 import './index.css';
+import { FcrUserInfo, FcrUserRole } from 'agora-edu-core/lib/type';
 interface LeaveMeetingProps {
     setPopoverOpened: React.Dispatch<React.SetStateAction<boolean>>;
+    end: () => void;
+    leave: () => void;
+    isLocked: boolean;
+    keepPhoneAudioConnection: () => void;
+    localUserRole: FcrUserRole;
+    remoteUsers: FcrUserInfo[];
+    hasAssignHostBeforeLeavingPermission: boolean;
+    hasEndRoomPermission: boolean;
+    isPstnUser: boolean;
+    assignHost: (user: FcrUserInfo) => void;
 }
 export declare const LeaveMeeting: (props: LeaveMeetingProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/modules/action-bar/leave/leave-meeting.js

@@ -12,23 +12,22 @@ require("./index.css");
 var _type = require("agora-edu-core/lib/type");
 var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _context = require("../context");
 var _mobxReact = require("mobx-react");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _jsxRuntime = require("react/jsx-runtime");
 var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (props) {
   var t = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
-    localUserRole = _useContext.localUserRole,
-    remoteUsers = _useContext.remoteUsers,
-    end = _useContext.end,
-    leave = _useContext.leave,
-    isLocked = _useContext.isLocked,
-    hasAssignHostBeforeLeavingPermission = _useContext.hasAssignHostBeforeLeavingPermission,
-    hasEndRoomPermission = _useContext.hasEndRoomPermission,
-    keepPhoneAudioConnection = _useContext.keepPhoneAudioConnection,
-    isPstnUser = _useContext.isPstnUser;
+  var localUserRole = props.localUserRole,
+    remoteUsers = props.remoteUsers,
+    end = props.end,
+    leave = props.leave,
+    isLocked = props.isLocked,
+    hasAssignHostBeforeLeavingPermission = props.hasAssignHostBeforeLeavingPermission,
+    hasEndRoomPermission = props.hasEndRoomPermission,
+    keepPhoneAudioConnection = props.keepPhoneAudioConnection,
+    isPstnUser = props.isPstnUser,
+    assignHost = props.assignHost;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     canAssign = _useState2[0],
@@ -45,9 +44,9 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
     if (remoteUsers.length > 0 && hasAssignHostBeforeLeavingPermission) {
       setCanAssign(true);
     } else {
-      props.setPopoverOpened(false);
-      leave();
       handleKeepConnect();
+      leave();
+      props.setPopoverOpened(false);
     }
   };
   var handleKeepConnect = function handleKeepConnect() {
@@ -57,19 +56,25 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
   };
   var handleConfirm = function handleConfirm() {
     props.setPopoverOpened(false);
-    leave();
     if (keepConnect && isPstnUser) {
       keepPhoneAudioConnection();
     }
+    leave();
   };
   var handleCancel = function handleCancel() {
     props.setPopoverOpened(false);
   };
   if (localUserRole === _type.FcrUserRole.HOST) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      onMouseEnter: function onMouseEnter() {
+        var _window$runtime;
+        (_window$runtime = window.runtime) === null || _window$runtime === void 0 || (_window$runtime = _window$runtime.browserWindow) === null || _window$runtime === void 0 || _window$runtime.setIgnoreMouseEvents(false);
+      },
       children: canAssign ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_assignHost.AssignHost, {
         setPopoverOpened: props.setPopoverOpened,
-        handleKeepConnect: handleKeepConnect
+        handleKeepConnect: handleKeepConnect,
+        remoteUsers: remoteUsers,
+        assignHost: assignHost
       }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "leave-container",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -101,7 +106,11 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "leave-container",
-      children: [isLocked() ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      onMouseEnter: function onMouseEnter() {
+        var _window$runtime2;
+        (_window$runtime2 = window.runtime) === null || _window$runtime2 === void 0 || (_window$runtime2 = _window$runtime2.browserWindow) === null || _window$runtime2 === void 0 || _window$runtime2.setIgnoreMouseEvents(false);
+      },
+      children: [isLocked ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "assistant-leave-lock-info",
           children: t('fmt_actionbar_tips_locked')

package/lib/modules/action-bar/more/poppover-content.js

@@ -103,7 +103,7 @@ var ScreenShare = (0, _mobxReact.observer)(function (props) {
 var Chat = (0, _mobxReact.observer)(function (props) {
   var _useContext4 = (0, _react.useContext)(_context.ActionBarContext),
     toggleChat = _useContext4.toggleChat,
-    newMessageCount = _useContext4.newMessageCount;
+    allNewMessage = _useContext4.allNewMessage;
   var onClick = function onClick() {
     props.setVisible(false);
     toggleChat();
@@ -117,12 +117,12 @@ var Chat = (0, _mobxReact.observer)(function (props) {
       size: 24
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       children: transI18n('fmt_chat_label_chat')
-    }), newMessageCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    }), allNewMessage > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       className: "fcr-more-popover-content_chat_msg_count",
-      children: newMessageCount > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+      children: allNewMessage > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
         type: _type2.FcrIconType.FCR_CHAT_REDDOT,
         size: 14
-      }) : newMessageCount
+      }) : allNewMessage
     })]
   });
 });

package/lib/modules/action-bar/participants/index.css

@@ -1,5 +1,6 @@
 .fcr-action-bar-participants-wrapper {
   position: relative;
+  cursor: pointer;
 }
 .fcr-action-bar-participants-user-count {
   position: absolute;
@@ -7,3 +8,14 @@
   left: 51px;
   color: var(--fcr_web_ui_scene_mainicon1);
 }
+.fcr-action-bar-participants-icon {
+  position: relative;
+}
+.fcr-action-bar-participants-red {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: var(--fcr_ui_scene_ramp_red6);
+  position: absolute;
+  right: 0;
+}

package/lib/modules/action-bar/participants/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Participants = void 0;
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.string.includes.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -14,6 +15,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _item = require("../item");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
+var _icon = require("agora-ui-foundation/lib/components/icon");
 var _context = require("../context");
 var _mobxReact = require("mobx-react");
 require("./index.css");
@@ -27,7 +29,8 @@ var Participants = exports.Participants = (0, _mobxReact.observer)(function (_re
     visibleList = _useContext.visibleList;
   var _useContext2 = (0, _react.useContext)(_context.ActionBarContext),
     toggleParticipants = _useContext2.toggleParticipants,
-    totalUser = _useContext2.totalUser;
+    totalUser = _useContext2.totalUser,
+    isNewWaitingRoomUserEnter = _useContext2.isNewWaitingRoomUserEnter;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     tooltipVisible = _useState2[0],
@@ -48,28 +51,32 @@ var Participants = exports.Participants = (0, _mobxReact.observer)(function (_re
       }
     },
     content: tooltip,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      onClick: toggleParticipants,
       className: "fcr-action-bar-participants-wrapper",
       style: {
         display: visibleList.includes('Participants') ? 'flex' : 'none'
       },
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "fcr-action-bar-participants-user-count",
-        children: totalUser > 999 ? '999+' : totalUser
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
         id: id,
         order: order,
-        onClick: toggleParticipants,
-        icon: _type.FcrIconType.FCR_PEOPLE,
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "fcr-action-bar-participants-icon",
+          children: [isNewWaitingRoomUserEnter ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "fcr-action-bar-participants-red"
+          }) : false, /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+            type: _type.FcrIconType.FCR_PEOPLE,
+            size: 32,
+            colors: {
+              iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
+            }
+          })]
+        }),
         iconColors: {
           iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
         },
-        title: title,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "fcr-action-bar-participants-user-count",
-          children: totalUser > 999 ? '999+' : totalUser
-        })
-      })]
+        title: "".concat(title, "(").concat(totalUser > 999 ? '999+' : totalUser, ")")
+      })
     })
   });
 });

package/lib/modules/action-bar/screen-share/index.js

@@ -39,6 +39,10 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_label_screenshare');
   var tooltip = hasStartScreenSharePermission ? transI18n('fmt_screenshare_label_screenshare') : transI18n('fmt_actionbar_screenshare_tips_restrictshare');
+  (0, _react.useEffect)(function () {
+    setMenuVisible(false);
+    setTooltipVisible(false);
+  }, [hasStartScreenSharePermission]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
     mouseEnterDelay: 0,
     onVisibleChange: function onVisibleChange() {
@@ -71,7 +75,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
         }
       } : undefined
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
-      overlayClassName: "fcr-action-bar--popover",
+      overlayClassName: "fcr-action-bar--popover fcr-screen-share--popover",
       visible: visibleMenu,
       onVisibleChange: setMenuVisible,
       trigger: "click",