fcr-ui-scene 3.6.4 → 3.7.1

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

@@ -69,7 +69,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _logger = require("../../utilities/logger");
 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, _setCheckedStateMapDecs, _setShareWithAudioStateDecs, _showLockedRoomToastDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _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_currentShareDisplayId, _init_fragmentEngineState, _setCheckedStateMapDecs, _setShareWithAudioStateDecs, _showLockedRoomToastDecs, _createNewShareDecs, _handlerStopShareDecs, _setShareAudioProcessingChannelDecs, _setFragmentEngineStateDecs, _handleMoreClickDecs, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _showToastDecs, _setShowMeetingDetailPortalDecs, _setEnableWaitingRoomDecs, _handleLeaveRoomDecs, _resetMessageCountDecs, _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; }
@@ -94,7 +94,8 @@ var _K = /*#__PURE__*/new WeakMap();
 var _L = /*#__PURE__*/new WeakMap();
 var _M = /*#__PURE__*/new WeakMap();
 var _N = /*#__PURE__*/new WeakMap();
-_ref = (_leaveConfirmRefDecs = [_mobx.observable, _mobx.observable.ref], _setCheckedStateMapDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _showLockedRoomToastDecs = [_mobx.action, _mobx.action.bound], _createNewShareDecs = [_mobx.action, _mobx.action.bound], _handlerStopShareDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _handleMoreClickDecs = [_mobx.action, _mobx.action.bound], _pauseCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
+var _O = /*#__PURE__*/new WeakMap();
+_ref = (_leaveConfirmRefDecs = [_mobx.observable, _mobx.observable.ref], _setCheckedStateMapDecs = [_mobx.action, _mobx.action.bound], _setShareWithAudioStateDecs = [_mobx.action, _mobx.action.bound], _showLockedRoomToastDecs = [_mobx.action, _mobx.action.bound], _createNewShareDecs = [_mobx.action, _mobx.action.bound], _handlerStopShareDecs = [_mobx.action, _mobx.action.bound], _setShareAudioProcessingChannelDecs = [_mobx.action, _mobx.action.bound], _setFragmentEngineStateDecs = [_mobx.action, _mobx.action.bound], _handleMoreClickDecs = [_mobx.action, _mobx.action.bound], _pauseCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
 })], _resumeCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
@@ -125,7 +126,8 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       sharingProvider = _ref2.sharingProvider,
       screenShareProvider = _ref2.screenShareProvider,
       sharedScreenShareSharedDataSource = _ref2.sharedScreenShareSharedDataSource,
-      dialogProvider = _ref2.dialogProvider;
+      dialogProvider = _ref2.dialogProvider,
+      sharedConfirmDataSource = _ref2.sharedConfirmDataSource;
     (0, _classCallCheck2["default"])(this, ControlBarStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
       prefix: 'ControlBarStore'
@@ -172,6 +174,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     _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));
     this._uiEventStore = uiEventStore;
     this._roomControl = roomControl;
     this._securityStore = securityStore;
@@ -179,6 +182,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     this._sharedLayoutDataSource = sharedLayoutDataSource;
     this._sharedChatDataSource = sharedChatDataSource;
     this._sharedMemberDataSource = sharedMemberDataSource;
+    this._sharedConfirmDataSource = sharedConfirmDataSource;
     this._localStorageProvider = localStorageProvider;
     this._sharedMeetingTimeDataSource = sharedMeetingTimeDataSource;
     this._messageProvider = messageProvider;
@@ -327,6 +331,14 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     set: function set(v) {
       _classPrivateFieldSet(_N, this, v);
     }
