fcr-ui-scene 3.4.5 → 3.5.1

package/lib/modules/action-bar/components/apps/useWidgetList.d.ts

@@ -0,0 +1,10 @@
+declare const useWidgetList: (onAppClick?: () => void) => {
+    name: string;
+    fcrToolTipProps: {
+        content: string;
+    };
+    onClick: () => void;
+    imgSrc: string;
+    permission: boolean;
+}[];
+export default useWidgetList;

package/lib/modules/action-bar/components/apps/useWidgetList.js

@@ -0,0 +1,38 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
+var _react = require("react");
+var _store = require("../../store");
+var useWidgetList = function useWidgetList(onAppClick) {
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+    registeredWidgetConfigs = _useContext.registeredWidgetConfigs,
+    openWidget = _useContext.openWidget;
+  var _onClick = function onClick(widgetId) {
+    openWidget(widgetId);
+    onAppClick && onAppClick();
+  };
+  return (0, _react.useMemo)(function () {
+    return registeredWidgetConfigs.map(function (widgetConfig) {
+      return {
+        name: widgetConfig.id,
+        fcrToolTipProps: {
+          content: widgetConfig.name
+        },
+        onClick: function onClick() {
+          _onClick(widgetConfig.id);
+        },
+        imgSrc: widgetConfig.icon,
+        permission: true
+      };
+    });
+  }, [registeredWidgetConfigs]);
+};
+var _default = exports["default"] = useWidgetList;

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

@@ -78,3 +78,11 @@
   align-items: center;
   justify-content: center;
 }
+
+.fcr-chatroom-tooltip-content-text-width {
+  width: calc(100% - 12px - 32px);
+}
+
+.fcr-chatroom-tooltip-content-text-width .fcr-chatroom-tooltip-content-msg-break {
+  overflow-wrap: break-word;
+}

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

@@ -19,6 +19,7 @@ var _store = require("../../store");
 var _fcr_chat_reddot = _interopRequireDefault(require("../../../../../public/assets/fcr_chat_reddot.svg"));
 var _mobxReact = require("mobx-react");
 var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _jsxRuntime = require("react/jsx-runtime");
 var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
