fcr-ui-scene 3.6.0 → 3.6.1

package/lib/modules/dialog/hooks/useElectron.js

@@ -33,7 +33,7 @@ var _store = require("../store");
 var _dialogs = require("../dialogs");
 var _renderer = require("../../../utilities/renderer");
 var _reactDom = require("react-dom");
-var _constant = require("../../../utilities/constant");
+var _tools = require("../../../utilities/tools");
 var _jsxRuntime = require("react/jsx-runtime");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -67,7 +67,6 @@ function useElectronDialog(props) {
     fullScreen = props.fullScreen,
     onOpened = props.onOpened,
     onUnmounted = props.onUnmounted,
-    polyfills = props.polyfills,
     _props$hasCustomShado = props.hasCustomShadow,
     hasCustomShadow = _props$hasCustomShado === void 0 ? true : _props$hasCustomShado,
     _props$disableShortcu = props.disableShortcutClose,
@@ -92,53 +91,15 @@ function useElectronDialog(props) {
   (0, _react.useEffect)(function () {
     var node;
     window.runtime.openRendererWindow(dialogKey, function (dom, browserWindow, newRendererWindow) {
-      var _controlbar$isVisible;
       node = dom;
       windowRef.current = browserWindow;
       newRendernerWindowRef.current = newRendererWindow;
       _dialogs.dialogWindows.set(dialogKey, browserWindow);
-      var thisWindowBounds = browserWindow.getBounds();
-      var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
-      var nearDisplayBounds = window.runtime.screen.getDisplayNearestPoint(mainAppWindowBounds).bounds;
-      var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
-      if (controlbar && controlbar !== null && controlbar !== void 0 && (_controlbar$isVisible = controlbar.isVisible) !== null && _controlbar$isVisible !== void 0 && _controlbar$isVisible.call(controlbar)) {
-        // 因为打开过的窗口在关闭时是用的 hide 方法，因此只判断 controlbar 是否存在会在关闭 controlbar 时失效，导致窗口依然跟随 controlbar 最后所在屏幕打开，所以要再判断一下 isVisible 状态
-        // 当屏幕共享时会打开 control bar，此时弹窗相对于 control bar 展示
-        var nearDisplay = window.runtime.screen.getDisplayNearestPoint(controlbar.getBounds());
-        var _nearDisplayBounds = nearDisplay.bounds;
-        var _thisWindowBounds = browserWindow.getBounds();
-        var centerBounds = {
-          x: Math.floor(_nearDisplayBounds.x + (_nearDisplayBounds.width - _thisWindowBounds.width) / 2),
-          y: Math.floor(_nearDisplayBounds.y + (_nearDisplayBounds.height - _thisWindowBounds.height) / 2)
-        };
-        // resizeble 为 true 的窗口在切换不同分辨率属性的显示器时，会有打开尺寸失真的情况出现，所以暂存一下其原始值，在更改坐标之后还原
-        var resizeble = browserWindow.isResizable();
-        browserWindow.setResizable(false);
-        browserWindow.setBounds(centerBounds);
-        browserWindow.setResizable(resizeble);
-      } else if (fullScreen) {
-        var _browserWindow$setBou;
-        // 当窗口的自定义设置为全屏时，让弹窗追随主窗口所在的屏幕展示
-        // 目前 fullScreen 的配置主要用于 toast 和 confirm，在应用启动时会直接初始化这两个 dialog，如果未设置 fullScreen，它们因为没有宽高将无法展示
-        var x = nearDisplayBounds.x,
-          y = nearDisplayBounds.y,
-          width = nearDisplayBounds.width,
-          height = nearDisplayBounds.height;
-        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou = browserWindow.setBounds) === null || _browserWindow$setBou === void 0 || _browserWindow$setBou.call(browserWindow, {
-          x: x,
-          y: y,
-          width: width,
-          height: height
-        });
-      } else {
-        var _browserWindow$setBou2;
-        // 如果窗口未设置全屏模式，那么新打开的弹窗相对于主窗口弹窗的水平垂直居中显示
-        var bounds = {
-          x: Math.floor(mainAppWindowBounds.x + (mainAppWindowBounds.width - thisWindowBounds.width) / 2),
-          y: Math.floor(mainAppWindowBounds.y + (mainAppWindowBounds.height - thisWindowBounds.height) / 2)
-        };
-        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou2 = browserWindow.setBounds) === null || _browserWindow$setBou2 === void 0 || _browserWindow$setBou2.call(browserWindow, bounds);
-      }
+      var _ref = (0, _tools.followCorrectDisplay)({
+          browserWindow: browserWindow,
+          alwaysFollowScreen: fullScreen
+        }),
+        nearDisplayBounds = _ref.nearDisplayBounds;
 
       // 设置所有窗口为所有工作区可见
       browserWindow.setVisibleOnAllWorkspaces(true, {
@@ -248,7 +209,6 @@ function useElectronDialogByDialogId(props) {
     fullScreen = props.fullScreen,
     onOpened = props.onOpened,
     onUnmounted = props.onUnmounted,
-    polyfills = props.polyfills,
     _props$hasCustomShado2 = props.hasCustomShadow,
     hasCustomShadow = _props$hasCustomShado2 === void 0 ? true : _props$hasCustomShado2,
     _props$disableShortcu2 = props.disableShortcutClose,
@@ -274,52 +234,15 @@ function useElectronDialogByDialogId(props) {
   (0, _react.useEffect)(function () {
     var node;
     window.runtime.openRendererWindow(winUniqueId, function (dom, browserWindow, newRendererWindow) {
-      var _controlbar$isVisible2;
       node = dom;
       windowRef.current = browserWindow;
       newRendernerWindowRef.current = newRendererWindow;
       _dialogs.dialogIdWindows.set(winUniqueId, browserWindow);
-      var thisWindowBounds = browserWindow.getBounds();
-      var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
-      var nearDisplayBounds = window.runtime.screen.getDisplayNearestPoint(mainAppWindowBounds).bounds;
-      var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
-      if (controlbar && controlbar !== null && controlbar !== void 0 && (_controlbar$isVisible2 = controlbar.isVisible) !== null && _controlbar$isVisible2 !== void 0 && _controlbar$isVisible2.call(controlbar)) {
-        // 因为打开过的窗口在关闭时是用的 hide 方法，因此只判断 controlbar 是否存在会在关闭 controlbar 时失效，导致窗口依然跟随 controlbar 最后所在屏幕打开，所以要再判断一下 isVisible 状态
-        // 当屏幕共享时会打开 control bar，此时弹窗相对于 control bar 展示
-        var nearDisplay = window.runtime.screen.getDisplayNearestPoint(controlbar.getBounds());
-        var _nearDisplayBounds2 = nearDisplay.bounds;
-        var _thisWindowBounds2 = browserWindow.getBounds();
-        var centerBounds = {
-          x: Math.floor(_nearDisplayBounds2.x + (_nearDisplayBounds2.width - _thisWindowBounds2.width) / 2),
-          y: Math.floor(_nearDisplayBounds2.y + (_nearDisplayBounds2.height - _thisWindowBounds2.height) / 2)
-        };
-        // resizeble 为 true 的窗口在切换不同分辨率属性的显示器时，会有打开尺寸失真的情况出现，所以暂存一下其原始值，在更改坐标之后还原
-        var resizeble = browserWindow.isResizable();
-        browserWindow.setResizable(false);
-        browserWindow.setBounds(centerBounds);
-        browserWindow.setResizable(resizeble);
-      } else if (fullScreen) {
-        var _browserWindow$setBou3;
-        // 当窗口的自定义设置为全屏时，让弹窗追随主窗口所在的屏幕展示
-        var x = nearDisplayBounds.x,
-          y = nearDisplayBounds.y,
-          width = nearDisplayBounds.width,
-          height = nearDisplayBounds.height;
-        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou3 = browserWindow.setBounds) === null || _browserWindow$setBou3 === void 0 || _browserWindow$setBou3.call(browserWindow, {
-          x: x,
-          y: y,
-          width: width,
-          height: height
-        });
-      } else {
-        var _browserWindow$setBou4;
-        // 如果主窗口不是全屏模式，那么新打开的弹窗相对于主窗口弹窗的水平垂直居中显示
-        var bounds = {
-          x: Math.floor(mainAppWindowBounds.x + (mainAppWindowBounds.width - thisWindowBounds.width) / 2),
-          y: Math.floor(mainAppWindowBounds.y + (mainAppWindowBounds.height - thisWindowBounds.height) / 2)
-        };
-        browserWindow === null || browserWindow === void 0 || (_browserWindow$setBou4 = browserWindow.setBounds) === null || _browserWindow$setBou4 === void 0 || _browserWindow$setBou4.call(browserWindow, bounds);
-      }
+      var _ref2 = (0, _tools.followCorrectDisplay)({
+          browserWindow: browserWindow,
+          alwaysFollowScreen: fullScreen
+        }),
+        nearDisplayBounds = _ref2.nearDisplayBounds;
 
       // 设置所有窗口为所有工作区可见
       browserWindow.setVisibleOnAllWorkspaces(true, {

package/lib/modules/dialog/index.js

@@ -52,7 +52,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireDefault(require("react"));
 var _base = require("../../base");
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");

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

@@ -74,7 +74,6 @@ var _react = require("react");
 var _logger = require("../../utilities/logger");
 var _decorator = require("agora-foundation/lib/decorator");
 var _tools = require("../../utilities/tools");
-var _dialogs = require("../dialog/dialogs");
 var _env = require("agora-foundation/lib/utilities/env");
 var _ConfirmStore;
 var _initProto, _init_isReplaceShare, _init_calculateMethods, _init_reposition, _init_confirms, _init_screenBounds, _addConfirmDecs, _resetIsReplaceDecs, _handleConfirmEventDecs, _ref;
@@ -134,13 +133,16 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       return (_this$_screenShareDat = _this._screenShareDataSource) === null || _this$_screenShareDat === void 0 ? void 0 : _this$_screenShareDat.currentShareBounds;
     }, function (bounds) {
       if (bounds) {
-        var _dialogWindows$get;
-        (_dialogWindows$get = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONFIRM)) === null || _dialogWindows$get === void 0 || _dialogWindows$get.setBounds(bounds);
+        var _ref3 = (0, _tools.followCorrectDisplay)({
+            dialogKey: _constant.FcrUIDialogKey.CONFIRM,
+            alwaysFollowScreen: true
+          }),
+          nearDisplayBounds = _ref3.nearDisplayBounds;
         _this.calculateMethods.forEach(function (method) {
-          return method(bounds);
+          return method(nearDisplayBounds);
         });
-        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(bounds)));
-        _this.screenBounds = bounds;
+        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(nearDisplayBounds)));
+        _this.screenBounds = nearDisplayBounds;
       } else {
         _this.logger.error("there is have no bounds ".concat(JSON.stringify(bounds)));
       }
@@ -148,10 +150,14 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       return _this.isSeizeScreen;
     }, function (isSeize) {
       if (isSeize && (0, _env.isElectron)()) {
-        var _ref3 = (0, _tools.followCorrectDisplay)(_constant.FcrUIDialogKey.CONFIRM, isSeize),
-          _bounds = _ref3.bounds;
-        _this.screenBounds = _bounds;
-        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(_bounds), ", when seize screen emit"));
+        var _ref4 = (0, _tools.followCorrectDisplay)({
+            dialogKey: _constant.FcrUIDialogKey.CONFIRM,
+            alwaysFollowScreen: true,
+            extraRefControlbarCondition: isSeize
+          }),
+          nearDisplayBounds = _ref4.nearDisplayBounds;
+        _this.screenBounds = nearDisplayBounds;
+        _this.logger.info("new sharing bounds is ".concat(JSON.stringify(nearDisplayBounds), ", when seize screen emit"));
       }
     }), (0, _mobx.reaction)(function () {
       return _this.screenBounds;
@@ -298,13 +304,13 @@ var ConfirmStore = exports["default"] = /*#__PURE__*/function () {
       if ((payload === null || payload === void 0 ? void 0 : payload.dialogKey) === _constant.FcrUIDialogKey.CONFIRM) {
         switch (action) {
           case _constant.FcrUIAction.OPEN_DIALOG:
-            if (this.screenBounds) {
-              var _dialogWindows$get2;
-              (_dialogWindows$get2 = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONFIRM)) === null || _dialogWindows$get2 === void 0 || _dialogWindows$get2.setBounds(this.screenBounds);
-              this.logger.info("open confirm dialog with bounds ".concat(JSON.stringify(this.screenBounds)));
-            } else {
-              this.logger.error("the screen bounds is ".concat(JSON.stringify(this.screenBounds)));
-            }
+            var _ref6 = (0, _tools.followCorrectDisplay)({
+                dialogKey: _constant.FcrUIDialogKey.CONFIRM,
+                alwaysFollowScreen: true
+              }),
+              nearDisplayBounds = _ref6.nearDisplayBounds;
+            this.screenBounds = nearDisplayBounds;
+            this.logger.info("open confirm dialog with bounds ".concat(JSON.stringify(nearDisplayBounds)));
             this.addConfirm(payload);
             break;
           case _constant.FcrUIAction.CLOSE_DIALOG:

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

@@ -104,7 +104,7 @@ var ToastStore = exports["default"] = /*#__PURE__*/function () {
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.toastsList;
     }, function () {
-      _this.toasts.forEach(function (value, key) {
+      _this.toasts.forEach(function (value) {
         value();
       });
     }));
@@ -167,7 +167,10 @@ var ToastStore = exports["default"] = /*#__PURE__*/function () {
         });
       }
       if (action === _constant.FcrUIAction.OPEN_DIALOG && params.dialogKey === _constant.FcrUIDialogKey.SHOW_TOAST) {
-        (0, _tools.followCorrectDisplay)(_constant.FcrUIDialogKey.SHOW_TOAST);
+        (0, _tools.followCorrectDisplay)({
+          dialogKey: _constant.FcrUIDialogKey.SHOW_TOAST,
+          alwaysFollowScreen: true
+        });
         var _params$params = params.params,
           _params$params$type = _params$params.type,
           type = _params$params$type === void 0 ? 'info' : _params$params$type,

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

@@ -71,14 +71,6 @@ var PSTNInvite = exports.PSTNInvite = (0, _mobxReact.observer)(function () {
     pstnCountryCodeList = _useContext.pstnCountryCodeList,
     stopSession = _useContext.stopSession,
     showToast = _useContext.showToast,
-    _useContext$roomInfo = _useContext.roomInfo,
-    inviteLink = _useContext$roomInfo.inviteLink,
-    password = _useContext$roomInfo.password,
-    roomId = _useContext$roomInfo.roomId,
-    roomName = _useContext$roomInfo.roomName,
-    userName = _useContext.localUser.userName,
-    meetingId = _useContext.meetingId,
-    roomSchedule = _useContext.roomSchedule,
     roomDetailCopyText = _useContext.roomDetailCopyText;
   var _useState13 = (0, _react.useState)(pstnCountryCodeList.length ? pstnCountryCodeList[0].text : ''),
     _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
@@ -94,15 +86,6 @@ var PSTNInvite = exports.PSTNInvite = (0, _mobxReact.observer)(function () {
   var checkInput = (0, _react.useCallback)(function (input, setError) {
     setError(input.trim().length === 0);
   }, []);
-  var getShareLink = function getShareLink() {
-    var info = {
-      roomId: roomId,
-      roomName: roomName,
-      userName: userName
-    };
-    var baseLink = "".concat(inviteLink);
-    return baseLink;
-  };
   var handleCopyMeetingDetail = (0, _react.useCallback)(function () {
     (0, _copyText.copyText)(roomDetailCopyText).then(function () {
       showToast({

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

@@ -46,7 +46,6 @@ var Aside = exports.Aside = (0, _mobxReact.observer)(function (_ref) {
     moveChatFromAsideToDialog = _useContext.moveChatFromAsideToDialog,
     closeParticipantFromAside = _useContext.closeParticipantFromAside,
     moveParticipantFromAsideToDialog = _useContext.moveParticipantFromAsideToDialog,
-    participantCount = _useContext.participantCount,
     chatRoomState = _useContext.chatRoomState,
     participantsRenderAt = _useContext.participantsRenderAt,
     chatRenderAt = _useContext.chatRenderAt;

package/lib/modules/layout/store.js

@@ -20,6 +20,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.StoreContext = void 0;
+require("core-js/modules/es.array.every.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
@@ -34,11 +35,13 @@ require("core-js/modules/es.object.values.js");
 require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.async-iterator.every.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.every.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");
@@ -415,8 +418,11 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
         return _this2._isVideoParticipantVisible(i);
       });
       var list = this.shouldHideNonVideoParticipants ? nonVideoStreamParticipantList : this.sourceList;
+      var isOnlyOne = list.every(function (i) {
+        return i.isMySelf && i.type === _type2.FcrUIWindowType.VIDEO;
+      });
       return list.filter(function (i) {
-        if (_this2.shouldHideMyVideo && i.isMySelf) {
+        if (_this2.shouldHideMyVideo && !isOnlyOne && i.isMySelf && i.type === _type2.FcrUIWindowType.VIDEO) {
           return false;
         }
         return true;

package/lib/modules/participant/components/participants/components/footer/components/footer/index.js

@@ -1,13 +1,11 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrParticipantsFooterWithRevokeHost = exports.FcrParticipantsFooterRename = exports.FcrParticipantsFooter = void 0;
 require("core-js/modules/es.array.unshift.js");
-var _react = _interopRequireDefault(require("react"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
 var _dropMenu = require("agora-ui-foundation/lib/components/drop-menu");

package/lib/modules/pc-audio-connect/store.js

@@ -251,7 +251,8 @@ var ConnectionGatewayStore = exports["default"] = /*#__PURE__*/function () {
               return _onOk.apply(this, arguments);
             }
             return onOk;
-          }()
+          }(),
+          reverseButton: true
         });
         return true;
       }

package/lib/modules/state-bar/meeting-details.js

@@ -21,7 +21,6 @@ var _react = require("react");
 var _store = require("./store");
 require("./meeting-detail.css");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _jsxRuntime = require("react/jsx-runtime");
 var CopyState = /*#__PURE__*/function (CopyState) {
   CopyState[CopyState["COPYINIT"] = 1] = "COPYINIT";
@@ -44,7 +43,6 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
   var _useContext = (0, _react.useContext)(_store.StoreContext),
     localUser = _useContext.localUser,
     roomInfo = _useContext.roomInfo,
-    scheduleInfo = _useContext.scheduleInfo,
     getShareLink = _useContext.getShareLink,
     password = _useContext.password,
     meetingId = _useContext.meetingId,
@@ -151,13 +149,9 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
     className: "meeting-details",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "meeting-details__content",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-        content: roomInfo.roomName,
-        placement: "bottom",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "meeting-details__content-meeting-subject",
-          children: renderMeetingRoomName
-        })
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "meeting-details__content-meeting-subject",
+        children: renderMeetingRoomName
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "meeting-details__content-meeting-id",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("label", {

package/lib/modules/whiteboard/components/control-bar/index.js

@@ -26,7 +26,6 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = (0, _mobxReact.observe
     setLoading = _useState2[1];
   var transI18n = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_store.WhiteboardControlBarUIContext),
-    onLonelyWindow = _useContext.onLonelyWindow,
     onZoomin = _useContext.onZoomin,
     onZoomout = _useContext.onZoomout,
     onOrigin = _useContext.onOrigin,
@@ -35,7 +34,6 @@ var WhiteboardControlbar = exports.WhiteboardControlbar = (0, _mobxReact.observe
     onEnable = _useContext.onEnable,
     ownerUser = _useContext.ownerUser,
     currentUser = _useContext.currentUser,
-    lonelywindowOpened = _useContext.lonelywindowOpened,
     canWriteBoard = _useContext.canWriteBoard,
     isAdaptived = _useContext.isAdaptived,
     isMaxmum = _useContext.isMaxmum,

package/lib/modules/whiteboard/components/scene-pagination.js

@@ -8,7 +8,6 @@ exports.ScenePagination = void 0;
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 var _pagination = require("./pagination");
-var _i18n = require("agora-ui-foundation/lib/i18n");
 var _store = require("./pagination/store");
 var _jsxRuntime = require("react/jsx-runtime");
 var ScenePagination = exports.ScenePagination = (0, _mobxReact.observer)(function () {
@@ -16,7 +15,6 @@ var ScenePagination = exports.ScenePagination = (0, _mobxReact.observer)(functio
     observables = _useContext.observables,
     addPage = _useContext.addPage,
     changePage = _useContext.changePage;
-  var transI18n = (0, _i18n.useI18n)();
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "fcr-board-pagination",
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_pagination.HalfRoundedPagination, {

package/lib/modules/whiteboard/components/toolbar/components/color-picker/components/color.js

@@ -12,8 +12,7 @@ var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _jsxRuntime = require("react/jsx-runtime");
 var Color = exports.Color = (0, _mobxReact.observer)(function (_ref) {
-  var value = _ref.value,
-    showCurrentColor = _ref.showCurrentColor;
+  var value = _ref.value;
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
     _useContext$observabl = _useContext.observables,
     currentColor = _useContext$observabl.currentColor,

package/lib/modules/widget/sdk.js

@@ -195,7 +195,6 @@ var FcrUIWidgetSDKImpl = exports.FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
         if (action === 'apiResponse') {
           this.logger.debug('handlePostMessage apiResponse: ', event.data);
           var _event$data = event.data,
-            _action = _event$data.action,
             callId = _event$data.callId,
             returnValue = _event$data.returnValue;
           var controllerPromiseGroup = this._requestPromises.get(callId);

package/lib/providers/device-provider.js

@@ -248,22 +248,9 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
       onSpeakerTestVolumeIndicationUpdated: this._handleSpeakerTestVolumeIndicationUpdated,
       onSelectedSpeakerVolumeUpdated: this._handleSpeakerVolumeUpdated
     });
-
-    // runInAction(() => {
-    //   this.speakerVolume = this._mediaControl.getSelectedSpeakerVolume();
-
-    //   const value = this._localStorageProvider.read(SETTING_KEY);
-    //   if (value) {
-    //     const speakerVolume = value.speakerVolume ?? this.speakerVolume;
-    //     const microphoneVolume = value.microphoneVolume ?? this.microphoneVolume;
-    //     const isLocalMirrorEnabled = value.isLocalMirrorEnabled ?? this.isLocalMirrorEnabled;
-    //     const editBeautyKey = value.editBeautyKey ?? this.beautyKey;
-    //     this.setEditBeautyKey(editBeautyKey);
-    //     this.setSpeakerVolume(speakerVolume);
-    //     this.toggleLocalMirror(isLocalMirrorEnabled);
-    //     this.setMicrophoneVolume(microphoneVolume);
-    //   }
-    // });
+    (0, _mobx.runInAction)(function () {
+      _this.speakerVolume = _this._mediaControl.getSelectedSpeakerVolume();
+    });
   }
   return (0, _createClass2["default"])(FcrUIDeviceProviderImpl, [{
     key: "_microphoneDeviceId",
@@ -694,16 +681,13 @@ var FcrUIDeviceProviderImpl = exports.FcrUIDeviceProviderImpl = /*#__PURE__*/fun
   }, {
     key: "_initLocalSetting",
     value: function _initLocalSetting() {
-      this.speakerVolume = this._mediaControl.getSelectedSpeakerVolume();
       var value = this._localStorageProvider.read(_store.SETTING_KEY);
       if (value) {
-        var _value$speakerVolume, _value$microphoneVolu, _value$isLocalMirrorE, _value$editBeautyKey;
-        var _speakerVolume = (_value$speakerVolume = value.speakerVolume) !== null && _value$speakerVolume !== void 0 ? _value$speakerVolume : this.speakerVolume;
+        var _value$microphoneVolu, _value$isLocalMirrorE, _value$editBeautyKey;
         var _microphoneVolume = (_value$microphoneVolu = value.microphoneVolume) !== null && _value$microphoneVolu !== void 0 ? _value$microphoneVolu : this.microphoneVolume;
         var _isLocalMirrorEnabled = (_value$isLocalMirrorE = value.isLocalMirrorEnabled) !== null && _value$isLocalMirrorE !== void 0 ? _value$isLocalMirrorE : this.isLocalMirrorEnabled;
         var editBeautyKey = (_value$editBeautyKey = value.editBeautyKey) !== null && _value$editBeautyKey !== void 0 ? _value$editBeautyKey : this.beautyKey;
         this.setEditBeautyKey(editBeautyKey);
-        this.setSpeakerVolume(_speakerVolume);
         this.toggleLocalMirror(_isLocalMirrorEnabled);
         this.setMicrophoneVolume(_microphoneVolume);
       }

package/lib/shared-data-source/meeting-time.js

@@ -57,9 +57,9 @@ 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 _i18n = require("agora-ui-foundation/lib/i18n");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _duration = _interopRequireDefault(require("dayjs/plugin/duration"));
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _base = require("../base");
 var _mobx = require("mobx");
 var _FcrUIMeetingTimeSharedDataSourceImpl;
@@ -131,7 +131,7 @@ var FcrUIMeetingTimeSharedDataSourceImpl = exports.FcrUIMeetingTimeSharedDataSou
           var remainTime = scheduleDuration - meetingDuration;
           var currentStatus = remainTime > 600 ? MeetingStatus.NORMAL : remainTime > 0 ? MeetingStatus.SOON_TO_END : MeetingStatus.OVERTIME;
           _this._setStatues(currentStatus);
-          var showHour = meetingDuration / 60 > 120;
+          var showHour = meetingDuration / 60 > 60;
           var h = meetingDuration / 3600;
           var m = showHour ? meetingDuration % 3600 / 60 : meetingDuration / 60;
           var s = meetingDuration % 60;

package/lib/shared-data-source/video-window.d.ts

@@ -135,7 +135,6 @@ export declare class FcrUIVideoWindowDataSourceImpl implements FcrUIVideoWindowD
     private _findInsertEndIndex;
     private _findCurrentSpeakerSpotlight;
     private _findItemIndexWithWindowId;
-    private _findItemIndexWithUserId;
     private _findItemIndexWithAudioStreamId;
     private _insertBoard;
     private _insertNewData;

package/lib/shared-data-source/video-window.js

@@ -655,7 +655,7 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
     key: "onSpotlightRemoved",
     value: function onSpotlightRemoved(streamId) {
       var _this3 = this;
-      var removeSpotlight = function removeSpotlight(streamId, list, limitCount) {
+      var removeSpotlight = function removeSpotlight(streamId, list) {
         var index = _this3._findItemIndexWithWindowId(streamId, list);
         if (index !== -1) {
           var item = list[index];
@@ -667,8 +667,8 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
           }
         }
       };
-      removeSpotlight(streamId, this.mainList, this.mainListLimitedCount);
-      removeSpotlight(streamId, this.foldList, this.foldListLimitedCount);
+      removeSpotlight(streamId, this.mainList);
+      removeSpotlight(streamId, this.foldList);
       this.spotlightStreamId = '';
       this._observer.notifyObservers('onSpotlightRemoved', streamId);
     }
@@ -1092,13 +1092,6 @@ var FcrUIVideoWindowDataSourceImpl = exports.FcrUIVideoWindowDataSourceImpl = /*
         return item.windowId === windowId;
       });
     }
-  }, {
-    key: "_findItemIndexWithUserId",
-    value: function _findItemIndexWithUserId(userId, list) {
-      return list.findIndex(function (item) {
-        return item.userId === userId;
-      });
-    }
   }, {
     key: "_findItemIndexWithAudioStreamId",
     value: function _findItemIndexWithAudioStreamId(audioStreamId, list) {

package/lib/ui-scene.js

@@ -260,7 +260,6 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
     key: "_addObservers",
     value: function _addObservers(roomProvider, eventProvider, deviceProvider, engine, uiManager, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, dialogProvider, messageProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
       var _this3 = this;
-      var dom = this._dom;
       var observable = this._observable;
       var sceneConfig = this._config;
       roomProvider.addObserver({
@@ -432,11 +431,10 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
     value: function () {
       var _renderSceneUI2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(roomControl, uiManager, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, messageProvider, dialogProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider) {
         var _roomControl$getRoomI;
-        var dom, type;
+        var type;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              dom = this._dom;
               type = (_roomControl$getRoomI = roomControl.getRoomInfo()) === null || _roomControl$getRoomI === void 0 ? void 0 : _roomControl$getRoomI.roomType;
               if (type === _type2.FcrRoomType.Mainroom) {
                 if ((0, _parameters.isRobotPullingMode)(this._creatorConfig.parameters)) {
@@ -449,7 +447,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
               } else {
                 this._disposers.push(uiManager.renderWaitingSceneUI(eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, dialogProvider, messageProvider, sharedLayoutDataSource, sharedSettingDataSource, sharedDevicePrivilegeDataSource, widgetProvider));
               }
-            case 3:
+            case 2:
             case "end":
               return _context3.stop();
           }

package/lib/utilities/tools.d.ts

@@ -62,8 +62,31 @@ export type CurrentShareScreenWorkArea = {
 export declare function getCurrentSharingWorkArea(params: {
     currentShareBounds: CurrentShareBounds;
 }): CurrentShareScreenWorkArea;
-export declare function followCorrectDisplay(dailogKey: FcrUIDialogKey | FcrUIDialogKey[], extraRefControlbarCondition?: boolean): {
-    bounds: CurrentShareBounds;
+export declare function followCorrectDisplay({ browserWindow, dialogKey, extraRefControlbarCondition, follow, alwaysFollowScreen, }: {
+    /**
+     * browserWindow 是 Electron 的窗口对象，如果传入，则直接设置 bounds，否则会根据 dialogKey 设置 bounds
+     */
+    browserWindow?: Electron.BrowserWindow;
+    /**
+     * 如果不使用 browserWindow ，则需要传入 dialogKey 设置 bounds，如果 browserWindow 和 dialogKey 都未传入，则抛出错误
+     */
+    dialogKey?: FcrUIDialogKey | FcrUIDialogKey[];
+    /**
+     * 始终 follow control bar 的位置，默认是 true
+     */
+    extraRefControlbarCondition?: boolean;
+    /**
+     * 根据屏幕或者应用主窗口居中显示，默认是 screen，如果需要跟随主窗口，则设置为 main-window,
+     * 在屏幕共享时，普通 dialog 窗口会以 controlbar 所在的屏幕为基准水平居中对齐
+     * 在非屏幕共享状态下，则会以主窗口为基准水平居中对齐
+     */
+    follow?: 'screen' | 'main-window';
+    /**
+     * 是否是全屏幕覆盖的透明窗口, 此设置主要针对 toast 和 confirm 弹窗
+     */
+    alwaysFollowScreen?: boolean;
+}): {
+    nearDisplayBounds: CurrentShareBounds;
     nearDisplay: Electron.Display;
 } | undefined;
 export declare const getBrowserLanguage: () => "zh" | "en";