fcr-ui-scene 3.1.1 → 3.3.0

package/lib/modules/live-streaming/store.d.ts

@@ -1,6 +1,6 @@
-import { FcrRoomControl } from 'agora-edu-core/lib/room-control';
 import { FcrLiveStreamingState } from 'agora-edu-core/lib/type';
 import { FcrUIEventStore } from '../../common/event-store';
+import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
 export default class LiveStreamingStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     accessor videoSteamingUrl: string;
@@ -18,7 +18,7 @@ export default class LiveStreamingStore {
     private _userObserver;
     private _roomObserver;
     constructor({ roomControl, uiEventStore, }: {
-        roomControl: FcrRoomControl;
+        roomControl: FcrBaseRoomControl;
         uiEventStore: FcrUIEventStore;
     });
     release(): void;

package/lib/modules/live-streaming/store.js

@@ -14,6 +14,22 @@ require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/esnext.function.metadata.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/esnext.symbol.metadata.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
@@ -27,6 +43,11 @@ require("core-js/modules/es.array.push.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.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -43,8 +64,8 @@ var _logger = require("agora-foundation/lib/logger");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _LiveStreamingStore;
 var _initProto, _init_videoSteamingUrl, _init_videoStreamingKey, _init_playUrl, _init_liveStreamingState, _init_isStartError, _onLiveButtonClickDecs, _startLiveStreamingDecs, _handleLiveStreamingStateUpdatedDecs, _handleEventDecs, _ref;
-function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+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; }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
@@ -90,9 +111,9 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
     this._uiEventStore.addObserver(this._uiEventObserver);
     this.liveStreamingState = roomControl.getLiveStreamingState();
     var liveStreamingConfig = roomControl.getLiveStreamingConfig();
-    this.videoSteamingUrl = liveStreamingConfig.pushStreamingUrl;
-    this.videoStreamingKey = liveStreamingConfig.pushStreamingKey;
-    this.playUrl = liveStreamingConfig.pullStreamingUrl;
+    this.videoSteamingUrl = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pushStreamingUrl) || '';
+    this.videoStreamingKey = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pushStreamingKey) || '';
+    this.playUrl = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pullStreamingUrl) || '';
   }
   return (0, _createClass2["default"])(LiveStreamingStore, [{
     key: "videoSteamingUrl",
@@ -172,7 +193,7 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "onLiveButtonClick",
     value: function () {
-      var _onLiveButtonClick = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(videoSteamingUrl, videoStreamingKey, playUrl) {
+      var _onLiveButtonClick = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(videoSteamingUrl, videoStreamingKey, playUrl) {
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -201,7 +222,7 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_startLiveStreaming",
     value: function () {
-      var _startLiveStreaming2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(videoSteamingUrl, videoStreamingKey, playUrl) {
+      var _startLiveStreaming2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(videoSteamingUrl, videoStreamingKey, playUrl) {
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -281,9 +302,9 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
     value: function _handleLiveStreamingStateUpdated(_roomId, state) {
       this.liveStreamingState = state;
       var liveStreamingConfig = this._roomControl.getLiveStreamingConfig();
-      this.videoSteamingUrl = liveStreamingConfig.pushStreamingUrl;
-      this.videoStreamingKey = liveStreamingConfig.pushStreamingKey;
-      this.playUrl = liveStreamingConfig.pullStreamingUrl;
+      this.videoSteamingUrl = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pushStreamingUrl) || '';
+      this.videoStreamingKey = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pushStreamingKey) || '';
+      this.playUrl = (liveStreamingConfig === null || liveStreamingConfig === void 0 ? void 0 : liveStreamingConfig.pullStreamingUrl) || '';
     }
   }, {
     key: "_handleEvent",
@@ -302,7 +323,7 @@ var LiveStreamingStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_stopLiveStreaming",
     value: function () {
-      var _stopLiveStreaming2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var _stopLiveStreaming2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:

package/lib/modules/participant/attendee/index.d.ts

@@ -1,10 +1,17 @@
-import { User } from 'agora-ui-foundation/lib/components/participants/attendee';
-import { ParticipantType } from '../../../utilities/constant';
+import { ParticipantActionType, User } from 'agora-ui-foundation/lib/components/participants/attendee';
 import { FcrUserRole } from '../../../type';
 import './index.css';
 import { FcrPrivilegeUserRole } from 'agora-edu-core';
+import { FcrUserKickOutType } from 'agora-edu-core/lib/room-control/type';
+export type OperateWaitingRoomMemberDialogProps = {
+    type: 'remove' | 'removeAll' | 'admitAll';
+    tooltip: string;
+    title: string;
+    userId?: string;
+};
+export declare const OperateWaitingRoomMemberDialog: ({ type, tooltip, title, userId, }: OperateWaitingRoomMemberDialogProps) => import("react/jsx-runtime").JSX.Element;
 interface ParticipantAttendeeProps extends User {
-    onParticipantsButtonClick: (action: ParticipantType, userId: string) => void;
+    onParticipantsButtonClick: (action: ParticipantActionType, userId: string, type?: FcrUserKickOutType | undefined) => void;
     currentPerspectiveType?: 'host' | 'attendee' | 'cohost';
     isPin: boolean;
     hasPinnedStream: boolean;
@@ -14,6 +21,8 @@ interface ParticipantAttendeeProps extends User {
     hasMutePermission: (role: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasUnmutePermission: (role: FcrPrivilegeUserRole | FcrUserRole) => boolean;
     hasRequestStartAudioPermission: (role: FcrPrivilegeUserRole | FcrUserRole) => boolean;
+    activeTab: string;
+    moveToMainRoomByUserIds: (userId: string[]) => void;
 }
 export declare const ParticipantAttendee: (props: ParticipantAttendeeProps) => import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/modules/participant/attendee/index.js

@@ -10,12 +10,17 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ParticipantAttendee = void 0;
+exports.ParticipantAttendee = exports.OperateWaitingRoomMemberDialog = 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"));
@@ -23,28 +28,112 @@ var _avatar = require("agora-ui-foundation/lib/components/avatar");
 var _action = require("agora-ui-foundation/lib/components/button/action");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
+var _attendee = require("agora-ui-foundation/lib/components/participants/attendee");
 var _popover = require("agora-ui-foundation/lib/components/popover");
 var _cameraState = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/camera-state");
 var _microphoneState = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/microphone-state");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _constant = require("../../../utilities/constant");
-var _participantsMoreAction = require("./participants-more-action");
 var _context = require("../context");
 var _type2 = require("../../../type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _muteAction = require("../../../utilities/mute-action");
 require("./index.css");
+var _helper = require("agora-ui-foundation/lib/components/avatar/helper");
 var _agoraEduCore = require("agora-edu-core");
+var _participantsMore = require("agora-ui-foundation/lib/components/participants/participants-more");
+var _type3 = require("agora-edu-core/lib/room-control/type");
+var _constant = require("../../../utilities/constant");
+var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
+var _button = require("agora-ui-foundation/lib/components/button");
 var _jsxRuntime = require("react/jsx-runtime");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var ParticipantAttendee = exports.ParticipantAttendee = (0, _mobxReact.observer)(function (props) {
+var OperateWaitingRoomMemberDialog = exports.OperateWaitingRoomMemberDialog = function OperateWaitingRoomMemberDialog(_ref) {
+  var type = _ref.type,
+    tooltip = _ref.tooltip,
+    title = _ref.title,
+    userId = _ref.userId;
+  var t = (0, _i18n.useI18n)();
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    isShowDropMenu = _useState2[0],
-    setIsShowDropMenu = _useState2[1];
+    isChecked = _useState2[0],
+    setIsChecked = _useState2[1];
+  var _useContext = (0, _react.useContext)(_context.StoreContext),
+    removeWaitingRoomUser = _useContext.removeWaitingRoomUser,
+    moveToMainRoomAllMember = _useContext.moveToMainRoomAllMember,
+    kickOutWaitingRoomAllMember = _useContext.kickOutWaitingRoomAllMember,
+    closeRemoveAdmitWaitingRoomDialog = _useContext.closeRemoveAdmitWaitingRoomDialog;
+  var DialogKeyMap = {
+    remove: _constant.DialogKey.WAITING_ROOM_SINGLE_REMOVE,
+    removeAll: _constant.DialogKey.WAITING_ROOM_ALL_REMOVE,
+    admitAll: _constant.DialogKey.WAITING_ROOM_ALL_ADMIT
+  };
+  var buttonTextMap = {
+    removeAll: t('fmt_waitingroom_sidebar_button_removeall'),
+    admitAll: t('fmt_waitingroom_sidebar_button_admitall'),
+    remove: t('fmt_waitingroom_sidebar_popup_button_remove')
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "operate-waiting-room-dialog-content",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "operate-waiting-room-dialog-title",
+      children: title
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "operate-waiting-room-dialog-tooltip",
+      children: tooltip
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "operate-waiting-room-dialog-confirm",
+      children: type === 'admitAll' ? null : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+          checked: isChecked,
+          onChange: setIsChecked,
+          size: "small",
+          styleType: "white"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          style: {
+            marginLeft: '10px'
+          },
+          children: t('fmt_waitingroom_sidebar_popup_option_notagain')
+        })]
+      })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "operate-waiting-room-dialog-btns",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+        size: "S",
+        shape: "rounded",
+        styleType: "white",
+        onClick: function onClick() {
+          closeRemoveAdmitWaitingRoomDialog(DialogKeyMap[type]);
+        },
+        children: t('fmt_waitingroom_sidebar_popup_button_cancel')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+        size: "S",
+        shape: "rounded",
+        styleType: type === 'admitAll' ? 'normal' : 'danger',
+        onClick: function onClick() {
+          if (type === 'remove') {
+            removeWaitingRoomUser(userId, isChecked ? _type3.FcrUserKickOutType.Forever : _type3.FcrUserKickOutType.Once);
+          }
+          if (type === 'removeAll') {
+            kickOutWaitingRoomAllMember(isChecked ? _type3.FcrUserKickOutType.Forever : _type3.FcrUserKickOutType.Once);
+          }
+          if (type === 'admitAll') {
+            moveToMainRoomAllMember();
+          }
+          closeRemoveAdmitWaitingRoomDialog(DialogKeyMap[type]);
+        },
+        children: buttonTextMap[type]
+      })]
+    })]
+  });
+};
+var ParticipantAttendee = exports.ParticipantAttendee = (0, _mobxReact.observer)(function (props) {
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    isShowDropMenu = _useState4[0],
+    setIsShowDropMenu = _useState4[1];
   var userId = props.userId,
     userName = props.userName,
     isMe = props.isMe,
@@ -68,16 +157,19 @@ var ParticipantAttendee = exports.ParticipantAttendee = (0, _mobxReact.observer)
     allowedOperations = props.allowedOperations,
     hasMutePermission = props.hasMutePermission,
     hasUnmutePermission = props.hasUnmutePermission,
-    hasRequestStartAudioPermission = props.hasRequestStartAudioPermission;
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    disableHover = _useState4[0],
-    setDisableHover = _useState4[1];
-  var volumeTimer = undefined;
-  var _useState5 = (0, _react.useState)(0),
+    hasRequestStartAudioPermission = props.hasRequestStartAudioPermission,
+    activeTab = props.activeTab,
+    moveToMainRoomByUserIds = props.moveToMainRoomByUserIds;
+  var _useState5 = (0, _react.useState)(false),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    phoneCallFrame = _useState6[0],
-    setPhoneCallFrame = _useState6[1];
+    disableHover = _useState6[0],
+    setDisableHover = _useState6[1];
+  var nameColor = (0, _helper.getNameColor)(userName);
+  var volumeTimer = undefined;
+  var _useState7 = (0, _react.useState)(0),
+    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+    phoneCallFrame = _useState8[0],
+    setPhoneCallFrame = _useState8[1];
   var percentPhone = function percentPhone(phoneCallFrame) {
     switch (phoneCallFrame) {
       case '0':
@@ -139,11 +231,11 @@ var ParticipantAttendee = exports.ParticipantAttendee = (0, _mobxReact.observer)
   }, [audioDeviceType]);
   var userActions = function userActions() {
     var handleAudioButtonClick = function handleAudioButtonClick() {
-      var action = hasAudio ? _constant.ParticipantType.MUTE_AUDIO : _constant.ParticipantType.UNMUTE_AUDIO;
+      var action = hasAudio ? _attendee.ParticipantActionType.MUTE_AUDIO : _attendee.ParticipantActionType.UNMUTE_AUDIO;
       onParticipantsButtonClick(action, userId);
     };
     var handlePrivateChatButtonClick = function handlePrivateChatButtonClick() {
-      onParticipantsButtonClick(_constant.ParticipantType.PRIVATE_CHAT, userId);
+      onParticipantsButtonClick(_attendee.ParticipantActionType.PRIVATE_CHAT, userId);
     };
     var handleMoreActionsClick = function handleMoreActionsClick(action, userId) {
       onParticipantsButtonClick(action, userId);
@@ -155,15 +247,26 @@ var ParticipantAttendee = exports.ParticipantAttendee = (0, _mobxReact.observer)
     var _actionMute = (0, _muteAction.actionMute)(!!isMe, hasAudio, muteAudioPermission, startAudioPermission, requestStartAudioPermission),
       isShowActionAudio = _actionMute.isShowActionAudio,
       actionAudioTag = _actionMute.actionAudioTag;
+    var waitingRoomParticipateActionsNeedHiden = ['start_video', 'request_start_video', 'stop_video', 'pin', 'set_as_host', 'set_as_co_host', 'revoke_co_host', 'merge_video', 'put_into_waiting_room'];
+    var mainRoomParticipateActionsNeedHiden = [];
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "attendee__user-action attendee__user-action-host ".concat(isShowDropMenu ? 'attendee__user-action-hovered' : ''),
-      children: [isShowActionAudio && /*#__PURE__*/(0, _jsxRuntime.jsx)(_action.FcrActionButton, {
+      children: [isShowActionAudio && activeTab === _constant.RoomType.MAIN_ROOM && /*#__PURE__*/(0, _jsxRuntime.jsx)(_action.FcrActionButton, {
         size: "small",
         onClick: handleAudioButtonClick,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: hasAudio ? 'attendee__danger-operate' : 'attendee__normal-operate',
           children: t(actionAudioTag)
         })
+      }), activeTab === _constant.RoomType.WAITING_ROOM && /*#__PURE__*/(0, _jsxRuntime.jsx)(_action.FcrActionButton, {
+        size: "small",
+        onClick: function onClick() {
+          return moveToMainRoomByUserIds([userId]);
+        },
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          className: 'attendee__normal-operate',
+          children: t('fmt_waitingroom_sidebar_button_admit')
+        })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
         visible: isShowDropMenu,
         overlayInnerStyle: {
@@ -180,13 +283,19 @@ var ParticipantAttendee = exports.ParticipantAttendee = (0, _mobxReact.observer)
           onMouseLeave: function onMouseLeave() {
             return setIsShowDropMenu(false);
           },
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_participantsMoreAction.ParticipantsMoreActions, _objectSpread(_objectSpread({}, props), {}, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_participantsMore.FcrParticipantsMoreActions, _objectSpread(_objectSpread({}, props), {}, {
             onParticipantsButtonClick: handleMoreActionsClick,
             userRole: userRole,
             isPin: isPin,
             hasPinnedStream: hasPinnedStream,
             allowedOperations: allowedOperations,
-            userType: userType
+            userType: userType,
+            userId: userId,
+            hasVideo: hasVideo,
+            hasAudio: hasAudio,
+            userName: userName,
+            audioDeviceType: audioDeviceType,
+            hideActions: activeTab === _constant.RoomType.MAIN_ROOM ? mainRoomParticipateActionsNeedHiden : waitingRoomParticipateActionsNeedHiden
           }))
         }),
         placement: "bottomRight",
@@ -224,6 +333,9 @@ var ParticipantAttendee = exports.ParticipantAttendee = (0, _mobxReact.observer)
         className: "attendee__user-info-identity",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           className: "attendee__name",
+          style: {
+            color: nameColor
+          },
           children: [userName, isMe && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
             className: "attendee__me-badge",
             children: "(Me)"
@@ -250,26 +362,26 @@ var ParticipantAttendee = exports.ParticipantAttendee = (0, _mobxReact.observer)
         colors: {
           iconPrimary: 'var(--fcr_ui_scene_ramp_green6)'
         }
-      }), audioDeviceType !== 'none' && /*#__PURE__*/(0, _jsxRuntime.jsx)(MicrophoneIndicator, {
+      }), audioDeviceType !== 'none' && activeTab === _constant.RoomType.MAIN_ROOM && /*#__PURE__*/(0, _jsxRuntime.jsx)(MicrophoneIndicator, {
         audioDeviceType: audioDeviceType,
         hasAudio: hasAudio,
         isLocal: !!isMe,
         userId: userId
-      }), videoDeviceType !== 'none' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cameraState.CameraState, {
+      }), videoDeviceType !== 'none' && activeTab === _constant.RoomType.MAIN_ROOM && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cameraState.CameraState, {
         isCameraMuted: !hasVideo,
         size: 28
       })]
     }), userActions()]
   }, userId);
 });
