fcr-ui-scene 3.4.0 → 3.4.2

package/lib/modules/waiting-room-layout/index.js

@@ -16,42 +16,62 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WaitingRoomLayout = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _base = require("../../base");
+var _toast = _interopRequireDefault(require("../dialog/components/toast"));
 var _store = _interopRequireWildcard(require("./store"));
 var _view = _interopRequireDefault(require("./view"));
+var _confirm = require("../dialog/components/confirm");
 var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["globalToast", "confirm"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 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)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var WaitingRoomLayout = exports.WaitingRoomLayout = /*#__PURE__*/function (_UIModule) {
-  function WaitingRoomLayout(args) {
-    var _this;
+  function WaitingRoomLayout() {
     (0, _classCallCheck2["default"])(this, WaitingRoomLayout);
-    _this = _callSuper(this, WaitingRoomLayout);
-    _this._store = new _store["default"](args);
-    return _this;
+    return _callSuper(this, WaitingRoomLayout, arguments);
   }
   (0, _inherits2["default"])(WaitingRoomLayout, _UIModule);
   return (0, _createClass2["default"])(WaitingRoomLayout, [{
+    key: "onNodeWillActive",
+    value: function onNodeWillActive() {
+      var _this$currentRoomCont;
+      this._store = new _store["default"]({
+        deviceProvider: this.deviceProvider,
+        localVideoRenderProvider: this.localVideoRenderProvider,
+        userControl: (_this$currentRoomCont = this.currentRoomControlProvider) === null || _this$currentRoomCont === void 0 ? void 0 : _this$currentRoomCont.currentRoomControl.getUserControl()
+      });
+    }
+  }, {
+    key: "onNodeWillInactive",
+    value: function onNodeWillInactive() {
+      var _this$_store;
+      (_this$_store = this._store) === null || _this$_store === void 0 || _this$_store.release();
+    }
+  }, {
     key: "getComponent",
     value: function getComponent() {
       var slots = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      this._store.updateSlots(slots);
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
-        value: this._store,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view["default"], {})
+      var store = this._store;
+      var globalToast = slots.globalToast,
+        confirm = slots.confirm,
+        restSlots = (0, _objectWithoutProperties2["default"])(slots, _excluded);
+      store.updateSlots(restSlots);
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_store.StoreContext.Provider, {
+        value: store,
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_view["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_toast["default"], {
+          children: globalToast
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.ConfirmDialog, {
+          children: confirm
+        })]
       });
     }
-  }, {
-    key: "onUnload",
-    value: function onUnload() {
-      this._store.release();
-    }
   }]);
 }(_base.UIModule);

package/lib/modules/waiting-room-layout/store.d.ts

