fcr-ui-scene 3.8.0-alpha → 3.8.1-alpha

package/lib/modules/layout/index.css

@@ -1,59 +1,59 @@
-.layout-demo {
-  padding: 50px;
-}
-
-.layout-demo__meta {
-  padding: 0 10px 10px;
-  font-family: monospace;
-  font-size: 1rem;
-}
-
-.layout-demo__frame {
-  position: relative;
-  border: 1px solid rgba(127, 127, 127, 0.2);
-  height: 60vh;
-}
-
-.layout-demo__controls {
-  padding-top: 20px;
-  display: flex;
-  flex-flow: row wrap;
-  gap: 10px;
-}
-
-.fcr-layer {
-  position: absolute;
-  z-index: 1000;
-  height: 0;
-}
-
-.login-confirm-dialog-content {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-  padding: 20px;
-}
-
-.login-confirm-dialog-content img {
-  margin-top: -36px;
-  margin-bottom: 24px;
-}
-
-.login-confirm-dialog-title {
-  font-weight: 600;
-  font-size: 16px;
-  margin-bottom: 10px;
-}
-
-.login-confirm-dialog-desc {
-  margin-bottom: 20px;
-}
-
-.login-confirm-dialog-btn {
-  width: 100%;
-}
-
-.login-confirm-dialog-content .fcr-button {
-  width: 100%;
-}
+.layout-demo {
+  padding: 50px;
+}
+
+.layout-demo__meta {
+  padding: 0 10px 10px;
+  font-family: monospace;
+  font-size: 1rem;
+}
+
+.layout-demo__frame {
+  position: relative;
+  border: 1px solid rgba(127, 127, 127, 0.2);
+  height: 60vh;
+}
+
+.layout-demo__controls {
+  padding-top: 20px;
+  display: flex;
+  flex-flow: row wrap;
+  gap: 10px;
+}
+
+.fcr-layer {
+  position: absolute;
+  z-index: 1000;
+  height: 0;
+}
+
+.login-confirm-dialog-content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  padding: 20px;
+}
+
+.login-confirm-dialog-content img {
+  margin-top: -36px;
+  margin-bottom: 24px;
+}
+
+.login-confirm-dialog-title {
+  font-weight: 600;
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+
+.login-confirm-dialog-desc {
+  margin-bottom: 20px;
+}
+
+.login-confirm-dialog-btn {
+  width: 100%;
+}
+
+.login-confirm-dialog-content .fcr-button {
+  width: 100%;
+}

package/lib/modules/layout/store.base.d.ts

@@ -9,7 +9,7 @@ import { FcrUIManagedObject } from '../../object-manager';
 import { FcrUIDisplayDistributionContentType, SharingType } from '../secondary-window/type';
 import { FcrUIDialogProvider } from '../../providers/dialog/type';
 export declare abstract class LayoutStoreBase implements FcrLayoutSlots, FcrUIEventObserver, FcrUIManagedObject {
-    protected readonly logger: import("agora-foundation/lib/logger").Logger;
+    private readonly logger;
     private _videoWindowDataSource;
     protected _eventProvider: FcrUIEventProvider;
     private _messageProvider;

package/lib/modules/layout/store.base.js

@@ -794,9 +794,9 @@ var LayoutStoreBase = exports.LayoutStoreBase = /*#__PURE__*/function () {
       !this.aside && this.toggleAside(true);
       this.asideWidth = val;
     }
-    /**
-     * Partially update slots, use `null` to delete the slot.
-     * `undefined` is ignored.
+    /**
+     * Partially update slots, use `null` to delete the slot.
+     * `undefined` is ignored.
      */
   }, {
     key: "updateSlots",
@@ -1054,8 +1054,8 @@ var LayoutStoreBase = exports.LayoutStoreBase = /*#__PURE__*/function () {
       }
     }
 
-    /**
-     * Initialize the store, must be called in the sub class construction
+    /**
+     * Initialize the store, must be called in the sub class construction
      */
   }, {
     key: "_initialize",

package/lib/modules/layout/store.electron.d.ts

@@ -5,7 +5,6 @@ export default class LayoutStoreElectron extends LayoutStoreBase {
     private _screenShareProvider;
     private _windowProvider;
     private _mainWindow;
-    private _renderer;
     get isSharingScreen(): boolean;
     get shareScreenOwnerId(): string;
     get secondaryWindowContentType(): "speaker" | "gallery" | "hidden" | "local-camera" | "remote-camera" | "sharing-screen" | "sharing-screen-with-annotation" | "sharing-whiteboard";

package/lib/modules/layout/store.electron.js

@@ -15,6 +15,7 @@ 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/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/esnext.function.metadata.js");
@@ -40,17 +41,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-require("core-js/modules/es.array.concat.js");
-require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.date.to-json.js");
-require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.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 _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -64,7 +56,7 @@ var _store = require("./store.base");
 var _type = require("./type");
 var _constant = require("../../utilities/constant");
 var _videoWindow = require("../dialog/dialogs/video-window");
-var _type2 = require("fcr-core/lib/type");
+var _lodash = require("lodash");
 var _LayoutStoreElectron;
 var _initProto;
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -89,137 +81,49 @@ var LayoutStoreElectron = exports["default"] = /*#__PURE__*/function (_LayoutSto
     _this._screenShareProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_SCREEN_SHARE_PROVIDER);
     _this._windowProvider = windowProvider;
     _this._mainWindow = windowProvider.getCurrentWindow();
-    _this._renderer = objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
     _superPropGet((_this, LayoutStoreElectron), "_initialize", _this, 3)([]);
 
     // 进入房间后，如果双屏模式处于激活状态，则需要设置主窗口为窗口最大化
     if (_this._multiDisplayProvider.isActive) {
       _this._multiDisplayProvider.setMainWindowMaximize();
     }
+    var handleMultiDisplayActiveChange = (0, _lodash.debounce)(function (isActive) {
+      var _this$_multiDisplayPr = _this._multiDisplayProvider.displayState,
+        sharingBySelf = _this$_multiDisplayPr.sharingBySelf,
+        isSharingScreen = _this$_multiDisplayPr.isSharingScreen;
+      if (isActive) {
+        // 多屏模式激活时，需要设置主窗口为窗口最大化
+        // 如果自己正在共享屏幕，则关闭 vidoe window 悬浮窗、显示主窗口
+        if (sharingBySelf && isSharingScreen) {
+          _this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+          _this._multiDisplayProvider.showMainWindowInIndexLeastDisplay({
+            isMaximized: true
+          });
+        } else {
+          _this._multiDisplayProvider.setMainWindowMaximize();
+        }
+        return;
+      }
+
+      // 多屏模式从激活状态转变为非激活状态时，
+      // 如果当前是自己在共享屏幕，则隐藏主窗口，打开 vidoe window 悬浮窗
+      // 如果不是自己在共享，则切换布局到演讲者模式
+      // 没屏幕共享时，不做操作
+      if (sharingBySelf && isSharingScreen) {
+        _this._mainWindow.hide();
+        _this._dialogProvider.openDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+        var workarea = _this._screenShareProvider.sharingDisplayBounds;
+        var videoWindow = _this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
+        (0, _videoWindow.setVideoWindowDialogPosition)(workarea, videoWindow);
+      } else if (isSharingScreen) {
+        _this.toggleLayout(_type.FcrUIVideoWindowLayoutType.Speaker);
+      }
+    }, 100);
     _this._disposers.push((0, _mobx.reaction)(function () {
       return _this.isMultiDisplayActive;
-    }, /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(isActive) {
-        var _this$_multiDisplayPr, sharingBySelf, isSharingScreen, selectionIdAndType, _selectionIdAndType, id, type, workarea, displayList, display, windowList, window, bounds, _display, videoWindow, _t, _t2;
-        return _regenerator["default"].wrap(function (_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _this$_multiDisplayPr = _this._multiDisplayProvider.displayState, sharingBySelf = _this$_multiDisplayPr.sharingBySelf, isSharingScreen = _this$_multiDisplayPr.isSharingScreen;
-              if (!isActive) {
-                _context.next = 1;
-                break;
-              }
-              // 多屏模式激活时，需要设置主窗口为窗口最大化
-              // 如果自己正在共享屏幕，则关闭 vidoe window 悬浮窗、显示主窗口
-              if (sharingBySelf && isSharingScreen) {
-                _this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-                _this._multiDisplayProvider.showMainWindowInIndexLeastDisplay({
-                  isMaximized: true
-                });
-              } else {
-                _this._multiDisplayProvider.setMainWindowMaximize();
-              }
-              return _context.abrupt("return");
-            case 1:
-              if (!(sharingBySelf && isSharingScreen)) {
-                _context.next = 16;
-                break;
-              }
-              _this._mainWindow.hide();
-              _this._dialogProvider.openDialog(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-              _context.prev = 2;
-              selectionIdAndType = _this._screenShareProvider.selectionIdAndType;
-              _context.next = 4;
-              break;
-            case 3:
-              _context.prev = 3;
-              _t = _context["catch"](2);
-              _this.logger.warn("get selection id and type error, can not set video window position: ".concat(_t));
-              return _context.abrupt("return");
-            case 4:
-              _selectionIdAndType = selectionIdAndType, id = _selectionIdAndType.id, type = _selectionIdAndType.type;
-              if (!(type === _type2.FcrScreenCaptureType.SCREEN)) {
-                _context.next = 8;
-                break;
-              }
-              _context.next = 5;
-              return _this._screenShareProvider.getDisplayList();
-            case 5:
-              displayList = _context.sent;
-              display = displayList.find(function (item) {
-                return item.id === id;
-              });
-              if (!display) {
-                _context.next = 6;
-                break;
-              }
-              workarea = display.bounds;
-              _context.next = 7;
-              break;
-            case 6:
-              _this.logger.warn("can not find display info for shared screen id: ".concat(id));
-              return _context.abrupt("return");
-            case 7:
-              _context.next = 15;
-              break;
-            case 8:
-              _context.next = 9;
-              return _this._screenShareProvider.getWindowList();
-            case 9:
-              windowList = _context.sent;
-              window = windowList.find(function (item) {
-                return item.id === id;
-              });
-              if (!window) {
-                _context.next = 10;
-                break;
-              }
-              bounds = window.bounds;
-              _context.next = 13;
-              break;
-            case 10:
-              _this.logger.warn("can not find window info for shared window id: ".concat(id));
-
-              // 共享的窗口被隐藏时，尝试使用 selectionBounds 作为位置依据
-              _context.prev = 11;
-              bounds = _this._screenShareProvider.selectionBounds;
-              _context.next = 13;
-              break;
-            case 12:
-              _context.prev = 12;
-              _t2 = _context["catch"](11);
-              _this.logger.warn("get selection bounds error, can not set video window position: ".concat(_t2));
-              return _context.abrupt("return");
-            case 13:
-              _display = _this._renderer.getDisplayMatching(bounds);
-              if (_display) {
-                _context.next = 14;
-                break;
-              }
-              _this.logger.warn("can not find display for shared window id: ".concat(id, ", bounds: ").concat(JSON.stringify(bounds)));
-              return _context.abrupt("return");
-            case 14:
-              workarea = _display.bounds;
-            case 15:
-              videoWindow = _this._windowProvider.getWindowById(_constant.FcrUIDialogKey.VIDEO_WINDOW);
-              (0, _videoWindow.setVideoWindowDialogPosition)(workarea, videoWindow);
-              _this.logger.info("set video window position while multi display mode off, workarea: ".concat(JSON.stringify(workarea)));
-              _context.next = 17;
-              break;
-            case 16:
-              if (isSharingScreen) {
-                _this.toggleLayout(_type.FcrUIVideoWindowLayoutType.Speaker);
-              }
-            case 17:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, null, [[2, 3], [11, 12]]);
-      }));
-      return function (_x) {
-        return _ref2.apply(this, arguments);
-      };
-    }()));
+    }, function (isActive) {
+      handleMultiDisplayActiveChange(isActive);
+    }));
     return _this;
   }
   (0, _inherits2["default"])(LayoutStoreElectron, _LayoutStoreBase);

