fcr-ui-scene 3.4.0 → 3.4.2

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

@@ -6,7 +6,6 @@ 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"));
@@ -15,8 +14,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 _store = require("../store");
+var _context = require("../context");
 var _mobxReact = require("mobx-react");
 require("./index.css");
 var _actionBarCollapesItems = require("../action-bar-collapes-items");
@@ -27,10 +25,9 @@ var Participants = exports.Participants = (0, _mobxReact.observer)(function (_re
   var transI18n = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_actionBarCollapesItems.actionBarCollapseContext),
     visibleList = _useContext.visibleList;
-  var _useContext2 = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext2 = (0, _react.useContext)(_context.ActionBarContext),
     toggleParticipants = _useContext2.toggleParticipants,
-    totalUser = _useContext2.totalUser,
-    isNewWaitingRoomUserEnter = _useContext2.isNewWaitingRoomUserEnter;
+    totalUser = _useContext2.totalUser;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     tooltipVisible = _useState2[0],
@@ -51,32 +48,28 @@ var Participants = exports.Participants = (0, _mobxReact.observer)(function (_re
       }
     },
     content: tooltip,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      onClick: toggleParticipants,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-action-bar-participants-wrapper",
       style: {
         display: visibleList.includes('Participants') ? 'flex' : 'none'
       },
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "fcr-action-bar-participants-user-count",
+        children: totalUser > 999 ? '999+' : totalUser
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
         id: id,
         order: order,
-        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)'
-            }
-          })]
-        }),
+        onClick: toggleParticipants,
+        icon: _type.FcrIconType.FCR_PEOPLE,
         iconColors: {
           iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
         },
-        title: "".concat(title, "(").concat(totalUser > 999 ? '999+' : totalUser, ")")
-      })
+        title: title,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "fcr-action-bar-participants-user-count",
+          children: totalUser > 999 ? '999+' : totalUser
+        })
+      })]
     })
   });
 });

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

