fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/modules/components/device-control/components/video-menu/index.js

@@ -26,7 +26,9 @@ var VideoMenu = (0, _mobxReact.observer)(function (_ref) {
     openDeviceSettingDialog = _useContext.openDeviceSettingDialog,
     cameraList = _useContext.cameraList,
     cameraId = _useContext.cameraId,
-    setCameraId = _useContext.setCameraId;
+    setCameraId = _useContext.setCameraId,
+    isBeautyModeAbilitySupported = _useContext.isBeautyModeAbilitySupported,
+    isVirtualBackgroundSupported = _useContext.isVirtualBackgroundSupported;
   var cameraOptions = cameraList.map(function (device) {
     return {
       text: device.deviceName,
@@ -79,13 +81,13 @@ var VideoMenu = (0, _mobxReact.observer)(function (_ref) {
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-device-popover-content-more",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      children: [isVirtualBackgroundSupported && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "fcr-device-popover-content-more-item",
         onClick: function onClick() {
           return openDeviceSetting('virtual-background');
         },
         children: transI18n('fmt_device_label_video_list_selectVirtualBackground')
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      }), isBeautyModeAbilitySupported && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "fcr-device-popover-content-more-item",
         onClick: function onClick() {
           return openDeviceSetting('beauty-filter');

package/lib/modules/components/device-control/store.base.d.ts

@@ -2,18 +2,23 @@ import { ConnectionTabType } from '../../video-window/type';
 import { DeviceControlStoreArgs } from './type';
 import { FcrUIDeviceProvider } from '../../../providers/device-provider';
 import { DeviceSettingDialogConfig } from '../../setting/type';
+import { FcrUIAbilityProvider } from '../../../providers/ability-provider';
 export declare abstract class DeviceControlStoreBase {
     protected _deviceProvider: FcrUIDeviceProvider;
     private _roomControl;
     private _dialogProvider;
     private _facilityProvider;
     private _sharedSettingDataSource;
+    protected _abilityProvider: FcrUIAbilityProvider;
     private _streamControlObserver;
     accessor isPstnUser: boolean;
     accessor phoneMicEnabled: boolean;
     get microphoneId(): string | null;
     get speakerId(): string;
     get speakerList(): import("agora-rte-sdk").AgoraRtcDeviceInfo[];
+    get isCallOutAbilitySupported(): boolean;
+    get isVirtualBackgroundSupported(): boolean;
+    get isBeautyModeAbilitySupported(): boolean;
     get microphoneEnabled(): boolean;
     get microphoneState(): import("../../../type").FcrUIMicrophoneState;
     get microphoneDetecting(): boolean;

package/lib/modules/components/device-control/store.base.js

@@ -87,6 +87,7 @@ var DeviceControlStoreBase = exports.DeviceControlStoreBase = /*#__PURE__*/funct
     _classPrivateFieldInitSpec(this, _B, _init_phoneMicEnabled(this, false));
     this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
     this._deviceProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DEVICE_PROVIDER);
+    this._abilityProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_ABILITY_PROVIDER);
     this._facilityProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_FACILITY_PROVIDER);
     var currentRoomProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_CURRENT_ROOM_CONTROL_PROVIDER);
     this._sharedSettingDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
@@ -124,6 +125,21 @@ var DeviceControlStoreBase = exports.DeviceControlStoreBase = /*#__PURE__*/funct
     get: function get() {
       return this._deviceProvider.speakerList;
     }
+  }, {
+    key: "isCallOutAbilitySupported",
+    get: function get() {
+      return this._abilityProvider.isCallOutAbilitySupported();
+    }
+  }, {
+    key: "isVirtualBackgroundSupported",
+    get: function get() {
+      return this._abilityProvider.isVirtualBackgroundSupported();
+    }
+  }, {
+    key: "isBeautyModeAbilitySupported",
+    get: function get() {
+      return this._abilityProvider.isBeautyModeAbilitySupported();
+    }
   }, {
     key: "microphoneEnabled",
     get: function get() {
@@ -242,7 +258,7 @@ var DeviceControlStoreBase = exports.DeviceControlStoreBase = /*#__PURE__*/funct
   }]);
 }();
 _DeviceControlStoreBase = DeviceControlStoreBase;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_DeviceControlStoreBase, [[_mobx.observable, 1, "isPstnUser"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.computed, 3, "microphoneId"], [_mobx.computed, 3, "speakerId"], [_mobx.computed, 3, "speakerList"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "microphoneState"], [_mobx.computed, 3, "microphoneDetecting"], [_mobx.computed, 3, "cameraId"], [_mobx.computed, 3, "cameraEnabled"], [_mobx.computed, 3, "microphoneVolumeLevel"], [_mobx.computed, 3, "microphoneList"], [_mobx.computed, 3, "cameraList"], [_mobx.computed, 3, "connectType"], [_openDeviceSettingDialogDecs, 18, "openDeviceSettingDialog"], [_openConnectionDecs, 18, "openConnection"], [_closeConnectionDecs, 18, "closeConnection"], [_checkMediaPermissionDecs, 18, "checkMediaPermission"], [_setSpeakerIdDecs, 18, "setSpeakerId"], [_setMicrophoneIdDecs, 18, "setMicrophoneId"], [_setCameraIdDecs, 18, "setCameraId"], [_decorator.bound, 2, "stopAudioByComputer"], [_decorator.bound, 2, "release"], [_decorator.bound, 2, "_handleStreamUpdate"]], []).e, 3);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_DeviceControlStoreBase, [[_mobx.observable, 1, "isPstnUser"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.computed, 3, "microphoneId"], [_mobx.computed, 3, "speakerId"], [_mobx.computed, 3, "speakerList"], [_mobx.computed, 3, "isCallOutAbilitySupported"], [_mobx.computed, 3, "isVirtualBackgroundSupported"], [_mobx.computed, 3, "isBeautyModeAbilitySupported"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "microphoneState"], [_mobx.computed, 3, "microphoneDetecting"], [_mobx.computed, 3, "cameraId"], [_mobx.computed, 3, "cameraEnabled"], [_mobx.computed, 3, "microphoneVolumeLevel"], [_mobx.computed, 3, "microphoneList"], [_mobx.computed, 3, "cameraList"], [_mobx.computed, 3, "connectType"], [_openDeviceSettingDialogDecs, 18, "openDeviceSettingDialog"], [_openConnectionDecs, 18, "openConnection"], [_closeConnectionDecs, 18, "closeConnection"], [_checkMediaPermissionDecs, 18, "checkMediaPermission"], [_setSpeakerIdDecs, 18, "setSpeakerId"], [_setMicrophoneIdDecs, 18, "setMicrophoneId"], [_setCameraIdDecs, 18, "setCameraId"], [_decorator.bound, 2, "stopAudioByComputer"], [_decorator.bound, 2, "release"], [_decorator.bound, 2, "_handleStreamUpdate"]], []).e, 3);
 _init_isPstnUser = _applyDecs$e[0];
 _init_phoneMicEnabled = _applyDecs$e[1];
 _initProto = _applyDecs$e[2];