package/lib/modules/layout/type.js

@@ -53,13 +53,13 @@ var FcrUIWindowType = exports.FcrUIWindowType = /*#__PURE__*/function (FcrUIWind
   return FcrUIWindowType;
 }({});
 var FcrUILayoutType = exports.FcrUILayoutType = /*#__PURE__*/function (FcrUILayoutType) {
-  /**
-   * 上下布局时，顶部的小窗口类型
+  /**
+   * 上下布局时，顶部的小窗口类型
    */
   FcrUILayoutType["CAROUSEL"] = "carousel";
-  /**
-   * 1. 上下布局时，底部的大窗口类型
-   * 2. 网格布局时的窗口类型
+  /**
+   * 1. 上下布局时，底部的大窗口类型
+   * 2. 网格布局时的窗口类型
    */
   FcrUILayoutType["GALLERY"] = "gallery";
   return FcrUILayoutType;

package/lib/modules/notification/index.css

@@ -1,77 +1,77 @@
-.waiting-room-confirm-dialog {
-  background-color: white;
-  border-radius: 10px;
-  position: relative;
-  z-index: 9999;
-  padding: 13px 0 0 10px;
-}
-
-.waiting-room-confirm-dialog .fcr-dialog-body {
-  padding: 20px;
-}
-
-.waiting-room-confirm-dialog-content {
-  display: flex;
-  align-items: center;
-}
-
-.fcr-notification-root .fcr-notification {
-  position: absolute;
-  top: 40px;
-  z-index: 999;
-  height: calc(100vh - 40px);
-}
-
-.fcr-notification-notice-wrapper {
-  border-radius: 10px;
-  left: 10px;
-}
-
-.waiting-room-confirm-dialog-content-icon {
-  background-color: #a19fff;
-  width: 48px;
-  height: 48px;
-  border-radius: 50px;
-  margin-right: 10px;
-}
-
-.waiting-room-confirm-dialog-content-title {
-  font-size: 14px;
-  margin-bottom: 5px;
-}
-
-.waiting-room-confirm-dialog-content-desc {
-  font-size: 13px;
-  color: var(--fcr_ui_scene_icontext2);
-}
-
-.waiting-room-confirm-dialog-btns {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  margin-top: 10px;
-}
-
-.waiting-room-left-btn {
-  color: var(--fcr_ui_scene_icontext2);
-  margin-right: 15px;
-  font-size: 12px;
-  cursor: pointer;
-}
-
-.fcr-notification_bottom {
-  left: 50%;
-  transform: translateX(-50%);
-  bottom: 0;
-}
-.fcr-notification_bottom .fcr-notification-notice-wrapper {
-  transform: translate3d(0px, 0px, 0px) !important;
-  top: unset;
-  bottom: 59px;
-  background-color: transparent;
-  box-shadow: none;
-}
-.fcr-notification_bottom .fcr-notification-notice-content {
-  padding: 0;
-  text-align: center;
-}
+.waiting-room-confirm-dialog {
+  background-color: white;
+  border-radius: 10px;
+  position: relative;
+  z-index: 9999;
+  padding: 13px 0 0 10px;
+}
+
+.waiting-room-confirm-dialog .fcr-dialog-body {
+  padding: 20px;
+}
+
+.waiting-room-confirm-dialog-content {
+  display: flex;
+  align-items: center;
+}
+
+.fcr-notification-root .fcr-notification {
+  position: absolute;
+  top: 40px;
+  z-index: 999;
+  height: calc(100vh - 40px);
+}
+
+.fcr-notification-notice-wrapper {
+  border-radius: 10px;
+  left: 10px;
+}
+
+.waiting-room-confirm-dialog-content-icon {
+  background-color: #a19fff;
+  width: 48px;
+  height: 48px;
+  border-radius: 50px;
+  margin-right: 10px;
+}
+
+.waiting-room-confirm-dialog-content-title {
+  font-size: 14px;
+  margin-bottom: 5px;
+}
+
+.waiting-room-confirm-dialog-content-desc {
+  font-size: 13px;
+  color: var(--fcr_ui_scene_icontext2);
+}
+
+.waiting-room-confirm-dialog-btns {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  margin-top: 10px;
+}
+
+.waiting-room-left-btn {
+  color: var(--fcr_ui_scene_icontext2);
+  margin-right: 15px;
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.fcr-notification_bottom {
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 0;
+}
+.fcr-notification_bottom .fcr-notification-notice-wrapper {
+  transform: translate3d(0px, 0px, 0px) !important;
+  top: unset;
+  bottom: 59px;
+  background-color: transparent;
+  box-shadow: none;
+}
+.fcr-notification_bottom .fcr-notification-notice-content {
+  padding: 0;
+  text-align: center;
+}