fcr-ui-scene 3.1.0 → 3.2.0

package/lib/modules/dialog/index.css

@@ -16,6 +16,11 @@
   flex-direction: column;
   box-shadow: var(--fcr_web_light_dropup);
 }
+
+.fcr-livestreaming-dialog-wrapper .frc-window-header {
+  cursor: move;
+}
+
 .fcr-livestreaming-dialog-content {
   flex: 1;
   overflow: hidden;
@@ -47,9 +52,3 @@
   box-shadow: var(--fcr_web_light_dropup);
   border: 1px solid var(--fcr_ui_scene_line1);
 }
-
-.fcr-device-setting-dialog-wrapper {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}

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

@@ -4,9 +4,9 @@ import { FcrUIEventStore } from '../../common/event-store';
 import { FcrSecurityStore } from '../../common/security-store';
 import { FcrUserInfo } from 'agora-edu-core/lib/type';
 import { FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { FcrChatRoomControl } from 'agora-edu-core/lib/room-control/chatroom-control';
 import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-content';
 import { FcrDeviceStore } from '../../common/device-store';
+import { FcrChatRoomControl } from 'agora-edu-core/lib/room-control/chatroom-control/type';
 export declare class DialogUIModule extends UIModule {
     private _dialogs;
     private _store;

package/lib/modules/dialog/index.js

@@ -12,6 +12,23 @@ require("core-js/modules/es.array.iterator.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.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.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 _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));

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

@@ -1,11 +1,11 @@
 import { FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { FcrChatRoomConnectionState, FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserInfo } from 'agora-edu-core/lib/type';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrSecurityStore } from '../../common/security-store';
 import { Rectangle } from 'electron';
-import { FcrChatRoomControl } from 'agora-edu-core/lib/room-control/chatroom-control';
 import { FcrDeviceStore } from '../../common/device-store';
 import { AgoraRtcScreenCaptureType } from 'agora-rte-sdk/lib/core/rtc/type';
+import { FcrChatRoomConnectionState, FcrChatRoomControl } from 'agora-edu-core/lib/room-control/chatroom-control/type';
 export default class DialogStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _currentShareId;

package/lib/modules/dialog/store.js

@@ -16,6 +16,10 @@ 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.function.metadata.js");
+require("core-js/modules/esnext.iterator.for-each.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 _typeof = require("@babel/runtime/helpers/typeof");
@@ -35,6 +39,27 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.find.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.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.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -53,12 +78,13 @@ var _type2 = require("../whiteboard/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _renderer = require("../../utilities/renderer");
 var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
+var _type4 = require("agora-edu-core/lib/room-control/chatroom-control/type");
 var _DialogStore;
 var _initProto, _init_openedDialogs, _init_connectorContainerBounds, _init_payloadDialogs, _init_userCount, _init_participantElectronDialogContainer, _init_chatRoomState, _init_currentDialogBounds, _init_videoWindowBounds, _setVideoWindowBoundsDecs, _setConnecorContainerBoundsDecs, _calculateDialogPositionDecs, _handleDialogEventDecs, _handleConnectionUpdatedDecs, _hanleAllUserCountUpdatedDecs, _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"); }
@@ -96,14 +122,16 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
       onAllUserCountUpdated: this._hanleAllUserCountUpdated.bind(this)
     });
     (0, _defineProperty2["default"])(this, "_chatRoomObserver", {
-      onConnectionStateUpdated: this._handleConnectionUpdated.bind(this)
+      onConnectionStateUpdated: this._handleConnectionUpdated.bind(this),
+      onErrorOccurred: function onErrorOccurred(error) {},
+      onTextMessageReceived: function onTextMessageReceived(message) {}
     });
     _classPrivateFieldInitSpec(this, _A, _init_openedDialogs(this, []));
     _classPrivateFieldInitSpec(this, _B, _init_connectorContainerBounds(this, {}));
     _classPrivateFieldInitSpec(this, _C, _init_payloadDialogs(this, new Map()));
     _classPrivateFieldInitSpec(this, _D, _init_userCount(this, 0));
     _classPrivateFieldInitSpec(this, _E, _init_participantElectronDialogContainer(this, null));
-    _classPrivateFieldInitSpec(this, _F, _init_chatRoomState(this, _type.FcrChatRoomConnectionState.Disconnected));
+    _classPrivateFieldInitSpec(this, _F, _init_chatRoomState(this, _type4.FcrChatRoomConnectionState.Disconnected));
     _classPrivateFieldInitSpec(this, _G, _init_currentDialogBounds(this, {
       x: 0,
       y: 0,
@@ -121,7 +149,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
     this._userControl.addObserver(this._userObserver);
     this._deviceStore = deviceStore;
     this._chatRoomControl = chatRoomControl;
-    this._chatRoomControl.addobserver(this._chatRoomObserver);
+    this._chatRoomControl.addObserver(this._chatRoomObserver);
     this._uiEventStore.addObserver({
       onEvent: function onEvent(action, payload) {
         if (action === _constant.UIAction.WHITEBOARD_CHANGED) {
@@ -252,7 +280,7 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setWorkArea",
     value: function () {
-      var _setWorkArea = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _setWorkArea = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var allWindows;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -435,7 +463,8 @@ var DialogStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_handleDialogEvent",
     value: function _handleDialogEvent(action, payload) {
-      var fragmentDialogKeys = [_constant.DialogKey.CONTROL_BAR, _constant.DialogKey.TOOLBAR];
+      var fragmentDialogKeys = [_constant.DialogKey.TOOLBAR];
+      if ((0, _env.isElectron)()) fragmentDialogKeys.push(_constant.DialogKey.CONTROL_BAR);
       if (action === _constant.UIAction.OPEN_DIALOG) {
         var _ref3 = payload || {},
           _ref3$dialogKey = _ref3.dialogKey,

package/lib/modules/dialog/view.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.View = void 0;
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _context = require("./context");

package/lib/modules/event-toast/context.d.ts

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

package/lib/modules/event-toast/store.js

@@ -17,6 +17,22 @@ 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.to-string.js");
 require("core-js/modules/es.string.iterator.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");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");

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

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

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

@@ -1,11 +1,11 @@
-import { FcrRoomControl } from 'agora-edu-core/lib/room-control';
 import { UIModule } from '../../base';
 import { FcrUIEventStore } from '../../common/event-store';
 import './index.css';
+import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
 export declare class InviteUIModule extends UIModule {
     private _store;
     constructor({ roomControl, uiEventStore, }: {
-        roomControl: FcrRoomControl;
+        roomControl: FcrBaseRoomControl;
         uiEventStore: FcrUIEventStore;
     });
     getComponent(): import("react/jsx-runtime").JSX.Element;

package/lib/modules/invite/pstn-invite.js

@@ -6,6 +6,8 @@ require("core-js/modules/es.object.get-own-property-descriptor.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.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
@@ -101,7 +103,7 @@ var PSTNInvite = exports.PSTNInvite = (0, _mobxReact.observer)(function () {
       });
     });
   }, []);
-  var handlepstnCall = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+  var handlepstnCall = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:

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

@@ -1,7 +1,7 @@
-import { FcrRoomControl } from 'agora-edu-core/lib/room-control';
 import { FcrUIEventStore } from '../../common/event-store';
 import { UIAction } from '../../utilities/constant';
 import { FcrIPConnectorSessionType, FcrRoomConnectorIpInfo, FcrRoomConnectorPhoneInfo, FcrRoomConnectorPhoneRegion } from 'agora-edu-core/lib/room-control/room-connector-control/type';
+import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
 export declare enum InviteStatus {
     DEFAULT = 0,
     CALLING = 1,
@@ -42,7 +42,7 @@ export default class InviteStore {
     private _voipSessionId;
     private _roomConnectorObserver;
     constructor({ roomControl, uiEventStore, }: {
-        roomControl: FcrRoomControl;
+        roomControl: FcrBaseRoomControl;
         uiEventStore: FcrUIEventStore;
     });
     openInviteDialog(): void;

package/lib/modules/invite/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 _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
@@ -29,6 +45,10 @@ require("core-js/modules/es.function.bind.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.map.js");
+require("core-js/modules/esnext.iterator.map.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");
 require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -42,8 +62,8 @@ var _constant = require("../../utilities/constant");
 var _type = require("agora-edu-core/lib/room-control/room-connector-control/type");
 var _InviteStore;
 var _initProto, _init_InviteStatus, _init_isPstnCalling, _init_isVoipCalling, _init_ipInfo, _init_phoneInfo, _init_calledPstnInfo, _init_calledVoipInfo, _getRoomConnectorIpInfoDecs, _getRoomConnectorPhoneInfoDecs, _startSessionByPhoneDecs, _startSessionByVoipDecs, _handleErrorDecs, _updateInviteStatusDecs, _stopSessionDecs, _resetpstnStatusDecs, _resetVoipStatusDecs, _handlePhoneConnectorSessionStateUpdatedDecs, _handleIPConnectorSessionStateUpdatedDecs, _onUiEventDecs, _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"); }
@@ -187,7 +207,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_getRoomConnectorIpInfo",
     value: function () {
-      var _getRoomConnectorIpInfo2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _getRoomConnectorIpInfo2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -209,7 +229,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_getRoomConnectorPhoneInfo",
     value: function () {
-      var _getRoomConnectorPhoneInfo2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var _getRoomConnectorPhoneInfo2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -243,7 +263,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "startSessionByPhone",
     value: function () {
-      var _startSessionByPhone = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref3) {
+      var _startSessionByPhone = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref3) {
         var phoneNumber, userName, zone;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
@@ -284,7 +304,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "startSessionByVoip",
     value: function () {
-      var _startSessionByVoip = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(address, ipType) {
+      var _startSessionByVoip = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(address, ipType) {
         return _regenerator["default"].wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -339,7 +359,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "stopSession",
     value: function () {
-      var _stopSession = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(type) {
+      var _stopSession = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(type) {
         var sessionId, res;
         return _regenerator["default"].wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {

package/lib/modules/invite/voip-invite.js

@@ -86,7 +86,7 @@ var VoipInvite = exports.VoipInvite = (0, _mobxReact.observer)(function () {
     setIsLoading(false);
   };
   var handleEndCallVoip = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:

package/lib/modules/layout/components/Aside.js

@@ -17,9 +17,9 @@ var _windowHeader = require("agora-ui-foundation/lib/components/window-header");
 var _hooks = require("../../../utilities/hooks");
 var _context = require("../context");
 var _utils = require("./utils");
-var _type2 = require("agora-edu-core/lib/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _iconButton = require("agora-ui-foundation/lib/components/icon-button");
+var _type2 = require("agora-edu-core/lib/room-control/chatroom-control/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var minHeight = 350;
 var DividerHeight = 16;
@@ -86,6 +86,8 @@ var Aside = exports.Aside = (0, _mobxReact.observer)(function (_ref) {
           flex: 1
         },
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_windowHeader.FcrWindowHeader, {
+          showClose: false // 在 Aside 中有自定义的按钮样式，不用 header 中的关闭按钮
+          ,
           title: "".concat(transI18n('fmt_role_participant'), "(").concat(participantCount, ")"),
           type: _windowHeader.WindowType.MODAL,
           onTypeChange: moveParticipantFromAsideToDialog,
@@ -108,6 +110,7 @@ var Aside = exports.Aside = (0, _mobxReact.observer)(function (_ref) {
           flex: 1
         },
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_windowHeader.FcrWindowHeader, {
+          showClose: false,
           title: chatRoomState === _type2.FcrChatRoomConnectionState.Connected ? transI18n('fmt_chat_label_chat') : transI18n('fmt_aside_status_connecting'),
           onTypeChange: moveChatFromAsideToDialog,
           onClose: closeAsideChat,

package/lib/modules/layout/components/Carousel.js

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.Carousel = void 0;
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.slice.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _mobxReact = require("mobx-react");
@@ -23,6 +25,7 @@ var _type3 = require("agora-rte-sdk/lib/core/rtc/type");
 var _agoraEduCore = require("agora-edu-core");
 var _boardContext = _interopRequireDefault(require("../../../utilities/board-context"));
 var _muteAction = require("../../../utilities/mute-action");
+var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
 // import { UserWindow, UserWindowActions } from './UserWindow';
 
@@ -56,9 +59,6 @@ var Carousel = exports.Carousel = (0, _mobxReact.observer)(function () {
     whiteboard = _useContext.whiteboard,
     toggleMainStream = _useContext.toggleMainStream,
     hasPinnedStream = _useContext.hasPinnedStream,
-    streamControl = _useContext.streamControl,
-    deviceStore = _useContext.deviceStore,
-    documentVisible = _useContext.documentVisible,
     getAllowedOperations = _useContext.getAllowedOperations,
     setVideoOrientation = _useContext.setVideoOrientation,
     hasUnmutePermission = _useContext.hasUnmutePermission,
@@ -162,7 +162,7 @@ var Carousel = exports.Carousel = (0, _mobxReact.observer)(function () {
             width: fullWidth,
             gap: Gap
           },
-          children: documentVisible && carouselList.slice(page * itemsPerPage, (page + 1) * itemsPerPage).map(function (windowData) {
+          children: carouselList.slice(page * itemsPerPage, (page + 1) * itemsPerPage).map(function (windowData) {
             var isScreenSharing = windowData.videoSourceType === _agoraEduCore.FcrVideoSourceType.SCREEN;
             var isBoard = windowData.type === _type2.FcrUIWindowType.BOARD;
             var showActionBottomLabel = carouselList.length > 1 && windowData.isSpeakerSpotlight;
@@ -210,7 +210,8 @@ var Carousel = exports.Carousel = (0, _mobxReact.observer)(function () {
                   openPrivateChat: openPrivateChat,
                   windowSize: "normal",
                   windowData: windowData,
-                  iconSize: 16
+                  iconSize: 16,
+                  showRotation: (0, _env.isElectron)()
                 }),
                 videoRenderMode: _type3.AgoraRtcRenderMode.FIT,
                 videoStreamType: _type3.AgoraRtcVideoStreamType.LOW_STREAM,

package/lib/modules/layout/components/Gallery.js

@@ -28,6 +28,8 @@ require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.array.unshift.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _icon = require("agora-ui-foundation/lib/components/icon");
@@ -44,10 +46,11 @@ var _screen = require("../../../utilities/screen");
 var _button = require("agora-ui-foundation/lib/components/button");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _muteAction = require("../../../utilities/mute-action");
+var _env = require("agora-foundation/lib/utilities/env");
 var _jsxRuntime = require("react/jsx-runtime");
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var MinVideoWidth = 192;
 var MinVideoHeight = 114;
 var PaddingX = 25;
@@ -103,9 +106,6 @@ var Gallery = exports.Gallery = (0, _mobxReact.observer)(function () {
     toggleMainStream = _useContext.toggleMainStream,
     hasPinnedStream = _useContext.hasPinnedStream,
     currentShareData = _useContext.currentShareData,
-    streamControl = _useContext.streamControl,
-    deviceStore = _useContext.deviceStore,
-    documentVisible = _useContext.documentVisible,
     getAllowedOperations = _useContext.getAllowedOperations,
     setVideoOrientation = _useContext.setVideoOrientation,
     hasUnmutePermission = _useContext.hasUnmutePermission,
@@ -217,7 +217,7 @@ var Gallery = exports.Gallery = (0, _mobxReact.observer)(function () {
             style: {
               gap: Gap
             },
-            children: documentVisible && row.map(function (windowData) {
+            children: row.map(function (windowData) {
               var size = galleryList.length === 1 ? {
                 width: bounds.width,
                 height: bounds.height - paddingY + 20
@@ -274,7 +274,8 @@ var Gallery = exports.Gallery = (0, _mobxReact.observer)(function () {
                     openPrivateChat: openPrivateChat,
                     windowSize: "large",
                     windowData: windowData,
-                    iconSize: 24
+                    iconSize: 24,
+                    showRotation: (0, _env.isElectron)()
                   }),
                   videoRenderMode: _type3.AgoraRtcRenderMode.FIT,
                   videoStreamType: videoStreamType,

package/lib/modules/layout/components/index.css

@@ -154,6 +154,12 @@
   background-color: var(--fcr_web_ui_scene_fill2);
   font-size: 0;
 }
+.fcr-layout-content-expand button:active {
+  outline: none;
+}
+.fcr-layout-content-expand button:focus {
+  outline: none;
+}
 
 .fcr-layout-content-expand svg {
   transform: rotate(180deg);
@@ -216,6 +222,9 @@
   justify-content: center;
   font-size: 0;
 }
+.fcr-layout-content-carousel-collapse:active {
+  outline: none;
+}
 .fcr-layout-content-carousel-collapse:hover {
   color: var(--fcr_ui_scene_icontext2);
   background-color: var(--fcr_web_ui_scene_hover2);
@@ -293,7 +302,7 @@
   pointer-events: auto;
   position: absolute;
   transform: translate(0, -50%);
-  top: 50%;
+  top: calc(50% + 40px);
   background-color: var(--fcr_web_ui_scene_fill4_popup);
   border-radius: 8px;
   box-shadow: var(--fcr_web_light_dropup);
@@ -301,6 +310,7 @@
   flex-flow: column nowrap;
   align-items: center;
   font-size: 12px;
+  z-index: 10;
 }
 
 .fcr-layout-content-gallery-arrow:has(button:disabled) {

package/lib/modules/layout/components/index.js

@@ -4,6 +4,9 @@ require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.object.define-property.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.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 Object.defineProperty(exports, "__esModule", {
   value: true

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

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