@@ -1,5 +1,6 @@
-import { FcrDeviceStore } from '../../common/device-store';
 import { FcrUserControl } from 'fcr-core';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { FcrUILocalVideoRenderProvider } from '../../providers/renderer-provider';
 export interface FcrLayoutSlots {
     chat: React.ReactNode;
     stateBar: React.ReactNode;
@@ -7,11 +8,13 @@ export interface FcrLayoutSlots {
     layers: React.ReactNode;
 }
 export interface LayoutStoreParams {
-    deviceStore: FcrDeviceStore;
+    deviceProvider: FcrUIDeviceProvider;
+    localVideoRenderProvider: FcrUILocalVideoRenderProvider;
     userControl: FcrUserControl;
 }
 export default class LayoutStore implements FcrLayoutSlots {
-    private _deviceStore;
+    private _deviceProvider;
+    private _localVideoRenderProvider;
     private _userControl;
     accessor participant: React.ReactNode;
     accessor chat: React.ReactNode;

package/lib/modules/waiting-room-layout/store.js

@@ -50,8 +50,9 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _mobx = require("mobx");
 var _react = require("react");
+var _decorator = require("agora-foundation/lib/decorator");
 var _LayoutStore;
-var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _startPlayLocalVideoDecs, _stopPlayLocalVideoDecs, _setCameraEnabledDecs, _setVideoOrientationDecs, _updateSlotsDecs, _ref;
+var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _updateSlotsDecs, _ref;
 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; }
@@ -68,7 +69,7 @@ var _C = /*#__PURE__*/new WeakMap();
 var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
-_ref = (_participantDecs = [_mobx.observable, _mobx.observable.ref], _chatDecs = [_mobx.observable, _mobx.observable.ref], _stateBarDecs = [_mobx.observable, _mobx.observable.ref], _actionBarDecs = [_mobx.observable, _mobx.observable.ref], _layersDecs = [_mobx.observable, _mobx.observable.ref], _whiteboardDecs = [_mobx.observable, _mobx.observable.ref], _startPlayLocalVideoDecs = [_mobx.action, _mobx.action.bound], _stopPlayLocalVideoDecs = [_mobx.action, _mobx.action.bound], _setCameraEnabledDecs = [_mobx.action, _mobx.action.bound], _setVideoOrientationDecs = [_mobx.action, _mobx.action.bound], _updateSlotsDecs = [_mobx.action, _mobx.action.bound], "_deviceStore");
+_ref = (_participantDecs = [_mobx.observable, _mobx.observable.ref], _chatDecs = [_mobx.observable, _mobx.observable.ref], _stateBarDecs = [_mobx.observable, _mobx.observable.ref], _actionBarDecs = [_mobx.observable, _mobx.observable.ref], _layersDecs = [_mobx.observable, _mobx.observable.ref], _whiteboardDecs = [_mobx.observable, _mobx.observable.ref], _updateSlotsDecs = [_mobx.action, _mobx.action.bound], "_deviceProvider");
 var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   function LayoutStore(params) {
     (0, _classCallCheck2["default"])(this, LayoutStore);
@@ -80,7 +81,8 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _D, _init_actionBar(this, null));
     _classPrivateFieldInitSpec(this, _E, _init_layers(this, null));
     _classPrivateFieldInitSpec(this, _F, _init_whiteboard(this, null));
-    this._deviceStore = params.deviceStore;
+    this._deviceProvider = params.deviceProvider;
+    this._localVideoRenderProvider = params.localVideoRenderProvider;
     this._userControl = params.userControl;
   }
   return (0, _createClass2["default"])(LayoutStore, [{
@@ -139,33 +141,35 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "cameraId",
     get: function get() {
-      return this._deviceStore.cameraId;
+      return this._deviceProvider.cameraId;
     }
   }, {
     key: "cameraEnabled",
     get: function get() {
-      return this._deviceStore.cameraEnabled;
+      return this._deviceProvider.cameraEnabled;
     }
   }, {
     key: "startPlayLocalVideo",
-    value: function startPlayLocalVideo(view, isMirror) {
-      return this._deviceStore.startPlayLocalVideo(view, isMirror);
+    value: function startPlayLocalVideo(view) {
+      var isMirror = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      return this._localVideoRenderProvider.startCameraPreview(view, {
+        isMirror: isMirror
+      });
     }
   }, {
     key: "stopPlayLocalVideo",
     value: function stopPlayLocalVideo(view) {
-      return this._deviceStore.stopPlayLocalVideo(view);
+      return this._localVideoRenderProvider.stopCameraPreview(view);
     }
   }, {
     key: "setCameraEnabled",
     value: function setCameraEnabled(enable) {
-      this._deviceStore.handleRealCameraEnabledChanged(enable);
-      this._deviceStore.cameraEnabled = enable;
+      this._deviceProvider.setCameraEnabled(enable);
     }
   }, {
     key: "setVideoOrientation",
     value: function setVideoOrientation() {
-      this._deviceStore.setVideoOrientation();
+      this._deviceProvider.setVideoOrientation();
     }
   }, {
     key: "updateSlots",
@@ -179,13 +183,11 @@ var LayoutStore = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "release",
-    value: function release() {
-      // this._chatRoomControl.removeObserver(this._chatRoomObserver);
-    }
+    value: function release() {}
   }]);
 }();
 _LayoutStore = LayoutStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LayoutStore, [[_participantDecs, 17, "participant"], [_chatDecs, 17, "chat"], [_stateBarDecs, 17, "stateBar"], [_actionBarDecs, 17, "actionBar"], [_layersDecs, 17, "layers"], [_whiteboardDecs, 17, "whiteboard"], [_startPlayLocalVideoDecs, 18, "startPlayLocalVideo"], [_stopPlayLocalVideoDecs, 18, "stopPlayLocalVideo"], [_setCameraEnabledDecs, 18, "setCameraEnabled"], [_setVideoOrientationDecs, 18, "setVideoOrientation"], [_updateSlotsDecs, 18, "updateSlots"]], []).e, 7);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LayoutStore, [[_participantDecs, 17, "participant"], [_chatDecs, 17, "chat"], [_stateBarDecs, 17, "stateBar"], [_actionBarDecs, 17, "actionBar"], [_layersDecs, 17, "layers"], [_whiteboardDecs, 17, "whiteboard"], [_decorator.bound, 2, "startPlayLocalVideo"], [_decorator.bound, 2, "stopPlayLocalVideo"], [_decorator.bound, 2, "setCameraEnabled"], [_decorator.bound, 2, "setVideoOrientation"], [_updateSlotsDecs, 18, "updateSlots"], [_decorator.bound, 2, "release"]], []).e, 7);
 _init_participant = _applyDecs$e[0];
 _init_chat = _applyDecs$e[1];
 _init_stateBar = _applyDecs$e[2];

