fcr-ui-scene 3.4.1 → 3.4.2

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

@@ -41,6 +41,7 @@ var _store = require("../../../setting/store");
 var _store2 = require("../../store");
 var _stopRecordDialog = require("../record/stop-record-dialog");
 require("./index.css");
+var _enums = require("../../enums");
 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; }
@@ -51,7 +52,7 @@ var Security = function Security() {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-more-popover-content__group-item  contain-icon",
     onClick: function onClick() {
-      return switchMenu(_store2.MoreMenuType.SECURITY);
+      return switchMenu(_enums.MoreMenuType.SECURITY);
     },
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
       type: _type2.FcrIconType.FCR_SECURITY,
@@ -270,7 +271,7 @@ var Apps = (0, _mobxReact.observer)(function (props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-more-popover-content__group-item contain-icon",
     onClick: function onClick() {
-      return switchMenu(_store2.MoreMenuType.APPS);
+      return switchMenu(_enums.MoreMenuType.APPS);
     },
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
       type: _type2.FcrIconType.FCR_MOREAPP,
@@ -280,9 +281,26 @@ var Apps = (0, _mobxReact.observer)(function (props) {
     })]
   });
 });
-var Settings = (0, _mobxReact.observer)(function (props) {
+var TriggerSubscribeLanguage = (0, _mobxReact.observer)(function (props) {
   var _useContext8 = (0, _react.useContext)(_store2.ActionBarContext),
-    openDeviceSettingDialog = _useContext8.openDeviceSettingDialog;
+    switchMenu = _useContext8.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(_enums.MoreMenuType.TRIGGER_OUTPUT_LANGUAGE_ROOM);
+    },
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+      type: _type2.FcrIconType.FCR_INTERPRETATION2,
+      size: 24
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      children: transI18n('fmt_interpretation_mobile_setting_controller_option_interpret')
+    })]
+  });
+});
+var Settings = (0, _mobxReact.observer)(function (props) {
+  var _useContext9 = (0, _react.useContext)(_store2.ActionBarContext),
+    openDeviceSettingDialog = _useContext9.openDeviceSettingDialog;
   var t = (0, _i18n.useI18n)();
   var onClick = function onClick() {
     props.setVisible(false);
@@ -347,9 +365,14 @@ var COMP_DETAIL = {
     order: 5,
     comp: LiveStreaming
   },
-  Apps: {
+  TriggerSubscribeLanguage: {
     group: 3,
     order: 6,
+    comp: TriggerSubscribeLanguage
+  },
+  Apps: {
+    group: 3,
+    order: 7,
     comp: Apps
   },
   Settings: {

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

@@ -0,0 +1,58 @@
+.interpreter-notification {
+  width: 270px;
+  min-height: 90px;
+  background: var(--fcr_ui_scene_ramp_purple6);
+  border-radius: var(--fcr_cornerradius_l);
+  position: relative;
+  z-index: 10;
+  bottom: 10px;
+  right: calc(60px - 15px);
+}
+
+.interpreter-notification .interpreter-notification-inner {
+  width: 270px;
+  padding: 10px 15px;
+  min-height: 90px;
+  border-radius: var(--fcr_cornerradius_l);
+  border-bottom-right-radius: 0;
+  background: var(--fcr_ui_scene_white10);
+}
+
+.interpreter-notification .interpreter-notification-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10px;
+  color: var(--fcr_ui_scene_black10);
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.interpreter-notification .interpreter-notification-content {
+  font-size: 15px;
+  line-height: 22px;
+  font-weight: 300;
+}
+
+.interpreter-notification .interpreter-notification-backtext {
+  font-size: 15px;
+  line-height: 1.5;
+  padding: 6px 15px;
+  color: var(--fcr_ui_scene_white10);
+}
+
+.interpreter-notification .interpreter-notification-close {
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  background: var(--fcr_ui_scene_white7);
+  position: absolute;
+  right: -23px;
+  top: 0;
+  text-align: center;
+  line-height: 16px;
+}
+.interpreter-notification .interpreter-notification-close:hover {
+  background-color: var(--fcr_ui_scene_white10);
+  cursor: pointer;
+}

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

@@ -0,0 +1,8 @@
+import './index.css';
+import { FcrInterpreterUserInfo } from 'fcr-core/lib/room-control/interpreter-control/types';
+export default function interpreterNotification(props: {
+    offline: FcrInterpreterUserInfo[] | undefined;
+    reenter: FcrInterpreterUserInfo[] | undefined;
+    onClose?: () => void;
+    onAssign?: () => void;
+}): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,100 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = interpreterNotification;
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.join.js");
+require("core-js/modules/es.array.map.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/web.timers.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _button = require("agora-ui-foundation/lib/components/button");
+require("./index.css");
+var _type = require("agora-ui-foundation/lib/components/icon/type");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _jsxRuntime = require("react/jsx-runtime");
+function interpreterNotification(props) {
+  var onClose = props.onClose,
+    onAssign = props.onAssign,
+    _props$offline = props.offline,
+    offline = _props$offline === void 0 ? [] : _props$offline,
+    _props$reenter = props.reenter,
+    reenter = _props$reenter === void 0 ? [] : _props$reenter;
+  var _useState = (0, _react.useState)(5),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    second = _useState2[0],
+    setSecond = _useState2[1];
+  var transI18n = (0, _i18n.useI18n)();
+  var text = (0, _react.useMemo)(function () {
+    return transI18n('fmt_interpretation_popup_label_set', {
+      reason1: offline.map(function (interpreter) {
+        return interpreter.userName;
+      }).join('、')
+    });
+  }, [offline]);
+  var reEnterText = (0, _react.useMemo)(function () {
+    return transI18n('fmt_interpretation_popup_toast_label_return_meeting', {
+      reason1: reenter.map(function (interpreter) {
+        return interpreter.userName;
+      }).join('、')
+    });
+  }, [reenter]);
+  (0, _react.useEffect)(function () {
+    if (second === 0) {
+      if (offline.length === 0) {
+        onClose && onClose();
+      }
+      return;
+    }
+    var timer = setInterval(function () {
+      setSecond(function (second) {
+        return second - 1;
+      });
+    }, 1000);
+    return function () {
+      clearInterval(timer);
+    };
+  }, [second]);
+  (0, _react.useEffect)(function () {
+    reenter.length > 0 && setSecond(5);
+  }, [reEnterText]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "interpreter-notification",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "interpreter-notification-close",
+      onClick: onClose,
+      children: "\xD7"
+    }), second > 0 && reenter.length > 0 && offline.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "interpreter-notification-backtext",
+      children: [reEnterText, "(", second, "s)"]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "interpreter-notification-inner",
+      children: [offline.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "interpreter-notification-header",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          children: transI18n('fmt_interpretation_pupup_interpreter_offline')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+          preIcon: _type.FcrIconType.FCR_SETTING2,
+          preIconProps: {
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_white10)'
+            },
+            size: 18
+          },
+          size: "XXS",
+          onClick: onAssign,
+          children: transI18n('fmt_interpretation_popup_button_set')
+        })]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "interpreter-notification-content",
+        children: offline.length > 0 ? text : "".concat(reEnterText, "(").concat(second, "s)")
+      })]
+    })]
+  });
+}

