fcr-ui-scene 3.1.1 → 3.3.0

package/lib/modules/participant/member-list-data-source.js

@@ -19,6 +19,26 @@ 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/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.function.metadata.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.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");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof3 = require("@babel/runtime/helpers/typeof");
@@ -38,7 +58,13 @@ require("core-js/modules/es.array.splice.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");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _mobx = require("mobx");
@@ -50,8 +76,8 @@ var _FcrUIMemberListDataSourceImpl;
 var _initProto, _init_list, _resetListDecs, _addDecs, _deleteDecs, _insertEndByPriorityDecs, _ref;
 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 _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"); }
@@ -66,7 +92,7 @@ var FcrUIMemberDataImpl = exports.FcrUIMemberDataImpl = /*#__PURE__*/function ()
     (0, _classCallCheck2["default"])(this, FcrUIMemberDataImpl);
     this._isMySelf = _isMySelf;
     this.userInfo = userInfo;
-    this.streams = streams;
+    this.streams = (0, _toConsumableArray2["default"])(streams);
   }
   return (0, _createClass2["default"])(FcrUIMemberDataImpl, [{
     key: "setUserInfo",

package/lib/modules/participant/room-control-drop-menu/index.css

@@ -2,6 +2,43 @@
   position: relative;
   /* margin: 8px 0; */
 }
+.room-control-options-box {
+  display: flex;
+  justify-content: space-between;
+}
+.room-control-options-box .fcr-checkbox {
+  width: fit-content;
+}
+
+.room-control-options-watermark-btns {
+  width: 104px;
+  height: 24px;
+  display: flex;
+  background-color: var(--fcr_mobile_ui_scene_fill1);
+  align-items: center;
+  padding: 2px;
+}
+
+.room-control-options-watermark-btn {
+  width: 50px;
+  height: 20px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: var(--fcr_ui_scene_icontext1);
+  font-size: 12px;
+  background-color: transparent;
+}
+.room-control-options-watermark-btn--active {
+  background-color: #ffffff;
+  color: var(--fcr_ui_scene_ramp_brand6);
+}
+
+.room-control-options-watermark-title-box {
+  display: flex;
+  align-items: center;
+  font-size: 13px;
+}
 
 .room-control-drop-with-under-line::after {
   content: '';

package/lib/modules/participant/room-control-drop-menu/index.js

@@ -1,11 +1,31 @@
 "use strict";
 
+require("core-js/modules/es.symbol.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/esnext.async-iterator.for-each.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.RoomControlDropMenu = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.unshift.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.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _dropMenu = require("agora-ui-foundation/lib/components/drop-menu");
 var _mobxReact = require("mobx-react");
@@ -15,6 +35,8 @@ var _context = require("../context");
 require("./index.css");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 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 RoomControlDropMenu = exports.RoomControlDropMenu = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_context.StoreContext),
     allowUnmuteSelfAudio = _useContext.allowUnmuteSelfAudio,
@@ -149,6 +171,18 @@ var RoomControlDropMenu = exports.RoomControlDropMenu = (0, _mobxReact.observer)
     });
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.FcrDropMenu, {
-    options: allActions
+    options: allActions.filter(function (v) {
+      return v.type !== 'disabled';
+    }).map(function (v) {
+      if (v.type === 'primary') {
+        return _objectSpread(_objectSpread({}, v), {}, {
+          title: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "security-drop-menu-checkbox",
+            children: v.title
+          })
+        });
+      }
+      return _objectSpread({}, v);
+    })
   });
 });

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

