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

package/lib/modules/control-bar/index.js

@@ -28,6 +28,7 @@ var _view = require("./view");
 var _store2 = require("../components/device-control/store");
 var _constant = require("../../utilities/constant");
 var _store3 = require("../components/leave-meeting/store");
+var _fcrCore = require("fcr-core");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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)); }
@@ -98,7 +99,7 @@ var ControlBarUIModule = exports.ControlBarUIModule = /*#__PURE__*/function (_UI
           this._store.handlerStopShare();
           break;
         case _constant.FcrUIRendererEventAction.FRAGMENT_ANNOTATION_ENGINE_STATE:
-          this.logger.info("[control-bar] fragment-annotation-engine-state, ".concat(event.payload));
+          this.logger.info("[control-bar] fragment-annotation-engine-state, ".concat(_fcrCore.FcrConnectionState[event.payload]));
           this._store.setFragmentEngineState(event.payload);
           break;
       }

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

@@ -1,4 +1,4 @@
-import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
+import { FcrWindowInfo } from 'fcr-core/lib/type';
 import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
 import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrConnectionState, FcrLiveStreamingState, FcrRecordingState, FcrRoomInfo } from 'fcr-core/lib/type';
@@ -49,6 +49,7 @@ export default class ControlBarStore {
     private _sharingProvider;
     private _screenShareProvider;
     private _dialogProvider;
+    private _handleMousePositionObserver;
     private _dialogObsever;
     private _participantDialogId;
     accessor leaveConfirmRef: React.ReactNode;
@@ -59,17 +60,17 @@ export default class ControlBarStore {
     accessor startTime: number;
     accessor playUrl: string;
     accessor liveStreamingState: FcrLiveStreamingState;
-    accessor allApplicationWindows: AgoraRtcWindowInfo[];
+    accessor allApplicationWindows: FcrWindowInfo[];
     accessor roomInfo: FcrRoomInfo;
     accessor isShowMeetingDetailPortal: boolean;
     accessor hiddenShareActionNav: boolean;
     accessor boardOwnerUser: string;
-    accessor currentShareDisplayId: number;
     accessor fragmentEngineState: FcrConnectionState;
-    isAnnotationSupported(): boolean;
+    accessor controlBarMouseOver: boolean;
+    get currentShareDisplayId(): number;
     get shareWithAudio(): boolean;
     get currentShareId(): string;
-    get currentShareType(): AgoraRtcScreenCaptureType;
+    get currentShareType(): import("fcr-core/lib/type").FcrScreenCaptureType;
     get currentShareBounds(): CurrentShareBounds;
     get privilegeProvider(): FcrUIPrivilegeProvider;
     get localUser(): import("fcr-core/lib/type").FcrUserInfo;
@@ -82,14 +83,13 @@ export default class ControlBarStore {
         y: number;
     };
     get hasSecurityPermission(): boolean;
-    get hasStartCloudRecordingPermission(): boolean;
-    get hasStopLiveStreamingPermission(): boolean;
     get hasGetLiveStreamingUrlPermission(): boolean;
+    get hasStartCloudRecordingPermission(): boolean;
     get hasStartLiveStreamingPermission(): boolean;
     get hasAssignHostBeforeLeavingPermission(): boolean;
+    get isEngineConnected(): boolean;
     get hasEndRoomPermission(): boolean;
     get hasAnnotationAllowWritePermission(): boolean;
-    get hasAnnotationWritePermission(): boolean;
     get allowAnnotationWriteState(): boolean;
     get totalHourText(): string;
     get totalMinuteText(): string;
@@ -110,10 +110,9 @@ export default class ControlBarStore {
     get shareAudioProcessingChannel(): AudioProcessingChannel;
     get checkedStateMap(): FcrSecurityCheckedStateType;
     get isSharingScreen(): boolean;
-    get mousePosition(): {
-        x: number;
-        y: number;
-    };
+    get annotationButtonVisible(): boolean;
+    get liveStreamingButtonVisible(): boolean;
+    get recordingButtonVisible(): boolean;
     constructor({ uiEventStore, securityStore, roomControl, deviceProvider, sharedLayoutDataSource, roomProvider, sharedChatDataSource, sharedMemberDataSource, localStorageProvider, abilityProvider, sharedMeetingTimeDataSource, messageProvider, sharedSecuritySharedDataSource, annotationProvider, sharingProvider, screenShareProvider, sharedScreenShareSharedDataSource, dialogProvider, sharedConfirmDataSource, }: {
         uiEventStore: FcrUIEventProvider;
         securityStore: FcrUIPrivilegeProvider;
@@ -158,6 +157,10 @@ export default class ControlBarStore {
     setAllAnnotationWrite(allow: boolean): void;
     release(): void;
     log(info: string): void;
+    removeObserverWindowBounds(): void;
+    setObserverWindowBounds(window: CurrentShareBounds): void;
     private _resetMessageCount;
+    private _handleMousePositionObserverMouseOver;
+    private _handleMousePositionObserverMouseOut;
 }
 export declare const StoreContext: import("react").Context<ControlBarStore>;

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

@@ -67,9 +67,10 @@ var _leaveMeeting = require("../components/leave-meeting");
 var _type3 = require("../../type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _logger = require("../../utilities/logger");
+var _sharedStorage = require("../../utilities/shared-storage");
 var _jsxRuntime = require("react/jsx-runtime");
 var _ControlBarStore;
-var _initProto, _leaveConfirmRefDecs, _init_leaveConfirmRef, _init_recordShareBounds, _init_cloudRecordingState, _init_isHost, _init_roomDuration, _init_startTime, _init_playUrl, _init_liveStreamingState, _init_allApplicationWindows, _init_roomInfo, _init_isShowMeetingDetailPortal, _init_hiddenShareActionNav, _init_boardOwnerUser, _init_currentShareDisplayId, _init_fragmentEngineState, _setCheckedStateMapDecs, _setShareWithAudioStateDecs, _showLockedRoomToastDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _setFragmentEngineStateDecs, _handleMoreClickDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showToastDecs, _setShowMeetingDetailPortalDecs, _setEnableWaitingRoomDecs, _handleLeaveRoomDecs, _resetMessageCountDecs, _ref;
+var _initProto, _leaveConfirmRefDecs, _init_leaveConfirmRef, _init_recordShareBounds, _init_cloudRecordingState, _init_isHost, _init_roomDuration, _init_startTime, _init_playUrl, _init_liveStreamingState, _init_allApplicationWindows, _init_roomInfo, _init_isShowMeetingDetailPortal, _init_hiddenShareActionNav, _init_boardOwnerUser, _init_fragmentEngineState, _init_controlBarMouseOver, _setCheckedStateMapDecs, _setShareWithAudioStateDecs, _showLockedRoomToastDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _setFragmentEngineStateDecs, _handleMoreClickDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showToastDecs, _setShowMeetingDetailPortalDecs, _setEnableWaitingRoomDecs, _handleLeaveRoomDecs, _removeObserverWindowBoundsDecs, _setObserverWindowBoundsDecs, _resetMessageCountDecs, _handleMousePositionObserverMouseOverDecs, _handleMousePositionObserverMouseOutDecs, _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; }
@@ -101,7 +102,7 @@ _ref = (_leaveConfirmRefDecs = [_mobx.observable, _mobx.observable.ref], _setChe
   leading: true
 })], _stopCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
-})], _showToastDecs = [_mobx.action, _mobx.action.bound], _setShowMeetingDetailPortalDecs = [_mobx.action, _mobx.action.bound], _setEnableWaitingRoomDecs = [_mobx.action, _mobx.action.bound], _handleLeaveRoomDecs = [_mobx.action, _mobx.action.bound], _resetMessageCountDecs = [_mobx.action, _mobx.action.bound], "logger");
+})], _showToastDecs = [_mobx.action, _mobx.action.bound], _setShowMeetingDetailPortalDecs = [_mobx.action, _mobx.action.bound], _setEnableWaitingRoomDecs = [_mobx.action, _mobx.action.bound], _handleLeaveRoomDecs = [_mobx.action, _mobx.action.bound], _removeObserverWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _setObserverWindowBoundsDecs = [_mobx.action, _mobx.action.bound], _resetMessageCountDecs = [_mobx.action, _mobx.action.bound], _handleMousePositionObserverMouseOverDecs = [_mobx.action, _mobx.action.bound], _handleMousePositionObserverMouseOutDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   function ControlBarStore(_ref2) {
     var _this = this,
@@ -141,6 +142,10 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     });
     (0, _defineProperty2["default"])(this, "_disposers", []);
     (0, _defineProperty2["default"])(this, "_liveStreamingDialogKey", null);
