fcr-ui-scene 3.7.4-rc.1 → 3.7.5

package/lib/modules/secondary-window/store.js

@@ -59,12 +59,13 @@ var _type = require("./type");
 var _decorator = require("agora-foundation/lib/decorator");
 var _logger = require("../../utilities/logger");
 var _constant = require("../../utilities/constant");
-var _store = require("../dialog/store");
 var _mobx = require("mobx");
 var _fcrCore = require("fcr-core");
 var _type2 = require("../layout/type");
+var _objectManager = require("../../object-manager");
+var _type3 = require("../../providers/dialog/type");
 var _SecondaryWindowStore;
-var _initProto, _init__screenShareScalcValue, _init_isSharingWhiteboard;
+var _initProto, _init__screenShareScalcValue, _init_isSharingWhiteboard, _init_iframeLoaded, _init_interceptedClose;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -77,17 +78,16 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 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();
 var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
+var _D = /*#__PURE__*/new WeakMap();
 var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function () {
-  function SecondaryWindowStore(_multiDisplayProvider, _videoWindowDataSource, _eventProvider, _sharedScreenShareDataSource, _memberSharedDataSource, _sharedWhiteboardDataSource, _sharedAnnotationDataSource, _annotationProvider) {
+  function SecondaryWindowStore(_ref) {
     var _this = this;
+    var objectManager = _ref.objectManager;
     (0, _classCallCheck2["default"])(this, SecondaryWindowStore);
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'secondary-window-store'
     })));
-    (0, _defineProperty2["default"])(this, "_observable", {
-      onContentDistributionUpdated: this._handleContentDistributionUpdated
-    });
-    (0, _defineProperty2["default"])(this, "_dialogId", null);
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_prevFullScalc", {
       width: document.body.offsetWidth,
@@ -103,31 +103,47 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     (0, _defineProperty2["default"])(this, "_diffScalcValue", 0.5);
     _classPrivateFieldInitSpec(this, _A, _init__screenShareScalcValue(this, 1));
     _classPrivateFieldInitSpec(this, _B, _init_isSharingWhiteboard(this, false));
