fcr-ui-scene 3.4.3 → 3.4.4

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

@@ -19,18 +19,18 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _popover = require("agora-ui-foundation/lib/components/popover");
 var _radio = require("agora-ui-foundation/lib/components/radio");
 var _mobxReact = require("mobx-react");
-var _store = require("../store");
-var _store2 = require("../../setting/store");
+var _context = require("../context");
+var _store = require("../../setting/store");
+var _type2 = require("../type");
 var _mic = require("agora-ui-foundation/lib/components/icon/mic");
 var _iconPhoneCall = require("agora-ui-foundation/lib/components/icon-phone-call");
-var _deviceStore = require("../../../common/device-store");
 var _jsxRuntime = require("react/jsx-runtime");
 var AudioRecordinDeviceIcon = exports.AudioRecordinDeviceIcon = (0, _mobxReact.observer)(function (_ref) {
   var _ref$size = _ref.size,
     size = _ref$size === void 0 ? 32 : _ref$size,
     _ref$micEnabled = _ref.micEnabled,
     micEnabled = _ref$micEnabled === void 0 ? false : _ref$micEnabled;
-  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     microphoneVolumeLevel = _useContext.microphoneVolumeLevel;
   var muteColor = {
     iconPrimary: "var(--fcr_ui_scene_ramp_red6)",
@@ -48,13 +48,15 @@ var AudioRecordinDeviceIcon = exports.AudioRecordinDeviceIcon = (0, _mobxReact.o
   });
 });
 var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(function () {
-  var _useContext2 = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext2 = (0, _react.useContext)(_context.ActionBarContext),
     microphoneEnabled = _useContext2.microphoneEnabled,
     enableMicrophone = _useContext2.enableMicrophone,
     toggleLayoutBarLock = _useContext2.toggleLayoutBarLock,
+    toggleConnection = _useContext2.toggleConnection,
     openConnection = _useContext2.openConnection,
     connectType = _useContext2.connectType,
     microphoneList = _useContext2.microphoneList,
+    microphoneVolumeLevel = _useContext2.microphoneVolumeLevel,
     phoneMicEnabled = _useContext2.phoneMicEnabled;
   var _useDeviceTooltipVisi = useDeviceTooltipVisible(toggleLayoutBarLock),
     tooltipVisible = _useDeviceTooltipVisi.tooltipVisible,
@@ -83,7 +85,7 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
         className: "fcr-action-bar-device",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           className: "fcr-action-bar-device-inner",
-          children: [connectType === _deviceStore.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          children: [connectType === _type2.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             onClick: function onClick() {
               return openConnection('computer');
             },
@@ -98,7 +100,7 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
               className: "fcr-action-bar-device-text",
               children: transI18n('fmt_toolbar_label_connectaudio')
             })]
-          }), connectType === _deviceStore.ConnectType.COMPUTER && (!noMic ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          }), connectType === _type2.ConnectType.COMPUTER && (!noMic ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             onClick: function onClick() {
               enableMicrophone(!microphoneEnabled);
             },
@@ -117,7 +119,7 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
               className: "fcr-action-bar-device-text",
               children: transI18n('fmt_internalsetting_status_nodevice')
             })]