package/lib/modules/action-bar/components/notification-bar/components/virtual-image/index.css

@@ -0,0 +1,56 @@
+.interpreter-virtual-image-container {
+  position: absolute;
+  width: 60px;
+  height: 72px;
+  right: 0;
+  bottom: 3px;
+  transition: all 0.2s;
+  z-index: 20;
+  animation: say-hi 1s;
+  animation-iteration-count: 1;
+}
+
+.interpreter-virtual-image-hidden {
+  height: 20px;
+}
+
+.interpreter-virtual-image-close {
+  width: 18px;
+  height: 18px;
+  border-radius: 50%;
+  background: var(--fcr_ui_scene_white7);
+  position: absolute;
+  right: -8px;
+  top: 0;
+  text-align: center;
+  line-height: 16px;
+  z-index: 10;
+}
+
+.interpreter-virtual-image-close:hover {
+  background-color: var(--fcr_ui_scene_white10);
+  cursor: pointer;
+}
+
+.interpreter-virtual-image {
+  height: 100%;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  overflow: hidden;
+}
+.interpreter-virtual-image:focus {
+  outline: none;
+}
+
+@keyframes say-hi {
+  0% {
+    height: 72px;
+  }
+  50% {
+    height: 57.6px;
+  }
+  100% {
+    height: 72px;
+  }
+}

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

