fcr-ui-scene 3.7.7 → 3.7.8

package/lib/shared-data-source/confirm-data.js

@@ -10,27 +10,12 @@ require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
 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/esnext.function.metadata.js");
-require("core-js/modules/esnext.symbol.metadata.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FcrUISharedConfirmDataSourceImpl = void 0;
-require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.map.js");
-require("core-js/modules/es.object.to-string.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.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -45,32 +30,19 @@ require("core-js/modules/esnext.map.merge.js");
 require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
-require("core-js/modules/esnext.set.add-all.js");
-require("core-js/modules/esnext.set.delete-all.js");
-require("core-js/modules/esnext.set.difference.v2.js");
-require("core-js/modules/esnext.set.difference.js");
-require("core-js/modules/esnext.set.every.js");
-require("core-js/modules/esnext.set.filter.js");
-require("core-js/modules/esnext.set.find.js");
-require("core-js/modules/esnext.set.intersection.v2.js");
-require("core-js/modules/esnext.set.intersection.js");
-require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
-require("core-js/modules/esnext.set.is-disjoint-from.js");
-require("core-js/modules/esnext.set.is-subset-of.v2.js");
-require("core-js/modules/esnext.set.is-subset-of.js");
-require("core-js/modules/esnext.set.is-superset-of.v2.js");
-require("core-js/modules/esnext.set.is-superset-of.js");
-require("core-js/modules/esnext.set.join.js");
-require("core-js/modules/esnext.set.map.js");
-require("core-js/modules/esnext.set.reduce.js");
-require("core-js/modules/esnext.set.some.js");
-require("core-js/modules/esnext.set.symmetric-difference.v2.js");
-require("core-js/modules/esnext.set.symmetric-difference.js");
-require("core-js/modules/esnext.set.union.v2.js");
-require("core-js/modules/esnext.set.union.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUISharedConfirmDataSourceImpl = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -79,9 +51,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _mobx = require("mobx");
 var _base = require("../base");
 var _logger = require("../utilities/logger");
-var _imports = require("fcr-core/lib/imports");
 var _FcrUISharedConfirmDataSourceImpl;
-var _initProto, _init_position, _init_windows, _init_mouseOverState;
+var _initProto, _init_position;
 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; }
@@ -93,22 +64,16 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 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 FcrUISharedConfirmDataSourceImpl = exports.FcrUISharedConfirmDataSourceImpl = /*#__PURE__*/function () {
   function FcrUISharedConfirmDataSourceImpl() {
     (0, _classCallCheck2["default"])(this, FcrUISharedConfirmDataSourceImpl);
     (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
       prefix: 'FcrUISharedConfirmDataSourceImpl'
     })));
-    (0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
     _classPrivateFieldInitSpec(this, _A, _init_position(this, {
       x: 0,
       y: 0
     }));
-    _classPrivateFieldInitSpec(this, _B, _init_windows(this, new Map()));
-    _classPrivateFieldInitSpec(this, _C, _init_mouseOverState(this, new Set()));
-    this._addLogObserver();
   }
   return (0, _createClass2["default"])(FcrUISharedConfirmDataSourceImpl, [{
     key: "position",
@@ -118,84 +83,15 @@ var FcrUISharedConfirmDataSourceImpl = exports.FcrUISharedConfirmDataSourceImpl
     set: function set(v) {
       _classPrivateFieldSet(_A, this, v);
     }
-  }, {
-    key: "windows",
-    get: function get() {
-      return _classPrivateFieldGet(_B, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_B, this, v);
-    }
-  }, {
-    key: "mouseOverState",
-    get: function get() {
-      return _classPrivateFieldGet(_C, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_C, this, v);
-    }
   }, {
     key: "setPosition",
     value: function setPosition(position) {
-      var _this = this;
       this.position = position;
-      if (this.windows.size > 0) {
-        this.windows.forEach(function (window, key) {
-          if (typeof window.width !== 'number' || typeof window.height !== 'number' || typeof window.x !== 'number' || typeof window.y !== 'number') {
-            return;
-          }
-          if (position.x >= window.x && position.y >= window.y && position.x <= window.x + window.width && position.y <= window.y + window.height) {
-            if (!_this.mouseOverState.has(key)) {
-              _this.mouseOverState.add(key);
-              _this._observable.notifyObservers('onMouseOver', key);
-            }
-          } else {
-            if (_this.mouseOverState.has(key)) {
-              _this.mouseOverState["delete"](key);
-              _this._observable.notifyObservers('onMouseOut', key);
-            }
-          }
-        });
-      }
-    }
-  }, {
-    key: "setWindowBounds",
-    value: function setWindowBounds(key, window) {
-      this.windows.set(key, window);
-    }
-  }, {
-    key: "removeWindowBounds",
-    value: function removeWindowBounds(key) {
-      this.mouseOverState["delete"](key);
-      this.windows["delete"](key);
-    }
-  }, {
-    key: "addObserver",
-    value: function addObserver(observer) {
-      this._observable.addObserver(observer);
-    }
-  }, {
-    key: "removeObserver",
-    value: function removeObserver(observer) {
-      this._observable.removeObserver(observer);
-    }
-  }, {
-    key: "release",
-    value: function release() {
-      this.windows.clear();
-      this.mouseOverState.clear();
-    }
-  }, {
-    key: "_addLogObserver",
-    value: function _addLogObserver() {
-      this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onMouseOver', 'onMouseOut']));
     }
   }]);
 }();
 _FcrUISharedConfirmDataSourceImpl = FcrUISharedConfirmDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfirmDataSourceImpl, [[_mobx.observable, 1, "position"], [_mobx.observable, 1, "windows"], [_mobx.observable, 1, "mouseOverState"]], []).e, 4);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedConfirmDataSourceImpl, [[_mobx.observable, 1, "position"]], []).e, 2);
 _init_position = _applyDecs$e[0];