package/lib/modules/whiteboard/components/control-bar/store.d.ts

@@ -1,7 +1,7 @@
-import { FcrUIEventStore } from '../../../../common/event-store';
+import { FcrUIEventProvider } from '../../../../providers/event-provider';
 import { FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrStreamControl, FcrUserControl } from 'fcr-core';
-import { FcrSecurityStore } from '../../../../common/security-store';
+import { FcrUIPrivilegeProvider } from '../../../../providers/privilege-provider';
 export declare class WhiteboardControlBarStore {
     accessor ownerUser: FcrUserInfo | undefined;
     accessor currentUser: FcrUserInfo | undefined;
@@ -17,10 +17,10 @@ export declare class WhiteboardControlBarStore {
     private _userControl;
     private _securityStore;
     constructor({ uiEventStore, userControl, securityStore, }: {
-        uiEventStore: FcrUIEventStore;
+        uiEventStore: FcrUIEventProvider;
         streamControl: FcrStreamControl;
         userControl: FcrUserControl;
-        securityStore: FcrSecurityStore;
+        securityStore: FcrUIPrivilegeProvider;
     });
     get canWriteBoard(): boolean;
     onZoomin(): void;

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

@@ -103,7 +103,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
     this.isHost = [_type2.FcrUserRole.HOST, _type2.FcrUserRole.COHOST].includes((_userControl$getLocal = userControl.getLocalUser()) === null || _userControl$getLocal === void 0 ? void 0 : _userControl$getLocal.userRole);
     uiEventStore.addObserver({
       onEvent: function onEvent(action, payload) {
-        if (action === _constant.UIAction.WHITEBOARD_CHANGED) {
+        if (action === _constant.FcrUIAction.WHITEBOARD_CHANGED) {
           if (payload.action === _type.WhiteboardBaseEvents.SET_OWNER_USER_ID) {
             var _this$_userControl;
             _this.ownerUser = payload.payload ? _this === null || _this === void 0 || (_this$_userControl = _this._userControl) === null || _this$_userControl === void 0 ? void 0 : _this$_userControl.getUser(payload.payload) : undefined;
@@ -219,35 +219,35 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
   }, {
     key: "onZoomin",
     value: function onZoomin() {
-      this._uiEventStore.sendEvent(_constant.UIAction.WHITEBOARD_CHANGED, {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ZOOMIN
       });
     }
   }, {
     key: "onZoomout",
     value: function onZoomout() {
-      this._uiEventStore.sendEvent(_constant.UIAction.WHITEBOARD_CHANGED, {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ZOOMOUT
       });
     }
   }, {
     key: "onAdaptive",
     value: function onAdaptive() {
-      this._uiEventStore.sendEvent(_constant.UIAction.WHITEBOARD_CHANGED, {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ADAPTIVE
       });
     }
   }, {
     key: "onOrigin",
     value: function onOrigin() {
-      this._uiEventStore.sendEvent(_constant.UIAction.WHITEBOARD_CHANGED, {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ORIGIN
       });
     }
   }, {
     key: "onLonelyWindow",
     value: function onLonelyWindow() {
-      this._uiEventStore.sendEvent(_constant.UIAction.WHITEBOARD_CHANGED, {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.LONEYWINDOW,
         payload: !this.lonelywindowOpened
       });
@@ -255,7 +255,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
   }, {
     key: "onClose",
     value: function onClose() {
-      this._uiEventStore.sendEvent(_constant.UIAction.CLOSE_WHITEBOARD);
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.CLOSE_WHITEBOARD);
     }
   }, {
     key: "setOwnerUser",
@@ -265,7 +265,7 @@ var WhiteboardControlBarStore = exports.WhiteboardControlBarStore = /*#__PURE__*
   }, {
     key: "onEnable",
     value: function onEnable(controlEnabled) {
-      this._uiEventStore.sendEvent(_constant.UIAction.WHITEBOARD_CHANGED, {
+      this._uiEventStore.sendEvent(_constant.FcrUIAction.WHITEBOARD_CHANGED, {
         action: _type.WhiteboardControlbarEvents.ENABLE_CONTROL,
         payload: controlEnabled
       });

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

@@ -1,27 +1,25 @@
-import { FcrUIEventStore } from '../../common/event-store';
 import { FcrBoardRegion, WhiteboardBaseEvents, WhiteboardControlbarEvents } from './type';
-import { DialogKey, UIAction } from '../../utilities/constant';
+import { FcrUIDialogKey, FcrUIAction } from '../../utilities/constant';
 import { UIModule } from '../../base';
 import { FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrStreamControl, FcrUserControl } from 'fcr-core';
-import { FcrSecurityStore } from '../../common/security-store';
-import { FcrWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control/types';
 import { FcrUIVideoWindowLayoutType } from '../layout/type';
-import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrUICurrentRoomControlProvider } from '../../providers/room-provider';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
 export declare class FcrWhiteboardUIModule extends UIModule {
     private _disposers;
-    private _uiEventStore;
-    private _userControl;
-    private _roomControl;
-    private _securityStore;
-    private _whiteboardControl;
-    private _boardStore;
+    private _uiEventStore?;
+    private _userControl?;
+    private _roomControl?;
+    private _securityStore?;
+    private _whiteboardControl?;
+    private _boardStore?;
     private _connectionState;
     private _boardMainWindow;
     private _toolbarContext?;
     private _defaultBoardState;
-    private _toolbarStore;
-    private _controlbarStore;
+    private _toolbarStore?;
+    private _controlbarStore?;
     private _initWidth;
     private _initHeight;
     private _joinSuccessed;
@@ -40,29 +38,26 @@ export declare class FcrWhiteboardUIModule extends UIModule {
         appId: string;
         region: FcrBoardRegion;
     };
+    currentRoomControlProvider?: FcrUICurrentRoomControlProvider;
+    eventProvider?: FcrUIEventProvider;
+    privilegeProvider?: FcrUIPrivilegeProvider;
     private accessor _lonelyWindowState;
     private accessor _ownerUser;
     private accessor _isHost;
     private accessor _boardBackground;
     private accessor _localUser;
-    get hasPrivilege(): boolean;
+    get hasPrivilege(): boolean | undefined;
     get contentAreaSize(): {
         width: number;
         height: number;
         top: number;
         left: number;
     };
-    constructor({ uiEventStore, userControl, roomControl, whiteboardControl, streamControl, securityStore, }: {
-        uiEventStore: FcrUIEventStore;
-        userControl: FcrUserControl;
-        roomControl: FcrBaseRoomControl;
-        whiteboardControl: FcrWhiteboardControl;
-        streamControl: FcrStreamControl;
-        securityStore: FcrSecurityStore;
-    });
+    onNodeWillActive(): void;
+    onNodeWillInactive(): void;
     getComponent(dom?: Element | null): React.ReactNode;
-    onEvent(event: UIAction, payload: {
-        dialogKey: DialogKey;
+    onEvent(event: FcrUIAction, payload: {
+        dialogKey: FcrUIDialogKey;
         dialogId?: string;
     } & {
         action: WhiteboardControlbarEvents | WhiteboardBaseEvents;