@@ -0,0 +1,5 @@
+import './index.css';
+export default function VirtualImage(props: {
+    hidden: boolean;
+    onClick: () => void;
+}): import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,33 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = VirtualImage;
+var _dome = _interopRequireDefault(require("../../assets/dome.png"));
+require("./index.css");
+var _jsxRuntime = require("react/jsx-runtime");
+function VirtualImage(props) {
+  var _onClick = props.onClick,
+    hidden = props.hidden;
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "interpreter-virtual-image-container ".concat(hidden ? 'interpreter-virtual-image-hidden' : ''),
+    children: [!hidden && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "interpreter-virtual-image-close",
+      onClick: _onClick,
+      children: "\xD7"
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
+      onClick: function onClick() {
+        return _onClick();
+      },
+      className: "interpreter-virtual-image",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+        className: "notification-icon",
+        src: _dome["default"],
+        draggable: "false"
+      })
+    })]
+  });
+}

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

@@ -0,0 +1,74 @@
+.notification-bar {
+  position: absolute;
+  right: 20px;
+  bottom: 52px;
+  z-index: 9999;
+  /* height: 60px; */
+  /* display: flex;
+  justify-content:space-between;
+  align-items: center;
+  background: var(--fcr_ui_scene_white8); */
+  /* border-radius: 30px; */
+  /* padding: 5px; */
+  transition: all 0.2s;
+}
+.notification-bar-hidden {
+  bottom: 62px;
+}
+.notification-icon {
+  width: 60px;
+  height: 103px;
+}
+
+.notification-action {
+  /* width: 50%; */
+  height: 100%;
+  padding: 3px;
+}
+.notification-action-bg {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 100%;
+  width: 100%;
+  padding: 8.5px 19.5px;
+}
+
+.notification-action-icon {
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  background: rgba(63, 59, 83, 1);
+}
+
+.notification-action__checked {
+  border-radius: 25px;
+  border: 1px solid var(--fcr_ui_scene_card3);
+  border-radius: 25px;
+}
+.notification-action__checked .notification-action-bg {
+  border-radius: 25px;
+  background: linear-gradient(
+    180deg,
+    #00cae0 0%,
+    #15d5ea 4.76%,
+    #6ae7f5 8.48%,
+    #64e8f7 25.6%,
+    #64e8f7 48%,
+    #00cae0 77.38%,
+    #00cae0 100%
+  );
+  box-shadow: 0px 4px 4px 0px rgba(4, 173, 191, 1) inset;
+}
+.notification-action__checked .notification-action-icon {
+  background: rgba(217, 217, 217, 1);
+}
+.notification-action-text {
+  color: var(--fcr_ui_scene_black10);
+  font-size: 20px;
+  margin-left: 8px;
+}
+
+.notification-action__checked .notification-action-text {
+  color: var(--fcr_ui_scene_white10);
+}

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

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

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