+    (0, _defineProperty2["default"])(this, "_handleMousePositionObserver", {
+      onMouseOver: this._handleMousePositionObserverMouseOver,
+      onMouseOut: this._handleMousePositionObserverMouseOut
+    });
     (0, _defineProperty2["default"])(this, "_dialogObsever", {
       onDialogOpened: function onDialogOpened(dialogKey, dialogId) {
         if (dialogKey === _constant.FcrUIDialogKey.PARTICIPANT) {
@@ -173,8 +178,8 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _K, _init_isShowMeetingDetailPortal(this, false));
     _classPrivateFieldInitSpec(this, _L, _init_hiddenShareActionNav(this, false));
     _classPrivateFieldInitSpec(this, _M, _init_boardOwnerUser(this, ''));
-    _classPrivateFieldInitSpec(this, _N, _init_currentShareDisplayId(this, 0));
-    _classPrivateFieldInitSpec(this, _O, _init_fragmentEngineState(this, _type2.FcrConnectionState.DISCONNECTED));
+    _classPrivateFieldInitSpec(this, _N, _init_fragmentEngineState(this));
+    _classPrivateFieldInitSpec(this, _O, _init_controlBarMouseOver(this, false));
     this._uiEventStore = uiEventStore;
     this._roomControl = roomControl;
     this._securityStore = securityStore;
@@ -198,6 +203,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     this._screenShareProvider = screenShareProvider;
     this._sharedScreenShareSharedDataSource = sharedScreenShareSharedDataSource;
     this._dialogProvider = dialogProvider;
+    this._sharedConfirmDataSource.addObserver(this._handleMousePositionObserver);
     this._dialogProvider.addObserver(this._dialogObsever);
     this._roomObserver = {
       onLiveStreamingStateUpdated: function onLiveStreamingStateUpdated(_roomId, state, url) {
@@ -218,6 +224,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     };
     roomControl.addObserver(this._roomObserver);
     roomControl.getSharingControl().getBoardControl().addObserver(this._boardObserver);
+    this.fragmentEngineState = (0, _sharedStorage.getAnnotationEngineState)();
   }
   return (0, _createClass2["default"])(ControlBarStore, [{
     key: "leaveConfirmRef",
@@ -324,7 +331,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_M, this, v);
     }
   }, {
-    key: "currentShareDisplayId",
+    key: "fragmentEngineState",
     get: function get() {
       return _classPrivateFieldGet(_N, this);
     },
@@ -332,7 +339,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_N, this, v);
     }
   }, {
-    key: "fragmentEngineState",
+    key: "controlBarMouseOver",
     get: function get() {
       return _classPrivateFieldGet(_O, this);
     },
@@ -340,9 +347,9 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       _classPrivateFieldSet(_O, this, v);
     }
   }, {
-    key: "isAnnotationSupported",
-    value: function isAnnotationSupported() {
-      return this._abilityProvider.isAnnotationSupported();
+    key: "currentShareDisplayId",
+    get: function get() {
+      return +this._sharedScreenShareSharedDataSource.currentShareId;
     }
   }, {
     key: "shareWithAudio",
@@ -390,19 +397,14 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       return this._securityStore.hasSecurityPermission;
     }
   }, {
-    key: "hasStartCloudRecordingPermission",
-    get: function get() {
-      return this._securityStore.hasStartCloudRecordingPermission();
-    }
-  }, {
-    key: "hasStopLiveStreamingPermission",
+    key: "hasGetLiveStreamingUrlPermission",
     get: function get() {
-      return this._securityStore.hasStopLiveStreamingPermission();
+      return this._securityStore.hasGetLiveStreamingLinkPermission();
     }
   }, {
-    key: "hasGetLiveStreamingUrlPermission",
+    key: "hasStartCloudRecordingPermission",
     get: function get() {
-      return this._securityStore.hasGetLiveStreamingLinkPermission();
+      return this._securityStore.hasStartCloudRecordingPermission();
     }
   }, {
     key: "hasStartLiveStreamingPermission",
@@ -414,6 +416,11 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._securityStore.hasAssignHostBeforeLeavingPermission(_fcrCore.FcrPrivilegeUserRole.HOST);
     }