-          })), connectType === _deviceStore.ConnectType.PHONE && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          })), connectType === _type2.ConnectType.PHONE && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_iconPhoneCall.FcrIconPhoneCall, {
               isMuted: !phoneMicEnabled
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -131,17 +133,17 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
           onVisibleChange: handlePopoverVisibleChanged,
           trigger: "click",
           content: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-            children: [connectType === _deviceStore.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(NoConnectionPopoverContent, {
+            children: [connectType === _type2.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(NoConnectionPopoverContent, {
               onItemClick: function onItemClick() {
                 handlePopoverVisibleChanged(false);
                 setPopoverOpened(false);
               }
-            }), connectType === _deviceStore.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)(AudioDeviceListPopoverContent, {
+            }), connectType === _type2.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)(AudioDeviceListPopoverContent, {
               setPopoverOpened: setPopoverOpened,
               onConnectClick: function onConnectClick() {
                 handlePopoverVisibleChanged(false);
               }
-            }), connectType === _deviceStore.ConnectType.PHONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(PhonePopoverContent, {
+            }), connectType === _type2.ConnectType.PHONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(PhonePopoverContent, {
               onItemClick: function onItemClick() {
                 handlePopoverVisibleChanged(false);
                 setPopoverOpened(false);
@@ -168,7 +170,7 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
 });
 var CameraDevice = exports.CameraDevice = (0, _mobxReact.observer)(function () {
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext3 = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext3 = (0, _react.useContext)(_context.ActionBarContext),
     cameraEnabled = _useContext3.cameraEnabled,
     enableCamera = _useContext3.enableCamera,
     toggleLayoutBarLock = _useContext3.toggleLayoutBarLock,
@@ -290,7 +292,7 @@ var VideoDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref2) {
   var onMoreClick = _ref2.onMoreClick,
     setPopoverOpened = _ref2.setPopoverOpened;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext4 = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext4 = (0, _react.useContext)(_context.ActionBarContext),
     openDeviceSettingDialog = _useContext4.openDeviceSettingDialog,
     cameraList = _useContext4.cameraList,
     cameraId = _useContext4.cameraId,
@@ -304,7 +306,7 @@ var VideoDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref2) {
   var openDeviceSetting = function openDeviceSetting(videoActiveTab) {
     setPopoverOpened(false);
     openDeviceSettingDialog({
-      activeTab: _store2.DeviceSettingTab.VIDEO,
+      activeTab: _store.DeviceSettingTab.VIDEO,
       videoActiveTab: videoActiveTab
     });
   };
@@ -381,7 +383,7 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
   var onConnectClick = _ref3.onConnectClick,
     setPopoverOpened = _ref3.setPopoverOpened;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext5 = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext5 = (0, _react.useContext)(_context.ActionBarContext),
     openDeviceSettingDialog = _useContext5.openDeviceSettingDialog,
     microphoneId = _useContext5.microphoneId,
     setMicrophoneId = _useContext5.setMicrophoneId,
@@ -391,8 +393,7 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
     speakerList = _useContext5.speakerList,
     openConnection = _useContext5.openConnection,
     connectType = _useContext5.connectType,
-    closeConnection = _useContext5.closeConnection,
-    closeSpeaker = _useContext5.closeSpeaker;
+    closeConnection = _useContext5.closeConnection;
   var microphoneOptions = microphoneList.map(function (device) {
     return {
       text: device.deviceName,
@@ -408,7 +409,7 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
   var openDeviceSetting = function openDeviceSetting() {
     setPopoverOpened(false);
     openDeviceSettingDialog({
-      activeTab: _store2.DeviceSettingTab.AUDIO
+      activeTab: _store.DeviceSettingTab.AUDIO
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -478,12 +479,11 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-device-popover-content-more",
-      children: [connectType === _deviceStore.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "fcr-device-popover-content-more-item fcr-device-popover-content-more-item--danger",
+      children: [connectType === _type2.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "fcr-device-popover-content-more-item",
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           onClick: function onClick() {
             setMicrophoneId('');
-            closeSpeaker();
             closeConnection();
           },
           children: transI18n('fmt_device_label_audio_list_leaveComputerAudio')
@@ -517,13 +517,13 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
 var NoConnectionPopoverContent = (0, _mobxReact.observer)(function (_ref4) {
   var onItemClick = _ref4.onItemClick;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext6 = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext6 = (0, _react.useContext)(_context.ActionBarContext),
     openDeviceSettingDialog = _useContext6.openDeviceSettingDialog,
     openConnection = _useContext6.openConnection;
   var openDeviceSetting = function openDeviceSetting() {
     onItemClick();
     openDeviceSettingDialog({
-      activeTab: _store2.DeviceSettingTab.AUDIO
+      activeTab: _store.DeviceSettingTab.AUDIO
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -569,13 +569,13 @@ var NoConnectionPopoverContent = (0, _mobxReact.observer)(function (_ref4) {
 var PhonePopoverContent = (0, _mobxReact.observer)(function (_ref5) {
   var onItemClick = _ref5.onItemClick;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext7 = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext7 = (0, _react.useContext)(_context.ActionBarContext),
     openDeviceSettingDialog = _useContext7.openDeviceSettingDialog,
     openConnection = _useContext7.openConnection;
   var openDeviceSetting = function openDeviceSetting() {
     onItemClick();
     openDeviceSettingDialog({
-      activeTab: _store2.DeviceSettingTab.AUDIO
+      activeTab: _store.DeviceSettingTab.AUDIO
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

package/lib/modules/action-bar/leave/assign-host.d.ts

@@ -1,8 +1,5 @@
 import './index.css';
-import { FcrUserInfo } from 'fcr-core/lib/type';
 interface AssignHostProps {
-    remoteUsers: FcrUserInfo[];
-    assignHost: (user: FcrUserInfo) => void;
     setPopoverOpened: React.Dispatch<React.SetStateAction<boolean>>;
     handleKeepConnect: () => void;
 }

package/lib/modules/action-bar/leave/assign-host.js

@@ -13,12 +13,14 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 require("./index.css");
+var _context2 = require("../context");
 var _chatSelect = require("../../chat/chat-select");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 var AssignHost = exports.AssignHost = (0, _mobxReact.observer)(function (props) {
-  var remoteUsers = props.remoteUsers,
-    assignHost = props.assignHost;
+  var _useContext = (0, _react.useContext)(_context2.ActionBarContext),
+    remoteUsers = _useContext.remoteUsers,
+    assignHost = _useContext.assignHost;
   var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     selected = _useState2[0],

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

@@ -114,13 +114,3 @@
   color: var(--fcr_ui_scene_icontext3);
   cursor: not-allowed;
 }
-.fcr-action-bar--leave-meeting-portal {
-  width: 255px;
-  position: absolute;
-  top: 2px;
-  left: 10px;
-  z-index: 999;
-  background-color: var(--fcr_ui_scene_white10);
-  border-radius: var(--fcr_cornerradius_l);
-  box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
-}

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

@@ -24,14 +24,13 @@ 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 _store = require("../store");
+var _context = require("../context");
 var _type = require("../../../type");
 var _mobxReact = require("mobx-react");
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
@@ -40,27 +39,17 @@ 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)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     localUserRole = _useContext.localUserRole,
-    toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
-    remoteUsers = _useContext.remoteUsers,
-    end = _useContext.end,
-    leave = _useContext.leave,
-    isLocked = _useContext.isLocked,
-    hasAssignHostBeforeLeavingPermission = _useContext.hasAssignHostBeforeLeavingPermission,
-    hasEndRoomPermission = _useContext.hasEndRoomPermission,
-    keepPhoneAudioConnection = _useContext.keepPhoneAudioConnection,
-    isPstnUser = _useContext.isPstnUser,
-    assignHost = _useContext.assignHost,
-    popoverOpened = _useContext.popoverOpened,
-    _setPopoverOpened = _useContext.setPopoverOpened,
-    stateBarLeaveMeeting = _useContext.stateBarLeaveMeeting,
-    setStateBarLeaveMeeting = _useContext.setStateBarLeaveMeeting;
+    toggleLayoutBarLock = _useContext.toggleLayoutBarLock;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     tooltipOpened = _useState2[0],
     setTooltipOpened = _useState2[1];
-  // const [popoverOpened, setPopoverOpened] = useState(false);
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    popoverOpened = _useState4[0],
+    _setPopoverOpened = _useState4[1];
   var popOverRef = (0, _react.useRef)(false);
   var onTooltipChanged = function onTooltipChanged(v) {
     if (!popoverOpened) {
@@ -81,30 +70,6 @@ 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 () {
       /* 修复窗口缩放时，在未经人为操作打开弹窗的情况下，改变窗口大小而触发的打开情形 */
@@ -119,47 +84,32 @@ 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.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
-        },
-        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()]
+  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);
+        }
+      }),
+      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')
+      }))
+    })
   });
 });

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

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

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,15 +18,15 @@ var _actionBarCollapesItems = require("../action-bar-collapes-items");
 var _mobxReact = require("mobx-react");
 require("./index.css");
 var _poppoverContent = require("./poppover-content");
-var _store = require("../store");
+var _context = require("../context");
 var _dropMenu = require("../security/drop-menu");
-var _appitems = require("../apps/appitems");
+var _store = require("../store");
 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;
   var _useContext2 = (0, _react.useContext)(_actionBarCollapesItems.actionBarCollapseContext),
@@ -39,10 +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)(_dropMenu.SecurityMenu, {})), _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 () {