package/lib/modules/components/leave-meeting/index.css

@@ -0,0 +1,21 @@
+.fcr-end-meeting-container {
+  position: relative;
+  padding: 8px 20px 20px;
+  max-height: 368px;
+}
+
+.fcr-end-meeting-title {
+  width: 100%;
+  height: 39px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  font-family: Verdana;
+  font-size: 14px;
+  font-weight: 700;
+  line-height: 18.2px;
+  text-align: center;
+
+  color: var(--fcr_ui_scene_icontext1, rgba(255, 255, 255, 1));
+}

package/lib/modules/components/leave-meeting/index.d.ts

@@ -1,5 +1,3 @@
 export declare const LeaveMeeting: (props: {
     setPopoverOpened?: React.Dispatch<React.SetStateAction<boolean>>;
-    onAssigned?: () => void;
-    onLeave?: () => void;
 }) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/components/leave-meeting/index.js

@@ -1,26 +1,21 @@
 "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.LeaveMeeting = void 0;
 var _fcrCore = require("fcr-core");
-var _assignHost2 = require("./components/assign-host");
-var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
-var _classnames = _interopRequireDefault(require("classnames"));
+var _assignHost = require("./components/assign-host");
 var _mobxReact = require("mobx-react");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _react = require("react");
 var _store = require("./store.base");