@@ -10,13 +10,13 @@ require("core-js/modules/es.array.concat.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _type = require("fcr-core/lib/type");
+var _type = require("agora-edu-core/lib/type");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _popover = require("agora-ui-foundation/lib/components/popover");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _store = require("../store");
+var _context = require("../context");
 var _item = require("../item");
 require("./index.css");
 var _stopRecordDialog = require("./stop-record-dialog");
@@ -25,7 +25,7 @@ var Record = exports.Record = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
     order = _ref.order;
   var t = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     hasStartCloudRecordingPermission = _useContext.hasStartCloudRecordingPermission,
     state = _useContext.cloudRecordingState,
     pauseCloudRecording = _useContext.pauseCloudRecording,
@@ -121,7 +121,7 @@ var Record = exports.Record = (0, _mobxReact.observer)(function (_ref) {
 });
 var RecordPopoverContent = (0, _mobxReact.observer)(function (_ref2) {
   var _onClick = _ref2.onClick;
-  var _useContext2 = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext2 = (0, _react.useContext)(_context.ActionBarContext),
     hasStartCloudRecordingPermission = _useContext2.hasStartCloudRecordingPermission,
     state = _useContext2.cloudRecordingState,
     startCloudRecording = _useContext2.startCloudRecording,

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

@@ -14,9 +14,9 @@ var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _item = require("../item");
 var _react = require("react");
-var _store = require("../store");
+var _context = require("../context");
 var _mobxReact = require("mobx-react");
-var _fcrCore = require("fcr-core");
+var _agoraEduCore = require("agora-edu-core");
 var _submenu = require("./submenu");
 var _env = require("agora-foundation/lib/utilities/env");
 var _popover = require("agora-ui-foundation/lib/components/popover");
@@ -24,7 +24,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
     order = _ref.order;
-  var actionStore = (0, _react.useContext)(_store.ActionBarContext);
+  var actionStore = (0, _react.useContext)(_context.ActionBarContext);
   var startScreenShare = actionStore.startScreenShare,
     localUserRole = actionStore.localUserRole,
     hasStartScreenSharePermission = actionStore.hasStartScreenSharePermission;
@@ -39,10 +39,6 @@ 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() {
@@ -67,7 +63,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
         iconPrimary: 'var(--fcr_ui_scene_ramp_green6)'
       },
       moreVisible: visibleMenu,
-      submenu: [_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole) ? {
+      submenu: [_agoraEduCore.FcrUserRole.HOST, _agoraEduCore.FcrUserRole.COHOST].includes(localUserRole) ? {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {}),
         onClick: function onClick() {
           setTooltipVisible(false);
@@ -75,7 +71,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
         }
       } : undefined
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
-      overlayClassName: "fcr-action-bar--popover fcr-screen-share--popover",
+      overlayClassName: "fcr-action-bar--popover",
       visible: visibleMenu,
       onVisibleChange: setMenuVisible,
       trigger: "click",

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

@@ -15,16 +15,15 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 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 _context = require("../context");
+var _agoraEduCore = require("agora-edu-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");
 var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
-  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     setAllowBoardWrite = _useContext.setAllowBoardWrite,
     setAllowScreenShare = _useContext.setAllowScreenShare,
     localUserRole = _useContext.localUserRole,
@@ -36,11 +35,10 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled,
     startScreenShare = _useContext.startScreenShare,
     hasScreenShare = _useContext.hasScreenShare,
-    hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission,
-    hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission;
+    hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission;
   var t = (0, _i18n.useI18n)();
-  var hasHostPermission = [_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole);
-  var hasBoardControlPermission = boardOwnerUser && localUser.userId !== boardOwnerUser.userId && hasCloseWriteBoardPermission && hasAllowWriteBoardPermission;
+  var hasHostPermission = [_agoraEduCore.FcrUserRole.HOST, _agoraEduCore.FcrUserRole.COHOST].includes(localUserRole);
+  var hasBoardControlPermission = boardOwnerUser && localUser.userId !== boardOwnerUser.userId && hasCloseWriteBoardPermission;
   // 需求变更，联席主持人也可以禁用主持人的白板，注释掉联席主持人不能禁用的逻辑
   // (FcrUserRole.HOST === localUserRole ||
   //   (FcrUserRole.COHOST === localUserRole && FcrUserRole.HOST !== boardOwnerUser?.userRole));
@@ -51,7 +49,13 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     key: 'allow_attendee_title',
     type: 'title'
   }, {
-    icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+    icon: boardOwnerUser && hasHostPermission ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+      type: _type.FcrIconType.FCR_WHITEBOARD,
+      size: 24,
+      colors: {
+        iconPrimary: '#FB584E'
+      }
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
       type: _type.FcrIconType.FCR_SCREENSHARING,
       size: 24,
       colors: {
@@ -66,10 +70,16 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
       //   ? setAllowScreenShare(FcrWhiteboardState.OFF)
       //   : startScreenShare();
       startScreenShare();
-    }
-    // classNames: 'fcr-icon-green',
+    },
+    classNames: 'fcr-icon-green'
   }, {
-    icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+    icon: boardOwnerUser && hasHostPermission ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+      type: _type.FcrIconType.FCR_WHITEBOARD,
+      size: 24,
+      colors: {
+        iconPrimary: '#FB584E'
+      }
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
       type: _type.FcrIconType.FCR_WHITEBOARD,
       size: 24,
       colors: {
@@ -79,15 +89,14 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     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'),
     key: 'allow_attendee_title',
-    type: boardOwnerUser && (boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId ? 'danger' : 'primary',
     onButtonClick: function onButtonClick() {
       if ((boardOwnerUser === null || boardOwnerUser === void 0 ? void 0 : boardOwnerUser.userId) === localUser.userId) {
         closeWhiteboard();
       } else {
         openWhiteboard();
       }
-    }
-    // classNames: 'fcr-icon-blue',
+    },
+    classNames: 'fcr-icon-blue'
   }];
   var menusElectronOnly = [];
   var hostMenus = [{
@@ -97,7 +106,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
   }, {
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
       checked: isScreenShareAndBoardEnabled,
-      label: t('fmt_screenshare_screen_and_board'),
+      label: t('fmt_screenshare_controlbar_security_list_participant_screenshare'),
       styleType: "white"
     }),
     key: 'enable_sharescreen',
@@ -126,10 +135,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
       shape: "rounded",
       block: true,
       children: t('fmt_screenshare_button_disableshare', {
-        reason1: boardOwnerUser ? (0, _truncate["default"])(boardOwnerUser.userName, {
-          length: 8,
-          separator: ' '
-        }) : t('fmt_actionbar_screenshare_labels_others')
+        reason1: boardOwnerUser ? boardOwnerUser.userName : t('fmt_actionbar_screenshare_labels_others')
       })
     }),
     key: 'enable_whiteboard',

