fcr-ui-scene 3.4.1 → 3.4.2

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

@@ -9,26 +9,26 @@ 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 _type = require("agora-edu-core/lib/type");
 var _react = require("react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _context = require("../context");
 var _mobxReact = require("mobx-react");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _jsxRuntime = require("react/jsx-runtime");
-var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(/*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (props) {
   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 _useContext = (0, _react.useContext)(_context.ActionBarContext),
+    localUserRole = _useContext.localUserRole,
+    remoteUsers = _useContext.remoteUsers,
+    end = _useContext.end,
+    leave = _useContext.leave,
+    isLocked = _useContext.isLocked,
+    hasAssignHostBeforeLeavingPermission = _useContext.hasAssignHostBeforeLeavingPermission,
+    hasEndRoomPermission = _useContext.hasEndRoomPermission,
+    keepPhoneAudioConnection = _useContext.keepPhoneAudioConnection,
+    isPstnUser = _useContext.isPstnUser;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     canAssign = _useState2[0],
@@ -41,16 +41,13 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(/*#__PURE__*/
     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);
+      leave();
+      handleKeepConnect();
     }
   };
   var handleKeepConnect = function handleKeepConnect() {
@@ -60,30 +57,19 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(/*#__PURE__*/
   };
   var handleConfirm = function handleConfirm() {
     props.setPopoverOpened(false);
+    leave();
     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
+        handleKeepConnect: handleKeepConnect
       }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "leave-container",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -115,11 +101,7 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(/*#__PURE__*/
   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: [isLocked() ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "assistant-leave-lock-info",
           children: t('fmt_actionbar_tips_locked')
@@ -150,4 +132,4 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(/*#__PURE__*/
       })]
     })
   });
-}));
+});

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 _store = require("../store");
+var _context = require("../context");
 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("fcr-core/lib/type");
+var _type2 = require("agora-edu-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)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     liveStreamingState = _useContext.liveStreamingState,
     openLiveStreamingDialog = _useContext.openLiveStreamingDialog;
   var isStarted = liveStreamingState === _type2.FcrLiveStreamingState.STARTED;

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

@@ -18,18 +18,17 @@ 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)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     currentMenuIs = _useContext.currentMenuIs,
-    switchMenu = _useContext.switchMenu,
-    setEnableWaitingRoom = _useContext.setEnableWaitingRoom;
+    switchMenu = _useContext.switchMenu;
   var _useContext2 = (0, _react.useContext)(_actionBarCollapesItems.actionBarCollapseContext),
     collapseList = _useContext2.collapseList,
     toggleLayoutBarLock = _useContext2.toggleLayoutBarLock;