@@ -0,0 +1,99 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NotificationBar = void 0;
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.includes.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.map.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _classnames = _interopRequireDefault(require("classnames"));
+require("./index.css");
+var _interpreter = _interopRequireDefault(require("./components/interpreter"));
+var _virtualImage = _interopRequireDefault(require("./components/virtual-image"));
+var _store = require("../../store");
+var _mobxReact = require("mobx-react");
+var _jsxRuntime = require("react/jsx-runtime");
+var NotificationBar = exports.NotificationBar = (0, _mobxReact.observer)(function () {
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+    openInterpreterDialog = _useContext.openInterpreterDialog,
+    users = _useContext.users,
+    interpreterUsers = _useContext.interpreterUsers,
+    interpreterUsersOffline = _useContext.interpreterUsersOffline,
+    folded = _useContext.folded;
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    showNotification = _useState2[0],
+    setShowNotification = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    hidden = _useState4[0],
+    setHidden = _useState4[1];
+  var shareScreenBarRef = (0, _react.useRef)(null);
+  var _useState5 = (0, _react.useState)([]),
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    interpreterOffline = _useState6[0],
+    setInterpreterOffline = _useState6[1];
+  var _useState7 = (0, _react.useState)([]),
+    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+    reEnterInterperter = _useState8[0],
+    setReEnterInterperter = _useState8[1];
+  (0, _react.useEffect)(function () {
+    var offline = (interpreterUsers === null || interpreterUsers === void 0 ? void 0 : interpreterUsers.filter(function (user) {
+      return !users.map(function (u) {
+        return u.userId;
+      }).includes(user.userId);
+    })) || [];
+    setInterpreterOffline(offline);
+    if (offline.length > 0) {
+      setShowNotification(true);
+    }
+  }, [users, interpreterUsers]);
+  (0, _react.useEffect)(function () {
+    var reEnter = (interpreterOffline === null || interpreterOffline === void 0 ? void 0 : interpreterOffline.filter(function (user) {
+      return users.map(function (u) {
+        return u.userId;
+      }).includes(user.userId);
+    })) || [];
+    setReEnterInterperter(reEnter);
+  }, [users]);
+  (0, _react.useEffect)(function () {
+    if (showNotification) {
+      setReEnterInterperter([]);
+    }
+  }, [showNotification]);
+  var show = showNotification && (reEnterInterperter.length > 0 || interpreterOffline.length > 0);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    ref: shareScreenBarRef,
+    className: (0, _classnames["default"])('notification-bar', {
+      'notification-bar-hidden': folded
+    }),
+    children: [show && /*#__PURE__*/(0, _jsxRuntime.jsx)(_interpreter["default"], {
+      offline: interpreterOffline,
+      reenter: reEnterInterperter,
+      onClose: function onClose() {
+        return setShowNotification(!showNotification);
+      },
+      onAssign: function onAssign() {
+        openInterpreterDialog();
+      }
+    }), (interpreterUsersOffline || show) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_virtualImage["default"], {
+      hidden: hidden,
+      onClick: function onClick() {
+        setShowNotification(!showNotification);
+        setHidden(showNotification);
+      }
+    })]
+  });
+});

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

@@ -19,13 +19,13 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _store = require("../../store");
 var _mobxReact = require("mobx-react");
 require("./index.css");
-var _actionBarCollapesItems = require("../../action-bar-collapes-items");
+var _collapse = require("../collapse");
 var _jsxRuntime = require("react/jsx-runtime");
 var Participants = exports.Participants = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
     order = _ref.order;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_actionBarCollapesItems.actionBarCollapseContext),
+  var _useContext = (0, _react.useContext)(_collapse.actionBarCollapseContext),
     visibleList = _useContext.visibleList;
   var _useContext2 = (0, _react.useContext)(_store.ActionBarContext),
     toggleParticipants = _useContext2.toggleParticipants,

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

@@ -0,0 +1,4 @@
+import { ActionBarItemPlacementProps } from '../../types';
+export declare const ActionBarItemPlacement: import("react").ForwardRefExoticComponent<ActionBarItemPlacementProps & {
+    children?: import("react").ReactNode | undefined;
+} & import("react").RefAttributes<HTMLDivElement>>;

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

