fcr-ui-scene 3.4.4 → 3.5.0

package/lib/modules/chat/view.js

@@ -16,32 +16,13 @@ require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.unshift.js");
-require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.for-each.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.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
-require("core-js/modules/esnext.map.delete-all.js");
-require("core-js/modules/esnext.map.emplace.js");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-require("core-js/modules/esnext.map.merge.js");
-require("core-js/modules/esnext.map.reduce.js");
-require("core-js/modules/esnext.map.some.js");
-require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -55,17 +36,16 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _react = require("react");
 var _chatBar = require("./components/chat-bar");
 var _type = require("../../type");
+var _type2 = require("fcr-core/lib/type");
 var _util = require("./util");
 var _copyText = require("../../utilities/copyText");
-var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
+var _type3 = require("fcr-core/lib/room-control/chatroom-control/type");
 var _fcrCore = require("fcr-core");
-var _tabs = require("agora-ui-foundation/lib/components/tabs");
-var _fcr_chat_reddot = _interopRequireDefault(require("../../../public/assets/fcr_chat_reddot.svg"));
-var _type3 = require("fcr-core/lib/room-control/type");
 var _types = require("./types");
+var _chatTabs = _interopRequireDefault(require("./components/chat-tabs"));
 var _jsxRuntime = require("react/jsx-runtime");
 var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
-  var _chatRoomStores$FcrRo, _chatRoomStores$FcrRo2, _chatRoomStores$FcrRo3, _chatRoomStores$FcrRo4, _chatRoomStores$FcrRo5, _chatRoomStores$FcrRo6, _chatRoomStores$FcrRo7;
+  var _chatRoomStores$FcrUI;
   var updateReadIndex = _ref.updateReadIndex,
     sendMsg = _ref.sendMsg,
     localUserId = _ref.userId,
@@ -74,22 +54,21 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   var t = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     chatRoomStores = _useContext.chatRoomStores,
-    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
     activeTabIndex = _useContext.activeTabIndex,
-    handlerActiveTab = _useContext.handlerActiveTab;
+    copyMap = _useContext.copyMap,
+    clearCopyMap = _useContext.clearCopyMap;
   var defaultProps = {
     errorMsg: t('fmt_chat_tips_exceedlimit'),
     forbiddenTxt: t('fmt_chat_button_muteall'),
     styles: {
       display: 'flex',
-      height: (_chatRoomStores$FcrRo = chatRoomStores[_type3.FcrRoomType.Waitingroom]) !== null && _chatRoomStores$FcrRo !== void 0 && _chatRoomStores$FcrRo.userCount || 0 > 0 ? 'calc(100% - 28px)' : '100%'
+      height: (_chatRoomStores$FcrUI = chatRoomStores[_type.FcrUIRoomType.WAITING_ROOM]) !== null && _chatRoomStores$FcrUI !== void 0 && _chatRoomStores$FcrUI.userCount || 0 > 0 ? 'calc(100% - 28px)' : '100%'
     }
   };
   var styles = defaultProps.styles,
     forbiddenTxt = defaultProps.forbiddenTxt,
     errorMsg = defaultProps.errorMsg;
   var _ref2 = chatRoomStores[activeTabIndex],
-    setTargetUser = _ref2.setTargetUser,
     privateTargetUser = _ref2.privateTargetUser,
     remoteUsers = _ref2.remoteUsers,
     targetUserIsOnline = _ref2.targetUserIsOnline,
@@ -98,44 +77,32 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     messageList = _ref2.messageList,
     textMsg = _ref2.textMsg,
     updateChatTextMsg = _ref2.updateChatTextMsg,
-    privateTargetList = _ref2.privateTargetList,
     resetTargetUser = _ref2.resetTargetUser,
     handleToast = _ref2.handleToast,
     chatRoomState = _ref2.chatRoomState,
     isHost = _ref2.isHost,
-    hasChatPermission = _ref2.hasChatPermission,
+    hasChatSendPublicPermission = _ref2.hasChatSendPublicPermission,
     hasChatSendPrivatePermission = _ref2.hasChatSendPrivatePermission,
     filterChatMember = _ref2.filterChatMember,
-    hasSendMessagePermission = _ref2.hasSendMessagePermission,
-    hasSendAllPermission = _ref2.hasSendAllPermission;
-  var handleTargetChange = function handleTargetChange(user) {
-    setTargetUser(user);
-  };
+    hasSendMessagePermission = _ref2.hasSendMessagePermission;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     multiSelectActive = _useState2[0],
     setMultiSelectActive = _useState2[1];