+  }, {
+    key: "isEngineConnected",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isEngineConnected;
+    }
   }, {
     key: "hasEndRoomPermission",
     get: function get() {
@@ -424,11 +431,6 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this._securityStore.hasAnnotationAllowWritePermission();
     }
-  }, {
-    key: "hasAnnotationWritePermission",
-    get: function get() {
-      return this._securityStore.hasAnnotationWritePermission();
-    }
   }, {
     key: "allowAnnotationWriteState",
     get: function get() {
@@ -531,9 +533,19 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       return this._sharedScreenShareSharedDataSource.isSharingScreen;
     }
   }, {
-    key: "mousePosition",
+    key: "annotationButtonVisible",
+    get: function get() {
+      return this._securityStore.hasAnnotationWritePermission() && this._abilityProvider.isAnnotationSupported() && this.fragmentEngineState === _type2.FcrConnectionState.CONNECTED;
+    }
+  }, {
+    key: "liveStreamingButtonVisible",
     get: function get() {
-      return this._sharedConfirmDataSource.position;
+      return this._securityStore.hasStopLiveStreamingPermission() && this.liveStreamingState === _type2.FcrLiveStreamingState.STARTED;
+    }
+  }, {
+    key: "recordingButtonVisible",
+    get: function get() {
+      return this._securityStore.hasStartCloudRecordingPermission() && this.cloudRecordingState !== _type2.FcrRecordingState.Stopped;
     }
   }, {
     key: "setCheckedStateMap",
@@ -675,7 +687,8 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
             height: 720
           },
           bitrate: 1200,
