fcr-ui-scene 3.3.0 → 3.4.0

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

@@ -24,13 +24,14 @@ exports.End = void 0;
 require("core-js/modules/web.timers.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _button = require("agora-ui-foundation/lib/components/button");
 var _leaveMeeting = require("./leave-meeting");
 var _popover = require("agora-ui-foundation/lib/components/popover");
 var _react = require("react");
-var _context = require("../context");
+var _store = require("../store");
 var _type = require("../../../type");
 var _mobxReact = require("mobx-react");
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
@@ -39,7 +40,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 End = exports.End = (0, _mobxReact.observer)(function (props) {
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     localUserRole = _useContext.localUserRole,
     toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
     remoteUsers = _useContext.remoteUsers,
@@ -52,7 +53,9 @@ var End = exports.End = (0, _mobxReact.observer)(function (props) {
     isPstnUser = _useContext.isPstnUser,
     assignHost = _useContext.assignHost,
     popoverOpened = _useContext.popoverOpened,
-    _setPopoverOpened = _useContext.setPopoverOpened;
+    _setPopoverOpened = _useContext.setPopoverOpened,
+    stateBarLeaveMeeting = _useContext.stateBarLeaveMeeting,
+    setStateBarLeaveMeeting = _useContext.setStateBarLeaveMeeting;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     tooltipOpened = _useState2[0],
@@ -78,6 +81,30 @@ var End = exports.End = (0, _mobxReact.observer)(function (props) {
       styleType: 'danger'
     };
   }, [popoverOpened]);
+  var leaveMeetingContent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_leaveMeeting.LeaveMeeting, {
+    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
+  });
+  var LeaveMeetingPortal = function LeaveMeetingPortal() {
+    var portalContent = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "fcr-action-bar--leave-meeting-portal",
+      id: "fcr-action-bar--leave-meeting-portal",
+      children: leaveMeetingContent
+    });
+    return /*#__PURE__*/_reactDom["default"].createPortal(portalContent, document.body);
+  };
   (0, _react.useEffect)(function () {
     var reflow = (0, _debounce["default"])(function () {
       /* 修复窗口缩放时，在未经人为操作打开弹窗的情况下，改变窗口大小而触发的打开情形 */
@@ -92,47 +119,47 @@ var End = exports.End = (0, _mobxReact.observer)(function (props) {
       window.removeEventListener('resize', reflow);
     };
   }, []);
+  (0, _react.useEffect)(function () {
+    if (!stateBarLeaveMeeting) return;
+    var container = document.getElementById('fcr-action-bar--leave-meeting-portal');
+    var handleClickOutside = function handleClickOutside(event) {
+      if (!(container !== null && container !== void 0 && container.contains(event.target))) {
+        setStateBarLeaveMeeting(false);
+      }
+    };
+    document.addEventListener('mousedown', handleClickOutside);
+    return function () {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [stateBarLeaveMeeting]);
   (0, _react.useEffect)(function () {
     if (popoverOpened) {
       onPopoverChanged(popoverOpened);
     }
   }, [popoverOpened]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-    visible: tooltipOpened,
-    onVisibleChange: onTooltipChanged,
-    content: localUserRole === _type.FcrUserRole.HOST ? transI18n('fmt_toolbar_button_end') : transI18n('fmt_toolbar_button_leave'),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
-      overlayClassName: "fcr-action-bar--device-popover fcr-action-bar--leave-popover",
-      overlayInnerStyle: {
-        width: 255
-      },
-      visible: popoverOpened,
-      onVisibleChange: onPopoverChanged,
-      trigger: "click",
-      placement: "topRight",
-      overlayOffset: 20,
-      content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_leaveMeeting.LeaveMeeting, {
-        setPopoverOpened: function setPopoverOpened(value) {
-          _setPopoverOpened(value);
-          onPopoverChanged(false);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+      visible: tooltipOpened,
+      onVisibleChange: onTooltipChanged,
+      content: localUserRole === _type.FcrUserRole.HOST ? transI18n('fmt_toolbar_button_end') : transI18n('fmt_toolbar_button_leave'),
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
+        overlayClassName: "fcr-action-bar--device-popover fcr-action-bar--leave-popover",
+        overlayInnerStyle: {
+          width: 255
         },
-        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",
-        size: "XS"
-      }, buttonProps), {}, {
-        children: popoverOpened ? transI18n('fmt_toolbar_button_cancel') : localUserRole === _type.FcrUserRole.HOST ? transI18n('fmt_toolbar_button_end') : transI18n('fmt_toolbar_button_leave')
-      }))
-    })
+        visible: popoverOpened,
+        onVisibleChange: onPopoverChanged,
+        trigger: "click",
+        placement: "topRight",
+        overlayOffset: 20,
+        content: leaveMeetingContent,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, _objectSpread(_objectSpread({
+          shape: "rounded",
+          size: "XS"
+        }, buttonProps), {}, {
+          children: popoverOpened ? transI18n('fmt_toolbar_button_cancel') : localUserRole === _type.FcrUserRole.HOST ? transI18n('fmt_toolbar_button_end') : transI18n('fmt_toolbar_button_leave')
+        }))
+      })
+    }), stateBarLeaveMeeting && LeaveMeetingPortal()]
   });
 });

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