-var _button = require("agora-ui-foundation/lib/components/button");
+var _confirmWrapper = require("../confirm-wrapper");
 var _jsxRuntime = require("react/jsx-runtime");
 var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (props) {
   var t = (0, _i18n.useI18n)();
-  var _setPopoverOpened = props.setPopoverOpened,
-    onAssigned = props.onAssigned,
-    onLeave = props.onLeave;
+  var setPopoverOpened = props.setPopoverOpened;
   var _useContext = (0, _react.useContext)(_store.LeaveMeetingStoreContext),
     canAssign = _useContext.canAssign,
     keepConnect = _useContext.keepConnect,
@@ -30,16 +25,18 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
     hasEndRoomPermission = _useContext.hasEndRoomPermission,
     isPstnUser = _useContext.isPstnUser,
     loading = _useContext.loading,
-    leave = _useContext.leave,
-    _assignHost = _useContext.assignHost,
+    exitMeeting = _useContext.exitMeeting,
+    assignHost = _useContext.assignHost,
     setCanAssign = _useContext.setCanAssign,
     setKeepConnect = _useContext.setKeepConnect,
     isAssignHostAvailable = _useContext.isAssignHostAvailable,
     showEndConfirmDialog = _useContext.showEndConfirmDialog;
-
+  var closePopover = function closePopover() {
+    setPopoverOpened === null || setPopoverOpened === void 0 || setPopoverOpened(false);
+  };
   // 结束会议
   var handleEnd = function handleEnd() {
-    _setPopoverOpened === null || _setPopoverOpened === void 0 || _setPopoverOpened(false);
+    closePopover();
     showEndConfirmDialog();
   };
 
@@ -48,109 +45,72 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
     if (hostAvailibleRemoteUsers.length > 0 && isAssignHostAvailable) {
       setCanAssign(true);
     } else {
-      leave();
-      _setPopoverOpened === null || _setPopoverOpened === void 0 || _setPopoverOpened(false);
-      onLeave === null || onLeave === void 0 || onLeave();
+      leaveMeeting();
     }
   };