+  }, {
+    key: "fragmentEngineState",
+    get: function get() {
+      return _classPrivateFieldGet(_O, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_O, this, v);
+    }
   }, {
     key: "isAnnotationSupported",
     value: function isAnnotationSupported() {
@@ -413,9 +425,9 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       return this._securityStore.hasAnnotationAllowWritePermission();
     }
   }, {
-    key: "hasAnnotationStartPermission",
+    key: "hasAnnotationWritePermission",
     get: function get() {
-      return this._securityStore.hasAnnotationStartPermission();
+      return this._securityStore.hasAnnotationWritePermission();
     }
   }, {
     key: "allowAnnotationWriteState",
@@ -468,8 +480,8 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "roomId",
     get: function get() {
-      var _this$_roomProvider$c;
-      return (_this$_roomProvider$c = this._roomProvider.currentRoomControl) === null || _this$_roomProvider$c === void 0 || (_this$_roomProvider$c = _this$_roomProvider$c.getRoomInfo()) === null || _this$_roomProvider$c === void 0 ? void 0 : _this$_roomProvider$c.roomId;
+      var _this$roomInfo;
+      return (_this$roomInfo = this.roomInfo) === null || _this$roomInfo === void 0 ? void 0 : _this$roomInfo.roomId;
     }
   }, {
     key: "meetingId",
@@ -478,6 +490,11 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       var mainRoomControl = this._roomProvider.currentRoomControl;
       return (_ref3 = mainRoomControl === null || mainRoomControl === void 0 ? void 0 : mainRoomControl.getRoomPropertiesByKeyPath('meetingId')) !== null && _ref3 !== void 0 ? _ref3 : this.roomId;
     }