-  var _useState3 = (0, _react.useState)(new Map()),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    copyMap = _useState4[0],
-    setCopyMap = _useState4[1];
-  var _useState5 = (0, _react.useState)(0),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    selectCnt = _useState6[0],
-    setSelectCnt = _useState6[1];
   var targetList = (0, _react.useMemo)(function () {
     var _users$;
     var users = (0, _toConsumableArray2["default"])(remoteUsers);
     if (((_users$ = users[0]) === null || _users$ === void 0 ? void 0 : _users$.userId) === _types.USER_ALL) {
-      if (!hasSendAllPermission) {
+      if (!hasChatSendPublicPermission) {
         users.shift();
       }
-    } else if (hasSendAllPermission) {
+    } else if (hasChatSendPublicPermission) {
       users.unshift({
         userId: _types.USER_ALL,
         userName: t('fmt_chat_option_all'),
         userRole: _type.FcrUserRole.ROBOT,
-        connectorType: _fcrCore.FcrRoomConnectorType.NONE
+        connectorType: _fcrCore.FcrRoomConnectorType.NONE,
+        platform: _type2.FcrPlatform.WEB_DESKTOP
       });
     }
     users = users.filter(function (user) {
@@ -151,7 +118,7 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     });
     users = filterChatMember(users);
     return users;
-  }, [chatLevel, remoteUsers, activeTabIndex, hasChatPermission, hasChatSendPrivatePermission]);
+  }, [chatLevel, remoteUsers, activeTabIndex, hasChatSendPublicPermission, hasChatSendPrivatePermission]);
   var handleMultiCopyMsg = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var msgHandled, msgIndex;
@@ -191,16 +158,10 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  (0, _react.useEffect)(function () {
-    setSelectCnt(copyMap.size);
-  }, [copyMap.size]);
   var resetMultiSelectStates = function resetMultiSelectStates() {
     setMultiSelectActive(false);
-    copyMap.clear();
-    setCopyMap(copyMap);
-    setSelectCnt(0);
+    clearCopyMap();
   };
