fcr-ui-scene 3.6.0 → 3.6.1

package/lib/utilities/tools.js

@@ -14,6 +14,8 @@ exports.getLanguage = void 0;
 exports.handleCheckMouseOver = handleCheckMouseOver;
 exports.waitUntil = exports.uint8ArrayToImageData = exports.storage = exports.setLanguage = exports.renderMeetingName = exports.renderMeetingId = exports.matchVirtualSoundCardPattern = exports.isZipUrl = exports.isPngOrJpg = exports.isMp4 = exports.isMp3OrWav = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.is-array.js");
@@ -338,30 +340,46 @@ function getCurrentSharingWorkArea(params) {
     scaleFactor: scaleFactor
   };
 }
-function followCorrectDisplay(dailogKey) {
-  var extraRefControlbarCondition = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+function followCorrectDisplay(_ref6) {
+  var browserWindow = _ref6.browserWindow,
+    dialogKey = _ref6.dialogKey,
+    _ref6$extraRefControl = _ref6.extraRefControlbarCondition,
+    extraRefControlbarCondition = _ref6$extraRefControl === void 0 ? true : _ref6$extraRefControl,
+    _ref6$follow = _ref6.follow,
+    follow = _ref6$follow === void 0 ? 'screen' : _ref6$follow,
+    _ref6$alwaysFollowScr = _ref6.alwaysFollowScreen,
+    alwaysFollowScreen = _ref6$alwaysFollowScr === void 0 ? false : _ref6$alwaysFollowScr;
   if (!(0, _env.isElectron)()) return;
-  var objectDialog = Array.isArray(dailogKey) ? dailogKey.map(function (dialog) {
+  if (!browserWindow && !dialogKey) throw new Error('browserWindow or dialogKey is required');
+  var objectDialog = dialogKey ? Array.isArray(dialogKey) ? dialogKey.map(function (dialog) {
     return _dialogs.dialogWindows.get(dialog);
-  }) : _dialogs.dialogWindows.get(dailogKey);
+  }) : _dialogs.dialogWindows.get(dialogKey) : browserWindow;
   var controlbar = _dialogs.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
+  var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
   // 按当前的窗口管理方式，在关闭 controlbar 的时候，controlbar 实际上是隐藏了自己，所以，依然能够通过 controlbar 访问到，所以需要判断是否是 visible 状态
   var followControlbar = controlbar && (extraRefControlbarCondition || controlbar.isVisible());
-  // 屏幕抢占时，需要判断是否是抢占屏幕，决定是取 controlbar 的位置计算热区，还是走原有逻辑，此类条件通过 extraRefControlbarCondition 传入
-  var nearestPoint = followControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : window.runtime.browserWindow.getBounds();
+  // 屏幕抢占时，需要判断是否是抢占屏幕，决定是取 controlbar 所在屏幕计算热区，还是以主窗口所在屏幕计算热区，此类条件通过 extraRefControlbarCondition 传入
+  var nearestPoint = followControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : mainAppWindowBounds;
   var nearDisplay = window.runtime.screen.getDisplayNearestPoint(nearestPoint);
-  var nearDisplayBounds = nearDisplay.bounds;
-  var bounds = {
-    x: Math.floor(nearDisplayBounds.x),
-    y: Math.floor(nearDisplayBounds.y),
-    width: Math.floor(nearDisplayBounds.width),
-    height: Math.floor(nearDisplayBounds.height)
+  var nearBounds = nearDisplay.bounds;
+  var nearDisplayBounds = {
+    x: Math.floor(nearBounds.x),
+    y: Math.floor(nearBounds.y),
+    width: Math.floor(nearBounds.width),
+    height: Math.floor(nearBounds.height)
+  };
+  var followBounds = function followBounds(theWindowBounds) {
+    var targetBounds = follow === 'screen' || extraRefControlbarCondition ? nearBounds : mainAppWindowBounds;
+    return alwaysFollowScreen ? nearDisplayBounds : {
+      x: Math.floor(targetBounds.x + (targetBounds.width - theWindowBounds.width) / 2),
+      y: Math.floor(targetBounds.y + (targetBounds.height - theWindowBounds.height) / 2)
+    };
   };
   Array.isArray(objectDialog) ? objectDialog.forEach(function (dialog) {
-    return dialog === null || dialog === void 0 ? void 0 : dialog.setBounds(bounds);
-  }) : objectDialog === null || objectDialog === void 0 ? void 0 : objectDialog.setBounds(bounds);
+    return dialog === null || dialog === void 0 ? void 0 : dialog.setBounds(followBounds(dialog.getBounds()));
+  }) : objectDialog === null || objectDialog === void 0 ? void 0 : objectDialog.setBounds(followBounds(objectDialog.getBounds()));
   return {
-    bounds: bounds,
+    nearDisplayBounds: nearDisplayBounds,
     nearDisplay: nearDisplay
   };
 }

package/lib/waiting-room-control-manager.js

@@ -46,7 +46,7 @@ var FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function
     (0, _defineProperty2["default"])(this, "_waitingRoomControl", null);
     (0, _defineProperty2["default"])(this, "_isJoining", false);
     (0, _defineProperty2["default"])(this, "_mainRoomUserObserver", {
-      onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
+      onUserInfoUpdated: function onUserInfoUpdated(_roomId, event) {
         var isLocalUserInfoUpdated = event.modifiedUser.userId === _this._mainRoomControl.getUserControl().getLocalUser().userId;
 
         // 权限变更的时候

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -21,14 +21,14 @@
     "@electron/remote": "2.0.1",
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
-    "agora-electron-sdk": "4.3.2-build.11-rc.1",
-    "agora-foundation": "^3.6.0",
-    "agora-ui-foundation": "^3.6.0",
+    "agora-electron-sdk": "4.3.2-build.145-rc.3",
+    "agora-foundation": "~3.6.1",
+    "agora-ui-foundation": "~3.6.1",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "^3.6.0",
+    "fcr-core": "~3.6.1",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -59,7 +59,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "^3.6.0",
+    "agora-toolchain": "~3.6.1",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",
@@ -71,4 +71,4 @@
   "lint-staged": {
     "*.{ts,tsx,html,css}": "prettier --write"
   }
-}
+}