-          frameRate: 15
+          frameRate: 15,
+          isMirror: false
         },
         retryTimeout: 60
       });
@@ -752,22 +765,48 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       this._roomControl.getSharingControl().getBoardControl().removeObserver(this._boardObserver);
       this._dialogProvider.removeObserver(this._dialogObsever);
       this._roomControl.removeObserver(this._roomObserver);
+      this._sharedConfirmDataSource.removeObserver(this._handleMousePositionObserver);
       this.recordShareBounds.clear();
+      this.removeObserverWindowBounds();
     }
   }, {
     key: "log",
     value: function log(info) {
       this.logger.info(info);
     }
+  }, {
+    key: "removeObserverWindowBounds",
+    value: function removeObserverWindowBounds() {
+      this._sharedConfirmDataSource.removeWindowBounds(_constant.FcrUIDialogKey.CONTROL_BAR);
+    }
+  }, {
+    key: "setObserverWindowBounds",
+    value: function setObserverWindowBounds(window) {
+      this._sharedConfirmDataSource.setWindowBounds(_constant.FcrUIDialogKey.CONTROL_BAR, window);
+    }
   }, {
     key: "_resetMessageCount",
     value: function _resetMessageCount() {
       this.newMessageCount = (0, _defineProperty2["default"])({}, _type3.FcrUIRoomType.MAIN_ROOM, 0);
     }
+  }, {
+    key: "_handleMousePositionObserverMouseOver",
+    value: function _handleMousePositionObserverMouseOver(key) {
+      if (key === _constant.FcrUIDialogKey.CONTROL_BAR) {
+        this.controlBarMouseOver = true;
+      }
+    }
+  }, {
+    key: "_handleMousePositionObserverMouseOut",
+    value: function _handleMousePositionObserverMouseOut(key) {
+      if (key === _constant.FcrUIDialogKey.CONTROL_BAR) {
+        this.controlBarMouseOver = false;
+      }
+    }
   }]);
 }();
 _ControlBarStore = ControlBarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "isHost"], [_mobx.observable, 1, "roomDuration"], [_mobx.observable, 1, "startTime"], [_mobx.observable, 1, "playUrl"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isShowMeetingDetailPortal"], [_mobx.observable, 1, "hiddenShareActionNav"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "currentShareDisplayId"], [_mobx.observable, 1, "fragmentEngineState"], [_decorator.bound, 2, "isAnnotationSupported"], [_mobx.computed, 3, "hasSecurityPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStopLiveStreamingPermission"], [_mobx.computed, 3, "hasGetLiveStreamingUrlPermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "hasAnnotationAllowWritePermission"], [_mobx.computed, 3, "allowAnnotationWriteState"], [_mobx.computed, 3, "totalHourText"], [_mobx.computed, 3, "totalMinuteText"], [_mobx.computed, 3, "meetingTimeStatus"], [_mobx.computed, 3, "meetingTime"], [_mobx.computed, 3, "meetingTimeKey"], [_mobx.computed, 3, "roomId"], [_mobx.computed, 3, "meetingId"], [_mobx.computed, 3, "checkedStateMap"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_createNewShareDecs, 18, "createNewShare"], [_handlerStopShareDecs, 18, "handlerStopShare"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_setFragmentEngineStateDecs, 18, "setFragmentEngineState"], [_handleMoreClickDecs, 18, "handleMoreClick"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showToastDecs, 18, "showToast"], [_setShowMeetingDetailPortalDecs, 18, "setShowMeetingDetailPortal"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_handleLeaveRoomDecs, 18, "handleLeaveRoom"], [_decorator.bound, 2, "getLocalMeetingTime"], [_decorator.bound, 2, "toggleAnnotation"], [_decorator.bound, 2, "setAllAnnotationWrite"], [_decorator.bound, 2, "log"], [_resetMessageCountDecs, 18, "_resetMessageCount"]], []).e, 16);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ControlBarStore, [[_leaveConfirmRefDecs, 17, "leaveConfirmRef"], [_mobx.observable, 1, "recordShareBounds"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "isHost"], [_mobx.observable, 1, "roomDuration"], [_mobx.observable, 1, "startTime"], [_mobx.observable, 1, "playUrl"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "allApplicationWindows"], [_mobx.observable, 1, "roomInfo"], [_mobx.observable, 1, "isShowMeetingDetailPortal"], [_mobx.observable, 1, "hiddenShareActionNav"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "fragmentEngineState"], [_mobx.observable, 1, "controlBarMouseOver"], [_mobx.computed, 3, "hasSecurityPermission"], [_mobx.computed, 3, "hasGetLiveStreamingUrlPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "isEngineConnected"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "hasAnnotationAllowWritePermission"], [_mobx.computed, 3, "allowAnnotationWriteState"], [_mobx.computed, 3, "totalHourText"], [_mobx.computed, 3, "totalMinuteText"], [_mobx.computed, 3, "meetingTimeStatus"], [_mobx.computed, 3, "meetingTime"], [_mobx.computed, 3, "meetingTimeKey"], [_mobx.computed, 3, "roomId"], [_mobx.computed, 3, "meetingId"], [_mobx.computed, 3, "checkedStateMap"], [_mobx.computed, 3, "annotationButtonVisible"], [_mobx.computed, 3, "liveStreamingButtonVisible"], [_mobx.computed, 3, "recordingButtonVisible"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"], [_setShareWithAudioStateDecs, 18, "setShareWithAudioState"], [_showLockedRoomToastDecs, 18, "showLockedRoomToast"], [_createNewShareDecs, 18, "createNewShare"], [_handlerStopShareDecs, 18, "handlerStopShare"], [_setShareAudioProcessingChannelDecs, 18, "setShareAudioProcessingChannel"], [_setFragmentEngineStateDecs, 18, "setFragmentEngineState"], [_handleMoreClickDecs, 18, "handleMoreClick"], [_decorator.bound, 2, "openLiveStreamingDialog"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_showToastDecs, 18, "showToast"], [_setShowMeetingDetailPortalDecs, 18, "setShowMeetingDetailPortal"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_handleLeaveRoomDecs, 18, "handleLeaveRoom"], [_decorator.bound, 2, "getLocalMeetingTime"], [_decorator.bound, 2, "toggleAnnotation"], [_decorator.bound, 2, "setAllAnnotationWrite"], [_decorator.bound, 2, "log"], [_removeObserverWindowBoundsDecs, 18, "removeObserverWindowBounds"], [_setObserverWindowBoundsDecs, 18, "setObserverWindowBounds"], [_resetMessageCountDecs, 18, "_resetMessageCount"], [_handleMousePositionObserverMouseOverDecs, 18, "_handleMousePositionObserverMouseOver"], [_handleMousePositionObserverMouseOutDecs, 18, "_handleMousePositionObserverMouseOut"]], []).e, 16);
 _init_leaveConfirmRef = _applyDecs$e[0];
 _init_recordShareBounds = _applyDecs$e[1];
 _init_cloudRecordingState = _applyDecs$e[2];