-  var handleConfirm = function handleConfirm() {
-    _setPopoverOpened === null || _setPopoverOpened === void 0 || _setPopoverOpened(false);
-    leave();
-    onLeave === null || onLeave === void 0 || onLeave();
+  var leaveMeeting = function leaveMeeting() {
+    closePopover();
+    exitMeeting();
   };
   var handleCancel = function handleCancel() {
-    _setPopoverOpened === null || _setPopoverOpened === void 0 || _setPopoverOpened(false);
+    closePopover();
   };
   (0, _react.useEffect)(function () {
     return setCanAssign(false);
   }, []);
   if (localUserRole === _fcrCore.FcrUserRole.HOST) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      children: canAssign ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_assignHost2.AssignHost, {
-        setPopoverOpened: function setPopoverOpened() {
-          return _setPopoverOpened === null || _setPopoverOpened === void 0 ? void 0 : _setPopoverOpened(false);
-        },
-        setCanAssign: setCanAssign,
-        remoteUsers: hostAvailibleRemoteUsers,
-        assignHost: function assignHost(user) {
-          _assignHost(user);
-          onAssigned === null || onAssigned === void 0 || onAssigned();
+    return canAssign ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_assignHost.AssignHost, {
+      setPopoverOpened: closePopover,
+      setCanAssign: setCanAssign,
+      remoteUsers: hostAvailibleRemoteUsers,
+      assignHost: assignHost,
+      loading: loading
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmWrapper.ConfirmWrapper, {
+      title: t('fmt_actionbar_labels_endmeeting'),
+      checkboxProps: {
+        label: t('fmt_pstn_status_maitain'),
+        checked: keepConnect,
+        onChange: function onChange(checked) {
+          return setKeepConnect(checked);
         },
-        loading: loading
-      }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "leave-container",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "leave-title",
-          children: t('fmt_actionbar_labels_endmeeting')
-        }), isPstnUser && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "leave-connect-check",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-            label: t('fmt_pstn_status_maitain'),
-            checked: keepConnect,
-            onChange: function onChange(checked) {
-              return setKeepConnect(checked);
-            }
-          })
-        }), hasEndRoomPermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
-          styleType: "danger",
-          size: "S",
-          shape: "rounded",
-          className: (0, _classnames["default"])('leave-confirm', {
-            'leave-confirm-disabled': keepConnect
-          }),
-          onClick: !keepConnect ? handleEnd : undefined,
-          children: t('fmt_popup_button_endmeeting')
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "leave-cancel",
-          onClick: function onClick(e) {
-            e.stopPropagation();
-            handleLeave();
-          },
-          children: t('fmt_popup_button_leavemeeting')
-        })]
-      })
+        isHidden: !isPstnUser
+      },
+      confirmBtnProps: {
+        text: t('fmt_popup_button_endmeeting'),
+        onClick: !keepConnect ? handleEnd : undefined,
+        disabled: keepConnect,
+        isHidden: !hasEndRoomPermission
+      },
+      secondaryConfirmBtnProps: {
+        text: t('fmt_popup_button_leavemeeting'),
+        onClick: function onClick(e) {
+          e === null || e === void 0 || e.stopPropagation();
+          handleLeave();
+        }
+      }
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "leave-container"
-      // TODO: 是否需要
-      // onMouseEnter={() => {
-      //   window.runtime?.browserWindow?.setIgnoreMouseEvents(false);
-      // }}
-      ,
-      onBlur: function onBlur() {
-        _setPopoverOpened === null || _setPopoverOpened === void 0 || _setPopoverOpened(false);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmWrapper.ConfirmWrapper, {
+    onBlur: function onBlur() {
+      setPopoverOpened === null || setPopoverOpened === void 0 || setPopoverOpened(false);
+    },
+    title: isLocked ? t('fmt_actionbar_tips_locked') : t('fmt_actionbar_tips_leavemeeting'),
+    description: isLocked ? t('fmt_actionbar_tips_recheckleave') : undefined,
+    checkboxProps: {
+      label: t('fmt_pstn_status_maitain'),
+      checked: keepConnect,
+      onChange: function onChange(checked) {
+        return setKeepConnect(checked);
       },
-      children: [isLocked ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "assistant-leave-lock-info",
-          children: t('fmt_actionbar_tips_locked')
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "assistant-lock-leave-title",
-          children: t('fmt_actionbar_tips_recheckleave')
-        })]
-      }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "leave-title",
-        children: t('fmt_actionbar_tips_leavemeeting')
-      }), isPstnUser && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "leave-connect-check",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-          label: t('fmt_pstn_status_maitain'),
-          checked: keepConnect,
-          onChange: function onChange(checked) {
-            return setKeepConnect(checked);
-          }
-        })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "leave-confirm",
-        onClick: handleConfirm,
-        children: t('fmt_actionbar__button_leaveyes')
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "leave-cancel",
-        onClick: handleCancel,
-        children: t('fmt_actionbar__button_leaveno')
-      })]
-    })
+      isHidden: !isPstnUser
+    },
+    confirmBtnProps: {
+      text: t('fmt_actionbar__button_leaveyes'),
+      onClick: leaveMeeting
+    },
+    cancelBtnProps: {
+      text: t('fmt_actionbar__button_leaveno'),
+      onClick: handleCancel
+    }
   });
 });

package/lib/modules/components/leave-meeting/portal.d.ts

@@ -2,5 +2,4 @@ import { PropsWithChildren } from 'react';
 import './style.css';
 export declare const LeaveMeetingPortal: (props: PropsWithChildren<{
     setPopoverOpened?: React.Dispatch<React.SetStateAction<boolean>>;
-    onLeave?: () => void;
 }>) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/components/leave-meeting/portal.js

@@ -6,24 +6,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.LeaveMeetingPortal = void 0;
 var _ = require(".");