@@ -0,0 +1,18 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ActionBarItemPlacement = void 0;
+var _react = require("react");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _jsxRuntime = require("react/jsx-runtime");
+var ActionBarItemPlacement = exports.ActionBarItemPlacement = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    ref: ref,
+    className: (0, _classnames["default"])("fcr-action-bar-".concat(props.placement)),
+    children: props.children
+  });
+});

package/lib/modules/action-bar/components/record/stop-record-dialog.d.ts

@@ -1,5 +1,3 @@
 import { PropsWithChildren } from 'react';
-export interface StopCloudRecordingProps {
-    stopCloudRecording: () => void;
-}
+import { StopCloudRecordingProps } from '../../types';
 export declare const StopCloudRecording: ({ stopCloudRecording, children, }: PropsWithChildren<StopCloudRecordingProps>) => import("react/jsx-runtime").JSX.Element;

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

@@ -37,10 +37,12 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
     startScreenShare = _useContext.startScreenShare,
     hasScreenShare = _useContext.hasScreenShare,
     hasCloseWriteBoardPermission = _useContext.hasCloseWriteBoardPermission,
-    hasAllowWriteBoardPermission = _useContext.hasAllowWriteBoardPermission;
+    sharingOwnerUser = _useContext.sharingOwnerUser,
+    hasStopScreenSharePermission = _useContext.hasStopScreenSharePermission,
+    closeShareScreen = _useContext.closeShareScreen;
   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 hasBoardControlPermission = boardOwnerUser && localUser.userId !== boardOwnerUser.userId && hasCloseWriteBoardPermission;
   // 需求变更，联席主持人也可以禁用主持人的白板，注释掉联席主持人不能禁用的逻辑
   // (FcrUserRole.HOST === localUserRole ||
   //   (FcrUserRole.COHOST === localUserRole && FcrUserRole.HOST !== boardOwnerUser?.userRole));
@@ -137,6 +139,24 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
       closeWhiteboard();
     }
   }];
+  var shareScrennControlMenus = [{
+    title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+      size: "XS",
+      styleType: "danger",
+      shape: "rounded",
+      block: true,
+      children: t('fmt_screenshare_button_disableshare', {
+        reason1: sharingOwnerUser ? (0, _truncate["default"])(sharingOwnerUser.userName, {
+          length: 8,
+          separator: ' '
+        }) : t('fmt_actionbar_screenshare_labels_others')
+      })
+    }),
+    key: 'close_share_screen',
+    onButtonClick: function onButtonClick() {
+      closeShareScreen();
+    }
+  }];
   if ((0, _env.isElectron)()) {
     menus.push.apply(menus, menusElectronOnly);
   } else {
@@ -148,6 +168,9 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function () {
   if (hasBoardControlPermission) {
     menus.push.apply(menus, boardControlMenus);
   }
+  if (hasStopScreenSharePermission) {
+    menus.push.apply(menus, shareScrennControlMenus);
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.FcrDropMenu, {
     options: menus
   });

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

@@ -22,7 +22,8 @@ var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
     order = _ref.order;
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
-    setEnableWaitingRoom = _useContext.setEnableWaitingRoom;
+    setEnableWaitingRoom = _useContext.setEnableWaitingRoom,
+    privilegeProvider = _useContext.privilegeProvider;
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_controlbar_button_security');
   var tooltip = transI18n('fmt_screenshare_controlbar_button_security');
@@ -32,6 +33,7 @@ var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
       popoverProps: {
         trigger: 'click',
         content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {
+          privilege: privilegeProvider,
           setEnableWaitingRoom: setEnableWaitingRoom
         }),
         overlayInnerStyle: {

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

@@ -0,0 +1 @@
+export declare const SmallerActionbar: () => import("react/jsx-runtime").JSX.Element;