@@ -781,7 +820,7 @@ _init_roomInfo = _applyDecs$e[9];
 _init_isShowMeetingDetailPortal = _applyDecs$e[10];
 _init_hiddenShareActionNav = _applyDecs$e[11];
 _init_boardOwnerUser = _applyDecs$e[12];
-_init_currentShareDisplayId = _applyDecs$e[13];
-_init_fragmentEngineState = _applyDecs$e[14];
+_init_fragmentEngineState = _applyDecs$e[13];
+_init_controlBarMouseOver = _applyDecs$e[14];
 _initProto = _applyDecs$e[15];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/control-bar/view.js

@@ -46,14 +46,13 @@ var _stopLiveStreaming = require("./components/stop-live-streaming");
 var _cloudRecordingButtons = require("./components/cloud-recording-buttons");
 var _toast = require("agora-ui-foundation/lib/components/toast");
 var _platform = require("../../utilities/platform");
-var _type = require("fcr-core/lib/type");
 var _deviceControl = _interopRequireDefault(require("../components/device-control"));
 var _meetingDetails = require("./components/meeting-details");
 var _react2 = require("@use-gesture/react");
 var _useElectron = require("../dialog/hooks/useElectron");
 var _enums = require("./enums");
 var _constant = require("../../utilities/constant");
