fcr-ui-scene 3.8.2 → 3.9.0

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

@@ -46,6 +46,7 @@ import { CameraControl } from './components/carmera';
 import { BoundaryDetector } from './components/boundary-detector';
 import { AppsPopover } from './components/apps-popover';
 import { usePopoverWatcher } from './hooks';
+import { AnnotationButton } from './components/annotation-button';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var HIDDEN_TIMEOUT = 3000;
 var NAV_HEIGHT = 84;
@@ -279,8 +280,8 @@ var ControlBar = observer(function () {
     draggableArea = _useContext5.draggableArea,
     currentShareDisplayId = _useContext5.currentShareDisplayId,
     updateWindowBounds = _useContext5.updateWindowBounds,
-    setArea = _useContext5.setArea,
-    removeArea = _useContext5.removeArea;
+    setPopoverArea = _useContext5.setPopoverArea,
+    resetPopoverArea = _useContext5.resetPopoverArea;
   var updatePosition = useContext(DragStateUpdaterContext);
   var _useContext6 = useContext(ControlBarCalculationUpdaterContext),
     setDimensions = _useContext6.setDimensions,
@@ -337,7 +338,7 @@ var ControlBar = observer(function () {
       };
     }
   }, [visibility]);
-  usePopoverWatcher(containerRef, setArea, removeArea);
+  usePopoverWatcher(containerRef, setPopoverArea, resetPopoverArea);
   return /*#__PURE__*/_jsxs("div", {
     ref: containerRef,
     className: rootClassNames,
@@ -441,7 +442,7 @@ var MeetingControlGroup = observer(function () {
         margin: '0 8px',
         height: '20px'
       }
-    }), /*#__PURE__*/_jsx(ShareScreenSection, {}), liveStreamingButtonVisible && /*#__PURE__*/_jsx(StopLiveStreamingButton, {}), recordingButtonVisible && /*#__PURE__*/_jsx(CloudRecordingButtons, {}), /*#__PURE__*/_jsx(MoreActionsSection, {}), /*#__PURE__*/_jsx(FcrDivider, {
+    }), /*#__PURE__*/_jsx(ShareScreenSection, {}), /*#__PURE__*/_jsx(AnnotationSection, {}), liveStreamingButtonVisible && /*#__PURE__*/_jsx(StopLiveStreamingButton, {}), recordingButtonVisible && /*#__PURE__*/_jsx(CloudRecordingButtons, {}), /*#__PURE__*/_jsx(MoreActionsSection, {}), /*#__PURE__*/_jsx(FcrDivider, {
       style: {
         margin: '0 8px',
         height: '20px'
@@ -469,6 +470,7 @@ var SecurityMenuSection = /*#__PURE__*/memo(function (_ref4) {
     }
   }, [isShareActionNavHidden]);
   return /*#__PURE__*/_jsx(FcrPopover, {
+    overlayClassName: "share-action-nav__security-popover",
     showArrow: false,
     mouseEnterDelay: 0,
     overlayInnerStyle: {
@@ -509,22 +511,64 @@ var ShareScreenSection = /*#__PURE__*/memo(function () {
   });
 });
 
-// 更多操作区块
-var MoreActionsSection = observer(function () {
+// 开启批注区块
+var AnnotationSection = observer(function () {
+  var _useContext11 = useContext(StoreContext),
+    toggleAnnotation = _useContext11.toggleAnnotation,
+    allowWriteAnnotation = _useContext11.allowWriteAnnotation,
+    clearAnnotation = _useContext11.clearAnnotation,
+    isWriteAnnotationAllowed = _useContext11.isWriteAnnotationAllowed,
+    hasPermissionAllowWriteAnnotation = _useContext11.hasPermissionAllowWriteAnnotation,
+    isAnnotationSupported = _useContext11.isAnnotationSupported,
+    hasAnnotationWritePermission = _useContext11.hasAnnotationWritePermission;
+  var _useContext12 = useContext(ControlBarCalculationContext),
+    isShareActionNavHidden = _useContext12.isShareActionNavHidden;
   var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    moreVisible = _useState12[0],
-    setMoreVisible = _useState12[1];
+    visible = _useState12[0],
+    setVisible = _useState12[1];
+  useEffect(function () {
+    if (isShareActionNavHidden) {
+      setVisible(false);
+    }
+  }, [isShareActionNavHidden]);
+
+  // 不支持标注的能力, 不显示按钮
+  if (!isAnnotationSupported) {
+    return null;
+  }
+
+  // 没有标注写权限, 不显示按钮
+  if (!hasAnnotationWritePermission) {
+    return null;
+  }
+  return /*#__PURE__*/_jsx(AnnotationButton, {
+    onAllowWriteClick: allowWriteAnnotation,
+    onCleanAnnotationClick: clearAnnotation,
+    onAnnotationButtonClick: toggleAnnotation,
+    isWriteAllowed: isWriteAnnotationAllowed,
+    haPermissionAllowWrite: hasPermissionAllowWriteAnnotation,
+    visible: visible,
+    setVisible: setVisible
+  });
+});
+
+// 更多操作区块
+var MoreActionsSection = observer(function () {
   var _useState13 = useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    isShowMeetingDetailPortal = _useState14[0],
-    setIsShowMeetingDetailPortal = _useState14[1];
-  var _useContext11 = useContext(StoreContext),
-    newMessageCount = _useContext11.newMessageCount,
-    hasChatPermission = _useContext11.hasChatPermission,
-    setAppActionbarPopoverVisible = _useContext11.setAppActionbarPopoverVisible;
-  var _useContext12 = useContext(ControlBarCalculationContext),
-    isShareActionNavHidden = _useContext12.isShareActionNavHidden;
+    moreVisible = _useState14[0],
+    setMoreVisible = _useState14[1];
+  var _useState15 = useState(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    isShowMeetingDetailPortal = _useState16[0],
+    setIsShowMeetingDetailPortal = _useState16[1];
+  var _useContext13 = useContext(StoreContext),
+    newMessageCount = _useContext13.newMessageCount,
+    hasChatPermission = _useContext13.hasChatPermission,
+    setAppActionbarPopoverVisible = _useContext13.setAppActionbarPopoverVisible;
+  var _useContext14 = useContext(ControlBarCalculationContext),
+    isShareActionNavHidden = _useContext14.isShareActionNavHidden;
   useEffect(function () {
     if (!moreVisible) {
       setIsShowMeetingDetailPortal(false);
@@ -570,17 +614,17 @@ var MoreActionsSection = observer(function () {
 
 // 音频分享区块
 var ShareAudioSection = observer(function () {
-  var _useContext13 = useContext(StoreContext),
-    setShareWithAudioState = _useContext13.setShareWithAudioState,
-    isSharingWithAudio = _useContext13.isSharingWithAudio,
-    setShareAudioMode = _useContext13.setShareAudioMode,
-    audioShareMode = _useContext13.audioShareMode;
-  var _useContext14 = useContext(ControlBarCalculationContext),
-    isShareActionNavHidden = _useContext14.isShareActionNavHidden;
-  var _useState15 = useState(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    popoverVisible = _useState16[0],
-    setPopoverVisible = _useState16[1];
+  var _useContext15 = useContext(StoreContext),
+    setShareWithAudioState = _useContext15.setShareWithAudioState,
+    isSharingWithAudio = _useContext15.isSharingWithAudio,
+    setShareAudioMode = _useContext15.setShareAudioMode,
+    audioShareMode = _useContext15.audioShareMode;
+  var _useContext16 = useContext(ControlBarCalculationContext),
+    isShareActionNavHidden = _useContext16.isShareActionNavHidden;
+  var _useState17 = useState(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    popoverVisible = _useState18[0],
+    setPopoverVisible = _useState18[1];
   useEffect(function () {
     if (isShareActionNavHidden) {
       setPopoverVisible(false);
@@ -598,19 +642,19 @@ var ShareAudioSection = observer(function () {
 
 // 分享状态导航（控制栏下部）
 var ShareStateNavigation = /*#__PURE__*/memo(function () {
-  var _useContext15 = useContext(StoreContext),
-    handlerStopShare = _useContext15.handlerStopShare,
-    handleMouseEnter = _useContext15.handleMouseEnter,
-    handleMouseLeave = _useContext15.handleMouseLeave,
-    setStateNavArea = _useContext15.setStateNavArea;
+  var _useContext17 = useContext(StoreContext),
+    handlerStopShare = _useContext17.handlerStopShare,
+    handleMouseEnter = _useContext17.handleMouseEnter,
+    handleMouseLeave = _useContext17.handleMouseLeave,
+    setStateNavArea = _useContext17.setStateNavArea;
   var calculation = useContext(ControlBarCalculationContext);
-  var _useContext16 = useContext(ControlBarCalculationUpdaterContext),
-    setIsShareActionNavHidden = _useContext16.setIsShareActionNavHidden,
-    setNavPosition = _useContext16.setNavPosition,
-    moveBottom = _useContext16.moveBottom,
-    moveTop = _useContext16.moveTop,
-    restartActiveTask = _useContext16.restartActiveTask,
-    cancelActiveTask = _useContext16.cancelActiveTask;
+  var _useContext18 = useContext(ControlBarCalculationUpdaterContext),
+    setIsShareActionNavHidden = _useContext18.setIsShareActionNavHidden,
+    setNavPosition = _useContext18.setNavPosition,
+    moveBottom = _useContext18.moveBottom,
+    moveTop = _useContext18.moveTop,
+    restartActiveTask = _useContext18.restartActiveTask,
+    cancelActiveTask = _useContext18.cancelActiveTask;
 
   // 从store获取当前位置和相关方法
   var navCurrentPosition = calculation.navPosition; // 从store获取

package/lib-es/modules/device-pretest/audio-preview/microphone-detection.js

@@ -1,12 +1,11 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 import { useI18n } from 'agora-ui-foundation/lib/i18n';
 import { FcrSelect } from 'agora-ui-foundation/lib/components/select';
 import { FcrToolTip } from 'agora-ui-foundation/lib/components/tooltip';
 import { FcrButton } from 'agora-ui-foundation/lib/components/button';
 import { observer } from 'mobx-react';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var MicrophoneDetection = observer(function (_ref) {
   var microphoneDeviceId = _ref.microphoneDeviceId,
@@ -18,10 +17,6 @@ export var MicrophoneDetection = observer(function (_ref) {
     microphoneDetecting = _ref.microphoneDetecting;
   var ns = useNamespace('microphone-detection');
   var t = useI18n();
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isDetecting = _useState2[0],
-    setIsDetecting = _useState2[1];
   useEffect(function () {
     return function () {
       stopMicrophoneTest();
@@ -41,11 +36,10 @@ export var MicrophoneDetection = observer(function (_ref) {
       trigger: "hover",
       placement: "top",
       mouseEnterDelay: 0.2,
-      content: t(disabled ? 'fmt_settings_popup_disable_while_speaker_detected' : isDetecting ? 'fmt_setting_tips_mic' : 'fmt_premeeting_setting_label_speak_into_your_microphone'),
+      content: t(disabled ? 'fmt_settings_popup_disable_while_speaker_detected' : microphoneDetecting ? 'fmt_setting_tips_mic' : 'fmt_premeeting_setting_label_speak_into_your_microphone'),
       children: /*#__PURE__*/_jsx(FcrButton, {
         onClick: function onClick() {
-          setIsDetecting(!isDetecting);
-          if (isDetecting) {
+          if (microphoneDetecting) {
             stopMicrophoneTest();
           } else {
             startMicrophoneTest();

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

@@ -6,7 +6,7 @@ import { FcrSelect } from 'agora-ui-foundation/lib/components/select';
 import { FcrToolTip } from 'agora-ui-foundation/lib/components/tooltip';
 import { FcrButton } from 'agora-ui-foundation/lib/components/button';
 import { observer } from 'mobx-react';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var SpeakerDetection = observer(function (_ref) {
   var speakerDeviceId = _ref.speakerDeviceId,

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

@@ -4,7 +4,7 @@ import { FcrDevicePretestPage } from 'agora-ui-foundation/lib/components/device-
 import { useContext, useEffect, useRef, useState } from 'react';
 import { DEFAULT_BEAUTY_VALUE, VideoViewType, LocalVideoPlayer } from 'agora-ui-foundation/lib/components/local-video-player';
 import { observer } from 'mobx-react';
-import { useNamespace } from '../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import './index.css';
 import { PretestStoreContext } from './store';
 import '../setting/video-settings/index.css';

package/lib-es/modules/device-pretest/settings/beauty.js

@@ -10,7 +10,7 @@ import { useMemo } from 'react';
 import { useI18n } from 'agora-ui-foundation/lib/i18n';
 import { FcrToolTip } from 'agora-ui-foundation/lib/components/tooltip';
 import { DEFAULT_BEAUTY_VALUE } from 'agora-ui-foundation/lib/components/local-video-player';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var BeautyOptionsCard = function BeautyOptionsCard(props) {
   var ns = useNamespace('beauty-setting');

package/lib-es/modules/device-pretest/settings/video-effect.js

@@ -1,7 +1,10 @@
+import "core-js/modules/es.array.filter.js";
+import "core-js/modules/es.object.to-string.js";
 import { FcrFashionTabs } from 'agora-ui-foundation/lib/components/tabs';
 import { observer } from 'mobx-react';
 import { useI18n } from 'agora-ui-foundation/lib/i18n';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
+import { useMemo } from 'react';
 
 // import './index.css';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -11,17 +14,29 @@ export var VideoEffect = observer(function (props) {
   var tabContents = props.tabContents,
     _props$currentTab = props.currentTab,
     currentTab = _props$currentTab === void 0 ? 'basic' : _props$currentTab,
-    handleActiveTab = props.handleActiveTab;
-  var tabItems = [{
-    label: t('fmt_setting_option_basics'),
-    key: 'basic'
-  }, {
-    label: t('fmt_setting_option_backgrounds'),
-    key: 'virtual-background'
-  }, {
-    label: t('fmt_device_labels_specialeffects'),
-    key: 'beauty-filter'
-  }];
+    handleActiveTab = props.handleActiveTab,
+    _props$isBeautyModeAb = props.isBeautyModeAbilitySupported,
+    isBeautyModeAbilitySupported = _props$isBeautyModeAb === void 0 ? true : _props$isBeautyModeAb,
+    _props$isVirtualBackg = props.isVirtualBackgroundSupported,
+    isVirtualBackgroundSupported = _props$isVirtualBackg === void 0 ? true : _props$isVirtualBackg;
+  var tabItems = useMemo(function () {
+    var items = [{
+      label: t('fmt_setting_option_basics'),
+      key: 'basic',
+      hidden: false
+    }, {
+      label: t('fmt_setting_option_backgrounds'),
+      key: 'virtual-background',
+      hidden: !isVirtualBackgroundSupported
+    }, {
+      label: t('fmt_device_labels_specialeffects'),
+      key: 'beauty-filter',
+      hidden: !isBeautyModeAbilitySupported
+    }];
+    return items.filter(function (item) {
+      return !item.hidden;
+    });
+  }, [t, isVirtualBackgroundSupported, isBeautyModeAbilitySupported]);
   return /*#__PURE__*/_jsxs("div", {
     className: ns.e('tab-wrapper'),
     children: [/*#__PURE__*/_jsx("div", {

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

@@ -8,7 +8,7 @@ import { PretestStoreContext } from '../store';
 import { FcrVolumeIndicator } from 'agora-ui-foundation/lib/components/volume-indicator';
 import { SpeakerDetection } from '../audio-preview/speaker-detection';
 import { FcrUIHighlightElement } from '../../../utilities/constant';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var VideoSettingsBasic4Custom = observer(function () {
   var ns = useNamespace('video-settings-basic_preview');

package/lib-es/modules/device-pretest/settings/virtual-background-setting.js

@@ -11,7 +11,7 @@ import classNames from 'classnames';
 import { observer } from 'mobx-react';
 import { throttle } from 'lodash';
 import { useI18n } from 'agora-ui-foundation/lib/i18n';
-import { useNamespace } from '../../../utilities/useNamespace';
+import { useNamespace } from 'agora-ui-foundation/lib/utilities/use-namespace';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var VirtualBackgroundSetting = observer(function (_ref) {
   var currentVirtualBackgroundName = _ref.currentVirtualBackgroundName,

package/lib-es/modules/dialog/components/confirm/index.css

@@ -1,21 +1,3 @@
-.fcr-event-confirm-wrapper.fcr-event-confirm-container {
-  width: 100vw;
-  height: 100vh;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 2000;
-  pointer-events: none;
-}
-
-.fcr-event-confirm-wrapper.fcr-event-confirm-container div {
-  pointer-events: all;
-}
-
-.fcr-confirm-dialog-wrapper {
-  background: #fff;
-}
-
 .fcr-confirm-dialog-wrapper_web {
   background: var(--fcr_mobile_ui_scene_color_popup_fill2);
   border-radius: var(--fcr_cornerradius_xl);

package/lib-es/modules/dialog/components/confirm/index.js

@@ -22,7 +22,8 @@ import { useDrag } from '@use-gesture/react';
 import { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { StoreContext } from '../../store.base';
 import { isElectron } from 'agora-foundation/lib/utilities/env';
-import { isMac } from '../../../../utilities/platform';
+import { isMac } from 'agora-foundation/lib/utilities/env';
+import './index.css';
 import { jsx as _jsx } from "react/jsx-runtime";
 export var ConfirmWindow = observer(function (_ref) {
   var _confirmBodyRef$curre;

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

@@ -3,7 +3,6 @@
   position: relative;
   flex: 1;
   width: 100%;
-  /* height: 100%; 此处设置 100% 会影响自适应高度布局 */
   box-sizing: border-box;
   overflow: hidden;
   font-family:
@@ -23,20 +22,20 @@
     'Noto Color Emoji';
   font-size: 14px;
   z-index: 0;
+  /* border: 1px solid var(--fcr_ui_scene_line1); */
+  border-radius: var(--fcr_cornerradius_xl);
 }
 
 ::-webkit-scrollbar {
   display: none;
 }
+
 .fcr-dialog-container_shadow {
   box-shadow: var(--fcr_web_light_dropup);
-  border: 1px solid var(--fcr_ui_scene_line1);
-  border-radius: var(--fcr_cornerradius_xl);
 }
 
 .fcr-dialog-container-header {
   width: 100%;
-  height: 46px;
   display: flex;
   align-items: center;
   -webkit-app-region: drag;

package/lib-es/modules/dialog/components/dialog-container/index.js

@@ -1,135 +1,89 @@
-import "core-js/modules/es.symbol.js";
-import "core-js/modules/es.array.filter.js";
-import "core-js/modules/es.array.for-each.js";
-import "core-js/modules/es.array.push.js";
-import "core-js/modules/es.object.define-properties.js";
-import "core-js/modules/es.object.define-property.js";
-import "core-js/modules/es.object.get-own-property-descriptor.js";
-import "core-js/modules/es.object.get-own-property-descriptors.js";
-import "core-js/modules/es.object.keys.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.filter.js";
-import "core-js/modules/esnext.iterator.for-each.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import "core-js/modules/es.parse-int.js";
-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) { _defineProperty(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; }
-import React from 'react';
-import { useState } from 'react';
-import { observer } from 'mobx-react';
+import { useCallback, useContext, useState } from 'react';
+import './index.css';
 import { isElectron } from 'agora-foundation/lib/utilities/env';
-import { DialogContainerBody } from './component/body';
-import { Rnd } from 'react-rnd';
-import { WEB_DIALOG_LAYER } from '../../level-config';
-import { jsx as _jsx } from "react/jsx-runtime";
-export var DialogContainer = observer(function (_ref) {
-  var width = _ref.width,
-    height = _ref.height,
+import { StoreContext } from '../../store.base';
+import { FcrIconButton } from 'agora-ui-foundation/lib/components/icon-button';
+import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
+import classNames from 'classnames';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+var HEADER_HEIGHT = '46px';
+export var DialogContainer = function DialogContainer(_ref) {
+  var actions = _ref.actions,
     title = _ref.title,
-    _onClose = _ref.onClose,
-    children = _ref.children,
-    actions = _ref.actions,
-    autoHeight = _ref.autoHeight,
-    showTopIcon = _ref.showTopIcon,
+    body = _ref.body,
     closable = _ref.closable,
-    style = _ref.style,
-    maxWidth = _ref.maxWidth,
-    maxHeight = _ref.maxHeight,
-    minWidth = _ref.minWidth,
-    minHeight = _ref.minHeight,
-    hasSystemShadow = _ref.hasSystemShadow,
+    _ref$showTopIcon = _ref.showTopIcon,
+    showTopIcon = _ref$showTopIcon === void 0 ? false : _ref$showTopIcon,
     dialogKey = _ref.dialogKey,
-    dialogId = _ref.dialogId;
-  var dialogBody = /*#__PURE__*/_jsx(DialogContainerBody, {
-    title: title,
-    actions: actions,
-    autoHeight: autoHeight !== null && autoHeight !== void 0 ? autoHeight : true,
-    closable: closable !== null && closable !== void 0 ? closable : true,
-    showTopIcon: showTopIcon,
-    onClose: _onClose,
-    hasSystemShadow: hasSystemShadow,
-    dialogKey: dialogKey,
-    dialogId: dialogId,
-    children: children
-  });
-  if (isElectron()) return dialogBody;
-  var _useState = useState({
-      width: width || 400,
-      height: height || 160
-    }),
-    _useState2 = _slicedToArray(_useState, 2),
-    webSize = _useState2[0],
-    updateSize = _useState2[1];
-  var windowWidth = window.innerWidth;
-  var windowHeight = window.innerHeight;
-  var x = windowWidth / 2 - webSize.width / 2;
-  var y = windowHeight / 2 - webSize.height / 2;
-  var _useState3 = useState({
-      x: x,
-      y: y
-    }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    position = _useState4[0],
-    updatePosition = _useState4[1];
-
-  // 应用尺寸限制的辅助函数
-  var constrainSize = function constrainSize(newSize) {
-    var constrainedWidth = newSize.width;
-    var constrainedHeight = newSize.height;
-
-    // 应用最小尺寸限制
-    if (minWidth && constrainedWidth < minWidth) {
-      constrainedWidth = minWidth;
-    }
-    if (minHeight && constrainedHeight < minHeight) {
-      constrainedHeight = minHeight;
-    }
-
-    // 应用最大尺寸限制
-    if (maxWidth && constrainedWidth > maxWidth) {
-      constrainedWidth = maxWidth;
-    }
-    if (maxHeight && constrainedHeight > maxHeight) {
-      constrainedHeight = maxHeight;
-    }
-    return {
-      width: constrainedWidth,
-      height: constrainedHeight
-    };
+    _ref$dialogId = _ref.dialogId,
+    dialogId = _ref$dialogId === void 0 ? '' : _ref$dialogId;
+  var _useContext = useContext(StoreContext),
+    handleDialogClose = _useContext.handleDialogClose;
+  var onClose = useCallback(function () {
+    handleDialogClose(dialogId);
+  }, [dialogId]);
+  var hasTitleOrActions = title || actions;
+  var contentStyle = {
+    height: "calc(100% - ".concat(hasTitleOrActions ? HEADER_HEIGHT : '0px', " )")
   };
-  return /*#__PURE__*/_jsx(Rnd, {
-    dragHandleClassName: 'fcr-dialog-container-header',
-    style: _objectSpread({
-      position: 'absolute',
-      touchAction: 'none',
-      display: 'flex',
-      flexDirection: 'column',
-      zIndex: WEB_DIALOG_LAYER.NORMAL_DIALOG
-    }, style),
-    size: webSize,
-    position: position,
-    minWidth: minWidth,
-    minHeight: minHeight,
-    maxWidth: maxWidth,
-    maxHeight: maxHeight,
-    bounds: "window",
-    onDragStop: function onDragStop(e, d) {
-      updatePosition({
-        x: d.x,
-        y: d.y
-      });
+  return /*#__PURE__*/_jsxs("div", {
+    className: classNames('fcr-dialog-container', {
+      'fcr-dialog-container_shadow': !isElectron()
+    }),
+    onClick: function onClick(e) {
+      return e.stopPropagation();
     },
-    onResizeStop: function onResizeStop(e, direction, ref, delta, position) {
-      var newSize = constrainSize({
-        width: parseInt(ref.style.width),
-        height: parseInt(ref.style.height)
-      });
-      updateSize(newSize);
-      updatePosition(position);
+    children: [hasTitleOrActions ? /*#__PURE__*/_jsxs("header", {
+      className: "fcr-dialog-container-header",
+      style: {
+        height: HEADER_HEIGHT
+      },
+      children: [actions && /*#__PURE__*/_jsx("div", {
+        style: {
+          flex: 1
+        }
+      }), /*#__PURE__*/_jsx("h2", {
+        children: title
+      }), actions && /*#__PURE__*/_jsxs("div", {
+        className: "fcr-dialog-container-actions",
+        children: [actions, showTopIcon && isElectron() && /*#__PURE__*/_jsx(TopButton, {
+          dialogKey: dialogKey,
+          dialogId: dialogId
+        })]
+      })]
+    }) : null, /*#__PURE__*/_jsx("section", {
+      className: "fcr-dialog-container-content",
+      style: contentStyle,
+      children: body
+    }), closable ? /*#__PURE__*/_jsx("a", {
+      className: "fcr-dialog-container-close",
+      onClick: onClose,
+      children: /*#__PURE__*/_jsx("span", {
+        children: "\xD7"
+      })
+    }) : null]
+  });
+};
+export var TopButton = function TopButton(props) {
+  var dialogKey = props.dialogKey,
+    dialogId = props.dialogId;
+  var _useContext2 = useContext(StoreContext),
+    getDialogWindow = _useContext2.getDialogWindow;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isAlwaysOnTop = _useState2[0],
+    setIsAlwaysOnTop = _useState2[1];
+  return /*#__PURE__*/_jsx(FcrIconButton, {
+    onClick: function onClick() {
+      var browserWindow = getDialogWindow(dialogKey);
+      browserWindow.setAlwaysOnTop(!isAlwaysOnTop, 'screen-saver');
+      setIsAlwaysOnTop(!isAlwaysOnTop);
     },
-    children: dialogBody
+    icon: isAlwaysOnTop ? FcrIconType.FCR_UNTOP : FcrIconType.FCR_TOP,
+    className: "frc-window-header__icon fcr-toggle-window-header__icon fcr-no-drag",
+    iconColors: {
+      iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+    }
   });
-});
+};