@@ -1,19 +1,26 @@
-import { FcrCoreEngine, FcrMainRoomControl } from 'agora-edu-core';
-import { FcrPeerSessionControl } from 'agora-edu-core/lib/peer-session';
-import { FcrMediaSourceState, FcrPrivilegeUserRole, FcrUserInfo, FcrUserRole } from 'agora-edu-core/lib/type';
-import { User } from 'agora-ui-foundation/lib/components/participants/attendee';
+import { FcrCoreEngine, FcrMediaSourceState, FcrPrivilegeUserRole } from 'agora-edu-core';
+import { FcrPeerSessionControl } from 'agora-edu-core/lib/peer-session/type';
+import { FcrUserInfo, FcrUserRole } from 'agora-edu-core/lib/type';
+import { RoomType } from '../../utilities/constant';
+import { ParticipantActionType, User } from 'agora-ui-foundation/lib/components/participants/attendee';
 import { FcrSecurityStore } from '../../common/security-store';
-import { ParticipantType, RoomControlType } from '../../utilities/constant';
+import { DialogKey, RoomControlType } from '../../utilities/constant';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrDeviceStore } from '../../common/device-store';
 import { FcrDeviceStreamStore } from '../../common/device-stream-store';
 import { FcrUIMemberData } from './type';
