fcr-ui-scene 3.4.5 → 3.5.1

package/lib/modules/event-confirm/index.js

@@ -43,9 +43,10 @@ var EventConfirmUIModule = exports.EventConfirmUIModule = /*#__PURE__*/function
         var _this$currentRoomCont;
         this._store = new _store2["default"]({
           uiEventStore: this.eventProvider,
-          dialogProvider: this.dialogProvider
+          dialogProvider: this.dialogProvider,
+          screenShareProvider: this.screenShareProvider
         });
-        this._leaveMeetingStore = new _store.LeaveMeetingStore(this.privilegeProvider, this.roomProvider, (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl);
+        this._leaveMeetingStore = new _store.LeaveMeetingStore(this.privilegeProvider, this.roomProvider, (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl, this.sharedMemberDataSource, this.abilityProvider, this.dialogProvider);
       }
     }
   }, {

package/lib/modules/event-confirm/store.d.ts

@@ -2,23 +2,29 @@ import { ConfirmContentProps } from 'agora-ui-foundation/lib/components/confirm-
 import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIDialogParams } from '../../type';
 import { FcrUIDialogProvider } from '../../providers/dialog-provider';
-export default class CconfirmStore {
+import { FcrUIScreenShareProvider } from '../../providers/screen-share-provider';
+export default class ConfirmStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _disposers;
     private _uiEventProvider;
     private _dialogProvider;
+    private _screenShareProvider;
     private _handleConfirmEventObserver;
+    accessor isReplaceShare: boolean;
     accessor confirms: Map<string, {
         params: ConfirmContentProps;
         timer?: () => void;
     }>;
-    get confirmList(): IteratorObject<ConfirmContentProps, undefined, unknown>;
-    constructor({ uiEventStore, dialogProvider, }: {
+    get confirmList(): ConfirmContentProps[];
+    get isSeizeScreen(): boolean;
+    constructor({ uiEventStore, dialogProvider, screenShareProvider, }: {
         uiEventStore: FcrUIEventProvider;
         dialogProvider: FcrUIDialogProvider;
+        screenShareProvider: FcrUIScreenShareProvider;
     });
     addConfirm(payload: FcrUIDialogParams<ConfirmContentProps>): void;
+    resetIsReplace(): void;
     release(): void;
     private _handleConfirmEvent;
 }
-export declare const StoreContext: import("react").Context<CconfirmStore>;
+export declare const StoreContext: import("react").Context<ConfirmStore>;

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

@@ -26,7 +26,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.StoreContext = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
@@ -60,15 +62,16 @@ 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");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 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 _logger = require("agora-foundation/lib/logger");
 var _mobx = require("mobx");
 var _constant = require("../../utilities/constant");
 var _react = require("react");
-var _CconfirmStore;
-var _initProto, _init_confirms, _addConfirmDecs, _handleConfirmEventDecs, _ref;
+var _logger = require("../../utilities/logger");
+var _ConfirmStore;
+var _initProto, _init_isReplaceShare, _init_confirms, _addConfirmDecs, _resetIsReplaceDecs, _handleConfirmEventDecs, _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(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -82,21 +85,27 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var _A = /*#__PURE__*/new WeakMap();
-_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], "logger");
-var CconfirmStore = exports["default"] = /*#__PURE__*/function () {
-  function CconfirmStore(_ref2) {
+var _B = /*#__PURE__*/new WeakMap();
+_ref = (_addConfirmDecs = [_mobx.action, _mobx.action.bound], _resetIsReplaceDecs = [_mobx.action, _mobx.action.bound], _handleConfirmEventDecs = [_mobx.action, _mobx.action.bound], "logger");
+var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
+  function ConfirmStore(_ref2) {
     var _this = this;
     var uiEventStore = _ref2.uiEventStore,
-      dialogProvider = _ref2.dialogProvider;
-    (0, _classCallCheck2["default"])(this, CconfirmStore);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
+      dialogProvider = _ref2.dialogProvider,
+      screenShareProvider = _ref2.screenShareProvider;
+    (0, _classCallCheck2["default"])(this, ConfirmStore);
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'ConfirmStore'
+    })));
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_handleConfirmEventObserver", {
       onEvent: this._handleConfirmEvent.bind(this)
     });