-var _type2 = require("../../type");
+var _type = require("../../type");
 var _annotationButton = require("./components/annotation-button");
 var _dialogUtils = require("../../utilities/dialog-utils");
 var _rendererEvent = require("../../utilities/renderer-event");
@@ -76,13 +75,8 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     setShareAudioProcessingChannel = _useContext2.setShareAudioProcessingChannel,
     createNewShare = _useContext2.createNewShare,
     currentShareId = _useContext2.currentShareId,
-    isSharingScreen = _useContext2.isSharingScreen,
+    controlBarMouseOver = _useContext2.controlBarMouseOver,
     handleMoreClick = _useContext2.handleMoreClick,
-    liveStreamingState = _useContext2.liveStreamingState,
-    cloudRecordingState = _useContext2.cloudRecordingState,
-    hasStartCloudRecordingPermission = _useContext2.hasStartCloudRecordingPermission,
-    hasStopLiveStreamingPermission = _useContext2.hasStopLiveStreamingPermission,
-    hasAnnotationWritePermission = _useContext2.hasAnnotationWritePermission,
     hasSecurityPermission = _useContext2.hasSecurityPermission,
     isShowMeetingDetailPortal = _useContext2.isShowMeetingDetailPortal,
     setShowMeetingDetailPortal = _useContext2.setShowMeetingDetailPortal,
@@ -95,10 +89,12 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     showLockedRoomToast = _useContext2.showLockedRoomToast,
     checkedStateMap = _useContext2.checkedStateMap,
     setCheckedStateMap = _useContext2.setCheckedStateMap,
-    isAnnotationSupported = _useContext2.isAnnotationSupported,
+    setObserverWindowBounds = _useContext2.setObserverWindowBounds,
+    removeObserverWindowBounds = _useContext2.removeObserverWindowBounds,
     log = _useContext2.log,
-    fragmentEngineState = _useContext2.fragmentEngineState,
-    mousePosition = _useContext2.mousePosition;
+    annotationButtonVisible = _useContext2.annotationButtonVisible,
+    liveStreamingButtonVisible = _useContext2.liveStreamingButtonVisible,
+    recordingButtonVisible = _useContext2.recordingButtonVisible;
   // 控制栏本身的高度
   var NAV_HEIGHT = 84;
   // 鼠标移开后自动隐藏的时间
@@ -150,7 +146,13 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     var x = coordination.x + dx;
     var y = coordination.y + dy;
     var maxX = browserWidth - barBound.width;
-    var maxY = browserHeight - barBound.height;
+    var maxY = browserHeight - barBound.height - TITLE_HEIGHT;
+    setObserverWindowBounds({
+      x: Math.max(0, Math.min(maxX, x)),
+      y: Math.max(0, Math.min(maxY, y)),
+      width: barBound.width,
+      height: barBound.height
+    });
     handleDragStop({
       lastX: Math.max(0, Math.min(maxX, x)),
       lastY: Math.max(0, Math.min(maxY, y))
@@ -176,6 +178,12 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       width: dialogWidth,
       height: dialogHeight
     });
+    setObserverWindowBounds({
+      x: controlBarNewX,
+      y: 0,
+      width: dialogWidth,
+      height: dialogHeight
+    });
     setNavCurrentPosition(_enums.TransferPosition.TOP);
   };
 
@@ -222,7 +230,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       y: y
     });
     // 控制栏左上角在屏幕Y轴的最大坐标
-    var MAX_Y = browserHeight - NAV_HEIGHT;
+    var MAX_Y = browserHeight - NAV_HEIGHT - TITLE_HEIGHT;
     if (y >= MAX_Y) {
       setNavCurrentPosition(_enums.TransferPosition.BOTTOM);
     } else if (y <= 0) {
@@ -255,6 +263,12 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
         height: height
       });
       setNavCurrentPosition(_enums.TransferPosition.TOP);
