fcr-ui-scene 3.7.9-alpha → 3.8.0

package/lib/providers/room-provider/waiting-room-control-manager.d.ts

@@ -9,7 +9,7 @@ export default class FcrUIWaitingRoomControlManager {
     private _sceneConfig;
     private _engine;
     private _mainRoomControl;
-    protected logger: import("agora-foundation/lib/logger").Logger;
+    protected logger: import("fcr-core/lib/imports").Logger;
     private _observable;
     private _waitingRoomControl;
     private _isJoining;

package/lib/providers/screen-share/constant.d.ts

@@ -0,0 +1 @@
+export declare const ERROR_MESSAGE_ABORTED = "aborted";

package/lib/providers/screen-share/constant.js

@@ -0,0 +1,8 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ERROR_MESSAGE_ABORTED = void 0;
+var ERROR_MESSAGE_ABORTED = exports.ERROR_MESSAGE_ABORTED = 'aborted';

package/lib/providers/screen-share/provider.base.d.ts

@@ -1,12 +1,13 @@
-import { FcrUIScreenShareDisplayInfo, FcrUIScreenShareObserver, FcrUIScreenShareProvider, FcrUIScreenShareReplaceParams, FcrUIScreenShareStartParams, FcrUIScreenShareWindowInfo } from './type';
-import { FcrUIManagedObject, FcrUIObjectManager } from '../../object-manager';
-import { FcrUIScreenShareStrategy } from './strategy/type';
+import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
 import { FcrDesktopMediaControl, FcrStreamControl, FcrStreamObserver } from 'fcr-core';
 import { FcrSharingControl, FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIScreenStreamSync } from './stream-state-sync';
-import { FcrUIFacilityProvider } from '../facility/type';
-import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
+import { FcrUIManagedObject, FcrUIObjectManager } from '../../object-manager';
 import { FcrUISharedScreenShareDataSource } from '../../shared-data/screen-share/type';
+import { FcrUIFacilityProvider } from '../facility/type';
+import { FcrUIScreenShareStrategy } from './strategy/type';
+import { FcrUIScreenStreamSync } from './stream-state-sync';
+import { FcrUISelectionBoundsChangeReason } from './struct';
+import { FcrUIScreenShareDisplayInfo, FcrUIScreenShareObserver, FcrUIScreenShareProvider, FcrUIScreenShareReplaceParams, FcrUIScreenShareStartParams, FcrUIScreenShareWindowInfo } from './type';
 /**
  * startShare
  *    - callback: share started
@@ -52,6 +53,7 @@ export declare abstract class FcrUIScreenShareProviderBase implements FcrUIManag
     protected _closeByOther: boolean;
     protected _closeOperator: FcrUserInfo | null;
     protected _localUser: FcrUserInfo;
+    protected _abortController: AbortController | null;
     protected accessor _isLocalUserScreenSharing: boolean;
     protected accessor _isRemoteUserScreenSharing: boolean;
     protected accessor _isSharingWithAudio: boolean;
@@ -75,6 +77,7 @@ export declare abstract class FcrUIScreenShareProviderBase implements FcrUIManag
     addObserver(observer: FcrUIScreenShareObserver): void;
     removeObserver(observer: FcrUIScreenShareObserver): void;
     setSelectionBounds(bounds: FcrUI.FcrUIRectangle | null): void;
+    changeSelectionBounds(bounds: FcrUI.FcrUIRectangle, reason: FcrUISelectionBoundsChangeReason): void;
     enableScreenShareAudio(): Promise<void>;
     disableScreenShareAudio(): Promise<void>;
     enableSmoothMode(): void;
@@ -91,5 +94,4 @@ export declare abstract class FcrUIScreenShareProviderBase implements FcrUIManag
     private _handleStreamAdded;
     private _getMyRemovedScreenStreamReason;
     private _findSharingUser;
-    private _handleStreamUpdated;
 }

package/lib/providers/screen-share/provider.base.js

@@ -57,18 +57,18 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _logger = require("../../utilities/logger");
-var _objectManager = require("../../object-manager");
+var _decorator = require("agora-foundation/lib/decorator");
+var _observable = require("agora-foundation/lib/utilities/observable");
 var _fcrCore = require("fcr-core");
 var _type = require("fcr-core/lib/type");
+var _get = _interopRequireDefault(require("lodash/get"));
+var _mobx = require("mobx");
+var _objectManager = require("../../object-manager");
+var _logger = require("../../utilities/logger");
 var _streamStateSync = require("./stream-state-sync");
 var _struct = require("./struct");
-var _observable = require("agora-foundation/lib/utilities/observable");
-var _decorator = require("agora-foundation/lib/decorator");
-var _mobx = require("mobx");
-var _get = _interopRequireDefault(require("lodash/get"));
 var _FcrUIScreenShareProviderBase;
-var _initProto, _init__isLocalUserScreenSharing, _init__isRemoteUserScreenSharing, _init__isSharingWithAudio, _init__isSharingInSmoothMode, _init__isSharingInStereoAudioMode, _init__shareStreamId, _init__sharingUser, _enableScreenShareAudioDecs, _disableScreenShareAudioDecs, _enableSmoothModeDecs, _disableSmoothModeDecs, _enableStereoAudioModeDecs, _disableStereoAudioModeDecs, _findSharingUserDecs, _handleStreamUpdatedDecs, _ref;
+var _initProto, _init__isLocalUserScreenSharing, _init__isRemoteUserScreenSharing, _init__isSharingWithAudio, _init__isSharingInSmoothMode, _init__isSharingInStereoAudioMode, _init__shareStreamId, _init__sharingUser, _enableScreenShareAudioDecs, _disableScreenShareAudioDecs, _enableSmoothModeDecs, _disableSmoothModeDecs, _enableStereoAudioModeDecs, _disableStereoAudioModeDecs, _findSharingUserDecs, _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; }
@@ -86,7 +86,7 @@ var _D = /*#__PURE__*/new WeakMap();
 var _E = /*#__PURE__*/new WeakMap();
 var _F = /*#__PURE__*/new WeakMap();
 var _G = /*#__PURE__*/new WeakMap();
-_ref = (_enableScreenShareAudioDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _disableScreenShareAudioDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _enableSmoothModeDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _disableSmoothModeDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _enableStereoAudioModeDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _disableStereoAudioModeDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _findSharingUserDecs = [_mobx.action, _mobx.action.bound], _handleStreamUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+_ref = (_enableScreenShareAudioDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _disableScreenShareAudioDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _enableSmoothModeDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _disableSmoothModeDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _enableStereoAudioModeDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _disableStereoAudioModeDecs = [void 0, _decorator.trace, _mobx.action, _mobx.action.bound], _findSharingUserDecs = [_mobx.action, _mobx.action.bound], "logger");
 /**
  * startShare
  *    - callback: share started
@@ -126,6 +126,7 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
     (0, _defineProperty2["default"])(this, "_sharingDisplayBounds", null);
     (0, _defineProperty2["default"])(this, "_closeByOther", false);
     (0, _defineProperty2["default"])(this, "_closeOperator", null);
+    (0, _defineProperty2["default"])(this, "_abortController", null);
     _classPrivateFieldInitSpec(this, _A, _init__isLocalUserScreenSharing(this, false));
     _classPrivateFieldInitSpec(this, _B, _init__isRemoteUserScreenSharing(this, false));
     _classPrivateFieldInitSpec(this, _C, _init__isSharingWithAudio(this, false));
@@ -150,9 +151,6 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
       },
       onStreamsRemoved: function onStreamsRemoved(roomId, events) {
         _this._handleStreamRemove(events);
-      },
-      onStreamsUpdated: function onStreamsUpdated(roomId, events) {
-        _this._handleStreamUpdated(events);
       }
     };
     this._streamControl.addObserver(streamObserver);
@@ -182,7 +180,7 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
         _this.observable.notifyObservers('onScreenShareStarted', _this.strategy.getScreenTrack());
       }
     });
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onScreenShareErrorOccurred', 'onAudioShareErrorOccurred', 'onScreenShareStarted', 'onScreenShareStopped', 'onShareSourceReplaced', 'onPrepreScreenCapture']));
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onScreenShareErrorOccurred', 'onAudioShareErrorOccurred', 'onScreenShareStarted', 'onScreenShareStopped', 'onShareSourceReplaced', 'onPrepreScreenCapture', 'onSelectionBoundsChanged']));
   }
   return (0, _createClass2["default"])(FcrUIScreenShareProviderBase, [{
     key: "_isLocalUserScreenSharing",
@@ -309,9 +307,10 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
     }
   }, {
     key: "setSelectionBounds",
-    value: function setSelectionBounds(bounds) {
-      this._selectionBounds = bounds;
-    }
+    value: function setSelectionBounds(bounds) {}
+  }, {
+    key: "changeSelectionBounds",
+    value: function changeSelectionBounds(bounds, reason) {}
   }, {
     key: "enableScreenShareAudio",
     value: function () {
@@ -434,7 +433,7 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
     key: "_handleStreamRemove",
     value: function _handleStreamRemove(events) {
       var isMyScreenStreamBeingRemoved = this._getMyRemovedScreenStreamReason(events);
-      if (this._isScreenShareStarted && isMyScreenStreamBeingRemoved) {
+      if (isMyScreenStreamBeingRemoved) {
         this.logger.info("local screen stream being removed, reason: ".concat(isMyScreenStreamBeingRemoved.reason));
         this._closeByOther = isMyScreenStreamBeingRemoved.test(_struct.FcrUIScreenShareStopReason.STOPPED_BY_OTHER);
         if (this._closeByOther) {
@@ -447,6 +446,10 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
   }, {
     key: "_stopDeviceCapture",
     value: function _stopDeviceCapture() {
+      if (this._abortController) {
+        this._abortController.abort();
+        this._abortController = null;
+      }
       this.strategy.stopScreenCapture();
       this.strategy.stopLoopbackCapture();
     }
@@ -499,20 +502,10 @@ var FcrUIScreenShareProviderBase = exports.FcrUIScreenShareProviderBase = /*#__P
       this._sharingUser = sharingUser;
       this._shareStreamId = shareStreamId;
     }
-  }, {
-    key: "_handleStreamUpdated",
-    value: function _handleStreamUpdated(events) {
-      var isSharingWithAudio = events.some(function (event) {
-        var isScreenSharing = event.modifiedStream.streamType === _type.FcrStreamType.BOTH;
-        var isSharingWithAudio = event.modifiedStream.audioSourceState === _type.FcrMediaSourceState.OPEN;
-        return isScreenSharing && isSharingWithAudio;
-      });
-      this._sharedScreenShareDataSource.setIsSharingWithAudio(isSharingWithAudio);
-    }
   }]);
 }();
 _FcrUIScreenShareProviderBase = FcrUIScreenShareProviderBase;
-var _applyDecs$e = _applyDecs(_FcrUIScreenShareProviderBase, [[_mobx.observable, 1, "_isLocalUserScreenSharing"], [_mobx.observable, 1, "_isRemoteUserScreenSharing"], [_mobx.observable, 1, "_isSharingWithAudio"], [_mobx.observable, 1, "_isSharingInSmoothMode"], [_mobx.observable, 1, "_isSharingInStereoAudioMode"], [_mobx.observable, 1, "_shareStreamId"], [_mobx.observable, 1, "_sharingUser"], [_decorator.trace, 2, "setSelectionBounds"], [_enableScreenShareAudioDecs, 18, "enableScreenShareAudio"], [_disableScreenShareAudioDecs, 18, "disableScreenShareAudio"], [_enableSmoothModeDecs, 18, "enableSmoothMode"], [_disableSmoothModeDecs, 18, "disableSmoothMode"], [_enableStereoAudioModeDecs, 18, "enableStereoAudioMode"], [_disableStereoAudioModeDecs, 18, "disableStereoAudioMode"], [_decorator.trace, 2, "release"], [_findSharingUserDecs, 18, "_findSharingUser"], [_handleStreamUpdatedDecs, 18, "_handleStreamUpdated"]], []).e;
+var _applyDecs$e = _applyDecs(_FcrUIScreenShareProviderBase, [[_mobx.observable, 1, "_isLocalUserScreenSharing"], [_mobx.observable, 1, "_isRemoteUserScreenSharing"], [_mobx.observable, 1, "_isSharingWithAudio"], [_mobx.observable, 1, "_isSharingInSmoothMode"], [_mobx.observable, 1, "_isSharingInStereoAudioMode"], [_mobx.observable, 1, "_shareStreamId"], [_mobx.observable, 1, "_sharingUser"], [_enableScreenShareAudioDecs, 18, "enableScreenShareAudio"], [_disableScreenShareAudioDecs, 18, "disableScreenShareAudio"], [_enableSmoothModeDecs, 18, "enableSmoothMode"], [_disableSmoothModeDecs, 18, "disableSmoothMode"], [_enableStereoAudioModeDecs, 18, "enableStereoAudioMode"], [_disableStereoAudioModeDecs, 18, "disableStereoAudioMode"], [_decorator.trace, 2, "release"], [_findSharingUserDecs, 18, "_findSharingUser"]], []).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 8);
 _init__isLocalUserScreenSharing = _applyDecs$e2[0];
 _init__isRemoteUserScreenSharing = _applyDecs$e2[1];

package/lib/providers/screen-share/provider.browser.js

@@ -192,31 +192,29 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               throw new Error("cannot start screen capture, error: ".concat(_t));
             case 8:
               if (this._facilityProvider.isNetworkConnected) {
-                _context3.next = 10;
+                _context3.next = 9;
                 break;
               }
-              _context3.next = 9;
-              return this.strategy.stopScreenCapture();
-            case 9:
+              this.strategy.stopScreenCapture();
               this.observable.notifyObservers('onScreenShareErrorOccurred', _struct.FcrUIScreenShareErrorCode.NETWORK_DISCONNECTED);
               throw new Error('network is disconnected while starting screen share');
-            case 10:
-              _context3.prev = 10;
-              _context3.next = 11;
+            case 9:
+              _context3.prev = 9;
+              _context3.next = 10;
               return this._screenStreamSync.startScreenStream(createConfig, encoderConfig);
-            case 11:
-              _context3.next = 13;
+            case 10:
+              _context3.next = 12;
               break;
-            case 12:
-              _context3.prev = 12;
-              _t2 = _context3["catch"](10);
+            case 11:
+              _context3.prev = 11;
+              _t2 = _context3["catch"](9);
               this.observable.notifyObservers('onScreenShareErrorOccurred', _struct.FcrUIScreenShareErrorCode.CANNOT_CREATE_STREAM);
               throw new Error("cannot create screen stream, error: ".concat(_t2));
-            case 13:
+            case 12:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[5, 7], [10, 12]]);
+        }, _callee3, this, [[5, 7], [9, 11]]);
       }));
       function startShare(_x) {
         return _startShare.apply(this, arguments);
@@ -230,12 +228,10 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              this.strategy.stopScreenCapture();
               _context4.next = 1;
-              return this.strategy.stopScreenCapture();
-            case 1:
-              _context4.next = 2;
               return this._screenStreamSync.stopScreenStream();
-            case 2:
+            case 1:
             case "end":
               return _context4.stop();
           }

package/lib/providers/screen-share/provider.electron.d.ts

@@ -1,6 +1,7 @@
 import { FcrUIObjectManager } from '../../object-manager';
 import { FcrUIScreenShareProviderBase } from './provider.base';
 import { FcrUIScreenShareStrategy } from './strategy/type';
+import { FcrUISelectionBoundsChangeReason } from './struct';
 import { FcrUIScreenShareStartParams, FcrUIScreenShareReplaceParams, FcrUIScreenShareWindowInfo, FcrUIScreenShareDisplayInfo } from './type';
 export declare class FcrUIScreenShareProviderImpl extends FcrUIScreenShareProviderBase {
     private _renderer;
@@ -13,6 +14,8 @@ export declare class FcrUIScreenShareProviderImpl extends FcrUIScreenShareProvid
     replaceShare({ videoSourceId, captureType }: FcrUIScreenShareReplaceParams): Promise<void>;
     findSharingDisplayBounds(): Electron.Rectangle;
     createStrategy(): FcrUIScreenShareStrategy;
+    setSelectionBounds(bounds: FcrUI.FcrUIRectangle | null): void;
+    changeSelectionBounds(bounds: FcrUI.FcrUIRectangle, reason: FcrUISelectionBoundsChangeReason): void;
     private _getExcludeWindows;
     private _getEncoderConfig;
 }

package/lib/providers/screen-share/provider.electron.js

@@ -75,6 +75,9 @@ var _misc = require("agora-foundation/lib/utilities/misc");
 var _tools = require("../../utilities/tools");
 var _constant = require("../../utilities/constant");
 var _defaultConfig = require("../../utilities/default-config");
+var _mobx = require("mobx");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _constant2 = require("./constant");
 var _FcrUIScreenShareProviderImpl;
 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)); }
@@ -105,10 +108,10 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               _context.next = 1;
               return this._mediaControl.getDisplayList();
             case 1:
-              this._displayList = _context.sent.map(function (item) {
+              this._displayList = _context.sent.map(function (item, index) {
                 return {
                   id: item.id,
-                  title: item.title,
+                  title: "".concat((0, _i18n.transI18n)('fmt_uimanager_labels_screen'), " ").concat(index + 1),
                   image: item.image,
                   imageWidth: item.imageWidth,
                   imageHeight: item.imageHeight,
@@ -166,7 +169,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     key: "startShare",
     value: function () {
       var _startShare = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref) {
-        var videoSourceId, _ref$captureType, captureType, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, excludeWindows, dimensions, frameRate, bitrate, _t, _t2;
+        var videoSourceId, _ref$captureType, captureType, createConfig, screenTrack, isScreenRecordingGranted, isScreenSharingPermitted, audioSourceId, encoderConfig, aborted, abortController, excludeWindows, dimensions, frameRate, bitrate, _t, _t2;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -214,7 +217,15 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               }
               this._sharingDisplayBounds = this.findSharingDisplayBounds();
               this.observable.notifyObservers('onPrepreScreenCapture');
-              encoderConfig = this._getEncoderConfig(); // create screen stream
+              encoderConfig = this._getEncoderConfig();
+              aborted = false;
+              abortController = new AbortController();
+              this._abortController = abortController;
+              abortController.signal.addEventListener('abort', function () {
+                aborted = true;
+              });
+
+              // create screen stream
               _context3.prev = 5;
               _context3.next = 6;
               return this._screenStreamSync.startScreenStream(createConfig, encoderConfig);
@@ -233,7 +244,13 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
             case 9:
               excludeWindows = _context3.sent;
               dimensions = encoderConfig.dimensions, frameRate = encoderConfig.frameRate, bitrate = encoderConfig.bitrate;
-              _context3.next = 10;
+              if (!aborted) {
+                _context3.next = 10;
+                break;
+              }
+              throw new Error(_constant2.ERROR_MESSAGE_ABORTED);
+            case 10:
+              _context3.next = 11;
               return this.strategy.startScreenCapture({
                 sourceId: videoSourceId,
                 captureType: captureType,
@@ -242,26 +259,30 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
                 frameRate: frameRate,
                 bitrate: bitrate
               });
-            case 10:
-              _context3.next = 12;
-              break;
             case 11:
-              _context3.prev = 11;
+              _context3.next = 13;
+              break;
+            case 12:
+              _context3.prev = 12;
               _t2 = _context3["catch"](8);
-              this.observable.notifyObservers('onScreenShareErrorOccurred', _struct.FcrUIScreenShareErrorCode.CANNOT_START_SCREEN_CAPTURE);
+              if (_t2 instanceof Error && _t2.message === _constant2.ERROR_MESSAGE_ABORTED) {
+                this.observable.notifyObservers('onScreenShareErrorOccurred', _struct.FcrUIScreenShareErrorCode.ABORT_START_SCREEN_CAPTURE);
+              } else {
+                this.observable.notifyObservers('onScreenShareErrorOccurred', _struct.FcrUIScreenShareErrorCode.CANNOT_START_SCREEN_CAPTURE);
+              }
               throw new Error("cannot start screen capture, error: ".concat(_t2));
-            case 12:
+            case 13:
               if (!this._isSharingWithAudio) {
-                _context3.next = 13;
+                _context3.next = 14;
                 break;
               }
-              _context3.next = 13;
+              _context3.next = 14;
               return this.strategy.startLoopbackCapture({});
-            case 13:
+            case 14:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[5, 7], [8, 11]]);
+        }, _callee3, this, [[5, 7], [8, 12]]);
       }));
       function startShare(_x) {
         return _startShare.apply(this, arguments);
@@ -275,15 +296,15 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
+              if (this._abortController) {
+                this._abortController.abort();
+                this._abortController = null;
+              }
+              this.strategy.stopScreenCapture();
+              this.strategy.stopLoopbackCapture();
               _context4.next = 1;
-              return this.strategy.stopScreenCapture();
-            case 1:
-              _context4.next = 2;
-              return this.strategy.stopLoopbackCapture();
-            case 2:
-              _context4.next = 3;
               return this._screenStreamSync.stopScreenStream();
-            case 3:
+            case 1:
             case "end":
               return _context4.stop();
           }
@@ -380,6 +401,26 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
     value: function createStrategy() {
       return new _electron.FcrUIElectronScreenShareStrategy(this.objectManager);
     }
+  }, {
+    key: "setSelectionBounds",
+    value: function setSelectionBounds(bounds) {
+      this._selectionBounds = bounds;
+    }
+  }, {
+    key: "changeSelectionBounds",
+    value: function changeSelectionBounds(bounds, reason) {
+      var oldBounds = this._selectionBounds;
+      this._selectionBounds = bounds;
+      this.logger.info("selection bounds: ".concat((0, _misc.jsonstring)(oldBounds), " => ").concat((0, _misc.jsonstring)(bounds)));
+      if (this._isLocalUserScreenSharing) {
+        if (bounds && oldBounds) {
+          if (oldBounds.width !== bounds.width || oldBounds.height !== bounds.height || oldBounds.x !== bounds.x || oldBounds.y !== bounds.y) {
+            this._sharingDisplayBounds = this.findSharingDisplayBounds();
+            this.observable.notifyObservers('onSelectionBoundsChanged', bounds, reason);
+          }
+        }
+      }
+    }
   }, {
     key: "_getExcludeWindows",
     value: function () {
@@ -393,7 +434,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
               windowNames = [];
               _context6.next = 1;
               return (0, _tools.waitUntil)(function () {
-                var windowsIds = _this3._renderer.getMediaSourcesIdByTitle(['Control Bar', 'Video Window', 'Annotation', 'Annotation tool bar']);
+                var windowsIds = _this3._renderer.getMediaSourcesIdByTitle(['Control Bar', 'Video Window', 'Annotation', 'Annotation tool bar', 'Subtitles History']);
                 windowsIds === null || windowsIds === void 0 || windowsIds.forEach(function (windowInfo) {
                   var windowName = windowInfo.windowName,
                     windowId = windowInfo.windowId;
@@ -404,7 +445,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
                     windowNames.push(windowName);
                   }
                 });
-                return windowNames.includes('Control Bar') && windowNames.includes('Video Window');
+                return windowNames.includes('Control Bar') && windowNames.includes('Video Window') && windowNames.includes('Subtitles History');
               }, 'control bar is open');
             case 1:
               return _context6.abrupt("return", excludeWindows);
@@ -446,7 +487,7 @@ var FcrUIScreenShareProviderImpl = exports.FcrUIScreenShareProviderImpl = /*#__P
   }]);
 }(_provider.FcrUIScreenShareProviderBase);
 _FcrUIScreenShareProviderImpl = FcrUIScreenShareProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIScreenShareProviderImpl, [[_decorator.trace, 2, "getDisplayList"], [_decorator.trace, 2, "getWindowList"], [_decorator.trace, 2, "startShare"], [_decorator.trace, 2, "stopShare"], [_decorator.trace, 2, "replaceShare"]], [], 0, void 0, _provider.FcrUIScreenShareProviderBase).e;
+var _applyDecs$e = _applyDecs(_FcrUIScreenShareProviderImpl, [[_decorator.trace, 2, "getDisplayList"], [_decorator.trace, 2, "getWindowList"], [_decorator.trace, 2, "startShare"], [_decorator.trace, 2, "stopShare"], [_decorator.trace, 2, "replaceShare"], [[_decorator.trace, _mobx.action], 2, "setSelectionBounds"], [[_decorator.trace, _mobx.action], 2, "changeSelectionBounds"]], [], 0, void 0, _provider.FcrUIScreenShareProviderBase).e;
 var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
 _initProto = _applyDecs$e2[0];
 _applyDecs$e;

package/lib/providers/screen-share/strategy/electron.d.ts

@@ -9,9 +9,10 @@ export declare class FcrUIElectronScreenShareStrategy extends FcrUIScreenShareSt
     private _loopbackTrack;
     private _mediaControl;
     private _isReplacing;
+    private _abortController;
     constructor(_objectManager: FcrUIObjectManager);
     startScreenCapture({ sourceId, captureType, excludeWindows, dimensions, frameRate, bitrate, }: FcrUIScreenCaptureStartParams): Promise<void>;
-    stopScreenCapture(): Promise<void>;
+    stopScreenCapture(): void;
     startLoopbackCapture(params: FcrUIScreenLoopbackCaptureStartParams): Promise<void>;
     stopLoopbackCapture(): Promise<void>;
     getScreenTrack(): FcrScreenTrack | null;