@@ -40,12 +39,10 @@ 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"])((0, _defineProperty2["default"])({}, _store.MoreMenuType.DEFAULT, /*#__PURE__*/(0, _jsxRuntime.jsx)(_poppoverContent.MorePopoverContent, {
+  var toggleMenus = (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)(_securityMenu["default"], {
-    setEnableWaitingRoom: setEnableWaitingRoom
-  })), _store.MoreMenuType.APPS, /*#__PURE__*/(0, _jsxRuntime.jsx)(_appitems.AppItems, {}));
+  })), _store.MoreMenuType.SECURITY, /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.SecurityMenu, {}));
   (0, _react.useEffect)(function () {
     // 处理在关闭的时候，过早切换菜单导致的闪烁问题
     timerRef.current = !visible ? setTimeout(function () {

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

@@ -33,19 +33,20 @@ 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("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 _i18n = require("agora-ui-foundation/lib/i18n");
 var _store = require("../../setting/store");
-var _store2 = require("../store");
+var _context = require("../context");
 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)(_store2.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     switchMenu = _useContext.switchMenu;
   var transI18n = (0, _i18n.useI18n)();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -62,7 +63,7 @@ var Security = function Security() {
   });
 };
 var Participants = function Participants(props) {
-  var _useContext2 = (0, _react.useContext)(_store2.ActionBarContext),
+  var _useContext2 = (0, _react.useContext)(_context.ActionBarContext),
     toggleParticipants = _useContext2.toggleParticipants;
   var transI18n = (0, _i18n.useI18n)();
   var onClick = function onClick() {
@@ -81,7 +82,7 @@ var Participants = function Participants(props) {
   });
 };
 var ScreenShare = (0, _mobxReact.observer)(function (props) {
-  var _useContext3 = (0, _react.useContext)(_store2.ActionBarContext),
+  var _useContext3 = (0, _react.useContext)(_context.ActionBarContext),
     startScreenShare = _useContext3.startScreenShare;
   var transI18n = (0, _i18n.useI18n)();
   var onClick = function onClick() {
@@ -100,9 +101,9 @@ var ScreenShare = (0, _mobxReact.observer)(function (props) {
   });
 });
 var Chat = (0, _mobxReact.observer)(function (props) {
-  var _useContext4 = (0, _react.useContext)(_store2.ActionBarContext),
+  var _useContext4 = (0, _react.useContext)(_context.ActionBarContext),
     toggleChat = _useContext4.toggleChat,
-    allNewMessage = _useContext4.allNewMessage;
+    newMessageCount = _useContext4.newMessageCount;
   var onClick = function onClick() {
     props.setVisible(false);
     toggleChat();
@@ -116,12 +117,12 @@ var Chat = (0, _mobxReact.observer)(function (props) {
       size: 24
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       children: transI18n('fmt_chat_label_chat')
-    }), allNewMessage > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    }), newMessageCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       className: "fcr-more-popover-content_chat_msg_count",
-      children: allNewMessage > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+      children: newMessageCount > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
         type: _type2.FcrIconType.FCR_CHAT_REDDOT,
         size: 14
-      }) : allNewMessage
+      }) : newMessageCount
     })]
   });
 });
@@ -129,7 +130,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)(_store2.ActionBarContext),
+  var _useContext5 = (0, _react.useContext)(_context.ActionBarContext),
     hasStartCloudRecordingPermission = _useContext5.hasStartCloudRecordingPermission,
     cloudRecordingState = _useContext5.cloudRecordingState,
     startCloudRecording = _useContext5.startCloudRecording,
@@ -244,7 +245,7 @@ var Respond = (0, _mobxReact.observer)(function (props) {
   });
 });
 var LiveStreaming = (0, _mobxReact.observer)(function (props) {
-  var _useContext6 = (0, _react.useContext)(_store2.ActionBarContext),
+  var _useContext6 = (0, _react.useContext)(_context.ActionBarContext),
     openLiveStreamingDialog = _useContext6.openLiveStreamingDialog,
     liveStreamingState = _useContext6.liveStreamingState;
   var onClick = function onClick() {
@@ -263,26 +264,9 @@ 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 _useContext8 = (0, _react.useContext)(_store2.ActionBarContext),
-    openDeviceSettingDialog = _useContext8.openDeviceSettingDialog;
+  var _useContext7 = (0, _react.useContext)(_context.ActionBarContext),
+    openDeviceSettingDialog = _useContext7.openDeviceSettingDialog;
   var t = (0, _i18n.useI18n)();
   var onClick = function onClick() {
     props.setVisible(false);
@@ -347,14 +331,9 @@ var COMP_DETAIL = {
     order: 5,
     comp: LiveStreaming
   },
-  Apps: {
-    group: 3,
-    order: 6,
-    comp: Apps
-  },
   Settings: {
     group: 4,
-    order: 2,
+    order: 1,
     comp: Settings
   }
 };

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

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

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

@@ -6,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,15 +71,10 @@ 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",
-      overlayInnerStyle: {
-        minWidth: '210px',
-        maxWidth: '370px',
-        width: 'fit-content'
-      },
       content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_submenu.SubMenu, {}),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItem, {
         disabled: !hasStartScreenSharePermission,

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',