-var MicrophoneIndicator = (0, _mobxReact.observer)(function (_ref) {
-  var audioDeviceType = _ref.audioDeviceType,
-    hasAudio = _ref.hasAudio,
-    isLocal = _ref.isLocal,
-    userId = _ref.userId;
-  var _useContext = (0, _react.useContext)(_context.StoreContext),
-    audioVolumeMap = _useContext.audioVolumeMap,
-    localMicVolume = _useContext.localMicVolume;
+var MicrophoneIndicator = (0, _mobxReact.observer)(function (_ref2) {
+  var audioDeviceType = _ref2.audioDeviceType,
+    hasAudio = _ref2.hasAudio,
+    isLocal = _ref2.isLocal,
+    userId = _ref2.userId;
+  var _useContext2 = (0, _react.useContext)(_context.StoreContext),
+    audioVolumeMap = _useContext2.audioVolumeMap,
+    localMicVolume = _useContext2.localMicVolume;
   var volume = isLocal ? localMicVolume : audioVolumeMap.get(userId);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_microphoneState.MicrophoneState, {
     isMicrophoneMuted: !hasAudio,

package/lib/modules/participant/context.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import ParticipantStore from './store';
 export declare const StoreContext: import("react").Context<ParticipantStore>;

package/lib/modules/participant/index.css

@@ -5,6 +5,7 @@
   width: 100%;
   min-width: 320px;
   flex: 1;
+  position: relative;
 }
 .participants-container-merge-content {
   display: flex;
@@ -56,3 +57,22 @@
 .fcr-participant .fcr-avatar {
   border-radius: var(--fcr_cornerradius_m);
 }
+
+.fcr-participant__footer_waiting_room button {
+  flex: 1 !important;
+  padding: 0 !important;
+}
+
+.participants-container-icon {
+  position: relative;
+}
+
+.participants-container-red {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: var(--fcr_ui_scene_ramp_red6);
+  position: absolute;
+  right: -5px;
+  top: -5px;
+}

package/lib/modules/participant/index.d.ts

@@ -1,11 +1,13 @@
-import { FcrCoreEngine, FcrMainRoomControl } from 'agora-edu-core';
-import { FcrPeerSessionControl } from 'agora-edu-core/lib/peer-session';
+import { FcrCoreEngine } from 'agora-edu-core';
 import { UIModule } from '../../base';
 import { FcrSecurityStore } from '../../common/security-store';
 import './index.css';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrDeviceStore } from '../../common/device-store';
 import { FcrDeviceStreamStore } from '../../common/device-stream-store';
+import { FcrPeerSessionControl } from 'agora-edu-core/lib/peer-session/type';
+import { FcrMainRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { OperateWaitingRoomMemberDialogProps } from './attendee';
 export declare class ParticipantUIModule extends UIModule {
     private _store;
     constructor(args: {
@@ -18,6 +20,7 @@ export declare class ParticipantUIModule extends UIModule {
         deviceStreamStore: FcrDeviceStreamStore;
     });
     getComponent(): import("react/jsx-runtime").JSX.Element;
+    getWaitingRoomDialog(params: OperateWaitingRoomMemberDialogProps): import("react/jsx-runtime").JSX.Element;
     openDialog(): void;
     onProcessEvent(event: RendererCustomEvent): void;
     protected onUnload(): void;

package/lib/modules/participant/index.dev.js

@@ -28,9 +28,9 @@ var _jsxRuntime = require("react/jsx-runtime");
 var App = (0, _root.hot)(function () {
   return null;
 });
-_reactDom["default"].render( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
-window.__DEV_ENGINE_IS_READY__.then( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-  var engine, urlParams, isAssistant, roomId, roomControl, userName, deviceStore, uiEventStore, securityStore, dialogModule, deviceStreamStore, uiModule, App;
+_reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
+window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var engine, urlParams, isAssistant, roomId, token, roomControl, userName, deviceStore, uiEventStore, securityStore, dialogModule, deviceStreamStore, uiModule, App;
   return _regenerator["default"].wrap(function _callee$(_context) {
     while (1) switch (_context.prev = _context.next) {
       case 0:
@@ -38,20 +38,22 @@ window.__DEV_ENGINE_IS_READY__.then( /*#__PURE__*/(0, _asyncToGenerator2["defaul
         urlParams = new URLSearchParams(window.location.search);
         isAssistant = urlParams.get('roomId');
         roomId = isAssistant || window.__DEV_ROOM_ID__;
-        _context.next = 6;
+        token = window.__DEV_USER_TOKEN__;
+        _context.next = 7;
         return engine.login();
-      case 6:
-        roomControl = engine.createRoomControl(roomId);
+      case 7:
+        roomControl = engine.createMainRoomControl(roomId);
         userName = isAssistant ? 'assistants' : 'test-user';
-        deviceStore = new _deviceStore.FcrDeviceStore(userName, engine.getMediaControl());
-        _context.next = 11;
+        deviceStore = new _deviceStore.FcrDeviceStore(userName, engine.getDesktopMediaControl());
+        _context.next = 12;
         return roomControl.join({
           userRole: isAssistant ? _type.FcrUserRole.PARTICIPANT : _type.FcrUserRole.HOST,
           userName: userName,
+          roomToken: token,
           streamLatency: _type.FcrStreamLatencyLevel.ULTRA_LOW,
           createStreamConfigs: []
         });
-      case 11:
+      case 12:
         uiEventStore = new _eventStore.FcrUIEventStore();
         securityStore = new _securityStore.FcrSecurityStore(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), roomControl.getRoomSessionControl(), uiEventStore);
         dialogModule = new _dialog.DialogUIModule({
@@ -64,7 +66,7 @@ window.__DEV_ENGINE_IS_READY__.then( /*#__PURE__*/(0, _asyncToGenerator2["defaul
           streamControl: roomControl.getStreamControl()
         });
         deviceStreamStore = new _deviceStreamStore.FcrDeviceStreamStore({
-          mediaControl: engine.getMediaControl(),
+          mediaControl: engine.getDesktopMediaControl(),
           roomControl: roomControl,
           securityStore: securityStore,
           deviceStore: deviceStore,
@@ -89,8 +91,8 @@ window.__DEV_ENGINE_IS_READY__.then( /*#__PURE__*/(0, _asyncToGenerator2["defaul
             children: [uiModule.getComponent(), dialogModule.getComponent()]
           });
         });
-        _reactDom["default"].render( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
-      case 18:
+        _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
+      case 19:
       case "end":
         return _context.stop();
     }

package/lib/modules/participant/index.js

@@ -1,13 +1,29 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ParticipantUIModule = void 0;
 require("core-js/modules/es.function.bind.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -19,7 +35,10 @@ var _context = require("./context");
 require("./index.css");
 var _store = _interopRequireDefault(require("./store"));
 var _view = require("./view");
+var _attendee = require("./attendee");
 var _jsxRuntime = require("react/jsx-runtime");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var ParticipantUIModule = exports.ParticipantUIModule = /*#__PURE__*/function (_UIModule) {
@@ -42,6 +61,14 @@ var ParticipantUIModule = exports.ParticipantUIModule = /*#__PURE__*/function (_
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {})
       });
     }
+  }, {
+    key: "getWaitingRoomDialog",
+    value: function getWaitingRoomDialog(params) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.StoreContext.Provider, {
+        value: this._store,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_attendee.OperateWaitingRoomMemberDialog, _objectSpread({}, params))
+      });
+    }
   }, {
     key: "openDialog",
     value: function openDialog() {

package/lib/modules/participant/member-list-data-source.d.ts

@@ -10,15 +10,15 @@ export declare class FcrUIMemberDataImpl implements FcrUIMemberData {
     updateStream(stream: FcrStreamInfo): void;
     addStream(stream: FcrStreamInfo): void;
     removeStream(streamId: string): void;
-    constructor(userInfo: FcrUserInfo, streams: FcrStreamInfo[], _isMySelf: boolean);
+    constructor(userInfo: FcrUserInfo, streams: Readonly<FcrStreamInfo[]>, _isMySelf: boolean);
     get userId(): string;
     get sortingPriority(): FcrUIMemberSortingPriority;
 }
 export declare class FcrUIMemberListDataSourceImpl implements FcrUIMemberListDataSource {
     accessor list: FcrUIMemberDataImpl[];
     resetList(users: FcrUserInfo[], streams: Record<string, FcrStreamInfo[]>): boolean;
-    add(user: FcrUserInfo, streams: FcrStreamInfo[], isMySelf: boolean): boolean;
-    update(param: FcrStreamInfo | FcrUserInfo, isBoardActive?: boolean): boolean;
+    add(user: FcrUserInfo, streams: Readonly<FcrStreamInfo[]>, isMySelf: boolean): boolean;
+    update(param: FcrStreamInfo | FcrUserInfo | undefined, isBoardActive?: boolean): boolean;
     updateWithStreamAdd(stream: FcrStreamInfo): boolean;
     updateWithStreamRemove(stream: FcrStreamInfo): boolean;
     delete(user: FcrUserInfo): boolean;