package/lib/modules/action-bar/security/drop-menu.js

@@ -26,20 +26,16 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _dropMenu = require("agora-ui-foundation/lib/components/drop-menu");
-var _store = require("../store");
+var _context = require("../context");
 var _react = require("react");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _mobxReact = require("mobx-react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _icon = require("agora-ui-foundation/lib/components/icon");
-var _type = require("agora-ui-foundation/lib/components/icon/type");
-var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
-var _type2 = require("fcr-core/lib/type");
 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 SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
-  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     isLockRoomEnabled = _useContext.isLockRoomEnabled,
     setLockRoomEnabled = _useContext.setLockRoomEnabled,
     allowChat = _useContext.allowChat,
@@ -52,37 +48,15 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
     setAllowBoardWrite = _useContext.setAllowBoardWrite,
     isBoardWriteEnabled = _useContext.isBoardWriteEnabled,
     hasLockRoomPermission = _useContext.hasLockRoomPermission,
-    hasEnableJoinWithAudioPermission = _useContext.hasEnableJoinWithAudioPermission,
     hasEnableStartSharePermission = _useContext.hasEnableStartSharePermission,
     hasAllowChatPermission = _useContext.hasAllowChatPermission,
     hasEnableStartAudioPermission = _useContext.hasEnableStartAudioPermission,
     hasEnableStartVideoPermission = _useContext.hasEnableStartVideoPermission,
     hasEnableChangeNamePermission = _useContext.hasEnableChangeNamePermission,
     hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission,
-    isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled,
-    setEnableWaitingRoom = _useContext.setEnableWaitingRoom,
-    isWaitingRoomEnabled = _useContext.isWaitingRoomEnabled,
-    isAllowJoinWithAudioEnabled = _useContext.isAllowJoinWithAudioEnabled,
-    setAllowJoinWithMuteAudio = _useContext.setAllowJoinWithMuteAudio,
-    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
-    localUserRole = _useContext.localUserRole,
-    isWaterMarkEnabled = _useContext.isWaterMarkEnabled,
-    isMulti = _useContext.isMulti,
-    setAllowWaterMark = _useContext.setAllowWaterMark,
-    setWaterMarkLineType = _useContext.setWaterMarkLineType,
-    setAlllowChangeName = _useContext.setAlllowChangeName,
-    hasWatermarkEnablePermission = _useContext.hasWatermarkEnablePermission,
-    hasWatermarkDisablePermission = _useContext.hasWatermarkDisablePermission,
-    hasAllowChangeNamePromission = _useContext.hasAllowChangeNamePromission,
-    hasDisallowChangeNamePromission = _useContext.hasDisallowChangeNamePromission,
-    allowChangeName = _useContext.allowChangeName;
+    isScreenShareAndBoardEnabled = _useContext.isScreenShareAndBoardEnabled;
   var transI18n = (0, _i18n.useI18n)();
   var allActions = [];
-  allActions.push({
-    title: transI18n('fmt_security_setting_label_security_setting'),
-    key: 'meeting_security_title',
-    type: 'title'
-  });
   if (hasLockRoomPermission) {
     allActions.push({
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
@@ -97,89 +71,17 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
       }
     });
   }