@@ -131,7 +132,7 @@ var FcrChatroomTooltipContent = function FcrChatroomTooltipContent(_ref2) {
       textSize: 15,
       nickName: nickName
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "fcr-chatroom-tooltip-content-text",
+      className: (0, _classnames["default"])('fcr-chatroom-tooltip-content-text', 'fcr-chatroom-tooltip-content-text-width'),
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "fcr-chatroom-tooltip-content-from",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {

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

@@ -1,8 +1,10 @@
-import { PropsWithChildren } from 'react';
 import '../../index.css';
-import { ActionBarCollapseContext, AppItemProps } from '../../types';
-export declare const actionBarCollapseContext: import("react").Context<ActionBarCollapseContext>;
-export declare const midActionOrderMap: import("react/jsx-runtime").JSX.Element[];
-export declare const ActionBarCollapseItems: ({ children, appItemOptions }: PropsWithChildren<{
+import { AppItemProps, Item } from '../../types';
+export declare const ActionBarCollapseContext: import("react").Context<{
+    setItem: (id: string, item: Item) => void;
+    visibleList: string[];
+    collapseList?: string[];
+}>;
+export declare const ActionBarCollapseItems: ({ appItemOptions }: {
     appItemOptions: AppItemProps[];
-}>) => import("react/jsx-runtime").JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.midActionOrderMap = exports.actionBarCollapseContext = exports.ActionBarCollapseItems = void 0;
+exports.ActionBarCollapseItems = exports.ActionBarCollapseContext = void 0;
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.from.js");
@@ -48,12 +48,11 @@ var _enums = require("../../enums");
 var _jsxRuntime = require("react/jsx-runtime");
 // import { LiveStreaming } from './components/live-streaming';
 
-var actionBarCollapseContext = exports.actionBarCollapseContext = /*#__PURE__*/(0, _react.createContext)({
+var ActionBarCollapseContext = exports.ActionBarCollapseContext = /*#__PURE__*/(0, _react.createContext)({
   setItem: function setItem() {},
-  visibleList: [],
-  toggleLayoutBarLock: function toggleLayoutBarLock() {}
+  visibleList: []
 });
-var midActionOrderMap = exports.midActionOrderMap = [/*#__PURE__*/(0, _jsxRuntime.jsx)(_security.Security, {
+var midActionOrderMap = [/*#__PURE__*/(0, _jsxRuntime.jsx)(_security.Security, {
   id: "Security",
   order: 1
 }, "Security"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_participants.Participants, {
@@ -88,38 +87,16 @@ var midActionOrderMap = exports.midActionOrderMap = [/*#__PURE__*/(0, _jsxRuntim
   order: 13
 }, "More")];
 var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.observer)(function (_ref) {
-  var children = _ref.children,
-    appItemOptions = _ref.appItemOptions;
+  var appItemOptions = _ref.appItemOptions;
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
-    hasStartScreenSharePermission = _useContext.hasStartScreenSharePermission,
-    hasStartLiveStreamingPermission = _useContext.hasStartLiveStreamingPermission,
-    toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
-    hasEnableStartSharePermission = _useContext.hasEnableStartSharePermission,
-    hasAllowChatPermission = _useContext.hasAllowChatPermission,
-    hasEnableStartAudioPermission = _useContext.hasEnableStartAudioPermission,
-    hasEnableChangeNamePermission = _useContext.hasEnableChangeNamePermission,
-    hasEnableStartVideoPermission = _useContext.hasEnableStartVideoPermission,
-    hasLockRoomPermission = _useContext.hasLockRoomPermission,
-    interpreterState = _useContext.interpreterState;
+    isInterpreterEnabled = _useContext.isInterpreterEnabled,
+    hasSecurityPermissions = _useContext.hasSecurityPermissions;
   var _useState = (0, _react.useState)(function () {
       return _mobx.observable.map();
     }),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 1),
     items = _useState2[0];
-  var _useState3 = (0, _react.useState)(midActionOrderMap.map(function (item) {
-      return item.props.id;
-    })),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    visibleList = _useState4[0],
-    setVisibleList = _useState4[1];
-  var _useState5 = (0, _react.useState)(true),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    alignCenter = _useState6[0],
-    setAlignCenter = _useState6[1];
-  var ref = (0, _react.useRef)(null);
-  var hasSecurityPermissions = hasEnableStartSharePermission || hasAllowChatPermission || hasEnableStartAudioPermission || hasEnableChangeNamePermission || hasEnableStartVideoPermission || hasLockRoomPermission;
   var itemKeys = Array.from(items.keys()).join(',');
-  var whenCoverIconOffset = 60;
   var filteredItems = (0, _react.useMemo)(function () {
     var filter = function filter(item) {
       switch (item.name) {
@@ -132,7 +109,7 @@ var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.obs
         // case 'LiveStreaming':
         //   return hasStartLiveStreamingPermission;
         case _enums.MidActionOrderMapKey.TriggerSubscribeLanguage:
-          return interpreterState;
+          return isInterpreterEnabled;
         case _enums.MidActionOrderMapKey.Apps:
           return appItemOptions.length > 0;
         default:
@@ -140,54 +117,64 @@ var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.obs
       }
     };
     return Array.from(items.values()).filter(filter);
-  }, [hasStartScreenSharePermission, hasStartLiveStreamingPermission, hasSecurityPermissions, itemKeys, interpreterState, appItemOptions]);
+  }, [
+  // hasStartScreenSharePermission,
+  // hasStartLiveStreamingPermission,
+  hasSecurityPermissions, itemKeys, isInterpreterEnabled, appItemOptions]);
+  var _useState3 = (0, _react.useState)(midActionOrderMap.map(function (item) {
+      return item.props.id;
+    })),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    visibleList = _useState4[0],
+    setVisibleList = _useState4[1];
+  var _useState5 = (0, _react.useState)(true),
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    alignCenter = _useState6[0],
+    setAlignCenter = _useState6[1];
+  var ref = (0, _react.useRef)(null);
+
   // if container width is not enough, collapse the items by order
   // if container width is enough, show all items
   // detect container width change by resize observer
   // More button is always visible
 
+  var resizeObserverCallback = (0, _debounce["default"])(function (entries) {
+    var whenCoverIconOffset = 60;
+    var rect = entries[0].contentRect;
+    var more = filteredItems.find(function (item) {
+      return item.name === 'More';
+    });
+    var moreWidth = more ? more.width : 0;
+    var containerWidth = rect.width - moreWidth - whenCoverIconOffset;
+    var totalWidth = filteredItems.reduce(function (prev, curr) {
+      return prev + curr.width;
+    }, 0) - moreWidth;
+    var shouldCollapseComponent = containerWidth <= totalWidth;
+    var currentVisibleList = [];
+    if (shouldCollapseComponent) {
+      var total = 0;
+      currentVisibleList = filteredItems.filter(function (item) {
+        total += item.width;
+        var isMore = item.name === 'More';
+        return isMore ? isMore : total < containerWidth;
+      });
+    } else {
+      currentVisibleList = filteredItems;
+    }
+    setVisibleList(currentVisibleList.map(function (item) {
+      return item.name;
+    }));
+    setAlignCenter(!shouldCollapseComponent);
+  }, 0);
   (0, _react.useEffect)(function () {
+    var resizeObserver = new ResizeObserver(resizeObserverCallback);
     if (ref.current) {
-      var resizeObserver = new ResizeObserver((0, _debounce["default"])(function (entries) {
-        var computeVisibleList = function computeVisibleList(rect, filteredItems) {
-          var more = filteredItems.find(function (item) {
-            return item.name === 'More';
-          });
-          var containerWidth = rect.width - (more ? more.width : 0) - whenCoverIconOffset;
-          var totalWidth = filteredItems.filter(function (i) {
-            return i.name !== 'More';
-          }).reduce(function (prev, curr) {
-            return prev + curr.width;
-          }, 0);
-          if (containerWidth <= totalWidth) {
-            setAlignCenter(false);
-            var total = 0;
-            var list = filteredItems.filter(function (item) {
-              if (item.name === 'More') {
-                return true;
-              }
-              total += item.width;
-              return total < containerWidth;
-            });
-            setVisibleList(list.map(function (item) {
-              return item.name;
-            }));
-          } else {
-            setAlignCenter(true);
-            setVisibleList(filteredItems.map(function (item) {
-              return item.name;
-            }));
-          }
-        };
-        var rect = entries[0].contentRect;
-        computeVisibleList(rect, filteredItems);
-      }, 0));
       resizeObserver.observe(ref.current);
-      return function () {
-        resizeObserver.disconnect();
-      };
     }
-  }, [itemKeys, filteredItems, interpreterState]);
+    return function () {
+      resizeObserver.disconnect();
+    };
+  }, [itemKeys, filteredItems]);
   var collapseList = filteredItems.filter(function (item) {
     return !visibleList.includes(item.name);
   }).map(function (item) {
@@ -209,14 +196,13 @@ var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.obs
     style: {
       justifyContent: alignCenter ? 'center' : 'flex-end'
     },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(actionBarCollapseContext.Provider, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ActionBarCollapseContext.Provider, {
       value: {
         visibleList: visibleList,
         collapseList: collapseList,
-        setItem: setItem,
-        toggleLayoutBarLock: toggleLayoutBarLock
+        setItem: setItem
       },
-      children: children
+      children: midActionOrderMap
     })
   });
 });

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

@@ -18,10 +18,10 @@ var Interpreter = exports.Interpreter = (0, _mobxReact.observer)(function (props
     order = props.order;
   var actionStore = (0, _react.useContext)(_store.ActionBarContext);
   var openInterpreterDialog = actionStore.openInterpreterDialog,
-    interpreterState = actionStore.interpreterState;
+    isInterpreterEnabled = actionStore.isInterpreterEnabled;
   var transI18n = (0, _i18n.useI18n)();
-  var content = interpreterState ? transI18n('fmt_interpretation_mobile_setting_controller_button_turn_off_interpretation') : transI18n('fmt_interpretation_mobile_setting_controller_button_turn_on_interpretation');
-  var icon = interpreterState ? _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_OFF : _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_ON;
+  var content = isInterpreterEnabled ? transI18n('fmt_interpretation_mobile_setting_controller_button_turn_off_interpretation') : transI18n('fmt_interpretation_mobile_setting_controller_button_turn_on_interpretation');
+  var icon = isInterpreterEnabled ? _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_OFF : _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_ON;
   var title = transI18n('fmt_interpretation_mobile_setting_controller_option_interpret');
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
     content: content,

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

@@ -59,7 +59,7 @@ var ActionBarItem = exports.ActionBarItem = function ActionBarItem(props) {
     children = props.children,
     others = (0, _objectWithoutProperties2["default"])(props, _excluded);
   var ref = (0, _react.useRef)(null);
-  var _useContext = (0, _react.useContext)(_collapse.actionBarCollapseContext),
+  var _useContext = (0, _react.useContext)(_collapse.ActionBarCollapseContext),
     setItem = _useContext.setItem,
     visibleList = _useContext.visibleList;
   var visible = id === 'More' ? moreVisible : visibleList.includes(id);

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

@@ -20,9 +20,9 @@ require("./index.css");
 var _poppoverContent = require("./poppover-content");
 var _store = require("../../store");
 var _securityMenu = _interopRequireDefault(require("../../../components/security-menu"));
-var _appitems = require("../apps/appitems");
 var _enums = require("../../enums");
 var _triggerSubscribeLanguage = require("../trigger-subscribe-language");
+var _appList = require("../apps/app-list");
 var _jsxRuntime = require("react/jsx-runtime");
 var More = exports.More = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
@@ -32,10 +32,13 @@ var More = exports.More = (0, _mobxReact.observer)(function (_ref) {
     currentMenuIs = _useContext.currentMenuIs,
     switchMenu = _useContext.switchMenu,
     setEnableWaitingRoom = _useContext.setEnableWaitingRoom,
-    privilegeProvider = _useContext.privilegeProvider;
-  var _useContext2 = (0, _react.useContext)(_collapse.actionBarCollapseContext),
-    collapseList = _useContext2.collapseList,
-    toggleLayoutBarLock = _useContext2.toggleLayoutBarLock;
+    privilegeProvider = _useContext.privilegeProvider,
+    showLockedRoomToast = _useContext.showLockedRoomToast,
+    toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
+    checkedStateMap = _useContext.checkedStateMap,
+    setCheckedStateMap = _useContext.setCheckedStateMap;
+  var _useContext2 = (0, _react.useContext)(_collapse.ActionBarCollapseContext),
+    collapseList = _useContext2.collapseList;
   var title = transI18n('fmt_screenshare_controlbar_button_more');
   var tooltip = transI18n('fmt_screenshare_controlbar_button_more');
   var _useState = (0, _react.useState)(false),
@@ -48,8 +51,11 @@ var More = exports.More = (0, _mobxReact.observer)(function (_ref) {
     setVisible: setVisible
   })), _enums.MoreMenuType.SECURITY, /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {
     privilege: privilegeProvider,
-    setEnableWaitingRoom: setEnableWaitingRoom
-  })), _enums.MoreMenuType.APPS, /*#__PURE__*/(0, _jsxRuntime.jsx)(_appitems.AppItems, {})), _enums.MoreMenuType.TRIGGER_OUTPUT_LANGUAGE_ROOM, /*#__PURE__*/(0, _jsxRuntime.jsx)(_triggerSubscribeLanguage.TriggerSubscribeLanguagePopoverContent, {}));
+    setEnableWaitingRoom: setEnableWaitingRoom,
+    showLockedRoomToast: showLockedRoomToast,
+    checkedStateMap: checkedStateMap,
+    setCheckedStateMap: setCheckedStateMap
+  })), _enums.MoreMenuType.APPS, /*#__PURE__*/(0, _jsxRuntime.jsx)(_appList.AppList, {})), _enums.MoreMenuType.TRIGGER_OUTPUT_LANGUAGE_ROOM, /*#__PURE__*/(0, _jsxRuntime.jsx)(_triggerSubscribeLanguage.TriggerSubscribeLanguagePopoverContent, {}));
   (0, _react.useEffect)(function () {
     // 处理在关闭的时候，过早切换菜单导致的闪烁问题
     timerRef.current = !visible ? setTimeout(function () {

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

@@ -1,2 +1,2 @@
 import './index.css';
-export declare const NotificationBar: () => import("react/jsx-runtime").JSX.Element;
+export declare const NotificationBar: () => import("react/jsx-runtime").JSX.Element | null;

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

@@ -29,9 +29,12 @@ var NotificationBar = exports.NotificationBar = (0, _mobxReact.observer)(functio
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     openInterpreterDialog = _useContext.openInterpreterDialog,
     users = _useContext.users,
-    interpreterUsers = _useContext.interpreterUsers,
-    interpreterUsersOffline = _useContext.interpreterUsersOffline,
-    folded = _useContext.folded;
+    interpreterUserList = _useContext.interpreterUserList,
+    hasOfflineUserExistence = _useContext.hasOfflineUserExistence,
+    folded = _useContext.folded,
+    isInterpreterEnabled = _useContext.isInterpreterEnabled,
+    hasEnableInterpreterPermission = _useContext.hasEnableInterpreterPermission,
+    hasDisableInterpreterPermission = _useContext.hasDisableInterpreterPermission;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     showNotification = _useState2[0],
@@ -50,7 +53,7 @@ var NotificationBar = exports.NotificationBar = (0, _mobxReact.observer)(functio
     reEnterInterperter = _useState8[0],
     setReEnterInterperter = _useState8[1];
   (0, _react.useEffect)(function () {
-    var offline = (interpreterUsers === null || interpreterUsers === void 0 ? void 0 : interpreterUsers.filter(function (user) {
+    var offline = (interpreterUserList === null || interpreterUserList === void 0 ? void 0 : interpreterUserList.filter(function (user) {
       return !users.map(function (u) {
         return u.userId;
       }).includes(user.userId);
@@ -59,7 +62,7 @@ var NotificationBar = exports.NotificationBar = (0, _mobxReact.observer)(functio
     if (offline.length > 0) {
       setShowNotification(true);
     }
-  }, [users, interpreterUsers]);
+  }, [users, interpreterUserList]);
   (0, _react.useEffect)(function () {
     var reEnter = (interpreterOffline === null || interpreterOffline === void 0 ? void 0 : interpreterOffline.filter(function (user) {
       return users.map(function (u) {
@@ -74,6 +77,10 @@ var NotificationBar = exports.NotificationBar = (0, _mobxReact.observer)(functio
     }
   }, [showNotification]);
   var show = showNotification && (reEnterInterperter.length > 0 || interpreterOffline.length > 0);
+  var isComponentVisible = hasEnableInterpreterPermission && hasDisableInterpreterPermission && isInterpreterEnabled;
+  if (!isComponentVisible) {
+    return null;
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     ref: shareScreenBarRef,
     className: (0, _classnames["default"])('notification-bar', {
@@ -88,7 +95,7 @@ var NotificationBar = exports.NotificationBar = (0, _mobxReact.observer)(functio
       onAssign: function onAssign() {
         openInterpreterDialog();
       }
-    }), (interpreterUsersOffline || show) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_virtualImage["default"], {
+    }), (hasOfflineUserExistence || show) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_virtualImage["default"], {
       hidden: hidden,
       onClick: function onClick() {
         setShowNotification(!showNotification);

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

@@ -25,7 +25,7 @@ var Participants = exports.Participants = (0, _mobxReact.observer)(function (_re
   var id = _ref.id,
     order = _ref.order;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_collapse.actionBarCollapseContext),
+  var _useContext = (0, _react.useContext)(_collapse.ActionBarCollapseContext),
     visibleList = _useContext.visibleList;
   var _useContext2 = (0, _react.useContext)(_store.ActionBarContext),
     toggleParticipants = _useContext2.toggleParticipants,

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

@@ -38,7 +38,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
     setMenuVisible = _useState4[1];
   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');
+  var tooltip = hasStartScreenSharePermission ? transI18n('fmt_screenshare_label_screenshare') : transI18n('fmt_screenshare_cohost_can_not_share_remind');
   (0, _react.useEffect)(function () {
     setMenuVisible(false);
     setTooltipVisible(false);

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

@@ -1,11 +1,26 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SubMenu = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.string.includes.js");
@@ -17,32 +32,33 @@ var _dropMenu = require("agora-ui-foundation/lib/components/drop-menu");
 var _env = require("agora-foundation/lib/utilities/env");
 var _store = require("../../store");
 var _fcrCore = require("fcr-core");
-var _classnames = _interopRequireDefault(require("classnames"));
 var _button = require("agora-ui-foundation/lib/components/button");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobxReact = require("mobx-react");
 var _truncate = _interopRequireDefault(require("lodash/truncate"));
 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; }
 var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
-    setAllowBoardWrite = _useContext.setAllowBoardWrite,
+    setAllowWriteBoard = _useContext.setAllowWriteBoard,
     setAllowScreenShare = _useContext.setAllowScreenShare,
     localUserRole = _useContext.localUserRole,
-    localUser = _useContext.localUser,
+    localUserId = _useContext.localUserId,
     openWhiteboard = _useContext.openWhiteboard,
     closeWhiteboard = _useContext.closeWhiteboard,
     boardOwnerUser = _useContext.boardOwnerUser,
-    isBoardWriteEnabled = _useContext.isBoardWriteEnabled,
-    isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled,
     startScreenShare = _useContext.startScreenShare,
     hasScreenShare = _useContext.hasScreenShare,
     hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission,
     sharingOwnerUser = _useContext.sharingOwnerUser,
     hasStopScreenSharePermission = _useContext.hasStopScreenSharePermission,
-    closeShareScreen = _useContext.closeShareScreen;
+    closeShareScreen = _useContext.closeShareScreen,
+    checkedStateMap = _useContext.checkedStateMap,
+    setCheckedStateMap = _useContext.setCheckedStateMap;
   var t = (0, _i18n.useI18n)();
   var hasHostPermission = [_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole);
-  var hasBoardControlPermission = boardOwnerUser && localUser.userId !== boardOwnerUser.userId && hasCloseWriteBoardPermission;
+  var hasBoardControlPermission = boardOwnerUser && localUserId !== boardOwnerUser.userId && hasCloseWriteBoardPermission;
   // 需求变更，联席主持人也可以禁用主持人的白板，注释掉联席主持人不能禁用的逻辑
   // (FcrUserRole.HOST === localUserRole ||
   //   (FcrUserRole.COHOST === localUserRole && FcrUserRole.HOST !== boardOwnerUser?.userRole));
@@ -78,12 +94,12 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
         iconPrimary: 'var(--fcr_ui_scene_icontext1)'
       }
     }),
-    disabled: boardOwnerUser && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) !== localUser.userId,
-    title: !boardOwnerUser ? t('fmt_screenshare_button_sharewhiteboard') : (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId ? t('fmt_screenshare_button_chosewhiteboard') : t('fmt_screenshare_options_alreadyopend'),
+    disabled: boardOwnerUser && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) !== localUserId,
+    title: !boardOwnerUser ? t('fmt_screenshare_button_sharewhiteboard') : (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUserId ? t('fmt_screenshare_button_chosewhiteboard') : t('fmt_screenshare_options_alreadyopend'),
     key: 'allow_attendee_title',
-    type: boardOwnerUser && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId ? 'danger' : 'primary',
+    type: boardOwnerUser && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUserId ? 'danger' : 'primary',
     onButtonClick: function onButtonClick() {
-      if ((boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId) {
+      if ((boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUserId) {
         closeWhiteboard();
       } else {
         openWhiteboard();
@@ -98,28 +114,32 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     type: 'title'
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-      checked: isScreenShareAndBoardEnabled,
+      checked: checkedStateMap.shareScreen,
       label: t('fmt_screenshare_screen_and_board'),
       styleType: "white"
     }),
     key: 'enable_sharescreen',
     onButtonClick: function onButtonClick() {
-      setAllowScreenShare();
+      setCheckedStateMap(_objectSpread(_objectSpread({}, checkedStateMap), {
+        shareScreen: !checkedStateMap.shareScreen
+      }));
+      setAllowScreenShare(!checkedStateMap.shareScreen);
     },
     classNames: 'fcr-checkbox-overlay-style'
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-      checked: isBoardWriteEnabled,
+      checked: checkedStateMap.shareWhiteboard,
       label: t('fmt_screenshare_options_editable'),
       styleType: "white"
     }),
     key: 'enable_whiteboard',
     onButtonClick: function onButtonClick() {
-      setAllowBoardWrite();
+      setCheckedStateMap(_objectSpread(_objectSpread({}, checkedStateMap), {
+        shareWhiteboard: !checkedStateMap.shareWhiteboard
+      }));
+      setAllowWriteBoard(!checkedStateMap.shareWhiteboard);
     },
-    classNames: (0, _classnames["default"])('fcr-checkbox-overlay-style', {
-      'room-control-drop-with-under-line': hasBoardControlPermission
-    })
+    classNames: 'fcr-checkbox-overlay-style'
   }];
   var boardControlMenus = [{
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
@@ -135,6 +155,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
       })
     }),
     key: 'enable_whiteboard',
+    classNames: 'fcr-drop-menu-option-primary-no-hover',
     onButtonClick: function onButtonClick() {
       closeWhiteboard();
     }
@@ -152,6 +173,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
         }) : t('fmt_actionbar_screenshare_labels_others')
       })
     }),
+    classNames: 'fcr-drop-menu-option-primary-no-hover',
     key: 'close_share_screen',
     onButtonClick: function onButtonClick() {
       closeShareScreen();
@@ -161,10 +183,24 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     menus.push.apply(menus, menusElectronOnly);
   } else {
     menus.push.apply(menus, menusWebOnly);
+    if (hasHostPermission) {
+      menus.push({
+        title: '',
+        key: '',
+        type: 'line'
+      });
+    }
   }
   if (hasHostPermission) {
     menus.push.apply(menus, hostMenus);
   }
+  if (hasBoardControlPermission || hasStopScreenSharePermission) {
+    menus.push({
+      title: '',
+      key: '',
+      type: 'line'
+    });
+  }
   if (hasBoardControlPermission) {
     menus.push.apply(menus, boardControlMenus);
   }
@@ -172,6 +208,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     menus.push.apply(menus, shareScrennControlMenus);
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.FcrDropMenu, {
+    className: "share-screen-menu",
     options: menus
   });
 });

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

@@ -23,7 +23,10 @@ var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
     setEnableWaitingRoom = _useContext.setEnableWaitingRoom,
-    privilegeProvider = _useContext.privilegeProvider;
+    privilegeProvider = _useContext.privilegeProvider,
+    showLockedRoomToast = _useContext.showLockedRoomToast,
+    checkedStateMap = _useContext.checkedStateMap,
+    setCheckedStateMap = _useContext.setCheckedStateMap;
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_controlbar_button_security');
   var tooltip = transI18n('fmt_screenshare_controlbar_button_security');
@@ -34,7 +37,10 @@ var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
         trigger: 'click',
         content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {
           privilege: privilegeProvider,
-          setEnableWaitingRoom: setEnableWaitingRoom
+          setEnableWaitingRoom: setEnableWaitingRoom,
+          showLockedRoomToast: showLockedRoomToast,
+          checkedStateMap: checkedStateMap,
+          setCheckedStateMap: setCheckedStateMap
         }),
         overlayInnerStyle: {
           boxShadow: 'var(--fcr_web_light_dropup_m)',