fcr-ui-scene 3.3.1 → 3.4.0

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

@@ -0,0 +1,10 @@
+export declare enum MoreAction {
+    OPEN_PARTICIPANTS = 1,
+    OPEN_CHAT = 2,
+    OPEN_LIVE_STEAMING_DIALOG = 3,
+    STOP_LIVE_STREAMING = 4,
+    OPEN_SETTING = 5,
+    CLOUD_RECORDING_START = 6,
+    CLOUD_RECORDING_STOP = 7,
+    LEAVE_ROOM = 8
+}

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

@@ -0,0 +1,18 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MoreAction = void 0;
+var MoreAction = exports.MoreAction = /*#__PURE__*/function (MoreAction) {
+  MoreAction[MoreAction["OPEN_PARTICIPANTS"] = 1] = "OPEN_PARTICIPANTS";
+  MoreAction[MoreAction["OPEN_CHAT"] = 2] = "OPEN_CHAT";
+  MoreAction[MoreAction["OPEN_LIVE_STEAMING_DIALOG"] = 3] = "OPEN_LIVE_STEAMING_DIALOG";
+  MoreAction[MoreAction["STOP_LIVE_STREAMING"] = 4] = "STOP_LIVE_STREAMING";
+  MoreAction[MoreAction["OPEN_SETTING"] = 5] = "OPEN_SETTING";
+  MoreAction[MoreAction["CLOUD_RECORDING_START"] = 6] = "CLOUD_RECORDING_START";
+  MoreAction[MoreAction["CLOUD_RECORDING_STOP"] = 7] = "CLOUD_RECORDING_STOP";
+  MoreAction[MoreAction["LEAVE_ROOM"] = 8] = "LEAVE_ROOM";
+  return MoreAction;
+}({});

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

@@ -0,0 +1 @@
+export declare const ControlBarView: () => import("react/jsx-runtime").JSX.Element;

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

