fcr-ui-scene 3.4.5 → 3.5.0

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

@@ -0,0 +1,153 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LeaveMeeting = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _assignHost = require("./assign-host");
+require("./index.css");
+var _type = require("fcr-core/lib/type");
+var _react = require("react");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+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)(/*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var t = (0, _i18n.useI18n)();
+  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,
+    setHeight = props.setHeight;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    canAssign = _useState2[0],
+    setCanAssign = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    keepConnect = _useState4[0],
+    setKeepConnect = _useState4[1];
+  var handleEnd = function handleEnd() {
+    props.setPopoverOpened(false);
+    end();
+  };
+  (0, _react.useEffect)(function () {
+    canAssign && (setHeight === null || setHeight === void 0 ? void 0 : setHeight());
+  }, [canAssign]);
+  var handleLeave = function handleLeave() {
+    if (remoteUsers.length > 0 && hasAssignHostBeforeLeavingPermission) {
+      setCanAssign(true);
+    } else {
+      handleKeepConnect();
+      leave();
+      props.setPopoverOpened(false);
+    }
+  };
+  var handleKeepConnect = function handleKeepConnect() {
+    if (keepConnect && isPstnUser) {
+      keepPhoneAudioConnection();
+    }
+  };
+  var handleConfirm = function handleConfirm() {
+    props.setPopoverOpened(false);
+    if (keepConnect && isPstnUser) {
+      keepPhoneAudioConnection();
+    }
+    leave();
+  };
+  var handleCancel = function handleCancel() {
+    props.setPopoverOpened(false);
+  };
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      handleCancel: handleCancel
+    };
+  });
+  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,
+        remoteUsers: remoteUsers,
+        assignHost: assignHost
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "leave-container",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "leave-title",
+          children: t('fmt_actionbar_labels_endmeeting')
+        }), isPstnUser && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "leave-connect-check",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+            label: t('fmt_pstn_status_maitain'),
+            checked: keepConnect,
+            onChange: function onChange(checked) {
+              return setKeepConnect(checked);
+            }
+          })
+        }), hasEndRoomPermission && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: (0, _classnames["default"])('leave-confirm', {
+            'leave-confirm-disabled': keepConnect
+          }),
+          onClick: !keepConnect ? handleEnd : undefined,
+          children: t('fmt_actionbar_button_plenarysession')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "leave-cancel",
+          onClick: handleLeave,
+          children: t('fmt_popup_button_leavemeeting')
+        })]
+      })
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "leave-container",
+      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')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "assistant-lock-leave-title",
+          children: t('fmt_actionbar_tips_recheckleave')
+        })]
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "leave-title",
+        children: t('fmt_actionbar_tips_leavemeeting')
+      }), isPstnUser && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "leave-connect-check",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+          label: t('fmt_pstn_status_maitain'),
+          checked: keepConnect,
+          onChange: function onChange(checked) {
+            return setKeepConnect(checked);
+          }
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "leave-confirm",
+        onClick: handleConfirm,
+        children: t('fmt_actionbar__button_leaveyes')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "leave-cancel",
+        onClick: handleCancel,
+        children: t('fmt_actionbar__button_leaveno')
+      })]
+    })
+  });
+}));

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/more/poppover-content.js

@@ -7,8 +7,6 @@ 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/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.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");
@@ -26,8 +24,6 @@ require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/esnext.array.group.js");
-require("core-js/modules/esnext.async-iterator.map.js");
-require("core-js/modules/esnext.async-iterator.reduce.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.iterator.reduce.js");

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

@@ -9,7 +9,8 @@ exports["default"] = interpreterNotification;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));

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

@@ -11,8 +11,6 @@ require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -29,9 +27,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 +51,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 +60,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 +75,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 +93,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,24 @@
 "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.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 +30,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 +92,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 +112,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 +153,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 +171,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 +181,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 +206,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)',