Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
refactor(ui): refine dropdown-related UI implementation (#4715)
白熱c5d46232302e
diff --git a/common/shared/eslint/index.js b/common/shared/eslint/index.jsindex dce361b9eb..65e0996193 100644--- a/common/shared/eslint/index.js+++ b/common/shared/eslint/index.js@@ -61,6 +61,7 @@ exports.baseRules = {'perfectionist/sort-imports': 'warn','perfectionist/sort-named-exports': 'warn','antfu/consistent-chaining': 'warn',+ 'react-hooks/exhaustive-deps': 'off','sort-imports': ['error',{@@ -78,6 +79,18 @@ exports.baseRules = {'jsdoc/tag-lines': 'off','import/consistent-type-specifier-style': 'warn',+ 'no-restricted-imports': [+ 'warn',+ {+ paths: [+ {+ name: 'clsx',+ message: 'Please use `import { clsx } from \'@univerjs/design\'` instead.',+ },+ ],+ },+ ],+// IMPORTANT: To ensure compatibility, some features of React 19 will be disabled.'react/no-forward-ref': 'off','react/no-context-provider': 'off',diff --git a/common/shared/package.json b/common/shared/package.jsonindex 36378a9484..3fc3a4bac0 100644--- a/common/shared/package.json+++ b/common/shared/package.json@@ -33,13 +33,13 @@"fs-extra": "^11.3.0","happy-dom": "15.0.0","javascript-obfuscator": "^4.1.1",- "postcss-preset-env": "^10.1.4",+ "postcss-preset-env": "^10.1.5","sort-keys": "^5.1.0","tailwind-scrollbar": "^3.1.0","tailwindcss": "^3.4.17","vite": "^6.1.1","vite-plugin-dts": "^4.5.0",- "vite-plugin-external": "^6.0.0",+ "vite-plugin-external": "^6.0.1","vitest": "^3.0.6"},"devDependencies": {diff --git a/packages-experimental/action-recorder/package.json b/packages-experimental/action-recorder/package.jsonindex 9c70ee833a..c80b6d477f 100644--- a/packages-experimental/action-recorder/package.json+++ b/packages-experimental/action-recorder/package.json@@ -72,8 +72,7 @@"@univerjs/sheets": "workspace:*","@univerjs/sheets-filter": "workspace:*","@univerjs/sheets-ui": "workspace:*",- "@univerjs/ui": "workspace:*",- "clsx": "^2.1.1"+ "@univerjs/ui": "workspace:*"},"devDependencies": {"@univerjs-infra/shared": "workspace:*",diff --git a/packages-experimental/action-recorder/src/views/components/RecorderPanel.tsx b/packages-experimental/action-recorder/src/views/components/RecorderPanel.tsxindex 4801a26d0c..a68792c8b2 100644--- a/packages-experimental/action-recorder/src/views/components/RecorderPanel.tsx+++ b/packages-experimental/action-recorder/src/views/components/RecorderPanel.tsx@@ -15,10 +15,9 @@*/import { ICommandService } from '@univerjs/core';-import { Button } from '@univerjs/design';+import { Button, clsx } from '@univerjs/design';import { RecordSingle } from '@univerjs/icons';import { useDependency, useObservable } from '@univerjs/ui';-import clsx from 'clsx';import React, { useCallback } from 'react';import { CompleteRecordingActionCommand, StartRecordingActionCommand, StopRecordingActionCommand } from '../../commands/commands/record.command';import { CloseRecordPanelOperation } from '../../commands/operations/operation';diff --git a/packages-experimental/debugger/package.json b/packages-experimental/debugger/package.jsonindex 94da160d04..16dfc42a48 100644--- a/packages-experimental/debugger/package.json+++ b/packages-experimental/debugger/package.json@@ -66,8 +66,7 @@"@univerjs/sheets": "workspace:*","@univerjs/sheets-drawing-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@univerjs/watermark": "workspace:*",- "clsx": "^2.1.1"+ "@univerjs/watermark": "workspace:*"},"optionalDependencies": {"vue": ">=3.0.0"diff --git a/packages-experimental/debugger/src/views/watermark/WatermarkTextSetting.tsx b/packages-experimental/debugger/src/views/watermark/WatermarkTextSetting.tsxindex 48aa550d1b..4e7bacf39e 100644--- a/packages-experimental/debugger/src/views/watermark/WatermarkTextSetting.tsx+++ b/packages-experimental/debugger/src/views/watermark/WatermarkTextSetting.tsx@@ -191,7 +191,7 @@ export const WatermarkTextSetting: React.FC<IWatermarkTextSettingProps> = (props/></div>- <div className={styles.watermarkTextSettingLayoutFontWrapper}>+ <div className="univer-grid univer-gap-1"><div>{localeService.t('univer-watermark.startY')}</div><InputNumberclassName="univer-box-border univer-h-7"diff --git a/packages-experimental/uni-docs-ui/package.json b/packages-experimental/uni-docs-ui/package.jsonindex 743ad72962..531d71c68d 100644--- a/packages-experimental/uni-docs-ui/package.json+++ b/packages-experimental/uni-docs-ui/package.json@@ -65,8 +65,7 @@"@univerjs/docs-ui": "workspace:*","@univerjs/engine-render": "workspace:*","@univerjs/ui": "workspace:*",- "@univerjs/uniui": "workspace:*",- "clsx": "^2.1.1"+ "@univerjs/uniui": "workspace:*"},"devDependencies": {"@univerjs-infra/shared": "workspace:*",diff --git a/packages-experimental/uni-formula-ui/package.json b/packages-experimental/uni-formula-ui/package.jsonindex 231bfbd16e..9d3a5c93d4 100644--- a/packages-experimental/uni-formula-ui/package.json+++ b/packages-experimental/uni-formula-ui/package.json@@ -76,8 +76,7 @@"@univerjs/sheets-formula-ui": "workspace:*","@univerjs/slides-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@univerjs/uni-formula": "workspace:*",- "clsx": "^2.1.1"+ "@univerjs/uni-formula": "workspace:*"},"devDependencies": {"@univerjs-infra/shared": "workspace:*",diff --git a/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx b/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsxindex 0d45b80c7d..4dc7aaca38 100644--- a/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx+++ b/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx@@ -17,10 +17,10 @@import type { IDocumentData, Nullable } from '@univerjs/core';import type { IUniFormulaPopupInfo } from '../../services/formula-popup.service';import { BooleanNumber, createInternalEditorID, DEFAULT_EMPTY_DOCUMENT_VALUE, DocumentFlavor, HorizontalAlign, ICommandService, LocaleService, VerticalAlign, WrapStrategy } from '@univerjs/core';+import { clsx } from '@univerjs/design';// import { TextEditor } from '@univerjs/docs-ui';import { CheckMarkSingle, CloseSingle } from '@univerjs/icons';import { useDependency, useObservable } from '@univerjs/ui';-import clsx from 'clsx';import React, { useCallback, useEffect, useRef, useState } from 'react';import { CloseFormulaPopupOperation, ConfirmFormulaPopupCommand } from '../../commands/operations/operation';diff --git a/packages-experimental/uni-formula/package.json b/packages-experimental/uni-formula/package.jsonindex 2d31e8a959..12e535f902 100644--- a/packages-experimental/uni-formula/package.json+++ b/packages-experimental/uni-formula/package.json@@ -56,8 +56,7 @@"build": "univer-cli build"},"dependencies": {- "@univerjs/core": "workspace:*",- "clsx": "^2.1.1"+ "@univerjs/core": "workspace:*"},"devDependencies": {"@univerjs-infra/shared": "workspace:*",diff --git a/packages-experimental/uni-sheets-ui/package.json b/packages-experimental/uni-sheets-ui/package.jsonindex d3824666da..83774ca983 100644--- a/packages-experimental/uni-sheets-ui/package.json+++ b/packages-experimental/uni-sheets-ui/package.json@@ -69,8 +69,7 @@"@univerjs/sheets-drawing-ui": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@univerjs/uniui": "workspace:*",- "clsx": "^2.1.1"+ "@univerjs/uniui": "workspace:*"},"devDependencies": {"@univerjs-infra/shared": "workspace:*",diff --git a/packages-experimental/uni-slides-ui/package.json b/packages-experimental/uni-slides-ui/package.jsonindex a22993e457..3750cc4e26 100644--- a/packages-experimental/uni-slides-ui/package.json+++ b/packages-experimental/uni-slides-ui/package.json@@ -64,8 +64,7 @@"@univerjs/icons": "^0.2.20","@univerjs/slides-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@univerjs/uniui": "workspace:*",- "clsx": "^2.1.1"+ "@univerjs/uniui": "workspace:*"},"devDependencies": {"@univerjs-infra/shared": "workspace:*",diff --git a/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx b/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsxindex 0ba7736d11..d2efd9bafc 100644--- a/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx+++ b/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx@@ -16,11 +16,11 @@import type { SlideDataModel } from '@univerjs/core';import { ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';+import { clsx } from '@univerjs/design';import { IRenderManagerService } from '@univerjs/engine-render';import { IncreaseSingle } from '@univerjs/icons';import { ActivateSlidePageOperation, AppendSlideOperation, SetSlidePageThumbOperation } from '@univerjs/slides-ui';import { useDependency, useObservable } from '@univerjs/ui';-import clsx from 'clsx';import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';import styles from './index.module.less';diff --git a/packages-experimental/uniui/package.json b/packages-experimental/uniui/package.jsonindex 7c9b6f75f5..a2097179e5 100644--- a/packages-experimental/uniui/package.json+++ b/packages-experimental/uniui/package.json@@ -69,9 +69,7 @@"@univerjs/sheets": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@xyflow/react": "^12.3.5",- "clsx": "^2.1.1",- "rc-util": "^5.43.0"+ "@xyflow/react": "^12.3.5"},"devDependencies": {"@univerjs-infra/shared": "workspace:*",diff --git a/packages-experimental/uniui/src/views/uni-sidebar/UniSidebar.tsx b/packages-experimental/uniui/src/views/uni-sidebar/UniSidebar.tsxindex 367999b637..ac24060d32 100644--- a/packages-experimental/uniui/src/views/uni-sidebar/UniSidebar.tsx+++ b/packages-experimental/uniui/src/views/uni-sidebar/UniSidebar.tsx@@ -15,9 +15,9 @@*/import type { ISidebarMethodOptions } from '@univerjs/ui';+import { clsx } from '@univerjs/design';import { CloseSingle } from '@univerjs/icons';import { CustomLabel, ILeftSidebarService, ISidebarService, useDependency, useObservable } from '@univerjs/ui';-import clsx from 'clsx';import React, { useEffect, useMemo, useRef } from 'react';import styles from './index.module.less';diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsxindex 03fa2b2e5f..d472b96f34 100644--- a/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx@@ -16,6 +16,7 @@import type { Nullable, Workbook } from '@univerjs/core';import { BooleanNumber, DEFAULT_EMPTY_DOCUMENT_VALUE, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DocumentFlavor, HorizontalAlign, ICommandService, IPermissionService, IUniverInstanceService, Rectangle, ThemeService, UniverInstanceType, VerticalAlign, WrapStrategy } from '@univerjs/core';+import { clsx } from '@univerjs/design';// import { TextEditor } from '@univerjs/docs-ui';import { DeviceInputEventType } from '@univerjs/engine-render';import { CheckMarkSingle, CloseSingle, FxSingle } from '@univerjs/icons';@@ -23,7 +24,6 @@ import { RangeProtectionPermissionEditPoint, RangeProtectionRuleModel, SheetsSelimport { IEditorBridgeService, IFormulaEditorManagerService, SetCellEditVisibleOperation, useActiveWorkbook } from '@univerjs/sheets-ui';// import { TextEditor } from '@univerjs/docs-ui';import { KeyCode, useDependency, useObservable } from '@univerjs/ui';-import clsx from 'clsx';import React, { useCallback, useLayoutEffect, useState } from 'react';import { EMPTY, merge, switchMap } from 'rxjs';import styles from './index.module.less';diff --git a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsxindex 4b1ff2fa50..23133c9993 100644--- a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx+++ b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx@@ -25,7 +25,7 @@ import type {} from '@xyflow/react';import type { IFloatingToolbarRef } from '../uni-toolbar/UniFloatToolbar';import { debounce, ICommandService, IContextService, IUniverInstanceService, LocaleService, ThemeService } from '@univerjs/core';-import { ConfigContext, ConfigProvider, defaultTheme, themeInstance } from '@univerjs/design';+import { clsx, ConfigContext, ConfigProvider, defaultTheme, themeInstance } from '@univerjs/design';import { IRenderManagerService } from '@univerjs/engine-render';import { MenuSingle } from '@univerjs/icons';import { builtInGlobalComponents,@@ -44,8 +44,6 @@ import {ReactFlowProvider,useNodesState,} from '@xyflow/react';-import clsx from 'clsx';-import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';import { createPortal } from 'react-dom';import { UniFocusUnitOperation } from '../../commands/operations/uni-focus-unit.operation';diff --git a/packages/design/package.json b/packages/design/package.jsonindex b856e9da31..06ca397ae5 100644--- a/packages/design/package.json+++ b/packages/design/package.json@@ -68,27 +68,23 @@"react-dom": ">=16.9.0 || >=17 || >=18 || >=19"},"dependencies": {+ "@radix-ui/react-dropdown-menu": "^2.1.6","@radix-ui/react-popover": "^1.1.6",- "@rc-component/color-picker": "^2.0.1","@rc-component/trigger": "^2.2.6","@univerjs/icons": "^0.2.20","clsx": "^2.1.1","dayjs": "^1.11.13","rc-dialog": "^9.6.0","rc-dropdown": "^4.2.1",- "rc-input": "^1.7.1","rc-input-number": "^9.3.0","rc-menu": "^9.16.0","rc-picker": "^4.9.0",- "rc-segmented": "^2.7.0","rc-select": "^14.16.4",- "rc-textarea": "^1.8.2",- "rc-util": "^5.43.0","rc-virtual-list": "^3.16.1","react-draggable": "^4.4.6","react-grid-layout": "^1.5.0","react-transition-group": "^4.4.5",- "tailwind-merge": "^2.6.0"+ "tailwind-merge": "^3.0.2"},"devDependencies": {"@testing-library/react": "^16.2.0",diff --git a/packages/design/src/components/color-picker/ColorPicker.tsx b/packages/design/src/components/color-picker/ColorPicker.tsxindex e16240ef8f..f2f86b58a0 100644--- a/packages/design/src/components/color-picker/ColorPicker.tsx+++ b/packages/design/src/components/color-picker/ColorPicker.tsx@@ -14,8 +14,8 @@* limitations under the License.*/-import canUseDom from 'rc-util/lib/Dom/canUseDom';import React, { useCallback, useEffect, useState } from 'react';+import { isBrowser } from '../../helper/is-browser';import { AlphaSlider } from './AlphaSlider';import { hexToHsv, hsvToHex, hsvToRgb, rgbToHex } from './color-conversion';import { ColorInput } from './ColorInput';@@ -37,7 +37,7 @@ export interface IColorPickerProps {}export function ColorPicker({ format = 'hex', value = '#000000', showAlpha = false, onChange }: IColorPickerProps) {- if (!canUseDom) return null;+ if (!isBrowser) return null;const [hsv, setHsv] = useState<[number, number, number]>([0, 100, 100]);const [alpha, setAlpha] = useState(1);diff --git a/packages/design/src/components/config-provider/ConfigProvider.tsx b/packages/design/src/components/config-provider/ConfigProvider.tsxindex 57bdae0cbf..252b7a0473 100644--- a/packages/design/src/components/config-provider/ConfigProvider.tsx+++ b/packages/design/src/components/config-provider/ConfigProvider.tsx@@ -14,10 +14,9 @@* limitations under the License.*/-import React, { createContext, useMemo } from 'react';-import canUseDom from 'rc-util/lib/Dom/canUseDom';-import type { ILocale } from '../../locale/interface';+import React, { createContext, useMemo } from 'react';+import { isBrowser } from '../../helper/is-browser';export interface IConfigProviderProps {children: React.ReactNode;@@ -26,7 +25,7 @@ export interface IConfigProviderProps {}export const ConfigContext = createContext<Omit<IConfigProviderProps, 'children'>>({- mountContainer: canUseDom() ? document.body : null,+ mountContainer: isBrowser() ? document.body : null,});export function ConfigProvider(props: IConfigProviderProps) {diff --git a/packages/design/src/components/dropdown-menu/DropdownMenu.tsx b/packages/design/src/components/dropdown-menu/DropdownMenu.tsxnew file mode 100644index 0000000000..b334b38ca7--- /dev/null+++ b/packages/design/src/components/dropdown-menu/DropdownMenu.tsx@@ -0,0 +1,217 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { Content } from '@radix-ui/react-popover';+import type { ComponentProps, ReactNode } from 'react';+import { useState } from 'react';+import {+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuPrimitive,+ DropdownMenuRadioGroup,+ DropdownMenuRadioItem,+ DropdownMenuSeparator,+ DropdownMenuTrigger,+} from './DropdownMenuPrimitive';+// import { DropdownMenuCheckboxItem, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuPortal, DropdownMenuPrimitive, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSeparator, DropdownMenuShortcut, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger } from './DropdownMenuPrimitive';++type DropdownMenu = {+ type: 'item';+ children: ReactNode;+ onSelect?: (item: DropdownMenu) => void;+} | {+ type?: 'separator';+} | {+ type?: 'radio';+ options: { value: string; label: string }[];+ value: string;+ onSelect?: (item: string) => void;+};++export interface IDropdownProps {+ children: ReactNode;+ /** @deprecated */+ overlay?: ReactNode;+ items: DropdownMenu[];+ disabled?: boolean;+ open?: boolean;+ onOpenChange?: (open: boolean) => void;+}++export function DropdownMenu(props: IDropdownProps & ComponentProps<typeof Content>) {+ const {+ children,+ overlay,+ items,+ disabled,+ open: controlledOpen,+ onOpenChange: controlledOnOpenChange,+ ...restProps+ } = props;++ const [uncontrolledOpen, setUncontrolledOpen] = useState(false);++ const isControlled = controlledOpen !== undefined;+ const open = isControlled ? controlledOpen : uncontrolledOpen;++ function handleChangeOpen(newOpen: boolean) {+ if (disabled) return;++ if (!isControlled) {+ setUncontrolledOpen(newOpen);+ }++ controlledOnOpenChange?.(newOpen);+ }++ // const [showStatusBar, setShowStatusBar] = useState<boolean>(true);+ // const [showActivityBar, setShowActivityBar] = useState<boolean>(false);+ // const [showPanel, setShowPanel] = useState<boolean>(false);+ // const [position, setPosition] = useState('bottom');++ function renderMenuItem(item: DropdownMenu, index: number) {+ // const { type, children, icon, checked, hidden, onSelect } = item;+ const { type } = item;++ if (type === 'separator') {+ return <DropdownMenuSeparator key={index} />;+ } else if (type === 'radio') {+ return (+ <DropdownMenuRadioGroup+ key={index}+ value={item.value}+ onValueChange={item.onSelect}+ >+ {item.options.map((option) => (+ <DropdownMenuRadioItem+ key={option.value}+ value={option.value}+ >+ {option.label}+ </DropdownMenuRadioItem>+ ))}+ </DropdownMenuRadioGroup>+ );+ } else if (type === 'item') {+ return (+ <DropdownMenuItem+ key={index}+ onSelect={() => {+ item.onSelect?.(item);+ }}+ >+ {item.children}+ </DropdownMenuItem>+ );+ }+ }++ return (+ <DropdownMenuPrimitive open={open} onOpenChange={handleChangeOpen}>+ <DropdownMenuTrigger asChild>+ {children}+ </DropdownMenuTrigger>+ <DropdownMenuContent {...restProps}>++ {overlay}+ {items.map((item, index) => renderMenuItem(item, index))}+ {/*+ <DropdownMenuLabel>Appearance</DropdownMenuLabel>+ <DropdownMenuSeparator />+ <DropdownMenuCheckboxItem+ checked={showStatusBar}+ onCheckedChange={setShowStatusBar}+ >+ Status Bar+ </DropdownMenuCheckboxItem>+ <DropdownMenuCheckboxItem+ checked={showActivityBar}+ onCheckedChange={setShowActivityBar}+ disabled+ >+ Activity Bar+ </DropdownMenuCheckboxItem>+ <DropdownMenuCheckboxItem+ checked={showPanel}+ onCheckedChange={setShowPanel}+ >+ Panel+ </DropdownMenuCheckboxItem>++ <DropdownMenuSeparator />++ <DropdownMenuLabel>Panel Position</DropdownMenuLabel>+ <DropdownMenuSeparator />+ <DropdownMenuRadioGroup value={position} onValueChange={setPosition}>+ <DropdownMenuRadioItem value="top">Top</DropdownMenuRadioItem>+ <DropdownMenuRadioItem value="bottom">Bottom</DropdownMenuRadioItem>+ <DropdownMenuRadioItem value="right">Right</DropdownMenuRadioItem>+ </DropdownMenuRadioGroup>++ <DropdownMenuSeparator />++ <DropdownMenuLabel>My Account</DropdownMenuLabel>+ <DropdownMenuSeparator />+ <DropdownMenuGroup>+ <DropdownMenuItem>+ Profile+ <DropdownMenuShortcut>⇧⌘P</DropdownMenuShortcut>+ </DropdownMenuItem>+ <DropdownMenuItem>+ Billing+ <DropdownMenuShortcut>⌘B</DropdownMenuShortcut>+ </DropdownMenuItem>+ <DropdownMenuItem>+ Settings+ <DropdownMenuShortcut>⌘S</DropdownMenuShortcut>+ </DropdownMenuItem>+ <DropdownMenuItem>+ Keyboard shortcuts+ <DropdownMenuShortcut>⌘K</DropdownMenuShortcut>+ </DropdownMenuItem>+ </DropdownMenuGroup>+ <DropdownMenuSeparator />+ <DropdownMenuGroup>+ <DropdownMenuItem>Team</DropdownMenuItem>+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>Invite users</DropdownMenuSubTrigger>+ <DropdownMenuPortal>+ <DropdownMenuSubContent>+ <DropdownMenuItem>Email</DropdownMenuItem>+ <DropdownMenuItem>Message</DropdownMenuItem>+ <DropdownMenuSeparator />+ <DropdownMenuItem>More...</DropdownMenuItem>+ </DropdownMenuSubContent>+ </DropdownMenuPortal>+ </DropdownMenuSub>+ <DropdownMenuItem>+ New Team+ <DropdownMenuShortcut>⌘+T</DropdownMenuShortcut>+ </DropdownMenuItem>+ </DropdownMenuGroup>+ <DropdownMenuSeparator />+ <DropdownMenuItem>GitHub</DropdownMenuItem>+ <DropdownMenuItem>Support</DropdownMenuItem>+ <DropdownMenuItem disabled>API</DropdownMenuItem>+ <DropdownMenuSeparator />+ <DropdownMenuItem>+ Log out+ <DropdownMenuShortcut>⇧⌘Q</DropdownMenuShortcut>+ </DropdownMenuItem> */}+ </DropdownMenuContent>+ </DropdownMenuPrimitive>+ );+}diff --git a/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx b/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsxnew file mode 100644index 0000000000..79f363771d--- /dev/null+++ b/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx@@ -0,0 +1,347 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { ComponentProps } from 'react';+import {+ CheckboxItem,+ Content,+ Group,+ Item,+ ItemIndicator,+ Label,+ Portal,+ RadioGroup,+ RadioItem,+ Root,+ Separator,+ Sub,+ SubContent,+ SubTrigger,+ Trigger,+} from '@radix-ui/react-dropdown-menu';+import { CheckMarkSingle, MoreRightSingle } from '@univerjs/icons';+import { clsx } from '../../helper/clsx';++function DropdownMenuPrimitive({+ ...props+}: ComponentProps<typeof Root>) {+ return <Root data-slot="dropdown-menu" {...props} />;+}++function DropdownMenuPortal({+ ...props+}: ComponentProps<typeof Portal>) {+ return (+ <Portal data-slot="dropdown-menu-portal" {...props} />+ );+}++function DropdownMenuTrigger({+ ...props+}: ComponentProps<typeof Trigger>) {+ return (+ <Trigger+ data-slot="dropdown-menu-trigger"+ {...props}+ />+ );+}++function DropdownMenuGroup({+ ...props+}: ComponentProps<typeof Group>) {+ return (+ <Group data-slot="dropdown-menu-group" {...props} />+ );+}++function DropdownMenuSub({+ ...props+}: ComponentProps<typeof Sub>) {+ return <Sub data-slot="dropdown-menu-sub" {...props} />;+}++function DropdownMenuRadioGroup({+ ...props+}: ComponentProps<typeof RadioGroup>) {+ return (+ <RadioGroup+ data-slot="dropdown-menu-radio-group"+ {...props}+ />+ );+}++function DropdownMenuSubTrigger({+ className,+ inset,+ children,+ ...props+}: ComponentProps<typeof SubTrigger> & {+ inset?: boolean;+}) {+ return (+ <SubTrigger+ data-slot="dropdown-menu-sub-trigger"+ data-inset={inset}+ className={clsx(+ `+ univer-flex univer-cursor-default univer-select-none univer-items-center univer-justify-between+ univer-gap-2 univer-rounded univer-px-2 univer-py-1.5 univer-text-[13px] univer-outline-none+ [&_svg]:univer-pointer-events-none [&_svg]:univer-size-4 [&_svg]:univer-shrink-0+ dark:focus:univer-bg-gray-600+ data-[state=open]:univer-bg-gray-100+ focus:univer-bg-gray-100+ `,+ className+ )}+ {...props}+ >+ {children}+ <MoreRightSingle className="ml-auto" />+ </SubTrigger>+ );+}++function DropdownMenuSubContent({+ className,+ ...props+}: ComponentProps<typeof SubContent>) {+ return (+ <SubContent+ data-slot="dropdown-menu-sub-content"+ className={clsx(+ `+ univer-z-50 univer-box-border univer-max-h-[var(--radix-popper-available-height)]+ univer-overflow-y-auto univer-rounded-md univer-border univer-border-solid univer-border-gray-200+ univer-bg-white univer-p-1.5 univer-text-gray-900 univer-shadow-md univer-scrollbar-thin+ univer-scrollbar-track-gray-50 univer-scrollbar-thumb-gray-300+ dark:univer-border-gray-600 dark:univer-bg-gray-700 dark:univer-text-white+ data-[side=bottom]:univer-slide-in-from-top-2+ data-[side=left]:univer-slide-in-from-right-2+ data-[side=right]:univer-slide-in-from-left-2+ data-[side=top]:univer-slide-in-from-bottom-2+ data-[state=closed]:univer-animate-out data-[state=closed]:univer-fade-out-0+ data-[state=closed]:univer-zoom-out-95+ data-[state=open]:univer-animate-in data-[state=open]:univer-fade-in-0+ data-[state=open]:univer-zoom-in-95+ `,+ className+ )}+ {...props}+ />+ );+}++function DropdownMenuContent({+ className,+ sideOffset = 4,+ ...props+}: ComponentProps<typeof Content>) {+ return (+ <Portal>+ <Content+ data-slot="dropdown-menu-content"+ sideOffset={sideOffset}+ className={clsx(+ `+ univer-z-50 univer-box-border univer-max-h-[var(--radix-popper-available-height)]+ univer-overflow-y-auto univer-rounded-md univer-border univer-border-solid univer-border-gray-200+ univer-bg-white univer-p-1.5 univer-text-gray-900 univer-shadow-md univer-scrollbar-thin+ univer-scrollbar-track-gray-50 univer-scrollbar-thumb-gray-300+ dark:univer-border-gray-600 dark:univer-bg-gray-700 dark:univer-text-white+ data-[side=bottom]:univer-slide-in-from-top-2+ data-[side=left]:univer-slide-in-from-right-2+ data-[side=right]:univer-slide-in-from-left-2+ data-[side=top]:univer-slide-in-from-bottom-2+ data-[state=closed]:univer-animate-out data-[state=closed]:univer-fade-out-0+ data-[state=closed]:univer-zoom-out-95+ data-[state=open]:univer-animate-in data-[state=open]:univer-fade-in-0+ data-[state=open]:univer-zoom-in-95+ `,+ className+ )}+ {...props}+ />+ </Portal>+ );+}++function DropdownMenuItem({+ className,+ inset,+ variant = 'default',+ ...props+}: ComponentProps<typeof Item> & {+ inset?: boolean;+ variant?: 'default' | 'destructive';+}) {+ return (+ <Item+ data-slot="dropdown-menu-item"+ data-inset={inset}+ data-variant={variant}+ className={clsx(+ `+ univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center univer-gap-2+ univer-rounded univer-px-2 univer-py-1.5 univer-text-[13px] univer-outline-none+ univer-transition-colors+ [&>svg]:univer-size-4 [&>svg]:univer-shrink-0+ dark:focus:univer-bg-gray-600+ data-[disabled]:univer-pointer-events-none data-[disabled]:univer-opacity-50+ focus:univer-bg-gray-100+ `,+ className+ )}+ {...props}+ />+ );+}++function DropdownMenuCheckboxItem({+ className,+ children,+ checked,+ ...props+}: ComponentProps<typeof CheckboxItem>) {+ return (+ <CheckboxItem+ data-slot="dropdown-menu-checkbox-item"+ className={clsx(+ `+ univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center+ univer-rounded univer-py-1.5 univer-pl-8 univer-pr-2 univer-text-[13px] univer-outline-none+ univer-transition-colors+ dark:focus:univer-bg-gray-600+ data-[disabled]:univer-pointer-events-none data-[disabled]:univer-opacity-50+ focus:univer-bg-gray-100+ `,+ className+ )}+ checked={checked}+ {...props}+ >+ <span+ className={`+ univer-absolute univer-left-2 univer-flex univer-h-3.5 univer-w-3.5 univer-items-center+ univer-justify-center+ `}+ >+ <ItemIndicator>+ <CheckMarkSingle className="univer-block univer-size-4 univer-fill-current univer-text-primary-600" />+ </ItemIndicator>+ </span>+ {children}+ </CheckboxItem>+ );+}++function DropdownMenuRadioItem({+ className,+ children,+ ...props+}: ComponentProps<typeof RadioItem>) {+ return (+ <RadioItem+ data-slot="dropdown-menu-radio-item"+ className={clsx(+ `+ univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center+ univer-rounded univer-py-1.5 univer-pl-8 univer-pr-2 univer-text-[13px] univer-outline-none+ univer-transition-colors+ dark:focus:univer-bg-gray-600+ data-[disabled]:univer-pointer-events-none data-[disabled]:univer-opacity-50+ focus:univer-bg-gray-100+ `,+ className+ )}+ {...props}+ >+ <span+ className={`+ univer-absolute univer-left-2 univer-flex univer-h-3.5 univer-w-3.5 univer-items-center+ univer-justify-center+ `}+ >+ <ItemIndicator>+ <CheckMarkSingle className="univer-block univer-size-4 univer-fill-current univer-text-primary-600" />+ </ItemIndicator>+ </span>+ {children}+ </RadioItem>+ );+}++function DropdownMenuLabel({+ className,+ inset,+ ...props+}: ComponentProps<typeof Label> & {+ inset?: boolean;+}) {+ return (+ <Label+ data-slot="dropdown-menu-label"+ data-inset={inset}+ className={clsx(+ 'univer-px-2 univer-py-1.5 univer-text-[13px] univer-font-semibold',+ className+ )}+ {...props}+ />+ );+}++function DropdownMenuSeparator({+ className,+ ...props+}: ComponentProps<typeof Separator>) {+ return (+ <Separator+ className={clsx('-univer-mx-1 univer-my-1 univer-h-px univer-bg-gray-200', className)}+ {...props}+ />+ );+}+function DropdownMenuShortcut({+ className,+ ...props+}: ComponentProps<'span'>) {+ return (+ <span+ className={clsx('univer-ml-auto univer-text-[13px] univer-tracking-widest univer-opacity-60', className)}+ {...props}+ />+ );+};++export {+ DropdownMenuCheckboxItem,+ DropdownMenuContent,+ DropdownMenuGroup,+ DropdownMenuItem,+ DropdownMenuLabel,+ DropdownMenuPortal,+ DropdownMenuPrimitive,+ DropdownMenuRadioGroup,+ DropdownMenuRadioItem,+ DropdownMenuSeparator,+ DropdownMenuShortcut,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,+ DropdownMenuTrigger,+};diff --git a/packages/sheets-ui/src/views/operate-container/index.ts b/packages/design/src/components/dropdown-menu/index.tssimilarity index 90%rename from packages/sheets-ui/src/views/operate-container/index.tsrename to packages/design/src/components/dropdown-menu/index.tsindex d8b508253f..4f146f1a10 100644--- a/packages/sheets-ui/src/views/operate-container/index.ts+++ b/packages/design/src/components/dropdown-menu/index.ts@@ -14,4 +14,4 @@* limitations under the License.*/-export * from './OperateContainer';+export { DropdownMenu, type IDropdownProps } from './DropdownMenu';diff --git a/packages/design/src/components/dropdown/Dropdown.tsx b/packages/design/src/components/dropdown/Dropdown.tsxindex f029d1313e..52719e5df8 100644--- a/packages/design/src/components/dropdown/Dropdown.tsx+++ b/packages/design/src/components/dropdown/Dropdown.tsx@@ -17,7 +17,7 @@import type { Content } from '@radix-ui/react-popover';import type { ComponentProps, ReactNode } from 'react';import { useState } from 'react';-import { PopoverContent, PopoverPrimitive, PopoverTrigger } from './Popover';+import { PopoverContent, PopoverPrimitive, PopoverTrigger } from './PopoverPrimitive';interface IDropdownProps {children: ReactNode;diff --git a/packages/design/src/components/dropdown/Popover.tsx b/packages/design/src/components/dropdown/PopoverPrimitive.tsxsimilarity index 100%rename from packages/design/src/components/dropdown/Popover.tsxrename to packages/design/src/components/dropdown/PopoverPrimitive.tsxdiff --git a/packages/design/src/components/icon/Icon.stories.tsx b/packages/design/src/components/icon/Icon.stories.tsxdeleted file mode 100644index 8a72e87409..0000000000--- a/packages/design/src/components/icon/Icon.stories.tsx+++ /dev/null@@ -1,46 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { Meta } from '@storybook/react';--import { Button } from '../button/Button';--const meta: Meta = {- title: 'Components / Icon',- parameters: {- layout: 'centered',- },- tags: ['autodocs'],-};--export default meta;--export const Playground = {- render() {- function handleRedirect() {- window.open('https://univer.ai/icons', '_blank');- }-- return (- <>- Check out our icon library at- <Button type="link" onClick={handleRedirect}>- https://univer.ai/icons- </Button>- </>- );- },-};diff --git a/packages/design/src/components/message/Message.tsx b/packages/design/src/components/message/Message.tsxindex 59432369ca..2e1ec51143 100644--- a/packages/design/src/components/message/Message.tsx+++ b/packages/design/src/components/message/Message.tsx@@ -15,10 +15,10 @@*/import { ErrorSingle, InfoSingle, Loading, SuccessSingle, WarningSingle } from '@univerjs/icons';-import canUseDom from 'rc-util/lib/Dom/canUseDom';-import React, { useEffect, useMemo, useState } from 'react';+import { useEffect, useMemo, useState } from 'react';import { createPortal } from 'react-dom';import { clsx } from '../../helper/clsx';+import { isBrowser } from '../../helper/is-browser';export enum MessageType {Success = 'success',@@ -44,27 +44,27 @@ const iconMap = {[MessageType.Loading]: <Loading className="univer-text-yellow-400 univer-animate-spin" />,};-// eslint-disable-next-line react-refresh/only-export-componentsconst Message = ({ content, type = MessageType.Info }: IMessageProps) => {const icon = useMemo(() => iconMap[type], [type]);+return (<divclassName={clsx(`- univer-font-sans univer-rounded-xl univer-p-4 univer-min-w-[320px] univer-transition-all- univer-bg-white univer-duration-300 univer-animate-in univer-fade-in univer-slide-in-from-top-4- univer-shadow-md univer-max-w-[480px] univer-border univer-border-gray-200 univer-border-solid+ univer-min-w-[320px] univer-max-w-[480px] univer-rounded-xl univer-border univer-border-solid+ univer-border-gray-200 univer-bg-white univer-p-4 univer-font-sans univer-shadow-md+ univer-transition-all univer-duration-300 univer-animate-in univer-fade-in univer-slide-in-from-top-4dark:univer-border-gray-700 dark:univer-bg-gray-700`)}>- <div className="univer-flex univer-gap-2 univer-items-start">+ <div className="univer-flex univer-items-start univer-gap-2"><span className="[&>svg]:univer-relative [&>svg]:univer-top-0.5 [&>svg]:univer-block">{icon}</span><pclassName={`- univer-text-sm univer-opacity-90 univer-m-0 univer-text-gray-500+ univer-m-0 univer-text-sm univer-text-gray-500 univer-opacity-90dark:univer-text-gray-400`}>@@ -86,9 +86,7 @@ const createMessage = (() => {let removeMessage: (id?: string) => void = () => {};const Messager = () => {- if (!canUseDom()) {- return null;- }+ if (!isBrowser()) return null;const [state, setState] = useState<IMessageState>({ messages: [] });@@ -124,8 +122,8 @@ const createMessage = (() => {return createPortal(<divclassName={`- univer-fixed univer-left-1/2 univer-top-4 univer-z-50 univer-flex univer-flex-col univer-items-center- univer-gap-1 -univer-translate-x-1/2+ univer-fixed univer-left-1/2 univer-top-4 univer-z-50 univer-flex -univer-translate-x-1/2+ univer-flex-col univer-items-center univer-gap-1`}>{state.messages.map((message, index) => (diff --git a/packages/design/src/components/segmented/Segmented.stories.tsx b/packages/design/src/components/segmented/Segmented.stories.tsxindex 5d3139dc2d..0346c61586 100644--- a/packages/design/src/components/segmented/Segmented.stories.tsx+++ b/packages/design/src/components/segmented/Segmented.stories.tsx@@ -33,7 +33,7 @@ export const SegmentedBasic = {return (<div style={{ width: 280 }}><Segmented- options={[+ items={[{ label: 'By Values', value: 'Values' },{ label: 'By Conditions', value: 'Conditions' },]}diff --git a/packages/design/src/components/segmented/Segmented.tsx b/packages/design/src/components/segmented/Segmented.tsxindex 521db0864e..46a0fd9a7c 100644--- a/packages/design/src/components/segmented/Segmented.tsx+++ b/packages/design/src/components/segmented/Segmented.tsx@@ -14,14 +14,122 @@* limitations under the License.*/-import React, { forwardRef } from 'react';-import type { SegmentedProps } from 'rc-segmented';-import RcSegmented from 'rc-segmented';+import type { CSSProperties } from 'react';+import { useEffect, useRef, useState } from 'react';+import { clsx } from '../../helper/clsx';-import styles from './index.module.less';+type ItemValue = string | number;-export interface ISegmentedProps extends Omit<SegmentedProps, 'prefixCls'> {}+interface ISegmentedItem<T extends ItemValue = ItemValue> {+ label: string;+ value: T;+}-export const Segmented = forwardRef<HTMLDivElement | null, ISegmentedProps>(function InnerSegmented(props, ref) {- return <RcSegmented prefixCls={styles.segmented} {...props} ref={ref} />;-});+interface ISegmentedProps<T extends ItemValue = ItemValue> {+ items: ISegmentedItem<T>[];+ value?: T;+ defaultValue?: T;+ onChange?: (value: T) => void;+ className?: string;+}++export function Segmented<T extends ItemValue = ItemValue>({+ items,+ value,+ defaultValue,+ onChange,+ className = '',+}: ISegmentedProps<T>) {+ const [selectedItem, setSelectedItem] = useState<T>(+ value !== undefined ? value : (defaultValue || items[0].value)+ );+ const [slideStyle, setSlideStyle] = useState({});+ const itemRefs = useRef<Map<T, HTMLButtonElement>>(new Map());+ const containerRef = useRef<HTMLDivElement>(null);++ // Update internal state when controlled value changes+ useEffect(() => {+ if (value !== undefined && value !== selectedItem) {+ setSelectedItem(value);+ }+ }, [value]);++ const updateSliderPosition = (newValue: T, oldValue?: T) => {+ const newItemElement = itemRefs.current.get(newValue);+ const oldItemElement = oldValue ? itemRefs.current.get(oldValue) : null;++ if (newItemElement && containerRef.current) {+ const containerRect = containerRef.current.getBoundingClientRect();+ const newRect = newItemElement.getBoundingClientRect();++ // Calculate position relative to container's padding+ const newLeft = newRect.left - containerRect.left - 4; // Subtract padding-left (p-1 = 4px)++ if (oldItemElement) {+ const oldRect = oldItemElement.getBoundingClientRect();+ const oldLeft = oldRect.left - containerRect.left - 4;++ setSlideStyle({+ '--slide-from': `${oldLeft}px`,+ '--slide-to': `${newLeft}px`,+ width: `${newRect.width}px`,+ transform: `translateX(${newLeft}px)`,+ } as CSSProperties);+ } else {+ setSlideStyle({+ width: `${newRect.width}px`,+ transform: `translateX(${newLeft}px)`,+ } as CSSProperties);+ }+ }+ };++ useEffect(() => {+ updateSliderPosition(selectedItem);+ }, [selectedItem]);++ const handleClick = (itemValue: T) => {+ const oldValue = selectedItem;+ setSelectedItem(itemValue);+ onChange?.(itemValue);+ updateSliderPosition(itemValue, oldValue);+ };++ return (+ <div+ ref={containerRef}+ className={clsx(`+ univer-relative univer-box-border univer-flex univer-gap-4 univer-rounded-lg univer-bg-gray-100 univer-p-1+ `, className)}+ >+ <div+ className={`+ univer-absolute univer-h-6 univer-rounded-md univer-bg-white univer-shadow-sm univer-transition-all+ univer-duration-200 univer-animate-univer-slide+ `}+ style={slideStyle}+ />++ {items.map((item) => (+ <button+ key={String(item.value)}+ ref={(el) => {+ if (el) itemRefs.current.set(item.value, el);+ }}+ className={clsx(`+ univer-relative univer-box-border univer-flex-1 univer-cursor-pointer univer-border-none+ univer-bg-transparent univer-px-3 univer-py-1 univer-text-xs univer-font-medium+ univer-transition-colors+ `, {+ 'univer-text-gray-900': selectedItem === item.value,+ 'univer-text-gray-500 hover:univer-text-gray-900': selectedItem !== item.value,+ })}+ type="button"+ onClick={() => handleClick(item.value)}+ >+ {item.label}+ </button>+ ))}+ </div>+ );+}diff --git a/packages/design/src/components/segmented/index.ts b/packages/design/src/components/segmented/index.tsindex d4f8419778..bb1732e81f 100644--- a/packages/design/src/components/segmented/index.ts+++ b/packages/design/src/components/segmented/index.ts@@ -14,4 +14,4 @@* limitations under the License.*/-export { Segmented, type ISegmentedProps } from './Segmented';+export { Segmented } from './Segmented';diff --git a/packages/design/src/components/tooltip/Tooltip.tsx b/packages/design/src/components/tooltip/Tooltip.tsxindex dafe935d7e..1f25e569c3 100644--- a/packages/design/src/components/tooltip/Tooltip.tsx+++ b/packages/design/src/components/tooltip/Tooltip.tsx@@ -14,10 +14,10 @@* limitations under the License.*/-import canUseDom from 'rc-util/lib/Dom/canUseDom';import React, { useEffect, useRef, useState } from 'react';import { createPortal } from 'react-dom';import { clsx } from '../../helper/clsx';+import { isBrowser } from '../../helper/is-browser';export interface ITooltipProps {/**@@ -57,10 +57,10 @@ export interface ITooltipProps {className?: string;}-export function Tooltip({ visible, asChild = false, title, children, placement = 'bottom', showIfEllipsis = false, onVisibleChange, className }: ITooltipProps) {- if (!canUseDom || title === undefined) {- return null;- }+export function Tooltip(props: ITooltipProps) {+ const { visible, asChild = false, title, children, placement = 'bottom', showIfEllipsis = false, onVisibleChange, className } = props;++ if (!isBrowser() || title === undefined) return;const [mounted, setMounted] = useState(false);const [position, setPosition] = useState({ x: 0, y: 0 });diff --git a/packages/design/src/helper/clsx.tsx b/packages/design/src/helper/clsx.tsxindex 08ea41258f..4d6869f29c 100644--- a/packages/design/src/helper/clsx.tsx+++ b/packages/design/src/helper/clsx.tsx@@ -14,7 +14,9 @@* limitations under the License.*/-import { type ClassValue, clsx as cn } from 'clsx';+/* eslint-disable no-restricted-imports */+import type { ClassValue } from 'clsx';+import { clsx as cn } from 'clsx';import { twMerge } from 'tailwind-merge';export function clsx(...inputs: ClassValue[]) {diff --git a/packages/sheets-ui/src/views/operate-container/OperateContainer.tsx b/packages/design/src/helper/is-browser.tssimilarity index 69%rename from packages/sheets-ui/src/views/operate-container/OperateContainer.tsxrename to packages/design/src/helper/is-browser.tsindex aa298c788b..bbe63c59d7 100644--- a/packages/sheets-ui/src/views/operate-container/OperateContainer.tsx+++ b/packages/design/src/helper/is-browser.ts@@ -14,13 +14,6 @@* limitations under the License.*/-import React from 'react';--import { AutoFillPopupMenu } from './AutoFillPopupMenu';-import styles from './index.module.less';--export const OperateContainer: React.FC = () => (- <div className={styles.operateContainer}>- <AutoFillPopupMenu />- </div>-);+export function isBrowser() {+ return typeof window !== 'undefined' && typeof document !== 'undefined';+}diff --git a/packages/design/src/utils/render.ts b/packages/design/src/helper/react-dom.tssimilarity index 100%rename from packages/design/src/utils/render.tsrename to packages/design/src/helper/react-dom.tsdiff --git a/packages/design/src/index.ts b/packages/design/src/index.tsindex d05ebeb660..0b8ec8b264 100644--- a/packages/design/src/index.ts+++ b/packages/design/src/index.ts@@ -40,7 +40,7 @@ export { type IRadioGroupProps, RadioGroup } from './components/radio-group';export { type IScrollbarProps, Scrollbar } from './components/scrollbar';export { type ISelectProps, Select } from './components/select';export { type ISelectListProps, SelectList } from './components/select-list';-export { type ISegmentedProps, Segmented } from './components/segmented';+export { Segmented } from './components/segmented';export { type ITooltipProps, Tooltip } from './components/tooltip';export { filterLeafNode, findNodePathFromTree, findSubTreeFromPath, type ITreeNodeProps, type ITreeProps, mergeTreeSelected, Tree, TreeSelectionMode } from './components/tree';export { Switch } from './components/switch';@@ -49,4 +49,6 @@ export { defaultTheme, greenTheme, themeInstance } from './themes';export { DraggableList, type IDraggableListProps } from './components/draggable-list';export { clsx } from './helper/clsx';export { resizeObserverCtor } from './helper/resize-observer';-export { render, unmount } from './utils/render';+export { render, unmount } from './helper/react-dom';+export { isBrowser } from './helper/is-browser';+export { DropdownMenu, type IDropdownProps } from './components/dropdown-menu';diff --git a/packages/design/src/themes/theme.ts b/packages/design/src/themes/theme.tsindex 0b8681bd33..f64e4b9588 100644--- a/packages/design/src/themes/theme.ts+++ b/packages/design/src/themes/theme.ts@@ -14,8 +14,7 @@* limitations under the License.*/-import canUseDom from 'rc-util/lib/Dom/canUseDom';-+import { isBrowser } from '../helper/is-browser';import styles from './theme-root.module.less';function convertToDashCase(input: string): string {@@ -43,7 +42,7 @@ class Theme {private _themeRootName = styles.theme;private constructor() {- if (!canUseDom()) return;+ if (!isBrowser()) return;const $style = document.createElement('style');$style.id = this._themeRootName;diff --git a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsxindex 2f208c9616..321e9f8f78 100644--- a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx+++ b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx@@ -16,11 +16,10 @@import type { IDrawingSearch } from '@univerjs/core';import { ICommandService, LocaleService } from '@univerjs/core';-import { clsx, Dropdown } from '@univerjs/design';+import { clsx, DropdownMenu } from '@univerjs/design';import { Autofill, MoreDownSingle } from '@univerjs/icons';import { useDependency } from '@univerjs/ui';import React, { useState } from 'react';-import styles from './index.module.less';export interface IImagePopupMenuItem {label: string;@@ -41,11 +40,11 @@ export interface IImagePopupMenuProps {}export const ImagePopupMenu: React.FC<IImagePopupMenuProps> = (props: IImagePopupMenuProps) => {- const menuItems = props.popup?.extraProps?.menuItems;+ const { popup } = props;- if (!menuItems) {- return null;- }+ const menuItems = popup?.extraProps?.menuItems;++ if (!menuItems) return null;const commandService = useDependency(ICommandService);const localeService = useDependency(LocaleService);@@ -79,40 +78,33 @@ export const ImagePopupMenu: React.FC<IImagePopupMenuProps> = (props: IImagePopuonMouseEnter={handleMouseEnter}onMouseLeave={handleMouseLeave}>- <Dropdown+ <DropdownMenualign="start"- overlay={(- <ul- className={clsx(styles.imagePopupMenu, `- univer-box-border univer-p-2 univer-text-sm univer-theme- `)}- >- {availableMenu.map((item) => (- <li- key={item.index}- onClick={() => handleClick(item)}- className={styles.imagePopupMenuItem}- >- <span className={styles.imagePopupMenuItemTitle}>{localeService.t(item.label)}</span>- </li>- ))}- </ul>- )}+ items={availableMenu.map((item) => ({+ type: 'item',+ children: localeService.t(item.label),+ onSelect: () => handleClick(item),+ }))}open={visible}onOpenChange={onVisibleChange}><div- className={clsx(styles.btnContainer, {- [styles.btnContainerExpand]: visible,+ className={clsx(`+ univer-flex univer-items-center univer-gap-2 univer-rounded univer-border univer-border-solid+ univer-border-gray-200 univer-p-1+ hover:univer-bg-gray-100+ `, {+ 'univer-bg-gray-100': visible,+ 'univer-bg-white': !visible,})}><Autofillstyle={{ color: '#35322B' }}extend={{ colorChannel1: 'rgb(var(--green-700, #409f11))' }}/>- {showMore && <MoreDownSingle style={{ color: '#CCCCCC', fontSize: '8px', marginLeft: '8px' }} />}+ {showMore && <MoreDownSingle className="univer-text-[10px] univer-text-gray-400" />}</div>- </Dropdown>+ </DropdownMenu></div>);};diff --git a/packages/drawing-ui/src/views/image-popup-menu/index.module.less b/packages/drawing-ui/src/views/image-popup-menu/index.module.lessdeleted file mode 100644index 2a10a9ef3d..0000000000--- a/packages/drawing-ui/src/views/image-popup-menu/index.module.less+++ /dev/null@@ -1,84 +0,0 @@-.image-popup-menu {- display: grid;- gap: var(--margin-xxs);- align-items: center;-- box-sizing: border-box;-- margin-top: 0;- margin-bottom: 0;- padding: var(--padding-sm);-- li {- list-style: none;- }-- &-item {- cursor: pointer;-- position: relative;-- display: flex;- align-items: center;-- box-sizing: border-box;- height: 28px;-- font-style: normal;- line-height: 20px; /* 153.846% */- text-align: left;-- border-radius: 4px;- border-radius: var(--border-radius-base);-- transition: background 0.2s;-- &:hover {- background-color: rgb(var(--bg-color-hover));- }-- &-icon {- position: absolute;- top: 50%;- left: var(--padding-xs);- transform: translateY(-50%);-- display: flex;- align-items: center;- justify-content: center;- }-- &-title {- padding: var(--padding-xs) var(--padding-xs) var(--padding-xs) 0;- vertical-align: middle;- }-- &-hide {- color: rgb(var(--text-color-secondary));- }-- &:hover {- background: rgb(var(--grey-100));- }- }-}--.btn-container {- display: flex;- align-items: center;- justify-content: center;-- padding: 3px;-- background: white;- border: 1px solid rgb(var(--grey-200, #e5e5e5));- border-radius: 4px;-- &:hover {- background: rgb(var(--grey-100, #f5f5f5));- }-- &.btn-container-expand {- background: rgb(var(--grey-100, #f5f5f5));- }-}diff --git a/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.tsx b/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.tsxindex d79d88562e..872ad8e5cd 100644--- a/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.tsx+++ b/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.tsx@@ -14,7 +14,6 @@* limitations under the License.*/-import type { ISegmentedProps } from '@univerjs/design';import type { ByConditionsModel, ByValuesModel } from '../../services/sheets-filter-panel.service';import { ICommandService, LocaleService } from '@univerjs/core';import { Button, Segmented } from '@univerjs/design';@@ -43,7 +42,7 @@ export function FilterPanel() {const filterBy = useObservable(sheetsFilterPanelService.filterBy$, undefined, true);const filterByModel = useObservable(sheetsFilterPanelService.filterByModel$, undefined, false);const canApply = useObservable(() => filterByModel?.canApply$ || of(false), undefined, false, [filterByModel]);- const options = useFilterByOptions(localeService);+ const items = useFilterByOptions(localeService);// only can disable clear when there is no criteriaconst clearFilterDisabled = !useObservable(sheetsFilterPanelService.hasCriteria$);@@ -78,7 +77,11 @@ export function FilterPanel() {sharedProps={{ range, colIndex, onClose: onCancel }}/><div className={styles.sheetsFilterPanelHeader}>- <Segmented value={filterBy} options={options} onChange={(value) => onFilterByTypeChange(value as FilterBy)} />+ <Segmented+ value={filterBy}+ items={items}+ onChange={(value) => onFilterByTypeChange(value as FilterBy)}+ /></div>{filterByModel? (@@ -102,12 +105,11 @@ export function FilterPanel() {);}-function useFilterByOptions(localeService: LocaleService): ISegmentedProps['options'] {+function useFilterByOptions(localeService: LocaleService) {const locale = localeService.getCurrentLocale();return useMemo(() => [{ label: localeService.t('sheets-filter.panel.by-values'), value: FilterBy.VALUES },{ label: localeService.t('sheets-filter.panel.by-conditions'), value: FilterBy.CONDITIONS },],- // eslint-disable-next-line react-hooks/exhaustive-deps[locale, localeService]);}diff --git a/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx b/packages/sheets-sort-ui/src/views/CustomSortPanel.tsxindex c1e53baac9..41ad5d4c8f 100644--- a/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx+++ b/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx@@ -17,11 +17,11 @@import type { IRange, Nullable } from '@univerjs/core';import type { IOrderRule } from '@univerjs/sheets-sort';import { LocaleService, LocaleType, throttle } from '@univerjs/core';-import { Button, Checkbox, DraggableList, DropdownLegacy, Radio, RadioGroup } from '@univerjs/design';+import { Button, Checkbox, clsx, DraggableList, Dropdown, Radio, RadioGroup } from '@univerjs/design';import { CheckMarkSingle, DeleteEmptySingle, IncreaseSingle, MoreDownSingle, SequenceSingle } from '@univerjs/icons';import { SheetsSortService, SortType } from '@univerjs/sheets-sort';import { useDependency } from '@univerjs/ui';-import React, { useCallback, useEffect, useRef, useState } from 'react';+import { useCallback, useEffect, useRef, useState } from 'react';import { SheetsSortUIService } from '../services/sheets-sort-ui.service';import styles from './index.module.less';@@ -206,13 +206,10 @@ export function SortOptionItem(props: ISortOptionItemProps) {<SequenceSingle /></div><div className={styles.customSortPanelItemColumn}>- <DropdownLegacy- placement="bottomLeft"- trigger={['click']}- visible={visible}- onVisibleChange={onVisibleChange}+ <Dropdown+ align="start"overlay={(- <ul className={styles.customSortColMenu}>+ <ul className={clsx(styles.customSortColMenu, 'univer-theme')}>{availableMenu.map((menuItem) => (<likey={menuItem.index}@@ -231,12 +228,14 @@ export function SortOptionItem(props: ISortOptionItemProps) {))}</ul>)}+ open={visible}+ onOpenChange={onVisibleChange}><div className={styles.customSortPanelItemColumnInput}><span className={styles.customSortPanelItemColumnInputText}>{itemLabel}</span><MoreDownSingle className={styles.customSortPanelItemColumnInputDropdown} /></div>- </DropdownLegacy>+ </Dropdown></div></div><div className={styles.customSortPanelItemOrder}>diff --git a/packages/sheets-ui/src/views/operate-container/AutoFillPopupMenu.tsx b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsxsimilarity index 76%rename from packages/sheets-ui/src/views/operate-container/AutoFillPopupMenu.tsxrename to packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsxindex 9f0fdd05ed..700c06e8f7 100644--- a/packages/sheets-ui/src/views/operate-container/AutoFillPopupMenu.tsx+++ b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx@@ -16,9 +16,9 @@import type { ICommandInfo, IExecutionOptions } from '@univerjs/core';import { ICommandService, IUniverInstanceService, LocaleService, toDisposable } from '@univerjs/core';-import { clsx, Dropdown } from '@univerjs/design';+import { clsx, DropdownMenu } from '@univerjs/design';import { convertTransformToOffsetX, convertTransformToOffsetY, IRenderManagerService } from '@univerjs/engine-render';-import { Autofill, CheckMarkSingle, MoreDownSingle } from '@univerjs/icons';+import { Autofill, MoreDownSingle } from '@univerjs/icons';import { useDependency } from '@univerjs/ui';import React, { useCallback, useEffect, useMemo, useState } from 'react';import { RefillCommand } from '../../commands/commands/refill.command';@@ -29,7 +29,6 @@ import { IAutoFillService } from '../../services/auto-fill/auto-fill.service';import { APPLY_TYPE } from '../../services/auto-fill/type';import { ISheetSelectionRenderService } from '../../services/selection/base-selection-render.service';import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';-import styles from './index.module.less';export interface IAnchorPoint {row: number;@@ -38,7 +37,7 @@ export interface IAnchorPoint {export interface IAutoFillPopupMenuItem {label: string;- value?: APPLY_TYPE;+ value: APPLY_TYPE;index: number;disable: boolean;}@@ -180,51 +179,41 @@ export const AutoFillPopupMenu: React.FC<{}> = () => {const availableMenu = menu.filter((item) => !item.disable);return (- <div- onMouseEnter={handleMouseEnter}- onMouseLeave={handleMouseLeave}- style={{ left: `${relativeX + 2}px`, top: `${relativeY + 2}px`, position: 'absolute' }}- >- <Dropdown- align="start"- overlay={(- <ul- className={`- univer-rounded-lg univer-p-2 univer-theme univer-m-0 univer-box-border univer-grid- univer-list-none univer-gap-1- `}- >- {availableMenu.map((item) => (- <li- key={item.index}- className={styles.autoFillPopupMenuItem}- onClick={() => handleClick(item)}- >- <span className={styles.autoFillPopupMenuItemIcon}>- {item.value === selected && (- <CheckMarkSingle style={{ color: 'rgb(var(--green-700, #409f11))' }} />- )}- </span>- <span className={styles.autoFillPopupMenuItemTitle}>{localeService.t(item.label)}</span>- </li>- ))}- </ul>- )}- open={visible}- onOpenChange={onVisibleChange}+ <div className="univer-absolute univer-inset-0 univer-z-10 univer-size-0">+ <div+ style={{ left: `${relativeX + 2}px`, top: `${relativeY + 2}px`, position: 'absolute' }}+ onMouseEnter={handleMouseEnter}+ onMouseLeave={handleMouseLeave}>- <div- className={clsx(styles.btnContainer, {- [styles.btnContainerExpand]: visible,- })}+ <DropdownMenu+ align="start"+ items={availableMenu.map((item) => ({+ type: 'radio',+ value: selected,+ options: [{ label: localeService.t(item.label), value: item.value }],+ onSelect: () => handleClick(item),+ }))}+ open={visible}+ onOpenChange={onVisibleChange}>- <Autofill- style={{ color: '#35322B' }}- extend={{ colorChannel1: 'rgb(var(--green-700, #409f11))' }}- />- {showMore && <MoreDownSingle style={{ color: '#CCCCCC', fontSize: '8px', marginLeft: '8px' }} />}- </div>- </Dropdown>+ <div+ className={clsx(`+ univer-flex univer-items-center univer-gap-2 univer-rounded univer-border univer-border-solid+ univer-border-gray-200 univer-p-1+ hover:univer-bg-gray-100+ `, {+ 'univer-bg-gray-100': visible,+ 'univer-bg-white': !visible,+ })}+ >+ <Autofill+ style={{ color: '#35322B' }}+ extend={{ colorChannel1: 'rgb(var(--green-700, #409f11))' }}+ />+ {showMore && <MoreDownSingle className="univer-text-[10px] univer-text-gray-400" />}+ </div>+ </DropdownMenu>+ </div></div>);};diff --git a/packages/sheets-ui/src/views/operate-container/index.module.less b/packages/sheets-ui/src/views/operate-container/index.module.lessdeleted file mode 100644index 7f256e23e9..0000000000--- a/packages/sheets-ui/src/views/operate-container/index.module.less+++ /dev/null@@ -1,85 +0,0 @@-.operate-container {- position: absolute;- z-index: 10;- right: 0;- left: 0;-- width: 0;- height: 0;-}-@item-padding-left: 24px;--.auto-fill-popup-menu {- &-item {- cursor: pointer;-- position: relative;-- display: flex;- align-items: center;-- box-sizing: border-box;- height: 28px;- padding: var(--padding-xs) 0 var(--padding-xs) @item-padding-left;-- font-size: 13px;- font-weight: 400;- font-style: normal;- line-height: 20px; /* 153.846% */- color: rgb(var(--black, #35322b));- text-align: left;-- border-radius: 4px;- border-radius: var(--border-radius-base);-- transition: background 0.2s;-- &:hover {- background-color: rgb(var(--bg-color-hover));- }-- &-icon {- position: absolute;- top: 50%;- left: var(--padding-xs);- transform: translateY(-50%);-- display: flex;- align-items: center;- justify-content: center;- }-- &-title {- padding: var(--padding-xs) var(--padding-xs) var(--padding-xs) 0;- vertical-align: middle;- }-- &-hide {- color: rgb(var(--text-color-secondary));- }-- &:hover {- background: rgb(var(--grey-100));- }- }-}--.btn-container {- display: flex;- align-items: center;- justify-content: center;-- padding: 3px;-- background: white;- border: 1px solid rgb(var(--grey-200, #e5e5e5));- border-radius: 4px;-- &:hover {- background: rgb(var(--grey-100, #f5f5f5));- }-- &.btn-container-expand {- background: rgb(var(--grey-100, #f5f5f5));- }-}diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-button/SheetBarButton.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-button/SheetBarButton.tsxindex 8ef02e1735..bf4c8e0d39 100644--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-button/SheetBarButton.tsx+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-button/SheetBarButton.tsx@@ -53,7 +53,14 @@ export function SheetBarButton(props: IBaseSheetBarButtonProps) {};return (- <button className={styles.sheetBarBtn} style={style} disabled={disabled} onClick={handleClick} {...restProps}>+ <button+ type="button"+ className={styles.sheetBarBtn}+ style={style}+ disabled={disabled}+ onClick={handleClick}+ {...restProps}+ >{children}</button>);diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsxindex 020692c854..9fda70c252 100644--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx@@ -15,8 +15,9 @@*/import type { ICommandInfo, Workbook } from '@univerjs/core';+import type { IDropdownProps } from '@univerjs/design';import { BooleanNumber, DisposableCollection, ICommandService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';-import { DropdownLegacy } from '@univerjs/design';+import { clsx, DropdownMenu } from '@univerjs/design';import { CheckMarkSingle, ConvertSingle, EyelashSingle } from '@univerjs/icons';import {InsertSheetMutation,@@ -30,11 +31,10 @@ import {WorksheetProtectionRuleModel,} from '@univerjs/sheets';import { useDependency, useObservable } from '@univerjs/ui';-import React, { useCallback, useEffect, useState } from 'react';+import React, { useCallback, useEffect, useMemo, useState } from 'react';import { ISheetBarService } from '../../../services/sheet-bar/sheet-bar.service';import { SheetBarButton } from '../sheet-bar-button/SheetBarButton';-import styles from './index.module.less';export interface ISheetBarMenuItem {label?: React.ReactNode;@@ -44,14 +44,7 @@ export interface ISheetBarMenuItem {sheetId?: string;}-export interface ISheetBarMenuProps {- style?: React.CSSProperties;- onClick?: (e?: MouseEvent) => void;-}--export function SheetBarMenu(props: ISheetBarMenuProps) {- const { style } = props;-+export function SheetBarMenu() {const [menu, setMenu] = useState<ISheetBarMenuItem[]>([]);const [visible, setVisible] = useState(false);@@ -97,7 +90,6 @@ export function SheetBarMenu(props: ISheetBarMenuProps) {});setMenu(worksheetMenuItems);- // eslint-disable-next-line react-hooks/exhaustive-deps}, [workbook, worksheetProtectionRuleModel]);const setupStatusUpdate = useCallback(() =>@@ -134,48 +126,43 @@ export function SheetBarMenu(props: ISheetBarMenuProps) {return () => disposables.dispose();}, [setupStatusUpdate, sheetBarService, statusInit, workbook]);+ const items: IDropdownProps['items'] = useMemo(() => menu.map((item) => ({+ type: 'item',+ children: (+ <div className="univer-pl-6 univer-box-border univer-relative">+ {(item.selected || item.hidden) && (+ <span className="univer-absolute univer-left-1 univer-top-0.5">+ {item.selected && <CheckMarkSingle className="univer-text-primary-600 univer-size-4" />}+ {item.hidden && <EyelashSingle className="univer-text-gray-400 univer-size-4" />}+ </span>+ )}++ <span+ className={clsx({+ 'univer-text-primary-600': item.selected,+ })}+ >+ {item.label}+ </span>+ </div>+ ),+ onSelect: () => {+ handleClick(item);+ },+ })), [menu]);+return (- <DropdownLegacy- placement="topLeft"- trigger={['click']}- overlay={(- <ul className={styles.sheetBarMenu} style={{ ...style }}>- {menu.map((item) => (- <li- key={item.index}- onClick={() => handleClick(item)}- className={item.selected- ? `- ${styles.sheetBarMenuItem}- ${styles.sheetBarMenuItemSelect}- `- : item.hidden- ? `- ${styles.sheetBarMenuItem}- ${styles.sheetBarMenuItemHide}- `- : styles.sheetBarMenuItem}- >- <span className={styles.sheetBarMenuItemIcon}>- {item.selected- ? <CheckMarkSingle />- : item.hidden- ? <EyelashSingle />- : <CheckMarkSingle />}- </span>- <div className={styles.sheetBarMenuItemLabel}>{item.label}</div>- </li>- ))}- </ul>- )}- visible={visible}- onVisibleChange={onVisibleChange}+ <DropdownMenu+ align="start"+ items={items}+ open={visible}+ onOpenChange={onVisibleChange}><div><SheetBarButton><ConvertSingle /></SheetBarButton></div>- </DropdownLegacy>+ </DropdownMenu>);}diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/index.module.less b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/index.module.lessdeleted file mode 100644index 23e54160cc..0000000000--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/index.module.less+++ /dev/null@@ -1,88 +0,0 @@-@padding-left-right: 24px;-@line-height: 20px;--.sheet-bar-menu {- max-height: calc(100vh - 36px);- display: grid;- gap: var(--margin-xxs);- align-items: center;- overflow-y: auto;-- box-sizing: border-box;- margin: 0;- padding: var(--padding-sm);-- background-color: rgb(var(--bg-color-secondary));- border: 1px solid rgb(var(--border-color));- border-radius: var(--border-radius-lg);- box-shadow: var(--box-shadow-lg);-- li {- list-style: none;- }-- &-item {- cursor: pointer;-- position: relative;-- display: flex;-- box-sizing: border-box;- padding: var(--padding-xs) @padding-left-right;-- color: rgb(var(--text-color));-- border-radius: var(--border-radius-base);-- transition: background 0.2s;-- &:hover {- background-color: rgb(var(--bg-color-hover));- }-- &-icon {- position: absolute;- top: 50%;- left: var(--margin-xxs);- transform: translateY(-50%);-- color: transparent;- }-- &-hide &-icon {- display: flex;- align-items: center;- justify-content: center;-- width: 16px;- height: 16px;-- color: rgb(var(--grey-400));- }-- &-select {- font-weight: 500;- color: rgb(var(--primary-color));- }-- &-select &-icon {- display: flex;- align-items: center;- justify-content: center;-- width: 16px;- height: 16px;-- color: rgb(var(--primary-color));- }-- &-label {- font-size: var(--font-size-xs);- font-weight: 400;- line-height: @line-height;- display: flex;- align-items: center;- }- }-}diff --git a/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx b/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsxindex e92d5603c0..e0ac89cf24 100644--- a/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx+++ b/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx@@ -19,10 +19,10 @@ import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { ContextMenuPosition, IMenuManagerService, ToolbarItem, useDependency, useObservable } from '@univerjs/ui';import { useMemo } from 'react';import { useActiveWorkbook } from '../../components/hook';+import { AutoFillPopupMenu } from '../auto-fill-popup-menu/AutoFillPopupMenu';import { CountBar } from '../count-bar/CountBar';import { EditorContainer } from '../editor-container/EditorContainer';import { FormulaBar } from '../formula-bar/FormulaBar';-import { OperateContainer } from '../operate-container/OperateContainer';import { SheetBar } from '../sheet-bar/SheetBar';import { StatusBar } from '../status-bar/StatusBar';@@ -88,7 +88,7 @@ export function RenderSheetContent() {return (<><EditorContainer />- <OperateContainer />+ <AutoFillPopupMenu /></>);}@@ -99,7 +99,7 @@ function useHasWorkbook(): boolean {const hasWorkbook = !!workbook;return useMemo(() => univerInstanceService.getAllUnitsForType(UniverInstanceType.UNIVER_SHEET).length > 0,- // eslint-disable-next-line react-hooks/exhaustive-deps+[univerInstanceService, hasWorkbook]);}diff --git a/packages/ui/package.json b/packages/ui/package.jsonindex db9e9ecbd7..32727ec8af 100644--- a/packages/ui/package.json+++ b/packages/ui/package.json@@ -82,8 +82,7 @@"@wendellhu/redi": "0.17.1","clsx": "^2.1.1","localforage": "^1.10.0",- "rc-notification": "^5.6.2",- "rc-util": "^5.43.0"+ "rc-notification": "^5.6.2"},"optionalDependencies": {"vue": ">=3.0.0"@@ -97,6 +96,7 @@"react-dom": "18.3.1","rxjs": "^7.8.1","tailwindcss": "^3.4.17",+ "tailwindcss-animate": "^1.0.7","typescript": "^5.7.3","vite": "^6.1.1","vitest": "^3.0.6",diff --git a/packages/ui/src/components/hooks/layout.ts b/packages/ui/src/components/hooks/layout.tsindex e7bec4cfed..1e2a950099 100644--- a/packages/ui/src/components/hooks/layout.ts+++ b/packages/ui/src/components/hooks/layout.ts@@ -15,11 +15,10 @@*/import type { Nullable } from '@univerjs/core';-import { resizeObserverCtor } from '@univerjs/design';--import canUseDom from 'rc-util/lib/Dom/canUseDom';+import { isBrowser, resizeObserverCtor } from '@univerjs/design';import { useEffect } from 'react';import { useEvent } from './event';+/*** These hooks are used for browser layout* Prefer to client-side@@ -60,9 +59,8 @@ export function useScrollYOverContainer(element: Nullable<HTMLElement>, containe});useEffect(() => {- if (!canUseDom() || !element || !container) {- return;- }+ if (!isBrowser() || !element || !container) return;+updater();const resizeObserver = resizeObserverCtor(updater);diff --git a/packages/ui/src/components/slider/Slider.tsx b/packages/ui/src/components/slider/Slider.tsxindex b48e57231d..fc39ef4ca2 100644--- a/packages/ui/src/components/slider/Slider.tsx+++ b/packages/ui/src/components/slider/Slider.tsx@@ -14,9 +14,10 @@* limitations under the License.*/+import type { IDropdownProps } from '@univerjs/design';import { LocaleService } from '@univerjs/core';-import { Button, clsx, Dropdown, Tooltip } from '@univerjs/design';-import { CheckMarkSingle, IncreaseSingle, ReduceSingle } from '@univerjs/icons';+import { Button, clsx, DropdownMenu, Tooltip } from '@univerjs/design';+import { IncreaseSingle, ReduceSingle } from '@univerjs/icons';import { useDependency } from '@wendellhu/redi/react-bindings';import React, { useMemo, useRef, useState } from 'react';import styles from './index.module.less';@@ -50,7 +51,7 @@ export interface ISliderProps {resetPoint?: number;/** Shortcuts of slider */- shortcuts?: number[];+ shortcuts: number[];/** (value) => void */onChange?: (value: number) => void;@@ -150,6 +151,13 @@ export function Slider(props: ISliderProps) {onChange && onChange(value);}+ const items: IDropdownProps['items'] = [{+ type: 'radio',+ value: value.toString(),+ options: shortcuts.map((item) => ({ value: item.toString(), label: `${item}%` })),+ onSelect: (value: string) => handleSelectZoomLevel(+value),+ }];+return (<divclassName={clsx(styles.slider, {@@ -190,45 +198,9 @@ export function Slider(props: ISliderProps) {<IncreaseSingle /></Button>- <Dropdown+ <DropdownMenualign="end"- overlay={(- <div- className={`- univer-box-border univer-grid univer-w-32 univer-items-center univer-gap-1 univer-p-2- univer-text-sm univer-text-gray-800- `}- >- {shortcuts?.map((item) => (- <a- key={item}- className={clsx(`- univer-relative univer-cursor-pointer univer-rounded-md univer-px-2 univer-py-1- univer-text-center univer-transition-colors univer-duration-200- hover:univer-bg-gray-100- `, {- 'univer-bg-gray-100': item === value,- })}- onClick={() => handleSelectZoomLevel(item)}- >- {item === value && (- <span- className={`- univer-absolute univer-left-2 univer-top-0 univer-flex univer-h-full- univer-items-center univer-text-green-500- `}- >- <CheckMarkSingle />- </span>- )}- <span>- {item}- %- </span>- </a>- ))}- </div>- )}+ items={items}open={zoomListVisible}onOpenChange={setZoomListVisible}>@@ -242,7 +214,7 @@ export function Slider(props: ISliderProps) {{value}%</a>- </Dropdown>+ </DropdownMenu></div>);}diff --git a/packages/ui/src/views/components/dom/FloatDom.tsx b/packages/ui/src/views/components/dom/FloatDom.tsxindex c228d764bf..2d9485c11b 100644--- a/packages/ui/src/views/components/dom/FloatDom.tsx+++ b/packages/ui/src/views/components/dom/FloatDom.tsx@@ -21,7 +21,6 @@ import { distinctUntilChanged, first } from 'rxjs';import { ComponentManager } from '../../../common';import { CanvasFloatDomService } from '../../../services/dom/canvas-dom-layer.service';import { useDependency, useObservable } from '../../../utils/di';-import styles from './index.module.less';const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {const { layer, id } = props;@@ -105,7 +104,7 @@ const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {return (<divref={domRef}- className={styles.floatDomWrapper}+ className="univer-z-10"style={{position: 'absolute',top: topRef.current,@@ -132,7 +131,7 @@ const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {<divid={id}ref={innerDomRef}- className={styles.floatDom}+ className="univer-overflow-hidden"style={{ position: 'absolute', ...innerStyle.current }}>{component}diff --git a/packages/ui/src/views/components/dom/index.module.less b/packages/ui/src/views/components/dom/index.module.lessdeleted file mode 100644index cd0722a8fa..0000000000--- a/packages/ui/src/views/components/dom/index.module.less+++ /dev/null@@ -1,7 +0,0 @@-.float-dom-wrapper {- z-index: 10;-}--.float-dom {- overflow: hidden;-}diff --git a/packages/ui/src/views/components/popup/RectPopup.tsx b/packages/ui/src/views/components/popup/RectPopup.tsxindex 767a1fc488..7f306199d9 100644--- a/packages/ui/src/views/components/popup/RectPopup.tsx+++ b/packages/ui/src/views/components/popup/RectPopup.tsx@@ -17,9 +17,9 @@import type { Nullable } from '@univerjs/core';import type { RefObject } from 'react';import type { Observable } from 'rxjs';-import { useEvent } from 'rc-util';import React, { createContext, useContext, useEffect, useRef } from 'react';import { createPortal } from 'react-dom';+import { useEvent } from '../../../components/hooks/event';import styles from './index.module.less';interface IAbsolutePosition {diff --git a/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx b/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsxindex 02e93a46da..1a7f2c3786 100644--- a/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx+++ b/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx@@ -14,10 +14,7 @@* limitations under the License.*/-import clsx from 'clsx';-import React from 'react';--import styles from './index.module.less';+import { clsx } from '@univerjs/design';export interface IBaseToolbarButtonProps {children?: React.ReactNode;@@ -86,23 +83,21 @@ export function ToolbarButton(props: IBaseToolbarButtonProps) {onDoubleClick && onDoubleClick(e);};- const _className = clsx(- styles.toolbarBtn,- {- [`- ${styles.toolbarBtnActive}- `]: active,- [`- ${styles.toolbarBtnNoIcon}- `]: noIcon,- },- className- );-return (<buttontype="button"- className={_className}+ className={clsx(`+ univer-flex univer-h-6 univer-min-w-6 univer-cursor-pointer univer-items-center univer-justify-center+ univer-rounded univer-border-none univer-bg-transparent univer-p-0 univer-text-base univer-text-gray-900+ univer-outline-none+ [&:disabled]:univer-cursor-not-allowed [&:disabled]:univer-text-gray-200+ [&:disabled]:hover:univer-bg-transparent+ hover:univer-bg-gray-100+ `, {+ 'univer-p-4': noIcon,+ '!univer-bg-gray-200': active,+ 'univer-text-gray-100': disabled,+ })}style={style}disabled={disabled}onClick={handleClick}diff --git a/packages/ui/src/views/components/ribbon/Button/index.module.less b/packages/ui/src/views/components/ribbon/Button/index.module.lessdeleted file mode 100644index 1df1c24e5a..0000000000--- a/packages/ui/src/views/components/ribbon/Button/index.module.less+++ /dev/null@@ -1,41 +0,0 @@-@toolbar-btn-size: 24px;--.toolbar-btn {- cursor: pointer;-- display: flex;- align-items: center;- justify-content: center;-- min-width: @toolbar-btn-size;- height: @toolbar-btn-size;- padding: 0;-- font-size: var(--font-size-lg);- color: rgb(var(--text-color));-- background-color: transparent;- border: none;- border-radius: var(--border-radius-base);- outline: none;-- &:not([disabled]):hover {- background-color: rgb(var(--grey-100));- }-- &[disabled] {- cursor: not-allowed;- color: rgb(var(--grey-200));- }-- &-no-icon {- padding: var(--padding-xs);- }-- &-active {- background-color: rgb(var(--grey-100));- &[disabled] {- color: rgba(var(--text-color), 0.25);- }- }-}diff --git a/packages/ui/src/views/components/ribbon/Ribbon.tsx b/packages/ui/src/views/components/ribbon/Ribbon.tsxindex 40f66abdff..aa5d69be0b 100644--- a/packages/ui/src/views/components/ribbon/Ribbon.tsx+++ b/packages/ui/src/views/components/ribbon/Ribbon.tsx@@ -152,8 +152,8 @@ export function Ribbon(props: IRibbonProps) {<header className="univer-relative univer-select-none"><divclassName={clsx(`- univer-animate-in univer-flex univer-h-0 univer-items-center univer-justify-center univer-gap-2- univer-overflow-hidden univer-transition-all+ univer-flex univer-h-0 univer-items-center univer-justify-center univer-gap-2+ univer-overflow-hidden univer-transition-all univer-animate-in`, {'univer-h-8 univer-slide-in-from-top-full': ribbon.length > 1 || (headerMenuComponents && headerMenuComponents.size > 0),})}diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsxindex cfa65f4946..534a454682 100644--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx@@ -19,7 +19,7 @@ import type { ITooltipWrapperRef } from './TooltipButtonWrapper';import { ICommandService, LocaleService } from '@univerjs/core';import { MoreDownSingle } from '@univerjs/icons';import clsx from 'clsx';-import React, { forwardRef, useMemo } from 'react';+import { forwardRef, useMemo } from 'react';import { isObservable, Observable } from 'rxjs';import { ComponentManager } from '../../../common/component-manager';import { CustomLabel } from '../../../components/custom-label/CustomLabel';@@ -45,7 +45,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenucommandService.executeCommand(commandId, params);};- const { tooltip, shortcut, icon, title, label, id, commandId } = props;+ const { tooltip, shortcut, icon, title, label, id, commandId, type } = props;const tooltipTitle = localeService.t(tooltip ?? '') + (shortcut ? ` (${shortcut})` : '');@@ -224,11 +224,11 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu}function renderItem() {- switch (props.type) {+ switch (type) {case MenuItemType.BUTTON_SELECTOR:case MenuItemType.SELECTOR:case MenuItemType.SUBITEMS:- return renderSelectorType(props.type);+ return renderSelectorType(type);case MenuItemType.BUTTON:default:return renderButtonType();diff --git a/packages/ui/src/views/components/zen-zone/ZenZone.tsx b/packages/ui/src/views/components/zen-zone/ZenZone.tsxindex 620696c6fe..5ae628d9d4 100644--- a/packages/ui/src/views/components/zen-zone/ZenZone.tsx+++ b/packages/ui/src/views/components/zen-zone/ZenZone.tsx@@ -20,7 +20,6 @@ import React, { useEffect, useMemo, useState } from 'react';import { ComponentManager } from '../../../common/component-manager';import { IZenZoneService } from '../../../services/zen-zone/zen-zone.service';import { useDependency, useObservable } from '../../../utils/di';-import styles from './index.module.less';export function ZenZone() {const zenZoneService = useDependency(IZenZoneService);@@ -47,8 +46,6 @@ export function ZenZone() {};}, []);- const _className = clsx(styles.zenZone, visible ? styles.zenZoneOpen : styles.zenZoneClose);-const Component = useMemo(() => {const Component = componentManager.get(componentKey ?? '');if (Component) {@@ -57,8 +54,13 @@ export function ZenZone() {}, [componentKey]);return (- <section style={hidden ? { opacity: 0, zIndex: -1 } : undefined} className={_className}>- <div className={styles.zenZoneEditorContainer}>+ <section+ className={clsx('univer-absolute univer-z-[-1] univer-flex', {+ 'univer-inset-0 univer-z-[100] univer-bg-gray-100 univer-animate-in univer-fade-in': visible,+ 'univer-hidden': hidden,+ })}+ >+ <div className="univer-relative univer-flex-1">{Component && <Component />}</div></section>diff --git a/packages/ui/src/views/components/zen-zone/index.module.less b/packages/ui/src/views/components/zen-zone/index.module.lessdeleted file mode 100644index ae13e4e5f6..0000000000--- a/packages/ui/src/views/components/zen-zone/index.module.less+++ /dev/null@@ -1,28 +0,0 @@-.zen-zone {- position: absolute;- z-index: -1;- transition: all 0.2s ease-in-out;- display: flex;- flex-direction: row;-- &-open {- z-index: 100;- top: 0;- left: 0;-- width: 100%;- height: 100%;-- background: rgb(var(--bg-color));- opacity: 1;- }-- &-close {- opacity: 0;- }-- &-editor-container {- flex: 1;- position: relative;- }-}diff --git a/packages/ui/tailwind.config.ts b/packages/ui/tailwind.config.tsindex 75967f186f..e3af27cc7b 100644--- a/packages/ui/tailwind.config.ts+++ b/packages/ui/tailwind.config.ts@@ -16,12 +16,16 @@import type { Config } from 'tailwindcss';import preset from '@univerjs-infra/shared/tailwind';+import animate from 'tailwindcss-animate';const config: Config = {presets: [preset],content: ['./src/**/*.{js,ts,jsx,tsx}',],+ plugins: [+ animate,+ ],};export default config;diff --git a/packages/watermark/package.json b/packages/watermark/package.jsonindex 4adc933daf..e9142d5b6d 100644--- a/packages/watermark/package.json+++ b/packages/watermark/package.json@@ -74,8 +74,7 @@},"dependencies": {"@univerjs/core": "workspace:*",- "@univerjs/engine-render": "workspace:*",- "clsx": "^2.1.1"+ "@univerjs/engine-render": "workspace:*"},"devDependencies": {"@univerjs-infra/shared": "workspace:*",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 134d47a639..00149335a3 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -144,8 +144,8 @@ importers:specifier: ^4.1.1version: 4.1.1postcss-preset-env:- specifier: ^10.1.4- version: 10.1.4([email protected])+ specifier: ^10.1.5+ version: 10.1.5([email protected])sort-keys:specifier: ^5.1.0version: 5.1.0@@ -162,8 +162,8 @@ importers:specifier: ^4.5.0version: 4.5.0(@types/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))vite-plugin-external:- specifier: ^6.0.0- version: 6.0.0+ specifier: ^6.0.1+ version: 6.0.1vitest:specifier: ^3.0.6version: 3.0.6(@types/[email protected])(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])@@ -591,9 +591,6 @@ importers:'@univerjs/ui':specifier: workspace:*version: link:../../packages/ui- clsx:- specifier: ^2.1.1- version: 2.1.1devDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -652,9 +649,6 @@ importers:'@univerjs/watermark':specifier: workspace:*version: link:../../packages/watermark- clsx:- specifier: ^2.1.1- version: 2.1.1devDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -733,9 +727,6 @@ importers:'@univerjs/uniui':specifier: workspace:*version: link:../uniui- clsx:- specifier: ^2.1.1- version: 2.1.1devDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -764,9 +755,6 @@ importers:'@univerjs/core':specifier: workspace:*version: link:../../packages/core- clsx:- specifier: ^2.1.1- version: 2.1.1devDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -816,9 +804,6 @@ importers:'@univerjs/uni-formula':specifier: workspace:*version: link:../uni-formula- clsx:- specifier: ^2.1.1- version: 2.1.1devDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -877,9 +862,6 @@ importers:'@univerjs/uniui':specifier: workspace:*version: link:../uniui- clsx:- specifier: ^2.1.1- version: 2.1.1devDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -926,9 +908,6 @@ importers:'@univerjs/uniui':specifier: workspace:*version: link:../uniui- clsx:- specifier: ^2.1.1- version: 2.1.1devDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -987,12 +966,6 @@ importers:'@xyflow/react':specifier: ^12.3.5- clsx:- specifier: ^2.1.1- version: 2.1.1- rc-util:- specifier: ^5.43.0devDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -1116,12 +1089,12 @@ importers:packages/design:dependencies:+ '@radix-ui/react-dropdown-menu':+ specifier: ^2.1.6+ version: 2.1.6(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])'@radix-ui/react-popover':specifier: ^1.1.6version: 1.1.6(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])- '@rc-component/color-picker':- specifier: ^2.0.1'@rc-component/trigger':specifier: ^2.2.6@@ -1140,9 +1113,6 @@ importers:rc-dropdown:specifier: ^4.2.1- rc-input:- specifier: ^1.7.1rc-input-number:specifier: ^9.3.0@@ -1152,18 +1122,9 @@ importers:rc-picker:specifier: ^4.9.0- rc-segmented:- specifier: ^2.7.0rc-select:specifier: ^14.16.4- rc-textarea:- specifier: ^1.8.2- rc-util:- specifier: ^5.43.0rc-virtual-list:specifier: ^3.16.1@@ -1177,8 +1138,8 @@ importers:specifier: ^4.4.5tailwind-merge:- specifier: ^2.6.0- version: 2.6.0+ specifier: ^3.0.2+ version: 3.0.2devDependencies:'@testing-library/react':specifier: ^16.2.0@@ -3305,9 +3266,6 @@ importers:rc-notification:specifier: ^5.6.2- rc-util:- specifier: ^5.43.0devDependencies:'@testing-library/react':specifier: ^16.2.0@@ -3333,6 +3291,9 @@ importers:tailwindcss:specifier: ^3.4.17version: 3.4.17+ tailwindcss-animate:+ specifier: ^1.0.7+ version: 1.0.7([email protected])typescript:specifier: ^5.7.3version: 5.7.3@@ -3404,9 +3365,6 @@ importers:'@univerjs/engine-render':specifier: workspace:*version: link:../engine-render- clsx:- specifier: ^2.1.1- version: 2.1.1devDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -3486,10 +3444,6 @@ packages:resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}engines: {node: '>=6.0.0'}- '@ant-design/[email protected]':- resolution: {integrity: sha512-y2217gk4NqL35giHl72o6Zzqji9O7vHh9YmhUVkPtAOpoTCH4uWxo/pr4VE8t0+ChEPs0qo4eJRC5Q1eXWo3vA==}- engines: {node: '>=8.x'}-'@antfu/[email protected]':resolution: {integrity: sha512-x6jcUSkscXb63xEM8JekZlDALtsVETxSc19pu+DuEZjx4iv0J8gThRDMPsIolceTeSnyh9bfW4dlAGcfu2NLzg==}hasBin: true@@ -3817,19 +3771,19 @@ packages:'@csstools/css-parser-algorithms': ^3.0.4'@csstools/css-tokenizer': ^3.0.3- '@csstools/[email protected]':- resolution: {integrity: sha512-MKtmkA0BX87PKaO1NFRTFH+UnkgnmySQOvNxJubsadusqPEC2aJ9MOQiMceZJJ6oitUl/i0L6u0M1IrmAOmgBA==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==}engines: {node: '>=18'}- '@csstools/[email protected]':- resolution: {integrity: sha512-rL7kaUnTkL9K+Cvo2pnCieqNpTKgQzy5f+N+5Iuko9HAoasP+xgprVh7KN/MaJVvVL1l0EzQq2MoqBHKSrDrag==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==}engines: {node: '>=18'}peerDependencies:'@csstools/css-parser-algorithms': ^3.0.4'@csstools/css-tokenizer': ^3.0.3- '@csstools/[email protected]':- resolution: {integrity: sha512-nkMp2mTICw32uE5NN+EsJ4f5N+IGFeCFu4bGpiKgb2Pq/7J/MpyLBeQ5ry4KKtRFZaYs6sTmcMYrSRIyj5DFKA==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==}engines: {node: '>=18'}peerDependencies:'@csstools/css-parser-algorithms': ^3.0.4@@ -3858,14 +3812,14 @@ packages:peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-aDHYmhNIHR6iLw4ElWhf+tRqqaXwKnMl0YsQ/X105Zc4dQwe6yJpMrTN6BwOoESrkDjOYMOfORviSSLeDTJkdQ==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-9dUvP2qpZI6PlGQ/sob+95B3u5u7nkYt9yhZFCC7G9HBRHBxj+QxS/wUlwaMGYW0waf+NIierI8aoDTssEdRYw==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-e68Nev4CxZYCLcrfWhHH4u/N1YocOfTmw67/kVX5Rb7rnguqqLyxPjhHWjSBX8o4bmyuukmNf3wrUSU3//kT7g==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-yuZpgWUzqZWQhEqfvtJufhl28DgO9sBwSbXbf/59gejNuvZcoUTRGQZhzhwF4ccqb53YAGB+u92z9+eSKoB4YA==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -3876,8 +3830,8 @@ packages:peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-IgJA5DQsQLu/upA3HcdvC6xEMR051ufebBTIXZ5E9/9iiaA7juXWz1ceYj814lnDYP/7eWjZnw0grRJlX4eI6g==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-XTb6Mw0v2qXtQYRW9d9duAjDnoTbBpsngD7sRNLmYDjvwU2ebpIHplyxgOeo6jp/Kr52gkLi5VaK5RDCqzMzZQ==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -3888,20 +3842,20 @@ packages:peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-gzFEZPoOkY0HqGdyeBXR3JP218Owr683u7KOZazTK7tQZBE8s2yhg06W1tshOqk7R7SWvw9gkw2TQogKpIW8Xw==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-/K8u9ZyGMGPjmwCSIjgaOLKfic2RIGdFHHes84XW5LnmrvdhOTVxo255NppHi3ROEvoHPW7MplMJgjZK5Q+TxA==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-WgEyBeg6glUeTdS2XT7qeTFBthTJuXlS9GFro/DVomj7W7WMTamAwpoP4oQCq/0Ki2gvfRYFi/uZtmRE14/DFA==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-CoHQ/0UXrvxLovu0ZeW6c3/20hjJ/QRg6lyXm3dZLY/JgvRU6bdbQZF/Du30A4TvowfcgvIHQmP1bNXUxgDrAw==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-LKYqjO+wGwDCfNIEllessCBWfR4MS/sS1WXO+j00KKyOjm7jDW2L6jzUmqASEiv/kkJO39GcoIOvTTfB3yeBUA==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-LpFKjX6hblpeqyych1cKmk+3FJZ19QmaJtqincySoMkbkG/w2tfbnO5oE6mlnCTXcGUJ0rCEuRHvTqKK0nHYUQ==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -3960,8 +3914,8 @@ packages:peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-J1+4Fr2W3pLZsfxkFazK+9kr96LhEYqoeBszLmFjb6AjYs+g9oDAw3J5oQignLKk3rC9XHW+ebPTZ9FaW5u5pg==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-LB6tIP7iBZb5CYv8iRenfBZmbaG3DWNEziOnPjGoQX5P94FBPvvTBy68b/d9NnS5PELKwFmmOYsAEIgEhDPCHA==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -3984,8 +3938,8 @@ packages:peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-I6WFQIbEKG2IO3vhaMGZDkucbCaUSXMxvHNzDdnfsTCF5tc0UlV3Oe2AhamatQoKFjBi75dSEMrgWq3+RegsOQ==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-+5aPsNWgxohXoYNS1f+Ys0x3Qnfehgygv3qrPyv+Y25G0yX54/WlVB+IXprqBLOXHM1gsVF+QQSjlArhygna0Q==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -3996,14 +3950,14 @@ packages:peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-vBCT6JvgdEkvRc91NFoNrLjgGtkLWt47GKT6E2UDn3nd8ZkMBiziQ1Md1OiKoSsgzxsSnGKG3RVdhlbdZEkHjA==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-dbNeEEPHxAwfQJ3duRL5IPpuD77QAHtRl4bAHRs0vOVhVbHrsL7mHnwe0irYjbs9kYwhAHZBQTLBgmvufPuRkA==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-apbT31vsJVd18MabfPOnE977xgct5B1I+Jpf+Munw3n6kKb1MMuUmGGH+PT9Hm/fFs6fe61Q/EWnkrb4bNoNQw==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-eGE31oLnJDoUysDdjS9MLxNZdtqqSxjDXMdISpLh80QMaYrKs7VINpid34tWQ+iU23Wg5x76qAzf1Q/SLLbZVg==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -4014,26 +3968,26 @@ packages:peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-MslYkZCeMQDxetNkfmmQYgKCy4c+w9pPDfgOBCJOo/RI1RveEUdZQYtOfrC6cIZB7sD7/PHr2VGOcMXlZawrnA==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-4EcAvXTUPh7n6UoZZkCzgtCf/wPzMlTNuddcKg7HG8ozfQkUcHsJ2faQKeLmjyKdYPyOUn4YA7yDPf8K/jfIxw==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-/dwlO9w8vfKgiADxpxUbZOWlL5zKoRIsCymYoh1IPuBsXODKanKnfuZRr32DEqT0//3Av1VjfNZU9yhxtEfIeA==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-rdrRCKRnWtj5FyRin0u/gLla7CIvZRw/zMGI1fVJP0Sg/m1WGicjPVHRANL++3HQtsiXKAbPrcPr+VkyGck0IA==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-xPZIikbx6jyzWvhms27uugIc0I4ykH4keRvoa3rxX5K7lEhkbd54rjj/dv60qOCTisoS+3bmwJTeyV1VNBrXaw==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-8XvCRrFNseBSAGxeaVTaNijAu+FzUvjwFXtcrynmazGb/9WUdsPCpBX+mHEHShVRq47Gy4peYAoxYs8ltUnmzA==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4- '@csstools/[email protected]':- resolution: {integrity: sha512-c4Y1D2Why/PeccaSouXnTt6WcNHJkoJRidV2VW9s5gJ97cNxnLgQ4Qj8qOqkIR9VmTQKJyNcbF4hy79ZQnWD7A==}+ '@csstools/[email protected]':+ resolution: {integrity: sha512-qTrZgLju3AV7Djhzuh2Bq/wjFqbcypnk0FhHjxW8DWJQcZLS1HecIus4X2/RLch1ukX7b+YYCdqbEnpIQO5ccg==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -4740,6 +4694,19 @@ packages:'@types/react-dom':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==}+ peerDependencies:+ '@types/react': ^19.0.8+ '@types/react-dom': ^19.0.3+ react: 19.0.0+ react-dom: 19.0.0+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==}peerDependencies:@@ -4758,6 +4725,15 @@ packages:'@types/react':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==}+ peerDependencies:+ '@types/react': ^19.0.8+ react: 19.0.0+ peerDependenciesMeta:+ '@types/react':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==}peerDependencies:@@ -4771,6 +4747,19 @@ packages:'@types/react-dom':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==}+ peerDependencies:+ '@types/react': ^19.0.8+ '@types/react-dom': ^19.0.3+ react: 19.0.0+ react-dom: 19.0.0+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==}peerDependencies:@@ -4802,6 +4791,19 @@ packages:'@types/react':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==}+ peerDependencies:+ '@types/react': ^19.0.8+ '@types/react-dom': ^19.0.3+ react: 19.0.0+ react-dom: 19.0.0+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==}peerDependencies:@@ -4867,6 +4869,19 @@ packages:'@types/react-dom':optional: true+ '@radix-ui/[email protected]':+ resolution: {integrity: sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==}+ peerDependencies:+ '@types/react': ^19.0.8+ '@types/react-dom': ^19.0.3+ react: 19.0.0+ react-dom: 19.0.0+ peerDependenciesMeta:+ '@types/react':+ optional: true+ '@types/react-dom':+ optional: true+'@radix-ui/[email protected]':resolution: {integrity: sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==}peerDependencies:@@ -4933,12 +4948,6 @@ packages:'@radix-ui/[email protected]':resolution: {integrity: sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==}- '@rc-component/[email protected]':- resolution: {integrity: sha512-WcZYwAThV/b2GISQ8F+7650r5ZZJ043E57aVBFkQ+kSY4C6wdofXgB0hBx+GPGpIU0Z81eETNoDUJMr7oy/P8Q==}- peerDependencies:- react: 19.0.0- react-dom: 19.0.0-'@rc-component/[email protected]':resolution: {integrity: sha512-jS4E7T9Li2GuYwI6PyiVXmxTiM6b07rlD9Ge8uGZSCz3WlzcG5ZK7g5bbuKNeZ9pgUuPK/5guV781ujdVpm4HQ==}engines: {node: '>=8.x'}@@ -9337,8 +9346,8 @@ packages:peerDependencies:postcss: ^8.4.6- resolution: {integrity: sha512-EZvAHsvyASX63vXnyXOIynkxhaHRSsdb7z6yiXKIovGXAolW4cMZ3qoh7k3VdTsLBS6VGdksGfIo3r6+waLoOw==}+ resolution: {integrity: sha512-S/TpMKVKofNvsxfau/+bw+IA6cSfB6/kmzFj5szUofHOVnFFMB2WwK+Zu07BeMD8T0n+ZnTO5uXiMvAKe2dPkA==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -9426,8 +9435,8 @@ packages:peerDependencies:postcss: ^8.4.21- resolution: {integrity: sha512-+ONj2bpOQfsCKZE2T9VGMyVVdGcGUpr7u3SVfvkJlvhTRmDCfY25k4Jc8fubB9DclAPR4+w8uVtDZmdRgdAHig==}+ resolution: {integrity: sha512-plV21I86Hg9q8omNz13G9fhPtLopIWH06bt/Cb5cs1XnaGU2kUtEitvVd4vtQb/VqCdNUHK5swKn3QFmMRbpDg==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -9457,8 +9466,8 @@ packages:webpack:optional: true- resolution: {integrity: sha512-HpIdsdieClTjXLOyYdUPAX/XQASNIwdKt5hoZW08ZOAiI+tbV0ta1oclkpVkW5ANU+xJvk3KkA0FejkjGLXUkg==}+ resolution: {integrity: sha512-pL1hXFQ2fEXNKiNiAgtfA005T9FBxky5zkX6s4GZM2D8RkVgRqz3f4g1JUoq925zXv495qk8UNldDwh8uGEDoA==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -9539,8 +9548,8 @@ packages:peerDependencies:postcss: ^8.4- resolution: {integrity: sha512-awWKS3CwyY7I4Eb3YSWOZisbj3qXyuQCrylYiu2vSHxnSZAj3LHStN6jOcpCrc6EjYunLwbeNto3M5/JBtXpzg==}+ resolution: {integrity: sha512-LQybafF/K7H+6fAs4SIkgzkSCixJy0/h0gubDIAP3Ihz+IQBRwsjyvBnAZ3JUHD+A/ITaxVRPDxn//a3Qy4pDw==}engines: {node: '>=18'}peerDependencies:postcss: ^8.4@@ -9701,12 +9710,6 @@ packages:react: 19.0.0react-dom: 19.0.0- resolution: {integrity: sha512-by1VW/m7z2OH/ST3P5P8zi4K/RWUh7jJuNaPYGdGzXwJ3MF1rKWEuP0jeKW1PaWqqLxNVSvQZ8sIRkCCS8uWSg==}- peerDependencies:- react: 19.0.0- react-dom: 19.0.0-resolution: {integrity: sha512-vAL0yqPkmXWk3+YKRkmIR8TYj3RVdEt3ptG2jCJXWNAvQbT0VJJdRyHZ7kG/l1JsZlB+VJq/VcYOo69VR4oD+w==}peerDependencies:@@ -9764,12 +9767,6 @@ packages:react: 19.0.0react-dom: 19.0.0- resolution: {integrity: sha512-liijAjXz+KnTRVnxxXG2sYDGd6iLL7VpGGdR8gwoxAXy2KglviKCxLWZdjKYJzYzGSUwKDSTdYk8brj54Bn5BA==}- peerDependencies:- react: 19.0.0- react-dom: 19.0.0-resolution: {integrity: sha512-jP6qf7+vjnxGvPpfPWbGYfFlSl3h8L2XcD4O7g2GYXmEeBC0mw+nPD7i++OOE8v3YGqP8xtYjRKAWCMLfjgxlw==}engines: {node: '>=8.x'}@@ -9777,12 +9774,6 @@ packages:react: 19.0.0react-dom: 19.0.0- resolution: {integrity: sha512-UFAezAqltyR00a8Lf0IPAyTd29Jj9ee8wt8DqXyDMal7r/Cg/nDt3e1OOv3Th4W6mKaZijjgwuPXhAfVNTN8sw==}- peerDependencies:- react: 19.0.0- react-dom: 19.0.0-resolution: {integrity: sha512-AzC7KKOXFqAdIBqdGWepL9Xn7cm3vnAmjlHqUnoQaTMZYhM4VlXGLkkHHxj/BZ7Td0+SOPKB4RGPboBVKT9htw==}peerDependencies:@@ -10538,8 +10529,8 @@ packages:resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==}engines: {node: ^14.18.0 || >=16.0.0}- resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}+ resolution: {integrity: sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==}resolution: {integrity: sha512-pmrtDIZeHyu2idTejfV59SbaJyvp1VRjYxAjZBH0jnyrPRo6HL1kD5Glz8VPagasqr6oAx6M05+Tuw429Z8jxg==}@@ -10952,8 +10943,8 @@ packages:vite:optional: true- resolution: {integrity: sha512-wE2Li+FJ24zmGC8x7jz/Ow2REN+bTnF3WI2xqYx5RipCeV9yJuMzvrignnPPEDgc2WAJtHsqDZm3FCC4Dmcryg==}+ resolution: {integrity: sha512-6CxUTn7FJgK6rErNTjfD2eLoWm0UjfkvrOpl5viWV0j9oGk9rXkLHOFu3ZMXJpDY6M1uOIHx4btmvEAY7d8xfA==}engines: {node: '>=14.18.0', vite: '>=3.1.0'}@@ -11283,10 +11274,6 @@ snapshots:'@jridgewell/gen-mapping': 0.3.5'@jridgewell/trace-mapping': 0.3.25- '@ant-design/[email protected]':- dependencies:- '@babel/runtime': 7.25.0-'@antfu/[email protected](@eslint-react/[email protected]([email protected]([email protected]))([email protected]([email protected]))([email protected]))(@typescript-eslint/[email protected]([email protected]([email protected]))([email protected]))(@vue/[email protected])([email protected]([email protected]([email protected])))([email protected]([email protected]([email protected])))([email protected]([email protected]([email protected])))([email protected]([email protected]))([email protected])([email protected](@types/[email protected])(@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))':dependencies:'@antfu/install-pkg': 1.0.0@@ -11744,17 +11731,17 @@ snapshots:'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3- '@csstools/[email protected]': {}+ '@csstools/[email protected]': {}- '@csstools/[email protected](@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])':+ '@csstools/[email protected](@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])':dependencies:'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3- '@csstools/[email protected](@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])':+ '@csstools/[email protected](@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])':dependencies:- '@csstools/color-helpers': 5.0.1- '@csstools/css-calc': 2.1.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/color-helpers': 5.0.2+ '@csstools/css-calc': 2.1.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3@@ -11775,18 +11762,18 @@ snapshots:postcss: 8.4.49postcss-selector-parser: 7.1.0- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-color-parser': 3.0.7(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-color-parser': 3.0.8(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3'@csstools/postcss-progressive-custom-properties': 4.0.0([email protected])'@csstools/utilities': 2.0.0([email protected])postcss: 8.4.49- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-color-parser': 3.0.7(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-color-parser': 3.0.8(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3'@csstools/postcss-progressive-custom-properties': 4.0.0([email protected])@@ -11801,9 +11788,9 @@ snapshots:'@csstools/utilities': 2.0.0([email protected])postcss: 8.4.49- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-calc': 2.1.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-calc': 2.1.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3postcss: 8.4.49@@ -11814,25 +11801,25 @@ snapshots:postcss: 8.4.49postcss-value-parser: 4.2.0- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-color-parser': 3.0.7(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-color-parser': 3.0.8(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3postcss: 8.4.49- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-color-parser': 3.0.7(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-color-parser': 3.0.8(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3'@csstools/postcss-progressive-custom-properties': 4.0.0([email protected])'@csstools/utilities': 2.0.0([email protected])postcss: 8.4.49- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-color-parser': 3.0.7(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-color-parser': 3.0.8(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3'@csstools/postcss-progressive-custom-properties': 4.0.0([email protected])@@ -11887,9 +11874,9 @@ snapshots:'@csstools/utilities': 2.0.0([email protected])postcss: 8.4.49- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-calc': 2.1.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-calc': 2.1.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3'@csstools/media-query-list-parser': 4.0.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])@@ -11913,9 +11900,9 @@ snapshots:postcss: 8.4.49postcss-value-parser: 4.2.0- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-color-parser': 3.0.7(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-color-parser': 3.0.8(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3'@csstools/postcss-progressive-custom-properties': 4.0.0([email protected])@@ -11927,16 +11914,16 @@ snapshots:postcss: 8.4.49postcss-value-parser: 4.2.0- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-calc': 2.1.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-calc': 2.1.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3postcss: 8.4.49- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-color-parser': 3.0.7(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-color-parser': 3.0.8(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3'@csstools/postcss-progressive-custom-properties': 4.0.0([email protected])@@ -11948,29 +11935,29 @@ snapshots:postcss: 8.4.49postcss-selector-parser: 7.1.0- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-calc': 2.1.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-calc': 2.1.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3postcss: 8.4.49- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-calc': 2.1.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-calc': 2.1.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3postcss: 8.4.49- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/color-helpers': 5.0.1+ '@csstools/color-helpers': 5.0.2postcss: 8.4.49postcss-value-parser: 4.2.0- '@csstools/[email protected]([email protected])':+ '@csstools/[email protected]([email protected])':dependencies:- '@csstools/css-calc': 2.1.1(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-calc': 2.1.2(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3postcss: 8.4.49@@ -12606,6 +12593,18 @@ snapshots:'@types/react': 19.0.8'@types/react-dom': 19.0.3(@types/[email protected])+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/react-compose-refs': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-primitive': 2.0.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-slot': 1.1.2(@types/[email protected])([email protected])+ react: 19.0.0+ react-dom: 19.0.0([email protected])+ optionalDependencies:+ '@types/react': 19.0.8+ '@types/react-dom': 19.0.3(@types/[email protected])+dependencies:react: 19.0.0@@ -12618,6 +12617,12 @@ snapshots:optionalDependencies:'@types/react': 19.0.8+ dependencies:+ react: 19.0.0+ optionalDependencies:+ '@types/react': 19.0.8+'@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@radix-ui/primitive': 1.1.1@@ -12631,6 +12636,21 @@ snapshots:'@types/react': 19.0.8'@types/react-dom': 19.0.3(@types/[email protected])+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/primitive': 1.1.1+ '@radix-ui/react-compose-refs': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-id': 1.1.0(@types/[email protected])([email protected])+ '@radix-ui/react-menu': 2.1.6(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-primitive': 2.0.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-use-controllable-state': 1.1.0(@types/[email protected])([email protected])+ react: 19.0.0+ react-dom: 19.0.0([email protected])+ optionalDependencies:+ '@types/react': 19.0.8+ '@types/react-dom': 19.0.3(@types/[email protected])+dependencies:react: 19.0.0@@ -12655,6 +12675,32 @@ snapshots:optionalDependencies:'@types/react': 19.0.8+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/primitive': 1.1.1+ '@radix-ui/react-collection': 1.1.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-compose-refs': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-direction': 1.1.0(@types/[email protected])([email protected])+ '@radix-ui/react-dismissable-layer': 1.1.5(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-focus-guards': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-focus-scope': 1.1.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-id': 1.1.0(@types/[email protected])([email protected])+ '@radix-ui/react-popper': 1.2.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-portal': 1.1.4(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-presence': 1.1.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-primitive': 2.0.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-roving-focus': 1.1.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-slot': 1.1.2(@types/[email protected])([email protected])+ '@radix-ui/react-use-callback-ref': 1.1.0(@types/[email protected])([email protected])+ aria-hidden: 1.2.4+ react: 19.0.0+ react-dom: 19.0.0([email protected])+ react-remove-scroll: 2.6.3(@types/[email protected])([email protected])+ optionalDependencies:+ '@types/react': 19.0.8+ '@types/react-dom': 19.0.3(@types/[email protected])+'@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':dependencies:'@radix-ui/primitive': 1.1.1@@ -12725,6 +12771,23 @@ snapshots:'@types/react': 19.0.8'@types/react-dom': 19.0.3(@types/[email protected])+ '@radix-ui/[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])':+ dependencies:+ '@radix-ui/primitive': 1.1.1+ '@radix-ui/react-collection': 1.1.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-compose-refs': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-context': 1.1.1(@types/[email protected])([email protected])+ '@radix-ui/react-direction': 1.1.0(@types/[email protected])([email protected])+ '@radix-ui/react-id': 1.1.0(@types/[email protected])([email protected])+ '@radix-ui/react-primitive': 2.0.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])+ '@radix-ui/react-use-callback-ref': 1.1.0(@types/[email protected])([email protected])+ '@radix-ui/react-use-controllable-state': 1.1.0(@types/[email protected])([email protected])+ react: 19.0.0+ react-dom: 19.0.0([email protected])+ optionalDependencies:+ '@types/react': 19.0.8+ '@types/react-dom': 19.0.3(@types/[email protected])+dependencies:'@radix-ui/react-compose-refs': 1.1.1(@types/[email protected])([email protected])@@ -12774,15 +12837,6 @@ snapshots:'@radix-ui/[email protected]': {}- dependencies:- '@ant-design/fast-color': 2.0.6- '@babel/runtime': 7.25.0- classnames: 2.5.1- react: 19.0.0- react-dom: 19.0.0([email protected])-'@rc-component/[email protected]':dependencies:'@babel/runtime': 7.26.0@@ -17853,9 +17907,9 @@ snapshots:postcss: 8.4.49postcss-value-parser: 4.2.0dependencies:- '@csstools/css-color-parser': 3.0.7(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-color-parser': 3.0.8(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3'@csstools/postcss-progressive-custom-properties': 4.0.0([email protected])@@ -17947,9 +18001,9 @@ snapshots:camelcase-css: 2.0.1postcss: 8.4.49dependencies:- '@csstools/css-color-parser': 3.0.7(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])+ '@csstools/css-color-parser': 3.0.8(@csstools/[email protected](@csstools/[email protected]))(@csstools/[email protected])'@csstools/css-parser-algorithms': 3.0.4(@csstools/[email protected])'@csstools/css-tokenizer': 3.0.3'@csstools/postcss-progressive-custom-properties': 4.0.0([email protected])@@ -17974,7 +18028,7 @@ snapshots:transitivePeerDependencies:- typescriptdependencies:postcss: 8.4.49postcss-value-parser: 4.2.0@@ -18054,17 +18108,17 @@ snapshots:postcss: 8.4.49postcss-value-parser: 4.2.0dependencies:'@csstools/postcss-cascade-layers': 5.0.1([email protected])- '@csstools/postcss-color-function': 4.0.7([email protected])- '@csstools/postcss-color-mix-function': 3.0.7([email protected])+ '@csstools/postcss-color-function': 4.0.8([email protected])+ '@csstools/postcss-color-mix-function': 3.0.8([email protected])'@csstools/postcss-content-alt-text': 2.0.4([email protected])- '@csstools/postcss-exponential-functions': 2.0.6([email protected])+ '@csstools/postcss-exponential-functions': 2.0.7([email protected])'@csstools/postcss-font-format-keywords': 4.0.0([email protected])- '@csstools/postcss-gamut-mapping': 2.0.7([email protected])- '@csstools/postcss-gradients-interpolation-method': 5.0.7([email protected])- '@csstools/postcss-hwb-function': 4.0.7([email protected])+ '@csstools/postcss-gamut-mapping': 2.0.8([email protected])+ '@csstools/postcss-gradients-interpolation-method': 5.0.8([email protected])+ '@csstools/postcss-hwb-function': 4.0.8([email protected])'@csstools/postcss-ic-unit': 4.0.0([email protected])'@csstools/postcss-initial': 2.0.1([email protected])'@csstools/postcss-is-pseudo-class': 5.0.1([email protected])@@ -18074,19 +18128,19 @@ snapshots:'@csstools/postcss-logical-overscroll-behavior': 2.0.0([email protected])'@csstools/postcss-logical-resize': 3.0.0([email protected])'@csstools/postcss-logical-viewport-units': 3.0.3([email protected])- '@csstools/postcss-media-minmax': 2.0.6([email protected])+ '@csstools/postcss-media-minmax': 2.0.7([email protected])'@csstools/postcss-media-queries-aspect-ratio-number-values': 3.0.4([email protected])'@csstools/postcss-nested-calc': 4.0.0([email protected])'@csstools/postcss-normalize-display-values': 4.0.0([email protected])- '@csstools/postcss-oklab-function': 4.0.7([email protected])+ '@csstools/postcss-oklab-function': 4.0.8([email protected])'@csstools/postcss-progressive-custom-properties': 4.0.0([email protected])- '@csstools/postcss-random-function': 1.0.2([email protected])- '@csstools/postcss-relative-color-syntax': 3.0.7([email protected])+ '@csstools/postcss-random-function': 1.0.3([email protected])+ '@csstools/postcss-relative-color-syntax': 3.0.8([email protected])'@csstools/postcss-scope-pseudo-class': 4.0.1([email protected])- '@csstools/postcss-sign-functions': 1.1.1([email protected])- '@csstools/postcss-stepped-value-functions': 4.0.6([email protected])- '@csstools/postcss-text-decoration-shorthand': 4.0.1([email protected])- '@csstools/postcss-trigonometric-functions': 4.0.6([email protected])+ '@csstools/postcss-sign-functions': 1.1.2([email protected])+ '@csstools/postcss-stepped-value-functions': 4.0.7([email protected])+ '@csstools/postcss-text-decoration-shorthand': 4.0.2([email protected])+ '@csstools/postcss-trigonometric-functions': 4.0.7([email protected])'@csstools/postcss-unset-value': 4.0.0([email protected])autoprefixer: 10.4.20([email protected])browserslist: 4.24.4@@ -18097,7 +18151,7 @@ snapshots:postcss: 8.4.49postcss-attribute-case-insensitive: 7.0.1([email protected])postcss-clamp: 4.1.0([email protected])- postcss-color-functional-notation: 7.0.7([email protected])+ postcss-color-functional-notation: 7.0.8([email protected])postcss-color-hex-alpha: 10.0.0([email protected])postcss-color-rebeccapurple: 10.0.0([email protected])postcss-custom-media: 11.0.5([email protected])@@ -18110,8 +18164,8 @@ snapshots:postcss-font-variant: 5.0.0([email protected])postcss-gap-properties: 6.0.0([email protected])postcss-image-set-function: 7.0.0([email protected])- postcss-lab-function: 7.0.7([email protected])- postcss-logical: 8.0.0([email protected])+ postcss-lab-function: 7.0.8([email protected])+ postcss-logical: 8.1.0([email protected])postcss-nesting: 13.0.1([email protected])postcss-opacity-percentage: 3.0.0([email protected])postcss-overflow-shorthand: 6.0.0([email protected])@@ -18299,14 +18353,6 @@ snapshots:react: 19.0.0react-dom: 19.0.0([email protected])- dependencies:- '@babel/runtime': 7.26.0- classnames: 2.5.1- react: 19.0.0- react-dom: 19.0.0([email protected])-dependencies:'@babel/runtime': 7.26.0@@ -18374,15 +18420,6 @@ snapshots:react-dom: 19.0.0([email protected])resize-observer-polyfill: 1.5.1- dependencies:- '@babel/runtime': 7.26.0- classnames: 2.5.1- react: 19.0.0- react-dom: 19.0.0([email protected])-dependencies:'@babel/runtime': 7.26.0@@ -18395,16 +18432,6 @@ snapshots:react: 19.0.0react-dom: 19.0.0([email protected])- dependencies:- '@babel/runtime': 7.25.4- classnames: 2.5.1- react: 19.0.0- react-dom: 19.0.0([email protected])-dependencies:'@babel/runtime': 7.24.7@@ -19301,7 +19328,7 @@ snapshots:'@pkgr/core': 0.1.1tslib: 2.8.1- [email protected]: {}+ [email protected]: {}dependencies:@@ -19739,7 +19766,7 @@ snapshots:- rollup- supports-colordependencies:'@types/fs-extra': 11.0.4'@types/node': 14.18.63