-var _platform = require("../../../utilities/platform");
+var _env = require("agora-foundation/lib/utilities/env");
 require("./style.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var LeaveMeetingPortal = exports.LeaveMeetingPortal = function LeaveMeetingPortal(props) {
   var setPopoverOpened = props.setPopoverOpened,
-    children = props.children,
-    onLeave = props.onLeave;
+    children = props.children;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "fcr-action-bar--leave-meeting-portal",
     id: "fcr-action-bar--leave-meeting-portal",
-    style: (0, _platform.isWindows)() ? {
+    style: (0, _env.isWindows)() ? {
       right: '10px'
     } : {
       left: '10px'
     },
     children: children || /*#__PURE__*/(0, _jsxRuntime.jsx)(_.LeaveMeeting, {
-      setPopoverOpened: setPopoverOpened,
-      onLeave: onLeave
+      setPopoverOpened: setPopoverOpened
     })
   });
 };

package/lib/modules/components/leave-meeting/store.base.d.ts

@@ -24,13 +24,12 @@ export declare abstract class LeaveMeetingStoreBase {
     showEndConfirmDialog(): void;
     abstract isHostSupportedByPlatform(platform: FcrPlatform): boolean;
     assignHost(user: FcrUserInfo): void;
-    setIsSelfEndMeeting(value: boolean): void;
-    leave(): Promise<void>;
+    endMeeting(): Promise<void>;
+    exitMeeting(): Promise<void>;
     resetPreventClose(): void;
-    keepPhoneAudioConnection(): Promise<void>;
+    private _keepPhoneAudioConnection;
     setCanAssign(value: boolean): void;
     setKeepConnect(value: boolean): void;
-    end(): Promise<void>;
     release(): void;
     private _checkIfQuitFullScreen;
 }

package/lib/modules/components/leave-meeting/store.base.js

@@ -61,7 +61,7 @@ var _objectManager = require("../../../object-manager");
 var _env = require("agora-foundation/lib/utilities/env");
 var _imports = require("fcr-core/lib/imports");
 var _LeaveMeetingStoreBase;
