fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib-es/modules/state-bar/store.base.js

@@ -90,13 +90,13 @@ import debounce from 'lodash/debounce';
 import { FcrRoomType } from 'fcr-core/lib/room-control/type';
 import { MinAsideWidth } from '../layout/view';
 import { createLogger } from '../../utilities/logger';
-import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import { FcrUIObjectKeys } from '../../object-manager';
 import { DeviceSettingTab } from '../setting/type';
 import { createContext } from 'react';
 import { getInvitationInfoByRoomInfo } from '../../utilities/meeting-detail';
 import { cloudRecordingConfig } from '../../utilities/default-config';
 import { enterFullScreen as _enterFullScreen, exitFullScreen as _exitFullScreen, isFullScreen } from '../../utilities/browser-api';
+import { FcrUIToastKey } from '../../modules/toast-manager/type';
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -194,6 +194,7 @@ export var StateBarStoreBase = /*#__PURE__*/function () {
       _this._setBrowserWidth(window.innerWidth)(); // 打开或关闭边栏
     }), function () {
       window.removeEventListener('resize', resizeHandler);
+      resizeHandler.cancel(); // 取消 debounce
     });
     this.roomInfo = this._roomControl.getRoomInfo();
     this.roomSchedule = this._roomControl.getRoomSchedule();
@@ -304,11 +305,6 @@ export var StateBarStoreBase = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_M, this, v);
     }