@@ -0,0 +1,351 @@
+"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.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.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.ControlBarView = void 0;
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/web.timers.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _divider = _interopRequireDefault(require("agora-ui-foundation/lib/components/divider"));
+var _popover = require("agora-ui-foundation/lib/components/popover");
+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 _shareScreenButton = require("agora-ui-foundation/lib/components/room-screen-share-state-bar/share-screen-button");
+var _mobxReact = require("mobx-react");
+var _react = require("react");
+var _store = require("./store");
+var _securityMenu = _interopRequireDefault(require("../components/security-menu"));
+var _shareStateNav = require("./components/share-state-nav");
+var _transferPositionIcon = require("./components/transfer-position-icon");
+var _moreActions = require("./components/more-actions");
+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 _type2 = require("./type");
+var _react2 = require("@use-gesture/react");
+var _useElectron = require("../dialog/hooks/useElectron");
+var _tools = require("../../utilities/tools");
+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; }
+var ControlBarView = exports.ControlBarView = (0, _mobxReact.observer)(function () {
+  var _screenBounds$availTo;
+  var _useContext = (0, _react.useContext)(_useElectron.DialogInstanceContext),
+    browserWindow = _useContext.browserWindow;
+  var _useContext2 = (0, _react.useContext)(_store.StoreContext),
+    setShareWithAudioState = _useContext2.setShareWithAudioState,
+    shareWithAudio = _useContext2.shareWithAudio,
+    handlerStopShare = _useContext2.handlerStopShare,
+    shareAudioProcessingChannel = _useContext2.shareAudioProcessingChannel,
+    setShareAudioProcessingChannel = _useContext2.setShareAudioProcessingChannel,
+    createNewShare = _useContext2.createNewShare,
+    currentShareId = _useContext2.currentShareId,
+    handleMoreClick = _useContext2.handleMoreClick,
+    liveStreamingState = _useContext2.liveStreamingState,
+    cloudRecordingState = _useContext2.cloudRecordingState,
+    hasStartCloudRecordingPermission = _useContext2.hasStartCloudRecordingPermission,
+    hasStopLiveStreamingPermission = _useContext2.hasStopLiveStreamingPermission,
+    getCoordinate = _useContext2.getCoordinate,
+    screenBounds = _useContext2.screenBounds,
+    hasSecurityPermission = _useContext2.hasSecurityPermission,
+    allApplicationWindows = _useContext2.allApplicationWindows,
+    isShowMeetingDetailPortal = _useContext2.isShowMeetingDetailPortal,
+    setShowMeetingDetailPortal = _useContext2.setShowMeetingDetailPortal,
+    setEnableWaitingRoom = _useContext2.setEnableWaitingRoom,
+    getCurrentSharingWorkArea = _useContext2.getCurrentSharingWorkArea;
+  // 控制栏本身的高度
+  var NAV_HEIGHT = 84;
+  // 鼠标移开后自动隐藏的时间
+  var HIDDEN_TIMEOUT = 3000;
+  // 系统顶部的状态栏
+  var TITLE_HEIGHT = (0, _platform.isWindows)() ? 0 : (_screenBounds$availTo = screenBounds.availTop) !== null && _screenBounds$availTo !== void 0 ? _screenBounds$availTo : 0;
+  var sharingWindowBounds = getCurrentSharingWorkArea();
+  var browserWidth = sharingWindowBounds.width;
+  var browserHeight = sharingWindowBounds.height;
+  var _useState = (0, _react.useState)(_transferPositionIcon.TransferPosition.TOP),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    navCurrentPosition = _useState2[0],
+    setNavCurrentPosition = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    hiddenShareActionNav = _useState4[0],
+    setHiddenShareActionNav = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    moreVisible = _useState6[0],
+    setMoreVisible = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
+    showSecurityPopover = _useState8[0],
+    setShowSecurityPopover = _useState8[1];
+  var windowFocusTimerRef = (0, _react.useRef)();
+  var alwayOnTopTimerRef = (0, _react.useRef)();
+  var _useState9 = (0, _react.useState)({
+      x: 0,
+      y: 0
+    }),
+    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
+    coordination = _useState10[0],
+    setCoordination = _useState10[1];
+  var _useState11 = (0, _react.useState)({
+      width: 0,
+      height: 0
+    }),
+    _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
+    barBound = _useState12[0],
+    setBound = _useState12[1];
+  var bind = (0, _react2.useDrag)(function (_ref) {
+    var _ref$delta = (0, _slicedToArray2["default"])(_ref.delta, 2),
+      dx = _ref$delta[0],
+      dy = _ref$delta[1];
+    var x = coordination.x + dx;
+    var y = coordination.y + dy;
+    var maxX = browserWidth - barBound.width;
+    var maxY = browserHeight - barBound.height;
+    handleDragStop({
+      lastX: Math.max(0, Math.min(maxX, x)),
+      lastY: Math.max(0, Math.min(maxY, y))
+    });
+  });
+  var rndRef = (0, _react.useRef)(null);
+  var hideTimeout = (0, _react.useRef)(0);
+
+  // 逻辑更改为根据分享的内容重新计算control-bar的窗口大小后，
+  // 计算最大的Y坐标可直接从window.innerHeight - NAV_HEIGHT获取
+
+  var handlerShareNavTransferPosition = (0, _react.useCallback)(function (targetPosition) {
+    setNavCurrentPosition(targetPosition);
+    var targetY = targetPosition === _transferPositionIcon.TransferPosition.TOP ? 0 : browserHeight - NAV_HEIGHT;
+    setCoordination({
+      x: coordination.x,
+      y: targetY
+    });
+  }, [coordination, rndRef.current]);
+  var handleMouseEnter = function handleMouseEnter() {
+    browserWindow.focus();
+    browserWindow.setIgnoreMouseEvents(false, {
+      forward: true
+    });
+    clearTimeout(hideTimeout.current);
+    setHiddenShareActionNav(false);
+  };
+  var handleMouseLeave = function handleMouseLeave(e) {
+    setMoreVisible(false);
+    setShowSecurityPopover(false);
+    browserWindow.setIgnoreMouseEvents(true, {
+      forward: true
+    });
+    hideTimeout.current = window.setTimeout(function () {
+      var hasPopover = document.querySelector('.fcr-popover');
+      if (!hasPopover) {
+        setHiddenShareActionNav(true);
+      }
+    }, HIDDEN_TIMEOUT);
+  };
+  var handleDragStop = function handleDragStop(data) {
+    var x = data.lastX,
+      y = data.lastY;
+    setCoordination({
+      x: x,
+      y: y
+    });
+    // 控制栏左上角在屏幕Y轴的最大坐标
+    var MAX_Y = browserHeight - NAV_HEIGHT;
+    if (y >= MAX_Y) {
+      setNavCurrentPosition(_transferPositionIcon.TransferPosition.BOTTOM);
+    } else if (y <= 0) {
+      setNavCurrentPosition(_transferPositionIcon.TransferPosition.TOP);
+    }
+  };
+  var handleMouseMove = function handleMouseMove() {
+    browserWindow.moveTop();
+    browserWindow.focus();
+    browserWindow.setIgnoreMouseEvents(false, {
+      forward: true
+    });
+  };
+  (0, _react.useEffect)(function () {
+    if (rndRef.current) {
+      var width = rndRef.current.offsetWidth;
+      var height = rndRef.current.offsetHeight;
+      var _getCoordinate = getCoordinate(width, height),
+        x = _getCoordinate.x,
+        y = _getCoordinate.y;
+      setCoordination({
+        x: x,
+        y: y
+      });
+      setBound({
+        width: width,
+        height: height
+      });
+    }
+    (0, _platform.isWindows)() && (0, _tools.handleCheckMouseOver)({
+      elem: rndRef.current,
+      browserWindow: browserWindow,
+      screenBounds: screenBounds,
+      callback: function callback(timerId) {
+        windowFocusTimerRef.current = timerId;
+      }
+    });
+  }, [currentShareId]);
+  (0, _react.useEffect)(function () {
+    if (!moreVisible) {
+      setShowMeetingDetailPortal(false);
+      browserWindow.setIgnoreMouseEvents(true, {
+        forward: true
+      });
+    }
+  }, [moreVisible]);
+  var handleIgnoreMinimize = function handleIgnoreMinimize(event) {
+    event.preventDefault();
+    // browserWindow.restore();
+  };
+  function handleBlur(event) {
+    setMoreVisible(false);
+    setShowSecurityPopover(false);
+  }
+  (0, _react.useEffect)(function () {
+    (0, _platform.isWindows)() && (0, _tools.handleCheckMouseOver)({
+      elem: rndRef.current,
+      browserWindow: browserWindow,
+      screenBounds: screenBounds,
+      callback: function callback(timerId) {
+        windowFocusTimerRef.current = timerId;
+      }
+    });
+    browserWindow.setAlwaysOnTop(false);
+    handleMouseLeave();
+    document.body.classList.add(_toast.TOAST_ROOT_CLASS_NAME);
+    browserWindow.addListener('minimize', handleIgnoreMinimize);
+    window.addEventListener('blur', handleBlur);
+    alwayOnTopTimerRef.current = setTimeout(function () {
+      browserWindow.setAlwaysOnTop(true, 'screen-saver');
+    }, 500);
+    return function () {
+      window.removeEventListener('blur', handleBlur);
+      browserWindow.setIgnoreMouseEvents(true);
+      browserWindow.close();
+      clearTimeout(hideTimeout.current);
+      clearTimeout(alwayOnTopTimerRef.current);
+      clearInterval(windowFocusTimerRef.current);
+    };
+  }, []);
+  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", {
+      ref: rndRef,
+      onMouseEnter: handleMouseEnter,
+      onMouseLeave: handleMouseLeave,
+      onMouseOver: handleMouseEnter,
+      onMouseMove: handleMouseMove,
+      onClick: handleMouseMove,
+      className: "fcr-flex \n        share-action-nav__container\n         ".concat(navCurrentPosition === _transferPositionIcon.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 ? '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, {
+            mouseEnterDelay: 0,
+            overlayInnerStyle: {
+              width: '300px',
+              boxShadow: 'none',
+              backgroundColor: 'none',
+              borderRadius: 'var(--fcr_cornerradius_l)'
+            },
+            content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {
+              setEnableWaitingRoom: setEnableWaitingRoom
+            }),
+            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, {})
+            })
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_participants.ParticipantButton, {
+            onTooltipButtonClick: function onTooltipButtonClick() {
+              handleMoreClick(_type2.MoreAction.OPEN_PARTICIPANTS);
+            }
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
+            style: {
+              margin: '0 8px',
+              height: '20px'
+            }
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareScreenButton.ShareScreenButton, {
+            onCreateNewShareButtonClick: createNewShare
+          }), 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)(_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, {
+            shareWithAudio: shareWithAudio,
+            currentAudioChannel: shareAudioProcessingChannel,
+            toggleShareWithAudio: setShareWithAudioState,
+            onSwitchAudioChannel: setShareAudioProcessingChannel
+          })]
+        })]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareStateNav.ShareStateNav, {
+        onShareStateNavTransferPosition: handlerShareNavTransferPosition,
+        currentPosition: navCurrentPosition,
+        onStopShare: function onStopShare() {
+          handlerStopShare();
+          browserWindow.close();
+        }
+      })]
+    })
+  })) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+});