-  if (hasWaitingRoomPermission) {
-    allActions.push({
-      title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-        checked: isWaitingRoomEnabled(),
-        label: transI18n('fmt_security_options_activatewaitingroom'),
-        styleType: "white"
-      }),
-      key: 'enable_waiting_room',
-      type: 'primary',
-      onButtonClick: function onButtonClick() {
-        setEnableWaitingRoom(!isWaitingRoomEnabled(), true);
-      },
-      classNames: 'room-control-drop-with-under-line'
-    });
-  }
-  if (hasEnableJoinWithAudioPermission) {
-    allActions.push({
-      title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-        checked: isAllowJoinWithAudioEnabled(),
-        label: transI18n('fmt_security_options_silence'),
-        styleType: "white"
-      }),
-      key: 'enable_join_with_audio',
-      type: 'primary',
-      onButtonClick: function onButtonClick() {
-        setAllowJoinWithMuteAudio(!isAllowJoinWithAudioEnabled());
-      }
-    });
-  }
-
-  /** 主持人和联席主持人 可以进行开启单行双行水印 */
-  if (hasWatermarkEnablePermission && hasWatermarkDisablePermission) {
-    allActions.push({
-      title: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "room-control-options-box",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-          className: "room-control-options-watermark-title-box",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-            checked: isWaterMarkEnabled,
-            label: transI18n('fmt_security_setting_mobile_label_watermark'),
-            styleType: "white"
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-            mouseEnterDelay: 0,
-            trigger: "hover",
-            placement: "top",
-            content: transI18n('fmt_security_setting_popup_tip_watermark_voice_active_prioritized'),
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
-              style: {
-                marginLeft: '6px'
-              },
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-                type: _type.FcrIconType.FCR_HELPQUESTION,
-                size: 16
-              })
-            })
-          })]
-        }), isWaterMarkEnabled && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-          className: "room-control-options-watermark-btns",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: "room-control-options-watermark-btn ".concat(isMulti ? '' : 'room-control-options-watermark-btn--active'),
-            onClick: function onClick(e) {
-              e.stopPropagation();
-              setWaterMarkLineType(_type2.FcrLineType.SINGLE_ROW);
-            },
-            children: transI18n('fmt_security_setting_mobile_option_watermark_style_single')
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: "room-control-options-watermark-btn ".concat(isMulti ? 'room-control-options-watermark-btn--active' : ''),
-            onClick: function onClick(e) {
-              e.stopPropagation();
-              setWaterMarkLineType(_type2.FcrLineType.MULTI_ROW);
-            },
-            children: transI18n('fmt_security_setting_mobile_option_watermark_style_multi')
-          })]
-        })]
-      }),
-      key: 'enable_watermark',
-      type: 'primary',
-      onButtonClick: function onButtonClick() {
-        setAllowWaterMark();
-      },
-      classNames: 'room-control-drop-with-under-line'
-    });
-  }
+  allActions.push({
+    title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+      checked: false,
+      label: transI18n('fmt_security_options_activatewaitingroom'),
+      styleType: "white"
+    }),
+    key: 'enable_waiting_room',
+    type: 'disabled',
+    onButtonClick: function onButtonClick() {},
+    classNames: 'room-control-drop-with-under-line'
+  });
   allActions.push({
     title: transI18n('fmt_screenshare_options_allow'),
     key: 'allow_attendee_title',
@@ -189,7 +91,7 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
     allActions.push({
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
         checked: isScreenShareAndBoardEnabled,
-        label: transI18n('fmt_screenshare_screen_and_board'),
+        label: transI18n('fmt_screenshare_controlbar_security_list_participant_screenshare'),
         styleType: "white"
       }),
       key: 'share_screen',
@@ -253,34 +155,17 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
       }
     });
   }