-    this._multiDisplayProvider = _multiDisplayProvider;
-    this._videoWindowDataSource = _videoWindowDataSource;
-    this._eventProvider = _eventProvider;
-    this._sharedScreenShareDataSource = _sharedScreenShareDataSource;
-    this._memberSharedDataSource = _memberSharedDataSource;
-    this._sharedWhiteboardDataSource = _sharedWhiteboardDataSource;
-    this._sharedAnnotationDataSource = _sharedAnnotationDataSource;
-    this._annotationProvider = _annotationProvider;
-    this._multiDisplayProvider.addObserver(this._observable);
-    if (this.secondaryWindowContentType !== _type.FcrUIDisplayDistributionContentType.HIDDEN) {
-      this._dialogId = this._eventProvider.openDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
-    }
+    _classPrivateFieldInitSpec(this, _C, _init_iframeLoaded(this, false));
+    _classPrivateFieldInitSpec(this, _D, _init_interceptedClose(this, false));
+    (0, _defineProperty2["default"])(this, "_handleSecondaryWindowClosed", function (dialogKey) {
+      if (dialogKey !== _constant.FcrUIDialogKey.SUB_WINDOW) {
+        return false;
+      }
+      if (_this.secondaryWindowContentType === _type.FcrUIDisplayDistributionContentType.HIDDEN) {
+        return false;
+      }
+      _this.setInterceptedClose(true);
+      return true;
+    });
+    // Get all required objects from objectManager
+    this._multiDisplayProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_MULTI_DISPLAY_PROVIDER);
+    this._videoWindowDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE);
+    this._memberSharedDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEMBER_DATA_SOURCE);
+    this._boardShareProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_BOARD_SHARE_PROVIDER);
+    this._sharedScreenShareDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_SCREEN_SHARE_DATA_SOURCE);
+    this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
+    this._windowProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WINDOW_PROVIDER);
+    this._renderer = objectManager.getObject(_objectManager.FcrUIObjectKeys.RENDERER_WRAPPER);
+    var localVideoRenderProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER);
+    var remoteVideoRenderProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_REMOTE_VIDEO_RENDER_PROVIDER);
+    this._videoRenderContext = {
+      localVideoRenderProvider: localVideoRenderProvider,
+      remoteVideoRenderProvider: remoteVideoRenderProvider
+    };
+    this._dialogProvider.addInterceptor(_type3.FcrDialogInterceptorEventName.ON_CLOSE, this._handleSecondaryWindowClosed);
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.secondaryWindowContentType;
-    }, function () {
+    }, function (contentType) {
       // 窗口内容变化时，重置缩放比例
       _this._screenShareScalcValue = _this._minScalcValue;
+      if (contentType === _type.FcrUIDisplayDistributionContentType.HIDDEN) {
+        _this._closeSecondaryWindow();
+      } else {
+        _this._openSecondaryWindow();
+      }
     }));
   }
   return (0, _createClass2["default"])(SecondaryWindowStore, [{
-    key: "_subWindowDialog",
-    get: function get() {
-      return _store.dialogWindows.get(_constant.FcrUIDialogKey.SUB_WINDOW);
-    }
-  }, {
     key: "_screenShareScalcValue",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
@@ -143,6 +159,22 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
     set: function set(v) {
       _classPrivateFieldSet(_B, this, v);
     }
+  }, {
+    key: "iframeLoaded",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "interceptedClose",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
   }, {
     key: "secondaryWindowContentType",
     get: function get() {
@@ -180,12 +212,12 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       return this._screenShareScalcValue === this._minScalcValue;
     }
   }, {
-    key: "isZoomMaxmum",
+    key: "isZoomMinimum",
     get: function get() {
       return this._screenShareScalcValue >= this._maxScalcValue;
     }
   }, {
-    key: "isZoomMinimum",
+    key: "isZoomMaxmum",
     get: function get() {
       return this._screenShareScalcValue <= this._minScalcValue;
     }
@@ -215,7 +247,7 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "ownerUser",
     get: function get() {
-      return this._sharedWhiteboardDataSource.sharingUserInfo;
+      return this._boardShareProvider.ownerUser;
     }
   }, {
     key: "isHost",
@@ -225,32 +257,37 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "canWriteBoard",
     get: function get() {
-      return this._sharedWhiteboardDataSource.canWriteBoard;
+      return this._boardShareProvider.canWriteBoard;
     }
   }, {
     key: "toolbarState",
     get: function get() {
-      return this._sharedWhiteboardDataSource.toolbarState;
+      return this._boardShareProvider.boardBarControl.toolbarState;
     }
   }, {
     key: "currentTheme",
     get: function get() {
-      return this._sharedWhiteboardDataSource.currentTheme;
+      return this._boardShareProvider.boardBarControl.currentTheme;
     }
   }, {
     key: "connectionState",
     get: function get() {
-      return this._sharedWhiteboardDataSource.connectionState;
+      return this._boardShareProvider.connectionState;
     }
   }, {
     key: "showLoading",
     get: function get() {
-      return this._sharedWhiteboardDataSource.showLoading;
+      return this._boardShareProvider.loading;
     }
   }, {
     key: "joinSuccess",
     get: function get() {
-      return this._sharedWhiteboardDataSource.joinSuccess;
+      return this._boardShareProvider.joined;
+    }
+  }, {
+    key: "isMyBoard",
+    get: function get() {
+      return this._boardShareProvider.isMyBoard;
     }
   }, {
     key: "isScreenShare",
@@ -267,12 +304,28 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "annotationHasStart",
     get: function get() {
-      return this._sharedAnnotationDataSource.annotationHasStart;
+      // return this._sharedAnnotationDataSource.annotationHasStart;
+      return false;
     }
   }, {
     key: "isShowToolbar",
     get: function get() {
-      return this.isBoardShare ? this._sharedWhiteboardDataSource.toolbarState.controlEnable || this.isHost : this._annotationProvider.isShowToolbar;
+      return this._boardShareProvider.boardBarControl.toolbarState.controlEnable || this.isHost;
+    }
+  }, {
+    key: "isSharingWithAudio",
+    get: function get() {
+      return this._sharedScreenShareDataSource.isSharingWithAudio;
+    }
+  }, {
+    key: "videoRenderContext",
+    get: function get() {
+      return this._videoRenderContext;
+    }
+  }, {
+    key: "isActive",
+    get: function get() {
+      return this._boardShareProvider.isActive;
     }
   }, {
     key: "getContent",
@@ -280,21 +333,32 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "handleIframeLoad",
     value: function handleIframeLoad(iframe) {
+      var _this2 = this;
       iframe === null || iframe === void 0 || iframe.addEventListener('load', function () {
         iframe.style.width = '100%';
         iframe.style.height = '100%';
+        _this2.iframeLoaded = true;
+        if (!iframe.contentWindow) {
+          _this2.logger.error('Iframe has no contentWindow');
+          return;
+        }
+        iframe.contentWindow.document.addEventListener('mousedown', function () {
+          if (_this2.interceptedClose) {
+            _this2.setInterceptedClose(false);
+          }
+        });
       });
     }
   }, {
-    key: "zoomOut",
-    value: function zoomOut() {
+    key: "zoomIn",
+    value: function zoomIn() {
       if (this._screenShareScalcValue < this._maxScalcValue) {
         this._screenShareScalcValue += this._diffScalcValue;
       }
     }
   }, {
-    key: "zoomIn",
-    value: function zoomIn() {
+    key: "zoomOut",
+    value: function zoomOut() {
       if (this._screenShareScalcValue > this._minScalcValue) {
         this._screenShareScalcValue -= this._diffScalcValue;
       }
@@ -314,6 +378,11 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
       };
       this._screenShareScalcValue = scalc;
     }
+  }, {
+    key: "setInterceptedClose",
+    value: function setInterceptedClose(value) {
+      this.interceptedClose = value;
+    }
   }, {
     key: "setScaleValue",
     value: function setScaleValue(scale) {
@@ -335,43 +404,50 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
   }, {
     key: "setWhiteboardTool",
     value: function setWhiteboardTool(tool) {
-      this._sharedWhiteboardDataSource.setWhiteboardTool(tool);
+      this._boardShareProvider.boardBarControl.setWhiteboardTool(tool);
     }
   }, {
     key: "saveWhiteboardDraft",
     value: function saveWhiteboardDraft() {
-      this._sharedWhiteboardDataSource.saveDraft();
+      this._boardShareProvider.boardBarControl.saveDraft();
     }
   }, {
     key: "setProgress",
     value: function setProgress(progress) {
-      this._sharedWhiteboardDataSource.setProgress(progress);
+      this._boardShareProvider.boardBarControl.setProgress(progress);
     }
   }, {
     key: "setTheme",
     value: function setTheme(theme) {
-      this._sharedWhiteboardDataSource.setTheme(theme);
+      this._boardShareProvider.boardBarControl.setTheme(theme);
     }
   }, {
     key: "setControlEnable",
     value: function setControlEnable(enable) {
-      this._sharedWhiteboardDataSource.setControlEnable(enable);
+      this._boardShareProvider.boardBarControl.setControlEnable(enable);
     }
   }, {
     key: "setShowLoading",
     value: function setShowLoading(show) {
-      this._sharedWhiteboardDataSource.setShowLoading(show);
+      this._boardShareProvider.boardBarControl.setShowLoading(show);
     }
   }, {
     key: "setCommonColors",
     value: function setCommonColors(colors) {
-      this._sharedWhiteboardDataSource.setCommonColors(colors);
+      this._boardShareProvider.boardBarControl.setCommonColors(colors);
     }
   }, {
     key: "log",
     value: function log(message) {
       this.logger.info(message);
     }
+  }, {
+    key: "handleSceneMounted",
+    value: function handleSceneMounted() {
+      if (this.secondaryWindowContentType !== _type.FcrUIDisplayDistributionContentType.HIDDEN) {
+        this._openSecondaryWindow();
+      }
+    }
   }, {
     key: "release",
     value: function release() {
@@ -379,29 +455,55 @@ var SecondaryWindowStore = exports.SecondaryWindowStore = /*#__PURE__*/function
         return disposer();
       });
       this._disposers = [];
+      this._dialogProvider.removeInterceptor(_type3.FcrDialogInterceptorEventName.ON_CLOSE, this._handleSecondaryWindowClosed);
+      this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
+    }
+  }, {
+    key: "_setSecondaryWindowBounds",
+    value: function _setSecondaryWindowBounds() {
+      var mainWindow = this._windowProvider.getCurrentWindow();
+      var mainWindowBoundfs = mainWindow.getBounds();
+      var mainWindowTitle = mainWindow.getTitle();
+      var displayMainWindow = this._renderer.getDisplayMatching(mainWindowBoundfs);
+      var displaySecondaryWindow = this._renderer.getAllDisplays().find(function (display) {
+        return display.id !== displayMainWindow.id;
+      });
+      if (displaySecondaryWindow) {
+        var _displaySecondaryWind = displaySecondaryWindow.workArea,
+          x = _displaySecondaryWind.x,
+          y = _displaySecondaryWind.y;
+        var secondaryWindow = this._windowProvider.getWindowById(_constant.FcrUIDialogKey.SUB_WINDOW);
+        secondaryWindow.setTitle(mainWindowTitle);
+        secondaryWindow.setBounds({
+          x: x,
+          y: y
+        });
+        secondaryWindow.maximize();
+      } else {
+        this.logger.error('No secondary display found');
+      }
     }
   }, {
-    key: "_handleContentDistributionUpdated",
-    value: function _handleContentDistributionUpdated(distribution) {
-      var _this$_subWindowDialo;
-      switch (distribution.secondaryWindow.type) {
-        case _type.FcrUIDisplayDistributionContentType.HIDDEN:
-          if (this._dialogId) {
-            this._eventProvider.closeDialog(this._dialogId);
-            this._dialogId = '';
-          }
-          break;
-        default:
-          if (this._dialogId) return (_this$_subWindowDialo = this._subWindowDialog) === null || _this$_subWindowDialo === void 0 ? void 0 : _this$_subWindowDialo.show();
-          this._dialogId = this._eventProvider.openDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
-          break;
-      }
+    key: "_openSecondaryWindow",
+    value: function _openSecondaryWindow() {
+      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SUB_WINDOW, {
+        focus: false
+      });
+      this._setSecondaryWindowBounds();
+    }
+  }, {
+    key: "_closeSecondaryWindow",
+    value: function _closeSecondaryWindow() {
+      this.iframeLoaded = false;
+      this._dialogProvider.closeDialog(_constant.FcrUIDialogKey.SUB_WINDOW);
     }
   }]);
 }();
 _SecondaryWindowStore = SecondaryWindowStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"], [_decorator.bound, 2, "_handleContentDistributionUpdated"]], []).e, 3);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_SecondaryWindowStore, [[_mobx.observable, 1, "_screenShareScalcValue"], [_mobx.observable, 1, "isSharingWhiteboard"], [_mobx.observable, 1, "iframeLoaded"], [_mobx.observable, 1, "interceptedClose"], [_mobx.computed, 3, "videoWindowData"], [_mobx.computed, 3, "isAspectRatioPreserved"], [_mobx.computed, 3, "scalValue"], [_decorator.bound, 2, "handleIframeLoad"], [_decorator.bound, 2, "zoomIn"], [_decorator.bound, 2, "zoomOut"], [_decorator.bound, 2, "fullContainer"], [_decorator.bound, 2, "setInterceptedClose"], [_decorator.bound, 2, "setScaleValue"], [_decorator.bound, 2, "setOriginScalc"], [_decorator.bound, 2, "setSpeakerViewSize"], [_decorator.bound, 2, "setWhiteboardTool"], [_decorator.bound, 2, "saveWhiteboardDraft"], [_decorator.bound, 2, "setProgress"], [_decorator.bound, 2, "setTheme"], [_decorator.bound, 2, "setControlEnable"], [_decorator.bound, 2, "setShowLoading"], [_decorator.bound, 2, "setCommonColors"], [_decorator.bound, 2, "log"]], []).e, 5);
 _init__screenShareScalcValue = _applyDecs$e[0];
 _init_isSharingWhiteboard = _applyDecs$e[1];
-_initProto = _applyDecs$e[2];
+_init_iframeLoaded = _applyDecs$e[2];
+_init_interceptedClose = _applyDecs$e[3];
+_initProto = _applyDecs$e[4];
 var SecondaryWindowStoreContext = exports.SecondaryWindowStoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/secondary-window/type.d.ts

@@ -2,6 +2,7 @@ import { FcrConnectionState, FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrUIVideoWindowData, FcrUIVideoWindowLayoutType } from '../layout/type';
 import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 import { FcrImageData } from 'fcr-core/lib/imports';
+import { FcrUIObjectManager } from '../../object-manager';
 export declare enum FcrUIDisplayDistributionContentType {
     GALLERY = "gallery",
     SPEAKER = "speaker",
@@ -108,3 +109,6 @@ export declare enum WhiteboardToolAction {
     WIDTH = "width",
     TOOL = "tool"
 }
+export type SecondaryWindowStoreArgs = {
+    objectManager: FcrUIObjectManager;
+};