package/lib/modules/device-pretest/assets/virtual-backdound-resources.d.ts

@@ -5,9 +5,18 @@ export declare enum VirtualOption {
     BLUR = "blur",
     VIDEO = "video"
 }
+export declare enum SoundEffectType {
+    NONE = "none",
+    CHECK = "check",
+    EFFECT = "effect"
+}
 export interface VirtualBackground {
     name: string;
     path: string;
     type: VirtualOption;
     url: string;
 }
+export interface SoundEffect {
+    name: string;
+    path: string;
+}

package/lib/modules/device-pretest/assets/virtual-backdound-resources.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VirtualOption = void 0;
+exports.VirtualOption = exports.SoundEffectType = void 0;
 var VirtualOption = exports.VirtualOption = /*#__PURE__*/function (VirtualOption) {
   VirtualOption["NONE"] = "none";
   VirtualOption["COLOR"] = "color";
@@ -12,4 +12,10 @@ var VirtualOption = exports.VirtualOption = /*#__PURE__*/function (VirtualOption
   VirtualOption["BLUR"] = "blur";
   VirtualOption["VIDEO"] = "video";
   return VirtualOption;
+}({});
+var SoundEffectType = exports.SoundEffectType = /*#__PURE__*/function (SoundEffectType) {
+  SoundEffectType["NONE"] = "none";
+  SoundEffectType["CHECK"] = "check";
+  SoundEffectType["EFFECT"] = "effect";
+  return SoundEffectType;
 }({});

package/lib/modules/device-pretest/audio-preview/speaker-control.js

@@ -10,7 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _slider = require("agora-ui-foundation/lib/components/slider");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _context = require("../context");
+var _store = require("../store");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -23,7 +23,7 @@ var SpeakerControl = exports.SpeakerControl = (0, _mobxReact.observer)(function
   (0, _react.useEffect)(function () {
     setContainerDom(containerRef.current);
   }, []);
-  var _useContext = (0, _react.useContext)(_context.PretestStoreContext),
+  var _useContext = (0, _react.useContext)(_store.PretestStoreContext),
     speakerVolume = _useContext.speakerVolume,
     setSpeakerVolume = _useContext.setSpeakerVolume,
     resetSpeakerVolume = _useContext.resetSpeakerVolume,

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

@@ -12,7 +12,7 @@ var _devicePretest = require("agora-ui-foundation/lib/components/device-pretest"
 var _useNamespace = require("../../utilities/useNamespace");
 require("./index.css");
 var _react = require("react");
-var _context = require("./context");
+var _store = require("./store");
 var _localVideoPlayer = require("agora-ui-foundation/lib/components/local-video-player");
 var _mobxReact = require("mobx-react");
 require("agora-ui-foundation/lib/components/local-video-player/index.css");
@@ -37,7 +37,7 @@ var FcrMeetingPreview = exports.FcrMeetingPreview = (0, _mobxReact.observer)(fun
   var ns = (0, _useNamespace.useNamespace)('meeting-preview');
   var deviceSettingsNs = (0, _useNamespace.useNamespace)('device-settings-video');
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_context.PretestStoreContext),
+  var _useContext = (0, _react.useContext)(_store.PretestStoreContext),
     setVideoOrientation = _useContext.setVideoOrientation,
     setBeautyOptions = _useContext.setBeautyOptions,
     isLocalMirrorEnabled = _useContext.isLocalMirrorEnabled,

package/lib/modules/device-pretest/settings/beauty.d.ts

@@ -1,6 +1,6 @@
 import { FC, PropsWithChildren } from 'react';
 import { BeautyKey } from '../../setting/store';
-import { FcrBeautyOptions } from 'agora-edu-core/lib/media-control/type';
+import { FcrBeautyOptions } from 'fcr-core/lib/media-control/type';
 export declare const Beauty: FC<PropsWithChildren<{
     enableBeauty: boolean;
     setEditBeautyKey: (key: BeautyKey) => void;

package/lib/modules/device-pretest/settings/video-settings-basic.js

@@ -12,7 +12,7 @@ var _useNamespace = require("../../setting/common/useNamespace");
 var _mobxReact = require("mobx-react");
 var _cameraSelect = require("./camera-select");
 var _microphoneDetection = require("../audio-preview/microphone-detection");
-var _context = require("../context");
+var _store = require("../store");
 var _volumeIndicator = require("agora-ui-foundation/lib/components/volume-indicator");
 var _speakerDetection = require("../audio-preview/speaker-detection");
 var _constant = require("../../../utilities/constant");
@@ -20,7 +20,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var VideoSettingsBasic4Custom = exports.VideoSettingsBasic4Custom = (0, _mobxReact.observer)(function () {
   var ns = (0, _useNamespace.useNamespace)('video-settings-basic_preview');
   var t = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_context.PretestStoreContext),
+  var _useContext = (0, _react.useContext)(_store.PretestStoreContext),
     microphoneVolumeLevel = _useContext.microphoneVolumeLevel,
     speakerVolumeLevel = _useContext.speakerVolumeLevel,
     setCameraDevice = _useContext.setCameraId,

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

@@ -1,4 +1,4 @@
-import { FcrBeautyOptions } from 'agora-edu-core/lib/media-control/type';
+import { FcrBeautyOptions } from 'fcr-core/lib/media-control/type';
 import { BeautyKey, FcrDeviceStore } from '../../common/device-store';
 import { TabKeyType } from './settings/video-effect';
 import { VirtualBackground } from './assets/virtual-backdound-resources';
@@ -67,3 +67,4 @@ export declare class FcrPretestStore {
     private _handleCameraListUpdated;
     private _handleCameraPreviewShowChanged;
 }
+export declare const PretestStoreContext: import("react").Context<FcrPretestStore>;

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

@@ -35,7 +35,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrPretestStore = void 0;
+exports.PretestStoreContext = exports.FcrPretestStore = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
@@ -57,6 +57,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _mobx = require("mobx");
 var _decorator = require("agora-foundation/lib/decorator");
+var _react = require("react");
 var _FcrPretestStore;
 var _initProto, _init_previewCameraEnabled, _init_activeTab, _setCameraIdDecs, _setVideoOrientationDecs, _setBeautyOptionsDecs, _setActiveTabDecs, _startPlayLocalVideoDecs, _stopPlayLocalVideoDecs, _setCameraEnabledDecs, _setMicrophoneEnabledDecs, _enableBeautyEffectDecs, _toggleLocalMirrorPreviewDecs, _toggleLocalMirrorDecs, _enableVirtualBackgroundDecs, _setEditBeautyKeyDecs, _handleForceOpenVideoEffectDecs, _handleCancelForceOpenVideoEffectDecs, _setSpeakerIdDecs, _stopMicrophoneTestDecs, _startMicrophoneTestDecs, _setMicrophoneIdDecs, _stopSpeakerTestDecs, _startSpeakerTestDecs, _setSpeakerVolumeDecs, _resetSpeakerVolumeDecs, _restoreSpeakerVolumeDecs, _releaseDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -420,9 +421,8 @@ var FcrPretestStore = exports.FcrPretestStore = /*#__PURE__*/function () {
   }]);
 }();
 _FcrPretestStore = FcrPretestStore;
-var _applyDecs$e = _applyDecs(_FcrPretestStore, [[_mobx.observable, 1, "previewCameraEnabled"], [_mobx.observable, 1, "activeTab"], [_setCameraIdDecs, 18, "setCameraId"], [_setVideoOrientationDecs, 18, "setVideoOrientation"], [_setBeautyOptionsDecs, 18, "setBeautyOptions"], [_setActiveTabDecs, 18, "setActiveTab"], [_startPlayLocalVideoDecs, 18, "startPlayLocalVideo"], [_stopPlayLocalVideoDecs, 18, "stopPlayLocalVideo"], [_setCameraEnabledDecs, 18, "setCameraEnabled"], [_setMicrophoneEnabledDecs, 18, "setMicrophoneEnabled"], [_enableBeautyEffectDecs, 18, "enableBeautyEffect"], [_toggleLocalMirrorPreviewDecs, 18, "toggleLocalMirrorPreview"], [_toggleLocalMirrorDecs, 18, "toggleLocalMirror"], [_enableVirtualBackgroundDecs, 18, "enableVirtualBackground"], [_setEditBeautyKeyDecs, 18, "setEditBeautyKey"], [_handleForceOpenVideoEffectDecs, 18, "handleForceOpenVideoEffect"], [_handleCancelForceOpenVideoEffectDecs, 18, "handleCancelForceOpenVideoEffect"], [_setSpeakerIdDecs, 18, "setSpeakerId"], [_stopMicrophoneTestDecs, 18, "stopMicrophoneTest"], [_startMicrophoneTestDecs, 18, "startMicrophoneTest"], [_setMicrophoneIdDecs, 18, "setMicrophoneId"], [_stopSpeakerTestDecs, 18, "stopSpeakerTest"], [_startSpeakerTestDecs, 18, "startSpeakerTest"], [_setSpeakerVolumeDecs, 18, "setSpeakerVolume"], [_resetSpeakerVolumeDecs, 18, "resetSpeakerVolume"], [_restoreSpeakerVolumeDecs, 18, "restoreSpeakerVolume"], [_releaseDecs, 18, "release"], [_decorator.bound, 2, "_setPreviewCameraEnabled"], [_decorator.bound, 2, "_setCameraEnabled"], [_decorator.bound, 2, "_handleCameraChanged"], [_decorator.bound, 2, "_handleCameraListUpdated"], [_decorator.bound, 2, "_handleCameraPreviewShowChanged"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 3);
-_init_previewCameraEnabled = _applyDecs$e2[0];
-_init_activeTab = _applyDecs$e2[1];
-_initProto = _applyDecs$e2[2];
-_applyDecs$e;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrPretestStore, [[_mobx.observable, 1, "previewCameraEnabled"], [_mobx.observable, 1, "activeTab"], [_setCameraIdDecs, 18, "setCameraId"], [_setVideoOrientationDecs, 18, "setVideoOrientation"], [_setBeautyOptionsDecs, 18, "setBeautyOptions"], [_setActiveTabDecs, 18, "setActiveTab"], [_startPlayLocalVideoDecs, 18, "startPlayLocalVideo"], [_stopPlayLocalVideoDecs, 18, "stopPlayLocalVideo"], [_setCameraEnabledDecs, 18, "setCameraEnabled"], [_setMicrophoneEnabledDecs, 18, "setMicrophoneEnabled"], [_enableBeautyEffectDecs, 18, "enableBeautyEffect"], [_toggleLocalMirrorPreviewDecs, 18, "toggleLocalMirrorPreview"], [_toggleLocalMirrorDecs, 18, "toggleLocalMirror"], [_enableVirtualBackgroundDecs, 18, "enableVirtualBackground"], [_setEditBeautyKeyDecs, 18, "setEditBeautyKey"], [_handleForceOpenVideoEffectDecs, 18, "handleForceOpenVideoEffect"], [_handleCancelForceOpenVideoEffectDecs, 18, "handleCancelForceOpenVideoEffect"], [_setSpeakerIdDecs, 18, "setSpeakerId"], [_stopMicrophoneTestDecs, 18, "stopMicrophoneTest"], [_startMicrophoneTestDecs, 18, "startMicrophoneTest"], [_setMicrophoneIdDecs, 18, "setMicrophoneId"], [_stopSpeakerTestDecs, 18, "stopSpeakerTest"], [_startSpeakerTestDecs, 18, "startSpeakerTest"], [_setSpeakerVolumeDecs, 18, "setSpeakerVolume"], [_resetSpeakerVolumeDecs, 18, "resetSpeakerVolume"], [_restoreSpeakerVolumeDecs, 18, "restoreSpeakerVolume"], [_releaseDecs, 18, "release"], [_decorator.bound, 2, "_setPreviewCameraEnabled"], [_decorator.bound, 2, "_setCameraEnabled"], [_decorator.bound, 2, "_handleCameraChanged"], [_decorator.bound, 2, "_handleCameraListUpdated"], [_decorator.bound, 2, "_handleCameraPreviewShowChanged"]], []).e, 3);
+_init_previewCameraEnabled = _applyDecs$e[0];
+_init_activeTab = _applyDecs$e[1];
+_initProto = _applyDecs$e[2];
+var PretestStoreContext = exports.PretestStoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/dialog/components/Interpreter/electron.js

@@ -7,66 +7,47 @@ Object.defineProperty(exports, "__esModule", {
 exports.InterpreterElectronDialog = void 0;
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _context = require("../../context");
+var _store = require("../../store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _constant = require("../../../../utilities/constant");
-var _dialogs = require("../../dialogs");
-var _renderer = require("../../../../utilities/renderer");
-var _reactDom = require("react-dom");
 var _windowHeader = require("agora-ui-foundation/lib/components/window-header");
+var _useElectron = require("../../hooks/useElectron");
 var _jsxRuntime = require("react/jsx-runtime");
+var config = {
+  frame: false,
+  fullscreen: false,
+  maximizable: false,
+  // titleBarStyle: 'hidden',
+  trafficLightPosition: {
+    x: 10,
+    y: 60
+  },
+  width: 684,
+  height: 438,
+  minWidth: 620,
+  minHeight: 300,
+  maxWidth: 800
+};
 var InterpreterElectronDialog = exports.InterpreterElectronDialog = (0, _mobxReact.observer)(function (_ref) {
   var children = _ref.children;
-  var store = (0, _react.useContext)(_context.StoreContext);
   var t = (0, _i18n.useI18n)();
-  (0, _react.useEffect)(function () {
-    var node;
-    window.runtime.openRendererWindow('interpreter-setting', function (dom, browserWindow) {
-      _dialogs.dialogWindows.set(_constant.DialogKey.INTERPRETER, browserWindow);
-      node = dom;
-      if (store.currentDialogBounds.height) {
-        (0, _dialogs.setDialogBounds)(browserWindow, {
-          y: store.currentDialogBounds.y
-        });
-      }
-      (0, _renderer.handleWillClose)(browserWindow, function () {
-        (0, _reactDom.unmountComponentAtNode)(node);
-        _dialogs.dialogWindows["delete"](_constant.DialogKey.INTERPRETER);
-        store.closeInterpreterDialog();
-      });
-      var handleCloseClick = function handleCloseClick() {
-        store.closeInterpreterDialog();
-      };
-      (0, _reactDom.render)(/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        className: "fcr-simultaneous-interpretation-dialog-wrapper",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_windowHeader.FcrWindowHeader, {
-          showClose: true,
-          title: t('fmt_modules_labels_simultaneous_interpretation'),
-          onClose: handleCloseClick,
-          type: _windowHeader.WindowType.WINDOW,
-          withWindowPopUpButton: false
-        }), children]
-      }), dom);
-    }, {
-      frame: false,
-      fullscreen: false,
-      maximizable: false,
-      // titleBarStyle: 'hidden',
-      trafficLightPosition: {
-        x: 10,
-        y: 60
-      },
-      width: 580,
-      height: 600,
-      minWidth: 580,
-      minHeight: 600,
-      maxWidth: 670,
-      maxHeight: 800
-    });
-    return function () {
-      node && (0, _reactDom.unmountComponentAtNode)(node);
-      window.runtime.closeRendererWindow('interpreter-setting');
-    };
-  }, []);
+  var store = (0, _react.useContext)(_store.StoreContext);
+  var handleCloseClick = function handleCloseClick() {
+    store.closeInterpreterDialog();
+  };
+  (0, _useElectron.useElectronDialog)({
+    config: config,
+    dialogKey: _constant.DialogKey.INTERPRETER,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "fcr-simultaneous-interpretation-dialog-wrapper",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_windowHeader.FcrWindowHeader, {
+        showClose: true,
+        title: t('fmt_interpretation_setting_controller_option_simultaneous_interpretation'),
+        onClose: handleCloseClick,
+        type: _windowHeader.WindowType.WINDOW,
+        withWindowPopUpButton: false
+      }), children]
+    })
+  });
   return null;
 });