+      setObserverWindowBounds({
+        x: x,
+        y: y,
+        width: width,
+        height: height
+      });
     }
   };
   var recomputControlBarPosAfterDisplayChange = function recomputControlBarPosAfterDisplayChange() {
@@ -301,6 +315,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     return function () {
       window.runtime.screen.removeListener('display-removed', handleDisplayRemoved);
       window.runtime.screen.removeListener('display-added', handleDisplayAdded);
+      removeObserverWindowBounds();
     };
   }, [currentShareDisplayId]);
   var handleIgnoreMinimize = function handleIgnoreMinimize(event) {
@@ -386,64 +401,17 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
   }, [currentShareId]);
   (0, _react.useEffect)(function () {
     if (rndRef.current && (0, _platform.isWindows)()) {
-      var _rndRef$current$getBo = rndRef.current.getBoundingClientRect(),
-        x = _rndRef$current$getBo.x,
-        y = _rndRef$current$getBo.y,
-        width = _rndRef$current$getBo.width,
-        height = _rndRef$current$getBo.height;
-      if (mousePosition.x > x && mousePosition.x < x + width && mousePosition.y > y && mousePosition.y < y + height) {
+      if (controlBarMouseOver) {
         browserWindow.setAlwaysOnTop(true, 'pop-up-menu');
       }
     }
-  }, [mousePosition]);
-
-  // useEffect(() => {
-  //   console.log('isReplaceScreen', isReplaceScreen);
-  //   return () => {
-  //     if (isReplaceScreen) {
-  //       const mainWindowVisible = window.runtime.browserWindow.isVisible();
-  //       log(
-  //         `[ControlBarView]:[screen-share]: control bar is destroying, main window is ${mainWindowVisible ? 'visible' : 'hidden'}, isReplaceScreen: ${isReplaceScreen}`,
-  //       );
-  //       // 当 control bar 卸载时，看看主窗口是否隐藏，如果隐藏，则显示主窗口
-  //       if (!mainWindowVisible) {
-  //         window.runtime.browserWindow.show();
-  //         log(
-  //           `[ControlBarView]:[screen-share]: main window is hiding at control bar destroyed, show main window`,
-  //         );
-  //       }
-  //       // 当 control bar 卸载时，看看 controlbar 的 window 是否仍然存在 ，如果存在则隐藏
-  //       if (browserWindow.isVisible()) {
-  //         browserWindow.hide();
-  //         log(
-  //           `[ControlBarView]:[screen-share]: control bar window is showing at control bar destroyed, hide control bar window`,
-  //         );
-  //       }
-  //     }
-  //   };
-  // }, [isReplaceScreen]);
-
-  // useEffect(() => {
-  //   return () => {
-  //     log(
-  //       `[ControlBarView]:[screen-share]: control bar is destroying, sharing state is ${isSharingScreen ? 'sharing' : 'not sharing'}`,
-  //     );
-  //     // 如果 controlbar 销毁后共享状态仍然进行，则再次尝试停止共享
-  //     if (isSharingScreen) {
-  //       handlerStopShare();
-  //     }
-  //   };
-  // }, [isSharingScreen]);
-
+  }, [controlBarMouseOver]);
   (0, _react.useEffect)(function () {
     browserWindow.on('blur', handleBlur);
     return function () {
       browserWindow.off('blur', handleBlur);
     };
   }, [browserWindow]);
-  (0, _react.useEffect)(function () {
-    log("[ControlBarView]: render check => \n      hasAnnotationWritePermission: ".concat(hasAnnotationWritePermission, ", \n      fragmentEngineState: ").concat(fragmentEngineState, ", \n      isAnnotationSupported: ").concat(isAnnotationSupported()));
-  }, [hasAnnotationWritePermission, fragmentEngineState]);
   return currentShareId ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread(_objectSpread({}, bind()), {}, {
     style: {
       width: 'fit-content',
@@ -516,8 +484,8 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
               }
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareScreenButton.ShareScreenButton, {
               onCreateNewShareButtonClick: createNewShare
-            }), hasAnnotationWritePermission && isAnnotationSupported() && fragmentEngineState === _type.FcrConnectionState.CONNECTED && /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationButton.AnnotationButton, {}), hasStopLiveStreamingPermission && liveStreamingState === _type.FcrLiveStreamingState.STARTED && /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopLiveStreaming.StopLiveStreamingButton, {}), hasStartCloudRecordingPermission && cloudRecordingState !== _type.FcrRecordingState.Stopped && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cloudRecordingButtons.CloudRecordingButtons, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.FcrBadge, {
-              count: newMessageCount[_type2.FcrUIRoomType.MAIN_ROOM] || 0,
+            }), annotationButtonVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationButton.AnnotationButton, {}), liveStreamingButtonVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_stopLiveStreaming.StopLiveStreamingButton, {}), recordingButtonVisible && /*#__PURE__*/(0, _jsxRuntime.jsx)(_cloudRecordingButtons.CloudRecordingButtons, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_badge.FcrBadge, {
+              count: newMessageCount[_type.FcrUIRoomType.MAIN_ROOM] || 0,
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
                 onClick: function onClick(e) {
                   return e.stopPropagation();
@@ -551,9 +519,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareStateNav.ShareStateNav, {
           onShareStateNavTransferPosition: handlerShareNavTransferPosition,
           currentPosition: navCurrentPosition,
-          onStopShare: function onStopShare() {
-            handlerStopShare();
-          }
+          onStopShare: handlerStopShare
         })]
       })
     })