@@ -1,5 +1,5 @@
 import './index.css';
-import { FcrUserInfo, FcrUserRole } from 'agora-edu-core/lib/type';
+import { FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
 interface LeaveMeetingProps {
     setPopoverOpened: React.Dispatch<React.SetStateAction<boolean>>;
     end: () => void;
@@ -12,6 +12,7 @@ interface LeaveMeetingProps {
     hasEndRoomPermission: boolean;
     isPstnUser: boolean;
     assignHost: (user: FcrUserInfo) => void;
+    setHeight?: () => void;
 }
-export declare const LeaveMeeting: (props: LeaveMeetingProps) => import("react/jsx-runtime").JSX.Element;
+export declare const LeaveMeeting: import("react").ForwardRefExoticComponent<LeaveMeetingProps & import("react").RefAttributes<unknown>>;
 export {};

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

@@ -9,14 +9,14 @@ exports.LeaveMeeting = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _assignHost = require("./assign-host");
 require("./index.css");
-var _type = require("agora-edu-core/lib/type");
+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)(function (props) {
+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,
@@ -27,7 +27,8 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
     hasEndRoomPermission = props.hasEndRoomPermission,
     keepPhoneAudioConnection = props.keepPhoneAudioConnection,
     isPstnUser = props.isPstnUser,
-    assignHost = props.assignHost;
+    assignHost = props.assignHost,
+    setHeight = props.setHeight;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     canAssign = _useState2[0],
@@ -40,6 +41,9 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
     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);
@@ -64,6 +68,11 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
   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() {
@@ -141,4 +150,4 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
       })]
     })
   });
-});
+}));

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