-_init_windows = _applyDecs$e[1];
-_init_mouseOverState = _applyDecs$e[2];
-_initProto = _applyDecs$e[3];
+_initProto = _applyDecs$e[1];
 (0, _base.registerDependency)('sharedConfirmDataSource');

package/lib/shared-data-source/screen-share-data.d.ts

@@ -69,7 +69,7 @@ export interface FcrUIScreenShareSharedDataSource {
      * 获取当前屏幕共享流的唯一标识符
      * @returns 当前屏幕共享流的唯一标识符
      */
-    get currentShareStreamId(): string | undefined;
+    get currentShareStreamId(): string;
     /**
      * 获取当前屏幕共享的媒体轨道对象
      * @returns 当前屏幕共享的媒体轨道对象，如果未开始共享则返回 null
@@ -85,6 +85,11 @@ export interface FcrUIScreenShareSharedDataSource {
      * @returns 返回一个 Promise，解析为可用的显示设备信息列表
      */
     get displayList(): Promise<FcrDisplayInfo[]>;
+    /**
+     * 获取当前环路back音频源的标识符, 用于设置屏幕共享开启共享音频时的音频源
+     * @returns 当前环路back音频源的唯一标识符
+     */
+    get loopbackAudioSourceId(): string | null;
     /**
      * 获取当前屏幕共享的音频轨道对象
      * @returns 当前屏幕共享的音频轨道对象，如果未共享音频则返回 null
@@ -194,6 +199,11 @@ export interface FcrUIScreenShareSharedDataSource {
      * @param shareAudioTrack - 音频轨道对象，表示屏幕共享的音频轨道，传入 null 表示不共享音频
      */
     setShareWithAudioTrack(shareWithAudioTrack: FcrLoopbackTrack | null): void;
+    /**
+     * 设置当前环路back音频源的标识符
+     * @param sourceId - 音频源的唯一标识符
+     */
+    setLoopbackAudioSourceId(sourceId: string): void;
     /**
      * 设置当前屏幕共享的媒体轨道
      * @param screenTrack - 屏幕共享的媒体轨道对象，传入 null 表示停止共享屏幕
@@ -213,7 +223,7 @@ export interface FcrUIScreenShareSharedDataSource {
      * 设置当前屏幕共享流的唯一标识符
      * @param streamId - 屏幕共享流的唯一标识符
      */
-    setCurrentShareStreamId(streamId: string | undefined): void;
+    setCurrentShareStreamId(streamId: string): void;
     /**
      * 设置屏幕共享是否包含音频
      * @param status - 布尔值，表示是否在屏幕共享中包含音频
@@ -272,11 +282,6 @@ export interface FcrUIScreenShareSharedDataSource {
      * 保存当前屏幕共享speakerView节点的宽高
      */
     setScreenShareSpeakerViewSize(width: number, height: number): void;
-    /**
-     * 获取当前环路back音频源的标识符, 用于设置屏幕共享开启共享音频时的音频源
-     * @returns 当前环路back音频源的唯一标识符
-     */
-    getLoopbackDeviceId(): string | null;
     /**
      * 释放屏幕共享相关资源
      * 清理所有订阅和资源，通常在组件卸载时调用
@@ -318,7 +323,8 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
     shareWithAudioTrack: FcrLoopbackTrack | null;
     currentShareId: string;
     currentShareType: FcrScreenCaptureType;
-    currentShareStreamId: string | undefined;
+    currentShareStreamId: string;
+    loopbackAudioSourceId: string | null;
     get appWindowList(): Promise<import("fcr-core/lib/imports").AgoraRtcWindowInfo[]>;
     get displayList(): Promise<import("fcr-core/lib/imports").AgoraRtcDisplayInfo[]>;
     get isZoomMaxmum(): boolean;
@@ -327,7 +333,6 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
     get isCurrentOriginal(): boolean;
     get isEngineConnected(): boolean;
     constructor(_connectionProvider: FcrUIConnectionProvider, _deviceProvider: FcrUIDeviceProvider);
-    getLoopbackDeviceId(): string | null;
     setScreenShareScenarioType(type: FcrScreenScenarioType): void;
     setScreenShareSpeakerViewSize(width: number, height: number): void;
     setScreenShareVideoRatio(ratio: number): void;
@@ -338,10 +343,11 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
     setSharingInReplace(isInReplace: boolean): void;
     setScreenSharingOwner(owner: FcrUserInfo | undefined): void;
     setShareWithAudioTrack(shareWithAudioTrack: FcrLoopbackTrack | null): void;
+    setLoopbackAudioSourceId(sourceId: string): void;
     setScreenTrack(screenTrack: FcrScreenTrack | null): void;
     setCurrentShareType(type: FcrScreenCaptureType): void;
     setCurrentShareId(id: string): void;
-    setCurrentShareStreamId(streamId?: string): void;
+    setCurrentShareStreamId(streamId: string): void;
     setCurrentShareAudioProcessingChannel(channel: AudioProcessingChannel): void;
     setScreenCaptureSources(sources: FcrUIDisplayCaptureSource[]): void;
     setApplicationCaptureSources(windowInfos: FcrWindowInfo[]): void;
@@ -354,4 +360,5 @@ export declare class FcrUIScreenShareSharedDataSourceImpl implements FcrUIScreen
     setShareWithAudio(withAudio: boolean): void;
     release(): void;
     private _handleOnConnectionStateUpdated;
+    private _setLoopbackAudioSourceId;
 }

package/lib/shared-data-source/screen-share-data.js

@@ -61,7 +61,7 @@ var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-
 var _type = require("fcr-core/lib/type");
 var _env = require("agora-foundation/lib/utilities/env");
 var _FcrUIScreenShareSharedDataSourceImpl;
-var _initProto, _init_isSharingScreen, _init_screenSharingOwner, _init_localUserScreenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_currentShareAudioProcessingChannel, _init_currentSelectionId, _init_currentSelectionType, _init_shareWithAudio, _init_boardOwnerUser, _init_currentSelectionBounds, _init_connectionState, _init_isSeizeStream, _init_screenShareScalcValue, _init_screenShareVideoRatio, _init_screenShareVideoSize, _init_screenShareSpeakerViewSize, _init_screenShareScenarioType, _init_isCurrentScreenShareInSmoothType, _init_sharingInReplace, _setScreenShareScenarioTypeDecs, _setScreenShareSpeakerViewSizeDecs, _setScreenShareVideoRatioDecs, _setScreenShareVideoSizeDecs, _setScreenShareScalcValueDecs, _setIsSeizeStreamDecs, _setIsSharingScreenDecs, _setSharingInReplaceDecs, _setScreenSharingOwnerDecs, _setShareWithAudioTrackDecs, _setScreenTrackDecs, _setCurrentShareTypeDecs, _setCurrentShareIdDecs, _setCurrentShareStreamIdDecs, _setCurrentShareAudioProcessingChannelDecs, _setScreenCaptureSourcesDecs, _setApplicationCaptureSourcesDecs, _setLocalUserScreenSharingStateDecs, _setCurrentShareIdInfosDecs, _setCurrentSelectionDecs, _setCurrentSelectionIdDecs, _setCurrentSelectionTypeDecs, _setCurrentSelectionBoundsDecs, _setShareWithAudioDecs, _handleOnConnectionStateUpdatedDecs, _ref;
+var _initProto, _init_isSharingScreen, _init_screenSharingOwner, _init_localUserScreenSharingState, _init_applicationCaptureSources, _init_screenCaptureSources, _init_currentShareAudioProcessingChannel, _init_currentSelectionId, _init_currentSelectionType, _init_shareWithAudio, _init_boardOwnerUser, _init_currentSelectionBounds, _init_connectionState, _init_isSeizeStream, _init_screenShareScalcValue, _init_screenShareVideoRatio, _init_screenShareVideoSize, _init_screenShareSpeakerViewSize, _init_screenShareScenarioType, _init_isCurrentScreenShareInSmoothType, _init_sharingInReplace, _setScreenShareScenarioTypeDecs, _setScreenShareSpeakerViewSizeDecs, _setScreenShareVideoRatioDecs, _setScreenShareVideoSizeDecs, _setScreenShareScalcValueDecs, _setIsSeizeStreamDecs, _setIsSharingScreenDecs, _setSharingInReplaceDecs, _setScreenSharingOwnerDecs, _setShareWithAudioTrackDecs, _setLoopbackAudioSourceIdDecs, _setScreenTrackDecs, _setCurrentShareTypeDecs, _setCurrentShareIdDecs, _setCurrentShareStreamIdDecs, _setCurrentShareAudioProcessingChannelDecs, _setScreenCaptureSourcesDecs, _setApplicationCaptureSourcesDecs, _setLocalUserScreenSharingStateDecs, _setCurrentShareIdInfosDecs, _setCurrentSelectionDecs, _setCurrentSelectionIdDecs, _setCurrentSelectionTypeDecs, _setCurrentSelectionBoundsDecs, _setShareWithAudioDecs, _handleOnConnectionStateUpdatedDecs, _setLoopbackAudioSourceIdDecs2, _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; }
@@ -92,7 +92,7 @@ var _Q = /*#__PURE__*/new WeakMap();
 var _R = /*#__PURE__*/new WeakMap();
 var _S = /*#__PURE__*/new WeakMap();
 var _T = /*#__PURE__*/new WeakMap();
-_ref = (_setScreenShareScenarioTypeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareSpeakerViewSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoRatioDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareScalcValueDecs = [_mobx.action, _mobx.action.bound], _setIsSeizeStreamDecs = [_mobx.action, _mobx.action.bound], _setIsSharingScreenDecs = [_mobx.action, _mobx.action.bound], _setSharingInReplaceDecs = [_mobx.action, _mobx.action.bound], _setScreenSharingOwnerDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioTrackDecs = [_mobx.action, _mobx.action.bound], _setScreenTrackDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareStreamIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _setScreenCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setApplicationCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setLocalUserScreenSharingStateDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdInfosDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionBoundsDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleOnConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_setScreenShareScenarioTypeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareSpeakerViewSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoRatioDecs = [_mobx.action, _mobx.action.bound], _setScreenShareVideoSizeDecs = [_mobx.action, _mobx.action.bound], _setScreenShareScalcValueDecs = [_mobx.action, _mobx.action.bound], _setIsSeizeStreamDecs = [_mobx.action, _mobx.action.bound], _setIsSharingScreenDecs = [_mobx.action, _mobx.action.bound], _setSharingInReplaceDecs = [_mobx.action, _mobx.action.bound], _setScreenSharingOwnerDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioTrackDecs = [_mobx.action, _mobx.action.bound], _setLoopbackAudioSourceIdDecs = [_mobx.action, _mobx.action.bound], _setScreenTrackDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareStreamIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _setScreenCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setApplicationCaptureSourcesDecs = [_mobx.action, _mobx.action.bound], _setLocalUserScreenSharingStateDecs = [_mobx.action, _mobx.action.bound], _setCurrentShareIdInfosDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionIdDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionTypeDecs = [_mobx.action, _mobx.action.bound], _setCurrentSelectionBoundsDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioDecs = [_mobx.action, _mobx.action.bound], _handleOnConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _setLoopbackAudioSourceIdDecs2 = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSourceImpl = /*#__PURE__*/function () {
   function FcrUIScreenShareSharedDataSourceImpl(_connectionProvider, _deviceProvider) {
     (0, _classCallCheck2["default"])(this, FcrUIScreenShareSharedDataSourceImpl);
@@ -138,10 +138,12 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     (0, _defineProperty2["default"])(this, "shareWithAudioTrack", null);
     (0, _defineProperty2["default"])(this, "currentShareId", '');
     (0, _defineProperty2["default"])(this, "currentShareType", _type.FcrScreenCaptureType.SCREEN);
-    (0, _defineProperty2["default"])(this, "currentShareStreamId", undefined);
+    (0, _defineProperty2["default"])(this, "currentShareStreamId", '');
+    (0, _defineProperty2["default"])(this, "loopbackAudioSourceId", null);
     this._connectionProvider = _connectionProvider;
     this._deviceProvider = _deviceProvider;
     this._connectionProvider.addObserver(this._connectionObserver);
+    this._setLoopbackAudioSourceId();
   }
   return (0, _createClass2["default"])(FcrUIScreenShareSharedDataSourceImpl, [{
     key: "isSharingScreen",
@@ -338,11 +340,6 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     get: function get() {
       return this.connectionState === _fcrCore.FcrConnectionState.CONNECTED;
     }
-  }, {
-    key: "getLoopbackDeviceId",
-    value: function getLoopbackDeviceId() {
-      return this._deviceProvider.getLoopbackDeviceId();
-    }
   }, {
     key: "setScreenShareScenarioType",
     value: function setScreenShareScenarioType(type) {
@@ -397,6 +394,11 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     value: function setShareWithAudioTrack(shareWithAudioTrack) {
       this.shareWithAudioTrack = shareWithAudioTrack;
     }
+  }, {
+    key: "setLoopbackAudioSourceId",
+    value: function setLoopbackAudioSourceId(sourceId) {
+      this.loopbackAudioSourceId = sourceId;
+    }
   }, {
     key: "setScreenTrack",
     value: function setScreenTrack(screenTrack) {
@@ -485,10 +487,15 @@ var FcrUIScreenShareSharedDataSourceImpl = exports.FcrUIScreenShareSharedDataSou
     value: function _handleOnConnectionStateUpdated(state) {
       this.connectionState = state;
     }
+  }, {
+    key: "_setLoopbackAudioSourceId",
+    value: function _setLoopbackAudioSourceId() {
+      this.loopbackAudioSourceId = this._deviceProvider.getLoopbackDeviceId();
+    }
   }]);
 }();
 _FcrUIScreenShareSharedDataSourceImpl = FcrUIScreenShareSharedDataSourceImpl;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareSharedDataSourceImpl, [[_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "screenSharingOwner"], [_mobx.observable, 1, "localUserScreenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "currentSelectionId"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentSelectionBounds"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "isSeizeStream"], [_mobx.observable, 1, "screenShareScalcValue"], [_mobx.observable, 1, "screenShareVideoRatio"], [_mobx.observable, 1, "screenShareVideoSize"], [_mobx.observable, 1, "screenShareSpeakerViewSize"], [_mobx.observable, 1, "screenShareScenarioType"], [_mobx.observable, 1, "isCurrentScreenShareInSmoothType"], [_mobx.observable, 1, "sharingInReplace"], [_imports.bound, 2, "getLoopbackDeviceId"], [_setScreenShareScenarioTypeDecs, 18, "setScreenShareScenarioType"], [_setScreenShareSpeakerViewSizeDecs, 18, "setScreenShareSpeakerViewSize"], [_setScreenShareVideoRatioDecs, 18, "setScreenShareVideoRatio"], [_setScreenShareVideoSizeDecs, 18, "setScreenShareVideoSize"], [_setScreenShareScalcValueDecs, 18, "setScreenShareScalcValue"], [_setIsSeizeStreamDecs, 18, "setIsSeizeStream"], [_setIsSharingScreenDecs, 18, "setIsSharingScreen"], [_setSharingInReplaceDecs, 18, "setSharingInReplace"], [_setScreenSharingOwnerDecs, 18, "setScreenSharingOwner"], [_setShareWithAudioTrackDecs, 18, "setShareWithAudioTrack"], [_setScreenTrackDecs, 18, "setScreenTrack"], [_setCurrentShareTypeDecs, 18, "setCurrentShareType"], [_setCurrentShareIdDecs, 18, "setCurrentShareId"], [_setCurrentShareStreamIdDecs, 18, "setCurrentShareStreamId"], [_setCurrentShareAudioProcessingChannelDecs, 18, "setCurrentShareAudioProcessingChannel"], [_setScreenCaptureSourcesDecs, 18, "setScreenCaptureSources"], [_setApplicationCaptureSourcesDecs, 18, "setApplicationCaptureSources"], [_setLocalUserScreenSharingStateDecs, 18, "setLocalUserScreenSharingState"], [_setCurrentShareIdInfosDecs, 18, "setCurrentShareIdInfos"], [_setCurrentSelectionDecs, 18, "setCurrentSelection"], [_setCurrentSelectionIdDecs, 18, "setCurrentSelectionId"], [_setCurrentSelectionTypeDecs, 18, "setCurrentSelectionType"], [_setCurrentSelectionBoundsDecs, 18, "setCurrentSelectionBounds"], [_setShareWithAudioDecs, 18, "setShareWithAudio"], [_handleOnConnectionStateUpdatedDecs, 18, "_handleOnConnectionStateUpdated"]], []).e, 21);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIScreenShareSharedDataSourceImpl, [[_mobx.observable, 1, "isSharingScreen"], [_mobx.observable, 1, "screenSharingOwner"], [_mobx.observable, 1, "localUserScreenSharingState"], [_mobx.observable, 1, "applicationCaptureSources"], [_mobx.observable, 1, "screenCaptureSources"], [_mobx.observable, 1, "currentShareAudioProcessingChannel"], [_mobx.observable, 1, "currentSelectionId"], [_mobx.observable, 1, "currentSelectionType"], [_mobx.observable, 1, "shareWithAudio"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentSelectionBounds"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "isSeizeStream"], [_mobx.observable, 1, "screenShareScalcValue"], [_mobx.observable, 1, "screenShareVideoRatio"], [_mobx.observable, 1, "screenShareVideoSize"], [_mobx.observable, 1, "screenShareSpeakerViewSize"], [_mobx.observable, 1, "screenShareScenarioType"], [_mobx.observable, 1, "isCurrentScreenShareInSmoothType"], [_mobx.observable, 1, "sharingInReplace"], [_setScreenShareScenarioTypeDecs, 18, "setScreenShareScenarioType"], [_setScreenShareSpeakerViewSizeDecs, 18, "setScreenShareSpeakerViewSize"], [_setScreenShareVideoRatioDecs, 18, "setScreenShareVideoRatio"], [_setScreenShareVideoSizeDecs, 18, "setScreenShareVideoSize"], [_setScreenShareScalcValueDecs, 18, "setScreenShareScalcValue"], [_setIsSeizeStreamDecs, 18, "setIsSeizeStream"], [_setIsSharingScreenDecs, 18, "setIsSharingScreen"], [_setSharingInReplaceDecs, 18, "setSharingInReplace"], [_setScreenSharingOwnerDecs, 18, "setScreenSharingOwner"], [_setShareWithAudioTrackDecs, 18, "setShareWithAudioTrack"], [_setLoopbackAudioSourceIdDecs, 18, "setLoopbackAudioSourceId"], [_setScreenTrackDecs, 18, "setScreenTrack"], [_setCurrentShareTypeDecs, 18, "setCurrentShareType"], [_setCurrentShareIdDecs, 18, "setCurrentShareId"], [_setCurrentShareStreamIdDecs, 18, "setCurrentShareStreamId"], [_setCurrentShareAudioProcessingChannelDecs, 18, "setCurrentShareAudioProcessingChannel"], [_setScreenCaptureSourcesDecs, 18, "setScreenCaptureSources"], [_setApplicationCaptureSourcesDecs, 18, "setApplicationCaptureSources"], [_setLocalUserScreenSharingStateDecs, 18, "setLocalUserScreenSharingState"], [_setCurrentShareIdInfosDecs, 18, "setCurrentShareIdInfos"], [_setCurrentSelectionDecs, 18, "setCurrentSelection"], [_setCurrentSelectionIdDecs, 18, "setCurrentSelectionId"], [_setCurrentSelectionTypeDecs, 18, "setCurrentSelectionType"], [_setCurrentSelectionBoundsDecs, 18, "setCurrentSelectionBounds"], [_setShareWithAudioDecs, 18, "setShareWithAudio"], [_handleOnConnectionStateUpdatedDecs, 18, "_handleOnConnectionStateUpdated"], [_setLoopbackAudioSourceIdDecs2, 18, "_setLoopbackAudioSourceId"]], []).e, 21);
 _init_isSharingScreen = _applyDecs$e[0];
 _init_screenSharingOwner = _applyDecs$e[1];
 _init_localUserScreenSharingState = _applyDecs$e[2];

package/lib/shared-data-source/whiteboard-data.d.ts

@@ -1,5 +1,5 @@
 import { FcrConnectionState, FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIMainWindowRenderer, FcrUIMainWindowRendererObserver, WhiteboardToolAction } from '../modules/secondary-window/type';
+import { WhiteboardToolAction } from '../modules/secondary-window/type';
 import { FcrBoardShape, FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 import { WhiteboardThemeType } from '../modules/whiteboard/type';
 import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
@@ -14,8 +14,7 @@ export interface FcrUISharedWhiteboardDataSource {
     get showLoading(): boolean;
     get joinSuccess(): boolean;
     get toolbarState(): FcrToolbarState;
-    get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
-    setSharingUser: (userInfo: FcrUserInfo | undefined) => void;
+    setSharingUser: (userInfo: FcrUserInfo) => void;
     setBackgroundColor: (color: string) => void;
     setWhiteboardTool: (tool: {
         action: WhiteboardToolAction;
@@ -34,10 +33,10 @@ export interface FcrUISharedWhiteboardDataSource {
 export declare class FcrUISharedWhiteboardDataSourceImpl implements FcrUISharedWhiteboardDataSource {
     private _whiteboardControl;
     private _privilegeProvider;
-    private _fcrUIMainWindowRenderer;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _showLoading;
     private _disposers;
+    private _fcrUIMainWindowRenderer;
     private _toolbarStateObserver;
     accessor currentTheme: Required<WhiteboardThemeType>;
     accessor sharingUserInfo: FcrUserInfo | undefined;
@@ -46,12 +45,11 @@ export declare class FcrUISharedWhiteboardDataSourceImpl implements FcrUISharedW
     accessor connectionState: FcrConnectionState;
     accessor joinSuccess: boolean;
     accessor toolbarState: FcrToolbarState;
-    get toolbarStateObserver(): FcrUIMainWindowRendererObserver;
     get showLoading(): boolean;
     get canWriteBoard(): boolean;
-    constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _privilegeProvider: FcrUIPrivilegeProvider, _fcrUIMainWindowRenderer: FcrUIMainWindowRenderer);
+    constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _privilegeProvider: FcrUIPrivilegeProvider);
     setControlEnable(enable: boolean): void;
-    setSharingUser(userInfo: FcrUserInfo | undefined): void;
+    setSharingUser(userInfo: FcrUserInfo): void;
     setBackgroundColor(color: string): void;
     setWhiteboardTool(tool: {
         action: WhiteboardToolAction;

package/lib/shared-data-source/whiteboard-data.js

@@ -60,6 +60,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _type = require("fcr-core/lib/type");
 var _base = require("../base");
 var _mobx = require("mobx");
+var _secondaryWindow = require("../modules/secondary-window");
 var _type2 = require("../modules/secondary-window/type");
 var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _toolbar = require("../modules/components/toolbar");
@@ -89,7 +90,7 @@ var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
 _ref = (_setControlEnableDecs = [_mobx.action, _mobx.action.bound], _setSharingUserDecs = [_mobx.action, _mobx.action.bound], _setBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardToolDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setShowLoadingDecs = [_mobx.action, _mobx.action.bound], _setCommonColorsDecs = [_mobx.action, _mobx.action.bound], _setProgressDecs = [_mobx.action, _mobx.action.bound], _setJoinSuccessDecs = [_mobx.action, _mobx.action.bound], _handleConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUISharedWhiteboardDataSourceImpl(_whiteboardControl, _privilegeProvider, _fcrUIMainWindowRenderer) {
+  function FcrUISharedWhiteboardDataSourceImpl(_whiteboardControl, _privilegeProvider) {
     var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUISharedWhiteboardDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
@@ -130,7 +131,10 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
     }));
     this._whiteboardControl = _whiteboardControl;
     this._privilegeProvider = _privilegeProvider;
-    this._fcrUIMainWindowRenderer = _fcrUIMainWindowRenderer;
+    this._fcrUIMainWindowRenderer = new _secondaryWindow.FcrUIMainWindowRendererImpl();
+    // @ts-ignore
+    window.FcrUIMainWindowRenderer = this._fcrUIMainWindowRenderer;
+    this._fcrUIMainWindowRenderer.addObserver(this._toolbarStateObserver);
     this._disposers.push((0, _mobx.reaction)(function () {
       return _this.canWriteBoard;
     }, function (canWrite) {
@@ -194,11 +198,6 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
     set: function set(v) {
       _classPrivateFieldSet(_G, this, v);
     }
-  }, {
-    key: "toolbarStateObserver",
-    get: function get() {
-      return this._toolbarStateObserver;
-    }
   }, {
     key: "showLoading",
     get: function get() {
@@ -274,7 +273,7 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
     key: "saveDraft",
     value: function saveDraft() {
       var _this$_fcrUIMainWindo5;
-      (_this$_fcrUIMainWindo5 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo5 === void 0 || _this$_fcrUIMainWindo5.notifyObservers('onSaveDraft');
+      (_this$_fcrUIMainWindo5 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo5 === void 0 || _this$_fcrUIMainWindo5.notifyObservers('onSaveDraft', true);
     }
   }, {
     key: "setProgress",
@@ -290,7 +289,7 @@ var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourc
     key: "inActive",
     value: function inActive() {
       var _this$_fcrUIMainWindo6;
-      (_this$_fcrUIMainWindo6 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo6 === void 0 || _this$_fcrUIMainWindo6.notifyObservers('onWhiteboardInActive');
+      (_this$_fcrUIMainWindo6 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo6 === void 0 || _this$_fcrUIMainWindo6.notifyObservers('onWhiteboardInActive', true);
     }
   }, {
     key: "release",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.7.7",
+  "version": "3.7.8",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -22,13 +22,13 @@
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
     "agora-electron-sdk": "4.3.2-build.156-rc.1",
-    "agora-foundation": "~3.7.7",
-    "agora-ui-foundation": "~3.7.7",
+    "agora-foundation": "3.7.8",
+    "agora-ui-foundation": "3.7.8",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "~3.7.7",
+    "fcr-core": "3.7.8",
     "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.7.7",
+    "agora-toolchain": "3.7.8",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",