-var _initProto, _init_keepConnect, _init_canAssign, _init_loading, _showEndConfirmDialogDecs, _assignHostDecs, _setIsSelfEndMeetingDecs, _leaveDecs, _keepPhoneAudioConnectionDecs, _setCanAssignDecs, _setKeepConnectDecs, _endDecs, _ref;
+var _initProto, _init_keepConnect, _init_canAssign, _init_loading, _showEndConfirmDialogDecs, _assignHostDecs, _endMeetingDecs, _exitMeetingDecs, _keepPhoneAudioConnectionDecs, _setCanAssignDecs, _setKeepConnectDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -75,7 +75,7 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
-_ref = (_showEndConfirmDialogDecs = [_mobx.action, _mobx.action.bound], _assignHostDecs = [_mobx.action, _mobx.action.bound], _setIsSelfEndMeetingDecs = [_mobx.action, _mobx.action.bound], _leaveDecs = [_mobx.action, _mobx.action.bound], _keepPhoneAudioConnectionDecs = [_mobx.action, _mobx.action.bound], _setCanAssignDecs = [_mobx.action, _mobx.action.bound], _setKeepConnectDecs = [_mobx.action, _mobx.action.bound], _endDecs = [_mobx.action, _mobx.action.bound], "_roomControl");
+_ref = (_showEndConfirmDialogDecs = [_mobx.action, _mobx.action.bound], _assignHostDecs = [_mobx.action, _mobx.action.bound], _endMeetingDecs = [_mobx.action, _mobx.action.bound], _exitMeetingDecs = [_mobx.action, _mobx.action.bound], _keepPhoneAudioConnectionDecs = [_mobx.action, _mobx.action.bound], _setCanAssignDecs = [_mobx.action, _mobx.action.bound], _setKeepConnectDecs = [_mobx.action, _mobx.action.bound], "_roomControl");
 var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/function () {
   function LeaveMeetingStoreBase(_ref2) {
     var objectManager = _ref2.objectManager;
@@ -143,52 +143,70 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
   }, {
     key: "showEndConfirmDialog",
     value: function showEndConfirmDialog() {
-      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.LEAVE_MEETING);
+      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONFIRM_END_MEETING);
     }
   }, {
     key: "assignHost",
     value: function assignHost(user) {
       this._userControl.updateRemoteUserRole(user.userId, _type.FcrUserRole.HOST);
-      this.leave();
+      this.exitMeeting();
     }
   }, {
-    key: "setIsSelfEndMeeting",
-    value: function setIsSelfEndMeeting(value) {
-      this._roomProvider.setIsSelfEndMeeting(value);
-    }
-  }, {
-    key: "leave",
+    key: "endMeeting",
     value: function () {
-      var _leave = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var _t;
+      var _endMeeting = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 1;
               return this._checkIfQuitFullScreen();
+            case 1:
+              this._roomProvider.closeRoom();
+              this.resetPreventClose();
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function endMeeting() {
+        return _endMeeting.apply(this, arguments);
+      }
+      return endMeeting;
+    }()
+  }, {
+    key: "exitMeeting",
+    value: function () {
+      var _exitMeeting = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+        var _t;
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 1;
+              return this._checkIfQuitFullScreen();
             case 1:
               this.loading = true;
               _t = this.keepConnect && this.isPstnUser;
               if (!_t) {
-                _context.next = 2;
+                _context2.next = 2;
                 break;
               }
-              _context.next = 2;
-              return this.keepPhoneAudioConnection();
+              _context2.next = 2;
+              return this._keepPhoneAudioConnection();
             case 2:
               this.loading = false;
               this._roomProvider.exitRoom();
               this.resetPreventClose();
             case 3:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
-      function leave() {
-        return _leave.apply(this, arguments);
+      function exitMeeting() {
+        return _exitMeeting.apply(this, arguments);
       }
-      return leave;
+      return exitMeeting;
     }() // TODO 等候室和主窗口的scene不需要有父store
     // 并且这里的base命名会和现在base/Electron/Browser 冲突，会让人以为是解决平台的逻辑
   }, {
@@ -206,23 +224,23 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
       }
     }
   }, {
-    key: "keepPhoneAudioConnection",
+    key: "_keepPhoneAudioConnection",
     value: function () {
-      var _keepPhoneAudioConnection = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        return _regenerator["default"].wrap(function (_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _keepPhoneAudioConnection2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+        return _regenerator["default"].wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              return _context2.abrupt("return", this._streamControl.splitAudioStream(this.localUserId));
+              return _context3.abrupt("return", this._streamControl.splitAudioStream(this.localUserId));
             case 1:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
-      function keepPhoneAudioConnection() {
-        return _keepPhoneAudioConnection.apply(this, arguments);
+      function _keepPhoneAudioConnection() {
+        return _keepPhoneAudioConnection2.apply(this, arguments);
       }
-      return keepPhoneAudioConnection;
+      return _keepPhoneAudioConnection;
     }()
   }, {
     key: "setCanAssign",
@@ -234,30 +252,6 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
     value: function setKeepConnect(value) {
       this.keepConnect = value;
     }
-  }, {
-    key: "end",
-    value: function () {
-      var _end = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-        return _regenerator["default"].wrap(function (_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 1;
-              return this._checkIfQuitFullScreen();
-            case 1:
-              this._roomControl.close();
-              this._roomProvider.exitRoom();
-              this.resetPreventClose();
-            case 2:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function end() {
-        return _end.apply(this, arguments);
-      }
-      return end;
-    }()
   }, {
     key: "release",
     value: function release() {}
@@ -298,7 +292,7 @@ var LeaveMeetingStoreBase = exports.LeaveMeetingStoreBase = /*#__PURE__*/functio
   }]);
 }();
 _LeaveMeetingStoreBase = LeaveMeetingStoreBase;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LeaveMeetingStoreBase, [[_mobx.observable, 1, "keepConnect"], [_mobx.observable, 1, "canAssign"], [_mobx.observable, 1, "loading"], [_mobx.computed, 3, "isAssignHostAvailable"], [_showEndConfirmDialogDecs, 18, "showEndConfirmDialog"], [_assignHostDecs, 18, "assignHost"], [_setIsSelfEndMeetingDecs, 18, "setIsSelfEndMeeting"], [_leaveDecs, 18, "leave"], [_keepPhoneAudioConnectionDecs, 18, "keepPhoneAudioConnection"], [_setCanAssignDecs, 18, "setCanAssign"], [_setKeepConnectDecs, 18, "setKeepConnect"], [_endDecs, 18, "end"]], []).e, 4);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LeaveMeetingStoreBase, [[_mobx.observable, 1, "keepConnect"], [_mobx.observable, 1, "canAssign"], [_mobx.observable, 1, "loading"], [_mobx.computed, 3, "isAssignHostAvailable"], [_showEndConfirmDialogDecs, 18, "showEndConfirmDialog"], [_assignHostDecs, 18, "assignHost"], [_endMeetingDecs, 18, "endMeeting"], [_exitMeetingDecs, 18, "exitMeeting"], [_keepPhoneAudioConnectionDecs, 18, "_keepPhoneAudioConnection"], [_setCanAssignDecs, 18, "setCanAssign"], [_setKeepConnectDecs, 18, "setKeepConnect"]], []).e, 4);
 _init_keepConnect = _applyDecs$e[0];
 _init_canAssign = _applyDecs$e[1];
 _init_loading = _applyDecs$e[2];