+  }, {
+    key: "isCurrentScreenShareInSmoothType",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isCurrentScreenShareInSmoothType;
+    }
   }, {
     key: "scheduleInfo",
     get: function get() {
@@ -514,9 +531,9 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
       return this._sharedScreenShareSharedDataSource.isSharingScreen;
     }
   }, {
-    key: "isReplaceScreen",
+    key: "mousePosition",
     get: function get() {
-      return this._sharedScreenShareSharedDataSource.isReplaceScreen;
+      return this._sharedConfirmDataSource.position;
     }
   }, {
     key: "setCheckedStateMap",
@@ -555,6 +572,12 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
     value: function setShareAudioProcessingChannel(target) {
       this._sharedScreenShareSharedDataSource.setCurrentShareAudioProcessingChannel(target);
     }
+  }, {
+    key: "setFragmentEngineState",
+    value: function setFragmentEngineState(state) {
+      this.log("setFragmentEngineState: ".concat(state));
+      this.fragmentEngineState = state;
+    }
 
     // more
   }, {
@@ -660,7 +683,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "showToast",
     value: function showToast(params) {
-      this._dialogProvider.openDialog(_constant.FcrUIDialogKey.SHOW_TOAST, _constant.FcrUIDialogKey.SHOW_TOAST, {
+      this._messageProvider.showToast({
         type: params.type,
         message: params.content,
         duration: params.duration
@@ -744,7 +767,7 @@ var ControlBarStore = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 _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"], [_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, "hasAnnotationStartPermission"], [_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"], [_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, 15);
+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);
 _init_leaveConfirmRef = _applyDecs$e[0];
 _init_recordShareBounds = _applyDecs$e[1];
 _init_cloudRecordingState = _applyDecs$e[2];
@@ -759,5 +782,6 @@ _init_isShowMeetingDetailPortal = _applyDecs$e[10];
 _init_hiddenShareActionNav = _applyDecs$e[11];
 _init_boardOwnerUser = _applyDecs$e[12];
 _init_currentShareDisplayId = _applyDecs$e[13];
-_initProto = _applyDecs$e[14];
+_init_fragmentEngineState = _applyDecs$e[14];
+_initProto = _applyDecs$e[15];
 var StoreContext = exports.StoreContext = /*#__PURE__*/(0, _react.createContext)(null);

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

@@ -1 +1,5 @@
+import { BrowserWindow } from 'electron';
+export declare const ControlbarContext: import("react").Context<{
+    browserWindow: BrowserWindow | null;
+}>;
 export declare const ControlBarView: () => import("react/jsx-runtime").JSX.Element;

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

@@ -16,7 +16,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ControlBarView = void 0;
+exports.ControlbarContext = exports.ControlBarView = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 require("core-js/modules/es.array.concat.js");
@@ -34,7 +34,7 @@ var _badge = require("agora-ui-foundation/lib/components/badge");
 var _meetingSecurity = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/meeting-security");
 var _more = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/more");
 var _participants = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/participants");
-var _shareAudio = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio");
+var _shareAudio = require("./components/share-audio");
 var _shareScreenButton = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-screen-button");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
@@ -51,15 +51,19 @@ var _deviceControl = _interopRequireDefault(require("../components/device-contro
 var _meetingDetails = require("./components/meeting-details");
 var _react2 = require("@use-gesture/react");
 var _useElectron = require("../dialog/hooks/useElectron");
-var _tools = require("../../utilities/tools");
 var _enums = require("./enums");
 var _constant = require("../../utilities/constant");
 var _type2 = require("../../type");
 var _annotationButton = require("./components/annotation-button");
+var _dialogUtils = require("../../utilities/dialog-utils");
+var _rendererEvent = require("../../utilities/renderer-event");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["x", "y"];
 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; }
+var ControlbarContext = exports.ControlbarContext = /*#__PURE__*/(0, _react.createContext)({
+  browserWindow: null
+});
 var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_useElectron.DialogInstanceContext),
     browserWindow = _useContext.browserWindow,
@@ -78,7 +82,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     cloudRecordingState = _useContext2.cloudRecordingState,
     hasStartCloudRecordingPermission = _useContext2.hasStartCloudRecordingPermission,
     hasStopLiveStreamingPermission = _useContext2.hasStopLiveStreamingPermission,
-    hasAnnotationStartPermission = _useContext2.hasAnnotationStartPermission,
+    hasAnnotationWritePermission = _useContext2.hasAnnotationWritePermission,
     hasSecurityPermission = _useContext2.hasSecurityPermission,
     isShowMeetingDetailPortal = _useContext2.isShowMeetingDetailPortal,
     setShowMeetingDetailPortal = _useContext2.setShowMeetingDetailPortal,
@@ -91,15 +95,16 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     showLockedRoomToast = _useContext2.showLockedRoomToast,
     checkedStateMap = _useContext2.checkedStateMap,
     setCheckedStateMap = _useContext2.setCheckedStateMap,
-    isReplaceScreen = _useContext2.isReplaceScreen,
     isAnnotationSupported = _useContext2.isAnnotationSupported,
-    log = _useContext2.log;
+    log = _useContext2.log,
+    fragmentEngineState = _useContext2.fragmentEngineState,
+    mousePosition = _useContext2.mousePosition;
   // 控制栏本身的高度
   var NAV_HEIGHT = 84;
   // 鼠标移开后自动隐藏的时间
   var HIDDEN_TIMEOUT = 3000;
   // 系统顶部的状态栏
-  var _getCurrentSharingWor = (0, _tools.getCurrentSharingWorkArea)({
+  var _getCurrentSharingWor = (0, _dialogUtils.getCurrentSharingWorkArea)({
       currentShareBounds: currentShareBounds
     }),
     browserWidth = _getCurrentSharingWor.width,
@@ -153,10 +158,29 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
   });
   var rndRef = (0, _react.useRef)(null);
   var hideTimeout = (0, _react.useRef)(0);
+  var moveControlBarToDisplayId = function moveControlBarToDisplayId(dialogWidth, dialogHeight, targetDisplayId) {
+    var displays = window.runtime.screen.getAllDisplays();
+    var targetDisplay = displays.find(function (display) {
+      return display.id === targetDisplayId;
+    });
+    if (!targetDisplay) {
+      return;
+    }
+    var controlBarNewX = targetDisplay.bounds.width / 2 - dialogWidth / 2;
+    browserWindow.setPosition(targetDisplay.bounds.x, targetDisplay.bounds.y);
+    setCoordination({
+      x: controlBarNewX,
+      y: 0
+    });
+    setBound({
+      width: dialogWidth,
+      height: dialogHeight
+    });
+    setNavCurrentPosition(_enums.TransferPosition.TOP);
+  };
 
   // 逻辑更改为根据分享的内容重新计算control-bar的窗口大小后，
   // 计算最大的Y坐标可直接从window.innerHeight - NAV_HEIGHT获取
-
   var handlerShareNavTransferPosition = (0, _react.useCallback)(function (targetPosition) {
     setNavCurrentPosition(targetPosition);
     var targetY = targetPosition === _enums.TransferPosition.TOP ? 0 : browserHeight - NAV_HEIGHT - TITLE_HEIGHT;
@@ -174,8 +198,12 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
     setHiddenShareActionNav(false);
   };
   var handleMouseLeave = function handleMouseLeave(e) {
-    setMoreVisible(false);
-    setShowSecurityPopover(false);
+    // setMoreVisible(false);
+    // setShowSecurityPopover(false);
+    (0, _rendererEvent.sendEvent)({
+      action: _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_FOCUS,
+      payload: true
+    });
     browserWindow.setIgnoreMouseEvents(true, {
       forward: true
     });
@@ -208,7 +236,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       forward: true
     });
   };
-  (0, _react.useEffect)(function () {
+  var computControlBarPos = function computControlBarPos(browserWidth) {
     if (rndRef.current) {
       var width = rndRef.current.offsetWidth;
       var height = rndRef.current.offsetHeight;
@@ -228,6 +256,25 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       });
       setNavCurrentPosition(_enums.TransferPosition.TOP);
     }
+  };
+  var recomputControlBarPosAfterDisplayChange = function recomputControlBarPosAfterDisplayChange() {
+    // setTimeout 1200ms后确定rndRef.current一定可以重新获取到，
+    // 跟随最新的共享内容所在的屏幕,位移control-bar
+    setTimeout(function () {
+      if (rndRef.current) {
+        var dialogWidth = rndRef.current.offsetWidth;
+        var dialogHeight = rndRef.current.offsetHeight;
+        var info = (0, _dialogUtils.getCurrentSharingWorkArea)({
+          currentShareBounds: currentShareBounds
+        });
+        moveControlBarToDisplayId(dialogWidth, dialogHeight, info.displayId);
+      }
+    }, 1200);
+  };
+  (0, _react.useEffect)(function () {
+    if (rndRef.current) {
+      computControlBarPos(browserWidth);
+    }
   }, [currentShareId]);
   (0, _react.useEffect)(function () {
     if (!moreVisible) {
@@ -242,18 +289,25 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       if (display.id === currentShareDisplayId) {
         handlerStopShare();
         browserWindow.close();
+      } else {
+        recomputControlBarPosAfterDisplayChange();
       }
     };
+    var handleDisplayAdded = function handleDisplayAdded(event, newDisplay) {
+      recomputControlBarPosAfterDisplayChange();
+    };
     window.runtime.screen.addListener('display-removed', handleDisplayRemoved);
+    window.runtime.screen.addListener('display-added', handleDisplayAdded);
     return function () {
       window.runtime.screen.removeListener('display-removed', handleDisplayRemoved);
+      window.runtime.screen.removeListener('display-added', handleDisplayAdded);
     };
   }, [currentShareDisplayId]);
   var handleIgnoreMinimize = function handleIgnoreMinimize(event) {
     event.preventDefault();
     // browserWindow.restore();
   };
-  function handleBlur(event) {
+  function handleBlur() {
     setMoreVisible(false);
     setShowSecurityPopover(false);
   }
@@ -285,7 +339,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       log("[ControlBarView]: [getScreenBounds][screen-share], screenBounds: ".concat(JSON.stringify(screenBounds)));
     } else {
       recordShareBounds.clear();
-      screenBounds = (0, _tools.getCurrentSharingWorkArea)({
+      screenBounds = (0, _dialogUtils.getCurrentSharingWorkArea)({
         currentShareBounds: currentShareBounds
       });
       recordShareBounds.set(currentShareBounds, screenBounds);
@@ -296,7 +350,7 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
   function checkMouseOver() {
     if (windowFocusTimerRef.current) clearInterval(windowFocusTimerRef.current);
     var screenBounds = getScreenBounds();
-    (0, _tools.handleCheckMouseOver)({
+    (0, _dialogUtils.handleCheckMouseOver)({
       elem: rndRef.current,
       browserWindow: browserWindow,
       screenBounds: screenBounds,
@@ -330,6 +384,18 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       clearInterval(windowFocusTimerRef.current);
     };
   }, [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) {
+        browserWindow.setAlwaysOnTop(true, 'pop-up-menu');
+      }
+    }
+  }, [mousePosition]);
 
   // useEffect(() => {
   //   console.log('isReplaceScreen', isReplaceScreen);
@@ -369,12 +435,22 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
   //   };
   // }, [isSharingScreen]);
 
+  (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',
       transform: "translate(".concat(coordination.x, "px, ").concat(coordination.y, "px)")
     },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    onClick: handleBlur,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       ref: rndRef,
       onMouseEnter: handleMouseEnter,
       onMouseLeave: handleMouseLeave,
@@ -382,90 +458,104 @@ var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function
       onMouseMove: handleMouseMove,
       onClick: handleMouseMove,
       className: "fcr-flex \n        share-action-nav__container\n         ".concat(navCurrentPosition === _enums.TransferPosition.BOTTOM ? 'share-action-nav__move_to_bottom' : 'share-action-nav__move_to_top', "\n         ").concat(hiddenShareActionNav ? 'share-action-nav__hidden' : '', "\n      ").concat(hiddenShareActionNav && coordination.y === browserHeight - NAV_HEIGHT - TITLE_HEIGHT ? 'completely-hidden-in-bottom' : '', "\n      // \u8FD9\u91CC\u7684\u903B\u8F91\u662F\uFF0C \u5F53control-bar\u5728\u9876\u90E8\u65F6\uFF0C\u5982\u679C\u5F53\u524D\u7684Y\u5750\u6807\u5C0F\u4E8E\u6807\u9898\u680F\u7684\u9AD8\u5EA6\uFF0C\u6216\u8005\u7B49\u4E8E\u6807\u9898\u680F\u7684\u9AD8\u5EA6\uFF0C\u6216\u8005\u7B49\u4E8E0\uFF0C\u90A3\u4E48\u5C31\u6DFB\u52A0\u5438\u9876\u6548\u679C\n      // \u5F53\u7535\u8111\u6709\u4E24\u4E2A\u5C4F\u5E55\u65F6\uFF0CTITLE_HEIGHT\u7684\u503C\u53EF\u80FD\u4E3A\u8D1F\u6570\n      ").concat(hiddenShareActionNav && (coordination.y < TITLE_HEIGHT || coordination.y === TITLE_HEIGHT || coordination.y === 0) ? 'completely-hidden-in-top' : '', "\n      "),
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "share-action-nav share-action-nav__can-draggable ".concat(hiddenShareActionNav ? 'invisible' : ''),
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "share-action-nav__media-control-group",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_deviceControl["default"], {
-            showTitle: false
-          })
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
-          style: {
-            marginRight: 24,
-            height: '20px',
-            marginLeft: 30
-          }
-        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-          className: "share-action-nav__meeting-control-group",
-          children: [hasSecurityPermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
-            showArrow: false,
-            mouseEnterDelay: 0,
-            overlayInnerStyle: {
-              width: '300px',
-              boxShadow: 'none',
-              backgroundColor: 'none',
-              borderRadius: 'var(--fcr_cornerradius_l)'
-            },
-            content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {
-              showLockedRoomToast: showLockedRoomToast,
-              privilege: privilegeProvider,
-              setEnableWaitingRoom: setEnableWaitingRoom,
-              checkedStateMap: checkedStateMap,
-              setCheckedStateMap: setCheckedStateMap
-            }),
-            trigger: "click",
-            visible: showSecurityPopover,
-            onVisibleChange: function onVisibleChange(visible) {
-              return setShowSecurityPopover(visible);
-            },
-            placement: "bottom",
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingSecurity.MeetingSecurity, {})
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(ControlbarContext.Provider, {
+        value: {
+          browserWindow: browserWindow
+        },
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "share-action-nav share-action-nav__can-draggable ".concat(hiddenShareActionNav ? 'invisible' : ''),
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "share-action-nav__media-control-group",
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_deviceControl["default"], {
+              showTitle: false
             })
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_participants.ParticipantButton, {
-            onTooltipButtonClick: function onTooltipButtonClick() {
-              handleMoreClick(_enums.MoreAction.OPEN_PARTICIPANTS);
-            }
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
             style: {
-              margin: '0 8px',
-              height: '20px'
+              marginRight: 24,
+              height: '20px',
+              marginLeft: 30
             }
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareScreenButton.ShareScreenButton, {
-            onCreateNewShareButtonClick: createNewShare
-          }), hasAnnotationStartPermission && isAnnotationSupported() && /*#__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,
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_more.More, {
-              visible: moreVisible,
-              onButtonClick: function onButtonClick() {
-                return setMoreVisible(!moreVisible);
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            className: "share-action-nav__meeting-control-group",
+            children: [hasSecurityPermission && /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
+              showArrow: false,
+              mouseEnterDelay: 0,
+              overlayInnerStyle: {
+                width: '300px',
+                boxShadow: 'none',
+                backgroundColor: 'none',
+                borderRadius: 'var(--fcr_cornerradius_l)'
+              },
+              content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {
+                showLockedRoomToast: showLockedRoomToast,
+                privilege: privilegeProvider,
+                setEnableWaitingRoom: setEnableWaitingRoom,
+                checkedStateMap: checkedStateMap,
+                setCheckedStateMap: setCheckedStateMap
+              }),
+              trigger: "click",
+              visible: showSecurityPopover,
+              onVisibleChange: function onVisibleChange(visible) {
+                return setShowSecurityPopover(visible);
               },
-              morePopoverContent: isShowMeetingDetailPortal ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingDetails.MeetingDetails, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_moreActions.MorePopoverContent, {
-                closePopover: function closePopover() {
-                  return setMoreVisible(false);
+              placement: "bottom",
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+                onClick: function onClick(e) {
+                  return e.stopPropagation();
                 },
-                hasChatPermission: true
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingSecurity.MeetingSecurity, {})
               })
-            })
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
-            style: {
-              margin: '0 8px',
-              height: '20px'
-            }
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareAudio.ShareAudio, {
-            shareWithAudio: shareWithAudio,
-            currentAudioChannel: shareAudioProcessingChannel,
-            toggleShareWithAudio: setShareWithAudioState,
-            onSwitchAudioChannel: setShareAudioProcessingChannel
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_participants.ParticipantButton, {
+              onTooltipButtonClick: function onTooltipButtonClick() {
+                handleMoreClick(_enums.MoreAction.OPEN_PARTICIPANTS);
+              }
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
+              style: {
+                margin: '0 8px',
+                height: '20px'
+              }
+            }), /*#__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,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+                onClick: function onClick(e) {
+                  return e.stopPropagation();
+                },
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_more.More, {
+                  visible: moreVisible,
+                  onButtonClick: function onButtonClick() {
+                    return setMoreVisible(!moreVisible);
+                  },
+                  morePopoverContent: isShowMeetingDetailPortal ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_meetingDetails.MeetingDetails, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_moreActions.MorePopoverContent, {
+                    closePopover: function closePopover() {
+                      return setMoreVisible(false);
+                    },
+                    hasChatPermission: true
+                  })
+                })
+              })
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
+              style: {
+                margin: '0 8px',
+                height: '20px'
+              }
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareAudio.ShareAudio, {
+              browserWindow: browserWindow,
+              shareWithAudio: shareWithAudio,
+              currentAudioChannel: shareAudioProcessingChannel,
+              toggleShareWithAudio: setShareWithAudioState,
+              onSwitchAudioChannel: setShareAudioProcessingChannel
+            })]
           })]
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareStateNav.ShareStateNav, {
+          onShareStateNavTransferPosition: handlerShareNavTransferPosition,
+          currentPosition: navCurrentPosition,
+          onStopShare: function onStopShare() {
+            handlerStopShare();
+          }
         })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareStateNav.ShareStateNav, {
-        onShareStateNavTransferPosition: handlerShareNavTransferPosition,
-        currentPosition: navCurrentPosition,
-        onStopShare: function onStopShare() {
-          handlerStopShare();
-        }
-      })]
+      })
     })
   })) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
 });

package/lib/modules/device-pretest/store.d.ts

@@ -26,7 +26,7 @@ export declare class FcrPretestStore {
     get speakerVolumeLevel(): number;
     get cameraDeviceList(): DeviceItem[];
     get speakerId(): string;
-    get microphoneId(): string;
+    get microphoneId(): string | null;
     get speakerDeviceList(): DeviceItem[];
     get microphoneDeviceList(): DeviceItem[];
     get speakerVolume(): number;

package/lib/modules/dialog/components/dialog-container/component/body.d.ts

@@ -2,7 +2,7 @@ import { PropsWithChildren } from 'react';
 import '../index.css';
 export declare function DialogContainerBody(props: PropsWithChildren<{
     onClick: () => void;
-    title?: string;
+    title?: string | React.ReactNode;
     actions?: React.ReactNode;
     autoHeight?: boolean;
     closable?: boolean;

package/lib/modules/dialog/components/dialog-container/index.css

@@ -19,6 +19,7 @@
     'Segoe UI Symbol',
     'Noto Color Emoji';
   font-size: 14px;
+  z-index: 0;
 }
 
 .fcr-dialog-container_shadow {

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

@@ -8,12 +8,13 @@ declare const DialogContainer: (props: PropsWithChildren<{
     width?: number;
     height?: number;
     dialogKey: FcrUIDialogKey;
-    title?: string;
+    title?: string | React.ReactNode;
     onClose?: () => void;
     closeInterception?: () => boolean;
     actions?: React.ReactNode;
     dialogId?: string;
     closable?: boolean;
     autoHeight?: boolean;
+    style?: React.CSSProperties;
 }>) => import("react/jsx-runtime").JSX.Element;
 export default DialogContainer;