package/lib/modules/device-pretest/store.js

@@ -389,7 +389,7 @@ var FcrPretestStore = exports.FcrPretestStore = /*#__PURE__*/function () {
     key: "_handleCameraChanged",
     value: function _handleCameraChanged() {
       var cameraTrack = this._deviceStore.cameraTrack;
-      if (this._deviceStore.showCameraPreview) {
+      if (this._deviceStore.showCameraPreview && cameraTrack) {
         cameraTrack.start();
       }
 
@@ -407,7 +407,9 @@ var FcrPretestStore = exports.FcrPretestStore = /*#__PURE__*/function () {
               if (cameraList.length > 0) {
                 if (previewCameraEnabled) {
                   cameraTrack = this._deviceStore.cameraTrack;
-                  cameraTrack.start();
+                  if (cameraTrack) {
+                    cameraTrack.start();
+                  }
                   this._setPreviewCameraEnabled(true);
                 }
               }

package/lib/modules/dialog/components/dialog-container/component/body.js

@@ -1,35 +1,17 @@
 "use strict";
 
-require("core-js/modules/es.symbol.js");
-require("core-js/modules/es.array.filter.js");
-require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
-require("core-js/modules/es.object.get-own-property-descriptor.js");
-require("core-js/modules/es.object.get-own-property-descriptors.js");
-require("core-js/modules/es.object.keys.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DialogContainerBody = DialogContainerBody;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-require("core-js/modules/es.function.bind.js");
 var _react = require("react");
 require("../index.css");
 var _env = require("agora-foundation/lib/utilities/env");
-var _ = require("..");
 var _useElectron = require("../../../hooks/useElectron");
 var _isBoolean = _interopRequireDefault(require("lodash/isBoolean"));
 var _jsxRuntime = require("react/jsx-runtime");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function DialogContainerBody(props) {
   var actions = props.actions,
     title = props.title,
@@ -37,8 +19,6 @@ function DialogContainerBody(props) {
     onClick = props.onClick,
     autoHeight = props.autoHeight,
     closable = props.closable;
-  var _useContext = (0, _react.useContext)(_.DialogContainerStore),
-    bind = _useContext.bind;
   var _ref = (0, _env.isElectron)() ? (0, _react.useContext)(_useElectron.DialogInstanceContext) : {
       resizable: false
     },
@@ -48,9 +28,8 @@ function DialogContainerBody(props) {
     onClick: function onClick(e) {
       return e.stopPropagation();
     },
-    children: [(title || actions) && /*#__PURE__*/(0, _jsxRuntime.jsxs)("header", _objectSpread(_objectSpread({
-      className: "fcr-dialog-container-header"
-    }, bind === null || bind === void 0 ? void 0 : bind()), {}, {
+    children: [(title || actions) && /*#__PURE__*/(0, _jsxRuntime.jsxs)("header", {
+      className: "fcr-dialog-container-header",
       children: [actions && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         style: {
           flex: 1
@@ -61,7 +40,7 @@ function DialogContainerBody(props) {
         className: "fcr-dialog-container-actions",
         children: actions
       })]
-    })), /*#__PURE__*/(0, _jsxRuntime.jsx)("section", {
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("section", {
       className: "fcr-dialog-container-content",
       style: title || actions ? {
         height: resizable ? 'calc(100% - 46px)' /* 当窗口需要拉伸时，会传值为 false 的 hasCustomShadow 过来，高度不需要自适应，所以内容区高度为 100vh 减去 title 高度 46px */ : (0, _env.isElectron)() ? autoHeight ? 'auto' : 'calc(100vh - 76px)' /* 76px 包含 46px 的 title 高度，和 30px 的阴影 */ : 'calc(100% - 46px)' /* 浏览器不需要减去阴影，高度需要 100% 减去 46px title */

package/lib/modules/dialog/components/dialog-container/index.d.ts

@@ -16,5 +16,9 @@ declare const DialogContainer: (props: PropsWithChildren<{
     closable?: boolean;
     autoHeight?: boolean;
     style?: React.CSSProperties;
+    maxWidth?: number;
+    maxHeight?: number;
+    minWidth?: number;
+    minHeight?: number;
 }>) => import("react/jsx-runtime").JSX.Element;
 export default DialogContainer;