-  var chatSelectNoTitle = localIsManager || chatLevel === 'everyone' || chatLevel === 'no_one';
   var copyTips = function copyTips() {
     handleToast({
       id: 'copy-multi-msg',
@@ -212,50 +173,15 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "chat-tabs-container",
-      children: chatRoomStores[_type3.FcrRoomType.Waitingroom] && chatRoomStores[_type3.FcrRoomType.Mainroom] && chatRoomStores[_type3.FcrRoomType.Waitingroom].userCount > 0 ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabs.FcrTabs, {
-        items: [{
-          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-            className: "chat-container-icon",
-            children: [((_chatRoomStores$FcrRo2 = chatRoomStores[_type3.FcrRoomType.Mainroom]) === null || _chatRoomStores$FcrRo2 === void 0 ? void 0 : _chatRoomStores$FcrRo2.unReadMsgCount) > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              className: "fcr-action-bar-chat-unread-count",
-              children: ((_chatRoomStores$FcrRo3 = chatRoomStores[_type3.FcrRoomType.Mainroom]) === null || _chatRoomStores$FcrRo3 === void 0 ? void 0 : _chatRoomStores$FcrRo3.unReadMsgCount) > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-                src: _fcr_chat_reddot["default"]
-              }) : (_chatRoomStores$FcrRo4 = chatRoomStores[_type3.FcrRoomType.Mainroom]) === null || _chatRoomStores$FcrRo4 === void 0 ? void 0 : _chatRoomStores$FcrRo4.unReadMsgCount
-            }), t('fmt_waitingroom_sidebar_chat_label_meeting', {
-              reason1: chatRoomStores[_type3.FcrRoomType.Mainroom].userCount
-            })]
-          }),
-          key: "".concat(_type3.FcrRoomType.Mainroom)
-        }, {
-          label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-            className: "chat-container-icon",
-            children: [((_chatRoomStores$FcrRo5 = chatRoomStores[_type3.FcrRoomType.Waitingroom]) === null || _chatRoomStores$FcrRo5 === void 0 ? void 0 : _chatRoomStores$FcrRo5.unReadMsgCount) > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              className: "fcr-action-bar-chat-unread-count",
-              children: ((_chatRoomStores$FcrRo6 = chatRoomStores[_type3.FcrRoomType.Waitingroom]) === null || _chatRoomStores$FcrRo6 === void 0 ? void 0 : _chatRoomStores$FcrRo6.unReadMsgCount) > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
-                src: _fcr_chat_reddot["default"]
-              }) : (_chatRoomStores$FcrRo7 = chatRoomStores[_type3.FcrRoomType.Waitingroom]) === null || _chatRoomStores$FcrRo7 === void 0 ? void 0 : _chatRoomStores$FcrRo7.unReadMsgCount
-            }), t('fmt_waitingroom_sidebar_label_waiting', {
-              reason1: chatRoomStores[_type3.FcrRoomType.Waitingroom].userCount
-            })]
-          }),
-          key: "".concat(_type3.FcrRoomType.Waitingroom)
-        }],
-        activeKey: "".concat(activeTabIndex),
-        onChange: function onChange(key) {
-          handlerActiveTab(key);
-        }
-      }) : null
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatWrapper.ChatWrapper, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_chatTabs["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatWrapper.ChatWrapper, {
       styles: styles,
       errorMsg: errorMsg,
       forbiddenTxt: forbiddenTxt,
       singling: singling,
-      forbidden: !localIsManager && !hasChatPermission && !hasChatSendPrivatePermission,
+      forbidden: !localIsManager && !hasChatSendPublicPermission && !hasChatSendPrivatePermission,
       isHost: isHost,
       handMsg: function handMsg(msg) {
-        if (chatRoomState !== _type2.FcrChatRoomConnectionState.Connected) {
+        if (chatRoomState !== _type3.FcrChatRoomConnectionState.Connected) {
           handleToast({
             id: 'send-msg-offline',
             toastProps: {
@@ -297,7 +223,7 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
           //   return;
           // }
 
-          if (privateTargetUser.userId === _types.USER_ALL && !hasSendMessagePermission()) {
+          if (privateTargetUser.userId === _types.USER_ALL && !hasSendMessagePermission) {
             handleToast({
               id: 'send-msg-to-none',
               toastProps: {
@@ -324,19 +250,13 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
       },
       handleClickUploadImage: handleClickUploadImage,
       msgBarElement: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatBar.MessageBar, {
-        selectedUser: privateTargetUser,
-        users: targetList,
-        onTargetChange: handleTargetChange,
-        title: chatSelectNoTitle ? undefined : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "assign-host-title",
-          children: chatLevel === 'public' ? t('fmt_chat_option_onlypublic') : t('fmt_chat_option_onlyprivate')
-        })
+        users: targetList
       }),
       targetUserIsOnline: targetUserIsOnline,
       privateTarget: privateTargetUser.userId,
       selectTargetNickname: privateTargetUser.userName,
       multiSelectActive: multiSelectActive,
-      selectCnt: selectCnt,
+      selectCnt: copyMap.size,
       onSelectCancel: function onSelectCancel() {
         resetMultiSelectStates();
       },
@@ -361,11 +281,7 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
         updateReadMsgIndex: updateReadIndex,
         userId: localUserId,
         setMultiSelectActive: setMultiSelectActive,
-        multiSelectActive: multiSelectActive,
-        copyMap: copyMap,
-        setCopyMap: setCopyMap,
-        selectCnt: selectCnt,
-        copyTips: copyTips
+        multiSelectActive: multiSelectActive
       })
     })]
   });

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

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _radio = require("agora-ui-foundation/lib/components/radio");
 var _i18n = require("agora-ui-foundation/lib/i18n");

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

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _mobxReact = require("mobx-react");

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

@@ -1,17 +1,18 @@
 import { DeviceSettingDialogConfig } from '../../setting/store';
 import { FcrMainRoomControl, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
 import { ConnectionTabType } from '../../video-window/type';
-import { FcrUIEventProvider } from '../../../providers/event-provider';
 import { FcrUIDeviceProvider } from '../../../providers/device-provider';
 import { FcrUISharedDevicePrivilegeDataSource } from '../../../shared-data-source/device-privilege-data';
 import { FcrUIDeviceStreamProvider } from '../../../providers/device-stream-provider';
+import { FcrUIDialogProvider } from '../../../providers/dialog-provider';
 export declare class DeviceControlStore {
     private _roomControl;
     private _deviceProvider;
-    private _eventProvider;
+    private _dialogProvider;
     private _deviceStreamProvider;
     private _sharedDevicePrivilegeDataSource;
     private _connectionWindowId;
+    private _streamControlObserver;
     accessor isPstnUser: boolean;
     accessor phoneMicEnabled: boolean;
     get microphoneId(): string;
@@ -24,7 +25,7 @@ export declare class DeviceControlStore {
     get microphoneList(): import("agora-rte-sdk").AgoraRtcDeviceInfo[];
     get cameraList(): import("agora-rte-sdk").AgoraRtcDeviceInfo[];
     get connectType(): import("../../../type").FcrUIConnectType;
-    constructor(_roomControl: FcrMainRoomControl | FcrWaitingRoomControl, _deviceProvider: FcrUIDeviceProvider, _eventProvider: FcrUIEventProvider, _deviceStreamProvider: FcrUIDeviceStreamProvider, _sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource);
+    constructor(_roomControl: FcrMainRoomControl | FcrWaitingRoomControl, _deviceProvider: FcrUIDeviceProvider, _dialogProvider: FcrUIDialogProvider, _deviceStreamProvider: FcrUIDeviceStreamProvider, _sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource);
     openDeviceSettingDialog(arg: Partial<DeviceSettingDialogConfig>): void;
     openConnection(type: ConnectionTabType): void;
     closeConnection(): void;

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

@@ -42,7 +42,6 @@ require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.async-iterator.find.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
@@ -56,7 +55,6 @@ var _react = require("react");
 var _fcrCore = require("fcr-core");
 var _mobx = require("mobx");
 var _type = require("agora-rte-sdk/lib/core/scene/type");
-var _env = require("agora-foundation/lib/utilities/env");
 var _decorator = require("agora-foundation/lib/decorator");
 var _constant = require("../../../utilities/constant");
 var _DeviceControlStore;
@@ -75,21 +73,22 @@ var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 _ref = (_openDeviceSettingDialogDecs = [_mobx.action, _mobx.action.bound], _openConnectionDecs = [_mobx.action, _mobx.action.bound], _closeConnectionDecs = [_mobx.action, _mobx.action.bound], _checkMediaPermissionDecs = [_mobx.action, _mobx.action.bound], _enableCameraDecs = [_mobx.action, _mobx.action.bound], _enableMicrophoneDecs = [_mobx.action, _mobx.action.bound], _setSpeakerIdDecs = [_mobx.action, _mobx.action.bound], _setMicrophoneIdDecs = [_mobx.action, _mobx.action.bound], _setCameraIdDecs = [_mobx.action, _mobx.action.bound], "_connectionWindowId");
 var DeviceControlStore = exports.DeviceControlStore = /*#__PURE__*/function () {
-  function DeviceControlStore(_roomControl, _deviceProvider, _eventProvider, _deviceStreamProvider, _sharedDevicePrivilegeDataSource) {
+  function DeviceControlStore(_roomControl, _deviceProvider, _dialogProvider, _deviceStreamProvider, _sharedDevicePrivilegeDataSource) {
     (0, _classCallCheck2["default"])(this, DeviceControlStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), ''));
+    (0, _defineProperty2["default"])(this, "_streamControlObserver", {
+      onStreamsAdded: this._handleStreamUpdate,
+      onStreamsRemoved: this._handleStreamUpdate,
+      onStreamsUpdated: this._handleStreamUpdate
+    });
     _classPrivateFieldInitSpec(this, _A, _init_isPstnUser(this, false));
     _classPrivateFieldInitSpec(this, _B, _init_phoneMicEnabled(this, false));
     this._roomControl = _roomControl;
     this._deviceProvider = _deviceProvider;
-    this._eventProvider = _eventProvider;
+    this._dialogProvider = _dialogProvider;
     this._deviceStreamProvider = _deviceStreamProvider;
     this._sharedDevicePrivilegeDataSource = _sharedDevicePrivilegeDataSource;
-    this._roomControl.getStreamControl().addObserver({
-      onStreamsAdded: this._handleStreamUpdate,
-      onStreamsRemoved: this._handleStreamUpdate,
-      onStreamsUpdated: this._handleStreamUpdate
-    });
+    this._roomControl.getStreamControl().addObserver(this._streamControlObserver);
   }
   return (0, _createClass2["default"])(DeviceControlStore, [{
     key: "isPstnUser",
@@ -160,31 +159,24 @@ var DeviceControlStore = exports.DeviceControlStore = /*#__PURE__*/function () {
   }, {
     key: "openDeviceSettingDialog",
     value: function openDeviceSettingDialog(arg) {
-      this._eventProvider.openDeviceSettingDialog(arg);
+      this._dialogProvider.openDeviceSettingDialog(arg);
     }
   }, {
     key: "openConnection",
     value: function openConnection(type) {
-      this._connectionWindowId = this._eventProvider.openDialog(_constant.FcrUIDialogKey.CONNECTION_GATEWAY, '', {
+      this._connectionWindowId = this._dialogProvider.openDialog(_constant.FcrUIDialogKey.CONNECTION_GATEWAY, '', {
         type: type
       });
     }
   }, {
     key: "closeConnection",
     value: function closeConnection() {
-      this._eventProvider.closeDialog(this._connectionWindowId);
+      this._dialogProvider.closeDialog(this._connectionWindowId);
     }
   }, {
     key: "checkMediaPermission",
     value: function checkMediaPermission(mediaType) {
-      var _this = this;
-      if ((0, _env.isElectron)()) {
-        window.runtime.checkMediaPermission(mediaType).then(function (hasPermission) {
-          if (!hasPermission) {
-            _this._eventProvider.openDialog(_constant.FcrUIDialogKey.SYSTEM_PREFERENCE, '', mediaType);
-          }
-        });
-      }
+      this._deviceStreamProvider.checkoutDevicePermission(mediaType);
     }
   }, {
     key: "enableCamera",
@@ -220,11 +212,7 @@ var DeviceControlStore = exports.DeviceControlStore = /*#__PURE__*/function () {
   }, {
     key: "release",
     value: function release() {
-      this._roomControl.getStreamControl().removeObserver({
-        onStreamsAdded: this._handleStreamUpdate,
-        onStreamsRemoved: this._handleStreamUpdate,
-        onStreamsUpdated: this._handleStreamUpdate
-      });
+      this._roomControl.getStreamControl().removeObserver(this._streamControlObserver);
     }
   }, {
     key: "_handleStreamUpdate",

package/lib/modules/components/leave-meeting/components/assign-host.js

@@ -18,6 +18,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _button = require("agora-ui-foundation/lib/components/button");
 var _jsxRuntime = require("react/jsx-runtime");
 var AssignHost = exports.AssignHost = (0, _mobxReact.observer)(function (props) {
+  var _remoteUsers$selected;
   var remoteUsers = props.remoteUsers,
     assignHost = props.assignHost,
     loading = props.loading;
@@ -26,16 +27,30 @@ var AssignHost = exports.AssignHost = (0, _mobxReact.observer)(function (props)
     selected = _useState2[0],
     setSelected = _useState2[1];
   var t = (0, _i18n.useI18n)();
+  (0, _react.useEffect)(function () {
+    if (remoteUsers.length === 0) {
+      setSelected(0);
+    } else if (selected >= remoteUsers.length) {
+      setSelected(remoteUsers.length - 1);
+    }
+  }, [remoteUsers, selected]);
   var handleLeave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var user;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            if (!(remoteUsers.length === 0 || !remoteUsers[selected])) {
+              _context.next = 3;
+              break;
+            }
+            props.setPopoverOpened(false);
+            return _context.abrupt("return");
+          case 3:
             user = remoteUsers[selected];
             assignHost(user);
             props.setPopoverOpened(false);
-          case 3:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -62,7 +77,7 @@ var AssignHost = exports.AssignHost = (0, _mobxReact.observer)(function (props)
       children: t('fmt_toolbar_button_assignleave')
     }),
     candidateUsers: remoteUsers,
-    selectedUid: remoteUsers[selected].userId,
+    selectedUid: (_remoteUsers$selected = remoteUsers[selected]) === null || _remoteUsers$selected === void 0 ? void 0 : _remoteUsers$selected.userId,
     onSelect: function onSelect(user) {
       setSelected(remoteUsers.indexOf(user));
     }

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

@@ -24,9 +24,8 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
     canAssign = _useContext.canAssign,
     keepConnect = _useContext.keepConnect,
     localUserRole = _useContext.localUserRole,
-    remoteUsers = _useContext.remoteUsers,
+    hostAvailibleRemoteUsers = _useContext.hostAvailibleRemoteUsers,
     isLocked = _useContext.isLocked,
-    hasAssignHostBeforeLeavingPermission = _useContext.hasAssignHostBeforeLeavingPermission,
     hasEndRoomPermission = _useContext.hasEndRoomPermission,
     isPstnUser = _useContext.isPstnUser,
     loading = _useContext.loading,
@@ -34,17 +33,19 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
     leave = _useContext.leave,
     _assignHost = _useContext.assignHost,
     setCanAssign = _useContext.setCanAssign,
-    setKeepConnect = _useContext.setKeepConnect;
+    setKeepConnect = _useContext.setKeepConnect,
+    isAssignHostAvailable = _useContext.isAssignHostAvailable,
+    showEndConfirmDialog = _useContext.showEndConfirmDialog;
 
   // 结束会议
   var handleEnd = function handleEnd() {
     setPopoverOpened(false);
-    end();
+    showEndConfirmDialog();
   };
 
   // 离开会议
   var handleLeave = function handleLeave() {
-    if (remoteUsers.length > 0 && hasAssignHostBeforeLeavingPermission) {
+    if (hostAvailibleRemoteUsers.length > 0 && isAssignHostAvailable) {
       setCanAssign(true);
     } else {
       leave();
@@ -69,7 +70,7 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
       },
       children: canAssign ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_assignHost2.AssignHost, {
         setPopoverOpened: setPopoverOpened,
-        remoteUsers: remoteUsers,
+        remoteUsers: hostAvailibleRemoteUsers,
         assignHost: function assignHost(user) {
           _assignHost(user);
           onAssigned === null || onAssigned === void 0 || onAssigned();
@@ -97,7 +98,7 @@ var LeaveMeeting = exports.LeaveMeeting = (0, _mobxReact.observer)(function (pro
             'leave-confirm-disabled': keepConnect
           }),
           onClick: !keepConnect ? handleEnd : undefined,
-          children: t('fmt_actionbar_button_plenarysession')
+          children: t('fmt_popup_button_endmeeting')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "leave-cancel",
           onClick: handleLeave,

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

@@ -1,24 +1,33 @@
-import { FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
+import { FcrUserInfo, FcrUserRole, FcrPlatform } from 'fcr-core/lib/type';
 import { FcrUIPrivilegeProvider } from '../../../providers/privilege-provider';
 import { FcrUIRoomProvider } from '../../../providers/room-provider';
 import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrUIMemberSharedDataSource } from '../../../shared-data-source/member-data';
+import { FcrUIAbilityProviderImpl } from '../../../providers/ability-provider';
+import { FcrUIDialogProvider } from '../../../providers/dialog-provider';
 export declare class LeaveMeetingStore {
     private _privilegeProvider;
     private _roomProvider;
     private _roomControl;
+    private _sharedMemberDataSource;
+    private _abilityProvider;
+    private _dialogProvder;
     private _userControl;
     private _streamControl;
-    accessor isPstnUser: boolean;
     accessor keepConnect: boolean;
     accessor canAssign: boolean;
-    accessor localUserId: string;
     accessor loading: boolean;
     get isLocked(): boolean;
+    get localUserId(): string;
+    get localUserRole(): FcrUserRole;
     get hasAssignHostBeforeLeavingPermission(): boolean;
     get hasEndRoomPermission(): boolean;
-    get localUserRole(): FcrUserRole;
-    get remoteUsers(): FcrUserInfo[];
-    constructor(_privilegeProvider: FcrUIPrivilegeProvider, _roomProvider: FcrUIRoomProvider, _roomControl: FcrBaseRoomControl);
+    get hostAvailibleRemoteUsers(): FcrUserInfo[];
+    get isPstnUser(): boolean;
+    get isAssignHostAvailable(): boolean;
+    constructor(_privilegeProvider: FcrUIPrivilegeProvider, _roomProvider: FcrUIRoomProvider, _roomControl: FcrBaseRoomControl, _sharedMemberDataSource: FcrUIMemberSharedDataSource, _abilityProvider: FcrUIAbilityProviderImpl, _dialogProvder: FcrUIDialogProvider);
+    showEndConfirmDialog(): void;
+    isHostSupportedByPlatform(platform: FcrPlatform): boolean;
     assignHost(user: FcrUserInfo): void;
     leave(): Promise<void>;
     keepPhoneAudioConnection(): Promise<void>;
@@ -26,6 +35,5 @@ export declare class LeaveMeetingStore {
     setKeepConnect(value: boolean): void;
     end(): Promise<void>;
     release(): void;
-    private _handleStreamsAddedOrUpdated;
 }
 export declare const LeaveMeetingStoreContext: import("react").Context<LeaveMeetingStore>;