-  }, {
-    key: "annotationHasStart",
-    get: function get() {
-      return false;
-    }
   }, {
     key: "shouldShowMeetingTime",
     get: function get() {
@@ -483,7 +479,7 @@ export var StateBarStoreBase = /*#__PURE__*/function () {
   }, {
     key: "showToast",
     value: function showToast(params) {
-      this._messageProvider.showToast(params);
+      this._messageProvider.showToastByKey(params);
     }
   }, {
     key: "showNotification",
@@ -498,16 +494,15 @@ export var StateBarStoreBase = /*#__PURE__*/function () {
   }, {
     key: "toastCannotToggleLayoutWhenSharing",
     value: function toastCannotToggleLayoutWhenSharing() {
-      var generateI18nKey = this.isLiveStreaming ? 'fmt_livestream_unable_switch_grid_view' : 'fmt_statusbar_hover_unable_switch_grid_view';
-      this._messageProvider.showToast({
-        type: 'normal',
-        message: transI18n(generateI18nKey)
+      this._messageProvider.showToastByKey({
+        key: FcrUIToastKey.FMT_STATUSBAR_HOVER_UNABLE_SWITCH_GRID_VIEW
       });
     }
   }, {
     key: "_onNetworkQualityUpdated",
     value: function _onNetworkQualityUpdated(_roomId, event) {
-      switch (event.txQuality) {
+      var networkQuality = Math.max(event.rxQuality, event.txQuality);
+      switch (networkQuality) {
         case 0:
         case 1:
           this.setNetworkStatus('excellent');
@@ -558,24 +553,20 @@ export var StateBarStoreBase = /*#__PURE__*/function () {
     key: "_onCloudRecordingStateUpdated",
     value: function _onCloudRecordingStateUpdated(roomId, state) {
       if (state === FcrRecordingState.Starting) {
-        this._messageProvider.showToast({
-          type: 'normal',
-          message: transI18n('fmt_record_tips_Cloudrecording_Start')
+        this._messageProvider.showToastByKey({
+          key: FcrUIToastKey.FMT_RECORD_TIPS_CLOUDRECORDING_START
         });
       } else if (state === FcrRecordingState.Started) {
-        this._messageProvider.showToast({
-          type: 'normal',
-          message: transI18n('fmt_localrecord_tips_already_start')
+        this._messageProvider.showToastByKey({
+          key: FcrUIToastKey.FMT_LOCALRECORD_TIPS_ALREADY_START
         });
       } else if (state === FcrRecordingState.Paused) {
-        this._messageProvider.showToast({
-          type: 'normal',
-          message: transI18n('fmt_record_toast_record_paused')
+        this._messageProvider.showToastByKey({
+          key: FcrUIToastKey.FMT_RECORD_TOAST_RECORD_PAUSED
         });
       } else if (state === FcrRecordingState.Stopped) {
-        this._messageProvider.showToast({
-          type: 'normal',
-          message: transI18n('fmt_record_record_stoped')
+        this._messageProvider.showToastByKey({
+          key: FcrUIToastKey.FMT_RECORD_RECORD_STOPED
         });
       }
       this.cloudRecordingState = state;

package/lib-es/modules/state-bar/view.js

@@ -6,7 +6,7 @@ import "core-js/modules/es.string.replace.js";
 import { useI18n } from 'agora-ui-foundation/lib/i18n';
 import { observer } from 'mobx-react';
 import './index.css';
-import { useNamespace } from '../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import stepDivider from '../../../public/assets/step-gradient.svg';
 import { FcrIcon } from 'agora-ui-foundation/lib/components/icon';
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
@@ -27,9 +27,10 @@ import classNames from 'classnames';
 import { FcrRoomType } from 'fcr-core/lib/room-control/type';
 import { GALLERY_MIN_SIZE } from '../../utilities/constant';
 import { FcrUINotificationContentType } from '../../type';
-import { copyText } from '../../utilities/browser-api';
+import { copyText } from 'agora-ui-foundation/lib/utilities/copy-text';
 import { debounce } from 'lodash';
 import { SubtitlesHistoryState } from './subtitles-history-state';
+import { FcrUIToastKey } from '../../modules/toast-manager/type';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export var MyFcrToolTip = function MyFcrToolTip(props) {
   return /*#__PURE__*/_jsx(FcrToolTip, {
@@ -122,13 +123,11 @@ export var View = observer(function () {
     if (!copyMeetingId) return;
     copyText(copyMeetingId).then(function () {
       showToast({
-        type: 'normal',
-        message: t('fmt_information_tips_beencopied')
+        key: FcrUIToastKey.FMT_INFORMATION_TIPS_BEENCOPIED
       });
     })["catch"](function () {
       showToast({
-        type: 'warn',
-        message: t('fmt_information_tips_numbercopyfailed')
+        key: FcrUIToastKey.FMT_INFORMATION_TIPS_NUMBERCOPYFAILED
       });
     });
   };

package/lib-es/modules/subtitles-history/components/list-item.js

@@ -1,6 +1,7 @@
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.date.to-string.js";
 import { FcrAvatar } from 'agora-ui-foundation/lib/components/avatar';
+import { FcrUISttActionType } from '../../../providers/stt-provider/type';
 import { forwardRef, useEffect, useRef } from 'react';
 import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -61,7 +62,11 @@ var renderSentence = function renderSentence(item, showTwoLine, isTranslateLangu
 var renderAction = function renderAction(item) {
   return /*#__PURE__*/_jsx("div", {
     className: "fcr-subtitles-history__list__item__action",
-    children: item.actionType === 'START_TRANSLATION' ? transI18n('fmt_ai_transcriptions_sidebar_tips_turnon') : transI18n('fmt_ai_transcriptions_sidebar_tips_turnoff')
+    children: item.actionType === FcrUISttActionType.START_TRANSCRIBING ? transI18n('fmt_ai_subtitles_toast_started_transcription', {
+      reason1: ''
+    }) : transI18n('fmt_ai_subtitles_toast_stopped_transcription', {
+      reason1: ''
+    })
   });
 };
 export var SubtitlesHistoryListItem = /*#__PURE__*/forwardRef(function (props, ref) {

package/lib-es/modules/subtitles-history/index.css

@@ -39,10 +39,6 @@
   height: 100%;
 }
 
-.fcr-dialog-container .fcr-subtitles-history-wrapper-electron {
-  height: calc(100% - 46px);
-}
-
 .fcr-subtitles-history-container {
   height: 100%;
   display: flex;
@@ -67,7 +63,8 @@
 
 .fcr-subtitles-history__list__item__action {
   margin: 0 auto;
-  width: 128px;
+  padding: 0 16px;
+  min-width: 128px;
   height: 30px;
   color: var(--fcr_ui_scene_icontext1);
   font-weight: 300;

package/lib-es/modules/subtitles-history/store.base.js

@@ -78,6 +78,7 @@ import { FcrUINotificationContentType } from '../../type';
 import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import { RespondDialogContent } from './components/respond-dialog-content';
 import { Duration } from 'fcr-core/lib/imports';
+import { FcrUIToastKey } from '../../modules/toast-manager/type';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var _A = /*#__PURE__*/new WeakMap();
 _ref = (_toggleOpenDecs = [void 0, action, action, action.bound], "logger");
@@ -136,10 +137,20 @@ var SubtitlesHistoryStoreBase = /*#__PURE__*/function () {
       // === 转写关闭时的处理 ===
       if (!isOpen) {
         _this._messageProvider.closeNotification(FcrUINotificationContentType.TRANSCRIBING);
-        _this._messageProvider.showToast({
-          type: isSelf ? 'normal' : 'info',
-          message: _this._getStopTranscribingTip(isSelf, _this.openOrStopTranscribingUserName)
-        });
+        if (isSelf) {
+          _this._messageProvider.showToastByKey({
+            key: FcrUIToastKey.FMT_AI_SUBTITLES_LABEL_STOPPED_TRANSCRIPTION_SELF
+          });
+        } else {
+          _this._messageProvider.showToastByKey({
+            key: FcrUIToastKey.FMT_AI_SUBTITLES_TOAST_STOPPED_TRANSCRIPTION,
+            params: {
+              transI18nOptions: {
+                reason1: _this.openOrStopTranscribingUserName
+              }
+            }
+          });
+        }
         return;
       }
 
@@ -431,9 +442,8 @@ var SubtitlesHistoryStoreBase = /*#__PURE__*/function () {
               while (1) switch (_context5.prev = _context5.next) {
                 case 0:
                   _this2._closeRequestDialog(id);
-                  _this2._messageProvider.showToast({
-                    type: 'normal',
-                    message: transI18n('fmt_ai_subtitles_toast_rtt_request_sent')
+                  _this2._messageProvider.showToastByKey({
+                    key: FcrUIToastKey.FMT_AI_SUBTITLES_TOAST_RTT_REQUEST_SENT
                   });
                   _context5.prev = 1;
                   _context5.next = 2;
@@ -736,11 +746,13 @@ var SubtitlesHistoryStoreBase = /*#__PURE__*/function () {
         if (this._respondDialogId) {
           this._closeRespondDialog(this._respondDialogId);
         }
-        this._messageProvider.showToast({
-          type: 'info',
-          message: transI18n('fmt_ai_subtitles_toast_rtt_host_declined_request', {
-            reason1: _senderUser.userName
-          })
+        this._messageProvider.showToastByKey({
+          key: FcrUIToastKey.FMT_AI_SUBTITLES_TOAST_RTT_HOST_DECLINED_REQUEST,
+          params: {
+            transI18nOptions: {
+              reason1: _senderUser.userName
+            }
+          }
         });
       }
     }

package/lib-es/modules/subtitles-history/store.electron.js

@@ -65,6 +65,8 @@ import { bound } from 'agora-foundation/lib/decorator';
 import { FcrUIObjectKeys } from '../../object-manager';
 import SubtitlesHistoryStoreBase from './store.base';
 import { computed, observable, runInAction } from 'mobx';
+import { FcrUIDialogKey } from '../../utilities/constant';
+import { electronWindowConfig } from '../dialog/dialogs/subtitles-history';
 var _A = /*#__PURE__*/new WeakMap();
 var SubtitlesHistoryStoreElectron = /*#__PURE__*/function (_SubtitlesHistoryStor) {
   function SubtitlesHistoryStoreElectron(args) {
@@ -76,13 +78,17 @@ var SubtitlesHistoryStoreElectron = /*#__PURE__*/function (_SubtitlesHistoryStor
     _defineProperty(_this, "_screenShareObserver", {
       onPrepreScreenCapture: _this._handleScreenShareStarted,
       onScreenShareErrorOccurred: _this._handleScreenShareStopped,
-      onScreenShareStopped: _this._handleScreenShareStopped,
-      onShareSourceReplaced: _this._handleScreenShareStopped
+      onScreenShareStopped: _this._handleScreenShareStopped
     });
     /** screen share provide 的 isLocalUserScreenSharing 依赖服务端下发的屏幕共享流有延迟, 所以独立维护一个状态 */
     _classPrivateFieldInitSpec(_this, _A, _init__isLocalUserScreenSharing(_this, false));
     _this._screenShareProvider = objectManager.getObject(FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER);
     _this._screenShareProvider.addObserver(_this._screenShareObserver);
+    var windowProvider = objectManager.getObject(FcrUIObjectKeys.P_WINDOW_PROVIDER);
+
+    // 提前创建转写历史窗口, 以便在屏幕共享时过滤此窗口
+    windowProvider.setWindowOptions(FcrUIDialogKey.SUBTITLES_HISTORY, electronWindowConfig);
+    windowProvider.getWindowById(FcrUIDialogKey.SUBTITLES_HISTORY);
     return _this;
   }
   _inherits(SubtitlesHistoryStoreElectron, _SubtitlesHistoryStor);

package/lib-es/modules/subtitles-history/view.js

@@ -10,7 +10,6 @@ import { SubtitlesHistoryList } from './components/list';
 import Empty from './empty';
 import { FcrToolTip } from 'agora-ui-foundation/lib/components/tooltip';
 import classNames from 'classnames';
-import { isElectron } from 'agora-foundation/lib/utilities/env';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var SubtitlesHistoryState = function SubtitlesHistoryState(props) {
   var t = useI18n();
@@ -45,9 +44,7 @@ export var SubtitlesHistory = observer(function () {
     translateLanguage = _useContext.translateLanguage,
     isTwoLineTranscribingEnabled = _useContext.isTwoLineTranscribingEnabled;
   return /*#__PURE__*/_jsx("div", {
-    className: classNames('fcr-subtitles-history-wrapper', {
-      'fcr-subtitles-history-wrapper-electron': isElectron()
-    }),
+    className: classNames('fcr-subtitles-history-wrapper'),
     children: /*#__PURE__*/_jsxs("div", {
       className: "fcr-subtitles-history-container",
       children: [/*#__PURE__*/_jsx(SubtitlesHistoryState, {
@@ -71,9 +68,14 @@ export var SubtitlesHistory = observer(function () {
           children: /*#__PURE__*/_jsx(FcrButton, {
             className: "fcr-subtitles-history__footer__btn",
             size: "XS",
-            type: "secondary",
+            type: "secondary-bordered",
             loading: isLoading,
             disabled: !hasStopTranscribePermission || isLoading,
+            postIconProps: {
+              colors: {
+                iconPrimary: 'currentColor'
+              }
+            },
             onClick: function onClick() {
               toggleOpen();
             },

package/lib-es/modules/toast-manager/index.js

@@ -0,0 +1,50 @@
+import "core-js/modules/es.reflect.construct.js";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import "core-js/modules/es.error.cause.js";
+import "core-js/modules/es.error.to-string.js";
+import "core-js/modules/es.array.concat.js";
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(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; })(); }
+import { UIModule } from '../../base';
+import { ToastManagerStore } from './store';
+export var ToastManagerUIModule = /*#__PURE__*/function (_UIModule) {
+  function ToastManagerUIModule() {
+    var _this;
+    _classCallCheck(this, ToastManagerUIModule);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, ToastManagerUIModule, [].concat(args));
+    _defineProperty(_this, "_store", null);
+    return _this;
+  }
+  _inherits(ToastManagerUIModule, _UIModule);
+  return _createClass(ToastManagerUIModule, [{
+    key: "store",
+    get: function get() {
+      if (!this._store) {
+        throw new Error('ToastManagerStore is not initialized');
+      }
+      return this._store;
+    }
+  }, {
+    key: "onNodeWillActive",
+    value: function onNodeWillActive() {
+      var objectManager = this.objectManager;
+      var args = {
+        objectManager: objectManager
+      };
+      this._store = new ToastManagerStore(args);
+    }
+  }, {
+    key: "nodeWillInactive",
+    value: function nodeWillInactive() {
+      this.store.release();
+    }
+  }]);
+}(UIModule);