-
-  // if (hasEnableChangeNamePermission) {
-  //   allActions.push({
-  //     title: (
-  //       <FcrCheckbox
-  //         checked={false}
-  //         label={transI18n('fmt_screenshare_controlbar_security_list_participant_changeName')}
-  //         styleType="white"
-  //       />
-  //     ),
-  //     key: 'rename',
-  //     type: 'disabled',
-  //     onButtonClick: () => {},
-  //     classNames: 'room-control-drop-with-under-line',
-  //   });
-  // }
-
-  if (hasAllowChangeNamePromission && hasDisallowChangeNamePromission) {
+  if (hasEnableChangeNamePermission) {
     allActions.push({
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-        checked: allowChangeName(),
-        label: transI18n('fmt_additional_label_change_name_self'),
+        checked: false,
+        label: transI18n('fmt_screenshare_controlbar_security_list_participant_changeName'),
         styleType: "white"
       }),
-      onButtonClick: function onButtonClick() {
-        return setAlllowChangeName(!allowChangeName());
-      },
-      key: 'rename'
+      key: 'rename',
+      type: 'disabled',
+      onButtonClick: function onButtonClick() {},
+      classNames: 'room-control-drop-with-under-line'
     });
   }
   allActions.push({

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

@@ -1,7 +1,6 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,19 +9,16 @@ var _item = require("../item");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _react = require("react");
-var _store = require("../store");
+var _context = require("../context");
 var _mobxReact = require("mobx-react");
-var _securityMenu = _interopRequireDefault(require("../../components/security-menu"));
+var _dropMenu = require("./drop-menu");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
-// import { SecurityMenu } from './drop-menu';
-
 var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
     order = _ref.order;
-  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
-    toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
-    setEnableWaitingRoom = _useContext.setEnableWaitingRoom;
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
+    toggleLayoutBarLock = _useContext.toggleLayoutBarLock;
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_controlbar_button_security');
   var tooltip = transI18n('fmt_screenshare_controlbar_button_security');
@@ -31,9 +27,8 @@ var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItemWithPopover, {
       popoverProps: {
         trigger: 'click',
-        content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {
-          setEnableWaitingRoom: setEnableWaitingRoom
-        }),
+        content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.SecurityMenu, {}),
+        overlayClassName: 'attendee__footer-more-actions',
         overlayInnerStyle: {
           boxShadow: 'var(--fcr_web_light_dropup_m)',
           border: 'none',

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

@@ -9,14 +9,14 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _item = require("../item");
-var _store = require("../store");
+var _context = require("../context");
 var _react = require("react");
-var _store2 = require("../../setting/store");
+var _store = require("../../setting/store");
 var _jsxRuntime = require("react/jsx-runtime");
 var Settings = exports.Settings = function Settings(_ref) {
   var id = _ref.id,
     order = _ref.order;
-  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     openDeviceSettingDialog = _useContext.openDeviceSettingDialog;
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_controlbar_button_more_setting');
@@ -30,7 +30,7 @@ var Settings = exports.Settings = function Settings(_ref) {
       title: title,
       onClick: function onClick() {
         openDeviceSettingDialog({
-          activeTab: _store2.DeviceSettingTab.GENERAL
+          activeTab: _store.DeviceSettingTab.GENERAL
         });
       },
       iconColors: {

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

@@ -9,13 +9,13 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _mobxReact = require("mobx-react");
+var _device = require("./device");
 var _react = require("react");
-var _store = require("./store");
+var _context = require("./context");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _microphone = require("../components/device-control/components/microphone");
 var _jsxRuntime = require("react/jsx-runtime");
 var SmallerActionbar = exports.SmallerActionbar = (0, _mobxReact.observer)(function () {
-  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     microphoneEnabled = _useContext.microphoneEnabled,
     enableMicrophone = _useContext.enableMicrophone,
     toggleFold = _useContext.toggleFold;
@@ -43,7 +43,7 @@ var SmallerActionbar = exports.SmallerActionbar = (0, _mobxReact.observer)(funct
         onClick: function onClick() {
           return enableMicrophone(!microphoneEnabled);
         },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_microphone.AudioRecordinDeviceIcon, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_device.AudioRecordinDeviceIcon, {
           micEnabled: microphoneEnabled
         })
       })