fcr-ui-scene 3.1.1 → 3.3.0

package/lib/modules/chat/util.js

@@ -48,7 +48,7 @@ var handleChatLevelChangedSystemMsg = exports.handleChatLevelChangedSystemMsg =
   var needMsgPrefix = chatLevel === 'everyone' || chatLevel === 'no_one';
   var msgPrefix = '';
   if (needMsgPrefix) {
-    msgPrefix = "".concat(publisherRole === 'union-host' || publisherRole === _type.FcrUserRole.COHOST ? t('fmt_role_cohost') : t('fmt_role_host'), " (").concat(isSelf ? t('I') : breakWord(publisherUsername), ") ");
+    msgPrefix = "".concat(publisherRole === 'union-host' || publisherRole === _type.FcrUserRole.COHOST ? t('fmt_role_cohost') : t('fmt_role_host'), " (").concat(isSelf ? t('fmt_participant_label_Me') : breakWord(publisherUsername), ") ");
   }
   var msg = msgPrefix;
   switch (chatLevel) {

package/lib/modules/connection-gateway/components/phone/components/callinfo/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = 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 _select = require("agora-ui-foundation/lib/components/select");
 require("./index.css");
 var _i18n = require("agora-ui-foundation/lib/i18n");

package/lib/modules/connection-gateway/components/phone/index.js

@@ -7,6 +7,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/esnext.iterator.map.js");
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _button = require("agora-ui-foundation/lib/components/button");

package/lib/modules/connection-gateway/index.d.ts

@@ -1,4 +1,4 @@
-import { FcrMainRoomControl } from 'agora-edu-core';
+import { FcrBaseRoomControl, FcrDesktopMediaControl } from 'agora-edu-core';
 import { UIModule } from '../../base';
 import { FcrUIEventStore } from '../../common/event-store';
 import './index.css';
@@ -6,9 +6,10 @@ import { FcrDeviceStore } from '../../common/device-store';
 export declare class ConnectionGatewayUIModule extends UIModule {
     private _store;
     constructor(args: {
-        roomControl: FcrMainRoomControl;
+        roomControl: FcrBaseRoomControl;
         uiEventStore: FcrUIEventStore;
         deviceStore: FcrDeviceStore;
+        mediaControl: FcrDesktopMediaControl;
     });
     getComponent(): import("react/jsx-runtime").JSX.Element;
     protected onUnload(): void;

package/lib/modules/connection-gateway/index.js

@@ -7,6 +7,8 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.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");

package/lib/modules/connection-gateway/store.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
-import { FcrMainRoomControl } from 'agora-edu-core';
+import { FcrDesktopMediaControl } from 'agora-edu-core';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrPhoneConnectorSession, FcrRoomConnectorPhoneInfo, FcrRoomConnectorSessionReason, FcrRoomConnectorSessionState } from 'agora-edu-core/lib/room-control/room-connector-control/type';
 import { FcrDeviceStore } from '../../common/device-store';
+import { FcrBaseRoomControl } from 'agora-edu-core/lib/room-control/type';
 export declare enum ConnectorRegion {
     CHINA = 1,
     AMERICA = 2
@@ -23,6 +23,7 @@ export default class ConnectionGatewayStore {
     private _uiEventStore;
     private _deviceStore;
     private _streamControl;
+    private _mediaControl;
     private _roomOberver;
     private _streamObserver;
     private _failureTimer;
@@ -45,10 +46,11 @@ export default class ConnectionGatewayStore {
     accessor hasPstnStream: boolean;
     accessor hasOwnPstnStream: boolean;
     accessor hasNeedMergedStream: boolean;
-    constructor({ roomControl, uiEventStore, deviceStore, }: {
-        roomControl: FcrMainRoomControl;
+    constructor({ roomControl, uiEventStore, deviceStore, mediaControl, }: {
+        roomControl: FcrBaseRoomControl;
         uiEventStore: FcrUIEventStore;
         deviceStore: FcrDeviceStore;
+        mediaControl: FcrDesktopMediaControl;
     });
     joinAudioByComputer(): void;
     stopAudioByComputer(): void;

package/lib/modules/connection-gateway/store.js

@@ -20,6 +20,22 @@ require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.regexp.to-string.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", {
@@ -40,9 +56,20 @@ require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.object.values.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.async-iterator.for-each.js");
+require("core-js/modules/esnext.async-iterator.some.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.some.js");
+require("core-js/modules/esnext.json.parse.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");
 require("core-js/modules/web.timers.js");
@@ -51,23 +78,23 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _agoraEduCore = require("agora-edu-core");
 var _mobx = require("mobx");
 var _react = require("react");
 var _constant = require("../../utilities/constant");
 var _decorator = require("agora-foundation/lib/decorator");
 var _store = require("../setting/store");
 var _type = require("agora-edu-core/lib/room-control/room-connector-control/type");
-var _type2 = require("agora-edu-core/lib/type");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _tools = require("../../utilities/tools");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _ConnectionGatewayStore;
 var _initProto, _init_connectType, _init_activeTabKey, _init_rememberMe, _init_rememberedNumberList, _init_connectionPhoneInfo, _init_currentRegion, _init_currentCallInfo, _init_connectInfo, _init_phoneCallState, _init_phoneCallReason, _init_connectSession, _init_calling, _init_outgoingCall, _init_isHangup, _init_hasPstnStream, _init_hasOwnPstnStream, _init_hasNeedMergedStream, _onTabChangeDecs, _onGetConnectInfoDecs, _regionChangeHandlerDecs, _startCallDecs, _stopCallDecs, _setRememberMeDecs, _initRememberedDataDecs, _rememberNumberDecs, _phoneCallUpdatedDecs, _phoneCallReasonDecs, _setStreamStateDecs, _handleStreamsAddedOrUpdatedDecs, _handleStreamsRemovedDecs, _ref;
-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 _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 _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; }
+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"); }
@@ -110,7 +137,8 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     var _this = this;
     var roomControl = _ref2.roomControl,
       uiEventStore = _ref2.uiEventStore,
-      deviceStore = _ref2.deviceStore;
+      deviceStore = _ref2.deviceStore,
+      mediaControl = _ref2.mediaControl;
     (0, _classCallCheck2["default"])(this, ConnectionGatewayStore);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
     (0, _defineProperty2["default"])(this, "_disposers", []);
@@ -146,6 +174,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _P, _init_hasOwnPstnStream(this, false));
     _classPrivateFieldInitSpec(this, _Q, _init_hasNeedMergedStream(this, false));
     this._roomControl = roomControl;
+    this._mediaControl = mediaControl;
     this._uiEventStore = uiEventStore;
     this._streamControl = roomControl.getStreamControl();
     this._userControl = roomControl.getUserControl();
@@ -308,6 +337,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       var list = this._deviceStore.microphoneList;
       if (list.length > 0) {
         this._deviceStore.setMicrophoneId('default');
+        this._mediaControl.setSelectedSpeakerVolume(100);
         this.closeConnectionDialog();
         this._uiEventStore.showToast({
           type: 'normal',
@@ -324,6 +354,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "stopAudioByComputer",
     value: function stopAudioByComputer() {
+      this._mediaControl.setSelectedSpeakerVolume(0);
       this._deviceStore.setMicrophoneId('');
     }
   }, {
@@ -351,7 +382,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "onGetConnectInfo",
     value: function () {
-      var _onGetConnectInfo = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _onGetConnectInfo = (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:
@@ -395,7 +426,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "startCall",
     value: function () {
-      var _startCall = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var _startCall = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var _this$_userControl$ge, phoneUserId, userName;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
@@ -432,7 +463,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "stopCall",
     value: function () {
-      var _stopCall = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var _stopCall = (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:
@@ -616,16 +647,16 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
     value: function _setStreamState() {
       var matchPSTN = function matchPSTN(_ref3) {
         var connectorType = _ref3.connectorType;
-        return connectorType === _type2.FcrRoomConnectorType.PSTN;
+        return connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN;
       };
       var _this$_userControl$ge2 = this._userControl.getLocalUser(),
         userId = _this$_userControl$ge2.userId;
       var myStreams = this._streamControl.getStreamsByUserId(userId);
-      var allStreams = Object.values(this._streamControl.getStreams());
+      var allStreams = this._streamControl.getStreamList();
       this.hasPstnStream = allStreams.some(matchPSTN);
       this.hasOwnPstnStream = myStreams.some(matchPSTN);
       this.hasNeedMergedStream = allStreams.some(function (stream) {
-        return stream.owner.connectorType === _type2.FcrRoomConnectorType.PSTN && stream.connectorType === _type2.FcrRoomConnectorType.PSTN;
+        return stream.owner.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN && stream.connectorType === _agoraEduCore.FcrRoomConnectorType.PSTN;
       });
       this.connectType = this.hasOwnPstnStream ? ConnectType.PHONE : this._deviceStore.microphoneId ? ConnectType.COMPUTER : ConnectType.NONE;
       return {
@@ -650,7 +681,7 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
       try {
         var _loop = function _loop() {
             var modifiedStream = _step.value.modifiedStream;
-            if (modifiedStream.connectorType !== _type2.FcrRoomConnectorType.PSTN) return {
+            if (modifiedStream.connectorType !== _agoraEduCore.FcrRoomConnectorType.PSTN) return {
               v: void 0
             };
             if (myStreams.findIndex(function (stream) {

package/lib/modules/device-pretest/audio-preview/microphone-detection.d.ts

@@ -9,4 +9,5 @@ export declare const MicrophoneDetection: FC<{
     startMicrophoneTest: () => void;
     stopMicrophoneTest: () => void;
     disabled?: boolean;
+    microphoneDetecting: boolean;
 }>;

package/lib/modules/device-pretest/audio-preview/microphone-detection.js

@@ -22,7 +22,8 @@ var MicrophoneDetection = exports.MicrophoneDetection = (0, _mobxReact.observer)
     setMicrophoneDevice = _ref.setMicrophoneDevice,
     startMicrophoneTest = _ref.startMicrophoneTest,
     stopMicrophoneTest = _ref.stopMicrophoneTest,
-    disabled = _ref.disabled;
+    disabled = _ref.disabled,
+    microphoneDetecting = _ref.microphoneDetecting;
   var ns = (0, _useNamespace.useNamespace)('microphone-detection');
   var t = (0, _i18n.useI18n)();
   var _useState = (0, _react.useState)(false),
@@ -64,7 +65,7 @@ var MicrophoneDetection = exports.MicrophoneDetection = (0, _mobxReact.observer)
         disabled: disabled,
         type: "secondary-bordered",
         shape: "rounded",
-        children: t(isDetecting ? 'fmt_internalsetting_status_recording' : 'fmt_setting_button_Mic')
+        children: t(microphoneDetecting ? 'fmt_internalsetting_status_recording' : 'fmt_setting_button_Mic')
       })
     })]
   });

package/lib/modules/device-pretest/audio-preview/speaker-control.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const SpeakerControl: React.FC<{}>;

package/lib/modules/device-pretest/audio-preview/speaker-control.js

@@ -43,7 +43,7 @@ var SpeakerControl = exports.SpeakerControl = (0, _mobxReact.observer)(function
       onClick: handleLouderClick,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
         type: speakerVolume === 0 ? _type.FcrIconType.FCR_V2_QUITE : _type.FcrIconType.FCR_V2_LOUDER_MIN,
-        size: 20,
+        size: 30,
         colors: {
           iconPrimary: speakerVolume === 0 ? 'var(--fcr_ui_scene_ramp_red6)' : 'var(--fcr_web_ui_scene_mainicon1)'
         }

package/lib/modules/device-pretest/context.d.ts

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

package/lib/modules/device-pretest/index.css

@@ -31,10 +31,6 @@
   fill: #ffffff;
 }
 
-.fcr-meeting-preview__wrapper .fcr-device-settings-video__active-tab-wrapper {
-  margin-top: 20px;
-}
-
 .fcr-speaker-control-wrapper {
   display: flex;
   align-items: center;

package/lib/modules/device-pretest/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.css';
 import 'agora-ui-foundation/lib/components/local-video-player/index.css';
 import '../setting/video-settings/index.css';

package/lib/modules/device-pretest/index.js

@@ -200,7 +200,8 @@ var FcrMeetingPreview = exports.FcrMeetingPreview = (0, _mobxReact.observer)(fun
           startLocalVideo: startPlayLocalVideo,
           stopLocalVideo: stopPlayLocalVideo,
           currentVideoViewType: currentVideoViewType,
-          handleVideoViewChange: handleVideoViewChange
+          handleVideoViewChange: handleVideoViewChange,
+          showRotation: (0, _env.isElectron)()
         })
       }),
       speakerElement: (0, _env.isElectron)() ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_speakerControl.SpeakerControl, {}) : null,

package/lib/modules/device-pretest/settings/beauty.js

@@ -7,22 +7,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Beauty = 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _switch = require("agora-ui-foundation/lib/components/switch");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _mobxReact = require("mobx-react");
+var _react = require("react");
 var _useNamespace = require("../../setting/common/useNamespace");
 var _store = require("../../setting/store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var BeautyOptionsCard = function BeautyOptionsCard(props) {
   var ns = (0, _useNamespace.useNamespace)('beauty-setting');
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _classnames["default"])(ns.e('card'), (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, ns.e('card__content-active'), props.isActive), ns.e('card__content-disable'), props.isDisabled)),
-    onClick: props.onCardClick,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+  var transI18n = (0, _i18n.useI18n)();
+  var cardContainerEl = (0, _react.useMemo)(function () {
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: ns.e('card-container'),
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: (0, _classnames["default"])(ns.e('card-container__wrapper'), (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, ns.e('card-container__wrapper-highlight'), props.isHightLight), ns.e('card-container__wrapper-disable'), props.isDisabled)),
@@ -31,7 +34,16 @@ var BeautyOptionsCard = function BeautyOptionsCard(props) {
         className: (0, _classnames["default"])(ns.e('card-title'), (0, _defineProperty2["default"])({}, ns.e('card-title-disable'), props.isDisabled)),
         children: props.title
       })]
-    })
+    });
+  }, [props.title, props.isHightLight, props.isDisabled]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: (0, _classnames["default"])(ns.e('card'), (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, ns.e('card__content-active'), props.isActive), ns.e('card__content-disable'), props.isDisabled)),
+    onClick: props.onCardClick,
+    children: props.cardKey === 'none' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
+      mouseEnterDelay: 0,
+      content: props.isDisabled ? transI18n('fmt_device_options_effects_enable') : transI18n('fmt_device_options_effects_disable'),
+      children: cardContainerEl
+    }) : cardContainerEl
   });
 };
 var Beauty = exports.Beauty = (0, _mobxReact.observer)(function (_ref) {
@@ -86,9 +98,10 @@ var Beauty = exports.Beauty = (0, _mobxReact.observer)(function (_ref) {
       children: transI18n('fmt_device_tips_videoeffectson')
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: ns.e('beauty-options'),
-      children: beautyOptions.map(function (item, index) {
+      children: beautyOptions.map(function (item) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(BeautyOptionsCard, {
           title: item.title,
+          cardKey: item.key,
           isDisabled: !enableBeauty,
           card: item.card,
           isActive: item.key === currentBeautyKey,

package/lib/modules/device-pretest/settings/video-effect.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export type TabKeyType = 'basic' | 'virtual-background' | 'beauty-filter';
 interface IVideoEffect {
     children?: React.ReactNode;

package/lib/modules/device-pretest/settings/video-settings-basic.js

@@ -70,6 +70,7 @@ var VideoSettingsBasic4Custom = exports.VideoSettingsBasic4Custom = (0, _mobxRea
               children: t('fmt_setting_label_Mic')
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_microphoneDetection.MicrophoneDetection, {
               disabled: speakerDetecting,
+              microphoneDetecting: microphoneDetecting,
               microphoneDeviceId: microphoneId !== null && microphoneId !== void 0 ? microphoneId : '',
               microphoneDeviceList: microphoneDeviceList,
               setMicrophoneDevice: setMicrophoneId,

package/lib/modules/device-pretest/settings/virtual-background-setting.js

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.VirtualBackgroundSetting = void 0;
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.function.name.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _useNamespace = require("../../setting/common/useNamespace");
 var _virtualBackdoundResources = require("../assets/virtual-backdound-resources");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");

package/lib/modules/device-pretest/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"));
@@ -38,8 +59,8 @@ var _mobx = require("mobx");
 var _decorator = require("agora-foundation/lib/decorator");
 var _FcrPretestStore;
 var _initProto, _init_previewCameraEnabled, _init_activeTab, _setCameraIdDecs, _setVideoOrientationDecs, _setBeautyOptionsDecs, _setActiveTabDecs, _startPlayLocalVideoDecs, _stopPlayLocalVideoDecs, _setCameraEnabledDecs, _setMicrophoneEnabledDecs, _enableBeautyEffectDecs, _toggleLocalMirrorPreviewDecs, _toggleLocalMirrorDecs, _enableVirtualBackgroundDecs, _setEditBeautyKeyDecs, _handleForceOpenVideoEffectDecs, _handleCancelForceOpenVideoEffectDecs, _setSpeakerIdDecs, _stopMicrophoneTestDecs, _startMicrophoneTestDecs, _setMicrophoneIdDecs, _stopSpeakerTestDecs, _startSpeakerTestDecs, _setSpeakerVolumeDecs, _resetSpeakerVolumeDecs, _restoreSpeakerVolumeDecs, _releaseDecs, _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"); }
@@ -84,9 +105,7 @@ var FcrPretestStore = exports.FcrPretestStore = /*#__PURE__*/function () {
     key: "activeTab",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
-    }
-  }, {
-    key: "activeTab",
+    },
     set: function set(v) {
       _classPrivateFieldSet(_B, this, v);
     }
@@ -316,7 +335,7 @@ var FcrPretestStore = exports.FcrPretestStore = /*#__PURE__*/function () {
     key: "setSpeakerVolume",
     value: function setSpeakerVolume(value) {
       this._deviceStore.setSpeakerVolume(value);
-      this._deviceStore.mediaControl.setSpeakerVolume(value);
+      this._deviceStore.mediaControl.setSelectedSpeakerVolume(value);
     }
   }, {
     key: "resetSpeakerVolume",
@@ -356,7 +375,7 @@ var FcrPretestStore = exports.FcrPretestStore = /*#__PURE__*/function () {
   }, {
     key: "_handleCameraChanged",
     value: function _handleCameraChanged() {
-      var cameraTrack = this._deviceStore.mediaControl.getCameraVideoTrack(this._deviceStore.cameraId);
+      var cameraTrack = this._deviceStore.mediaControl.getCameraTrack(this._deviceStore.cameraId);
       if (this._deviceStore.showCameraPreview) {
         cameraTrack.start();
       }
@@ -365,21 +384,17 @@ var FcrPretestStore = exports.FcrPretestStore = /*#__PURE__*/function () {
   }, {
     key: "_handleCameraListUpdated",
     value: function () {
-      var _handleCameraListUpdated2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(cameraList, currentDeviceExist) {
-        var previewCameraEnabled, deviceId, cameraTrack;
+      var _handleCameraListUpdated2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(cameraList) {
+        var previewCameraEnabled, cameraTrack;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               previewCameraEnabled = this.previewCameraEnabled;
-              if (!currentDeviceExist) {
-                if (cameraList.length > 0) {
-                  deviceId = cameraList[0].deviceId;
-                  this.setCameraId(deviceId);
-                  cameraTrack = this._deviceStore.mediaControl.getCameraVideoTrack(this._deviceStore.cameraId);
-                  if (previewCameraEnabled) {
-                    cameraTrack.start();
-                    this._setPreviewCameraEnabled(true);
-                  }
+              if (cameraList.length > 0) {
+                if (previewCameraEnabled) {
+                  cameraTrack = this._deviceStore.mediaControl.getCameraTrack(this._deviceStore.cameraId);
+                  cameraTrack.start();
+                  this._setPreviewCameraEnabled(true);
                 }
               }
             case 2:
@@ -388,7 +403,7 @@ var FcrPretestStore = exports.FcrPretestStore = /*#__PURE__*/function () {
           }
         }, _callee, this);
       }));
-      function _handleCameraListUpdated(_x, _x2) {
+      function _handleCameraListUpdated(_x) {
         return _handleCameraListUpdated2.apply(this, arguments);
       }
       return _handleCameraListUpdated;

package/lib/modules/dialog/components/chat/electron.js

@@ -36,7 +36,7 @@ var ChatElectronDialog = exports.ChatElectronDialog = (0, _mobxReact.observer)(f
         _dialogs.dialogWindows["delete"](_constant.DialogKey.CHAT);
         store.closeChatFromDialog();
       });
-      (0, _reactDom.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.StoreContext.Provider, {
+      (0, _reactDom.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_context.StoreContext.Provider, {
         value: store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_.ChatDialogContent, {
           chatAction: chatAction,
@@ -48,7 +48,8 @@ var ChatElectronDialog = exports.ChatElectronDialog = (0, _mobxReact.observer)(f
       fullscreen: false,
       maximizable: false,
       y: store.currentDialogBounds.y,
-      show: !(0, _platform.isWindows)()
+      show: !(0, _platform.isWindows)(),
+      transparent: true
     });
     return function () {
       node && (0, _reactDom.unmountComponentAtNode)(node);

package/lib/modules/dialog/components/chat/index.js

@@ -12,8 +12,8 @@ var _reactRnd = require("react-rnd");
 var _context = require("../../context");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _windowHeader = require("agora-ui-foundation/lib/components/window-header");
-var _type = require("agora-edu-core/lib/type");
 var _electron = require("./electron");
+var _type = require("agora-edu-core/lib/room-control/chatroom-control/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var ChatDialogContent = exports.ChatDialogContent = (0, _mobxReact.observer)(function (_ref) {
   var children = _ref.children,

package/lib/modules/dialog/components/confirm/electron.js

@@ -20,7 +20,7 @@ var ConfirmElectronDialog = (0, _mobxReact.observer)(function (_ref) {
   var store = (0, _react.useContext)(_context2.StoreContext);
   (0, _react.useEffect)(function () {
     var node;
-    (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _ref3, x, y;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -48,7 +48,7 @@ var ConfirmElectronDialog = (0, _mobxReact.observer)(function (_ref) {
               (0, _renderer.handleWillClose)(browserWindow, function () {
                 (0, _reactDom.unmountComponentAtNode)(node);
               });
-              (0, _reactDom.render)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_context2.StoreContext.Provider, {
+              (0, _reactDom.render)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_context2.StoreContext.Provider, {
                 value: store,
                 children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
                   className: "fcr-confirm-dialog-wrapper",
@@ -59,14 +59,16 @@ var ConfirmElectronDialog = (0, _mobxReact.observer)(function (_ref) {
               frame: false,
               fullscreen: false,
               maximizable: false,
-              width: (params === null || params === void 0 ? void 0 : params.width) || 415,
-              height: (params === null || params === void 0 ? void 0 : params.height) || 190,
+              // TODO:
+              width: (params === null || params === void 0 ? void 0 : params.width) || 320,
+              height: (params === null || params === void 0 ? void 0 : params.height) || 168 + (params.closable || params.closable === undefined ? 16 : 0),
               minWidth: 255,
               minHeight: 160,
               maxWidth: 620,
               maxHeight: 700,
               x: x + ((params === null || params === void 0 ? void 0 : params.x) || 0),
-              y: y + ((params === null || params === void 0 ? void 0 : params.y) || 0)
+              y: y + ((params === null || params === void 0 ? void 0 : params.y) || 0),
+              transparent: true
             });
           case 9:
           case "end":