-    _classPrivateFieldInitSpec(this, _A, _init_confirms(this, new Map()));
+    _classPrivateFieldInitSpec(this, _A, _init_isReplaceShare(this, false));
+    _classPrivateFieldInitSpec(this, _B, _init_confirms(this, new Map()));
     this._uiEventProvider = uiEventStore;
     this._dialogProvider = dialogProvider;
+    this._screenShareProvider = screenShareProvider;
     this._uiEventProvider.addObserver(this._handleConfirmEventObserver);
     this._dialogProvider.addObserver(this._handleConfirmEventObserver);
     this._disposers.push((0, _mobx.reaction)(function () {
@@ -108,45 +117,94 @@ var CconfirmStore = exports["default"] = /*#__PURE__*/function () {
       });
     }));
   }
-  return (0, _createClass2["default"])(CconfirmStore, [{
-    key: "confirms",
+  return (0, _createClass2["default"])(ConfirmStore, [{
+    key: "isReplaceShare",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
     set: function set(v) {
       _classPrivateFieldSet(_A, this, v);
     }
+  }, {
+    key: "confirms",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
   }, {
     key: "confirmList",
     get: function get() {
-      var result = this.confirms.values().map(function (item) {
+      var result = Array.from(this.confirms.values()).map(function (item) {
         return item.params;
       });
       return result;
     }
+  }, {
+    key: "isSeizeScreen",
+    get: function get() {
+      var _this$_screenSharePro;
+      return (_this$_screenSharePro = this._screenShareProvider) === null || _this$_screenSharePro === void 0 ? void 0 : _this$_screenSharePro.isSeizeStream;
+    }
   }, {
     key: "addConfirm",
     value: function addConfirm(payload) {
       var _this2 = this;
       var dialogId = payload.dialogId;
       var params = payload.params;
+      var timer = params.duration ? function () {
+        var timer = setTimeout(function () {
+          (0, _mobx.runInAction)(function () {
+            _this2.confirms["delete"](dialogId);
+          });
+          clearTimeout(timer);
+        }, params.duration || 3000);
+      } : undefined;
+      var confirmParams = {
+        params: _objectSpread(_objectSpread({}, params), {}, {
+          onClose: function onClose() {
+            _this2.confirms["delete"](dialogId);
+          }
+        }),
+        timer: timer
+      };
       if (!this.confirms.get(dialogId)) {
-        this.confirms.set(dialogId, {
-          params: _objectSpread(_objectSpread({}, params), {}, {
-            onClose: function onClose() {
-              _this2.confirms["delete"](dialogId);
-            }
-          }),
-          timer: params.duration ? function () {
-            var timer = setTimeout(function () {
-              (0, _mobx.runInAction)(function () {
-                _this2.confirms["delete"](dialogId);
-              });
-              clearTimeout(timer);
-            }, params.duration || 3000);
-          } : undefined
-        });
+        this.confirms.set(dialogId, confirmParams);
       }
+      var confirmInstance = this.confirms.get(dialogId);
+      if (confirmInstance) {
+        var originOk = confirmInstance.params.onOk;
+        if (originOk) {
+          confirmInstance.params.onOk = /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+            var tip;
+            return _regenerator["default"].wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  confirmInstance.params.okButtonProps = _objectSpread(_objectSpread({}, confirmInstance.params.okButtonProps), {}, {
+                    loading: true
+                  });
+                  _context.next = 3;
+                  return originOk();
+                case 3:
+                  tip = _context.sent;
+                  confirmInstance.params.okButtonProps = _objectSpread(_objectSpread({}, confirmInstance.params.okButtonProps), {}, {
+                    loading: false
+                  });
+                  if (tip) confirmInstance.params.tip = tip;
+                case 6:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          }));
+        }
+      }
+    }
+  }, {
+    key: "resetIsReplace",
+    value: function resetIsReplace() {
+      this.isReplaceShare = false;
     }
   }, {
     key: "release",
@@ -174,8 +232,9 @@ var CconfirmStore = exports["default"] = /*#__PURE__*/function () {
     }
   }]);
 }();
-_CconfirmStore = CconfirmStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_CconfirmStore, [[_mobx.observable, 1, "confirms"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"]], []).e, 2);
-_init_confirms = _applyDecs$e[0];
-_initProto = _applyDecs$e[1];
+_ConfirmStore = ConfirmStore;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ConfirmStore, [[_mobx.observable, 1, "isReplaceShare"], [_mobx.observable, 1, "confirms"], [_mobx.computed, 3, "confirmList"], [_addConfirmDecs, 18, "addConfirm"], [_resetIsReplaceDecs, 18, "resetIsReplace"], [_handleConfirmEventDecs, 18, "_handleConfirmEvent"]], []).e, 3);
+_init_isReplaceShare = _applyDecs$e[0];
+_init_confirms = _applyDecs$e[1];
+_initProto = _applyDecs$e[2];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/event-confirm/view.js

@@ -24,6 +24,7 @@ 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");
+require("core-js/modules/web.timers.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -70,31 +71,46 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
 var ConfirmWindow = (0, _mobxReact.observer)(function (_ref2) {
   var _rndRef$current;
   var confirm = _ref2.confirm;
+  var _useContext2 = (0, _react.useContext)(_store.StoreContext),
+    isSeizeScreen = _useContext2.isSeizeScreen;
   var _ref3 = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {},
     browserWindow = _ref3.browserWindow;
   var rndRef = (0, _react.useRef)(null);
   var windowFocusTimerRef = (0, _react.useRef)();
   var defaultSize = {
-    width: confirm.width || 400,
+    width: confirm.width || 320,
     height: confirm.height ? confirm.height : ((_rndRef$current = rndRef.current) === null || _rndRef$current === void 0 ? void 0 : _rndRef$current.getBoundingClientRect().height) || (confirm.icon ? 160 : 150)
   };
-  var mainWindowBounds = (0, _env.isElectron)() ? window.runtime.browserWindow.getBounds() : {
-    x: 0,
-    y: 0,
-    width: window.innerWidth,
-    height: window.innerHeight
-  };
-  var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
-  var nearDisplay = (0, _env.isElectron)() ? window.runtime.screen.getDisplayNearestPoint((controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds()) || mainWindowBounds).bounds // 如果有 controlbar，就以 controlbar 的位置展示 confirm
-  : {
-    x: 0,
-    y: 0,
+  var baseBounds = {
+    x: window.innerWidth / 2 - defaultSize.width / 2,
+    y: window.innerHeight / 2 - defaultSize.height / 2,
     width: window.innerWidth,
     height: window.innerHeight
   };
+  var _useMemo = (0, _react.useMemo)(function () {
+      var mainWindowBounds = (0, _env.isElectron)() ? window.runtime.browserWindow.getBounds() : baseBounds;
+      var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
+      // 按当前的窗口管理方式，在关闭 controlbar 的时候，controlbar 实际上是隐藏了自己，所以，依然能够通过 controlbar 访问到，所以需要判断是否是 visible 状态
+      // 屏幕抢占时，需要判断是否是抢占屏幕，决定是取 controlbar 的位置计算热区，还是走原有逻辑
+      var needControlbar = controlbar && (isSeizeScreen || controlbar.isVisible());
+      var nearDisplay = (0, _env.isElectron)() ? window.runtime.screen.getDisplayNearestPoint(needControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : mainWindowBounds).bounds // 如果有 controlbar，就以 controlbar 的位置展示 confirm
+      : baseBounds;
+      return {
+        nearDisplay: nearDisplay,
+        controlbar: controlbar,
+        mainWindowBounds: mainWindowBounds,
+        needControlbar: needControlbar
+      };
+    }, []),
+    nearDisplay = _useMemo.nearDisplay,
+    controlbar = _useMemo.controlbar,
+    mainWindowBounds = _useMemo.mainWindowBounds,
+    needControlbar = _useMemo.needControlbar;
+  var x = nearDisplay.width / 2 - defaultSize.width / 2;
+  var y = nearDisplay.height / 2 - defaultSize.height / 2;
   var _useState = (0, _react.useState)({
-      x: 0,
-      y: 0
+      x: x,
+      y: y
     }),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     bounds = _useState2[0],
@@ -113,32 +129,49 @@ var ConfirmWindow = (0, _mobxReact.observer)(function (_ref2) {
     };
     setBounds(coord);
   });
-  (0, _react.useEffect)(function () {
-    setBounds({
-      x: nearDisplay.width / 2 - defaultSize.width / 2,
-      y: nearDisplay.height / 2 - defaultSize.height / 2
-    });
+  var ignoreMouseTimer = (0, _react.useRef)();
+  function recalclate() {
     if ((0, _env.isElectron)() && (0, _platform.isWindows)() && browserWindow && rndRef.current) {
+      var screenBounds = window.runtime.screen.getDisplayNearestPoint(needControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : mainWindowBounds).bounds;
       (0, _tools.handleCheckMouseOver)({
         elem: rndRef.current,
         browserWindow: browserWindow,
-        screenBounds: nearDisplay,
+        screenBounds: screenBounds,
         callback: function callback(timerId) {
           windowFocusTimerRef.current = timerId;
         }
       });
     }
+  }
+  (0, _react.useEffect)(function () {
+    browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(false);
+    recalclate();
+    (0, _env.isElectron)() && (0, _platform.isWindows)() && window.runtime.screen.addListener('display-removed', recalclate);
     return function () {
       clearTimeout(windowFocusTimerRef.current);
+      ignoreMouseTimer.current && clearInterval(ignoreMouseTimer.current);
+      (0, _env.isElectron)() && (0, _platform.isWindows)() && window.runtime.screen.removeListener('display-removed', recalclate);
     };
   }, [rndRef.current /** hack 处理 windows 下，弹出窗口层级不对的问题 */]);
   var handleMouseEnter = function handleMouseEnter() {
-    (0, _env.isElectron)() && (browserWindow === null || browserWindow === void 0 ? void 0 : browserWindow.setIgnoreMouseEvents(false, {
-      forward: true
-    }));
+    ignoreMouseTimer.current && clearInterval(ignoreMouseTimer.current);
+    if ((0, _env.isElectron)()) {
+      browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(false);
+      browserWindow === null || browserWindow === void 0 || browserWindow.focus();
+    }
   };
   var handleMouseLeave = function handleMouseLeave() {
-    (0, _env.isElectron)() && (browserWindow === null || browserWindow === void 0 ? void 0 : browserWindow.setIgnoreMouseEvents(true));
+    if ((0, _env.isElectron)()) {
+      browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
+        forward: true
+      });
+      // 修复老版本的 mac 下，ignore 会失效的问题
+      ignoreMouseTimer.current = setInterval(function () {
+        browserWindow === null || browserWindow === void 0 || browserWindow.setIgnoreMouseEvents(true, {
+          forward: true
+        });
+      }, 1000);
+    }
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, bind()), {}, {
     onMouseLeave: handleMouseLeave,
@@ -156,6 +189,12 @@ var ConfirmWindow = (0, _mobxReact.observer)(function (_ref2) {
       onClick: function onClick(e) {
         return e.stopPropagation();
       },
+      onKeyUp: function onKeyUp(e) {
+        return e.stopPropagation();
+      },
+      onKeyDown: function onKeyDown(e) {
+        return e.stopPropagation();
+      },
       className: "fcr-confirm-dialog-wrapper_web",
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmContent.ConfirmContent, _objectSpread({}, confirm))
     })

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

@@ -62,12 +62,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 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 _logger = require("agora-foundation/lib/logger");
 var _mobx = require("mobx");
 var _constant = require("../../utilities/constant");
 var _toast = require("agora-ui-foundation/lib/components/toast");
 var _react = require("react");
 var _env = require("agora-foundation/lib/utilities/env");
+var _logger = require("../../utilities/logger");
 var _ToastStore;
 var _initProto, _init_toasts, _addToastDecs, _handleToastEventDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -88,7 +88,9 @@ var ToastStore = exports["default"] = /*#__PURE__*/function () {
     var uiEventStore = _ref2.uiEventStore,
       messageProvider = _ref2.messageProvider;
     (0, _classCallCheck2["default"])(this, ToastStore);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'ToastStore'
+    })));
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_toastEventObserver", {
       onEvent: this._handleToastEvent.bind(this)

package/lib/modules/interpreter/action/edit-btn/index.js

@@ -17,12 +17,12 @@ var EditBtn = function EditBtn(props) {
   var transI18n = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     openInterpreterState = _useContext.openInterpreterState,
-    interpreterOff = _useContext.interpreterOff,
+    isInterpreterEnabled = _useContext.isInterpreterEnabled,
     setInterpreterListEditState = _useContext.setInterpreterListEditState,
     interpreterUsersEditState = _useContext.interpreterUsersEditState,
-    interpreterUsersCheckPass = _useContext.interpreterUsersCheckPass,
-    interpreterUsersAllOffLine = _useContext.interpreterUsersAllOffLine;
-  if (!interpreterOff) {
+    isFormValidationPassed = _useContext.isFormValidationPassed,
+    isAllInterpreterUsersOffline = _useContext.isAllInterpreterUsersOffline;
+  if (!isInterpreterEnabled) {
     return null;
   }
   var handleClick = function handleClick() {
@@ -31,7 +31,7 @@ var EditBtn = function EditBtn(props) {
       openInterpreterState();
     }
   };
-  var disabled = interpreterUsersEditState && !interpreterUsersCheckPass || (interpreterUsersEditState ? interpreterUsersAllOffLine : false);
+  var disabled = interpreterUsersEditState && !isFormValidationPassed || (interpreterUsersEditState ? isAllInterpreterUsersOffline : false);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltipWrapper["default"], {
     disabled: disabled,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {

package/lib/modules/interpreter/action/switch-btn/index.js

@@ -18,18 +18,18 @@ var SwitchBtn = function SwitchBtn() {
   var transI18n = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     openInterpreterState = _useContext.openInterpreterState,
-    interpreterOff = _useContext.interpreterOff,
+    isInterpreterEnabled = _useContext.isInterpreterEnabled,
     interpreterUsersEditState = _useContext.interpreterUsersEditState,
-    interpreterUsersCheckPass = _useContext.interpreterUsersCheckPass,
+    isFormValidationPassed = _useContext.isFormValidationPassed,
     closeInterpreterState = _useContext.closeInterpreterState,
-    interpreterUsersAllOffLine = _useContext.interpreterUsersAllOffLine,
+    isAllInterpreterUsersOffline = _useContext.isAllInterpreterUsersOffline,
     closeInterpreterDialog = _useContext.closeInterpreterDialog;
   if (interpreterUsersEditState) {
     return null;
   }
-  var disabled = !interpreterOff && !interpreterUsersCheckPass || (interpreterOff ? false : interpreterUsersAllOffLine);
+  var disabled = !isInterpreterEnabled && !isFormValidationPassed || (isInterpreterEnabled ? false : isAllInterpreterUsersOffline);
   var handleClick = function handleClick() {
-    if (interpreterOff) {
+    if (isInterpreterEnabled) {
       closeInterpreterState();
     } else {
       !disabled && openInterpreterState();
@@ -43,9 +43,9 @@ var SwitchBtn = function SwitchBtn() {
       shape: "rounded",
       size: "XS",
       onClick: handleClick,
-      styleType: interpreterOff ? 'danger' : 'normal',
+      styleType: isInterpreterEnabled ? 'danger' : 'normal',
       disabled: disabled,
-      children: interpreterOff ? transI18n('fmt_interpretation_setting_popup_controller_option_stop_interpretation') : transI18n('fmt_interpretation_setting_popup_controller_option_turn_on_simultaneous')
+      children: isInterpreterEnabled ? transI18n('fmt_interpretation_setting_popup_controller_option_stop_interpretation') : transI18n('fmt_interpretation_setting_popup_controller_option_turn_on_simultaneous')
     })
   });
 };

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

@@ -3,12 +3,16 @@ import { FcrUIEventProvider } from '../../providers/event-provider';
 import { FcrUIInterpreterProvider } from '../../providers/interpreter-provider';
 import { FcrUIMainRoomControlProvider } from '../../providers/room-provider';
 import { FcrUISharedInterpreterDataSource } from '../../shared-data-source/interpreter';
+import { FcrUIMessageProvider } from '../../providers/message-provider';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 export declare class InterpreterUIModule extends UIModule {
     private _store?;
     mainRoomControlProvider?: FcrUIMainRoomControlProvider;
-    eventProvider?: FcrUIEventProvider;
+    messageProvider?: FcrUIMessageProvider;
     interpreterProvider?: FcrUIInterpreterProvider;
     sharedInterpreterDataSource?: FcrUISharedInterpreterDataSource;
+    dialogProvider?: FcrUIDialogProvider;
+    eventProvider?: FcrUIEventProvider;
     onNodeWillActive(): void;
     nodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;

package/lib/modules/interpreter/index.js

@@ -87,9 +87,11 @@ var InterpreterUIModule = exports.InterpreterUIModule = /*#__PURE__*/function (_
       var _this$mainRoomControl;
       this._store = new _store["default"]({
         mainRoomControl: (_this$mainRoomControl = this.mainRoomControlProvider) === null || _this$mainRoomControl === void 0 ? void 0 : _this$mainRoomControl.mainRoomControl,
-        eventProvider: this.eventProvider,
+        messageProvider: this.messageProvider,
         interpreterProvider: this.interpreterProvider,
-        sharedInterpreterDataSource: this.sharedInterpreterDataSource
+        sharedInterpreterDataSource: this.sharedInterpreterDataSource,
+        dialogProvider: this.dialogProvider,
+        eventProvider: this.eventProvider
       });
     }
   }, {

package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-language/index.js

@@ -84,7 +84,7 @@ var PickLanguage = function PickLanguage(props) {
   var transI18n = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     updateInterpreterUsers = _useContext.updateInterpreterUsers,
-    interpreterOff = _useContext.interpreterOff,
+    isInterpreterEnabled = _useContext.isInterpreterEnabled,
     interpreterUsersEditState = _useContext.interpreterUsersEditState,
     languageList = _useContext.languageList;
   var handleChange = function handleChange(data) {
@@ -136,7 +136,7 @@ var PickLanguage = function PickLanguage(props) {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_select.FcrSelect, {
       className: "fcr-simultaneous-interpretation__pick-Language-container-select",
       options: targetOptions,
-      disabled: !interpreterUsersEditState && interpreterOff,
+      disabled: !interpreterUsersEditState && isInterpreterEnabled,
       value: targetValue,
       showSearch: true,
       onChange: function onChange(value) {
@@ -172,7 +172,7 @@ var PickLanguage = function PickLanguage(props) {
       placeholder: transI18n('fmt_interpretation_setting_popup_controller_labe_source_language') // 请选择设备
       ,
       styleType: "white",
-      disabled: !interpreterUsersEditState && interpreterOff
+      disabled: !interpreterUsersEditState && isInterpreterEnabled
     })]
   });
 };

package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-user/index.js

@@ -46,7 +46,7 @@ var PickUser = function PickUser(props) {
   var transI18n = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     updateInterpreterUsers = _useContext.updateInterpreterUsers,
-    interpreterOff = _useContext.interpreterOff,
+    isInterpreterEnabled = _useContext.isInterpreterEnabled,
     interpreterUsersEditState = _useContext.interpreterUsersEditState,
     initUsers = _useContext.initUsers,
     localInterpreterUsers = _useContext.localInterpreterUsers;
@@ -76,7 +76,8 @@ var PickUser = function PickUser(props) {
           userName: userName,
           userRole: _type.FcrUserRole.PARTICIPANT,
           connectorType: _type2.AgoraRteRoomConnectorType.NONE,
-          isOffLine: true
+          isOffLine: true,
+          platform: _type.FcrPlatform.WEB_DESKTOP
         });
       }
     }
@@ -106,11 +107,11 @@ var PickUser = function PickUser(props) {
       return option.value === value;
     });
     if (checkedItem) {
-      var interpreterUsers = _objectSpread(_objectSpread({}, model), {}, {
+      var interpreterUserList = _objectSpread(_objectSpread({}, model), {}, {
         userId: checkedItem.value,
         userName: checkedItem.text
       });
-      updateInterpreterUsers(interpreterUsers);
+      updateInterpreterUsers(interpreterUserList);
     }
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_select.FcrSelect, {
@@ -119,7 +120,7 @@ var PickUser = function PickUser(props) {
     options: options,
     value: model.userId,
     onChange: onChange,
-    disabled: !interpreterUsersEditState && interpreterOff,
+    disabled: !interpreterUsersEditState && isInterpreterEnabled,
     placeholder: transI18n('fmt_interpretation_setting_popup_controller_labe_search_name'),
     styleType: "white",
     tag: tag

package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-user/option-Item.js

@@ -21,10 +21,10 @@ var OptionItem = (0, _mobxReact.observer)(function (props) {
   var transI18n = (0, _i18n.useI18n)();
   var userRole = (0, _react.useMemo)(function () {
     if (_fcrCore.FcrUserRole.HOST === model.userRole) {
-      return transI18n('fmt_interpretation_interpreter_popup_special_co_host');
+      return transI18n('fmt_role_host');
     }
     if (_fcrCore.FcrUserRole.COHOST === model.userRole) {
-      return transI18n('fmt_interpretation_interpreter_popup_special_host');
+      return transI18n('fmt_role_cohost');
     }
     return null;
   }, [model.userRole]);

package/lib/modules/interpreter/interpreter-list/interpreter-item/index.js

@@ -20,11 +20,11 @@ var InterpreterItem = function InterpreterItem(props) {
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     interpreterUsersEditState = _useContext.interpreterUsersEditState,
     localInterpreterUsers = _useContext.localInterpreterUsers,
-    interpreterOff = _useContext.interpreterOff;
+    isInterpreterEnabled = _useContext.isInterpreterEnabled;
   var model = props.model,
     index = props.index;
   var t = (0, _i18n.useI18n)();
-  var isShow = localInterpreterUsers.length > 1 && (interpreterUsersEditState || !interpreterOff);
+  var isShow = localInterpreterUsers.length > 1 && (interpreterUsersEditState || !isInterpreterEnabled);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-simultaneous-interpretation__interpreter-Item-container",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

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

@@ -5,9 +5,11 @@ export default class InterpreterStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _mainRoomControl;
     private _userControl;
-    private _eventProvider;
+    private _messageProvider;
+    private _dialogProvider;
     private _interpreterProvider;
     private _sharedInterpreterDataSource;
+    private _eventProvider;
     private _dialogInfo;
     private _confirmDialogs;
     private _interpreterProviderObserver;
@@ -19,12 +21,12 @@ export default class InterpreterStore {
         isOffLine: boolean;
     }>;
     accessor currentDialogId: string | null;
-    get interpreterOff(): boolean;
+    get isInterpreterEnabled(): boolean;
     get hasEnableInterpreterPermission(): boolean;
-    get interpreterUsersCheckPass(): boolean;
-    get interpreterUsersAllOffLine(): boolean;
+    get isFormValidationPassed(): boolean;
+    get isAllInterpreterUsersOffline(): boolean;
     get languageList(): FcrLanguage[];
-    constructor({ mainRoomControl, eventProvider, interpreterProvider, sharedInterpreterDataSource, }: InterpreterStoreProps);
+    constructor({ mainRoomControl, messageProvider, dialogProvider, interpreterProvider, sharedInterpreterDataSource, eventProvider, }: InterpreterStoreProps);
     openInterpreterState(): void;
     closeInterpreterState(): void;
     setInterpreterListEditState(): void;
@@ -45,6 +47,7 @@ export default class InterpreterStore {
     private _updateUsers;
     closeInterpreterDialog(): void;
     private _handleUiEvents;
+    private _updatePublishAudioPrivilegeOfStreams;
     release(): void;
 }
 export declare const StoreContext: import("react").Context<InterpreterStore>;