package/lib/modules/components/leave-meeting/style.css

@@ -1,5 +1,4 @@
 .fcr-action-bar--leave-meeting-portal {
-  width: 280px;
   position: absolute;
   top: 2px;
   z-index: 999;

package/lib/modules/components/member-window/components/member-actions/components/more-actions.js

@@ -26,7 +26,7 @@ var _participantsMore = require("agora-ui-foundation/lib/components/participants
 var _fcrCore = require("fcr-core");
 var _provider = require("../provider");
 var _mobxReact = require("mobx-react");
-var _muteAction = require("../../../../../../utilities/mute-action");
+var _muteAction = require("agora-ui-foundation/lib/utilities/mute-action");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var EMPTY_HIDE_ACTIONS = [];
@@ -89,6 +89,7 @@ var MoreActions = exports.MoreActions = (0, _mobxReact.observer)(function (_ref)
     store.muteAudio(store.hasMicrophoneAudioStream, store.userId);
   };
   var onParticipantsButtonClick = (0, _react.useCallback)(function (action, userId) {
+    onVisibleChange(false);
     store.sendParticipantEvent({
       action: action,
       userId: userId

package/lib/modules/components/member-window/components/member-actions/provider.js

@@ -21,7 +21,7 @@ require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _store = require("./store");
-var _hooks = require("../../../../../utilities/hooks");
+var _hooks = require("agora-ui-foundation/lib/utilities/hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var HideControlsTimeout = 3000;

package/lib/modules/components/member-window/index.d.ts

@@ -1,5 +1,5 @@
-import './index.css';
 import { FcrRoomConnectorType } from 'fcr-core';
+import './index.css';
 import { MemberWindowProps } from './types';
 export declare const MinAvatarSize = 53;
 export declare const MaxAvatarSize = 175;

package/lib/modules/components/member-window/index.js

@@ -34,16 +34,16 @@ require("core-js/modules/esnext.set.symmetric-difference.js");
 require("core-js/modules/esnext.set.union.v2.js");
 require("core-js/modules/esnext.set.union.js");
 require("core-js/modules/web.dom-collections.iterator.js");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _mobxReact = require("mobx-react");
 var _avatar = require("agora-ui-foundation/lib/components/avatar");
 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 _i18n = require("agora-ui-foundation/lib/i18n");
-require("./index.css");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _fcrCore = require("fcr-core");
+var _mobxReact = require("mobx-react");
 var _videoPlayer = require("./components/video-player");
+require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 var MinAvatarSize = exports.MinAvatarSize = 53;
 var MaxAvatarSize = exports.MaxAvatarSize = 175;