@@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.LiveStreaming = void 0;
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _context = require("../context");
+var _store = require("../store");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _item = require("../item");
-var _type2 = require("agora-edu-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 var LiveStreaming = exports.LiveStreaming = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
     order = _ref.order;
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     liveStreamingState = _useContext.liveStreamingState,
     openLiveStreamingDialog = _useContext.openLiveStreamingDialog;
   var isStarted = liveStreamingState === _type2.FcrLiveStreamingState.STARTED;

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

@@ -18,17 +18,18 @@ var _actionBarCollapesItems = require("../action-bar-collapes-items");
 var _mobxReact = require("mobx-react");
 require("./index.css");
 var _poppoverContent = require("./poppover-content");
-var _context = require("../context");
-var _dropMenu = require("../security/drop-menu");
 var _store = require("../store");
+var _securityMenu = _interopRequireDefault(require("../../components/security-menu"));
+var _appitems = require("../apps/appitems");
 var _jsxRuntime = require("react/jsx-runtime");
 var More = exports.More = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
     order = _ref.order;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     currentMenuIs = _useContext.currentMenuIs,
-    switchMenu = _useContext.switchMenu;
+    switchMenu = _useContext.switchMenu,
+    setEnableWaitingRoom = _useContext.setEnableWaitingRoom;
   var _useContext2 = (0, _react.useContext)(_actionBarCollapesItems.actionBarCollapseContext),
     collapseList = _useContext2.collapseList,
     toggleLayoutBarLock = _useContext2.toggleLayoutBarLock;
@@ -39,10 +40,12 @@ var More = exports.More = (0, _mobxReact.observer)(function (_ref) {
     visible = _useState2[0],
     setVisible = _useState2[1];
   var timerRef = (0, _react.useRef)(undefined);
-  var toggleMenus = (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _store.MoreMenuType.DEFAULT, /*#__PURE__*/(0, _jsxRuntime.jsx)(_poppoverContent.MorePopoverContent, {
+  var toggleMenus = (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _store.MoreMenuType.DEFAULT, /*#__PURE__*/(0, _jsxRuntime.jsx)(_poppoverContent.MorePopoverContent, {
     compList: collapseList || [],
     setVisible: setVisible
-  })), _store.MoreMenuType.SECURITY, /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.SecurityMenu, {}));
+  })), _store.MoreMenuType.SECURITY, /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {
+    setEnableWaitingRoom: setEnableWaitingRoom
+  })), _store.MoreMenuType.APPS, /*#__PURE__*/(0, _jsxRuntime.jsx)(_appitems.AppItems, {}));
   (0, _react.useEffect)(function () {
     // 处理在关闭的时候，过早切换菜单导致的闪烁问题
     timerRef.current = !visible ? setTimeout(function () {

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

@@ -33,20 +33,19 @@ require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.iterator.reduce.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _type = require("agora-edu-core/lib/type");
+var _type = require("fcr-core/lib/type");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type2 = require("agora-ui-foundation/lib/components/icon/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _store = require("../../setting/store");
-var _context = require("../context");
+var _store2 = require("../store");
 var _stopRecordDialog = require("../record/stop-record-dialog");
 require("./index.css");
-var _store2 = require("../store");
 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 Security = function Security() {
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store2.ActionBarContext),
     switchMenu = _useContext.switchMenu;
   var transI18n = (0, _i18n.useI18n)();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -63,7 +62,7 @@ var Security = function Security() {
   });
 };
 var Participants = function Participants(props) {
-  var _useContext2 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext2 = (0, _react.useContext)(_store2.ActionBarContext),
     toggleParticipants = _useContext2.toggleParticipants;
   var transI18n = (0, _i18n.useI18n)();
   var onClick = function onClick() {
@@ -82,7 +81,7 @@ var Participants = function Participants(props) {
   });
 };
 var ScreenShare = (0, _mobxReact.observer)(function (props) {
-  var _useContext3 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext3 = (0, _react.useContext)(_store2.ActionBarContext),
     startScreenShare = _useContext3.startScreenShare;
   var transI18n = (0, _i18n.useI18n)();
   var onClick = function onClick() {
@@ -101,7 +100,7 @@ var ScreenShare = (0, _mobxReact.observer)(function (props) {
   });
 });
 var Chat = (0, _mobxReact.observer)(function (props) {
-  var _useContext4 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext4 = (0, _react.useContext)(_store2.ActionBarContext),
     toggleChat = _useContext4.toggleChat,
     allNewMessage = _useContext4.allNewMessage;
   var onClick = function onClick() {
@@ -130,7 +129,7 @@ var Chat = (0, _mobxReact.observer)(function (props) {
 // See ../record/index.tsx.
 var Record = (0, _mobxReact.observer)(function (props) {
   var t = (0, _i18n.useI18n)();
-  var _useContext5 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext5 = (0, _react.useContext)(_store2.ActionBarContext),
     hasStartCloudRecordingPermission = _useContext5.hasStartCloudRecordingPermission,
     cloudRecordingState = _useContext5.cloudRecordingState,
     startCloudRecording = _useContext5.startCloudRecording,
@@ -245,7 +244,7 @@ var Respond = (0, _mobxReact.observer)(function (props) {
   });
 });
 var LiveStreaming = (0, _mobxReact.observer)(function (props) {
-  var _useContext6 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext6 = (0, _react.useContext)(_store2.ActionBarContext),
     openLiveStreamingDialog = _useContext6.openLiveStreamingDialog,
     liveStreamingState = _useContext6.liveStreamingState;
   var onClick = function onClick() {
@@ -264,9 +263,26 @@ var LiveStreaming = (0, _mobxReact.observer)(function (props) {
     })]
   });
 });
+var Apps = (0, _mobxReact.observer)(function (props) {
+  var _useContext7 = (0, _react.useContext)(_store2.ActionBarContext),
+    switchMenu = _useContext7.switchMenu;
+  var transI18n = (0, _i18n.useI18n)();
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "fcr-more-popover-content__group-item contain-icon",
+    onClick: function onClick() {
+      return switchMenu(_store2.MoreMenuType.APPS);
+    },
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+      type: _type2.FcrIconType.FCR_MOREAPP,
+      size: 24
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      children: "Apps"
+    })]
+  });
+});
 var Settings = (0, _mobxReact.observer)(function (props) {
-  var _useContext7 = (0, _react.useContext)(_context.ActionBarContext),
-    openDeviceSettingDialog = _useContext7.openDeviceSettingDialog;
+  var _useContext8 = (0, _react.useContext)(_store2.ActionBarContext),
+    openDeviceSettingDialog = _useContext8.openDeviceSettingDialog;
   var t = (0, _i18n.useI18n)();
   var onClick = function onClick() {
     props.setVisible(false);
@@ -331,9 +347,14 @@ var COMP_DETAIL = {
     order: 5,
     comp: LiveStreaming
   },
+  Apps: {
+    group: 3,
+    order: 6,
+    comp: Apps
+  },
   Settings: {
     group: 4,
-    order: 1,
+    order: 2,
     comp: Settings
   }
 };

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

@@ -16,7 +16,7 @@ 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 _store = require("../store");
 var _mobxReact = require("mobx-react");
 require("./index.css");
 var _actionBarCollapesItems = require("../action-bar-collapes-items");
@@ -27,7 +27,7 @@ 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)(_context.ActionBarContext),
+  var _useContext2 = (0, _react.useContext)(_store.ActionBarContext),
     toggleParticipants = _useContext2.toggleParticipants,
     totalUser = _useContext2.totalUser,
     isNewWaitingRoomUserEnter = _useContext2.isNewWaitingRoomUserEnter;

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("agora-edu-core/lib/type");
+var _type = require("fcr-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 _context = require("../context");
+var _store = require("../store");
 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)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.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)(_context.ActionBarContext),
+  var _useContext2 = (0, _react.useContext)(_store.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 _context = require("../context");
+var _store = require("../store");
 var _mobxReact = require("mobx-react");
-var _agoraEduCore = require("agora-edu-core");
+var _fcrCore = require("fcr-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)(_context.ActionBarContext);
+  var actionStore = (0, _react.useContext)(_store.ActionBarContext);
   var startScreenShare = actionStore.startScreenShare,
     localUserRole = actionStore.localUserRole,
     hasStartScreenSharePermission = actionStore.hasStartScreenSharePermission;
@@ -67,7 +67,7 @@ var ScreenShare = exports.ScreenShare = (0, _mobxReact.observer)(function (_ref)
         iconPrimary: 'var(--fcr_ui_scene_ramp_green6)'
       },
       moreVisible: visibleMenu,
-      submenu: [_agoraEduCore.FcrUserRole.HOST, _agoraEduCore.FcrUserRole.COHOST].includes(localUserRole) ? {
+      submenu: [_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole) ? {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {}),
         onClick: function onClick() {
           setTooltipVisible(false);

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

@@ -15,8 +15,8 @@ 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 _context = require("../context");
-var _agoraEduCore = require("agora-edu-core");
+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");
@@ -24,7 +24,7 @@ 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)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     setAllowBoardWrite = _useContext.setAllowBoardWrite,
     setAllowScreenShare = _useContext.setAllowScreenShare,
     localUserRole = _useContext.localUserRole,
@@ -39,7 +39,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission,
     hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission;
   var t = (0, _i18n.useI18n)();
-  var hasHostPermission = [_agoraEduCore.FcrUserRole.HOST, _agoraEduCore.FcrUserRole.COHOST].includes(localUserRole);
+  var hasHostPermission = [_fcrCore.FcrUserRole.HOST, _fcrCore.FcrUserRole.COHOST].includes(localUserRole);
   var hasBoardControlPermission = boardOwnerUser && localUser.userId !== boardOwnerUser.userId && hasCloseWriteBoardPermission && hasAllowWriteBoardPermission;
   // 需求变更，联席主持人也可以禁用主持人的白板，注释掉联席主持人不能禁用的逻辑
   // (FcrUserRole.HOST === localUserRole ||

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

@@ -26,7 +26,7 @@ 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 _context = require("../context");
+var _store = require("../store");
 var _react = require("react");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _mobxReact = require("mobx-react");
@@ -34,12 +34,12 @@ 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("agora-edu-core/lib/type");
+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)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     isLockRoomEnabled = _useContext.isLockRoomEnabled,
     setLockRoomEnabled = _useContext.setLockRoomEnabled,
     allowChat = _useContext.allowChat,
@@ -52,6 +52,7 @@ 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,
@@ -61,14 +62,20 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
     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;
+    hasWatermarkDisablePermission = _useContext.hasWatermarkDisablePermission,
+    hasAllowChangeNamePromission = _useContext.hasAllowChangeNamePromission,
+    hasDisallowChangeNamePromission = _useContext.hasDisallowChangeNamePromission,
+    allowChangeName = _useContext.allowChangeName;
   var transI18n = (0, _i18n.useI18n)();
   var allActions = [];
   allActions.push({
@@ -105,6 +112,20 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
       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) {
@@ -232,17 +253,34 @@ var SecurityMenu = exports.SecurityMenu = (0, _mobxReact.observer)(function () {
       }
     });
   }
-  if (hasEnableChangeNamePermission) {
+
+  // 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) {
     allActions.push({
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-        checked: false,
-        label: transI18n('fmt_screenshare_controlbar_security_list_participant_changeName'),
+        checked: allowChangeName(),
+        label: transI18n('fmt_additional_label_change_name_self'),
         styleType: "white"
       }),
-      key: 'rename',
-      type: 'disabled',
-      onButtonClick: function onButtonClick() {},
-      classNames: 'room-control-drop-with-under-line'
+      onButtonClick: function onButtonClick() {
+        return setAlllowChangeName(!allowChangeName());
+      },
+      key: 'rename'
     });
   }
   allActions.push({