+import { FcrUserKickOutType } from 'agora-edu-core/lib/room-control/user-control/type';
+import { FcrMainRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { OperateWaitingRoomMemberDialogProps } from './attendee';
 export default class ParticipantStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _dataSource;
+    private _waitingRoomDataSource;
     private _roomControl;
     private _streamControl;
     private _userControl;
+    private _waitingRoomControl?;
+    private _waitingRoomUserControl?;
     private _engine;
     private _peerSessionControl;
     private _disposers;
@@ -22,6 +29,15 @@ export default class ParticipantStore {
     private _deviceStreamStore;
     private _unmuteAudioTimestamp;
     private _unmuteVideoTimestamp;
+    private _processedUserOpenDeviceRequests;
+    private _securityStore;
+    private _uiEventStore;
+    private _streamsObserver;
+    private _peerSessionObserver;
+    private _userObserver;
+    private _eventObserver;
+    private _waitingRoomUserObserver;
+    private _whitebaordObderver;
     private accessor _mainList;
     accessor _participantsWindowActive: boolean;
     accessor currentPerspectiveType: 'host' | 'attendee' | 'cohost';
@@ -35,25 +51,9 @@ export default class ParticipantStore {
     accessor enableSpotlight: boolean;
     accessor mergeConfirmDialog: boolean;
     accessor mergeUserId: string;
-    setSpotlightStreamId(streamId: string): void;
-    private _processedUserOpenDeviceRequests;
-    private _securityStore;
-    private _uiEventStore;
-    private _streamsObserver;
-    private _peerSessionObserver;
-    private _userObserver;
-    private _eventObserver;
-    private _whitebaordObderver;
-    constructor({ roomControl, engine, peerSessionControl, securityStore, uiEventStore, deviceStore, deviceStreamStore, }: {
-        roomControl: FcrMainRoomControl;
-        engine: FcrCoreEngine;
-        peerSessionControl: FcrPeerSessionControl;
-        securityStore: FcrSecurityStore;
-        uiEventStore: FcrUIEventStore;
-        deviceStore: FcrDeviceStore;
-        deviceStreamStore: FcrDeviceStreamStore;
-    });
-    release(): void;
+    accessor activeTab: RoomType;
+    accessor isNewWaitingRoomUserEnter: boolean;
+    accessor waitingRoomUserCount: number;
     get userListSource(): import("./member-list-data-source").FcrUIMemberDataImpl[];
     get mergeUserInfo(): FcrUserInfo | undefined;
     get userMap(): Map<string, FcrUIMemberData>;
@@ -66,12 +66,27 @@ export default class ParticipantStore {
     get allowChat(): boolean;
     get allowShareScreen(): boolean;
     get pinedStreamIds(): string[];
-    checkIsPin: (userId: string) => boolean;
     get hasPinnedStream(): boolean;
+    get userList(): User[];
+    get localMicVolume(): number;
+    get hasRevokeHostPermission(): boolean;
+    constructor({ roomControl, engine, peerSessionControl, securityStore, uiEventStore, deviceStore, deviceStreamStore, }: {
+        roomControl: FcrMainRoomControl;
+        engine: FcrCoreEngine;
+        peerSessionControl: FcrPeerSessionControl;
+        securityStore: FcrSecurityStore;
+        uiEventStore: FcrUIEventStore;
+        deviceStore: FcrDeviceStore;
+        deviceStreamStore: FcrDeviceStreamStore;
+    });
+    setSpotlightStreamId(streamId: string): void;
+    release(): void;
+    allowedOperations: (userId: string, userRole: FcrUserRole) => string[];
+    checkIsPin: (userId: string) => boolean;
     hasMutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
+    hasWaitingRoomPermission(): boolean;
     hasUnmutePermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
     hasRequestStartAudioPermission(targetRole: FcrPrivilegeUserRole | FcrUserRole): boolean;
-    private _handleEvent;
     setCurrentModal(modal: 'modal' | 'window'): void;
     closeParticipantsAside(): void;
     openParticipantsWindow(): void;
@@ -88,25 +103,34 @@ export default class ParticipantStore {
         closable?: boolean;
         height?: number;
     }, id: string): void;
-    get userList(): User[];
     setParticipantsWindowActive(active: boolean): void;
     handlerSearchUser(searchText: string): void;
-    private _formatUser;
     onInvite(): void;
     setMergeConfirmDialog(visible: boolean): void;
     mergeConfirmDialogOk(userId: string): void;
-    handlerUserAction(action: ParticipantType, userId: string): void;
+    removePin(userId: string): void;
+    addPin(userId: string): void;
+    getAllowedOperations(targetRole: FcrUserRole, isSelf: boolean): string[];
+    closeRemoveAdmitWaitingRoomDialog(dialogKey: DialogKey): void;
+    openRemoveAdmitWaitingRoomDialog(dialogKey: DialogKey, params: OperateWaitingRoomMemberDialogProps): void;
+    handlerUserAction(action: ParticipantActionType, userId: string): void;
+    private _moveToWaitingRoomByUserIds;
+    removeWaitingRoomUser(userId: string, type: FcrUserKickOutType): void;
+    kickOutWaitingRoomAllMember(type: FcrUserKickOutType): Promise<void>;
+    moveToMainRoomAllMember(): Promise<void>;
     getMicStreamVolume(streamId: string): number;
-    get localMicVolume(): number;
     handlerRoomControlAction(action: RoomControlType, data?: any): void;
+    private _handleEvent;
+    moveToMainRoomByUserIds(userId: string[]): void;
+    handleActiveTab(tab: RoomType): void;
+    private _initWaitingRoomUserList;
+    private _formatUser;
     private _muteUserAudio;
     private _unmuteUserAudio;
     private _muteUserVideo;
     private _unmuteUserVideo;
     private _privateChat;
     private _kickOutUser;
-    removePin(userId: string): void;
-    addPin(userId: string): void;
     private _handleSetHostOrCoHost;
     private _setAsHost;
     private _setAsCoHost;
@@ -125,14 +149,15 @@ export default class ParticipantStore {
     private _updateUserBoardState;
     private _handleRemoteUserJoined;
     private _handleRemoteUserLeft;
+    private _handleRemoteWaitingUserJoined;
+    private _getWaitingRoomUserCount;
+    private _handleRemoteWaitingUserLeft;
     private _onUserInfoUpdated;
     private _initUserList;
     private _handleStreamsAdded;
     private _handleStreamsUpdated;
     private _handleStreamsRemoved;
     private _refreshCurrentPerspectiveType;
-    get hasRevokeHostPermission(): boolean;
-    getAllowedOperations(targetRole: FcrUserRole, isSelf: boolean): string[];
     private _onPeerSessionReceived;
     private _onPeerSessionAccepted;
     private _onPeerSessionRejected;