Skip to content

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.

refactor: rename view files to PascalCase (#7083)

白熱057fca00d4d6
diff --git a/package.json b/package.json
index 7fadbf718f..1a2fe85c34 100644
--- a/package.json
+++ b/package.json
@@ -60,18 +60,18 @@
"@antfu/eslint-config": "^9.0.0",
"@commitlint/cli": "^21.0.2",
"@commitlint/config-conventional": "^21.0.2",
- "@eslint-react/eslint-plugin": "^5.8.12",
+ "@eslint-react/eslint-plugin": "^5.9.0",
"@eslint/compat": "^2.1.0",
"@playwright/test": "^1.57.0",
"@release-it-plugins/workspaces": "^5.0.3",
"@release-it/conventional-changelog": "^10.0.6",
"@types/fs-extra": "^11.0.4",
- "@types/node": "^25.9.1",
- "@types/react": "19.2.16",
+ "@types/node": "^25.9.3",
+ "@types/react": "19.2.17",
"@types/react-dom": "19.2.3",
"@univerjs-infra/shared": "workspace:*",
"@univerjs/design": "workspace:*",
- "eslint": "^10.4.1",
+ "eslint": "^10.5.0",
"eslint-plugin-format": "^2.0.1",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.1.1",
@@ -79,20 +79,20 @@
"fs-extra": "^11.3.5",
"husky": "^9.1.7",
"lint-staged": "^17.0.7",
- "posthog-node": "^5.36.2",
+ "posthog-node": "^5.37.0",
"react": "19.2.7",
"react-dom": "19.2.7",
"release-it": "^19.2.4",
"serve": "^14.2.6",
"tailwindcss": "3.4.18",
- "tsx": "^4.22.3",
- "turbo": "^2.9.16",
+ "tsx": "^4.22.4",
+ "turbo": "^2.9.18",
"typescript": "^6.0.3",
"vitest": "^4.1.8"
},
"pnpm": {
"overrides": {
- "@types/react": "19.2.16",
+ "@types/react": "19.2.17",
"@types/react-dom": "19.2.3",
"basic-ftp": "5.2.0",
"react": "19.2.7",
diff --git a/packages/design/src/helper/class-utilities.ts b/packages/design/src/helper/class-utilities.ts
index a73d58075b..ec67d8a528 100644
--- a/packages/design/src/helper/class-utilities.ts
+++ b/packages/design/src/helper/class-utilities.ts
@@ -28,3 +28,4 @@ export const borderBottomClassName = clsx(borderBasicClassName, 'univer-border-l
export const borderRightClassName = clsx(borderBasicClassName, 'univer-border-l-0 univer-border-b-0 univer-border-t-0 univer-border-r');
export const divideYClassName = 'univer-divide-gray-200 dark:!univer-divide-gray-600 univer-divide-y univer-divide-x-0 univer-divide-solid';
export const divideXClassName = 'univer-divide-gray-200 dark:!univer-divide-gray-600 univer-divide-x univer-divide-y-0 univer-divide-solid';
+export const resetButtonClassName = 'univer-m-0 univer-flex univer-appearance-none univer-items-center univer-justify-center univer-border-0 univer-bg-transparent univer-p-0 univer-leading-none univer-outline-none univer-cursor-pointer';
diff --git a/packages/design/src/index.ts b/packages/design/src/index.ts
index 515564b457..cd022e7ce4 100644
--- a/packages/design/src/index.ts
+++ b/packages/design/src/index.ts
@@ -77,6 +77,7 @@ export {
borderTopClassName,
divideXClassName,
divideYClassName,
+ resetButtonClassName,
scrollbarClassName,
} from './helper/class-utilities';
export { clsx } from './helper/clsx';
diff --git a/packages/docs-drawing-ui/src/controllers/doc-drawing-printing.controller.tsx b/packages/docs-drawing-ui/src/controllers/doc-drawing-printing.controller.tsx
index 39a61ffbce..1bd7ead975 100644
--- a/packages/docs-drawing-ui/src/controllers/doc-drawing-printing.controller.tsx
+++ b/packages/docs-drawing-ui/src/controllers/doc-drawing-printing.controller.tsx
@@ -15,14 +15,14 @@
*/
import type { IDocFloatDom } from '@univerjs/docs-drawing';
-import type { IPrintingFloatDomProps } from '../views/printing-float-dom';
+import type { IPrintingFloatDomProps } from '../views/DocPrintingFloatDom';
import { Disposable, DOC_DRAWING_PRINTING_COMPONENT_KEY, DrawingTypeEnum, Inject, Injector } from '@univerjs/core';
import { render, unmount } from '@univerjs/design';
import { DocPrintInterceptorService } from '@univerjs/docs-ui';
import { IDrawingManagerService } from '@univerjs/drawing';
import { DrawingRenderService } from '@univerjs/drawing-ui';
import { ComponentManager, connectInjector } from '@univerjs/ui';
-import { DocPrintingFloatDom } from '../views/printing-float-dom';
+import { DocPrintingFloatDom } from '../views/DocPrintingFloatDom';
export class DocDrawingPrintingController extends Disposable {
constructor(
diff --git a/packages/docs-drawing-ui/src/views/printing-float-dom/index.tsx b/packages/docs-drawing-ui/src/views/DocPrintingFloatDom.tsx
similarity index 96%
rename from packages/docs-drawing-ui/src/views/printing-float-dom/index.tsx
rename to packages/docs-drawing-ui/src/views/DocPrintingFloatDom.tsx
index 0057a84840..5d8a8feb85 100644
--- a/packages/docs-drawing-ui/src/views/printing-float-dom/index.tsx
+++ b/packages/docs-drawing-ui/src/views/DocPrintingFloatDom.tsx
@@ -20,7 +20,7 @@ import type { IFloatDom, IFloatDomLayout } from '@univerjs/ui';
import { PrintFloatDomSingle } from '@univerjs/ui';
import { useMemo } from 'react';
import { BehaviorSubject } from 'rxjs';
-import { calcDocFloatDomPositionByRect } from '../../controllers/doc-float-dom.controller';
+import { calcDocFloatDomPositionByRect } from '../controllers/doc-float-dom.controller';
export interface IPrintingFloatDomProps {
floatDomInfos: IDocFloatDom[];
diff --git a/packages/docs-hyper-link-ui/src/controllers/__tests__/ui.controller.spec.ts b/packages/docs-hyper-link-ui/src/controllers/__tests__/ui.controller.spec.ts
index 672723486b..faf486b1d6 100644
--- a/packages/docs-hyper-link-ui/src/controllers/__tests__/ui.controller.spec.ts
+++ b/packages/docs-hyper-link-ui/src/controllers/__tests__/ui.controller.spec.ts
@@ -16,7 +16,7 @@
import { FLOAT_TOOLBAR_MENU_POSITION } from '@univerjs/docs-ui';
import { describe, expect, it, vi } from 'vitest';
-import { DocHyperLinkEdit } from '../../views/hyper-link-edit';
+import { DocHyperLinkEdit } from '../../views/DocHyperLinkEdit';
import { DocHyperLinkUIController } from '../ui.controller';
describe('DocHyperLinkUIController', () => {
diff --git a/packages/docs-hyper-link-ui/src/controllers/ui.controller.ts b/packages/docs-hyper-link-ui/src/controllers/ui.controller.ts
index e1954aa929..9ea65fdc61 100644
--- a/packages/docs-hyper-link-ui/src/controllers/ui.controller.ts
+++ b/packages/docs-hyper-link-ui/src/controllers/ui.controller.ts
@@ -25,8 +25,8 @@ import { UpdateDocHyperLinkCommand } from '../commands/commands/update-link.comm
import { ClickDocHyperLinkOperation, ShowDocHyperLinkEditPopupOperation, ToggleDocHyperLinkInfoPopupOperation } from '../commands/operations/popup.operation';
import { addLinkShortcut, DOC_LINK_ICON } from '../menu/menu';
import { menuSchema } from '../menu/schema';
-import { DocHyperLinkEdit } from '../views/hyper-link-edit';
-import { DocLinkPopup } from '../views/hyper-link-popup';
+import { DocHyperLinkEdit } from '../views/DocHyperLinkEdit';
+import { DocLinkPopup } from '../views/DocLinkPopup';
export interface IDocHyperLinkUIConfig {
menu: MenuConfig;
diff --git a/packages/docs-hyper-link-ui/src/services/hyper-link-popup.service.ts b/packages/docs-hyper-link-ui/src/services/hyper-link-popup.service.ts
index 148d1eb539..8d003c873c 100644
--- a/packages/docs-hyper-link-ui/src/services/hyper-link-popup.service.ts
+++ b/packages/docs-hyper-link-ui/src/services/hyper-link-popup.service.ts
@@ -19,8 +19,8 @@ import { Disposable, Inject, IUniverInstanceService, UniverInstanceType } from '
import { DocSelectionManagerService } from '@univerjs/docs';
import { DocCanvasPopManagerService } from '@univerjs/docs-ui';
import { BehaviorSubject } from 'rxjs';
-import { DocHyperLinkEdit } from '../views/hyper-link-edit';
-import { DocLinkPopup } from '../views/hyper-link-popup';
+import { DocHyperLinkEdit } from '../views/DocHyperLinkEdit';
+import { DocLinkPopup } from '../views/DocLinkPopup';
export interface ILinkInfo {
unitId: string;
diff --git a/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx b/packages/docs-hyper-link-ui/src/views/DocHyperLinkEdit.tsx
similarity index 95%
rename from packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx
rename to packages/docs-hyper-link-ui/src/views/DocHyperLinkEdit.tsx
index 7d7103947b..b393a287cc 100644
--- a/packages/docs-hyper-link-ui/src/views/hyper-link-edit/index.tsx
+++ b/packages/docs-hyper-link-ui/src/views/DocHyperLinkEdit.tsx
@@ -20,10 +20,10 @@ import { borderClassName, Button, clsx, FormLayout, Input } from '@univerjs/desi
import { DocSelectionManagerService } from '@univerjs/docs';
import { KeyCode, useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useState } from 'react';
-import { AddDocHyperLinkCommand } from '../../commands/commands/add-link.command';
-import { UpdateDocHyperLinkCommand } from '../../commands/commands/update-link.command';
-import { DocHyperLinkPopupService } from '../../services/hyper-link-popup.service';
-import { isBlankInput } from './utils';
+import { AddDocHyperLinkCommand } from '../commands/commands/add-link.command';
+import { UpdateDocHyperLinkCommand } from '../commands/commands/update-link.command';
+import { DocHyperLinkPopupService } from '../services/hyper-link-popup.service';
+import { isBlankInput } from './hyper-link-edit/utils';
function hasProtocol(urlString: string) {
const pattern = /^[a-zA-Z]+:\/\//;
diff --git a/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx b/packages/docs-hyper-link-ui/src/views/DocLinkPopup.tsx
similarity index 95%
rename from packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
rename to packages/docs-hyper-link-ui/src/views/DocLinkPopup.tsx
index 67259c24af..8389d0cac2 100644
--- a/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
+++ b/packages/docs-hyper-link-ui/src/views/DocLinkPopup.tsx
@@ -19,9 +19,9 @@ import { CustomRangeType, ICommandService, IUniverInstanceService, LocaleService
import { borderClassName, clsx, MessageType, Tooltip } from '@univerjs/design';
import { CopyIcon, LinkIcon, UnlinkIcon, WriteIcon } from '@univerjs/icons';
import { IMessageService, useDependency, useObservable } from '@univerjs/ui';
-import { DeleteDocHyperLinkCommand } from '../../commands/commands/delete-link.command';
-import { ShowDocHyperLinkEditPopupOperation } from '../../commands/operations/popup.operation';
-import { DocHyperLinkPopupService } from '../../services/hyper-link-popup.service';
+import { DeleteDocHyperLinkCommand } from '../commands/commands/delete-link.command';
+import { ShowDocHyperLinkEditPopupOperation } from '../commands/operations/popup.operation';
+import { DocHyperLinkPopupService } from '../services/hyper-link-popup.service';
export const DocLinkPopup = () => {
const hyperLinkService = useDependency(DocHyperLinkPopupService);
diff --git a/packages/docs-mention-ui/src/controllers/doc-mention-ui.controller.ts b/packages/docs-mention-ui/src/controllers/doc-mention-ui.controller.ts
index 26f5a85d1e..7c2c19fca0 100644
--- a/packages/docs-mention-ui/src/controllers/doc-mention-ui.controller.ts
+++ b/packages/docs-mention-ui/src/controllers/doc-mention-ui.controller.ts
@@ -18,7 +18,7 @@ import { Disposable, ICommandService, Inject } from '@univerjs/core';
import { ComponentManager } from '@univerjs/ui';
import { AddDocMentionCommand, DeleteDocMentionCommand } from '../commands/commands/doc-mention.command';
import { CloseMentionEditPopupOperation, CloseMentionInfoPopupOperation, ShowMentionEditPopupOperation, ShowMentionInfoPopupOperation } from '../commands/operations/mention-popup.operation';
-import { MentionEditPopup } from '../views/mention-edit-popup';
+import { MentionEditPopup } from '../views/MentionEditPopup';
export class DocMentionUIController extends Disposable {
constructor(
diff --git a/packages/docs-mention-ui/src/services/doc-mention-popup.service.ts b/packages/docs-mention-ui/src/services/doc-mention-popup.service.ts
index 9dadf379e7..d9f0219d75 100644
--- a/packages/docs-mention-ui/src/services/doc-mention-popup.service.ts
+++ b/packages/docs-mention-ui/src/services/doc-mention-popup.service.ts
@@ -18,7 +18,7 @@ import type { IDisposable, Nullable } from '@univerjs/core';
import { Disposable, Inject } from '@univerjs/core';
import { DocCanvasPopManagerService } from '@univerjs/docs-ui';
import { BehaviorSubject } from 'rxjs';
-import { MentionEditPopup } from '../views/mention-edit-popup';
+import { MentionEditPopup } from '../views/MentionEditPopup';
import { DocMentionService } from './doc-mention.service';
export class DocMentionPopupService extends Disposable {
diff --git a/packages/docs-mention-ui/src/views/mention-edit-popup/index.tsx b/packages/docs-mention-ui/src/views/MentionEditPopup.tsx
similarity index 94%
rename from packages/docs-mention-ui/src/views/mention-edit-popup/index.tsx
rename to packages/docs-mention-ui/src/views/MentionEditPopup.tsx
index 58cc6e1477..a38f46198d 100644
--- a/packages/docs-mention-ui/src/views/mention-edit-popup/index.tsx
+++ b/packages/docs-mention-ui/src/views/MentionEditPopup.tsx
@@ -21,9 +21,9 @@ import { IEditorService } from '@univerjs/docs-ui';
import { useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useState } from 'react';
import { filter } from 'rxjs';
-import { AddDocMentionCommand } from '../../commands/commands/doc-mention.command';
-import { DocMentionPopupService } from '../../services/doc-mention-popup.service';
-import { MentionList } from '../mention-list';
+import { AddDocMentionCommand } from '../commands/commands/doc-mention.command';
+import { DocMentionPopupService } from '../services/doc-mention-popup.service';
+import { MentionList } from './MentionList';
export const MentionEditPopup = () => {
const popupService = useDependency(DocMentionPopupService);
diff --git a/packages/docs-mention-ui/src/views/mention-list/index.tsx b/packages/docs-mention-ui/src/views/MentionList.tsx
similarity index 100%
rename from packages/docs-mention-ui/src/views/mention-list/index.tsx
rename to packages/docs-mention-ui/src/views/MentionList.tsx
diff --git a/packages/docs-thread-comment-ui/src/controllers/__tests__/doc-thread-comment-ui.controller.spec.ts b/packages/docs-thread-comment-ui/src/controllers/__tests__/doc-thread-comment-ui.controller.spec.ts
index 314d41604b..fc1015c16b 100644
--- a/packages/docs-thread-comment-ui/src/controllers/__tests__/doc-thread-comment-ui.controller.spec.ts
+++ b/packages/docs-thread-comment-ui/src/controllers/__tests__/doc-thread-comment-ui.controller.spec.ts
@@ -17,7 +17,7 @@
import { FLOAT_TOOLBAR_MENU_POSITION } from '@univerjs/docs-ui';
import { describe, expect, it, vi } from 'vitest';
import { DOCS_THREAD_COMMENT_PANEL } from '../../common/const';
-import { DocThreadCommentPanel } from '../../views/doc-thread-comment-panel';
+import { DocThreadCommentPanel } from '../../views/DocThreadCommentPanel';
import { DocThreadCommentUIController } from '../doc-thread-comment-ui.controller';
describe('DocThreadCommentUIController', () => {
diff --git a/packages/docs-thread-comment-ui/src/controllers/doc-thread-comment-ui.controller.ts b/packages/docs-thread-comment-ui/src/controllers/doc-thread-comment-ui.controller.ts
index a21b4bf5b6..a83f52e350 100644
--- a/packages/docs-thread-comment-ui/src/controllers/doc-thread-comment-ui.controller.ts
+++ b/packages/docs-thread-comment-ui/src/controllers/doc-thread-comment-ui.controller.ts
@@ -23,7 +23,7 @@ import { DeleteDocCommentComment } from '../commands/commands/delete-doc-comment
import { ShowCommentPanelOperation, StartAddCommentOperation, ToggleCommentPanelOperation } from '../commands/operations/show-comment-panel.operation';
import { DOCS_THREAD_COMMENT_PANEL } from '../common/const';
import { menuSchema } from '../menu/schema';
-import { DocThreadCommentPanel } from '../views/doc-thread-comment-panel';
+import { DocThreadCommentPanel } from '../views/DocThreadCommentPanel';
export class DocThreadCommentUIController extends Disposable {
constructor(
diff --git a/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx b/packages/docs-thread-comment-ui/src/views/DocThreadCommentPanel.tsx
similarity index 87%
rename from packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx
rename to packages/docs-thread-comment-ui/src/views/DocThreadCommentPanel.tsx
index ce3ddbf514..9083da825c 100644
--- a/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx
+++ b/packages/docs-thread-comment-ui/src/views/DocThreadCommentPanel.tsx
@@ -15,20 +15,20 @@
*/
import type { DocumentDataModel } from '@univerjs/core';
-import type { IAddDocCommentComment } from '../../commands/commands/add-doc-comment.command';
-import type { IDeleteDocCommentComment } from '../../commands/commands/delete-doc-comment.command';
+import type { IAddDocCommentComment } from '../commands/commands/add-doc-comment.command';
+import type { IDeleteDocCommentComment } from '../commands/commands/delete-doc-comment.command';
import { ICommandService, Injector, isInternalEditorID, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { DocSelectionManagerService, RichTextEditingMutation } from '@univerjs/docs';
import { ThreadCommentPanel } from '@univerjs/thread-comment-ui';
import { useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useState } from 'react';
import { debounceTime, filter, Observable } from 'rxjs';
-import { AddDocCommentComment } from '../../commands/commands/add-doc-comment.command';
-import { DeleteDocCommentComment } from '../../commands/commands/delete-doc-comment.command';
-import { StartAddCommentOperation } from '../../commands/operations/show-comment-panel.operation';
-import { DEFAULT_DOC_SUBUNIT_ID } from '../../common/const';
-import { shouldDisableAddComment } from '../../menu/menu';
-import { DocThreadCommentService } from '../../services/doc-thread-comment.service';
+import { AddDocCommentComment } from '../commands/commands/add-doc-comment.command';
+import { DeleteDocCommentComment } from '../commands/commands/delete-doc-comment.command';
+import { StartAddCommentOperation } from '../commands/operations/show-comment-panel.operation';
+import { DEFAULT_DOC_SUBUNIT_ID } from '../common/const';
+import { shouldDisableAddComment } from '../menu/menu';
+import { DocThreadCommentService } from '../services/doc-thread-comment.service';
export const DocThreadCommentPanel = () => {
const univerInstanceService = useDependency(IUniverInstanceService);
diff --git a/packages/docs-ui/src/commands/operations/open-page-setting.operation.ts b/packages/docs-ui/src/commands/operations/open-page-setting.operation.ts
index 276bd8c0e5..107e6b8655 100644
--- a/packages/docs-ui/src/commands/operations/open-page-setting.operation.ts
+++ b/packages/docs-ui/src/commands/operations/open-page-setting.operation.ts
@@ -18,7 +18,7 @@ import type { ICommand, ModernDocumentWidthMode, PaperType } from '@univerjs/cor
import type { IConfirmPartMethodOptions } from '@univerjs/ui';
import type { IDocPageSetupCommandParams } from '../commands/doc-page-setup.command';
import { CommandType, DocumentFlavor, ICommandService, IConfirmService, LocaleService, MODERN_DOCUMENT_WIDTH, PAGE_SIZE } from '@univerjs/core';
-import { PAGE_SETTING_COMPONENT_ID } from '../../views/page-settings';
+import { PAGE_SETTING_COMPONENT_ID } from '../../views/PageSettings';
import { DocPageSetupCommand } from '../commands/doc-page-setup.command';
export const DocOpenPageSettingCommand: ICommand = {
diff --git a/packages/docs-ui/src/components/paragraph-menu/__tests__/paragraph-menu.spec.ts b/packages/docs-ui/src/components/paragraph-menu/__tests__/paragraph-menu.spec.ts
deleted file mode 100644
index 3893b34144..0000000000
--- a/packages/docs-ui/src/components/paragraph-menu/__tests__/paragraph-menu.spec.ts
+++ /dev/null
@@ -1,532 +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 { NamedStyleType } from '@univerjs/core';
-import { MenuItemType } from '@univerjs/ui';
-
-import React from 'react';
-import { renderToStaticMarkup } from 'react-dom/server';
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import * as paragraphMenu from '..';
-import { createParagraphMenuHoverOpenScheduler, finishParagraphMenuCommand, getParagraphFormattingRange, getParagraphMenuActiveHeadingCommandId, getParagraphMenuCommand, getParagraphMenuCommandTargetRange, getParagraphMenuHiddenHeadingCommandIds, getParagraphMenuHiddenItemIds, getParagraphMenuIconSizeClass, getParagraphMenuPopupDirection, getParagraphMenuResolvedCommand, getParagraphMenuTargetRange, isEmptyParagraphMenuTarget, PARAGRAPH_MENU_HOVER_OPEN_DELAY, setParagraphMenuInteractionActive, shouldShowParagraphSettingMenu, shouldUseInsertBelowRange } from '..';
-import { HorizontalLineCommand } from '../../../commands/commands/doc-horizontal-line.command';
-import { SetInlineFormatTextBackgroundColorCommand, SetInlineFormatTextColorCommand } from '../../../commands/commands/inline-format.command';
-import { BulletListCommand, InsertBulletListBellowCommand, OrderListCommand } from '../../../commands/commands/list.command';
-import { H1HeadingCommand, H3HeadingCommand, H4HeadingCommand, H5HeadingCommand, NormalTextHeadingCommand, SetParagraphNamedStyleCommand, SubtitleHeadingCommand, TitleHeadingCommand } from '../../../commands/commands/set-heading.command';
-import { CreateDocTableCommand } from '../../../commands/commands/table/doc-table-create.command';
-import {
- DOC_PARAGRAPH_T_EDIT_MENU_ID,
- DOC_PARAGRAPH_T_INSERT_MENU_ID,
- EmptyParagraphBulletListMenuItemFactory,
- EmptyParagraphH1MenuItemFactory,
- EmptyParagraphHorizontalLineMenuItemFactory,
- HEADING_ICON_MAP,
- INSERT_BELLOW_MENU_ID,
- InsertBulletListBellowMenuItemFactory,
- InsertHorizontalLineBellowMenuItemFactory,
- InsertOrderListBellowMenuItemFactory,
- ParagraphMenuBackgroundColorHeaderActionMenuItemFactory,
- ParagraphMenuBackgroundColorSwatchMenuItemFactories,
- ParagraphMenuDefaultTextColorMenuItemFactory,
- ParagraphMenuIndentDecreaseMenuItemFactory,
- ParagraphMenuIndentIncreaseMenuItemFactory,
- ParagraphMenuNoBackgroundMenuItemFactory,
- ParagraphMenuTextColorHeaderActionMenuItemFactory,
- ParagraphMenuTextColorSwatchMenuItemFactories,
- TableBlockCopyMenuItemFactory,
- TableBlockDeleteMenuItemFactory,
- TableBlockPasteMenuItemFactory,
-} from '../../../menu/paragraph-menu';
-
-describe('ParagraphMenu', () => {
- afterEach(() => {
- vi.useRealTimers();
- });
-
- it('uses a smaller icon for normal text paragraph triggers', () => {
- expect(getParagraphMenuIconSizeClass('TextTypeIcon')).toBe('univer-size-3');
- expect(getParagraphMenuIconSizeClass('TitleTypeIcon')).toBe('univer-size-4');
- expect(getParagraphMenuIconSizeClass('SubtitleTypeIcon')).toBe('univer-size-4');
- expect(getParagraphMenuIconSizeClass('H1Icon')).toBe('univer-size-4');
- expect(HEADING_ICON_MAP[NamedStyleType.TITLE].key).toBe('TitleTypeIcon');
- expect(HEADING_ICON_MAP[NamedStyleType.SUBTITLE].key).toBe('SubtitleTypeIcon');
- });
-
- it('uses the enlarged context menu size variant for the docs T menu', () => {
- expect((paragraphMenu as any).getParagraphMenuContextMenuSizeVariant?.()).toBe('paragraph-t');
- });
-
- it('uses fully-qualified locale keys for paragraph context menu labels', () => {
- const accessor = {
- get: () => ({
- get: () => undefined,
- register: () => undefined,
- }),
- } as never;
-
- expect(EmptyParagraphH1MenuItemFactory(accessor).title).toBe('ui.toolbar.heading.1');
- expect(EmptyParagraphBulletListMenuItemFactory(accessor).title).toBe('docs-ui.rightClick.bulletList');
- expect(EmptyParagraphHorizontalLineMenuItemFactory(accessor).title).toBe('docs-ui.toolbar.horizontalLine');
- expect(TableBlockCopyMenuItemFactory(accessor).title).toBe('docs-ui.rightClick.copy');
- expect(TableBlockPasteMenuItemFactory(accessor).title).toBe('docs-ui.rightClick.paste');
- expect(TableBlockDeleteMenuItemFactory(accessor).title).toBe('docs-ui.rightClick.delete');
- });
-
- it('adds matching tooltips to T-menu icon actions', () => {
- const accessor = {
- get: () => ({
- get: () => undefined,
- register: () => undefined,
- }),
- } as never;
-
- expect(EmptyParagraphH1MenuItemFactory(accessor).tooltip).toBe('ui.toolbar.heading.1');
- expect(EmptyParagraphBulletListMenuItemFactory(accessor).tooltip).toBe('docs-ui.rightClick.bulletList');
- expect(EmptyParagraphHorizontalLineMenuItemFactory(accessor).tooltip).toBe('docs-ui.toolbar.horizontalLine');
- expect(InsertOrderListBellowMenuItemFactory(accessor).tooltip).toBe('docs-ui.rightClick.orderList');
- expect(InsertBulletListBellowMenuItemFactory(accessor).tooltip).toBe('docs-ui.rightClick.bulletList');
- expect(InsertHorizontalLineBellowMenuItemFactory(accessor).tooltip).toBe('docs-ui.toolbar.horizontalLine');
- expect(ParagraphMenuIndentIncreaseMenuItemFactory(accessor).tooltip).toBe('docs-ui.paragraphMenu.increaseIndent');
- expect(ParagraphMenuIndentDecreaseMenuItemFactory(accessor).tooltip).toBe('docs-ui.paragraphMenu.decreaseIndent');
- expect(ParagraphMenuIndentIncreaseMenuItemFactory(accessor).title).toBe('docs-ui.paragraphMenu.increase');
- expect(ParagraphMenuIndentDecreaseMenuItemFactory(accessor).title).toBe('docs-ui.paragraphMenu.decrease');
- });
-
- it('renders paragraph text color swatches with an A glyph inside an outlined color chip', () => {
- const registeredIcons = new Map<string, React.ComponentType<{ className?: string }>>();
- const componentManager = {
- get: (key: string) => registeredIcons.get(key),
- register: (key: string, component: React.ComponentType<{ className?: string }>) => {
- registeredIcons.set(key, component);
- },
- };
- const accessor = {
- get: () => componentManager,
- } as never;
-
- const factory = ParagraphMenuTextColorSwatchMenuItemFactories['doc.menu.paragraph-t.text-color.0'].menuItemFactory;
- const menuItem = factory(accessor);
- const Icon = registeredIcons.get(menuItem.icon as string);
-
- expect(Icon).toBeDefined();
- expect(menuItem.tooltip).toBeUndefined();
-
- const markup = renderToStaticMarkup(React.createElement(Icon!, { className: 'swatch-icon' }));
-
- expect(markup).toContain('>A<');
- expect(markup.match(/<rect/g)?.length ?? 0).toBeGreaterThan(0);
- });
-
- it('keeps paragraph background color swatches as plain color blocks', () => {
- const registeredIcons = new Map<string, React.ComponentType<{ className?: string }>>();
- const componentManager = {
- get: (key: string) => registeredIcons.get(key),
- register: (key: string, component: React.ComponentType<{ className?: string }>) => {
- registeredIcons.set(key, component);
- },
- };
- const accessor = {
- get: () => componentManager,
- } as never;
-
- const factory = ParagraphMenuBackgroundColorSwatchMenuItemFactories['doc.menu.paragraph-t.background-color.0'].menuItemFactory;
- const menuItem = factory(accessor);
- const Icon = registeredIcons.get(menuItem.icon as string);
-
- expect(Icon).toBeDefined();
- expect(menuItem.tooltip).toBeUndefined();
-
- const markup = renderToStaticMarkup(React.createElement(Icon!, { className: 'swatch-icon' }));
-
- expect(markup).not.toContain('>A<');
- expect(markup.match(/<rect/g)?.length ?? 0).toBeGreaterThan(0);
- });
-
- it('keeps the non-color explanatory actions in the colors submenu tooltip-free', () => {
- const accessor = {
- get: () => ({
- get: () => undefined,
- register: () => undefined,
- }),
- } as never;
-
- expect(ParagraphMenuDefaultTextColorMenuItemFactory(accessor).tooltip).toBeUndefined();
- expect(ParagraphMenuNoBackgroundMenuItemFactory(accessor).tooltip).toBeUndefined();
- });
-
- it('reuses the existing text color selector logic for the colors header action with an A icon', () => {
- const registeredIcons = new Map<string, React.ComponentType<{ className?: string }>>();
- const componentManager = {
- get: (key: string) => registeredIcons.get(key),
- register: (key: string, component: React.ComponentType<{ className?: string }>) => {
- registeredIcons.set(key, component);
- },
- };
- const accessor = {
- get: () => componentManager,
- } as never;
-
- const menuItem = ParagraphMenuTextColorHeaderActionMenuItemFactory(accessor);
- const Icon = registeredIcons.get(menuItem.icon as string);
-
- expect(menuItem.type).toBe(MenuItemType.BUTTON_SELECTOR);
- expect(menuItem.id).toBe(SetInlineFormatTextColorCommand.id);
- expect(menuItem.icon).toBe('HeaderTextColorIcon');
- expect(menuItem.tooltip).toBeUndefined();
- expect(Array.isArray((menuItem as any).selections)).toBe(true);
- expect(Icon).toBeDefined();
-
- const markup = renderToStaticMarkup(React.createElement(Icon!, { className: 'header-color-icon' }));
-
- expect(markup).toContain('>A<');
- expect(markup).toContain('width="1em"');
- expect(markup).toContain('height="1em"');
- });
-
- it('reuses the existing background color selector logic for the colors header action with the bucket icon', () => {
- const accessor = {
- get: () => ({
- get: () => undefined,
- register: () => undefined,
- }),
- } as never;
-
- const menuItem = ParagraphMenuBackgroundColorHeaderActionMenuItemFactory(accessor);
-
- expect(menuItem.type).toBe(MenuItemType.BUTTON_SELECTOR);
- expect(menuItem.id).toBe(SetInlineFormatTextBackgroundColorCommand.id);
- expect(menuItem.icon).toBe('PaintBucketDoubleIcon');
- expect(menuItem.tooltip).toBeUndefined();
- expect(Array.isArray((menuItem as any).selections)).toBe(true);
- });
-
- it('opens the popup away from the drag handle when there is not enough left space', () => {
- expect(getParagraphMenuPopupDirection(170)).toBe('right');
- expect(getParagraphMenuPopupDirection(260)).toBe('left');
- });
-
- it('creates a hover bridge overlapping the trigger edge for left-side paragraph popups', () => {
- expect(paragraphMenu.getParagraphMenuHoverBridgeStyle?.({
- left: 320,
- right: 348,
- top: 120,
- bottom: 152,
- }, 'left')).toEqual({
- left: 308,
- top: 112,
- width: 24,
- height: 48,
- });
- });
-
- it('creates a hover bridge overlapping the trigger edge for right-side paragraph popups', () => {
- expect(paragraphMenu.getParagraphMenuHoverBridgeStyle?.({
- left: 24,
- right: 52,
- top: 40,
- bottom: 72,
- }, 'right')).toEqual({
- left: 40,
- top: 32,
- width: 24,
- height: 48,
- });
- });
-
- it('delays opening the paragraph popup for hover and cancels before the delay elapses', () => {
- vi.useFakeTimers();
- const openMenu = vi.fn();
- const scheduler = createParagraphMenuHoverOpenScheduler(openMenu);
-
- scheduler.schedule();
- vi.advanceTimersByTime(PARAGRAPH_MENU_HOVER_OPEN_DELAY - 1);
-
- expect(openMenu).not.toHaveBeenCalled();
-
- vi.advanceTimersByTime(1);
-
- expect(openMenu).toHaveBeenCalledTimes(1);
-
- openMenu.mockClear();
- scheduler.schedule();
- scheduler.cancel();
- vi.advanceTimersByTime(PARAGRAPH_MENU_HOVER_OPEN_DELAY);
-
- expect(openMenu).not.toHaveBeenCalled();
- });
-
- it('opens the paragraph popup immediately for click', () => {
- vi.useFakeTimers();
- const openMenu = vi.fn();
- const scheduler = createParagraphMenuHoverOpenScheduler(openMenu);
-
- scheduler.schedule();
- scheduler.openNow();
-
- expect(openMenu).toHaveBeenCalledTimes(1);
-
- vi.advanceTimersByTime(PARAGRAPH_MENU_HOVER_OPEN_DELAY);
-
- expect(openMenu).toHaveBeenCalledTimes(1);
- });
-
- it('marks the paragraph menu interaction as active while hovering trigger, bridge, or popup', () => {
- const setParagraphMenuActive = vi.fn();
-
- setParagraphMenuInteractionActive({ setParagraphMenuActive } as never, true);
- setParagraphMenuInteractionActive({ setParagraphMenuActive } as never, false);
-
- expect(setParagraphMenuActive).toHaveBeenNthCalledWith(1, true);
- expect(setParagraphMenuActive).toHaveBeenNthCalledWith(2, false);
- });
-
- it('maps paragraph named styles to the active heading menu item', () => {
- expect(getParagraphMenuActiveHeadingCommandId(NamedStyleType.HEADING_1)).toBe(H1HeadingCommand.id);
- expect(getParagraphMenuActiveHeadingCommandId(NamedStyleType.HEADING_3)).toBe(H3HeadingCommand.id);
- expect(getParagraphMenuActiveHeadingCommandId(NamedStyleType.NORMAL_TEXT)).toBe(NormalTextHeadingCommand.id);
- expect(getParagraphMenuActiveHeadingCommandId(undefined)).toBe(NormalTextHeadingCommand.id);
- expect(getParagraphMenuActiveHeadingCommandId(NamedStyleType.TITLE)).toBe(TitleHeadingCommand.id);
- expect(getParagraphMenuActiveHeadingCommandId(NamedStyleType.SUBTITLE)).toBe(SubtitleHeadingCommand.id);
- });
-
- it('hides the alternate title shortcuts for the hovered paragraph style', () => {
- expect(getParagraphMenuHiddenHeadingCommandIds(NamedStyleType.TITLE)).toEqual([
- H4HeadingCommand.id,
- H5HeadingCommand.id,
- SubtitleHeadingCommand.id,
- ]);
- expect(getParagraphMenuHiddenHeadingCommandIds(NamedStyleType.SUBTITLE)).toEqual([
- H4HeadingCommand.id,
- H5HeadingCommand.id,
- TitleHeadingCommand.id,
- ]);
- expect(getParagraphMenuHiddenHeadingCommandIds(NamedStyleType.NORMAL_TEXT)).toEqual([
- H5HeadingCommand.id,
- TitleHeadingCommand.id,
- SubtitleHeadingCommand.id,
- ]);
- });
-
- it('keeps all six insert-state header icons visible for empty paragraphs', () => {
- expect(getParagraphMenuHiddenItemIds(
- DOC_PARAGRAPH_T_INSERT_MENU_ID,
- { kind: 'paragraph' } as never,
- NamedStyleType.NORMAL_TEXT
- )).toEqual([]);
-
- expect(getParagraphMenuHiddenItemIds(
- DOC_PARAGRAPH_T_EDIT_MENU_ID,
- { kind: 'paragraph' } as never,
- NamedStyleType.NORMAL_TEXT
- )).toEqual([
- H5HeadingCommand.id,
- TitleHeadingCommand.id,
- SubtitleHeadingCommand.id,
- ]);
- });
-
- it('shows paragraph settings only for paragraph and list menu targets', () => {
- expect(shouldShowParagraphSettingMenu(null)).toBe(true);
- expect(shouldShowParagraphSettingMenu({ kind: 'paragraph' } as never)).toBe(true);
- expect(shouldShowParagraphSettingMenu({ kind: 'paragraph', icon: 'OrderIcon' } as never)).toBe(true);
- expect(shouldShowParagraphSettingMenu({ kind: 'blockRange' } as never)).toBe(false);
- expect(shouldShowParagraphSettingMenu({ kind: 'table' } as never)).toBe(false);
- expect(shouldShowParagraphSettingMenu({ kind: 'customBlock' } as never)).toBe(false);
- });
-
- it('detects empty paragraph menu targets', () => {
- const paragraph = {
- paragraphStart: 2,
- paragraphEnd: 2,
- };
- const nonEmptyParagraph = {
- paragraphStart: 2,
- paragraphEnd: 3,
- };
-
- expect(isEmptyParagraphMenuTarget('a\r\r', paragraph as never)).toBe(true);
- expect(isEmptyParagraphMenuTarget('a\r\r', { paragraphStart: 1, paragraphEnd: 2 } as never)).toBe(true);
- expect(isEmptyParagraphMenuTarget('a\n\n', { paragraphStart: 1, paragraphEnd: 2 } as never)).toBe(true);
- expect(isEmptyParagraphMenuTarget('a\rb\r', nonEmptyParagraph as never)).toBe(false);
- });
-
- it('builds a collapsed selection range for the hovered paragraph', () => {
- expect(getParagraphMenuTargetRange({
- paragraphStart: 3,
- paragraphEnd: 8,
- segmentId: 'header-1',
- } as never)).toEqual({
- collapsed: true,
- endOffset: 3,
- segmentId: 'header-1',
- startOffset: 3,
- });
- });
-
- it('builds a full formatting range for whole-paragraph color actions', () => {
- expect(getParagraphFormattingRange({
- kind: 'paragraph',
- menuRange: {
- startOffset: 3,
- endOffset: 3,
- collapsed: true,
- },
- } as never, {
- paragraphStart: 3,
- paragraphEnd: 8,
- segmentId: 'header-1',
- } as never)).toEqual({
- collapsed: false,
- endOffset: 8,
- segmentId: 'header-1',
- startOffset: 3,
- });
-
- expect(getParagraphFormattingRange({
- kind: 'blockRange',
- blockRange: {
- startIndex: 6,
- endIndex: 14,
- },
- menuRange: {
- startOffset: 6,
- endOffset: 15,
- collapsed: false,
- },
- } as never, {
- segmentId: 'body',
- } as never)).toEqual({
- collapsed: false,
- endOffset: 15,
- segmentId: 'body',
- startOffset: 6,
- });
- });
-
- it('uses the formatting range for whole-paragraph selection commands', () => {
- const targetRange = { startOffset: 3, endOffset: 3, collapsed: true };
- const formattingRange = { startOffset: 3, endOffset: 8, collapsed: false };
-
- expect(getParagraphMenuCommandTargetRange(SetInlineFormatTextColorCommand.id, targetRange as never, formattingRange as never)).toEqual(formattingRange);
- expect(getParagraphMenuCommandTargetRange(H1HeadingCommand.id, targetRange as never, formattingRange as never)).toEqual(targetRange);
- });
-
- it('preserves context menu command params for paragraph menu actions', () => {
- expect(getParagraphMenuCommand({
- commandId: CreateDocTableCommand.id,
- id: 'doc.operation.create-table',
- label: 'doc.operation.create-table',
- params: { rowCount: 3, colCount: 5 },
- })).toEqual({
- commandId: CreateDocTableCommand.id,
- params: { rowCount: 3, colCount: 5 },
- });
-
- expect(getParagraphMenuCommand({
- label: 'doc.command.h1-heading',
- }, { startOffset: 3, endOffset: 3, collapsed: true })).toEqual({
- commandId: SetParagraphNamedStyleCommand.id,
- params: {
- value: NamedStyleType.HEADING_1,
- textRanges: [{ startOffset: 3, endOffset: 3, collapsed: true }],
- },
- });
- });
-
- it('preserves custom color values when resolving paragraph menu commands', () => {
- expect(getParagraphMenuResolvedCommand({
- id: SetInlineFormatTextColorCommand.id,
- value: '#ff5500',
- }, null)).toEqual({
- commandId: SetInlineFormatTextColorCommand.id,
- params: { value: '#ff5500' },
- });
-
- expect(getParagraphMenuResolvedCommand({
- id: SetInlineFormatTextBackgroundColorCommand.id,
- value: 'rgba(255, 140, 81, 0.3)',
- }, null)).toEqual({
- commandId: SetInlineFormatTextBackgroundColorCommand.id,
- params: { value: 'rgba(255, 140, 81, 0.3)' },
- });
- });
-
- it('passes the hovered paragraph range to current-paragraph menu commands', () => {
- const targetRange = { startOffset: 3, endOffset: 3, collapsed: true };
-
- expect(getParagraphMenuCommand({
- label: BulletListCommand.id,
- }, targetRange)).toEqual({
- commandId: BulletListCommand.id,
- params: { docRange: [targetRange] },
- });
- expect(getParagraphMenuCommand({
- label: OrderListCommand.id,
- }, targetRange)).toEqual({
- commandId: OrderListCommand.id,
- params: { docRange: [targetRange] },
- });
- expect(getParagraphMenuCommand({
- label: HorizontalLineCommand.id,
- }, targetRange)).toEqual({
- commandId: HorizontalLineCommand.id,
- params: { insertRange: targetRange },
- });
- expect(getParagraphMenuCommand({
- label: H1HeadingCommand.id,
- }, null)).toEqual({
- commandId: H1HeadingCommand.id,
- params: undefined,
- });
- });
-
- it('detects menu commands that should use the hovered block insert-below anchor', () => {
- expect(shouldUseInsertBelowRange(InsertBulletListBellowCommand.id, {
- id: InsertBulletListBellowCommand.id,
- })).toBe(true);
- expect(shouldUseInsertBelowRange('docs-callout.command.insert-below', {
- id: 'docs-callout.command.insert-below',
- })).toBe(true);
- expect(shouldUseInsertBelowRange('doc.command.insert-float-image', {
- id: 'doc.command.insert-float-image',
- })).toBe(true);
- expect(shouldUseInsertBelowRange(CreateDocTableCommand.id, {
- id: 'doc.operation.create-table',
- })).toBe(true);
- expect(shouldUseInsertBelowRange(H1HeadingCommand.id, {
- id: H1HeadingCommand.id,
- })).toBe(false);
- expect(shouldUseInsertBelowRange(H1HeadingCommand.id, {
- id: INSERT_BELLOW_MENU_ID,
- })).toBe(true);
- });
-
- it('releases the paragraph menu service before returning focus after command execution', () => {
- const calls: string[] = [];
-
- finishParagraphMenuCommand(
- {
- hideParagraphMenu: vi.fn(() => calls.push('service')),
- } as never,
- {
- focus: vi.fn(() => calls.push('focus')),
- } as never,
- () => calls.push('ui')
- );
-
- expect(calls).toEqual(['service', 'ui', 'focus']);
- });
-});
diff --git a/packages/docs-ui/src/controllers/doc-ui.controller.ts b/packages/docs-ui/src/controllers/doc-ui.controller.ts
index d727401ee1..b45b72d041 100644
--- a/packages/docs-ui/src/controllers/doc-ui.controller.ts
+++ b/packages/docs-ui/src/controllers/doc-ui.controller.ts
@@ -28,8 +28,6 @@ import { DeleteIcon, DocSettingIcon, TodoListDoubleIcon } from '@univerjs/icons'
import { BuiltInUIPart, ComponentManager, connectInjector, ILayoutService, IMenuManagerService, IShortcutService, IUIPartsService } from '@univerjs/ui';
import { CoreHeaderFooterCommand, OpenHeaderFooterPanelCommand } from '../commands/commands/doc-header-footer.command';
import { SidebarDocHeaderFooterPanelOperation } from '../commands/operations/doc-header-footer-panel.operation';
-import { BULLET_LIST_TYPE_COMPONENT, BulletListTypePicker, ORDER_LIST_TYPE_COMPONENT, OrderListTypePicker } from '../components/list-type-picker';
-import { DOC_PARAGRAPH_MENU_COMPONENT_KEY, DOC_TABLE_BLOCK_MENU_COMPONENT_KEY, ParagraphMenu, TableBlockMenu } from '../components/paragraph-menu';
import { floatToolbarMenuSchema, menuSchema } from '../menu/schema';
import { DocSelectionRenderService } from '../services/selection/doc-selection-render.service';
import { TabShortCut } from '../shortcuts/format.shortcut';
@@ -48,8 +46,10 @@ import {
UnderlineShortCut,
} from '../shortcuts/toolbar.shortcut';
import { DocFooter } from '../views/doc-footer';
-import { PAGE_SETTING_COMPONENT_ID, PageSettings } from '../views/page-settings';
-import { DocSideMenu } from '../views/side-menu';
+import { DocSideMenu } from '../views/DocSideMenu';
+import { BULLET_LIST_TYPE_COMPONENT, BulletListTypePicker, ORDER_LIST_TYPE_COMPONENT, OrderListTypePicker } from '../views/list-type-picker/index';
+import { PAGE_SETTING_COMPONENT_ID, PageSettings } from '../views/PageSettings';
+import { DOC_PARAGRAPH_MENU_COMPONENT_KEY, DOC_TABLE_BLOCK_MENU_COMPONENT_KEY, ParagraphMenu, TableBlockMenu } from '../views/ParagraphMenu';
export class DocUIController extends Disposable {
constructor(
diff --git a/packages/docs-ui/src/index.ts b/packages/docs-ui/src/index.ts
index 6de8afa3fd..91c2e0714e 100644
--- a/packages/docs-ui/src/index.ts
+++ b/packages/docs-ui/src/index.ts
@@ -167,5 +167,5 @@ export { getCanvasOffsetByEngine } from './services/selection/selection-utils';
export { getAnchorBounding, getLineBounding, TEXT_RANGE_LAYER_INDEX, TextRange } from './services/selection/text-range';
export { whenDocAndEditorFocused } from './shortcuts/utils';
export { DOC_VERTICAL_PADDING } from './types/const/padding';
-export { type IRichTextEditorProps, RichTextEditor } from './views/rich-text-editor';
export { type IKeyboardEventConfig, useEditor, useEditorClickOutside, useIsFocusing, useKeyboardEvent, useLeftAndRightArrow, useOnChange, useResize } from './views/rich-text-editor/hooks';
+export { type IRichTextEditorProps, RichTextEditor } from './views/RichTextEditor';
diff --git a/packages/docs-ui/src/menu/menu.ts b/packages/docs-ui/src/menu/menu.ts
index 541a769966..391f15805a 100644
--- a/packages/docs-ui/src/menu/menu.ts
+++ b/packages/docs-ui/src/menu/menu.ts
@@ -68,8 +68,8 @@ import { CreateDocTableCommand } from '../commands/commands/table/doc-table-crea
import { DocCreateTableOperation } from '../commands/operations/doc-create-table.operation';
import { DocOpenPageSettingCommand } from '../commands/operations/open-page-setting.operation';
import { getCommandSkeleton } from '../commands/util';
-import { BULLET_LIST_TYPE_COMPONENT, ORDER_LIST_TYPE_COMPONENT } from '../components/list-type-picker';
import { DocMenuStyleService } from '../services/doc-menu-style.service';
+import { BULLET_LIST_TYPE_COMPONENT, ORDER_LIST_TYPE_COMPONENT } from '../views/list-type-picker/index';
function getInsertTableHiddenObservable(
accessor: IAccessor
diff --git a/packages/docs-ui/src/services/__tests__/doc-paragraph-menu.service.spec.ts b/packages/docs-ui/src/services/__tests__/doc-paragraph-menu.service.spec.ts
index 907896155b..3760c6b222 100644
--- a/packages/docs-ui/src/services/__tests__/doc-paragraph-menu.service.spec.ts
+++ b/packages/docs-ui/src/services/__tests__/doc-paragraph-menu.service.spec.ts
@@ -19,7 +19,7 @@ import { DataStreamTreeTokenType, DOC_RANGE_TYPE, DocumentBlockRangeType, Preset
import { DocumentEditArea } from '@univerjs/engine-render';
import { BehaviorSubject, Subject } from 'rxjs';
import { describe, expect, it, vi } from 'vitest';
-import { DOC_PARAGRAPH_MENU_COMPONENT_KEY, DOC_TABLE_BLOCK_MENU_COMPONENT_KEY } from '../../components/paragraph-menu';
+import { DOC_PARAGRAPH_MENU_COMPONENT_KEY, DOC_TABLE_BLOCK_MENU_COMPONENT_KEY } from '../../views/ParagraphMenu';
import { getPreferredParagraphBoundsInRange, getTableBlockMenuHoverRect, getTableHorizontalViewportGeometry } from '../doc-event-manager.service';
import { DocParagraphMenuService } from '../doc-paragraph-menu.service';
diff --git a/packages/docs-ui/src/services/doc-paragraph-menu.service.ts b/packages/docs-ui/src/services/doc-paragraph-menu.service.ts
index 5136a7534b..7a6bdce9b9 100644
--- a/packages/docs-ui/src/services/doc-paragraph-menu.service.ts
+++ b/packages/docs-ui/src/services/doc-paragraph-menu.service.ts
@@ -23,7 +23,7 @@ import { DocSelectionManagerService, DocSkeletonManagerService } from '@univerjs
import { DocumentEditArea } from '@univerjs/engine-render';
import { BehaviorSubject, combineLatest, first, throttleTime } from 'rxjs';
import { VIEWPORT_KEY } from '../basics/docs-view-key';
-import { DOC_PARAGRAPH_MENU_COMPONENT_KEY, DOC_TABLE_BLOCK_MENU_COMPONENT_KEY } from '../components/paragraph-menu/component-keys';
+import { DOC_PARAGRAPH_MENU_COMPONENT_KEY, DOC_TABLE_BLOCK_MENU_COMPONENT_KEY } from '../views/paragraph-menu/component-keys';
import { DocEventManagerService } from './doc-event-manager.service';
import { calcDocRangePositions, DocCanvasPopManagerService, transformBound2OffsetBound, transformOffset2Bound } from './doc-popup-manager.service';
import { DocFloatMenuService } from './float-menu.service';
diff --git a/packages/docs-ui/src/services/doc-zoom.ts b/packages/docs-ui/src/services/doc-zoom.ts
index 3ee69e3e35..f43a750aac 100644
--- a/packages/docs-ui/src/services/doc-zoom.ts
+++ b/packages/docs-ui/src/services/doc-zoom.ts
@@ -18,7 +18,7 @@ import type { DocumentDataModel } from '@univerjs/core';
import { DocumentFlavor } from '@univerjs/core';
const DEFAULT_DOC_ZOOM_RATIO = 1;
-export const DEFAULT_MODERN_DOC_ZOOM_RATIO = 1.2;
+export const DEFAULT_MODERN_DOC_ZOOM_RATIO = 1;
type DocZoomSource = Pick<DocumentDataModel, 'getSettings' | 'getSnapshot'>;
diff --git a/packages/docs-ui/src/services/float-menu.service.ts b/packages/docs-ui/src/services/float-menu.service.ts
index ef318c775d..373e4c3b3b 100644
--- a/packages/docs-ui/src/services/float-menu.service.ts
+++ b/packages/docs-ui/src/services/float-menu.service.ts
@@ -19,7 +19,7 @@ import type { INodePosition, IRenderContext, IRenderModule, ITextRangeWithStyle
import { DataStreamTreeTokenType, deepCompare, Disposable, DocumentBlockRangeType, Inject, isInternalEditorID, IUniverInstanceService, toDisposable, UniverInstanceType } from '@univerjs/core';
import { DocSelectionManagerService } from '@univerjs/docs';
import { ComponentManager } from '@univerjs/ui';
-import { FloatToolbar } from '../components/float-toolbar/FloatToolbar';
+import { FloatToolbar } from '../views/float-toolbar/FloatToolbar';
import { DocCanvasPopManagerService } from './doc-popup-manager.service';
import { DocSelectionRenderService } from './selection/doc-selection-render.service';
diff --git a/packages/docs-ui/src/views/side-menu/index.tsx b/packages/docs-ui/src/views/DocSideMenu.tsx
similarity index 94%
rename from packages/docs-ui/src/views/side-menu/index.tsx
rename to packages/docs-ui/src/views/DocSideMenu.tsx
index d7e431992b..acb03a7e36 100644
--- a/packages/docs-ui/src/views/side-menu/index.tsx
+++ b/packages/docs-ui/src/views/DocSideMenu.tsx
@@ -16,19 +16,19 @@
import type { DocumentDataModel, IParagraph } from '@univerjs/core';
import type { IRichTextEditingMutationParams } from '@univerjs/docs';
-import type { ISideMenuItem } from '../../components/side-menu';
-import type { IUniverDocsUIConfig } from '../../config/config';
-import type { IMutiPageParagraphBound } from '../../services/doc-event-manager.service';
+import type { IUniverDocsUIConfig } from '../config/config';
+import type { IMutiPageParagraphBound } from '../services/doc-event-manager.service';
+import type { ISideMenuItem } from './SideMenu';
import { debounce, fromEventSubject, getPlainText, ICommandService, isInternalEditorID, IUniverInstanceService, NamedStyleType, UniverInstanceType } from '@univerjs/core';
import { RichTextEditingMutation } from '@univerjs/docs';
import { IRenderManagerService } from '@univerjs/engine-render';
import { useConfigValue, useDependency, useEvent, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useState } from 'react';
import { of, throttleTime } from 'rxjs';
-import { VIEWPORT_KEY } from '../../basics/docs-view-key';
-import { SideMenu } from '../../components/side-menu';
-import { DOCS_UI_PLUGIN_CONFIG_KEY } from '../../config/config';
-import { DocEventManagerService } from '../../services/doc-event-manager.service';
+import { VIEWPORT_KEY } from '../basics/docs-view-key';
+import { DOCS_UI_PLUGIN_CONFIG_KEY } from '../config/config';
+import { DocEventManagerService } from '../services/doc-event-manager.service';
+import { SideMenu } from './SideMenu';
const transformNamedStyleTypeToLevel = (type: NamedStyleType) => {
switch (type) {
diff --git a/packages/docs-ui/src/views/page-settings/index.tsx b/packages/docs-ui/src/views/PageSettings.tsx
similarity index 100%
rename from packages/docs-ui/src/views/page-settings/index.tsx
rename to packages/docs-ui/src/views/PageSettings.tsx
diff --git a/packages/docs-ui/src/components/paragraph-menu/index.tsx b/packages/docs-ui/src/views/ParagraphMenu.tsx
similarity index 96%
rename from packages/docs-ui/src/components/paragraph-menu/index.tsx
rename to packages/docs-ui/src/views/ParagraphMenu.tsx
index 8b262a610b..e26d846db3 100644
--- a/packages/docs-ui/src/components/paragraph-menu/index.tsx
+++ b/packages/docs-ui/src/views/ParagraphMenu.tsx
@@ -18,8 +18,8 @@ import type { DocumentDataModel, IDocumentBlockRange, IDocumentBody, IParagraph,
import type { ITextRangeWithStyle } from '@univerjs/engine-render';
import type { IPopup, IValueOption, RectPopupDirection } from '@univerjs/ui';
import type { CSSProperties } from 'react';
-import type { IMutiPageParagraphBound } from '../../services/doc-event-manager.service';
-import type { IDocBlockMenuTarget } from '../../services/doc-paragraph-menu.service';
+import type { IMutiPageParagraphBound } from '../services/doc-event-manager.service';
+import type { IDocBlockMenuTarget } from '../services/doc-paragraph-menu.service';
import { DataStreamTreeTokenType, DocumentBlockRangeType, ICommandService, IUniverInstanceService, JSONX, NamedStyleType, SliceBodyType, Tools, UniverInstanceType } from '@univerjs/core';
import { clsx } from '@univerjs/design';
import { DocContentInsertService, DocSelectionManagerService, RichTextEditingMutation } from '@univerjs/docs';
@@ -27,17 +27,17 @@ import { IRenderManagerService } from '@univerjs/engine-render';
import { ComponentManager, ContextMenuPanel, IClipboardInterfaceService, ILayoutService, RectPopup, useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
import { BehaviorSubject } from 'rxjs';
-import { BreakLineCommand } from '../../commands/commands/break-line.command';
-import { DocCopyCommand, DocCopyCurrentParagraphCommand, DocCutCurrentParagraphCommand, DocPasteCommand } from '../../commands/commands/clipboard.command';
-import { MoveDocBlockCommand } from '../../commands/commands/doc-block-move.command';
-import { DeleteCurrentParagraphCommand } from '../../commands/commands/doc-delete.command';
-import { HorizontalLineCommand } from '../../commands/commands/doc-horizontal-line.command';
-import { DocParagraphSettingCommand } from '../../commands/commands/doc-paragraph-setting.command';
-import { ResetInlineFormatTextBackgroundColorCommand, SetInlineFormatTextBackgroundColorCommand, SetInlineFormatTextColorCommand } from '../../commands/commands/inline-format.command';
-import { BulletListCommand, CheckListCommand, OrderListCommand } from '../../commands/commands/list.command';
-import { AlignCenterCommand, AlignJustifyCommand, AlignLeftCommand, AlignRightCommand } from '../../commands/commands/paragraph-align.command';
-import { H1HeadingCommand, H2HeadingCommand, H3HeadingCommand, H4HeadingCommand, H5HeadingCommand, NormalTextHeadingCommand, SetParagraphNamedStyleCommand, SubtitleHeadingCommand, TitleHeadingCommand } from '../../commands/commands/set-heading.command';
-import { DocTableDeleteTableCommand } from '../../commands/commands/table/doc-table-delete.command';
+import { BreakLineCommand } from '../commands/commands/break-line.command';
+import { DocCopyCommand, DocCopyCurrentParagraphCommand, DocCutCurrentParagraphCommand, DocPasteCommand } from '../commands/commands/clipboard.command';
+import { MoveDocBlockCommand } from '../commands/commands/doc-block-move.command';
+import { DeleteCurrentParagraphCommand } from '../commands/commands/doc-delete.command';
+import { HorizontalLineCommand } from '../commands/commands/doc-horizontal-line.command';
+import { DocParagraphSettingCommand } from '../commands/commands/doc-paragraph-setting.command';
+import { ResetInlineFormatTextBackgroundColorCommand, SetInlineFormatTextBackgroundColorCommand, SetInlineFormatTextColorCommand } from '../commands/commands/inline-format.command';
+import { BulletListCommand, CheckListCommand, OrderListCommand } from '../commands/commands/list.command';
+import { AlignCenterCommand, AlignJustifyCommand, AlignLeftCommand, AlignRightCommand } from '../commands/commands/paragraph-align.command';
+import { H1HeadingCommand, H2HeadingCommand, H3HeadingCommand, H4HeadingCommand, H5HeadingCommand, NormalTextHeadingCommand, SetParagraphNamedStyleCommand, SubtitleHeadingCommand, TitleHeadingCommand } from '../commands/commands/set-heading.command';
+import { DocTableDeleteTableCommand } from '../commands/commands/table/doc-table-delete.command';
import {
DOC_PARAGRAPH_T_DIVIDER_MENU_ID,
DOC_PARAGRAPH_T_EDIT_MENU_ID,
@@ -49,20 +49,12 @@ import {
DOC_TABLE_BLOCK_MENU_ID,
HEADING_ICON_MAP,
INSERT_BELLOW_MENU_ID,
-} from '../../menu/paragraph-menu';
-import { IDocClipboardService } from '../../services/clipboard/clipboard.service';
-import { DocEventManagerService } from '../../services/doc-event-manager.service';
-import { DocParagraphMenuService } from '../../services/doc-paragraph-menu.service';
+} from '../menu/paragraph-menu';
+import { IDocClipboardService } from '../services/clipboard/clipboard.service';
+import { DocEventManagerService } from '../services/doc-event-manager.service';
+import { DocParagraphMenuService } from '../services/doc-paragraph-menu.service';
-export { DOC_PARAGRAPH_MENU_COMPONENT_KEY, DOC_TABLE_BLOCK_MENU_COMPONENT_KEY } from './component-keys';
-
-export function getParagraphMenuIconSizeClass(iconKey: string): string {
- return iconKey === 'TextTypeIcon' ? 'univer-size-3' : 'univer-size-4';
-}
-
-export function getParagraphMenuContextMenuSizeVariant(): 'paragraph-t' {
- return 'paragraph-t';
-}
+export { DOC_PARAGRAPH_MENU_COMPONENT_KEY, DOC_TABLE_BLOCK_MENU_COMPONENT_KEY } from './paragraph-menu/component-keys';
export function getParagraphMenuPopupDirection(anchorLeft: number, menuWidth = 212, viewportPadding = 8): 'left' | 'right' {
return anchorLeft - menuWidth < viewportPadding ? 'right' : 'left';
@@ -981,15 +973,7 @@ function ParagraphMenuBase({ popup, tableBlockOnly = false }: { popup: IPopup; t
hoverOpenSchedulerRef.current.openNow();
}}
>
- <TargetIcon
- className={clsx(
- getParagraphMenuIconSizeClass(targetIconKey),
- `
- univer-text-gray-700
- dark:!univer-text-white
- `
- )}
- />
+ <TargetIcon />
{currentActiveTarget?.draggable && (
<button
type="button"
@@ -1123,7 +1107,6 @@ function ParagraphMenuBase({ popup, tableBlockOnly = false }: { popup: IPopup; t
<ContextMenuPanel
className="univer-w-[212px]"
menuType={resolvedParagraphMenuType}
- sizeVariant={getParagraphMenuContextMenuSizeVariant()}
activeItemIds={currentActiveTarget?.kind === 'table' ? undefined : paragraphMenuActiveItemIds}
hiddenItemIds={openMode === 'slash' || currentActiveTarget?.kind === 'table' ? undefined : paragraphMenuHiddenItemIds}
autoFocus={openMode === 'slash'}
diff --git a/packages/docs-ui/src/views/rich-text-editor/index.tsx b/packages/docs-ui/src/views/RichTextEditor.tsx
similarity index 93%
rename from packages/docs-ui/src/views/rich-text-editor/index.tsx
rename to packages/docs-ui/src/views/RichTextEditor.tsx
index ee153623d8..e4d366cb9e 100644
--- a/packages/docs-ui/src/views/rich-text-editor/index.tsx
+++ b/packages/docs-ui/src/views/RichTextEditor.tsx
@@ -16,19 +16,19 @@
import type { IDocumentData } from '@univerjs/core';
import type { CSSProperties, ReactNode, RefObject } from 'react';
-import type { Editor } from '../../services/editor/editor';
-import type { IKeyboardEventConfig } from './hooks';
+import type { Editor } from '../services/editor/editor';
+import type { IKeyboardEventConfig } from './rich-text-editor/hooks';
import { BuildTextUtils, createInternalEditorID, generateRandomId, getPlainText } from '@univerjs/core';
import { borderClassName, clsx } from '@univerjs/design';
import { DocSkeletonManagerService } from '@univerjs/docs';
import { IRenderManagerService } from '@univerjs/engine-render';
import { useDependency, useEvent, useObservable } from '@univerjs/ui';
import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
-import { IEditorService } from '../../services/editor/editor-manager.service';
-import { useEditorClickOutside, useIsFocusing, useKeyboardEvent, useResize } from './hooks';
-import { useEditor } from './hooks/use-editor';
-import { useLeftAndRightArrow } from './hooks/use-left-and-right-arrow';
-import { useOnChange } from './hooks/use-on-change';
+import { IEditorService } from '../services/editor/editor-manager.service';
+import { useEditorClickOutside, useIsFocusing, useKeyboardEvent, useResize } from './rich-text-editor/hooks';
+import { useEditor } from './rich-text-editor/hooks/use-editor';
+import { useLeftAndRightArrow } from './rich-text-editor/hooks/use-left-and-right-arrow';
+import { useOnChange } from './rich-text-editor/hooks/use-on-change';
export interface IRichTextEditorProps {
className?: string;
diff --git a/packages/docs-ui/src/components/side-menu/index.tsx b/packages/docs-ui/src/views/SideMenu.tsx
similarity index 100%
rename from packages/docs-ui/src/components/side-menu/index.tsx
rename to packages/docs-ui/src/views/SideMenu.tsx
diff --git a/packages/docs-ui/src/components/const.ts b/packages/docs-ui/src/views/const.ts
similarity index 100%
rename from packages/docs-ui/src/components/const.ts
rename to packages/docs-ui/src/views/const.ts
diff --git a/packages/docs-ui/src/components/editor/utils.ts b/packages/docs-ui/src/views/editor/utils.ts
similarity index 100%
rename from packages/docs-ui/src/components/editor/utils.ts
rename to packages/docs-ui/src/views/editor/utils.ts
diff --git a/packages/docs-ui/src/components/float-toolbar/FloatToolbar.stories.tsx b/packages/docs-ui/src/views/float-toolbar/FloatToolbar.stories.tsx
similarity index 100%
rename from packages/docs-ui/src/components/float-toolbar/FloatToolbar.stories.tsx
rename to packages/docs-ui/src/views/float-toolbar/FloatToolbar.stories.tsx
diff --git a/packages/docs-ui/src/components/float-toolbar/FloatToolbar.tsx b/packages/docs-ui/src/views/float-toolbar/FloatToolbar.tsx
similarity index 100%
rename from packages/docs-ui/src/components/float-toolbar/FloatToolbar.tsx
rename to packages/docs-ui/src/views/float-toolbar/FloatToolbar.tsx
diff --git a/packages/docs-ui/src/components/float-toolbar/__tests__/FloatToolbar.spec.ts b/packages/docs-ui/src/views/float-toolbar/__tests__/FloatToolbar.spec.ts
similarity index 100%
rename from packages/docs-ui/src/components/float-toolbar/__tests__/FloatToolbar.spec.ts
rename to packages/docs-ui/src/views/float-toolbar/__tests__/FloatToolbar.spec.ts
diff --git a/packages/docs-ui/src/components/list-type-picker/Picker.tsx b/packages/docs-ui/src/views/list-type-picker/Picker.tsx
similarity index 100%
rename from packages/docs-ui/src/components/list-type-picker/Picker.tsx
rename to packages/docs-ui/src/views/list-type-picker/Picker.tsx
diff --git a/packages/docs-ui/src/components/list-type-picker/index.ts b/packages/docs-ui/src/views/list-type-picker/index.ts
similarity index 100%
rename from packages/docs-ui/src/components/list-type-picker/index.ts
rename to packages/docs-ui/src/views/list-type-picker/index.ts
diff --git a/packages/docs-ui/src/components/paragraph-menu/component-keys.ts b/packages/docs-ui/src/views/paragraph-menu/component-keys.ts
similarity index 100%
rename from packages/docs-ui/src/components/paragraph-menu/component-keys.ts
rename to packages/docs-ui/src/views/paragraph-menu/component-keys.ts
diff --git a/packages/docs-ui/src/views/paragraph-setting/Setting.tsx b/packages/docs-ui/src/views/paragraph-setting/Setting.tsx
index 9e952fe20e..be5db7913e 100644
--- a/packages/docs-ui/src/views/paragraph-setting/Setting.tsx
+++ b/packages/docs-ui/src/views/paragraph-setting/Setting.tsx
@@ -16,7 +16,7 @@
import type { ReactNode } from 'react';
import { HorizontalAlign, LocaleService } from '@univerjs/core';
-import { borderClassName, clsx, InputNumber, Select, Tooltip } from '@univerjs/design';
+import { borderClassName, Button, clsx, InputNumber, Select, Tooltip } from '@univerjs/design';
import { AlignTextBothIcon, HorizontallyIcon, LeftJustifyingIcon, RightJustifyingIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
import { useMemo, useRef } from 'react';
@@ -33,8 +33,6 @@ import {
} from './hook/utils';
import { getLineSpacingInputConfig, getLineSpacingRuleOptions } from './line-spacing';
-const PARAGRAPH_SETTING_CONTROL_CLASS = 'univer-w-full';
-
const ParagraphSettingSection = (props: {
title: ReactNode;
children: ReactNode;
@@ -105,7 +103,7 @@ const AutoFocusInputNumber = (props: {
}, 30);
});
}}
- className={clsx(PARAGRAPH_SETTING_CONTROL_CLASS, className)}
+ className={clsx('univer-w-full', className)}
/>
);
};
@@ -140,37 +138,33 @@ export function ParagraphSetting() {
<ParagraphSettingSection title={localeService.t('docs-ui.doc.paragraphSetting.alignment')} first>
<div
className={clsx(`
- univer-grid univer-h-10 univer-grid-cols-4 univer-items-stretch univer-gap-1 univer-rounded-lg
- univer-bg-white univer-p-1
+ univer-flex univer-grid-cols-4 univer-items-center univer-justify-around univer-gap-2
+ univer-rounded-lg univer-bg-white univer-p-1
dark:!univer-bg-gray-900
`, borderClassName)}
>
{alignmentOptions.map((item) => {
return (
<Tooltip title={item.label} key={item.value} placement="bottom">
- <button
- type="button"
- className={clsx(`
- univer-flex univer-h-full univer-w-full univer-cursor-pointer univer-items-center
- univer-justify-center univer-rounded-md univer-border-none univer-bg-transparent
- univer-p-0 univer-text-gray-900 univer-transition-colors
- hover:univer-bg-gray-100
- dark:!univer-text-gray-100
- dark:hover:!univer-bg-gray-700
- `, {
- 'univer-bg-gray-200 dark:!univer-bg-gray-700': horizontalAlignValue === item.value,
- })}
- onClick={() => setHorizontalAlign(item.value)}
- >
- <span
- className="
- univer-flex univer-size-5 univer-items-center univer-justify-center
- univer-text-lg
- "
+ <span className="univer-flex univer-w-full univer-items-center univer-justify-center">
+ <Button
+ type="button"
+ variant="text"
+ className={clsx({
+ '!univer-bg-gray-200 dark:!univer-bg-gray-700': horizontalAlignValue === item.value,
+ })}
+ onClick={() => setHorizontalAlign(item.value)}
>
- {item.icon}
- </span>
- </button>
+ <span
+ className="
+ univer-flex univer-size-5 univer-items-center univer-justify-center
+ univer-text-lg
+ "
+ >
+ {item.icon}
+ </span>
+ </Button>
+ </span>
</Tooltip>
);
})}
@@ -205,7 +199,7 @@ export function ParagraphSetting() {
<ParagraphSettingRow label={localeService.t('docs-ui.doc.paragraphSetting.lineSpace')}>
<div className="univer-flex univer-w-full univer-flex-col univer-gap-2">
<Select
- className={PARAGRAPH_SETTING_CONTROL_CLASS}
+ className="univer-w-full"
value={`${spacingRule}`}
options={lineSpacingOptions}
onChange={(v) => setSpacingRule(Number(v))}
diff --git a/packages/docs-ui/src/components/side-menu/SideMenu.stories.tsx b/packages/docs-ui/src/views/side-menu/SideMenu.stories.tsx
similarity index 97%
rename from packages/docs-ui/src/components/side-menu/SideMenu.stories.tsx
rename to packages/docs-ui/src/views/side-menu/SideMenu.stories.tsx
index 91b3ba7a96..9a4a66dbb0 100644
--- a/packages/docs-ui/src/components/side-menu/SideMenu.stories.tsx
+++ b/packages/docs-ui/src/views/side-menu/SideMenu.stories.tsx
@@ -15,9 +15,9 @@
*/
import type { Meta } from '@storybook/react';
-import type { ISideMenuItem } from './index';
+import type { ISideMenuItem } from '../SideMenu';
import { useState } from 'react';
-import { SideMenu } from './index';
+import { SideMenu } from '../SideMenu';
const meta: Meta<typeof SideMenu> = {
title: 'Components / SideMenu',
diff --git a/packages/drawing-ui/src/index.ts b/packages/drawing-ui/src/index.ts
index eefc8ef55e..501aab0ddd 100644
--- a/packages/drawing-ui/src/index.ts
+++ b/packages/drawing-ui/src/index.ts
@@ -39,5 +39,4 @@ export { DrawingRenderService } from './services/drawing-render.service';
export { getUpdateParams } from './utils/get-update-params';
export { ImageCropperObject } from './views/crop/image-cropper-object';
export { COMPONENT_IMAGE_POPUP_MENU } from './views/image-popup-menu/component-name';
-export { ImagePopupMenu } from './views/image-popup-menu/ImagePopupMenu';
export { DrawingCommonPanel } from './views/panel/DrawingCommonPanel';
diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/cf.panel.controller.ts b/packages/sheets-conditional-formatting-ui/src/controllers/cf.panel.controller.ts
index e7ab9fedfa..76c3a9206c 100644
--- a/packages/sheets-conditional-formatting-ui/src/controllers/cf.panel.controller.ts
+++ b/packages/sheets-conditional-formatting-ui/src/controllers/cf.panel.controller.ts
@@ -18,7 +18,7 @@ import type { IDisposable } from '@univerjs/core';
import type { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
import { Disposable, generateRandomId, Inject, Injector, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import { ComponentManager, ISidebarService } from '@univerjs/ui';
-import { ConditionFormattingPanel } from '../components/panel';
+import { ConditionFormattingPanel } from '../views/ConditionFormattingPanel';
const CF_PANEL_KEY = 'sheet.conditional.formatting.panel';
diff --git a/packages/sheets-conditional-formatting-ui/src/components/color-picker/index.tsx b/packages/sheets-conditional-formatting-ui/src/views/ColorPicker.tsx
similarity index 100%
rename from packages/sheets-conditional-formatting-ui/src/components/color-picker/index.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/ColorPicker.tsx
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/index.tsx b/packages/sheets-conditional-formatting-ui/src/views/ConditionFormattingPanel.tsx
similarity index 95%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/index.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/ConditionFormattingPanel.tsx
index 465d76d2bf..8c8f40e10a 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/ConditionFormattingPanel.tsx
@@ -16,8 +16,8 @@
import type { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
import { useState } from 'react';
-import { RuleEdit } from './rule-edit';
-import { RuleList } from './rule-list';
+import { RuleEdit } from './panel/RuleEdit';
+import { RuleList } from './panel/RuleList';
interface IConditionFormattingPanelProps { rule?: IConditionFormattingRule };
diff --git a/packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.tsx b/packages/sheets-conditional-formatting-ui/src/views/ConditionalStyleEditor.tsx
similarity index 99%
rename from packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/ConditionalStyleEditor.tsx
index 60abf9dafe..8f6eca7444 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/ConditionalStyleEditor.tsx
@@ -20,7 +20,7 @@ import { clsx } from '@univerjs/design';
import { BoldIcon, FontColorDoubleIcon, ItalicIcon, StrikethroughIcon, UnderlineIcon } from '@univerjs/icons';
import { removeUndefinedAttr } from '@univerjs/sheets-conditional-formatting';
import { useEffect, useState } from 'react';
-import { ColorPicker } from '../color-picker';
+import { ColorPicker } from './ColorPicker';
interface IConditionalStyleEditorProps {
className?: string;
diff --git a/packages/sheets-conditional-formatting-ui/src/components/preview/index.tsx b/packages/sheets-conditional-formatting-ui/src/views/Preview.tsx
similarity index 100%
rename from packages/sheets-conditional-formatting-ui/src/components/preview/index.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/Preview.tsx
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx b/packages/sheets-conditional-formatting-ui/src/views/panel/RuleEdit.tsx
similarity index 96%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/panel/RuleEdit.tsx
index 48c3fd718f..c6c1d9c808 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/panel/RuleEdit.tsx
@@ -17,7 +17,7 @@
import type { IRange, Workbook } from '@univerjs/core';
import type { IRemoveSheetMutationParams } from '@univerjs/sheets';
import type { IAddCfCommandParams, IConditionFormattingRule, ISetCfCommandParams } from '@univerjs/sheets-conditional-formatting';
-import type { IStyleEditorProps } from './type';
+import type { IStyleEditorProps } from './rule-edit/type';
import { ICommandService, InterceptorManager, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import { Button, Select } from '@univerjs/design';
import { deserializeRangeWithSheet, serializeRange } from '@univerjs/engine-formula';
@@ -26,13 +26,13 @@ import { AddCfCommand, CFRuleType, CFSubRuleType, ConditionalFormattingRuleModel
import { RangeSelector } from '@univerjs/sheets-formula-ui';
import { useDependency } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
-import { ColorScaleStyleEditor } from './ColorScale';
-import { DataBarStyleEditor } from './DataBar';
-import { FormulaStyleEditor } from './Formula';
-import { HighlightCellStyleEditor } from './HighlightCell';
-import { IconSet } from './IconSet';
-import { RankStyleEditor } from './Rank';
-import { beforeSubmit, submit } from './type';
+import { ColorScaleStyleEditor } from './rule-edit/ColorScale';
+import { DataBarStyleEditor } from './rule-edit/DataBar';
+import { FormulaStyleEditor } from './rule-edit/Formula';
+import { HighlightCellStyleEditor } from './rule-edit/HighlightCell';
+import { IconSet } from './rule-edit/IconSet';
+import { RankStyleEditor } from './rule-edit/Rank';
+import { beforeSubmit, submit } from './rule-edit/type';
interface IRuleEditProps {
rule?: IConditionFormattingRule;
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx b/packages/sheets-conditional-formatting-ui/src/views/panel/RuleList.tsx
similarity index 99%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/panel/RuleList.tsx
index 666ba3bbcd..f97d5ddea3 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/panel/RuleList.tsx
@@ -37,8 +37,8 @@ import { useHighlightRange } from '@univerjs/sheets-ui';
import { useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useState } from 'react';
import { debounceTime, Observable } from 'rxjs';
-import { ConditionalFormattingI18nController } from '../../../controllers/cf.i18n.controller';
-import { Preview } from '../../preview';
+import { ConditionalFormattingI18nController } from '../../controllers/cf.i18n.controller';
+import { Preview } from '../Preview';
interface IRuleListProps {
onClick: (rule: IConditionFormattingRule) => void;
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/ColorScale.tsx
similarity index 99%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/ColorScale.tsx
index 30e526d9ec..810fe5d5d5 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/ColorScale.tsx
@@ -24,8 +24,8 @@ import { CFRuleType, CFValueType, createDefaultValueByValueType } from '@univerj
import { FormulaEditor } from '@univerjs/sheets-formula-ui';
import { useDependency, useSidebarClick } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
-import { ColorPicker } from '../../color-picker';
-import { Preview } from '../../preview';
+import { ColorPicker } from '../../ColorPicker';
+import { Preview } from '../../Preview';
import { previewClassName } from './styles';
const createOptionItem = (text: string, localeService: LocaleService) => ({ label: localeService.t(`sheets-conditional-formatting-ui.valueType.${text}`), value: text });
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/DataBar.tsx
similarity index 99%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/DataBar.tsx
index e95d74e55a..25d5438612 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/DataBar.tsx
@@ -24,8 +24,8 @@ import { CFRuleType, CFValueType, createDefaultValueByValueType, defaultDataBarN
import { FormulaEditor } from '@univerjs/sheets-formula-ui';
import { useDependency, useSidebarClick } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
-import { ColorPicker } from '../../color-picker';
-import { Preview } from '../../preview';
+import { ColorPicker } from '../../ColorPicker';
+import { Preview } from '../../Preview';
import { previewClassName } from './styles';
const createOptionItem = (text: CFValueType, localeService: LocaleService) => ({ label: localeService.t(`sheets-conditional-formatting-ui.valueType.${text}`), value: text });
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/Formula.tsx
similarity index 98%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/Formula.tsx
index 52bbacb2c4..1198bf80c7 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/Formula.tsx
@@ -24,8 +24,8 @@ import { CFRuleType, CFSubRuleType } from '@univerjs/sheets-conditional-formatti
import { FormulaEditor } from '@univerjs/sheets-formula-ui';
import { useDependency, useSidebarClick } from '@univerjs/ui';
import { useEffect, useRef, useState } from 'react';
-import { ConditionalStyleEditor } from '../../conditional-style-editor';
-import { Preview } from '../../preview';
+import { ConditionalStyleEditor } from '../../ConditionalStyleEditor';
+import { Preview } from '../../Preview';
import { previewClassName } from './styles';
export const FormulaStyleEditor = (props: IStyleEditorProps) => {
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/HighlightCell.tsx
similarity index 99%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/HighlightCell.tsx
index bb6aa6486e..d10f5877f5 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/HighlightCell.tsx
@@ -34,8 +34,8 @@ import {
} from '@univerjs/sheets-conditional-formatting';
import { useDependency } from '@univerjs/ui';
import { useEffect, useMemo, useState } from 'react';
-import { ConditionalStyleEditor } from '../../conditional-style-editor';
-import { Preview } from '../../preview';
+import { ConditionalStyleEditor } from '../../ConditionalStyleEditor';
+import { Preview } from '../../Preview';
import { WrapperError } from '../../wrapper-error/WrapperError';
import { previewClassName } from './styles';
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/IconSet.tsx
similarity index 100%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/IconSet.tsx
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/Rank.tsx
similarity index 98%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/Rank.tsx
index 8905c314d8..9fd823bf7c 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/Rank.tsx
@@ -21,8 +21,8 @@ import { Checkbox, InputNumber, Select } from '@univerjs/design';
import { CFNumberOperator, CFRuleType, CFSubRuleType } from '@univerjs/sheets-conditional-formatting';
import { useDependency } from '@univerjs/ui';
import { useEffect, useState } from 'react';
-import { ConditionalStyleEditor } from '../../conditional-style-editor';
-import { Preview } from '../../preview';
+import { ConditionalStyleEditor } from '../../ConditionalStyleEditor';
+import { Preview } from '../../Preview';
import { previewClassName } from './styles';
export const RankStyleEditor = (props: IStyleEditorProps) => {
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/styles.ts b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/styles.ts
similarity index 100%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/styles.ts
rename to packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/styles.ts
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/type.ts b/packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/type.ts
similarity index 100%
rename from packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/type.ts
rename to packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/type.ts
diff --git a/packages/sheets-conditional-formatting-ui/src/components/wrapper-error/WrapperError.tsx b/packages/sheets-conditional-formatting-ui/src/views/wrapper-error/WrapperError.tsx
similarity index 100%
rename from packages/sheets-conditional-formatting-ui/src/components/wrapper-error/WrapperError.tsx
rename to packages/sheets-conditional-formatting-ui/src/views/wrapper-error/WrapperError.tsx
diff --git a/packages/sheets-data-validation-ui/src/controllers/dv-ui.controller.ts b/packages/sheets-data-validation-ui/src/controllers/dv-ui.controller.ts
index b26a646019..7ebc3b8a18 100644
--- a/packages/sheets-data-validation-ui/src/controllers/dv-ui.controller.ts
+++ b/packages/sheets-data-validation-ui/src/controllers/dv-ui.controller.ts
@@ -22,9 +22,9 @@ import { DataValidationIcon } from '@univerjs/icons';
import { ComponentManager } from '@univerjs/ui';
import { DATA_VALIDATION_PANEL } from '../commands/operations/data-validation.operation';
import { DataValidationPanel } from '../views/components';
+import { DateShowTimeOption } from '../views/components/DateShowTimeOption';
import { FORMULA_INPUTS } from '../views/components/formula-input';
-import { ListRenderModeInput } from '../views/components/render-mode';
-import { DateShowTimeOption } from '../views/components/show-time';
+import { ListRenderModeInput } from '../views/components/ListRenderModeInput';
import { CheckboxValidatorView } from '../views/validator-views/checkbox-validator-view';
import { CustomFormulaValidatorView } from '../views/validator-views/custom-validator-view';
import { DateValidatorView } from '../views/validator-views/date-validator-view';
diff --git a/packages/sheets-data-validation-ui/src/index.ts b/packages/sheets-data-validation-ui/src/index.ts
index cbad9ddbbd..d6b6b6e3a0 100644
--- a/packages/sheets-data-validation-ui/src/index.ts
+++ b/packages/sheets-data-validation-ui/src/index.ts
@@ -19,4 +19,3 @@ import './global.css';
export type { IUniverSheetsDataValidationUIConfig } from './config/config';
export { UniverSheetsDataValidationMobileUIPlugin } from './mobile-plugin';
export { UniverSheetsDataValidationUIPlugin } from './plugin';
-export { BaseSheetDataValidatorView } from './views/validator-views/sheet-validator-view';
diff --git a/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx b/packages/sheets-data-validation-ui/src/views/components/DataValidationDetail.tsx
similarity index 99%
rename from packages/sheets-data-validation-ui/src/views/components/detail/index.tsx
rename to packages/sheets-data-validation-ui/src/views/components/DataValidationDetail.tsx
index a5b6445cfc..63ecd858f5 100644
--- a/packages/sheets-data-validation-ui/src/views/components/detail/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/DataValidationDetail.tsx
@@ -27,8 +27,8 @@ import { RangeSelector } from '@univerjs/sheets-formula-ui';
import { ComponentManager, useDependency, useEvent, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
import { of } from 'rxjs';
-import { DataValidationPanelService } from '../../../services/data-validation-panel.service';
-import { DataValidationOptions } from '../options';
+import { DataValidationPanelService } from '../../services/data-validation-panel.service';
+import { DataValidationOptions } from './DataValidationOptions';
// debounce execute commands, for better redo-undo experience
const debounceExecuteFactory = (commandService: ICommandService) => debounce(
diff --git a/packages/sheets-data-validation-ui/src/views/components/item/index.tsx b/packages/sheets-data-validation-ui/src/views/components/DataValidationItem.tsx
similarity index 100%
rename from packages/sheets-data-validation-ui/src/views/components/item/index.tsx
rename to packages/sheets-data-validation-ui/src/views/components/DataValidationItem.tsx
diff --git a/packages/sheets-data-validation-ui/src/views/components/list/index.tsx b/packages/sheets-data-validation-ui/src/views/components/DataValidationList.tsx
similarity index 97%
rename from packages/sheets-data-validation-ui/src/views/components/list/index.tsx
rename to packages/sheets-data-validation-ui/src/views/components/DataValidationList.tsx
index d5d6478434..276d427006 100644
--- a/packages/sheets-data-validation-ui/src/views/components/list/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/DataValidationList.tsx
@@ -22,8 +22,8 @@ import { checkRangesEditablePermission } from '@univerjs/sheets';
import { AddSheetDataValidationCommand, createDefaultNewRule, RemoveSheetAllDataValidationCommand, SheetDataValidationModel } from '@univerjs/sheets-data-validation';
import { useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useState } from 'react';
-import { DataValidationPanelService } from '../../../services/data-validation-panel.service';
-import { DataValidationItem } from '../item';
+import { DataValidationPanelService } from '../../services/data-validation-panel.service';
+import { DataValidationItem } from './DataValidationItem';
export function DataValidationList(props: { workbook: Workbook }) {
const sheetDataValidationModel = useDependency(SheetDataValidationModel);
diff --git a/packages/sheets-data-validation-ui/src/views/components/options/index.tsx b/packages/sheets-data-validation-ui/src/views/components/DataValidationOptions.tsx
similarity index 100%
rename from packages/sheets-data-validation-ui/src/views/components/options/index.tsx
rename to packages/sheets-data-validation-ui/src/views/components/DataValidationOptions.tsx
diff --git a/packages/sheets-data-validation-ui/src/views/components/panel/index.tsx b/packages/sheets-data-validation-ui/src/views/components/DataValidationPanel.tsx
similarity index 89%
rename from packages/sheets-data-validation-ui/src/views/components/panel/index.tsx
rename to packages/sheets-data-validation-ui/src/views/components/DataValidationPanel.tsx
index c05700f04e..f09b73df0d 100644
--- a/packages/sheets-data-validation-ui/src/views/components/panel/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/DataValidationPanel.tsx
@@ -18,9 +18,9 @@ import type { Workbook } from '@univerjs/core';
import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { useDependency, useObservable } from '@univerjs/ui';
import { of } from 'rxjs';
-import { DataValidationPanelService } from '../../../services/data-validation-panel.service';
-import { DataValidationDetail } from '../detail';
-import { DataValidationList } from '../list';
+import { DataValidationPanelService } from '../../services/data-validation-panel.service';
+import { DataValidationDetail } from './DataValidationDetail';
+import { DataValidationList } from './DataValidationList';
export const DataValidationPanel = () => {
const dataValidationPanelService = useDependency(DataValidationPanelService);
diff --git a/packages/sheets-data-validation-ui/src/views/components/show-time/index.tsx b/packages/sheets-data-validation-ui/src/views/components/DateShowTimeOption.tsx
similarity index 100%
rename from packages/sheets-data-validation-ui/src/views/components/show-time/index.tsx
rename to packages/sheets-data-validation-ui/src/views/components/DateShowTimeOption.tsx
diff --git a/packages/sheets-data-validation-ui/src/views/components/render-mode/index.tsx b/packages/sheets-data-validation-ui/src/views/components/ListRenderModeInput.tsx
similarity index 100%
rename from packages/sheets-data-validation-ui/src/views/components/render-mode/index.tsx
rename to packages/sheets-data-validation-ui/src/views/components/ListRenderModeInput.tsx
diff --git a/packages/sheets-data-validation-ui/src/views/components/index.ts b/packages/sheets-data-validation-ui/src/views/components/index.ts
index 6639f681ba..9e6fe0f7a3 100644
--- a/packages/sheets-data-validation-ui/src/views/components/index.ts
+++ b/packages/sheets-data-validation-ui/src/views/components/index.ts
@@ -14,4 +14,4 @@
* limitations under the License.
*/
-export { DataValidationPanel } from './panel';
+export { DataValidationPanel } from './DataValidationPanel';
diff --git a/packages/sheets-data-validation-ui/src/views/validator-views/date-validator-view.ts b/packages/sheets-data-validation-ui/src/views/validator-views/date-validator-view.ts
index 34a699ec4c..167bca8bc6 100644
--- a/packages/sheets-data-validation-ui/src/views/validator-views/date-validator-view.ts
+++ b/packages/sheets-data-validation-ui/src/views/validator-views/date-validator-view.ts
@@ -16,8 +16,8 @@
import { DataValidationType } from '@univerjs/core';
import { DataValidatorDropdownType } from '@univerjs/data-validation';
+import { DateShowTimeOption } from '../components/DateShowTimeOption';
import { BASE_FORMULA_INPUT_NAME } from '../components/formula-input/formula-input';
-import { DateShowTimeOption } from '../components/show-time';
import { BaseSheetDataValidatorView } from './sheet-validator-view';
export class DateValidatorView extends BaseSheetDataValidatorView {
diff --git a/packages/sheets-data-validation-ui/src/views/validator-views/list-validator-view.ts b/packages/sheets-data-validation-ui/src/views/validator-views/list-validator-view.ts
index d54a8ced7d..c37425aa02 100644
--- a/packages/sheets-data-validation-ui/src/views/validator-views/list-validator-view.ts
+++ b/packages/sheets-data-validation-ui/src/views/validator-views/list-validator-view.ts
@@ -19,7 +19,7 @@ import type { IBaseDataValidationWidget } from '@univerjs/data-validation';
import { DataValidationType } from '@univerjs/core';
import { DataValidatorDropdownType } from '@univerjs/data-validation';
import { LIST_FORMULA_INPUT_NAME } from '../components/formula-input';
-import { ListRenderModeInput } from '../components/render-mode';
+import { ListRenderModeInput } from '../components/ListRenderModeInput';
import { DropdownWidget } from '../widgets/dropdown-widget';
import { BaseSheetDataValidatorView } from './sheet-validator-view';
diff --git a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.tsx b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.tsx
index 9feebd8361..4903bb6f3a 100644
--- a/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.tsx
+++ b/packages/sheets-drawing-ui/src/controllers/sheet-drawing-printing.controller.tsx
@@ -17,7 +17,7 @@
import type { IRange } from '@univerjs/core';
import type { IFloatDomData } from '@univerjs/sheets-drawing';
import type { ComponentType } from '@univerjs/ui';
-import type { IPrintingFloatDomProps } from '../views/printing-float-dom';
+import type { IPrintingFloatDomProps } from '../views/PrintingFloatDom';
import { Disposable, DrawingTypeEnum, Inject, Injector, PRINT_CHART_COMPONENT_KEY, Tools } from '@univerjs/core';
import { render, unmount } from '@univerjs/design';
import { IDrawingManagerService } from '@univerjs/drawing';
@@ -26,7 +26,7 @@ import { IRenderManagerService } from '@univerjs/engine-render';
import { SheetPrintInterceptorService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
import { ComponentManager, connectInjector } from '@univerjs/ui';
import { SheetCanvasFloatDomManagerService } from '../services/canvas-float-dom-manager.service';
-import { PrintingFloatDom } from '../views/printing-float-dom';
+import { PrintingFloatDom } from '../views/PrintingFloatDom';
export class SheetDrawingPrintingController extends Disposable {
constructor(
diff --git a/packages/sheets-drawing-ui/src/index.ts b/packages/sheets-drawing-ui/src/index.ts
index 18131f4699..d5a0b7ea38 100644
--- a/packages/sheets-drawing-ui/src/index.ts
+++ b/packages/sheets-drawing-ui/src/index.ts
@@ -29,6 +29,19 @@ export { SheetsDrawingGroupCopyPasteController } from './controllers/sheet-drawi
export { SheetDrawingUpdateController } from './controllers/sheet-drawing-update.controller';
export { SHEETS_IMAGE_MENU_ID } from './menu/image.menu';
export { UniverSheetsDrawingUIPlugin } from './plugin';
-export { BatchSaveImagesService, FileNamePart, type IBatchSaveImagesConfig, IBatchSaveImagesService, type ICellImageInfo } from './services/batch-save-images.service';
-export { calcSheetFloatDomPosition, type ICanvasFloatDom, type ICanvasFloatDomInfo, type IDOMAnchor, SHEET_FLOAT_DOM_PREFIX, SheetCanvasFloatDomManagerService } from './services/canvas-float-dom-manager.service';
+export {
+ BatchSaveImagesService,
+ FileNamePart,
+ type IBatchSaveImagesConfig,
+ IBatchSaveImagesService,
+ type ICellImageInfo,
+} from './services/batch-save-images.service';
+export {
+ calcSheetFloatDomPosition,
+ type ICanvasFloatDom,
+ type ICanvasFloatDomInfo,
+ type IDOMAnchor,
+ SHEET_FLOAT_DOM_PREFIX,
+ SheetCanvasFloatDomManagerService,
+} from './services/canvas-float-dom-manager.service';
export { SheetDrawingAnchor } from './views/sheet-image-panel/SheetDrawingAnchor';
diff --git a/packages/sheets-drawing-ui/src/views/printing-float-dom/index.tsx b/packages/sheets-drawing-ui/src/views/PrintingFloatDom.tsx
similarity index 97%
rename from packages/sheets-drawing-ui/src/views/printing-float-dom/index.tsx
rename to packages/sheets-drawing-ui/src/views/PrintingFloatDom.tsx
index 23044c73ce..48ad5e5997 100644
--- a/packages/sheets-drawing-ui/src/views/printing-float-dom/index.tsx
+++ b/packages/sheets-drawing-ui/src/views/PrintingFloatDom.tsx
@@ -21,7 +21,7 @@ import type { IFloatDom, IFloatDomLayout } from '@univerjs/ui';
import { PrintFloatDomSingle } from '@univerjs/ui';
import { useMemo } from 'react';
import { BehaviorSubject } from 'rxjs';
-import { transformBound2DOMBound } from '../../services/canvas-float-dom-manager.service';
+import { transformBound2DOMBound } from '../services/canvas-float-dom-manager.service';
export interface IPrintingFloatDomProps {
floatDomInfos: IFloatDomData[];
diff --git a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit.tsx
similarity index 97%
rename from packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
rename to packages/sheets-hyper-link-ui/src/views/CellLinkEdit.tsx
index 3c07b2b46d..031792990b 100644
--- a/packages/sheets-hyper-link-ui/src/views/CellLinkEdit/index.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkEdit.tsx
@@ -41,13 +41,13 @@ import { AddHyperLinkCommand, AddRichHyperLinkCommand, SheetHyperLinkType, Sheet
import { IEditorBridgeService, IMarkSelectionService, ScrollToRangeOperation } from '@univerjs/sheets-ui';
import { KeyCode, useDependency, useEvent, useObservable } from '@univerjs/ui';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { CloseHyperLinkPopupOperation } from '../../commands/operations/popup.operations';
-import { isLegalLink, serializeUrl } from '../../common/util';
-import { SheetsHyperLinkPopupService } from '../../services/popup.service';
-import { SheetsHyperLinkResolverService } from '../../services/resolver.service';
-import { SheetsHyperLinkSidePanelService } from '../../services/side-panel.service';
-import { HyperLinkEditSourceType } from '../../types/enums/edit-source';
-import { isBlankInput, resolveRangePayload } from './utils';
+import { CloseHyperLinkPopupOperation } from '../commands/operations/popup.operations';
+import { isLegalLink, serializeUrl } from '../common/util';
+import { SheetsHyperLinkPopupService } from '../services/popup.service';
+import { SheetsHyperLinkResolverService } from '../services/resolver.service';
+import { SheetsHyperLinkSidePanelService } from '../services/side-panel.service';
+import { HyperLinkEditSourceType } from '../types/enums/edit-source';
+import { isBlankInput, resolveRangePayload } from './CellLinkEdit/utils';
export const CellLinkEdit = () => {
const [id, setId] = useState('');
diff --git a/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx b/packages/sheets-hyper-link-ui/src/views/CellLinkPopup.tsx
similarity index 96%
rename from packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
rename to packages/sheets-hyper-link-ui/src/views/CellLinkPopup.tsx
index f0bca8fd9f..8e376395c9 100644
--- a/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkPopup.tsx
@@ -15,7 +15,7 @@
*/
import type { ICustomRange, Nullable, Workbook } from '@univerjs/core';
-import type { IHyperLinkPopup } from '../../services/popup.service';
+import type { IHyperLinkPopup } from '../services/popup.service';
import { ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import { borderClassName, clsx, MessageType, Tooltip } from '@univerjs/design';
import { AllBorderIcon, CopyIcon, LinkIcon, UnlinkIcon, WriteIcon, XlsxMultiIcon } from '@univerjs/icons';
@@ -23,10 +23,10 @@ import { CancelHyperLinkCommand, CancelRichHyperLinkCommand, SheetHyperLinkType,
import { IEditorBridgeService } from '@univerjs/sheets-ui';
import { IMessageService, useDependency } from '@univerjs/ui';
import { useEffect, useState } from 'react';
-import { OpenHyperLinkEditPanelOperation } from '../../commands/operations/popup.operations';
-import { SheetsHyperLinkPopupService } from '../../services/popup.service';
-import { SheetsHyperLinkResolverService } from '../../services/resolver.service';
-import { HyperLinkEditSourceType } from '../../types/enums/edit-source';
+import { OpenHyperLinkEditPanelOperation } from '../commands/operations/popup.operations';
+import { SheetsHyperLinkPopupService } from '../services/popup.service';
+import { SheetsHyperLinkResolverService } from '../services/resolver.service';
+import { HyperLinkEditSourceType } from '../types/enums/edit-source';
const iconsMap = {
[SheetHyperLinkType.URL]: <LinkIcon />,
diff --git a/packages/sheets-note-ui/src/index.ts b/packages/sheets-note-ui/src/index.ts
index 9ff99bb73e..314fc210b6 100644
--- a/packages/sheets-note-ui/src/index.ts
+++ b/packages/sheets-note-ui/src/index.ts
@@ -21,4 +21,3 @@ export { SheetsCellContentController } from './controllers/sheets-cell-content.c
export { SheetsNotePopupController } from './controllers/sheets-note-popup.controller';
export { UniverSheetsNoteUIPlugin } from './plugin';
export { SheetsNotePopupService } from './services/sheets-note-popup.service';
-export { SheetsNote } from './views/Note';
diff --git a/packages/sheets-numfmt-ui/src/controllers/numfmt.controller.ts b/packages/sheets-numfmt-ui/src/controllers/numfmt.controller.ts
index fc6e13d97a..36d87fecb8 100644
--- a/packages/sheets-numfmt-ui/src/controllers/numfmt.controller.ts
+++ b/packages/sheets-numfmt-ui/src/controllers/numfmt.controller.ts
@@ -17,7 +17,7 @@
import type { IDisposable, IRange, Workbook } from '@univerjs/core';
import type { ISetNumfmtMutationParams } from '@univerjs/sheets';
import type { ISetNumfmtCommandParams } from '@univerjs/sheets-numfmt';
-import type { ISheetNumfmtPanelProps } from '../views/components';
+import type { ISheetNumfmtPanelProps } from '../views/SheetNumfmtPanel';
import {
CellValueType,
Disposable,
@@ -49,7 +49,7 @@ import { combineLatest, merge, Observable } from 'rxjs';
import { debounceTime, map, switchMap, tap } from 'rxjs/operators';
import { CloseNumfmtPanelOperator } from '../commands/operations/close.numfmt.panel.operation';
import { OpenNumfmtPanelOperator } from '../commands/operations/open.numfmt.panel.operation';
-import { SheetNumfmtPanel } from '../views/components';
+import { SheetNumfmtPanel } from '../views/SheetNumfmtPanel';
const SHEET_NUMFMT_PANEL = 'SHEET_NUMFMT_PANEL';
diff --git a/packages/sheets-numfmt-ui/src/views/components/index.tsx b/packages/sheets-numfmt-ui/src/views/SheetNumfmtPanel.tsx
similarity index 89%
rename from packages/sheets-numfmt-ui/src/views/components/index.tsx
rename to packages/sheets-numfmt-ui/src/views/SheetNumfmtPanel.tsx
index 29cb74c3ec..9d87d792dc 100644
--- a/packages/sheets-numfmt-ui/src/views/components/index.tsx
+++ b/packages/sheets-numfmt-ui/src/views/SheetNumfmtPanel.tsx
@@ -16,21 +16,21 @@
import type { ISelectProps } from '@univerjs/design';
import type { FC } from 'react';
-import type { IBusinessComponentProps } from './interface';
+import type { IBusinessComponentProps } from './components/interface';
import { LocaleService } from '@univerjs/core';
import { Button, clsx, scrollbarClassName, Select } from '@univerjs/design';
import { getCurrencyType } from '@univerjs/sheets-numfmt';
import { useDependency } from '@univerjs/ui';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { UserHabitCurrencyContext } from '../../controllers/user-habit.controller';
-import { useCurrencyOptions } from '../hooks/use-currency-options';
-import { useNextTick } from '../hooks/use-next-tick';
-import { AccountingPanel, isAccountingPanel } from './Accounting';
-import { CurrencyPanel, isCurrencyPanel } from './Currency';
-import { CustomFormat } from './CustomFormat';
-import { DatePanel, isDatePanel } from './Date';
-import { GeneralPanel, isGeneralPanel } from './General';
-import { isThousandthPercentilePanel, ThousandthPercentilePanel } from './ThousandthPercentile';
+import { UserHabitCurrencyContext } from '../controllers/user-habit.controller';
+import { AccountingPanel, isAccountingPanel } from './components/Accounting';
+import { CurrencyPanel, isCurrencyPanel } from './components/Currency';
+import { CustomFormat } from './components/CustomFormat';
+import { DatePanel, isDatePanel } from './components/Date';
+import { GeneralPanel, isGeneralPanel } from './components/General';
+import { isThousandthPercentilePanel, ThousandthPercentilePanel } from './components/ThousandthPercentile';
+import { useCurrencyOptions } from './hooks/use-currency-options';
+import { useNextTick } from './hooks/use-next-tick';
export interface ISheetNumfmtPanelProps {
value: { defaultValue: number; defaultPattern: string; row: number; col: number };
diff --git a/packages/sheets-numfmt-ui/src/views/components/stories/Panel.stories.tsx b/packages/sheets-numfmt-ui/src/views/components/stories/Panel.stories.tsx
index 32226114b1..3affe4ca01 100644
--- a/packages/sheets-numfmt-ui/src/views/components/stories/Panel.stories.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/stories/Panel.stories.tsx
@@ -16,7 +16,7 @@
import type { Meta, StoryObj } from '@storybook/react';
import type { Dependency } from '@univerjs/core';
-import type { ISheetNumfmtPanelProps } from '../index';
+import type { ISheetNumfmtPanelProps } from '../../SheetNumfmtPanel';
import { LocaleService, LocaleType } from '@univerjs/core';
import { RediContext } from '@univerjs/ui';
import { useContext, useState } from 'react';
@@ -24,7 +24,7 @@ import { UserHabitController } from '../../../controllers/user-habit.controller'
import enUS from '../../../locale/en-US';
import ruRU from '../../../locale/ru-RU';
import zhCN from '../../../locale/zh-CN';
-import { SheetNumfmtPanel } from '../index';
+import { SheetNumfmtPanel } from '../../SheetNumfmtPanel';
const meta: Meta = {
title: 'numfmt',
diff --git a/packages/sheets-thread-comment-ui/src/controllers/sheets-thread-comment.controller.ts b/packages/sheets-thread-comment-ui/src/controllers/sheets-thread-comment.controller.ts
index a96f119f4a..8a0ab1befd 100644
--- a/packages/sheets-thread-comment-ui/src/controllers/sheets-thread-comment.controller.ts
+++ b/packages/sheets-thread-comment-ui/src/controllers/sheets-thread-comment.controller.ts
@@ -20,8 +20,8 @@ import { ComponentManager, IMenuManagerService, IShortcutService } from '@univer
import { AddCommentShortcut } from '../menu/menu';
import { menuSchema } from '../menu/schema';
import { SHEETS_THREAD_COMMENT_MODAL, SHEETS_THREAD_COMMENT_PANEL } from '../types/const';
-import { SheetsThreadCommentCell } from '../views/sheets-thread-comment-cell';
-import { SheetsThreadCommentPanel } from '../views/sheets-thread-comment-panel';
+import { SheetsThreadCommentCell } from '../views/SheetsThreadCommentCell';
+import { SheetsThreadCommentPanel } from '../views/SheetsThreadCommentPanel';
export class SheetsThreadCommentController extends Disposable {
constructor(
diff --git a/packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-cell/index.tsx b/packages/sheets-thread-comment-ui/src/views/SheetsThreadCommentCell.tsx
similarity index 96%
rename from packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-cell/index.tsx
rename to packages/sheets-thread-comment-ui/src/views/SheetsThreadCommentCell.tsx
index c4e42e5200..ed9d00588f 100644
--- a/packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-cell/index.tsx
+++ b/packages/sheets-thread-comment-ui/src/views/SheetsThreadCommentCell.tsx
@@ -19,7 +19,7 @@ import { IUniverInstanceService, Tools, UniverInstanceType } from '@univerjs/cor
import { SheetsThreadCommentModel } from '@univerjs/sheets-thread-comment';
import { ThreadCommentTree, ThreadCommentTreeLocation } from '@univerjs/thread-comment-ui';
import { useDependency, useObservable } from '@univerjs/ui';
-import { SheetsThreadCommentPopupService } from '../../services/sheets-thread-comment-popup.service';
+import { SheetsThreadCommentPopupService } from '../services/sheets-thread-comment-popup.service';
export const SheetsThreadCommentCell = () => {
const univerInstanceService = useDependency(IUniverInstanceService);
diff --git a/packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-panel/index.tsx b/packages/sheets-thread-comment-ui/src/views/SheetsThreadCommentPanel.tsx
similarity index 96%
rename from packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-panel/index.tsx
rename to packages/sheets-thread-comment-ui/src/views/SheetsThreadCommentPanel.tsx
index 49bd7cda0b..01b0861dd3 100644
--- a/packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-panel/index.tsx
+++ b/packages/sheets-thread-comment-ui/src/views/SheetsThreadCommentPanel.tsx
@@ -23,8 +23,8 @@ import { ThreadCommentPanel, ThreadCommentPanelService } from '@univerjs/thread-
import { useDependency, useObservable } from '@univerjs/ui';
import { useCallback, useEffect, useMemo, useRef } from 'react';
import { map } from 'rxjs';
-import { ShowAddSheetCommentModalOperation } from '../../commands/operations/comment.operation';
-import { SheetsThreadCommentPopupService } from '../../services/sheets-thread-comment-popup.service';
+import { ShowAddSheetCommentModalOperation } from '../commands/operations/comment.operation';
+import { SheetsThreadCommentPopupService } from '../services/sheets-thread-comment-popup.service';
export const SheetsThreadCommentPanel = () => {
const markSelectionService = useDependency(IMarkSelectionService);
diff --git a/packages/sheets-ui/src/controllers/mobile/mobile-sheet-ui.controller.ts b/packages/sheets-ui/src/controllers/mobile/mobile-sheet-ui.controller.ts
index 9936acb42e..1853acbb4e 100644
--- a/packages/sheets-ui/src/controllers/mobile/mobile-sheet-ui.controller.ts
+++ b/packages/sheets-ui/src/controllers/mobile/mobile-sheet-ui.controller.ts
@@ -92,15 +92,15 @@ import { SetZoomRatioOperation } from '../../commands/operations/set-zoom-ratio.
import { SheetPermissionOpenDialogOperation } from '../../commands/operations/sheet-permission-open-dialog.operation';
import { SheetPermissionOpenPanelOperation } from '../../commands/operations/sheet-permission-open-panel.operation';
import { SidebarDefinedNameOperation } from '../../commands/operations/sidebar-defined-name.operation';
-import { BorderPanel } from '../../components/border-panel/BorderPanel';
-import { BORDER_PANEL_COMPONENT } from '../../components/border-panel/interface';
-import { MENU_ITEM_FROZEN_COMPONENT, MenuItemFrozen } from '../../components/menu-item-frozen';
-import { MENU_ITEM_INPUT_COMPONENT, MenuItemInput } from '../../components/menu-item-input';
import { menuSchema } from '../../menu/mobile-menu';
-import { CellPopup } from '../../views/cell-popup';
+import { BorderPanel } from '../../views/border-panel/BorderPanel';
+import { BORDER_PANEL_COMPONENT } from '../../views/border-panel/interface';
import { CELL_POPUP_COMPONENT_KEY } from '../../views/cell-popup/config';
+import { CellPopup } from '../../views/CellPopup';
import { DEFINED_NAME_CONTAINER } from '../../views/defined-name/component-name';
import { DefinedNameContainer } from '../../views/defined-name/DefinedNameContainer';
+import { MENU_ITEM_FROZEN_COMPONENT, MenuItemFrozen } from '../../views/menu-item-frozen/index';
+import { MENU_ITEM_INPUT_COMPONENT, MenuItemInput } from '../../views/menu-item-input/index';
import { MobileSheetBar } from '../../views/mobile/sheet-bar/MobileSheetBar';
import { RenderSheetContent } from '../../views/sheet-container/SheetContainer';
diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts
index e16202499e..9de94c7510 100644
--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts
+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts
@@ -37,7 +37,7 @@ import {
} from '../../consts/permission';
import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
import { SheetPermissionDialog, SheetPermissionPanel, SheetPermissionUserDialog } from '../../views/permission';
-import { AlertDialog } from '../../views/permission/error-msg-dialog';
+import { AlertDialog } from '../../views/permission/AlertDialog';
import { UNIVER_SHEET_PERMISSION_ALERT_DIALOG } from '../../views/permission/error-msg-dialog/interface';
import { RANGE_PROTECTION_CAN_NOT_VIEW_RENDER_EXTENSION_KEY, RANGE_PROTECTION_CAN_VIEW_RENDER_EXTENSION_KEY, RangeProtectionCanNotViewRenderExtension, RangeProtectionCanViewRenderExtension } from '../../views/permission/extensions/range-protection.render';
import { worksheetProtectionKey, WorksheetProtectionRenderExtension } from '../../views/permission/extensions/worksheet-permission.render';
diff --git a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
index 396b671d1b..3ed5d2d846 100644
--- a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
+++ b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
@@ -88,15 +88,15 @@ import { SetZoomRatioOperation } from '../commands/operations/set-zoom-ratio.ope
import { SheetPermissionOpenDialogOperation } from '../commands/operations/sheet-permission-open-dialog.operation';
import { SheetPermissionOpenPanelOperation } from '../commands/operations/sheet-permission-open-panel.operation';
import { SidebarDefinedNameOperation } from '../commands/operations/sidebar-defined-name.operation';
-import { BorderPanel } from '../components/border-panel/BorderPanel';
-import { BORDER_PANEL_COMPONENT } from '../components/border-panel/interface';
-import { MENU_ITEM_FROZEN_COMPONENT, MenuItemFrozen } from '../components/menu-item-frozen';
-import { MENU_ITEM_INPUT_COMPONENT, MenuItemInput } from '../components/menu-item-input';
import { menuSchema } from '../menu/schema';
-import { CellPopup } from '../views/cell-popup';
+import { BorderPanel } from '../views/border-panel/BorderPanel';
+import { BORDER_PANEL_COMPONENT } from '../views/border-panel/interface';
import { CELL_POPUP_COMPONENT_KEY } from '../views/cell-popup/config';
+import { CellPopup } from '../views/CellPopup';
import { DEFINED_NAME_CONTAINER } from '../views/defined-name/component-name';
import { DefinedNameContainer } from '../views/defined-name/DefinedNameContainer';
+import { MENU_ITEM_FROZEN_COMPONENT, MenuItemFrozen } from '../views/menu-item-frozen/index';
+import { MENU_ITEM_INPUT_COMPONENT, MenuItemInput } from '../views/menu-item-input/index';
import { RenderSheetContent, RenderSheetFooter, RenderSheetHeader } from '../views/sheet-container/SheetContainer';
import { CopyDownShortcutItem, CopyRightShortcutItem } from './shortcuts/copy-fill.shortcut';
import {
diff --git a/packages/sheets-ui/src/index.ts b/packages/sheets-ui/src/index.ts
index b4e19c4f4c..33354d7666 100644
--- a/packages/sheets-ui/src/index.ts
+++ b/packages/sheets-ui/src/index.ts
@@ -88,7 +88,6 @@ export { SheetPermissionOpenPanelOperation } from './commands/operations/sheet-p
export { SidebarDefinedNameOperation } from './commands/operations/sidebar-defined-name.operation';
export { EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY, RANGE_SELECTOR_COMPONENT_KEY, SHEET_VIEW_KEY } from './common/keys';
export { getCellRealRange, getViewportByCell } from './common/utils';
-export { useActiveWorkbook, useActiveWorksheet, useWorkbooks } from './components/hook';
export { type IUniverSheetsUIConfig } from './config/config';
export { UNIVER_SHEET_PERMISSION_USER_PART } from './consts/permission';
export { SHEET_UI_PLUGIN_NAME } from './consts/plugin-name';
@@ -160,13 +159,10 @@ export { SheetsRenderService } from './services/sheets-render.service';
export { IStatusBarService, StatusBarService } from './services/status-bar.service';
export { calculateDocSkeletonRects, getCustomRangePosition, getEditingCustomRangePosition } from './services/utils/doc-skeleton-util';
export { useKeyEventConfig } from './views/editor-container';
-export { FormulaBar } from './views/formula-bar/FormulaBar';
-export { MobileSheetBar } from './views/mobile/sheet-bar/MobileSheetBar';
+export { useActiveWorkbook, useActiveWorksheet, useWorkbooks } from './views/hook';
export type { IRangeProtectionRenderCellData } from './views/permission/extensions/range-protection.render';
export { type IPermissionDetailUserPartProps } from './views/permission/panel-detail/PermissionDetailUserPart';
export { type IBaseSheetBarProps } from './views/sheet-bar/sheet-bar-tabs/SheetBarItem';
-export { SheetBar } from './views/sheet-bar/SheetBar';
-export { RenderSheetContent, RenderSheetFooter, RenderSheetHeader } from './views/sheet-container/SheetContainer';
export { type IStatisticItem } from './views/status-bar/CopyableStatisticItem';
export { functionDisplayNames } from './views/status-bar/CopyableStatisticItem';
export { SheetCopyDownCommand, SheetCopyRightCommand } from '@univerjs/sheets';
diff --git a/packages/sheets-ui/src/menu/border.menu.ts b/packages/sheets-ui/src/menu/border.menu.ts
index 57831285c1..c096b18ffb 100644
--- a/packages/sheets-ui/src/menu/border.menu.ts
+++ b/packages/sheets-ui/src/menu/border.menu.ts
@@ -22,7 +22,7 @@ import { BorderStyleManagerService, RangeProtectionPermissionEditPoint, SetBorde
import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import { combineLatest, map, Observable, startWith } from 'rxjs';
-import { BORDER_LINE_CHILDREN, BORDER_PANEL_COMPONENT } from '../components/border-panel/interface';
+import { BORDER_LINE_CHILDREN, BORDER_PANEL_COMPONENT } from '../views/border-panel/interface';
import { getCurrentRangeDisable$ } from './menu-util';
export function CellBorderSelectorMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<IBorderInfo, IBorderInfo> {
diff --git a/packages/sheets-ui/src/menu/frozen.menu.ts b/packages/sheets-ui/src/menu/frozen.menu.ts
index 050a7a7cc4..a0e8ac1a6f 100644
--- a/packages/sheets-ui/src/menu/frozen.menu.ts
+++ b/packages/sheets-ui/src/menu/frozen.menu.ts
@@ -22,7 +22,7 @@ import { CancelFrozenCommand, SheetsSelectionsService } from '@univerjs/sheets';
import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import { combineLatest, map, Observable } from 'rxjs';
import { SetColumnFrozenCommand, SetFirstColumnFrozenCommand, SetFirstRowFrozenCommand, SetRowFrozenCommand, SetSelectionFrozenCommand } from '../commands/commands/set-frozen.command';
-import { MENU_ITEM_FROZEN_COMPONENT } from '../components/menu-item-frozen';
+import { MENU_ITEM_FROZEN_COMPONENT } from '../views/menu-item-frozen/index';
const getMenuHiddenByCurrentSelectionChangedObservable$ = (accessor: IAccessor, type: 'row' | 'col' | 'all'): Observable<boolean> => {
const selectionManagerService = accessor.get(SheetsSelectionsService);
diff --git a/packages/sheets-ui/src/menu/insert.menu.ts b/packages/sheets-ui/src/menu/insert.menu.ts
index cc18b5a036..8b0fa9f9c7 100644
--- a/packages/sheets-ui/src/menu/insert.menu.ts
+++ b/packages/sheets-ui/src/menu/insert.menu.ts
@@ -41,7 +41,7 @@ import { MenuItemType } from '@univerjs/ui';
import { Observable } from 'rxjs';
import { InsertRangeMoveDownConfirmCommand } from '../commands/commands/insert-range-move-down-confirm.command';
import { InsertRangeMoveRightConfirmCommand } from '../commands/commands/insert-range-move-right-confirm.command';
-import { MENU_ITEM_INPUT_COMPONENT } from '../components/menu-item-input';
+import { MENU_ITEM_INPUT_COMPONENT } from '../views/menu-item-input/index';
import { deriveStateFromActiveSheet$, getBaseRangeMenuHidden$, getCellMenuHidden$, getCurrentRangeDisable$, getInsertAfterMenuHidden$, getInsertBeforeMenuHidden$, getObservableWithExclusiveRange$ } from './menu-util';
export const COL_INSERT_MENU_ID = 'sheet.menu.col-insert';
diff --git a/packages/sheets-ui/src/menu/menu.ts b/packages/sheets-ui/src/menu/menu.ts
index e1b4a18e88..003371f9ed 100644
--- a/packages/sheets-ui/src/menu/menu.ts
+++ b/packages/sheets-ui/src/menu/menu.ts
@@ -102,9 +102,9 @@ import {
} from '../commands/commands/inline-format.command';
import { SetInfiniteFormatPainterCommand, SetOnceFormatPainterCommand } from '../commands/commands/set-format-painter.command';
import { SetWorksheetColAutoWidthCommand } from '../commands/commands/set-worksheet-auto-col-width.command';
-import { MENU_ITEM_INPUT_COMPONENT } from '../components/menu-item-input';
import { ISheetClipboardService } from '../services/clipboard/clipboard.service';
import { FormatPainterStatus, IFormatPainterService } from '../services/format-painter/format-painter.service';
+import { MENU_ITEM_INPUT_COMPONENT } from '../views/menu-item-input/index';
import { deriveStateFromActiveSheet$, getCurrentRangeDisable$, getObservableWithExclusiveRange$ } from './menu-util';
import { getFontStyleAtCursor } from './utils';
diff --git a/packages/sheets-ui/src/views/cell-popup/index.tsx b/packages/sheets-ui/src/views/CellPopup.tsx
similarity index 91%
rename from packages/sheets-ui/src/views/cell-popup/index.tsx
rename to packages/sheets-ui/src/views/CellPopup.tsx
index dbe3c4759c..aac1efd084 100644
--- a/packages/sheets-ui/src/views/cell-popup/index.tsx
+++ b/packages/sheets-ui/src/views/CellPopup.tsx
@@ -19,7 +19,7 @@ import type { IPopup } from '@univerjs/ui';
import { ComponentManager, useDependency, useObservable } from '@univerjs/ui';
import { useMemo } from 'react';
import { filter } from 'rxjs';
-import { CellPopupManagerService } from '../../services/cell-popup-manager.service';
+import { CellPopupManagerService } from '../services/cell-popup-manager.service';
export const CellPopup = (props: { popup: IPopup<ISheetLocationBase & { direction: 'horizontal' | 'vertical' }> }) => {
const { popup } = props;
@@ -35,7 +35,7 @@ export const CellPopup = (props: { popup: IPopup<ISheetLocationBase & { directio
const componentManager = useDependency(ComponentManager);
return (
- <div data-u-comp="cell-popup" className="univer-ml-px univer-flex univer-flex-col">
+ <div data-u-comp="sheets-ui-cell-popup" className="univer-ml-px univer-flex univer-flex-col">
{popups.map((popup) => {
const Component = componentManager.get(popup.componentKey);
return Component ? <Component key={popup.id ?? popup.componentKey} popup={popup} /> : null;
diff --git a/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
index d74831366e..d558f2e9a0 100644
--- a/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
+++ b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
@@ -23,10 +23,10 @@ import { AUTO_FILL_APPLY_TYPE, IAutoFillService, RefillCommand } from '@univerjs
import { useDependency } from '@univerjs/ui';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { SetScrollOperation } from '../../commands/operations/scroll.operation';
-import { useActiveWorkbook } from '../../components/hook';
import { getSheetObject } from '../../controllers/utils/component-tools';
import { ISheetSelectionRenderService } from '../../services/selection/base-selection-render.service';
import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
+import { useActiveWorkbook } from '../hook';
export interface IAnchorPoint {
row: number;
diff --git a/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx b/packages/sheets-ui/src/views/border-panel/BorderPanel.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
rename to packages/sheets-ui/src/views/border-panel/BorderPanel.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/BorderLine.tsx b/packages/sheets-ui/src/views/border-panel/border-line/BorderLine.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/BorderLine.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/BorderLine.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDashDot.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDashDot.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDashDot.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDashDot.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDashDotDot.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDashDotDot.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDashDotDot.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDashDotDot.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDashed.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDashed.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDashed.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDashed.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDotted.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDotted.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDotted.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDotted.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDouble.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDouble.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderDouble.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderDouble.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderHair.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderHair.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderHair.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderHair.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderMedium.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderMedium.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderMedium.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderMedium.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderMediumDashDot.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderMediumDashDot.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderMediumDashDot.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderMediumDashDot.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderMediumDashDotDot.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderMediumDashDotDot.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderMediumDashDotDot.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderMediumDashDotDot.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderMediumDashed.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderMediumDashed.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderMediumDashed.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderMediumDashed.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderThick.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderThick.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderThick.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderThick.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/border-line/icons/BorderThin.tsx b/packages/sheets-ui/src/views/border-panel/border-line/icons/BorderThin.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/border-line/icons/BorderThin.tsx
rename to packages/sheets-ui/src/views/border-panel/border-line/icons/BorderThin.tsx
diff --git a/packages/sheets-ui/src/components/border-panel/interface.ts b/packages/sheets-ui/src/views/border-panel/interface.ts
similarity index 100%
rename from packages/sheets-ui/src/components/border-panel/interface.ts
rename to packages/sheets-ui/src/views/border-panel/interface.ts
diff --git a/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx b/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
index 9158040196..83618eefc7 100644
--- a/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
+++ b/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
@@ -23,11 +23,11 @@ import { MoreDownIcon, PasteSpecialDoubleIcon } from '@univerjs/icons';
import { useDependency, useObservable } from '@univerjs/ui';
import { useState } from 'react';
import { SheetOptionalPasteCommand } from '../../commands/commands/clipboard.command';
-import { useActiveWorkbook } from '../../components/hook';
import { getSheetObject } from '../../controllers/utils/component-tools';
import { ISheetClipboardService, PREDEFINED_HOOK_NAME_PASTE } from '../../services/clipboard/clipboard.service';
import { ISheetSelectionRenderService } from '../../services/selection/base-selection-render.service';
import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
+import { useActiveWorkbook } from '../hook';
const DEFAULT_PADDING = 2;
diff --git a/packages/sheets-ui/src/components/const.ts b/packages/sheets-ui/src/views/const.ts
similarity index 100%
rename from packages/sheets-ui/src/components/const.ts
rename to packages/sheets-ui/src/views/const.ts
diff --git a/packages/sheets-ui/src/views/dropdown/cascader-dropdown/index.tsx b/packages/sheets-ui/src/views/dropdown/CascaderDropdown.tsx
similarity index 96%
rename from packages/sheets-ui/src/views/dropdown/cascader-dropdown/index.tsx
rename to packages/sheets-ui/src/views/dropdown/CascaderDropdown.tsx
index fa8e5efd8e..7c699f54e2 100644
--- a/packages/sheets-ui/src/views/dropdown/cascader-dropdown/index.tsx
+++ b/packages/sheets-ui/src/views/dropdown/CascaderDropdown.tsx
@@ -16,7 +16,7 @@
import type { ICascaderOption } from '@univerjs/design';
import type { IPopup } from '@univerjs/ui';
-import type { IBaseDropdownProps } from '../type';
+import type { IBaseDropdownProps } from './type';
import { CascaderList } from '@univerjs/design';
import { useState } from 'react';
diff --git a/packages/sheets-ui/src/views/dropdown/color-dropdown/index.tsx b/packages/sheets-ui/src/views/dropdown/ColorDropdown.tsx
similarity index 95%
rename from packages/sheets-ui/src/views/dropdown/color-dropdown/index.tsx
rename to packages/sheets-ui/src/views/dropdown/ColorDropdown.tsx
index b2833bbed3..db32ab1b9a 100644
--- a/packages/sheets-ui/src/views/dropdown/color-dropdown/index.tsx
+++ b/packages/sheets-ui/src/views/dropdown/ColorDropdown.tsx
@@ -15,7 +15,7 @@
*/
import type { IPopup } from '@univerjs/ui';
-import type { IBaseDropdownProps } from '../type';
+import type { IBaseDropdownProps } from './type';
import { ColorPicker } from '@univerjs/design';
export interface IColorDropdownProps {
diff --git a/packages/sheets-ui/src/views/dropdown/date-dropdown/index.tsx b/packages/sheets-ui/src/views/dropdown/DateDropdown.tsx
similarity index 98%
rename from packages/sheets-ui/src/views/dropdown/date-dropdown/index.tsx
rename to packages/sheets-ui/src/views/dropdown/DateDropdown.tsx
index c404d6f1ec..cc107b5c86 100644
--- a/packages/sheets-ui/src/views/dropdown/date-dropdown/index.tsx
+++ b/packages/sheets-ui/src/views/dropdown/DateDropdown.tsx
@@ -16,7 +16,7 @@
import type { DateKit } from '@univerjs/core';
import type { IPopup } from '@univerjs/ui';
-import type { IBaseDropdownProps } from '../type';
+import type { IBaseDropdownProps } from './type';
import { dateKit, LocaleService } from '@univerjs/core';
import { borderTopClassName, Button, Calendar, clsx, TimeInput } from '@univerjs/design';
import { useDependency } from '@univerjs/ui';
diff --git a/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx b/packages/sheets-ui/src/views/dropdown/ListDropDown.tsx
similarity index 98%
rename from packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx
rename to packages/sheets-ui/src/views/dropdown/ListDropDown.tsx
index 3c74a14ee8..20cd91f154 100644
--- a/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx
+++ b/packages/sheets-ui/src/views/dropdown/ListDropDown.tsx
@@ -17,7 +17,7 @@
import type { ISheetLocation } from '@univerjs/sheets';
import type { IPopup } from '@univerjs/ui';
import type { CSSProperties } from 'react';
-import type { IBaseDropdownProps } from '../type';
+import type { IBaseDropdownProps } from './type';
import {
ColorKit,
LocaleService,
@@ -33,7 +33,7 @@ import {
} from '@univerjs/sheets';
import { useDependency } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
-import { getListDropdownValue } from './utils';
+import { getListDropdownValue } from './list-dropdown/utils';
interface ISelectListProps {
value: string[];
diff --git a/packages/sheets-ui/src/views/dropdown/index.ts b/packages/sheets-ui/src/views/dropdown/index.ts
index f0c2b7cca4..5807b3b197 100644
--- a/packages/sheets-ui/src/views/dropdown/index.ts
+++ b/packages/sheets-ui/src/views/dropdown/index.ts
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-import type { ICascaderDropdownProps } from './cascader-dropdown';
-import type { IColorDropdownProps } from './color-dropdown';
-import type { IDateDropdownProps } from './date-dropdown';
-import type { IListDropdownProps } from './list-dropdown';
-import { CascaderDropdown } from './cascader-dropdown';
-import { ColorDropdown } from './color-dropdown';
-import { DateDropdown } from './date-dropdown';
-import { ListDropDown } from './list-dropdown';
+import type { ICascaderDropdownProps } from './CascaderDropdown';
+import type { IColorDropdownProps } from './ColorDropdown';
+import type { IDateDropdownProps } from './DateDropdown';
+import type { IListDropdownProps } from './ListDropDown';
+import { CascaderDropdown } from './CascaderDropdown';
+import { ColorDropdown } from './ColorDropdown';
+import { DateDropdown } from './DateDropdown';
+import { ListDropDown } from './ListDropDown';
export type ICellDropdown = {
type: 'datepicker';
@@ -37,10 +37,10 @@ export type ICellDropdown = {
props: ICascaderDropdownProps;
};
-export { CascaderDropdown } from './cascader-dropdown';
-export { ColorDropdown } from './color-dropdown';
-export { DateDropdown } from './date-dropdown';
-export { ListDropDown } from './list-dropdown';
+export { CascaderDropdown } from './CascaderDropdown';
+export { ColorDropdown } from './ColorDropdown';
+export { DateDropdown } from './DateDropdown';
+export { ListDropDown } from './ListDropDown';
export const dropdownMap = {
datepicker: DateDropdown,
diff --git a/packages/sheets-ui/src/components/hook.ts b/packages/sheets-ui/src/views/hook.ts
similarity index 100%
rename from packages/sheets-ui/src/components/hook.ts
rename to packages/sheets-ui/src/views/hook.ts
diff --git a/packages/sheets-ui/src/components/menu-item-frozen/MenuItemFrozen.tsx b/packages/sheets-ui/src/views/menu-item-frozen/MenuItemFrozen.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/menu-item-frozen/MenuItemFrozen.tsx
rename to packages/sheets-ui/src/views/menu-item-frozen/MenuItemFrozen.tsx
diff --git a/packages/sheets-ui/src/components/menu-item-frozen/index.ts b/packages/sheets-ui/src/views/menu-item-frozen/index.ts
similarity index 100%
rename from packages/sheets-ui/src/components/menu-item-frozen/index.ts
rename to packages/sheets-ui/src/views/menu-item-frozen/index.ts
diff --git a/packages/sheets-ui/src/components/menu-item-frozen/interface.ts b/packages/sheets-ui/src/views/menu-item-frozen/interface.ts
similarity index 100%
rename from packages/sheets-ui/src/components/menu-item-frozen/interface.ts
rename to packages/sheets-ui/src/views/menu-item-frozen/interface.ts
diff --git a/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx b/packages/sheets-ui/src/views/menu-item-input/MenuItemInput.tsx
similarity index 100%
rename from packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx
rename to packages/sheets-ui/src/views/menu-item-input/MenuItemInput.tsx
diff --git a/packages/sheets-ui/src/components/menu-item-input/index.ts b/packages/sheets-ui/src/views/menu-item-input/index.ts
similarity index 100%
rename from packages/sheets-ui/src/components/menu-item-input/index.ts
rename to packages/sheets-ui/src/views/menu-item-input/index.ts
diff --git a/packages/sheets-ui/src/components/menu-item-input/interface.ts b/packages/sheets-ui/src/views/menu-item-input/interface.ts
similarity index 100%
rename from packages/sheets-ui/src/components/menu-item-input/interface.ts
rename to packages/sheets-ui/src/views/menu-item-input/interface.ts
diff --git a/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx b/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx
index 5129fbcbc3..15565ba5da 100644
--- a/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx
+++ b/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx
@@ -29,7 +29,7 @@ import {
} from '@univerjs/sheets';
import { useDependency } from '@univerjs/ui';
import { useCallback, useEffect, useRef, useState } from 'react';
-import { useActiveWorkbook } from '../../../components/hook';
+import { useActiveWorkbook } from '../../hook';
export function MobileSheetBar() {
const workbook = useActiveWorkbook();
diff --git a/packages/sheets-ui/src/views/permission/error-msg-dialog/index.tsx b/packages/sheets-ui/src/views/permission/AlertDialog.tsx
similarity index 100%
rename from packages/sheets-ui/src/views/permission/error-msg-dialog/index.tsx
rename to packages/sheets-ui/src/views/permission/AlertDialog.tsx
diff --git a/packages/sheets-ui/src/views/permission/permission-dialog/index.tsx b/packages/sheets-ui/src/views/permission/SheetPermissionDialog.tsx
similarity index 98%
rename from packages/sheets-ui/src/views/permission/permission-dialog/index.tsx
rename to packages/sheets-ui/src/views/permission/SheetPermissionDialog.tsx
index 742311e047..43efd6b3be 100644
--- a/packages/sheets-ui/src/views/permission/permission-dialog/index.tsx
+++ b/packages/sheets-ui/src/views/permission/SheetPermissionDialog.tsx
@@ -23,8 +23,8 @@ import { ObjectScope, UnitObject, UnitRole } from '@univerjs/protocol';
import { getAllWorksheetPermissionPoint, SetWorksheetPermissionPointsCommand, WorksheetProtectionPointModel } from '@univerjs/sheets';
import { IDialogService, useDependency } from '@univerjs/ui';
import { useEffect, useState } from 'react';
-import { defaultWorksheetUnitActionList, subUnitPermissionTypeMap, UNIVER_SHEET_PERMISSION_DIALOG_ID } from '../../../consts/permission';
-import Spin from '../spin';
+import { defaultWorksheetUnitActionList, subUnitPermissionTypeMap, UNIVER_SHEET_PERMISSION_DIALOG_ID } from '../../consts/permission';
+import Spin from './Spin';
interface IPermissionMap {
[key: string]: {
diff --git a/packages/sheets-ui/src/views/permission/panel/index.tsx b/packages/sheets-ui/src/views/permission/SheetPermissionPanel.tsx
similarity index 85%
rename from packages/sheets-ui/src/views/permission/panel/index.tsx
rename to packages/sheets-ui/src/views/permission/SheetPermissionPanel.tsx
index 9451950f21..a8df5bf62f 100644
--- a/packages/sheets-ui/src/views/permission/panel/index.tsx
+++ b/packages/sheets-ui/src/views/permission/SheetPermissionPanel.tsx
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-import type { IPermissionPanelRule } from '../../../services/permission/sheet-permission-panel.model';
+import type { IPermissionPanelRule } from '../../services/permission/sheet-permission-panel.model';
import { IUniverInstanceService } from '@univerjs/core';
import { serializeRangeWithSheet } from '@univerjs/engine-formula';
import { getSheetCommandTarget, SheetsSelectionsService } from '@univerjs/sheets';
import { useDependency } from '@univerjs/ui';
-import { SheetPermissionPanelModel } from '../../../services/permission/sheet-permission-panel.model';
-import { SheetPermissionPanelDetail } from '../panel-detail/PermissionDetailPanel';
-import { SheetPermissionPanelList } from '../panel-list';
+import { SheetPermissionPanelModel } from '../../services/permission/sheet-permission-panel.model';
+import { SheetPermissionPanelDetail } from './panel-detail/PermissionDetailPanel';
+import { SheetPermissionPanelList } from './SheetPermissionPanelList';
interface ISheetPermissionPanelProps {
showDetail: boolean;
diff --git a/packages/sheets-ui/src/views/permission/panel-list/index.tsx b/packages/sheets-ui/src/views/permission/SheetPermissionPanelList.tsx
similarity index 98%
rename from packages/sheets-ui/src/views/permission/panel-list/index.tsx
rename to packages/sheets-ui/src/views/permission/SheetPermissionPanelList.tsx
index 62b273e3c1..85a42f566d 100644
--- a/packages/sheets-ui/src/views/permission/panel-list/index.tsx
+++ b/packages/sheets-ui/src/views/permission/SheetPermissionPanelList.tsx
@@ -17,7 +17,7 @@
import type { IRange, Workbook } from '@univerjs/core';
import type { IPermissionPoint } from '@univerjs/protocol';
import type { IRangeProtectionRule, IWorksheetProtectionRule } from '@univerjs/sheets';
-import type { IPermissionPanelRule } from '../../../services/permission/sheet-permission-panel.model';
+import type { IPermissionPanelRule } from '../../services/permission/sheet-permission-panel.model';
import { IAuthzIoService, ICommandService, IPermissionService, IUniverInstanceService, LocaleService, Tools, UniverInstanceType, UserManagerService } from '@univerjs/core';
import { Avatar, borderClassName, Button, clsx, Tooltip } from '@univerjs/design';
import { serializeRange } from '@univerjs/engine-formula';
@@ -27,10 +27,10 @@ import { baseProtectionActions, DeleteRangeProtectionCommand, DeleteWorksheetPro
import { ISidebarService, useDependency, useObservable } from '@univerjs/ui';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { distinctUntilChanged, merge } from 'rxjs';
-import { UNIVER_SHEET_PERMISSION_PANEL } from '../../../consts/permission';
-import { useHighlightRange } from '../../../hooks/use-highlight-range';
-import { SheetPermissionUserManagerService } from '../../../services/permission/sheet-permission-user-list.service';
-import { panelListEmptyBase64 } from './constant';
+import { UNIVER_SHEET_PERMISSION_PANEL } from '../../consts/permission';
+import { useHighlightRange } from '../../hooks/use-highlight-range';
+import { SheetPermissionUserManagerService } from '../../services/permission/sheet-permission-user-list.service';
+import { panelListEmptyBase64 } from './panel-list/constant';
type IRuleItem = IRangeProtectionRule | IWorksheetProtectionRule;
diff --git a/packages/sheets-ui/src/views/permission/user-dialog/index.tsx b/packages/sheets-ui/src/views/permission/SheetPermissionUserDialog.tsx
similarity index 96%
rename from packages/sheets-ui/src/views/permission/user-dialog/index.tsx
rename to packages/sheets-ui/src/views/permission/SheetPermissionUserDialog.tsx
index 72a3998717..81834a964d 100644
--- a/packages/sheets-ui/src/views/permission/user-dialog/index.tsx
+++ b/packages/sheets-ui/src/views/permission/SheetPermissionUserDialog.tsx
@@ -21,9 +21,9 @@ import { CheckMarkIcon } from '@univerjs/icons';
import { UnitRole } from '@univerjs/protocol';
import { IDialogService, useDependency, useObservable } from '@univerjs/ui';
import { useState } from 'react';
-import { UNIVER_SHEET_PERMISSION_USER_DIALOG_ID } from '../../../consts/permission';
-import { SheetPermissionUserManagerService } from '../../../services/permission/sheet-permission-user-list.service';
-import { UserEmptyBase64 } from './constant';
+import { UNIVER_SHEET_PERMISSION_USER_DIALOG_ID } from '../../consts/permission';
+import { SheetPermissionUserManagerService } from '../../services/permission/sheet-permission-user-list.service';
+import { UserEmptyBase64 } from './user-dialog/constant';
export const SheetPermissionUserDialog = () => {
const [inputValue, setInputValue] = useState('');
diff --git a/packages/sheets-ui/src/views/permission/spin/index.tsx b/packages/sheets-ui/src/views/permission/Spin.tsx
similarity index 100%
rename from packages/sheets-ui/src/views/permission/spin/index.tsx
rename to packages/sheets-ui/src/views/permission/Spin.tsx
diff --git a/packages/sheets-ui/src/views/permission/index.ts b/packages/sheets-ui/src/views/permission/index.ts
index ee92723962..3beec6eae5 100644
--- a/packages/sheets-ui/src/views/permission/index.ts
+++ b/packages/sheets-ui/src/views/permission/index.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-export { SheetPermissionPanel } from './panel';
-export { SheetPermissionPanelList } from './panel-list';
-export { SheetPermissionDialog } from './permission-dialog';
-export { SheetPermissionUserDialog } from './user-dialog';
+export { SheetPermissionDialog } from './SheetPermissionDialog';
+export { SheetPermissionPanel } from './SheetPermissionPanel';
+export { SheetPermissionPanelList } from './SheetPermissionPanelList';
+export { SheetPermissionUserDialog } from './SheetPermissionUserDialog';
diff --git a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
index f7f89a831f..a0fb192df7 100644
--- a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
@@ -21,9 +21,9 @@ import { IncreaseIcon, MoreIcon } from '@univerjs/icons';
import { InsertSheetCommand, WorkbookCreateSheetPermission, WorkbookEditablePermission } from '@univerjs/sheets';
import { useConfigValue, useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useState } from 'react';
-import { useActiveWorkbook } from '../../components/hook';
import { SHEETS_UI_PLUGIN_CONFIG_KEY } from '../../config/config';
import { ISheetBarService } from '../../services/sheet-bar/sheet-bar.service';
+import { useActiveWorkbook } from '../hook';
import { SheetBarButton } from './sheet-bar-button/SheetBarButton';
import { SheetBarMenu } from './sheet-bar-menu/SheetBarMenu';
import { SheetBarTabs } from './sheet-bar-tabs/SheetBarTabs';
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
index 3c4f21eb29..542b7440eb 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
@@ -46,9 +46,9 @@ import {
import { UI_PLUGIN_CONFIG_KEY, useConfigValue, useDependency, useObservable } from '@univerjs/ui';
import { useCallback, useEffect, useRef, useState } from 'react';
import { merge } from 'rxjs';
-import { useActiveWorkbook } from '../../../components/hook';
import { IEditorBridgeService } from '../../../services/editor-bridge.service';
import { ISheetBarService } from '../../../services/sheet-bar/sheet-bar.service';
+import { useActiveWorkbook } from '../../hook';
import { SheetBarItem } from './SheetBarItem';
import { SheetBarTabsContextMenu } from './SheetBarTabsContextMenu';
import { SlideTabBar } from './utils/slide-tab-bar';
diff --git a/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx b/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx
index c5029d5ac7..024ca34307 100644
--- a/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx
+++ b/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx
@@ -19,11 +19,11 @@ import type { IUniverSheetsUIConfig } from '../../config/config';
import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { ComponentManager, ContextMenuPosition, IMenuManagerService, ToolbarItem, useConfigValue, useDependency, useObservable } from '@univerjs/ui';
import { useMemo } from 'react';
-import { useActiveWorkbook } from '../../components/hook';
import { SHEETS_UI_PLUGIN_CONFIG_KEY } from '../../config/config';
import { AutoFillPopupMenu } from '../auto-fill-popup-menu/AutoFillPopupMenu';
import { EditorContainer } from '../editor-container/EditorContainer';
import { FormulaBar } from '../formula-bar/FormulaBar';
+import { useActiveWorkbook } from '../hook';
import { SheetBar } from '../sheet-bar/SheetBar';
import { SheetZoomSlider } from '../sheet-slider/CountBar';
import { StatusBar } from '../status-bar/StatusBar';
diff --git a/packages/sheets-ui/src/views/sheet-slider/ZoomSlider.tsx b/packages/sheets-ui/src/views/sheet-slider/ZoomSlider.tsx
index b890fb7b4a..8b92892578 100644
--- a/packages/sheets-ui/src/views/sheet-slider/ZoomSlider.tsx
+++ b/packages/sheets-ui/src/views/sheet-slider/ZoomSlider.tsx
@@ -28,8 +28,8 @@ import { useCallback, useEffect, useState } from 'react';
import { SetZoomRatioCommand } from '../../commands/commands/set-zoom-ratio.command';
import { SetZoomRatioOperation } from '../../commands/operations/set-zoom-ratio.operation';
import { SHEET_ZOOM_RANGE } from '../../common/keys';
-import { useActiveWorkbook } from '../../components/hook';
import { IEditorBridgeService } from '../../services/editor-bridge.service';
+import { useActiveWorkbook } from '../hook';
const ZOOM_MAP = [50, 75, 100, 125, 150, 175, 200, 400];
diff --git a/packages/slides-ui/src/commands/operations/insert-shape.operation.ts b/packages/slides-ui/src/commands/operations/insert-shape.operation.ts
index 3153fbc5d7..16c9a49f7b 100644
--- a/packages/slides-ui/src/commands/operations/insert-shape.operation.ts
+++ b/packages/slides-ui/src/commands/operations/insert-shape.operation.ts
@@ -20,8 +20,8 @@ import { CommandType, generateRandomId, ICommandService, IUniverInstanceService,
import { ObjectType } from '@univerjs/engine-render';
import { BasicShapes, PageElementType } from '@univerjs/slides';
import { ISidebarService } from '@univerjs/ui';
-import { COMPONENT_SLIDE_SIDEBAR } from '../../components/sidebar/Sidebar';
import { CanvasView } from '../../controllers/canvas-view';
+import { COMPONENT_SLIDE_SIDEBAR } from '../../views/sidebar/Sidebar';
export interface IInsertShapeOperationParams {
unitId: string;
diff --git a/packages/slides-ui/src/controllers/slide-ui.controller.ts b/packages/slides-ui/src/controllers/slide-ui.controller.ts
index ef6b155d47..a8b5d2fcbe 100644
--- a/packages/slides-ui/src/controllers/slide-ui.controller.ts
+++ b/packages/slides-ui/src/controllers/slide-ui.controller.ts
@@ -26,12 +26,12 @@ import { SlideAddTextCommand, SlideAddTextOperation } from '../commands/operatio
import { SetSlidePageThumbOperation } from '../commands/operations/set-thumb.operation';
import { SetTextEditArrowOperation } from '../commands/operations/text-edit.operation';
import { UpdateSlideElementOperation } from '../commands/operations/update-element.operation';
-import { COMPONENT_SLIDE_IMAGE_POPUP_MENU } from '../components/image-popup-menu/component-name';
-import { SlideImagePopupMenu } from '../components/image-popup-menu/ImagePopupMenu';
-import Sidebar, { COMPONENT_SLIDE_SIDEBAR } from '../components/sidebar/Sidebar';
-import { SlideSideBar } from '../components/slide-bar/SlideBar';
import { menuSchema } from '../menu/schema';
import { SlideEditorContainer } from '../views/editor-container';
+import { COMPONENT_SLIDE_IMAGE_POPUP_MENU } from '../views/image-popup-menu/component-name';
+import { SlideImagePopupMenu } from '../views/image-popup-menu/ImagePopupMenu';
+import Sidebar, { COMPONENT_SLIDE_SIDEBAR } from '../views/sidebar/Sidebar';
+import { SlideSideBar } from '../views/slide-bar/SlideBar';
import { EditorDeleteLeftShortcut, generateArrowSelectionShortCutItem } from './shortcuts/editor.shortcuts';
/**
diff --git a/packages/slides-ui/src/index.ts b/packages/slides-ui/src/index.ts
index 981cdcab44..c461de3159 100644
--- a/packages/slides-ui/src/index.ts
+++ b/packages/slides-ui/src/index.ts
@@ -24,7 +24,6 @@ export { InsertSlideShapeEllipseCommand, InsertSlideShapeEllipseOperation, Inser
export { SlideAddTextCommand, SlideAddTextOperation } from './commands/operations/insert-text.operation';
export { SetSlidePageThumbOperation } from './commands/operations/set-thumb.operation';
export { UpdateSlideElementOperation } from './commands/operations/update-element.operation';
-export { SlideSideBar } from './components/slide-bar/SlideBar';
export type { IUniverSlidesUIConfig } from './config/config';
export { SLIDE_EDITOR_ID } from './const';
export { CanvasView } from './controllers/canvas-view';
@@ -35,4 +34,3 @@ export { SHAPE_MENU_ID } from './menu/shape.menu';
export { UniverSlidesUIPlugin } from './plugin';
export { ISlideEditorBridgeService } from './services/slide-editor-bridge.service';
export { SlideCanvasPopMangerService } from './services/slide-popup-manager.service';
-export { SlideEditorContainer } from './views/editor-container/EditorContainer';
diff --git a/packages/slides-ui/src/menu/popup-menu.controller.ts b/packages/slides-ui/src/menu/popup-menu.controller.ts
index 9c2ab15ad2..2f8d2e774c 100644
--- a/packages/slides-ui/src/menu/popup-menu.controller.ts
+++ b/packages/slides-ui/src/menu/popup-menu.controller.ts
@@ -23,9 +23,9 @@ import { ISidebarService } from '@univerjs/ui';
import { DeleteSlideElementOperation } from '../commands/operations/delete-element.operation';
import { ToggleSlideEditSidebarOperation } from '../commands/operations/insert-shape.operation';
import { UpdateSlideElementOperation } from '../commands/operations/update-element.operation';
-import { COMPONENT_SLIDE_IMAGE_POPUP_MENU } from '../components/image-popup-menu/component-name';
import { CanvasView } from '../controllers/canvas-view';
import { SlideCanvasPopMangerService } from '../services/slide-popup-manager.service';
+import { COMPONENT_SLIDE_IMAGE_POPUP_MENU } from '../views/image-popup-menu/component-name';
export class SlidePopupMenuController extends RxDisposable {
private _initImagePopupMenu = new Set<string>();
diff --git a/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx b/packages/slides-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
similarity index 100%
rename from packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
rename to packages/slides-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
diff --git a/packages/slides-ui/src/components/image-popup-menu/component-name.ts b/packages/slides-ui/src/views/image-popup-menu/component-name.ts
similarity index 100%
rename from packages/slides-ui/src/components/image-popup-menu/component-name.ts
rename to packages/slides-ui/src/views/image-popup-menu/component-name.ts
diff --git a/packages/slides-ui/src/components/panels/ArrangePanel.tsx b/packages/slides-ui/src/views/panels/ArrangePanel.tsx
similarity index 100%
rename from packages/slides-ui/src/components/panels/ArrangePanel.tsx
rename to packages/slides-ui/src/views/panels/ArrangePanel.tsx
diff --git a/packages/slides-ui/src/components/panels/FillPanel.tsx b/packages/slides-ui/src/views/panels/FillPanel.tsx
similarity index 100%
rename from packages/slides-ui/src/components/panels/FillPanel.tsx
rename to packages/slides-ui/src/views/panels/FillPanel.tsx
diff --git a/packages/slides-ui/src/components/panels/TransformPanel.tsx b/packages/slides-ui/src/views/panels/TransformPanel.tsx
similarity index 100%
rename from packages/slides-ui/src/components/panels/TransformPanel.tsx
rename to packages/slides-ui/src/views/panels/TransformPanel.tsx
diff --git a/packages/slides-ui/src/components/sidebar/Sidebar.tsx b/packages/slides-ui/src/views/sidebar/Sidebar.tsx
similarity index 96%
rename from packages/slides-ui/src/components/sidebar/Sidebar.tsx
rename to packages/slides-ui/src/views/sidebar/Sidebar.tsx
index 19faecb2d8..b16f9fa8c6 100644
--- a/packages/slides-ui/src/components/sidebar/Sidebar.tsx
+++ b/packages/slides-ui/src/views/sidebar/Sidebar.tsx
@@ -35,7 +35,7 @@ export default function RectSidebar() {
const pageId = currentSlide?.getActivePage()?.id;
// see packages/sheets-ui/src/views/permission/permission-dialog/index.tsx@SheetPermissionDialog
- // see packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx@getUnitId
+ // see packages/sheets-conditional-formatting-ui/src/views/panel/rule-edit/index.tsx@getUnitId
// const unitId = univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SLIDE)!.getUnitId();
const unitId = univerInstanceService.getFocusedUnit()?.getUnitId() || '';
diff --git a/packages/slides-ui/src/components/slide-bar/SlideBar.tsx b/packages/slides-ui/src/views/slide-bar/SlideBar.tsx
similarity index 100%
rename from packages/slides-ui/src/components/slide-bar/SlideBar.tsx
rename to packages/slides-ui/src/views/slide-bar/SlideBar.tsx
diff --git a/packages/thread-comment-ui/src/index.ts b/packages/thread-comment-ui/src/index.ts
index af3285b2eb..36ba2bedc3 100644
--- a/packages/thread-comment-ui/src/index.ts
+++ b/packages/thread-comment-ui/src/index.ts
@@ -20,7 +20,7 @@ export { type ISetActiveCommentOperationParams, SetActiveCommentOperation } from
export type { IUniverThreadCommentUIConfig } from './config/config';
export { UniverThreadCommentUIPlugin } from './plugin';
export { type ActiveCommentInfo, ThreadCommentPanelService } from './services/thread-comment-panel.service';
-export { ThreadCommentPanel } from './views/thread-comment-panel';
-export type { IThreadCommentPanelProps } from './views/thread-comment-panel';
-export { ThreadCommentTree, ThreadCommentTreeLocation } from './views/thread-comment-tree';
-export type { IThreadCommentTreeProps } from './views/thread-comment-tree';
+export { ThreadCommentPanel } from './views/ThreadCommentPanel';
+export type { IThreadCommentPanelProps } from './views/ThreadCommentPanel';
+export { ThreadCommentTree, ThreadCommentTreeLocation } from './views/ThreadCommentTree';
+export type { IThreadCommentTreeProps } from './views/ThreadCommentTree';
diff --git a/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx b/packages/thread-comment-ui/src/views/ThreadCommentEditor.tsx
similarity index 98%
rename from packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx
rename to packages/thread-comment-ui/src/views/ThreadCommentEditor.tsx
index f41dd41e14..128dcdea16 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-editor/index.tsx
+++ b/packages/thread-comment-ui/src/views/ThreadCommentEditor.tsx
@@ -22,8 +22,8 @@ import { Button, clsx } from '@univerjs/design';
import { BreakLineCommand, IEditorService, RichTextEditor } from '@univerjs/docs-ui';
import { KeyCode, useDependency } from '@univerjs/ui';
import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { SetActiveCommentOperation } from '../../commands/operations/comment.operations';
-import { focusThreadCommentEditor } from './util';
+import { SetActiveCommentOperation } from '../commands/operations/comment.operations';
+import { focusThreadCommentEditor } from './thread-comment-editor/util';
export interface IThreadCommentEditorProps {
id?: string;
diff --git a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx b/packages/thread-comment-ui/src/views/ThreadCommentPanel.tsx
similarity index 95%
rename from packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
rename to packages/thread-comment-ui/src/views/ThreadCommentPanel.tsx
index a991b122b3..7e51885a49 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
+++ b/packages/thread-comment-ui/src/views/ThreadCommentPanel.tsx
@@ -17,18 +17,18 @@
import type { Nullable } from '@univerjs/core';
import type { IThreadComment } from '@univerjs/thread-comment';
import type { Observable } from 'rxjs';
-import type { IThreadCommentTreeProps } from '../thread-comment-tree';
-import type { ThreadCommentPanelSection } from './util';
+import type { ThreadCommentPanelSection } from './thread-comment-panel/util';
+import type { IThreadCommentTreeProps } from './ThreadCommentTree';
import { ICommandService, LocaleService, UniverInstanceType, UserManagerService } from '@univerjs/core';
import { Button, Select } from '@univerjs/design';
import { IncreaseIcon } from '@univerjs/icons';
import { ThreadCommentModel } from '@univerjs/thread-comment';
import { useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
-import { SetActiveCommentOperation } from '../../commands/operations/comment.operations';
-import { ThreadCommentPanelService } from '../../services/thread-comment-panel.service';
-import { ThreadCommentTree, ThreadCommentTreeLocation } from '../thread-comment-tree';
-import { getThreadCommentPanelItemKey } from './util';
+import { SetActiveCommentOperation } from '../commands/operations/comment.operations';
+import { ThreadCommentPanelService } from '../services/thread-comment-panel.service';
+import { getThreadCommentPanelItemKey } from './thread-comment-panel/util';
+import { ThreadCommentTree, ThreadCommentTreeLocation } from './ThreadCommentTree';
export interface IThreadCommentPanelProps {
unitId: string;
diff --git a/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx b/packages/thread-comment-ui/src/views/ThreadCommentTree.tsx
similarity index 98%
rename from packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
rename to packages/thread-comment-ui/src/views/ThreadCommentTree.tsx
index bb89f89516..1a4b9a83b7 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
+++ b/packages/thread-comment-ui/src/views/ThreadCommentTree.tsx
@@ -17,7 +17,7 @@
import type { IUser, UniverInstanceType } from '@univerjs/core';
import type { IAddCommentCommandParams, IThreadComment, IUpdateCommentCommandParams } from '@univerjs/thread-comment';
import type { IUniverUIConfig } from '@univerjs/ui';
-import type { IThreadCommentEditorInstance } from '../thread-comment-editor';
+import type { IThreadCommentEditorInstance } from './ThreadCommentEditor';
import { generateRandomId, ICommandService, LocaleService, UserManagerService } from '@univerjs/core';
import { borderClassName, clsx, Dropdown, scrollbarClassName, Tooltip } from '@univerjs/design';
import { DeleteIcon, MoreHorizontalIcon, ReplyToCommentIcon, ResolvedIcon, SolveIcon } from '@univerjs/icons';
@@ -33,10 +33,10 @@ import {
import { UI_PLUGIN_CONFIG_KEY, useConfigValue, useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
import { debounceTime } from 'rxjs';
-import { SetActiveCommentOperation } from '../../commands/operations/comment.operations';
-import { ThreadCommentEditor } from '../thread-comment-editor';
-import { transformDocument2TextNodes, transformTextNodes2Document } from '../thread-comment-editor/util';
-import { getThreadCommentEditorId } from './util';
+import { SetActiveCommentOperation } from '../commands/operations/comment.operations';
+import { transformDocument2TextNodes, transformTextNodes2Document } from './thread-comment-editor/util';
+import { getThreadCommentEditorId } from './thread-comment-tree/util';
+import { ThreadCommentEditor } from './ThreadCommentEditor';
export enum ThreadCommentTreeLocation {
CELL = 'CELL',
diff --git a/packages/thread-comment-ui/src/views/thread-comment-editor/__tests__/index.spec.tsx b/packages/thread-comment-ui/src/views/thread-comment-editor/__tests__/index.spec.tsx
index 07a2e5a567..90b91fc6bd 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-editor/__tests__/index.spec.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-editor/__tests__/index.spec.tsx
@@ -14,14 +14,13 @@
* limitations under the License.
*/
+import type { ButtonHTMLAttributes, FormEvent } from 'react';
import type { Root } from 'react-dom/client';
import { UniverInstanceType } from '@univerjs/core';
-import * as React from 'react';
-import { act } from 'react';
+import { act, createRef, useEffect } from 'react';
import { createRoot } from 'react-dom/client';
-
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { ThreadCommentEditor } from '../index';
+import { ThreadCommentEditor } from '../../ThreadCommentEditor';
const { commandService, localeService, editorService, coreTokens, docsUiTokens, editorHandle } = vi.hoisted(() => {
const commandService = {
@@ -92,7 +91,7 @@ vi.mock('@univerjs/docs-ui', () => ({
},
IEditorService: docsUiTokens.IEditorService,
RichTextEditor: ({ autoFocus, editorRef, onFocusChange, placeholder }: any) => {
- React.useEffect(() => {
+ useEffect(() => {
editorRef.current = editorHandle;
if (autoFocus) {
onFocusChange?.(true);
@@ -114,7 +113,7 @@ vi.mock('../../../commands/operations/comment.operations', () => ({
}));
vi.mock('@univerjs/design', () => ({
- Button: ({ children, disabled, onClick, type }: React.ButtonHTMLAttributes<HTMLButtonElement>) => (
+ Button: ({ children, disabled, onClick, type }: ButtonHTMLAttributes<HTMLButtonElement>) => (
<button disabled={disabled} onClick={onClick} type={type}>
{children}
</button>
@@ -179,7 +178,7 @@ describe('ThreadCommentEditor', () => {
it('uses non-submit buttons so replying does not submit an outer form', () => {
const onSave = vi.fn();
- const onSubmit = vi.fn((event: React.FormEvent<HTMLFormElement>) => event.preventDefault());
+ const onSubmit = vi.fn((event: FormEvent<HTMLFormElement>) => event.preventDefault());
container = document.createElement('div');
document.body.appendChild(container);
@@ -281,7 +280,7 @@ describe('ThreadCommentEditor', () => {
});
it('shows action buttons after reply inserts mention text without a focus change event', () => {
- const ref = React.createRef<{ reply: (text: { dataStream: string }) => void }>();
+ const ref = createRef<{ reply: (text: { dataStream: string }) => void }>();
container = document.createElement('div');
document.body.appendChild(container);
diff --git a/packages/thread-comment-ui/src/views/thread-comment-tree/__tests__/util.spec.ts b/packages/thread-comment-ui/src/views/thread-comment-tree/__tests__/util.spec.ts
index 81b664c6e7..bec17967b4 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-tree/__tests__/util.spec.ts
+++ b/packages/thread-comment-ui/src/views/thread-comment-tree/__tests__/util.spec.ts
@@ -16,7 +16,7 @@
import { DOCS_COMMENT_EDITOR_UNIT_ID_KEY } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
-import { ThreadCommentTreeLocation } from '..';
+import { ThreadCommentTreeLocation } from '../../ThreadCommentTree';
import { getThreadCommentEditorId } from '../util';
describe('getThreadCommentEditorId', () => {
diff --git a/packages/thread-comment-ui/src/views/thread-comment-tree/util.ts b/packages/thread-comment-ui/src/views/thread-comment-tree/util.ts
index 13b99734f5..de31c43f97 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-tree/util.ts
+++ b/packages/thread-comment-ui/src/views/thread-comment-tree/util.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { ThreadCommentTreeLocation } from '../thread-comment-tree';
+import type { ThreadCommentTreeLocation } from '../ThreadCommentTree';
import { DOCS_COMMENT_EDITOR_UNIT_ID_KEY } from '@univerjs/core';
interface IGetThreadCommentEditorIdParams {
diff --git a/packages/ui/src/controllers/ui/ui-desktop.controller.tsx b/packages/ui/src/controllers/ui/ui-desktop.controller.tsx
index 9bcc3b6ffa..aaa2b60050 100644
--- a/packages/ui/src/controllers/ui/ui-desktop.controller.tsx
+++ b/packages/ui/src/controllers/ui/ui-desktop.controller.tsx
@@ -23,21 +23,21 @@ import { Inject, Injector, IUniverInstanceService, LifecycleService, toDisposabl
import { ColorPicker, render as createRoot, unmount } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
import { ComponentManager } from '../../common';
-import { HEADING_ITEM_COMPONENT, HeadingItem } from '../../components';
-import { COLOR_PICKER_COMPONENT } from '../../components/color-picker/interface';
-import { COMMON_LABEL_COMPONENT, CommonLabel } from '../../components/common-label';
-import { FontFamily, FontFamilyItem } from '../../components/font-family';
-import { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT } from '../../components/font-family/interface';
-import { FontSize } from '../../components/font-size/FontSize';
-import { FONT_SIZE_COMPONENT } from '../../components/font-size/interface';
import { menuSchema } from '../../menu/schema';
import { ILayoutService } from '../../services/layout/layout.service';
import { IMenuManagerService } from '../../services/menu/menu-manager.service';
import { BuiltInUIPart, IUIPartsService } from '../../services/parts/parts.service';
import { connectInjector } from '../../utils/di';
+import { COLOR_PICKER_COMPONENT } from '../../views/color-picker/interface';
+import { COMMON_LABEL_COMPONENT, CommonLabel } from '../../views/CommonLabel';
import { FloatDom } from '../../views/components/dom/FloatDom';
import { CanvasPopup } from '../../views/components/popup/CanvasPopup';
import { Ribbon } from '../../views/components/ribbon/Ribbon';
+import { FontFamily, FontFamilyItem } from '../../views/font-family/index';
+import { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT } from '../../views/font-family/interface';
+import { FontSize } from '../../views/font-size/FontSize';
+import { FONT_SIZE_COMPONENT } from '../../views/font-size/interface';
+import { HEADING_ITEM_COMPONENT, HeadingItem } from '../../views/index';
import { DesktopWorkbench } from '../../views/workbench/Workbench';
import { SingleUnitUIController } from './ui-shared.controller';
diff --git a/packages/ui/src/controllers/ui/ui-mobile.controller.tsx b/packages/ui/src/controllers/ui/ui-mobile.controller.tsx
index 4a97f5f0a4..dc5bffd684 100644
--- a/packages/ui/src/controllers/ui/ui-mobile.controller.tsx
+++ b/packages/ui/src/controllers/ui/ui-mobile.controller.tsx
@@ -23,21 +23,21 @@ import { Inject, Injector, IUniverInstanceService, LifecycleService, toDisposabl
import { ColorPicker, render as createRoot, unmount } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
import { ComponentManager } from '../../common';
-import { HEADING_ITEM_COMPONENT, HeadingItem } from '../../components';
-import { COLOR_PICKER_COMPONENT } from '../../components/color-picker/interface';
-import { COMMON_LABEL_COMPONENT, CommonLabel } from '../../components/common-label';
-import { FontFamily, FontFamilyItem } from '../../components/font-family';
-import { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT } from '../../components/font-family/interface';
-import { FontSize } from '../../components/font-size/FontSize';
-import { FONT_SIZE_COMPONENT } from '../../components/font-size/interface';
import { menuSchema } from '../../menu/schema';
import { ILayoutService } from '../../services/layout/layout.service';
import { IMenuManagerService } from '../../services/menu/menu-manager.service';
import { BuiltInUIPart, IUIPartsService } from '../../services/parts/parts.service';
import { connectInjector } from '../../utils/di';
+import { COLOR_PICKER_COMPONENT } from '../../views/color-picker/interface';
+import { COMMON_LABEL_COMPONENT, CommonLabel } from '../../views/CommonLabel';
import { FloatDom } from '../../views/components/dom/FloatDom';
import { CanvasPopup } from '../../views/components/popup/CanvasPopup';
import { MobileRibbon } from '../../views/components/ribbon/MobileRibbon';
+import { FontFamily, FontFamilyItem } from '../../views/font-family/index';
+import { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT } from '../../views/font-family/interface';
+import { FontSize } from '../../views/font-size/FontSize';
+import { FONT_SIZE_COMPONENT } from '../../views/font-size/interface';
+import { HEADING_ITEM_COMPONENT, HeadingItem } from '../../views/index';
import { MobileWorkbench } from '../../views/mobile-workbench/MobileWorkbench';
import { SingleUnitUIController } from './ui-shared.controller';
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
index 952a1671a6..534f17b826 100644
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -20,16 +20,6 @@ export { ToggleShortcutPanelOperation } from './commands/operations/toggle-short
export * from './common';
export { getHeaderFooterMenuHiddenObservable, getMenuHiddenObservable } from './common/menu-hidden-observable';
export { mergeMenuConfigs } from './common/menu-merge-configs';
-export * from './components';
-export { COLOR_PICKER_COMPONENT } from './components/color-picker/interface';
-export { FontFamily } from './components/font-family/FontFamily';
-export { FontFamilyItem } from './components/font-family/FontFamilyItem';
-export { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT, type IFontFamilyProps } from './components/font-family/interface';
-export { FontSize } from './components/font-size/FontSize';
-export { FONT_SIZE_COMPONENT, FONT_SIZE_LIST, HEADING_LIST } from './components/font-size/interface';
-export * from './components/hooks';
-export { type INotificationOptions } from './components/notification/Notification';
-export { ProgressBar } from './components/progress-bar/ProgressBar';
export { type IUniverUIConfig, UI_PLUGIN_CONFIG_KEY } from './config/config';
export { UNI_DISABLE_CHANGING_FOCUS_KEY } from './const';
export { ErrorController } from './controllers/error/error.controller';
@@ -118,6 +108,7 @@ export { useSidebarClick } from './services/sidebar/hooks/use-sidebar-click';
export { ILeftSidebarService, ISidebarService } from './services/sidebar/sidebar.service';
export { ThemeSwitcherService } from './services/theme-switcher/theme-switcher.service';
export * from './utils';
+export { COLOR_PICKER_COMPONENT } from './views/color-picker/interface';
export { ComponentContainer, type IComponentContainerProps, useComponentsOfPart } from './views/components/ComponentContainer';
export type { IConfirmChildrenProps } from './views/components/confirm-part/interface';
export { type IConfirmPartMethodOptions } from './views/components/confirm-part/interface';
@@ -136,3 +127,12 @@ export { Ribbon } from './views/components/ribbon/Ribbon';
export { ToolbarButton } from './views/components/ribbon/ToolbarButton';
export { ToolbarItem } from './views/components/ribbon/ToolbarItem';
export { type ISidebarMethodOptions, Sidebar } from './views/components/sidebar/Sidebar';
+export { FontFamily } from './views/font-family/FontFamily';
+export { FontFamilyItem } from './views/font-family/FontFamilyItem';
+export { FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT, type IFontFamilyProps } from './views/font-family/interface';
+export { FontSize } from './views/font-size/FontSize';
+export { FONT_SIZE_COMPONENT, FONT_SIZE_LIST, HEADING_LIST } from './views/font-size/interface';
+export * from './views/hooks/index';
+export * from './views/index';
+export { type INotificationOptions } from './views/notification/Notification';
+export { ProgressBar } from './views/progress-bar/ProgressBar';
diff --git a/packages/ui/src/services/__tests__/desktop-services.spec.ts b/packages/ui/src/services/__tests__/desktop-services.spec.ts
index 7309fb820e..c2053d4cd9 100644
--- a/packages/ui/src/services/__tests__/desktop-services.spec.ts
+++ b/packages/ui/src/services/__tests__/desktop-services.spec.ts
@@ -38,7 +38,7 @@ vi.mock('@univerjs/design', async (importOriginal) => {
};
});
-vi.mock('../../components/notification/Notification', () => ({
+vi.mock('../../views/notification/Notification', () => ({
Notification: () => null,
notification: {
show: vi.fn(),
@@ -169,7 +169,7 @@ describe('DesktopGalleryService', () => {
});
describe('DesktopNotificationService', async () => {
- const { notification } = await import('../../components/notification/Notification');
+ const { notification } = await import('../../views/notification/Notification');
it('should register ui part and show notification', () => {
const uiPartsService = createUiPartsService();
diff --git a/packages/ui/src/services/message/desktop-message.service.ts b/packages/ui/src/services/message/desktop-message.service.ts
index f413ecb538..ae63daf3a8 100644
--- a/packages/ui/src/services/message/desktop-message.service.ts
+++ b/packages/ui/src/services/message/desktop-message.service.ts
@@ -19,8 +19,8 @@ import type { IMessageProps } from '@univerjs/design';
import type { IMessageService } from './message.service';
import { Disposable, Inject, Injector, toDisposable } from '@univerjs/core';
import { message, removeMessage } from '@univerjs/design';
-import { MessageContainer } from '../../components/message/MessageContainer';
import { connectInjector } from '../../utils/di';
+import { MessageContainer } from '../../views/message/MessageContainer';
import { BuiltInUIPart, IUIPartsService } from '../parts/parts.service';
let messageId = 0;
diff --git a/packages/ui/src/services/notification/desktop-notification.service.ts b/packages/ui/src/services/notification/desktop-notification.service.ts
index 548d1da99d..5ea499a60e 100644
--- a/packages/ui/src/services/notification/desktop-notification.service.ts
+++ b/packages/ui/src/services/notification/desktop-notification.service.ts
@@ -15,12 +15,12 @@
*/
import type { IDisposable } from '@univerjs/core';
-import type { INotificationOptions } from '../../components/notification/Notification';
+import type { INotificationOptions } from '../../views/notification/Notification';
import type { INotificationService } from './notification.service';
import { Disposable, Inject, Injector, toDisposable } from '@univerjs/core';
-import { notification, Notification } from '../../components/notification/Notification';
import { connectInjector } from '../../utils/di';
+import { notification, Notification } from '../../views/notification/Notification';
import { BuiltInUIPart, IUIPartsService } from '../parts/parts.service';
export class DesktopNotificationService extends Disposable implements INotificationService {
diff --git a/packages/ui/src/services/notification/notification.service.ts b/packages/ui/src/services/notification/notification.service.ts
index bfd1640a10..236d322bf5 100644
--- a/packages/ui/src/services/notification/notification.service.ts
+++ b/packages/ui/src/services/notification/notification.service.ts
@@ -15,7 +15,7 @@
*/
import type { IDisposable } from '@univerjs/core';
-import type { INotificationOptions } from '../../components/notification/Notification';
+import type { INotificationOptions } from '../../views/notification/Notification';
import { createIdentifier } from '@univerjs/core';
export const INotificationService = createIdentifier<INotificationService>('ui.notification.service');
diff --git a/packages/ui/src/components/common-label/index.tsx b/packages/ui/src/views/CommonLabel.tsx
similarity index 96%
rename from packages/ui/src/components/common-label/index.tsx
rename to packages/ui/src/views/CommonLabel.tsx
index 9f22e7c62b..ca666c11ae 100644
--- a/packages/ui/src/components/common-label/index.tsx
+++ b/packages/ui/src/views/CommonLabel.tsx
@@ -17,7 +17,7 @@
import { LocaleService } from '@univerjs/core';
import { useMemo } from 'react';
-import { useDependency } from '../../utils/di';
+import { useDependency } from '../utils/di';
export interface ICommonLabelProps {
value: string | number;
diff --git a/packages/ui/src/components/heading-item/index.tsx b/packages/ui/src/views/HeadingItem.tsx
similarity index 96%
rename from packages/ui/src/components/heading-item/index.tsx
rename to packages/ui/src/views/HeadingItem.tsx
index 26b5199119..6f0f91e0d2 100644
--- a/packages/ui/src/components/heading-item/index.tsx
+++ b/packages/ui/src/views/HeadingItem.tsx
@@ -17,7 +17,7 @@
import type { NamedStyleType } from '@univerjs/core';
import { LocaleService, NAMED_STYLE_MAP } from '@univerjs/core';
import { clsx } from '@univerjs/design';
-import { useDependency } from '../../utils/di';
+import { useDependency } from '../utils/di';
export const HeadingItem = (props: { value: NamedStyleType; text: string }) => {
const { value, text } = props;
diff --git a/packages/ui/src/components/color-picker/interface.ts b/packages/ui/src/views/color-picker/interface.ts
similarity index 100%
rename from packages/ui/src/components/color-picker/interface.ts
rename to packages/ui/src/views/color-picker/interface.ts
diff --git a/packages/ui/src/views/components/confirm-part/ConfirmPart.tsx b/packages/ui/src/views/components/confirm-part/ConfirmPart.tsx
index 56eb87e115..569086c32e 100644
--- a/packages/ui/src/views/components/confirm-part/ConfirmPart.tsx
+++ b/packages/ui/src/views/components/confirm-part/ConfirmPart.tsx
@@ -19,8 +19,8 @@ import type { IConfirmChildrenProps, IConfirmPartMethodOptions, IContextConfirmP
import { IConfirmService } from '@univerjs/core';
import { Confirm } from '@univerjs/design';
import { cloneElement, useEffect, useState } from 'react';
-import { CustomLabel } from '../../../components/custom-label/CustomLabel';
import { useDependency } from '../../../utils/di';
+import { CustomLabel } from '../../custom-label/CustomLabel';
const ContextConfirm = (props: IContextConfirmProps) => {
const { children, onClose, onConfirm } = props;
diff --git a/packages/ui/src/views/components/confirm-part/interface.ts b/packages/ui/src/views/components/confirm-part/interface.ts
index a6ecd6fc9a..c2a62d5293 100644
--- a/packages/ui/src/views/components/confirm-part/interface.ts
+++ b/packages/ui/src/views/components/confirm-part/interface.ts
@@ -16,7 +16,7 @@
import type { IConfirmProps } from '@univerjs/design';
-import type { ICustomLabelProps } from '../../../components/custom-label/CustomLabel';
+import type { ICustomLabelProps } from '../../custom-label/CustomLabel';
export interface IConfirmChildrenProps {
hooks: {
diff --git a/packages/ui/src/views/components/context-menu/ContextMenuPanel.tsx b/packages/ui/src/views/components/context-menu/ContextMenuPanel.tsx
index 744ae96929..5d4d7c0dc6 100644
--- a/packages/ui/src/views/components/context-menu/ContextMenuPanel.tsx
+++ b/packages/ui/src/views/components/context-menu/ContextMenuPanel.tsx
@@ -30,13 +30,13 @@ import { CheckMarkIcon, MoreIcon } from '@univerjs/icons';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
import { combineLatest, isObservable, of, scan, startWith } from 'rxjs';
-import { CustomLabel } from '../../../components/custom-label/CustomLabel';
-import { useScrollYOverContainer } from '../../../components/hooks/layout';
-import { resolveMenuItemActiveState, UIQuickTileMenuGroup, UITinyMenuGroup } from '../../../components/menu/desktop/TinyMenuGroup';
import { ILayoutService } from '../../../services/layout/layout.service';
import { MenuItemType } from '../../../services/menu/menu';
import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
import { useDependency, useObservable } from '../../../utils/di';
+import { CustomLabel } from '../../custom-label/CustomLabel';
+import { useScrollYOverContainer } from '../../hooks/layout';
+import { resolveMenuItemActiveState, UIQuickTileMenuGroup, UITinyMenuGroup } from '../../menu/desktop/TinyMenuGroup';
type ContextMenuSizeVariant = 'default' | 'paragraph-t';
type ContextMenuAutoFocusTarget = 'first-item' | 'container';
diff --git a/packages/ui/src/views/components/context-menu/MobileContextMenu.tsx b/packages/ui/src/views/components/context-menu/MobileContextMenu.tsx
index 95758e3713..d9309ede47 100644
--- a/packages/ui/src/views/components/context-menu/MobileContextMenu.tsx
+++ b/packages/ui/src/views/components/context-menu/MobileContextMenu.tsx
@@ -20,12 +20,12 @@ import { ConfigContext } from '@univerjs/design';
import { CloseIcon } from '@univerjs/icons';
import { useContext, useEffect, useMemo, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
-import { MobileMenu } from '../../../components/menu/mobile/MobileMenu';
import { IContextMenuHostService } from '../../../services/contextmenu/contextmenu-host.service';
import { IContextMenuService } from '../../../services/contextmenu/contextmenu.service';
import { ILayoutService } from '../../../services/layout/layout.service';
import { ContextMenuPosition } from '../../../services/menu/types';
import { useDependency, useObservable } from '../../../utils/di';
+import { MobileMenu } from '../../menu/mobile/MobileMenu';
const MOBILE_CONTEXT_MENU_HOST_ID = 'mobile-context-menu';
diff --git a/packages/ui/src/views/components/context-menu/__tests__/ContextMenuPanel.spec.tsx b/packages/ui/src/views/components/context-menu/__tests__/ContextMenuPanel.spec.tsx
index 6e6fe79397..ff5fd71293 100644
--- a/packages/ui/src/views/components/context-menu/__tests__/ContextMenuPanel.spec.tsx
+++ b/packages/ui/src/views/components/context-menu/__tests__/ContextMenuPanel.spec.tsx
@@ -61,7 +61,7 @@ vi.mock('../../../../utils/di', async () => {
};
});
-vi.mock('../../../../components/menu/desktop/TinyMenuGroup', () => ({
+vi.mock('../../../menu/desktop/TinyMenuGroup', () => ({
resolveMenuItemActiveState: () => false,
UITinyMenuGroup: (props: unknown) => {
tinyMenuGroupSpy(props);
@@ -70,7 +70,7 @@ vi.mock('../../../../components/menu/desktop/TinyMenuGroup', () => ({
UIQuickTileMenuGroup: () => <div data-testid="quick-tile-menu-group" />,
}));
-vi.mock('../../../../components/custom-label/CustomLabel', () => ({
+vi.mock('../../../custom-label/CustomLabel', () => ({
CustomLabel: () => <span data-testid="custom-label" />,
}));
diff --git a/packages/ui/src/views/components/dialog-part/DialogPart.tsx b/packages/ui/src/views/components/dialog-part/DialogPart.tsx
index 036abd9fa1..3ff12cf265 100644
--- a/packages/ui/src/views/components/dialog-part/DialogPart.tsx
+++ b/packages/ui/src/views/components/dialog-part/DialogPart.tsx
@@ -18,9 +18,9 @@ import type { IDialogProps } from '@univerjs/design';
import type { IDialogPartMethodOptions } from './interface';
import { Dialog } from '@univerjs/design';
import { useEffect, useMemo, useState } from 'react';
-import { CustomLabel } from '../../../components/custom-label/CustomLabel';
import { IDialogService } from '../../../services/dialog/dialog.service';
import { useDependency } from '../../../utils/di';
+import { CustomLabel } from '../../custom-label/CustomLabel';
export function DialogPart() {
const dialogService = useDependency(IDialogService);
diff --git a/packages/ui/src/views/components/dialog-part/interface.ts b/packages/ui/src/views/components/dialog-part/interface.ts
index 60437393ce..1fc6f7f00b 100644
--- a/packages/ui/src/views/components/dialog-part/interface.ts
+++ b/packages/ui/src/views/components/dialog-part/interface.ts
@@ -16,7 +16,7 @@
import type { IDialogProps } from '@univerjs/design';
-import type { ICustomLabelProps } from '../../../components/custom-label/CustomLabel';
+import type { ICustomLabelProps } from '../../custom-label/CustomLabel';
export type IDialogPartMethodOptions = {
id: string;
diff --git a/packages/ui/src/views/components/popup/RectPopup.tsx b/packages/ui/src/views/components/popup/RectPopup.tsx
index 785c54684f..3d83f9e1cd 100644
--- a/packages/ui/src/views/components/popup/RectPopup.tsx
+++ b/packages/ui/src/views/components/popup/RectPopup.tsx
@@ -22,9 +22,9 @@ import { IConfigService, LocaleService } from '@univerjs/core';
import { clsx } from '@univerjs/design';
import { createContext, useContext, useEffect, useRef } from 'react';
import { createPortal } from 'react-dom';
-import { useEvent } from '../../../components/hooks/event';
import { UI_PLUGIN_CONFIG_KEY } from '../../../config/config';
import { useDependency, useObservable } from '../../../utils/di';
+import { useEvent } from '../../hooks/event';
interface IAbsolutePosition {
left: number;
diff --git a/packages/ui/src/views/components/ribbon/MobileRibbon.tsx b/packages/ui/src/views/components/ribbon/MobileRibbon.tsx
index d0f701faad..c52b83b49a 100644
--- a/packages/ui/src/views/components/ribbon/MobileRibbon.tsx
+++ b/packages/ui/src/views/components/ribbon/MobileRibbon.tsx
@@ -16,7 +16,7 @@
import type { ComponentType } from 'react';
import { LocaleService } from '@univerjs/core';
-import { borderBottomClassName, borderClassName, borderRightClassName, clsx } from '@univerjs/design';
+import { borderBottomClassName, borderClassName, borderRightClassName, clsx, resetButtonClassName } from '@univerjs/design';
import { MoreIcon, MoreLeftIcon, MoreRightIcon } from '@univerjs/icons';
import { useEffect, useMemo, useRef, useState } from 'react';
import { RibbonPosition } from '../../../services/menu/types';
@@ -31,10 +31,7 @@ interface IMobileRibbonProps {
}
const toolbarScrollOffset = 168;
-const resetButtonClassName = `
-univer-m-0 univer-flex univer-appearance-none univer-items-center univer-justify-center
-univer-border-0 univer-bg-transparent univer-p-0 univer-leading-none univer-outline-none
-`;
+
const nestedControlResetClassName = `
[&_button]:!univer-m-0 [&_button]:!univer-appearance-none [&_button]:!univer-border-0
[&_button]:!univer-bg-transparent [&_button]:!univer-p-0 [&_button]:!univer-leading-none
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index e47edbf76c..aa7121bb98 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -22,10 +22,10 @@ import { MoreDownIcon } from '@univerjs/icons';
import { forwardRef, useMemo } from 'react';
import { isObservable, Observable } from 'rxjs';
import { ComponentManager } from '../../../common/component-manager';
-import { CustomLabel } from '../../../components/custom-label/CustomLabel';
import { ILayoutService } from '../../../services/layout/layout.service';
import { MenuItemType } from '../../../services/menu/menu';
import { useDependency, useObservable } from '../../../utils/di';
+import { CustomLabel } from '../../custom-label/CustomLabel';
import { useToolbarItemStatus, useToolbarShortcutDisplay } from './hook';
import { ToolbarButton } from './ToolbarButton';
import { DropdownMenuWrapper, TooltipWrapper } from './TooltipButtonWrapper';
diff --git a/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx b/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
index 9a1d85e3d1..a4d8b6a545 100644
--- a/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
+++ b/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
@@ -22,9 +22,9 @@ import { clsx, Dropdown, DropdownMenu, Tooltip } from '@univerjs/design';
import { CheckMarkIcon } from '@univerjs/icons';
import { createContext, forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
import { combineLatest, of } from 'rxjs';
-import { CustomLabel } from '../../../components/custom-label/CustomLabel';
import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
import { useDependency } from '../../../utils/di';
+import { CustomLabel } from '../../custom-label/CustomLabel';
const TooltipWrapperContext = createContext({
dropdownVisible: false,
diff --git a/packages/ui/src/views/components/ribbon/__tests__/TooltipButtonWrapper.spec.tsx b/packages/ui/src/views/components/ribbon/__tests__/TooltipButtonWrapper.spec.tsx
index 2dffcad972..a08d43e71d 100644
--- a/packages/ui/src/views/components/ribbon/__tests__/TooltipButtonWrapper.spec.tsx
+++ b/packages/ui/src/views/components/ribbon/__tests__/TooltipButtonWrapper.spec.tsx
@@ -19,7 +19,7 @@ import React from 'react';
import { describe, expect, it, vi } from 'vitest';
import { DropdownMenuLabel } from '../TooltipButtonWrapper';
-vi.mock('../../../../components/custom-label/CustomLabel', () => ({
+vi.mock('../../../custom-label/CustomLabel', () => ({
CustomLabel: (props: { label?: unknown }) => React.createElement(
'span',
{
diff --git a/packages/ui/src/views/components/sidebar/Sidebar.tsx b/packages/ui/src/views/components/sidebar/Sidebar.tsx
index 3dff867873..512358be0c 100644
--- a/packages/ui/src/views/components/sidebar/Sidebar.tsx
+++ b/packages/ui/src/views/components/sidebar/Sidebar.tsx
@@ -15,13 +15,13 @@
*/
import type { CSSProperties, ReactNode } from 'react';
-import type { ICustomLabelProps } from '../../../components/custom-label/CustomLabel';
+import type { ICustomLabelProps } from '../../custom-label/CustomLabel';
import { borderLeftBottomClassName, clsx, scrollbarClassName } from '@univerjs/design';
import { CloseIcon } from '@univerjs/icons';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { CustomLabel } from '../../../components/custom-label/CustomLabel';
import { ISidebarService } from '../../../services/sidebar/sidebar.service';
import { useDependency, useObservable } from '../../../utils/di';
+import { CustomLabel } from '../../custom-label/CustomLabel';
export interface ISidebarMethodOptions {
id?: string;
diff --git a/packages/ui/src/components/custom-label/CustomLabel.tsx b/packages/ui/src/views/custom-label/CustomLabel.tsx
similarity index 100%
rename from packages/ui/src/components/custom-label/CustomLabel.tsx
rename to packages/ui/src/views/custom-label/CustomLabel.tsx
diff --git a/packages/ui/src/components/custom-label/index.ts b/packages/ui/src/views/custom-label/index.ts
similarity index 100%
rename from packages/ui/src/components/custom-label/index.ts
rename to packages/ui/src/views/custom-label/index.ts
diff --git a/packages/ui/src/components/font-family/FontFamily.tsx b/packages/ui/src/views/font-family/FontFamily.tsx
similarity index 100%
rename from packages/ui/src/components/font-family/FontFamily.tsx
rename to packages/ui/src/views/font-family/FontFamily.tsx
diff --git a/packages/ui/src/components/font-family/FontFamilyItem.tsx b/packages/ui/src/views/font-family/FontFamilyItem.tsx
similarity index 100%
rename from packages/ui/src/components/font-family/FontFamilyItem.tsx
rename to packages/ui/src/views/font-family/FontFamilyItem.tsx
diff --git a/packages/ui/src/components/font-family/index.ts b/packages/ui/src/views/font-family/index.ts
similarity index 100%
rename from packages/ui/src/components/font-family/index.ts
rename to packages/ui/src/views/font-family/index.ts
diff --git a/packages/ui/src/components/font-family/interface.ts b/packages/ui/src/views/font-family/interface.ts
similarity index 100%
rename from packages/ui/src/components/font-family/interface.ts
rename to packages/ui/src/views/font-family/interface.ts
diff --git a/packages/ui/src/components/font-size/FontSize.tsx b/packages/ui/src/views/font-size/FontSize.tsx
similarity index 100%
rename from packages/ui/src/components/font-size/FontSize.tsx
rename to packages/ui/src/views/font-size/FontSize.tsx
diff --git a/packages/ui/src/components/font-size/interface.ts b/packages/ui/src/views/font-size/interface.ts
similarity index 100%
rename from packages/ui/src/components/font-size/interface.ts
rename to packages/ui/src/views/font-size/interface.ts
diff --git a/packages/ui/src/components/hooks/__tests__/observable.spec.ts b/packages/ui/src/views/hooks/__tests__/observable.spec.ts
similarity index 100%
rename from packages/ui/src/components/hooks/__tests__/observable.spec.ts
rename to packages/ui/src/views/hooks/__tests__/observable.spec.ts
diff --git a/packages/ui/src/components/hooks/event.ts b/packages/ui/src/views/hooks/event.ts
similarity index 100%
rename from packages/ui/src/components/hooks/event.ts
rename to packages/ui/src/views/hooks/event.ts
diff --git a/packages/ui/src/components/hooks/index.ts b/packages/ui/src/views/hooks/index.ts
similarity index 100%
rename from packages/ui/src/components/hooks/index.ts
rename to packages/ui/src/views/hooks/index.ts
diff --git a/packages/ui/src/components/hooks/layout.ts b/packages/ui/src/views/hooks/layout.ts
similarity index 100%
rename from packages/ui/src/components/hooks/layout.ts
rename to packages/ui/src/views/hooks/layout.ts
diff --git a/packages/ui/src/components/hooks/update-effect.ts b/packages/ui/src/views/hooks/update-effect.ts
similarity index 100%
rename from packages/ui/src/components/hooks/update-effect.ts
rename to packages/ui/src/views/hooks/update-effect.ts
diff --git a/packages/ui/src/components/hooks/use-click-out-side.ts b/packages/ui/src/views/hooks/use-click-out-side.ts
similarity index 100%
rename from packages/ui/src/components/hooks/use-click-out-side.ts
rename to packages/ui/src/views/hooks/use-click-out-side.ts
diff --git a/packages/ui/src/components/hooks/use-debounce.ts b/packages/ui/src/views/hooks/use-debounce.ts
similarity index 100%
rename from packages/ui/src/components/hooks/use-debounce.ts
rename to packages/ui/src/views/hooks/use-debounce.ts
diff --git a/packages/ui/src/components/hooks/virtual-list.ts b/packages/ui/src/views/hooks/virtual-list.ts
similarity index 100%
rename from packages/ui/src/components/hooks/virtual-list.ts
rename to packages/ui/src/views/hooks/virtual-list.ts
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/views/index.ts
similarity index 80%
rename from packages/ui/src/components/index.ts
rename to packages/ui/src/views/index.ts
index 488c7f1fdd..921b80c714 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/views/index.ts
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-export * from './common-label';
-export * from './custom-label';
-export * from './heading-item';
+export * from './CommonLabel';
+export * from './custom-label/index';
+export * from './HeadingItem';
export { useScrollYOverContainer } from './hooks/layout';
-export { type ISliderProps, Slider } from './slider';
+export { type ISliderProps, Slider } from './slider/index';
diff --git a/packages/ui/src/components/menu/common/hook.ts b/packages/ui/src/views/menu/common/hook.ts
similarity index 100%
rename from packages/ui/src/components/menu/common/hook.ts
rename to packages/ui/src/views/menu/common/hook.ts
diff --git a/packages/ui/src/components/menu/desktop/DesignTinyMenuGroup.tsx b/packages/ui/src/views/menu/desktop/DesignTinyMenuGroup.tsx
similarity index 93%
rename from packages/ui/src/components/menu/desktop/DesignTinyMenuGroup.tsx
rename to packages/ui/src/views/menu/desktop/DesignTinyMenuGroup.tsx
index c236293d98..2037199e4b 100644
--- a/packages/ui/src/components/menu/desktop/DesignTinyMenuGroup.tsx
+++ b/packages/ui/src/views/menu/desktop/DesignTinyMenuGroup.tsx
@@ -141,6 +141,14 @@ function getTinyMenuVariant(sizeVariant: TinyMenuSizeVariant, layoutVariant: Tin
return 'default';
}
+function getTinyMenuGridTemplateColumns(columns: number | undefined, variant: TinyMenuVariant) {
+ if (!columns || (columns === 6 && variant !== 'compactParagraph')) {
+ return undefined;
+ }
+
+ return `repeat(${columns}, max-content)`;
+}
+
export function DesignTinyMenuGroup({
items,
columns,
@@ -150,6 +158,7 @@ export function DesignTinyMenuGroup({
}: ITinyMenuGroupProps) {
const variant = getTinyMenuVariant(sizeVariant, layoutVariant);
const isParagraphTVariant = variant !== 'default';
+ const gridTemplateColumns = getTinyMenuGridTemplateColumns(columns, variant);
return (
<div
@@ -158,8 +167,8 @@ export function DesignTinyMenuGroup({
layout: columns ? 'grid' : 'wrap',
columnsSix: columns === 6 && variant !== 'compactParagraph',
})}
- style={variant === 'compactParagraph' && columns
- ? { gridTemplateColumns: `repeat(${columns}, max-content)` }
+ style={gridTemplateColumns
+ ? { gridTemplateColumns }
: undefined}
>
{items.map((item) => {
diff --git a/packages/ui/src/components/menu/desktop/TinyMenuGroup.tsx b/packages/ui/src/views/menu/desktop/TinyMenuGroup.tsx
similarity index 100%
rename from packages/ui/src/components/menu/desktop/TinyMenuGroup.tsx
rename to packages/ui/src/views/menu/desktop/TinyMenuGroup.tsx
diff --git a/packages/ui/src/components/menu/desktop/__tests__/DesignTinyMenuGroup.spec.tsx b/packages/ui/src/views/menu/desktop/__tests__/DesignTinyMenuGroup.spec.tsx
similarity index 81%
rename from packages/ui/src/components/menu/desktop/__tests__/DesignTinyMenuGroup.spec.tsx
rename to packages/ui/src/views/menu/desktop/__tests__/DesignTinyMenuGroup.spec.tsx
index 9a113bff40..1ef710dae1 100644
--- a/packages/ui/src/components/menu/desktop/__tests__/DesignTinyMenuGroup.spec.tsx
+++ b/packages/ui/src/views/menu/desktop/__tests__/DesignTinyMenuGroup.spec.tsx
@@ -82,4 +82,20 @@ describe('DesignTinyMenuGroup', () => {
expect(container.querySelector('[data-color-channel]')?.getAttribute('data-color-channel')).toBe('var(--univer-primary-600)');
});
+
+ it('defines explicit grid columns for compact quick layouts with custom column counts', () => {
+ const Icon = () => <span data-testid="quick-icon" />;
+ const { container } = render(
+ <DesignTinyMenuGroup
+ items={[
+ { key: 'black', Icon, className: '', onClick: vi.fn() },
+ { key: 'red', Icon, className: '', onClick: vi.fn() },
+ ]}
+ columns={8}
+ layoutVariant="compact"
+ />
+ );
+
+ expect((container.firstElementChild as HTMLElement).style.gridTemplateColumns).toBe('repeat(8, max-content)');
+ });
});
diff --git a/packages/ui/src/components/menu/desktop/__tests__/TinyMenuGroup.spec.ts b/packages/ui/src/views/menu/desktop/__tests__/TinyMenuGroup.spec.ts
similarity index 100%
rename from packages/ui/src/components/menu/desktop/__tests__/TinyMenuGroup.spec.ts
rename to packages/ui/src/views/menu/desktop/__tests__/TinyMenuGroup.spec.ts
diff --git a/packages/ui/src/components/menu/mobile/MobileMenu.stories.tsx b/packages/ui/src/views/menu/mobile/MobileMenu.stories.tsx
similarity index 100%
rename from packages/ui/src/components/menu/mobile/MobileMenu.stories.tsx
rename to packages/ui/src/views/menu/mobile/MobileMenu.stories.tsx
diff --git a/packages/ui/src/components/menu/mobile/MobileMenu.tsx b/packages/ui/src/views/menu/mobile/MobileMenu.tsx
similarity index 99%
rename from packages/ui/src/components/menu/mobile/MobileMenu.tsx
rename to packages/ui/src/views/menu/mobile/MobileMenu.tsx
index 9ec6850b82..a0eef8fa7e 100644
--- a/packages/ui/src/components/menu/mobile/MobileMenu.tsx
+++ b/packages/ui/src/views/menu/mobile/MobileMenu.tsx
@@ -26,7 +26,7 @@ import { scan, startWith } from 'rxjs/operators';
import { MenuItemType } from '../../../services/menu/menu';
import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
import { useDependency, useObservable } from '../../../utils/di';
-import { CustomLabel } from '../../custom-label';
+import { CustomLabel } from '../../custom-label/index';
type MobileMenuView =
| {
diff --git a/packages/ui/src/components/menu/types.ts b/packages/ui/src/views/menu/types.ts
similarity index 100%
rename from packages/ui/src/components/menu/types.ts
rename to packages/ui/src/views/menu/types.ts
diff --git a/packages/ui/src/components/message/MessageContainer.tsx b/packages/ui/src/views/message/MessageContainer.tsx
similarity index 100%
rename from packages/ui/src/components/message/MessageContainer.tsx
rename to packages/ui/src/views/message/MessageContainer.tsx
diff --git a/packages/ui/src/components/notification/Notification.stories.tsx b/packages/ui/src/views/notification/Notification.stories.tsx
similarity index 100%
rename from packages/ui/src/components/notification/Notification.stories.tsx
rename to packages/ui/src/views/notification/Notification.stories.tsx
diff --git a/packages/ui/src/components/notification/Notification.tsx b/packages/ui/src/views/notification/Notification.tsx
similarity index 100%
rename from packages/ui/src/components/notification/Notification.tsx
rename to packages/ui/src/views/notification/Notification.tsx
diff --git a/packages/ui/src/components/progress-bar/ProgressBar.tsx b/packages/ui/src/views/progress-bar/ProgressBar.tsx
similarity index 100%
rename from packages/ui/src/components/progress-bar/ProgressBar.tsx
rename to packages/ui/src/views/progress-bar/ProgressBar.tsx
diff --git a/packages/ui/src/components/slider/Slider.stories.tsx b/packages/ui/src/views/slider/Slider.stories.tsx
similarity index 100%
rename from packages/ui/src/components/slider/Slider.stories.tsx
rename to packages/ui/src/views/slider/Slider.stories.tsx
diff --git a/packages/ui/src/components/slider/Slider.tsx b/packages/ui/src/views/slider/Slider.tsx
similarity index 100%
rename from packages/ui/src/components/slider/Slider.tsx
rename to packages/ui/src/views/slider/Slider.tsx
diff --git a/packages/ui/src/components/slider/__tests__/Slider.spec.tsx b/packages/ui/src/views/slider/__tests__/Slider.spec.tsx
similarity index 100%
rename from packages/ui/src/components/slider/__tests__/Slider.spec.tsx
rename to packages/ui/src/views/slider/__tests__/Slider.spec.tsx
diff --git a/packages/ui/src/components/slider/index.ts b/packages/ui/src/views/slider/index.ts
similarity index 100%
rename from packages/ui/src/components/slider/index.ts
rename to packages/ui/src/views/slider/index.ts
diff --git a/packages/ui/src/views/workbench/Workbench.tsx b/packages/ui/src/views/workbench/Workbench.tsx
index 5da7335b8f..fa9019ed17 100644
--- a/packages/ui/src/views/workbench/Workbench.tsx
+++ b/packages/ui/src/views/workbench/Workbench.tsx
@@ -20,7 +20,6 @@ import { IConfigService, LocaleService, ThemeService } from '@univerjs/core';
import { borderBottomClassName, clsx, ConfigContext, ConfigProvider } from '@univerjs/design';
import { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
-import { useConfigValue } from '../../components/hooks';
import { UI_PLUGIN_CONFIG_KEY } from '../../config/config';
import { BuiltInUIPart } from '../../services/parts/parts.service';
import { ThemeSwitcherService } from '../../services/theme-switcher/theme-switcher.service';
@@ -28,6 +27,7 @@ import { useDependency } from '../../utils/di';
import { ComponentContainer, useComponentsOfPart } from '../components/ComponentContainer';
import { DesktopContextMenu } from '../components/context-menu/ContextMenu';
import { Sidebar } from '../components/sidebar/Sidebar';
+import { useConfigValue } from '../hooks/index';
export interface IUniverWorkbenchProps extends IWorkbenchOptions {
mountContainer: HTMLElement;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f1ad7a54e2..0e8bf895a6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,7 +5,7 @@ settings:
excludeLinksFromLockfile: false
overrides:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
basic-ftp: 5.2.0
react: 19.2.7
@@ -17,40 +17,40 @@ importers:
devDependencies:
'@antfu/eslint-config':
specifier: ^9.0.0
'@commitlint/cli':
specifier: ^21.0.2
'@commitlint/config-conventional':
specifier: ^21.0.2
version: 21.0.2
'@eslint-react/eslint-plugin':
- specifier: ^5.8.12
+ specifier: ^5.9.0
'@eslint/compat':
specifier: ^2.1.0
'@playwright/test':
specifier: ^1.57.0
version: 1.57.0
'@release-it-plugins/workspaces':
specifier: ^5.0.3
'@release-it/conventional-changelog':
specifier: ^10.0.6
'@types/fs-extra':
specifier: ^11.0.4
version: 11.0.4
'@types/node':
- specifier: ^25.9.1
- version: 25.9.1
+ specifier: ^25.9.3
+ version: 25.9.3
'@types/react':
- specifier: 19.2.16
- version: 19.2.16
+ specifier: 19.2.17
+ version: 19.2.17
'@types/react-dom':
specifier: 19.2.3
- version: 19.2.3(@types/[email protected])
+ version: 19.2.3(@types/[email protected])
'@univerjs-infra/shared':
specifier: workspace:*
version: link:common/shared
@@ -58,20 +58,20 @@ importers:
specifier: workspace:*
version: link:packages/design
eslint:
- specifier: ^10.4.1
- version: 10.4.1([email protected])
+ specifier: ^10.5.0
+ version: 10.5.0([email protected])
eslint-plugin-format:
specifier: ^2.0.1
eslint-plugin-react:
specifier: ^7.37.5
eslint-plugin-react-hooks:
specifier: ^7.1.1
eslint-plugin-react-refresh:
specifier: ^0.5.2
fs-extra:
specifier: ^11.3.5
version: 11.3.5
@@ -82,8 +82,8 @@ importers:
specifier: ^17.0.7
version: 17.0.7
posthog-node:
- specifier: ^5.36.2
- version: 5.36.2([email protected])
+ specifier: ^5.37.0
+ version: 5.37.0([email protected])
react:
specifier: 19.2.7
version: 19.2.7
@@ -92,7 +92,7 @@ importers:
version: 19.2.7([email protected])
release-it:
specifier: ^19.2.4
- version: 19.2.4(@types/[email protected])([email protected])
+ version: 19.2.4(@types/[email protected])([email protected])
serve:
specifier: ^14.2.6
version: 14.2.6
@@ -100,17 +100,17 @@ importers:
specifier: 3.4.18
version: 3.4.18
tsx:
- specifier: ^4.22.3
- version: 4.22.3
+ specifier: ^4.22.4
+ version: 4.22.4
turbo:
- specifier: ^2.9.16
- version: 2.9.16
+ specifier: ^2.9.18
+ version: 2.9.18
typescript:
specifier: ^6.0.3
version: 6.0.3
vitest:
specifier: ^4.1.8
common/debugger:
dependencies:
@@ -322,10 +322,10 @@ importers:
dependencies:
'@tsdown/css':
specifier: ^0.22.2
'@typescript-eslint/parser':
specifier: ^8.60.1
'@vitest/coverage-istanbul':
specifier: ^4.1.8
version: 4.1.8([email protected])
@@ -334,16 +334,16 @@ importers:
version: 10.5.0([email protected])
eslint-plugin-better-tailwindcss:
specifier: ^4.5.0
eslint-plugin-header:
specifier: ^3.1.1
eslint-plugin-no-barrel-import:
specifier: ^0.0.2
eslint-plugin-no-penetrating-import:
specifier: ^0.0.1
fs-extra:
specifier: ^11.3.5
version: 11.3.5
@@ -370,13 +370,13 @@ importers:
version: 3.4.18
tsdown:
specifier: ^0.22.2
unplugin-vue:
specifier: ^7.2.0
vitest:
specifier: ^4.1.8
devDependencies:
'@types/fs-extra':
specifier: ^11.0.4
@@ -404,7 +404,7 @@ importers:
'@storybook/addon-docs':
specifier: ^10.3.6
'@storybook/addon-links':
specifier: ^10.3.6
@@ -480,7 +480,7 @@ importers:
dependencies:
'@lit/react':
specifier: ^1.0.8
- version: 1.0.8(@types/[email protected])
+ version: 1.0.8(@types/[email protected])
'@univerjs/action-recorder':
specifier: workspace:*
version: link:../packages/action-recorder
@@ -681,7 +681,7 @@ importers:
version: 19.2.7([email protected])
react-mosaic-component:
specifier: ^6.2.0
rxjs:
specifier: ^7.8.2
version: 7.8.2
@@ -779,7 +779,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/core:
dependencies:
@@ -837,7 +837,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/data-validation:
dependencies:
@@ -862,31 +862,31 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/design:
dependencies:
'@radix-ui/react-dialog':
specifier: ^1.1.16
'@radix-ui/react-direction':
specifier: ^1.1.2
- version: 1.1.2(@types/[email protected])([email protected])
+ version: 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-dropdown-menu':
specifier: ^2.1.17
'@radix-ui/react-hover-card':
specifier: ^1.1.16
'@radix-ui/react-popover':
specifier: ^1.1.16
'@radix-ui/react-separator':
specifier: ^1.1.9
'@radix-ui/react-slot':
specifier: ^1.2.5
- version: 1.2.5(@types/[email protected])([email protected])
+ version: 1.2.5(@types/[email protected])([email protected])
'@univerjs/icons':
specifier: 1.12.0
@@ -911,10 +911,10 @@ importers:
version: 6.9.1
'@testing-library/react':
specifier: ^16.3.2
'@types/react-transition-group':
specifier: ^4.4.12
- version: 4.4.12(@types/[email protected])
+ version: 4.4.12(@types/[email protected])
'@univerjs-infra/shared':
specifier: workspace:*
version: link:../../common/shared
@@ -938,7 +938,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/docs:
dependencies:
@@ -960,7 +960,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/docs-drawing:
dependencies:
@@ -979,7 +979,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/docs-drawing-ui:
dependencies:
@@ -1031,7 +1031,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/docs-hyper-link:
dependencies:
@@ -1047,7 +1047,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/docs-hyper-link-ui:
dependencies:
@@ -1096,7 +1096,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/docs-mention-ui:
dependencies:
@@ -1139,7 +1139,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/docs-quick-insert-ui:
dependencies:
@@ -1197,7 +1197,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/docs-thread-comment-ui:
dependencies:
@@ -1246,7 +1246,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/docs-ui:
dependencies:
@@ -1301,7 +1301,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/drawing:
dependencies:
@@ -1323,7 +1323,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/drawing-ui:
dependencies:
@@ -1366,7 +1366,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/engine-formula:
dependencies:
@@ -1394,7 +1394,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/engine-render:
dependencies:
@@ -1434,13 +1434,13 @@ importers:
version: 7.8.2
tsdown:
specifier: ^0.22.2
typescript:
specifier: ^6.0.3
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/find-replace:
dependencies:
@@ -1480,7 +1480,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/network:
dependencies:
@@ -1499,7 +1499,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/protocol:
dependencies:
@@ -1518,7 +1518,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/rpc:
dependencies:
@@ -1537,7 +1537,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/rpc-node:
dependencies:
@@ -1559,7 +1559,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets:
dependencies:
@@ -1593,7 +1593,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-conditional-formatting:
dependencies:
@@ -1627,7 +1627,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-conditional-formatting-ui:
dependencies:
@@ -1685,7 +1685,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-crosshair-highlight:
dependencies:
@@ -1731,7 +1731,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-data-validation:
dependencies:
@@ -1765,7 +1765,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-data-validation-ui:
dependencies:
@@ -1826,7 +1826,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-drawing:
dependencies:
@@ -1851,7 +1851,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-drawing-ui:
dependencies:
@@ -1909,7 +1909,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-filter:
dependencies:
@@ -1940,7 +1940,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-filter-ui:
dependencies:
@@ -1995,7 +1995,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-find-replace:
dependencies:
@@ -2026,7 +2026,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-formula:
dependencies:
@@ -2060,7 +2060,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-formula-ui:
dependencies:
@@ -2118,7 +2118,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-hyper-link:
dependencies:
@@ -2146,7 +2146,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-hyper-link-ui:
dependencies:
@@ -2210,7 +2210,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-note:
dependencies:
@@ -2241,7 +2241,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-note-ui:
dependencies:
@@ -2290,7 +2290,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-numfmt:
dependencies:
@@ -2315,7 +2315,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-numfmt-ui:
dependencies:
@@ -2367,7 +2367,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-sort:
dependencies:
@@ -2389,7 +2389,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-sort-ui:
dependencies:
@@ -2441,7 +2441,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-table:
dependencies:
@@ -2472,7 +2472,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-table-ui:
dependencies:
@@ -2530,7 +2530,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-thread-comment:
dependencies:
@@ -2558,7 +2558,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-thread-comment-ui:
dependencies:
@@ -2613,7 +2613,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/sheets-ui:
dependencies:
@@ -2674,7 +2674,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/slides:
dependencies:
@@ -2696,7 +2696,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/slides-ui:
dependencies:
@@ -2748,7 +2748,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/telemetry:
dependencies:
@@ -2764,7 +2764,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/themes:
devDependencies:
@@ -2789,7 +2789,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/thread-comment-ui:
dependencies:
@@ -2832,7 +2832,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/ui:
dependencies:
@@ -2854,7 +2854,7 @@ importers:
devDependencies:
'@testing-library/react':
specifier: ^16.3.2
'@univerjs-infra/shared':
specifier: workspace:*
version: link:../../common/shared
@@ -2884,7 +2884,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/ui-adapter-vue3:
dependencies:
@@ -2903,7 +2903,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
vue:
specifier: ^3.5.34
version: 3.5.34([email protected])
@@ -2925,7 +2925,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/uniscript:
dependencies:
@@ -2968,7 +2968,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages/watermark:
dependencies:
@@ -2990,7 +2990,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
presets:
dependencies:
@@ -3669,7 +3669,7 @@ importers:
version: 6.0.3
vitest:
specifier: ^4.1.8
packages:
@@ -4752,53 +4752,53 @@ packages:
resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
- '@eslint-react/[email protected]':
- resolution: {integrity: sha512-gqfh9F1LLhrbFid7ARCzXV1RZtQznIj4TYPMz60vrEWTYmB/pG2QRoQZVxsYBE+fCmykwxdubqHrG3oDxhF8Ew==}
+ '@eslint-react/[email protected]':
+ resolution: {integrity: sha512-D5DmbsEGYYmHOC2J68BRC2iJhYsD4K0x8mllgB08SeSQ0T/nP2BRogg/ohn5ZeRMb87ZDqN6NtGR7G7qTwgOSw==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
- '@eslint-react/[email protected]':
- resolution: {integrity: sha512-sgAiLZfgwKaCbOC5d9IVfctDQoVDpD4/eHZb437e5KGuoV6RFtjdfJnpfOjBfKQjk0/9s1CrFyzM1yYLEZrUlg==}
+ '@eslint-react/[email protected]':
+ resolution: {integrity: sha512-GzARSlLTJT3FY9sUO9bYLoFtgiuUoNKzVv68oJkjAIembiu/6s1vyjs/I/1PEt+pEU6eu5hPjKHJXzd4boSDmQ==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
- '@eslint-react/[email protected]':
- resolution: {integrity: sha512-+2Vz4dE4x1pvztXGM4dsWi7Gqm5P4ZqbtveyucHpehwpxyJlFU30g+zyYnx/Yz0FUP/ScaLJcDqVWpvCiTjJUw==}
+ '@eslint-react/[email protected]':
+ resolution: {integrity: sha512-BQFiLhxgYnGldiydecjjRXSIixHUsYb8YNSdlrGkoQU3ZFidW6d5R0I1Reooz8DAg/m6sjwZ17MRVRNm3Z4PyA==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
- '@eslint-react/[email protected]':
- resolution: {integrity: sha512-iwlM6hz3CNXqYSJz1GN0XB6z/V6PyecuV77ilTxEv6SZmNYRllmCzydu/ZjKF2aCAtZOY6EmTzj3nvVJgOzwWQ==}
+ '@eslint-react/[email protected]':
+ resolution: {integrity: sha512-PEJPNXLjzlpdq2A4+9XlVdYziZPGq7wM+PB8jtmUzurQuZ8dqfCoBiQNuu+8TYMPGet1lUjHhijCO8MM9mEfrg==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
- '@eslint-react/[email protected]':
- resolution: {integrity: sha512-gSz/byutHqd7Ad8r/FtfyKqx+XG7d9Oqa08Y+IpzEEmGhiXTAKj0VhTwIQnbT0DaQ9vdTJlWWUbJ5XEZxsMk+w==}
+ '@eslint-react/[email protected]':
+ resolution: {integrity: sha512-dc6hBagLgCt+CSkWSJjbyPDGGcs/J9qHTdymMQrw51bO+DIztQpuy42E42EjOdxWcaw3U0eUtu330nZEcKqGMw==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
- '@eslint-react/[email protected]':
- resolution: {integrity: sha512-fNfN3WNWq9Vfz6ynPEOSCVRh+79j7wBlvoEHTCb7nNQzyUPOjf6KfJikSiqfgfthFY9We+luZFFpFvDppo+LiA==}
+ '@eslint-react/[email protected]':
+ resolution: {integrity: sha512-Ln255YTTUSlONr+e0Lu1wi2X9fTuOlNNJNXTz6PYaNZFAwCNWdlhkzFL8HdIBgPiWPUKrt+OMuah8o0xVoHswA==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
- '@eslint-react/[email protected]':
- resolution: {integrity: sha512-sukcf7cRJxi+HoBssLUViLZ8DJWI7CLv1uTfNpWDGIQwJHi+HBVAppG5ymtE8liBprSb+oWlYK71sY/wTTzTUQ==}
+ '@eslint-react/[email protected]':
+ resolution: {integrity: sha512-vNz4y4eFKRYetihXiiZueGgClsyTFhR3kltMDPwoZyJaERdkyeoUylY09OnWakJFitao1+s2eBkSVuFqA8dqrA==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
'@eslint/[email protected]':
@@ -5105,7 +5105,7 @@ packages:
resolution: {integrity: sha512-p2+YcF+JE67SRX3mMlJ1TKCSTsgyOVdAwd/nxp3NuV1+Cb6MWALbN6nT7Ld4tpmYofcE5kcaSY1YBB9erY+6fw==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
resolution: {integrity: sha512-pbCDiVMnne1lYUIaYNN5wrwQXDtHaYtg7YEFPeW+hws6U47WeFvISGUWekPGKWOP1ygrs0ef0o1VJMk1exos5A==}
@@ -5113,7 +5113,7 @@ packages:
'@mdx-js/[email protected]':
resolution: {integrity: sha512-f++rKLQgUVYDAtECQ6fn/is15GkEH9+nZPM3MS0RcxVqoTfawHvDlSCH7JbMhAM6uJ32v3eXLvLmLvjGu7PTQw==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
'@napi-rs/[email protected]':
@@ -5438,11 +5438,11 @@ packages:
engines: {node: '>=18'}
hasBin: true
- '@posthog/[email protected]':
- resolution: {integrity: sha512-rRJxn7UjPR5LWgRwicJgHWD7tu3P2IebdWjGJ1xpXkbNqpFyW+SbSDGjhunmmXXl2c59ejOICtnbrwN6njS1lw==}
+ '@posthog/[email protected]':
+ resolution: {integrity: sha512-vwOEMfZvGv5XxNWV7p9I52NSmvFNMhyW2IHpIoUHW5jLkgUrknzJW1H/qxVGSIrNNVQkfsoaDFzDhJdg10pgrA==}
- '@posthog/[email protected]':
- resolution: {integrity: sha512-GaeyU1vPxwZvYlSWdpxbLCRPqY2WKUZYUNjBlJHAlaAXbMmCfLgB2cvkwjidr8lhX8nyxINjjvQMiOSSfSSxcg==}
+ '@posthog/[email protected]':
+ resolution: {integrity: sha512-LqJoiQi2eyWn7rCUgnn+D+F3Efp6+04o72bjSX6kWHx0nFaYNC/nJuAIRliDTY/X7GPIUAaHAcSjbMI/9wfX1Q==}
'@protobufjs/[email protected]':
resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
@@ -5483,7 +5483,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-yqHW5WQ/cTpU/un7dqqIKNy2iRU8BC0JB78PEzTfCCYvZu1U6W9KwObAniMk9nhSfyotKPQTYaUD/HB0f5muig==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5496,7 +5496,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-zuSVi7ziP7uQRqc+yGxsKJfNkdyHv3ZKDaHe0gzg4dRgws96TPKWIiz84tVHP4GEcEl8bC0mdt17NkcxaJHmaQ==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5509,7 +5509,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-rYOP8OMnuuPMQF1uhPVlGNcCDlkokKqGFE3JcxFViIkAXP7EvFWUliJAstrapypaBLJNHbZL6jGhbVDGTwmVhA==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5518,7 +5518,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-QwH4PO5urrbO+FaGd5Aglg+YJgWTyyuZ3g/6mKvsqraLkglDdckw9JafgL5McL5VEJ6EPNduPaT3ZE9BttDAqg==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5527,7 +5527,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-l9ok83YBclEZhbjgzt76Hw733e6cvRKPNgO6GJ/IETlufXG9p+fRu2wlvpImQvR6xdJ8h7J8J2DBvsPEiEsKMw==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5540,7 +5540,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-C3vFhbyi4SW3PmbAi6Awpu4OzJtd0MxGurvSsYtr7p7nM8RNB3VAF3CUmnp2j50knpkrRcB7+ycVXzgLgF6yNA==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5549,7 +5549,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-MhoruH6xEzsbvOmo4TNgMfmtvRGyDZw4MDSdf4ybMHfezjqwzv6hyd4lsMzBp8K9Sn6sGzCF62x1I7BYUECXOg==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5562,7 +5562,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-S6b3Jm57sY5EdDyOMLkacbB0qMnKhy1RCKZCt795ZkmtUOAvojYIZ5p7dXHIh5Cyr3jCLLI5/g64V3FKLudZmw==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5575,7 +5575,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-cot/aB/mOm0IYVYTTmQcEEK1M48lZWi8FlYe5nDPQQ8NYZUlXEFgncJ9p2Kzer3RKSrY7cTTpEMLZKNo9QoP5Q==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5584,7 +5584,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-9Se8t+Zry+1rEOL7Y6l/4ANYU/TOtAtf8O2fKdwLltcaMcm6kOqYGbzO4tMFQ0bvzO920pRAoHpFZ4W85S3keQ==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5597,7 +5597,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-hAileDBtd6CX7nlZOarOnISQ6PP4q0e16BX51ulzdZ+7IzjL0sDTVpFdmSYrIjw6zVNsfQBao5gG6AWr3qwfvA==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5610,7 +5610,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-orBC88futVpqCmhX1p4cvquNHsELQ+w+vBJnuj3ftETI5bJb0bZn3Tqu3SWN2IOcPycTnMGnhwoermvISt72sA==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5619,7 +5619,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-fmbNnFyf+JYCN0DhhWnEdUTDnZD1mXaPQWivdsPIb8oOSbARfD3LIQJbLCG8a8QLCwoMxiJ7GVPIFcC8Dw8v2Q==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5632,7 +5632,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-8brVpAU5Uq7Bh0c8EFc4ZTf2JJTYn0o+1L+CUJB3UYIOkTjKGMgoHvduylrahdmNlr3DfH0rFq2DrbNZXgaspw==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5645,7 +5645,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-9PB589e1aWZbrlFUHdz6WiPCL+xLZHQFX7oibqG/6Q0SwOkxDyQX9W/cyPa+sAPPKuC8cpLCpRczE5a/1DiwVQ==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5658,7 +5658,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-UEytdjgEh2tJGgD/gZK4FUx6t1rNIlM3U0DENhSrG7I75FGm1DnaDuVUWF1pWAWUwGmn1sCJ1VGHn8LhN1aTOw==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5671,7 +5671,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-zdTk4PlUO0E18HnZ3wYbW0KkJJxWCdiNYp6g6X1PtONFhxVkg01vliTJAmwIszU6mHiyBOoW9P0rAugl5/hULQ==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5684,7 +5684,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-zifXeB8Y88qCYx8PLZ5oQb32KwZub+s925mMoZsBBq9KUQqWKkREubTfs6ASjRPPBe7Jt9O8OHH89+95VG+grA==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5697,7 +5697,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-FvgPt1bRmg8Xt2QpF7NUZW3dE0ZQHGm41dAdgT2J2GJPoIXz+9Em3NobAxf4fupcxhgHu03E5CRiU2MWvObXyg==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5710,7 +5710,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-gvgW+JV/Mbjj6darztTetnmElpQEzZrXpJvfj+dOxNAxiyHEAyUvEjjl4zxblvmjmKmi3jfPoy7ZdxzCuUBJSA==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -5723,7 +5723,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-rCMO3QsIVKv5JTY5CVbo2MvO77SpEqqYc8AvRE7OWqRDOIqAKjsp+DrmnY9uc8NPdxB5E2z47HTYGeE2+NTptg==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5732,7 +5732,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-xCso9j1/u8sEgP1RNHjFrXJLApL8LiqOkI1R4ywuN00rxWdYg4oQXuwKLS3i0j5NWLromUD27/4nlxj2UFVvIw==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5741,7 +5741,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-PLzC90MS+ReootmjC597dvopoelpZ8Q61HJkDXZSExitIq7PL55vHNnesAHwguHK0aPfBnpdNzQtv1uliaqQrA==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5750,7 +5750,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-6c8ZqvPTWILEKnyVkP53EGRCcpnJiKTC21sS/6R1GF5xKyHJJWQEPfkqlcgUkdRQivd6tb23abUwe4ngWmY0JA==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5759,7 +5759,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-2uVLvLjgO7NZCWw01/FdqRwmA42J0BcjPMUCA+koFEOAb+zjqIP7SiFz/7zWPrKnVmSqr76Omq2ALyCuX4dhLw==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5768,7 +5768,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-jrBWOxZITuGcnjRCM2t2U5ZPkCLxD+Ym6DjfssS5haTj2iiak/DOb64JeN6OdLfLgptb6/e2kKR+ZuTrGoZTPA==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5777,7 +5777,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-d8a+bBY/FxikNPlgJJoaBHZX+zKVbWHYJGTLnLvveQgFSTntkGdEKv3JDtHrMS0DNYpllz2nRsTLGLKYttbpmw==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -5786,7 +5786,7 @@ packages:
'@radix-ui/[email protected]':
resolution: {integrity: sha512-giWQp+4mxjBPt4KZ0MmyuykFNWfbDxKt4x+fPkRYmgRFJSbCZFzUglvMb/Kjn38tm10YP4ufiQZDx3zna4LU6w==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -6500,7 +6500,7 @@ packages:
engines: {node: '>=18'}
peerDependencies:
'@testing-library/dom': ^10.0.0
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@types/react-dom': 19.2.3
react: 19.2.7
react-dom: 19.2.7
@@ -6541,33 +6541,33 @@ packages:
sass-embedded:
optional: true
- '@turbo/[email protected]':
- resolution: {integrity: sha512-jLjApWTSNd7JZ5JaLYfelW1ytnGQOvB7ivl+2RD1xQvJTbi8I9gBjzcga7tDZVPyaxpl10YTfJt3BrYXR18KDw==}
+ '@turbo/[email protected]':
+ resolution: {integrity: sha512-9f27peFu16ur8c0v9nUFUEyBnbKuuFsUTjHFWfmwGfzySBXbHwzU44QhZon6Mznz0cHsIr3984NQj/bVrnGSRw==}
cpu: [x64]
os: [darwin]
- '@turbo/[email protected]':
- resolution: {integrity: sha512-YPgrn+5HIGzrx0O2a631SV4MBQUe4W/DafMFUuBVgaU32PW9/OTT0ehviF0QSxTXuRJlHvW2eUTemddF5/spmw==}
+ '@turbo/[email protected]':
+ resolution: {integrity: sha512-9A6TMRq/Ib+QnbhLlgkhOm+624wO4pzSQ/yQviQfWHOlFvaYxdnIAYmu2H6TS6y7kSVL0DvzNe04NbESTOzFVQ==}
cpu: [arm64]
os: [darwin]
- '@turbo/[email protected]':
- resolution: {integrity: sha512-vAEf1H6l26lTpl9FJ/peQo1NUB8RC0sbEJJz5mPcUhHA2bPDup2x3CZPgo/bH8S4cUcBLm4FN3UHd5iUO2RAew==}
+ '@turbo/[email protected]':
+ resolution: {integrity: sha512-zCdIDtz69AnbYh913elJRRoF3QY5aa2HNnf+4rAkc7bQ+tWujiDkCNV7stazOUPggaDvhKIf2Z87qHftTeXSkw==}
cpu: [x64]
os: [linux]
- '@turbo/[email protected]':
- resolution: {integrity: sha512-xDBLR2PZg4BrQOchfG6svgpv5FCNJ2TOtT2psLdEJcdKo1BH+pnPs9Xj6pvUjgfkHbuvBOfeE4R6tvxMoQKDHQ==}
+ '@turbo/[email protected]':
+ resolution: {integrity: sha512-Va1kXI04naMgYwqv/5Dfa36dTDx8015U7oaQAjrXa45ua9OoFjSV4OmvkML4EmXvUclQHCiBRbY8bvd0jV7eAg==}
cpu: [arm64]
os: [linux]
- '@turbo/[email protected]':
- resolution: {integrity: sha512-NBAJnaUiGdgkSzQwUIdOvkCkcpTSu58G/sBGa0mvBtzfvFOOgrQwepKOOQ8cp6sWM6OcKDNFj2p1dsZA1OWjPg==}
+ '@turbo/[email protected]':
+ resolution: {integrity: sha512-m0kDhZANxSNz9ck1ybogFscHabriAsp4eDFNrN/1H5WrgTF7b3VlcPZnhuO3v2+E2KnCbeAc+UUT10BZZHdDKw==}
cpu: [x64]
os: [win32]
- '@turbo/[email protected]':
- resolution: {integrity: sha512-Y7SJppD0Z8wjO3Ec0ZGd9KQ4Yv0BMnA8CIowj5Vp+OEVsosXDG2weK6/t1RRLfJmc2Ozrnd6y4DOgQys+mn3WQ==}
+ '@turbo/[email protected]':
+ resolution: {integrity: sha512-nUdR8WqoomUys9iIQmG45TMiizJ+5BV8egSeLLZba/AWblyp3fVBcIH1kSE58OtK4g2YzbMJEth6Ttv9w5rqMA==}
cpu: [arm64]
os: [win32]
@@ -6667,9 +6667,6 @@ packages:
resolution: {integrity: sha512-dyh/xO2Fh5bYrfWaaqGrRQQGkNdmYw6AmaAUvYeUMNTWQtvb796ikLdmTchRmOlOiIJ1TDXfWgVx1QkUlQ6Hew==}
- '@types/[email protected]':
- resolution: {integrity: sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==}
-
resolution: {integrity: sha512-603BddQMv3pUcr4U2dhujk83N2tTDVr/34wII2B6bJy6g+8WD6yUb11jszNs0gdi4PesVWl7ABt8nYMVpnLUcg==}
@@ -6689,15 +6686,15 @@ packages:
resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
resolution: {integrity: sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
- '@types/[email protected]':
- resolution: {integrity: sha512-esJiCAnl0kfpNdE69f3So4WJUXy95dLZydX0KwK46riIHDzHM7O9Vtf9xCHW0PXIqvgqNrswl522kA/5yx+F4w==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==}
resolution: {integrity: sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==}
@@ -6774,6 +6771,12 @@ packages:
peerDependencies:
typescript: '>=4.8.4 <6.1.0'
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-DV42F7MLJO6Rax7SK1yg43tcnEfGUrurSpSxKuVX+a3RCTzBlH3fuxprrOJXKCJGAaw82xXocikJ0uQaqwXgGA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ typescript: '>=4.8.4 <6.1.0'
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-EWuV5Vq1EFYJEOVcILyWPO35PjnT0c6tv99PCpD12PgfZae5/Jo+F17hGjsEs2Moe+Dy1J7KIr8y037cK8+/rQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6792,6 +6795,10 @@ packages:
resolution: {integrity: sha512-gvI5OQoptnxQnchOirukCuQ55svJSTuD/4k5+pC267xyBtYry748R9/c3tYUzb/iE6RZfllRz2lVulLCHkTm4w==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-IWdXFHFSb6mlC3HPc7QsLDm5zYEbUla6trDEHf32D3/dnuUyXd87plScSNXSbm0/RxMvObpI17sv/EDTGrGZkA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6810,6 +6817,12 @@ packages:
peerDependencies:
typescript: '>=4.8.4 <6.1.0'
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-O5Amvdv9ztMpxpf+vmFULGG78IE6Qwdr3bCGvqwG4nwc9H2qXkOYJJnRbRHyMkQTjv1d03olqwwwzHLMqpFePQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ typescript: '>=4.8.4 <6.1.0'
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-sdwTrpjosW7ANQYJ39ZBF1ZyEMEGVB2UsikrserVM/30a/F1dTLnu9bGxEdosugyu5caigjLrR2qiD11asjI1A==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6817,6 +6830,13 @@ packages:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
typescript: '>=4.8.4 <6.1.0'
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-TuBiQYIkd97yBfInHCTKVYMbX4kvEmpOEuixIuzCU9p8BGT1SfyyO0d0IfDMbPIHcjn/hWnusUX5e8v5Xg+X8A==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+ typescript: '>=4.8.4 <6.1.0'
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6829,6 +6849,10 @@ packages:
resolution: {integrity: sha512-4h0tY8ppCkdCzcrl2YM5M3my0xsE1Tf8om3owEu5oPWmXwkKRmk0j0LGDzYBGUcAlesEbxBhazqu/K4cu3Ug7w==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-9QTQpZ5Iin4CdIodfbDQFSeiSJKidgYJYug1P9CC2xWgUTvlmixViqDZNciMjwLBZyJnG4tGmPl97rVAFb1AJg==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6847,6 +6871,12 @@ packages:
peerDependencies:
typescript: '>=4.8.4 <6.1.0'
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-42zatd5qSvvcV1JdDBCLxYRznvP4eIHpPoZXdkPFnAmanA4FuZ5dibSnCBggY8hQnqajPpoGjXFdZ7fIJKQnlA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ typescript: '>=4.8.4 <6.1.0'
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6861,6 +6891,13 @@ packages:
eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
typescript: '>=4.8.4 <6.1.0'
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-3bzFt7ImFMW/jVYwJamDoe/dMOdFLSC6pom6rRjdh4SZJEYupyMzem8e7vKZLclLfpHjlwSAXOUxtKxGXUiLqA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+ typescript: '>=4.8.4 <6.1.0'
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6873,6 +6910,10 @@ packages:
resolution: {integrity: sha512-EbGRQg4FhrmwLodl+t3JNAnXHWVr9Vp+Zl1QBZVPY4ByfkzIT8cX3K6QWODHtkIZqqJVEWvhHSx3v5PDHsaQag==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-QVLZu3ZPQEE+HICQyAMZ2yLQhxf0meY/wx6Hx14YcTNj13JB3qHlX3lJ02L3fLGHgERRH71kvYDwiXIguT3AjQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@univerjs/[email protected]':
resolution: {integrity: sha512-m2RSIsGaC1y66vIqU2FEUvDQ+3CBKBFwa28PUUpg9Rn93AoFs6LXok/FQxE6pibMbMomTjySyVtxgK4ZexCaaQ==}
@@ -8372,11 +8413,11 @@ packages:
peerDependencies:
eslint: ^9.0.0 || ^10.0.0
- resolution: {integrity: sha512-bxeIPyJVGmjHpQs/2/Q5M6gzWjgBJKYhcla5lWurIj6G4UY0F27cHHDRU+xETzPGRXUS2JgPF9Lr6HyIauUIvQ==}
+ resolution: {integrity: sha512-gBlV304swaW2S0MqVFkQhii0C+KAy2WmxFtVtho39h5GzWdjKjNIxdUdOPQvLAFd7B1/lkbJflqGQKf6sjWGTg==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
@@ -8385,18 +8426,18 @@ packages:
peerDependencies:
eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 || ^10.0.0
- resolution: {integrity: sha512-fZAkopT2ZPcffR5R5RZgQZDaI8yQRsmF5kPiWzHjRmvRRh9C3qflHt7qw48+exeYQ2h5Jrh78x59q+hI7LlzwA==}
+ resolution: {integrity: sha512-K/8RtAb8GDuhoIsR+Feo5Cr57Ts1N2juekocxk9TuF3azx2bCOuHiuU/rqMStMWi5oLTPrg2XqquD2LeS7x6iQ==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
- resolution: {integrity: sha512-p3dksfTD51Eiyoa4U5mQRPTBnDi2YwuGMH5CORsmfTjCXZjKtdYjaJYq1lpA/+P1op0/nYe02+S7/zeZiwr7gg==}
+ resolution: {integrity: sha512-0VYdfPXZZLDiNzvp8DmgYFwZ+vO8pljU0Pcr83/Hj8PSilF4kL2rZWh4fkh+IVQv8iIpIv7HLRbBD/nU/QSh+w==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
@@ -8404,25 +8445,25 @@ packages:
peerDependencies:
eslint: ^9 || ^10
- resolution: {integrity: sha512-J1tltk4nKAusOUum7JAnmHPwo6H4PYk1ay9LKsVRpranXe8STpwLawJHWDZ0JCOCcGAEpn2Jn7ynsUMmy3z8iw==}
+ resolution: {integrity: sha512-hcP7lTqV5JNx8QpmMKric50IBEuFwj5mlM7cyaYB/2UWJaaQvScywHeg/CRZrDauFxkIVx9JXcORBqW+h7VGdQ==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
- resolution: {integrity: sha512-mRLrIVulO/Gqj3Je3cWGo5D89aL4Ozyi+fAWKz2CyUeJIzQQOy6kDNYhP7jktwXE6rkTyk/ufSh8wnJdebA/Eg==}
+ resolution: {integrity: sha512-AlKMpAFHbgJ10hcTIw80NXzEPKxB1zugA98joPnMKDSuf/wScoWGwl5X6SmigVn4KChPBudYchdN0OrBUqO02g==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
- resolution: {integrity: sha512-uFfFjDeOGP5vOWG/4pT4dzOVUpEK11e23N7J6g0Ctdn4AUEUMB6dqtoIjXF6KLrQQfbF0y/O/YdUVFkPhsMLkg==}
+ resolution: {integrity: sha512-urgjMTtZpUzhkFBbQqp4+vdFhQmSkgeLnpq1h/2gemnzKjiMpDa9cCbo1vhjHnYQLzU6YRbxJ1hhqVv+9nXbjw==}
engines: {node: '>=22.0.0'}
peerDependencies:
- eslint: ^10.3.0
+ eslint: '*'
typescript: '*'
@@ -8508,8 +8549,8 @@ packages:
resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
- resolution: {integrity: sha512-AyIKhnOBuOAdueD7RB3xB+YeAWScb9jHsJBgH2Hcde8InP5JYhqrRR6iTMHyTEwgENK54Cp44e4v8BwNhsuHuw==}
+ resolution: {integrity: sha512-1y+7C+vi12bUK1IpZeaV3gsH9fHLBmPvYmPx42pvT/E9yG0IC8g3PUZZgp0+JLJl7ZDK0flc2gc+Aw9dpCvIsQ==}
engines: {node: ^20.19.0 || ^22.13.0 || >=24}
hasBin: true
peerDependencies:
@@ -10527,8 +10568,8 @@ packages:
resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==}
engines: {node: ^10 || ^12 || >=14}
- resolution: {integrity: sha512-k+URjhZyxR0PJ92JZkYcgyk7+2U+T8r0fnfsQFNkW4GeKcuYH6t13VLzjI+bH4YLSknUuLmDDg4CczGO9nad2Q==}
+ resolution: {integrity: sha512-wFwWGcqAqZ1WJRlNNYc92veV83d1lOQcP4Lq0q7Kar9GdZLPpiFYHeudyybYJnjZjkI9v06vLvY/Og5CZIfByg==}
engines: {node: ^20.20.0 || >=22.22.0}
peerDependencies:
rxjs: ^7.0.0
@@ -10643,7 +10684,7 @@ packages:
peerDependencies:
'@types/hoist-non-react-statics': '>= 3.3.1'
'@types/node': '>= 12'
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/hoist-non-react-statics':
@@ -10686,7 +10727,7 @@ packages:
resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
engines: {node: '>=10'}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -10696,7 +10737,7 @@ packages:
resolution: {integrity: sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==}
engines: {node: '>=10'}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -10706,7 +10747,7 @@ packages:
resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
engines: {node: '>=10'}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -11502,13 +11543,13 @@ packages:
resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
- resolution: {integrity: sha512-mdoNxBC/cSQObGGVQ5Bpn5i+yv7j68gk3Nfm3wFjcJg3Z0Mix9jzAFfP12prmm5eVGmDKtp0yyArrs0Q+8gZHg==}
+ resolution: {integrity: sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==}
engines: {node: '>=18.0.0'}
hasBin: true
- resolution: {integrity: sha512-NqgRQy6j6dPYcdSdv0q1g9QsZg7SWg87RERM8otw/1AtKU2yTFVClOM7cbwKzOonZr/Ek1blTBucw64L9H0Bwg==}
+ resolution: {integrity: sha512-bwabv6PupzeavybzEoArBAkwq5fnzwf8OFnRtpHwnviFWuwJPFxtyH+aVp36TmIqK3aYYgtTJ3J0m2ysxxSzQg==}
hasBin: true
@@ -11667,7 +11708,7 @@ packages:
resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
engines: {node: '>=10'}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -11677,7 +11718,7 @@ packages:
resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
engines: {node: '>=10'}
peerDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
peerDependenciesMeta:
'@types/react':
@@ -12088,49 +12129,49 @@ snapshots:
'@alloc/[email protected]': {}
dependencies:
'@antfu/install-pkg': 1.1.0
'@clack/prompts': 1.5.1
- '@e18e/eslint-plugin': 0.4.1([email protected]([email protected]))
- '@eslint-community/eslint-plugin-eslint-comments': 4.7.1([email protected]([email protected]))
+ '@e18e/eslint-plugin': 0.4.1([email protected]([email protected]))
+ '@eslint-community/eslint-plugin-eslint-comments': 4.7.1([email protected]([email protected]))
'@eslint/markdown': 8.0.2
- '@stylistic/eslint-plugin': 5.10.0([email protected]([email protected]))
- '@typescript-eslint/parser': 8.60.0([email protected]([email protected]))([email protected])
+ '@stylistic/eslint-plugin': 5.10.0([email protected]([email protected]))
+ '@typescript-eslint/parser': 8.60.0([email protected]([email protected]))([email protected])
ansis: 4.3.0
cac: 7.0.0
- eslint: 10.4.1([email protected])
- eslint-config-flat-gitignore: 2.3.0([email protected]([email protected]))
+ eslint: 10.5.0([email protected])
+ eslint-config-flat-gitignore: 2.3.0([email protected]([email protected]))
eslint-flat-config-utils: 3.2.0
- eslint-merge-processors: 2.0.0([email protected]([email protected]))
- eslint-plugin-antfu: 3.2.3([email protected]([email protected]))
- eslint-plugin-import-lite: 0.6.0([email protected]([email protected]))
- eslint-plugin-jsdoc: 62.9.0([email protected]([email protected]))
- eslint-plugin-jsonc: 3.1.2([email protected]([email protected]))
+ eslint-merge-processors: 2.0.0([email protected]([email protected]))
+ eslint-plugin-antfu: 3.2.3([email protected]([email protected]))
+ eslint-plugin-import-lite: 0.6.0([email protected]([email protected]))
+ eslint-plugin-jsdoc: 62.9.0([email protected]([email protected]))
+ eslint-plugin-jsonc: 3.1.2([email protected]([email protected]))
eslint-plugin-no-only-tests: 3.4.0
- eslint-plugin-perfectionist: 5.9.0([email protected]([email protected]))([email protected])
- eslint-plugin-pnpm: 1.6.0([email protected]([email protected]))
- eslint-plugin-regexp: 3.1.0([email protected]([email protected]))
- eslint-plugin-toml: 1.3.1([email protected]([email protected]))
- eslint-plugin-unicorn: 64.0.0([email protected]([email protected]))
- eslint-plugin-yml: 3.4.0([email protected]([email protected]))
- eslint-processor-vue-blocks: 2.0.0(@vue/[email protected])([email protected]([email protected]))
+ eslint-plugin-perfectionist: 5.9.0([email protected]([email protected]))([email protected])
+ eslint-plugin-pnpm: 1.6.0([email protected]([email protected]))
+ eslint-plugin-regexp: 3.1.0([email protected]([email protected]))
+ eslint-plugin-toml: 1.3.1([email protected]([email protected]))
+ eslint-plugin-unicorn: 64.0.0([email protected]([email protected]))
+ eslint-plugin-yml: 3.4.0([email protected]([email protected]))
+ eslint-processor-vue-blocks: 2.0.0(@vue/[email protected])([email protected]([email protected]))
globals: 17.6.0
local-pkg: 1.1.2
parse-gitignore: 2.0.0
toml-eslint-parser: 1.0.3
- vue-eslint-parser: 10.4.0([email protected]([email protected]))
+ vue-eslint-parser: 10.4.0([email protected]([email protected]))
yaml-eslint-parser: 2.0.0
optionalDependencies:
- '@eslint-react/eslint-plugin': 5.8.12([email protected]([email protected]))([email protected])
- eslint-plugin-format: 2.0.1([email protected]([email protected]))
- eslint-plugin-react-refresh: 0.5.2([email protected]([email protected]))
+ '@eslint-react/eslint-plugin': 5.9.0([email protected]([email protected]))([email protected])
+ eslint-plugin-format: 2.0.1([email protected]([email protected]))
+ eslint-plugin-react-refresh: 0.5.2([email protected]([email protected]))
transitivePeerDependencies:
- '@eslint/json'
- '@typescript-eslint/rule-tester'
@@ -12436,11 +12477,11 @@ snapshots:
fast-wrap-ansi: 0.2.2
sisteransi: 1.0.5
dependencies:
'@commitlint/format': 21.0.1
'@commitlint/lint': 21.0.2
- '@commitlint/load': 21.0.2(@types/[email protected])([email protected])
+ '@commitlint/load': 21.0.2(@types/[email protected])([email protected])
'@commitlint/read': 21.0.2([email protected])([email protected])
'@commitlint/types': 21.0.1
tinyexec: 1.2.3
@@ -12485,14 +12526,14 @@ snapshots:
'@commitlint/rules': 21.0.2
'@commitlint/types': 21.0.1
dependencies:
'@commitlint/config-validator': 21.0.1
'@commitlint/execute-rule': 21.0.1
'@commitlint/resolve-extends': 21.0.1
'@commitlint/types': 21.0.1
cosmiconfig: 9.0.1([email protected])
- cosmiconfig-typescript-loader: 6.2.0(@types/[email protected])([email protected]([email protected]))([email protected])
+ cosmiconfig-typescript-loader: 6.2.0(@types/[email protected])([email protected]([email protected]))([email protected])
es-toolkit: 1.46.1
is-plain-obj: 4.1.0
picocolors: 1.1.1
@@ -12904,13 +12945,13 @@ snapshots:
'@dprint/[email protected]': {}
dependencies:
empathic: 2.0.1
module-replacements: 3.0.0-beta.8
semver: 7.8.1
optionalDependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
'@emnapi/[email protected]':
dependencies:
@@ -13113,111 +13154,111 @@ snapshots:
'@esbuild/[email protected]':
optional: true
dependencies:
escape-string-regexp: 4.0.0
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
ignore: 7.0.5
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
eslint-visitor-keys: 3.4.3
'@eslint-community/[email protected]': {}
dependencies:
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/typescript-estree': 8.60.1([email protected])
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/typescript-estree': 8.61.0([email protected])
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
string-ts: 2.3.1
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
- dependencies:
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/shared': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.60.1
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ dependencies:
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@eslint-react/shared': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.61.0
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
ts-pattern: 5.9.0
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-react/shared': 5.8.12([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
- eslint-plugin-react-dom: 5.8.12([email protected]([email protected]))([email protected])
- eslint-plugin-react-jsx: 5.8.12([email protected]([email protected]))([email protected])
- eslint-plugin-react-naming-convention: 5.8.12([email protected]([email protected]))([email protected])
- eslint-plugin-react-rsc: 5.8.12([email protected]([email protected]))([email protected])
- eslint-plugin-react-web-api: 5.8.12([email protected]([email protected]))([email protected])
- eslint-plugin-react-x: 5.8.12([email protected]([email protected]))([email protected])
+ '@eslint-react/shared': 5.9.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
+ eslint-plugin-react-dom: 5.9.0([email protected]([email protected]))([email protected])
+ eslint-plugin-react-jsx: 5.9.0([email protected]([email protected]))([email protected])
+ eslint-plugin-react-naming-convention: 5.9.0([email protected]([email protected]))([email protected])
+ eslint-plugin-react-rsc: 5.9.0([email protected]([email protected]))([email protected])
+ eslint-plugin-react-web-api: 5.9.0([email protected]([email protected]))([email protected])
+ eslint-plugin-react-x: 5.9.0([email protected]([email protected]))([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/shared': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@eslint-react/shared': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
ts-pattern: 5.9.0
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
ts-pattern: 5.9.0
typescript: 6.0.3
zod: 4.4.3
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.60.1
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.61.0
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
ts-pattern: 5.9.0
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
'@eslint/core': 1.2.1
optionalDependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
'@eslint/[email protected]':
dependencies:
@@ -13323,128 +13364,128 @@ snapshots:
'@inquirer/[email protected]': {}
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
'@inquirer/ansi': 1.0.2
- '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
'@inquirer/figures': 1.0.15
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
yoctocolors-cjs: 2.1.3
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
- '@inquirer/core': 10.3.2(@types/[email protected])
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
'@inquirer/ansi': 1.0.2
'@inquirer/figures': 1.0.15
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
cli-width: 4.1.0
mute-stream: 2.0.0
signal-exit: 4.1.0
wrap-ansi: 6.2.0
yoctocolors-cjs: 2.1.3
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
- '@inquirer/core': 10.3.2(@types/[email protected])
- '@inquirer/external-editor': 1.0.3(@types/[email protected])
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/external-editor': 1.0.3(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
- '@inquirer/core': 10.3.2(@types/[email protected])
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
yoctocolors-cjs: 2.1.3
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
chardet: 2.1.1
iconv-lite: 0.7.1
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
'@inquirer/[email protected]': {}
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
- '@inquirer/core': 10.3.2(@types/[email protected])
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
- '@inquirer/core': 10.3.2(@types/[email protected])
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
'@inquirer/ansi': 1.0.2
- '@inquirer/core': 10.3.2(@types/[email protected])
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
optionalDependencies:
- '@types/node': 25.9.1
-
- '@inquirer/[email protected](@types/[email protected])':
- dependencies:
- '@inquirer/checkbox': 4.3.2(@types/[email protected])
- '@inquirer/confirm': 5.1.21(@types/[email protected])
- '@inquirer/editor': 4.2.23(@types/[email protected])
- '@inquirer/expand': 4.0.23(@types/[email protected])
- '@inquirer/input': 4.3.1(@types/[email protected])
- '@inquirer/number': 3.0.23(@types/[email protected])
- '@inquirer/password': 4.0.23(@types/[email protected])
- '@inquirer/rawlist': 4.1.11(@types/[email protected])
- '@inquirer/search': 3.2.2(@types/[email protected])
- '@inquirer/select': 4.4.2(@types/[email protected])
+ '@types/node': 25.9.3
+
+ '@inquirer/[email protected](@types/[email protected])':
+ dependencies:
+ '@inquirer/checkbox': 4.3.2(@types/[email protected])
+ '@inquirer/confirm': 5.1.21(@types/[email protected])
+ '@inquirer/editor': 4.2.23(@types/[email protected])
+ '@inquirer/expand': 4.0.23(@types/[email protected])
+ '@inquirer/input': 4.3.1(@types/[email protected])
+ '@inquirer/number': 3.0.23(@types/[email protected])
+ '@inquirer/password': 4.0.23(@types/[email protected])
+ '@inquirer/rawlist': 4.1.11(@types/[email protected])
+ '@inquirer/search': 3.2.2(@types/[email protected])
+ '@inquirer/select': 4.4.2(@types/[email protected])
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
- '@inquirer/core': 10.3.2(@types/[email protected])
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
yoctocolors-cjs: 2.1.3
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
- '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
'@inquirer/figures': 1.0.15
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
yoctocolors-cjs: 2.1.3
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
dependencies:
'@inquirer/ansi': 1.0.2
- '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
'@inquirer/figures': 1.0.15
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
yoctocolors-cjs: 2.1.3
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
- '@inquirer/[email protected](@types/[email protected])':
+ '@inquirer/[email protected](@types/[email protected])':
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
'@inversifyjs/[email protected]': {}
@@ -13529,18 +13570,18 @@ snapshots:
'@lit-labs/[email protected]': {}
dependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
'@lit-labs/ssr-dom-shim': 1.5.0
dependencies:
'@types/mdx': 2.0.13
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
react: 19.2.7
@@ -13782,11 +13823,11 @@ snapshots:
dependencies:
playwright: 1.57.0
- '@posthog/[email protected]':
+ '@posthog/[email protected]':
dependencies:
- '@posthog/types': 1.380.1
+ '@posthog/types': 1.386.3
- '@posthog/[email protected]': {}
+ '@posthog/[email protected]': {}
'@protobufjs/[email protected]': {}
@@ -13817,311 +13858,311 @@ snapshots:
'@radix-ui/[email protected]': {}
dependencies:
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
'@radix-ui/primitive': 1.1.4
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-focus-guards': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-focus-guards': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
aria-hidden: 1.2.6
react: 19.2.7
react-dom: 19.2.7([email protected])
- react-remove-scroll: 2.7.2(@types/[email protected])([email protected])
+ react-remove-scroll: 2.7.2(@types/[email protected])([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
'@radix-ui/primitive': 1.1.4
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-use-escape-keydown': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-escape-keydown': 1.1.2(@types/[email protected])([email protected])
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
'@radix-ui/primitive': 1.1.4
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
'@radix-ui/primitive': 1.1.4
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
- '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
'@radix-ui/primitive': 1.1.4
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-direction': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-focus-guards': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-roving-focus': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
- '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-direction': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-focus-guards': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-roving-focus': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
+ '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
aria-hidden: 1.2.6
react: 19.2.7
react-dom: 19.2.7([email protected])
- react-remove-scroll: 2.7.2(@types/[email protected])([email protected])
+ react-remove-scroll: 2.7.2(@types/[email protected])([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
'@radix-ui/primitive': 1.1.4
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
- '@radix-ui/react-focus-guards': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.12(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-focus-guards': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
aria-hidden: 1.2.6
react: 19.2.7
react-dom: 19.2.7([email protected])
- react-remove-scroll: 2.7.2(@types/[email protected])([email protected])
+ react-remove-scroll: 2.7.2(@types/[email protected])([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
'@floating-ui/react-dom': 2.1.6([email protected]([email protected]))([email protected])
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-use-rect': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-use-size': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-rect': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-size': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/rect': 1.1.2
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
- '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
- '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
- '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
+ '@radix-ui/react-slot': 1.2.5(@types/[email protected])([email protected])
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
'@radix-ui/primitive': 1.1.4
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
- '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
- '@radix-ui/react-direction': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.4(@types/[email protected])([email protected])
+ '@radix-ui/react-direction': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-id': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.2.3(@types/[email protected])([email protected])
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
dependencies:
- '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-compose-refs': 1.1.3(@types/[email protected])([email protected])
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
- '@radix-ui/react-use-effect-event': 0.0.3(@types/[email protected])([email protected])
- '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-effect-event': 0.0.3(@types/[email protected])([email protected])
+ '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
- '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
- '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-callback-ref': 1.1.2(@types/[email protected])([email protected])
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
'@radix-ui/rect': 1.1.2
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
- '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-layout-effect': 1.1.2(@types/[email protected])([email protected])
react: 19.2.7
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
'@radix-ui/[email protected]': {}
@@ -14131,19 +14172,19 @@ snapshots:
'@react-dnd/[email protected]': {}
dependencies:
detect-indent: 6.1.0
detect-newline: 3.1.0
execa: 8.0.1
- release-it: 19.2.4(@types/[email protected])([email protected])
+ release-it: 19.2.4(@types/[email protected])([email protected])
semver: 7.7.2
url-join: 4.0.1
validate-peer-dependencies: 1.2.0
walk-sync: 2.2.0
yaml: 2.8.0
dependencies:
'@conventional-changelog/git-client': 2.6.0([email protected])([email protected])
concat-stream: 2.0.0
@@ -14151,7 +14192,7 @@ snapshots:
conventional-changelog-angular: 8.3.0
conventional-changelog-conventionalcommits: 9.3.0
conventional-recommended-bump: 11.2.0
- release-it: 19.2.4(@types/[email protected])([email protected])
+ release-it: 19.2.4(@types/[email protected])([email protected])
semver: 7.7.4
transitivePeerDependencies:
- conventional-commits-filter
@@ -14419,10 +14460,10 @@ snapshots:
'@standard-schema/[email protected]': {}
dependencies:
- '@mdx-js/react': 3.1.1(@types/[email protected])([email protected])
+ '@mdx-js/react': 3.1.1(@types/[email protected])([email protected])
react: 19.2.7
@@ -14489,14 +14530,14 @@ snapshots:
ts-dedent: 2.2.0
dependencies:
unplugin: 2.3.11
optionalDependencies:
esbuild: 0.28.0
rollup: 4.55.1
webpack: 5.106.2(@swc/[email protected])([email protected])
'@storybook/[email protected]': {}
@@ -14581,11 +14622,11 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
'@typescript-eslint/types': 8.60.1
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
eslint-visitor-keys: 4.2.1
espree: 10.4.0
estraverse: 5.3.0
@@ -14663,15 +14704,15 @@ snapshots:
picocolors: 1.1.1
redent: 3.0.0
dependencies:
'@babel/runtime': 7.28.6
'@testing-library/dom': 10.4.0
react: 19.2.7
react-dom: 19.2.7([email protected])
optionalDependencies:
- '@types/react': 19.2.16
- '@types/react-dom': 19.2.3(@types/[email protected])
+ '@types/react': 19.2.17
+ '@types/react-dom': 19.2.3(@types/[email protected])
'@testing-library/[email protected](@testing-library/[email protected])':
dependencies:
@@ -14679,12 +14720,12 @@ snapshots:
'@tootallnate/[email protected]': {}
dependencies:
lightningcss: 1.32.0
rolldown: 1.1.0
optionalDependencies:
postcss: 8.5.15
postcss-modules: 6.0.1([email protected])
@@ -14694,22 +14735,22 @@ snapshots:
- tsx
- yaml
- '@turbo/[email protected]':
+ '@turbo/[email protected]':
optional: true
- '@turbo/[email protected]':
+ '@turbo/[email protected]':
optional: true
- '@turbo/[email protected]':
+ '@turbo/[email protected]':
optional: true
- '@turbo/[email protected]':
+ '@turbo/[email protected]':
optional: true
- '@turbo/[email protected]':
+ '@turbo/[email protected]':
optional: true
- '@turbo/[email protected]':
+ '@turbo/[email protected]':
optional: true
@@ -14774,7 +14815,7 @@ snapshots:
dependencies:
'@types/jsonfile': 6.1.4
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
dependencies:
@@ -14788,7 +14829,7 @@ snapshots:
dependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
'@types/[email protected]': {}
@@ -14816,10 +14857,6 @@ snapshots:
dependencies:
undici-types: 6.21.0
- '@types/[email protected]':
- dependencies:
- undici-types: 7.24.6
-
dependencies:
undici-types: 7.24.6
@@ -14834,15 +14871,15 @@ snapshots:
'@types/[email protected]': {}
dependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
- '@types/[email protected]':
+ '@types/[email protected]':
dependencies:
csstype: 3.2.3
@@ -14856,7 +14893,7 @@ snapshots:
dependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
'@types/[email protected]': {}
@@ -14870,15 +14907,15 @@ snapshots:
dependencies:
'@types/node': 25.9.3
dependencies:
'@eslint-community/regexpp': 4.12.2
- '@typescript-eslint/parser': 8.60.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/parser': 8.60.0([email protected]([email protected]))([email protected])
'@typescript-eslint/scope-manager': 8.60.1
- '@typescript-eslint/type-utils': 8.60.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/type-utils': 8.60.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
'@typescript-eslint/visitor-keys': 8.60.1
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
ignore: 7.0.5
natural-compare: 1.4.0
ts-api-utils: 2.5.0([email protected])
@@ -14886,46 +14923,46 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@typescript-eslint/scope-manager': 8.56.1
'@typescript-eslint/types': 8.56.1
'@typescript-eslint/typescript-estree': 8.56.1([email protected])
'@typescript-eslint/visitor-keys': 8.56.1
debug: 4.4.3
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
'@typescript-eslint/scope-manager': 8.60.0
'@typescript-eslint/types': 8.60.0
'@typescript-eslint/typescript-estree': 8.60.0([email protected])
'@typescript-eslint/visitor-keys': 8.60.0
debug: 4.4.3
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
'@typescript-eslint/scope-manager': 8.60.1
'@typescript-eslint/types': 8.60.1
'@typescript-eslint/typescript-estree': 8.60.1([email protected])
'@typescript-eslint/visitor-keys': 8.60.1
debug: 4.4.3
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
'@typescript-eslint/[email protected]([email protected])':
dependencies:
- '@typescript-eslint/tsconfig-utils': 8.56.1([email protected])
- '@typescript-eslint/types': 8.56.1
+ '@typescript-eslint/tsconfig-utils': 8.60.1([email protected])
+ '@typescript-eslint/types': 8.60.1
debug: 4.4.3
typescript: 6.0.3
transitivePeerDependencies:
@@ -14949,13 +14986,22 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@typescript-eslint/[email protected]([email protected])':
dependencies:
- '@typescript-eslint/parser': 8.56.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/tsconfig-utils': 8.61.0([email protected])
+ '@typescript-eslint/types': 8.61.0
+ debug: 4.4.3
+ typescript: 6.0.3
+ transitivePeerDependencies:
+ - supports-color
+
+ dependencies:
+ '@typescript-eslint/parser': 8.56.1([email protected]([email protected]))([email protected])
'@typescript-eslint/typescript-estree': 8.56.1([email protected])
- '@typescript-eslint/utils': 8.56.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/utils': 8.56.1([email protected]([email protected]))([email protected])
ajv: 6.15.0
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
json-stable-stringify-without-jsonify: 1.0.1
lodash.merge: 4.6.2
semver: 7.8.4
@@ -14978,6 +15024,11 @@ snapshots:
'@typescript-eslint/types': 8.60.1
'@typescript-eslint/visitor-keys': 8.60.1
+ '@typescript-eslint/[email protected]':
+ dependencies:
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/visitor-keys': 8.61.0
+
'@typescript-eslint/[email protected]([email protected])':
dependencies:
typescript: 6.0.3
@@ -14990,13 +15041,29 @@ snapshots:
dependencies:
typescript: 6.0.3
+ '@typescript-eslint/[email protected]([email protected])':
+ dependencies:
+ typescript: 6.0.3
+
dependencies:
'@typescript-eslint/types': 8.60.1
'@typescript-eslint/typescript-estree': 8.60.1([email protected])
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
debug: 4.4.3
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
+ ts-api-utils: 2.5.0([email protected])
+ typescript: 6.0.3
+ transitivePeerDependencies:
+ - supports-color
+
+ dependencies:
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/typescript-estree': 8.61.0([email protected])
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ debug: 4.4.3
+ eslint: 10.5.0([email protected])
ts-api-utils: 2.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
@@ -15008,6 +15075,8 @@ snapshots:
'@typescript-eslint/[email protected]': {}
+ '@typescript-eslint/[email protected]': {}
+
'@typescript-eslint/[email protected]([email protected])':
dependencies:
'@typescript-eslint/project-service': 8.56.1([email protected])
@@ -15053,24 +15122,50 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@typescript-eslint/[email protected]([email protected])':
+ dependencies:
+ '@typescript-eslint/project-service': 8.61.0([email protected])
+ '@typescript-eslint/tsconfig-utils': 8.61.0([email protected])
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/visitor-keys': 8.61.0
+ debug: 4.4.3
+ minimatch: 10.2.5
+ semver: 7.8.4
+ tinyglobby: 0.2.17
+ ts-api-utils: 2.5.0([email protected])
+ typescript: 6.0.3
+ transitivePeerDependencies:
+ - supports-color
+
dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
'@typescript-eslint/scope-manager': 8.56.1
'@typescript-eslint/types': 8.56.1
'@typescript-eslint/typescript-estree': 8.56.1([email protected])
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
'@typescript-eslint/scope-manager': 8.60.1
'@typescript-eslint/types': 8.60.1
'@typescript-eslint/typescript-estree': 8.60.1([email protected])
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
+ typescript: 6.0.3
+ transitivePeerDependencies:
+ - supports-color
+
+ dependencies:
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@typescript-eslint/scope-manager': 8.61.0
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/typescript-estree': 8.61.0([email protected])
+ eslint: 10.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
@@ -15090,6 +15185,11 @@ snapshots:
'@typescript-eslint/types': 8.60.1
eslint-visitor-keys: 5.0.1
+ '@typescript-eslint/[email protected]':
+ dependencies:
+ '@typescript-eslint/types': 8.61.0
+ eslint-visitor-keys: 5.0.1
+
'@univerjs/[email protected]': {}
@@ -15121,19 +15221,19 @@ snapshots:
magicast: 0.5.3
obug: 2.1.2
tinyrainbow: 3.1.0
transitivePeerDependencies:
- supports-color
dependencies:
'@typescript-eslint/scope-manager': 8.60.1
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
optionalDependencies:
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
@@ -15154,21 +15254,13 @@ snapshots:
chai: 6.2.2
tinyrainbow: 3.1.0
dependencies:
'@vitest/spy': 4.1.8
estree-walker: 3.0.3
magic-string: 0.30.21
optionalDependencies:
-
- dependencies:
- '@vitest/spy': 4.1.8
- estree-walker: 3.0.3
- magic-string: 0.30.21
- optionalDependencies:
'@vitest/[email protected]':
dependencies:
@@ -16075,9 +16167,9 @@ snapshots:
dependencies:
browserslist: 4.28.2
dependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
cosmiconfig: 9.0.1([email protected])
jiti: 2.7.0
typescript: 6.0.3
@@ -16635,43 +16727,43 @@ snapshots:
optionalDependencies:
source-map: 0.6.1
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
semver: 7.8.1
dependencies:
- '@eslint/compat': 2.1.0([email protected]([email protected]))
- eslint: 10.4.1([email protected])
+ '@eslint/compat': 2.1.0([email protected]([email protected]))
+ eslint: 10.5.0([email protected])
dependencies:
'@eslint/config-helpers': 0.5.5
pathe: 2.0.3
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
prettier-linter-helpers: 1.0.1
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
esquery: 1.7.0
jsonc-eslint-parser: 3.1.0
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
dependencies:
'@eslint/css-tree': 4.0.3
'@valibot/to-json-schema': 1.7.0([email protected]([email protected]))
@@ -16683,48 +16775,48 @@ snapshots:
tsconfig-paths-webpack-plugin: 4.2.0
valibot: 1.4.0([email protected])
optionalDependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
transitivePeerDependencies:
- '@eslint/css'
- typescript
dependencies:
'@es-joy/jsdoccomment': 0.84.0
- '@typescript-eslint/rule-tester': 8.56.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/typescript-estree': 8.60.1([email protected])
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@typescript-eslint/rule-tester': 8.56.1([email protected]([email protected]))([email protected])
+ '@typescript-eslint/typescript-estree': 8.61.0([email protected])
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
'@eslint-community/regexpp': 4.12.2
- eslint: 10.4.1([email protected])
- eslint-compat-utils: 0.5.1([email protected]([email protected]))
+ eslint: 10.5.0([email protected])
+ eslint-compat-utils: 0.5.1([email protected]([email protected]))
dependencies:
'@dprint/formatter': 0.5.1
'@dprint/markdown': 0.21.1
'@dprint/toml': 0.7.0
- eslint: 10.4.1([email protected])
- eslint-formatting-reporter: 0.0.0([email protected]([email protected]))
+ eslint: 10.5.0([email protected])
+ eslint-formatting-reporter: 0.0.0([email protected]([email protected]))
eslint-parser-plain: 0.1.1
ohash: 2.0.11
oxfmt: 0.35.0
prettier: 3.8.1
synckit: 0.11.12
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
dependencies:
'@es-joy/jsdoccomment': 0.86.0
'@es-joy/resolve.exports': 1.2.0
@@ -16732,7 +16824,7 @@ snapshots:
comment-parser: 1.4.6
debug: 4.4.3
escape-string-regexp: 4.0.0
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
espree: 11.2.0
esquery: 1.7.0
html-entities: 2.6.0
@@ -16744,27 +16836,27 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
'@eslint/core': 1.2.1
'@eslint/plugin-kit': 0.6.1
'@ota-meshi/ast-token-store': 0.3.0
diff-sequences: 29.6.3
- eslint: 10.4.1([email protected])
- eslint-json-compat-utils: 0.2.3([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
+ eslint-json-compat-utils: 0.2.3([email protected]([email protected]))([email protected])
jsonc-eslint-parser: 3.1.0
natural-compare: 1.4.0
synckit: 0.11.12
transitivePeerDependencies:
- '@eslint/json'
dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
enhanced-resolve: 5.21.0
- eslint: 10.4.1([email protected])
- eslint-plugin-es-x: 7.8.0([email protected]([email protected]))
+ eslint: 10.5.0([email protected])
+ eslint-plugin-es-x: 7.8.0([email protected]([email protected]))
get-tsconfig: 4.13.7
globals: 15.15.0
globrex: 0.1.2
@@ -16774,31 +16866,31 @@ snapshots:
ts-declaration-location: 1.0.7([email protected])
typescript: 6.0.3
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
requireindex: 1.2.0
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
requireindex: 1.2.0
dependencies:
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
natural-orderby: 5.0.0
transitivePeerDependencies:
- supports-color
- typescript
dependencies:
empathic: 2.0.1
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
jsonc-eslint-parser: 3.1.0
pathe: 2.0.3
pnpm-workspace-yaml: 1.6.0
@@ -16806,108 +16898,108 @@ snapshots:
yaml: 2.9.0
yaml-eslint-parser: 2.0.0
dependencies:
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/shared': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@eslint-react/shared': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
compare-versions: 6.1.1
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
'@babel/core': 7.29.0
'@babel/parser': 7.29.3
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
hermes-parser: 0.25.1
zod: 4.4.3
zod-validation-error: 4.0.2([email protected])
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-react/core': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/shared': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@eslint-react/shared': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-react/core': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
ts-pattern: 5.9.0
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
dependencies:
- '@eslint-react/core': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/shared': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
- eslint: 10.4.1([email protected])
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@eslint-react/shared': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
+ eslint: 10.5.0([email protected])
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
dependencies:
- '@eslint-react/core': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/shared': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@eslint-react/shared': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
birecord: 0.1.1
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
ts-pattern: 5.9.0
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
- dependencies:
- '@eslint-react/core': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/eslint': 5.8.12([email protected]([email protected]))([email protected])
- '@eslint-react/shared': 5.8.12([email protected]([email protected]))([email protected])
- '@typescript-eslint/scope-manager': 8.60.1
- '@typescript-eslint/type-utils': 8.60.1([email protected]([email protected]))([email protected])
- '@typescript-eslint/types': 8.60.1
- '@typescript-eslint/typescript-estree': 8.60.1([email protected])
- '@typescript-eslint/utils': 8.60.1([email protected]([email protected]))([email protected])
+ dependencies:
+ '@eslint-react/eslint': 5.9.0([email protected]([email protected]))([email protected])
+ '@eslint-react/shared': 5.9.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/scope-manager': 8.61.0
+ '@typescript-eslint/type-utils': 8.61.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/types': 8.61.0
+ '@typescript-eslint/typescript-estree': 8.61.0([email protected])
+ '@typescript-eslint/utils': 8.61.0([email protected]([email protected]))([email protected])
compare-versions: 6.1.1
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
string-ts: 2.3.1
ts-api-utils: 2.5.0([email protected])
ts-pattern: 5.9.0
@@ -16915,7 +17007,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
array-includes: 3.1.8
array.prototype.findlast: 1.2.5
@@ -16923,7 +17015,7 @@ snapshots:
array.prototype.tosorted: 1.1.4
doctrine: 2.1.0
es-iterator-helpers: 1.2.1
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
estraverse: 5.3.0
hasown: 2.0.2
jsx-ast-utils: 3.3.5
@@ -16937,37 +17029,37 @@ snapshots:
string.prototype.matchall: 4.0.12
string.prototype.repeat: 1.0.0
dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
'@eslint-community/regexpp': 4.12.2
comment-parser: 1.4.5
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
jsdoc-type-pratt-parser: 7.1.1
refa: 0.12.1
regexp-ast-analysis: 0.7.1
scslre: 0.3.0
dependencies:
'@eslint/core': 1.2.1
'@eslint/plugin-kit': 0.6.1
'@ota-meshi/ast-token-store': 0.3.0
debug: 4.4.3
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
toml-eslint-parser: 1.0.3
transitivePeerDependencies:
- supports-color
dependencies:
'@babel/helper-validator-identifier': 7.29.7
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
change-case: 5.4.4
ci-info: 4.4.0
clean-regexp: 1.0.0
core-js-compat: 3.49.0
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
find-up-simple: 1.0.1
globals: 17.6.0
indent-string: 5.0.0
@@ -16979,41 +17071,41 @@ snapshots:
semver: 7.8.1
strip-indent: 4.1.1
dependencies:
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
optionalDependencies:
dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
- eslint: 10.4.1([email protected])
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ eslint: 10.5.0([email protected])
natural-compare: 1.4.0
nth-check: 2.1.1
postcss-selector-parser: 7.1.1
semver: 7.8.1
- vue-eslint-parser: 10.4.0([email protected]([email protected]))
+ vue-eslint-parser: 10.4.0([email protected]([email protected]))
xml-name-validator: 4.0.0
optionalDependencies:
- '@stylistic/eslint-plugin': 5.10.0([email protected]([email protected]))
- '@typescript-eslint/parser': 8.60.0([email protected]([email protected]))([email protected])
+ '@stylistic/eslint-plugin': 5.10.0([email protected]([email protected]))
+ '@typescript-eslint/parser': 8.60.0([email protected]([email protected]))([email protected])
dependencies:
'@eslint/core': 1.2.1
'@eslint/plugin-kit': 0.7.2
'@ota-meshi/ast-token-store': 0.3.0
diff-sequences: 29.6.3
escape-string-regexp: 5.0.0
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
natural-compare: 1.4.0
yaml-eslint-parser: 2.0.0
dependencies:
'@vue/compiler-sfc': 3.5.35
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
dependencies:
@@ -17038,9 +17130,9 @@ snapshots:
dependencies:
- '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
+ '@eslint-community/eslint-utils': 4.9.1([email protected]([email protected]))
'@eslint-community/regexpp': 4.12.2
'@eslint/config-array': 0.23.5
'@eslint/config-helpers': 0.6.0
@@ -17612,17 +17704,17 @@ snapshots:
dependencies:
'@inquirer/ansi': 1.0.2
- '@inquirer/core': 10.3.2(@types/[email protected])
- '@inquirer/prompts': 7.10.1(@types/[email protected])
- '@inquirer/type': 3.0.10(@types/[email protected])
+ '@inquirer/core': 10.3.2(@types/[email protected])
+ '@inquirer/prompts': 7.10.1(@types/[email protected])
+ '@inquirer/type': 3.0.10(@types/[email protected])
mute-stream: 2.0.0
run-async: 4.0.6
rxjs: 7.8.2
optionalDependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
dependencies:
@@ -17904,7 +17996,7 @@ snapshots:
dependencies:
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
merge-stream: 2.0.0
supports-color: 8.1.1
@@ -19163,13 +19255,13 @@ snapshots:
optionalDependencies:
postcss: 8.5.14
dependencies:
lilconfig: 3.1.3
optionalDependencies:
jiti: 2.7.0
postcss: 8.5.15
- tsx: 4.22.3
+ tsx: 4.22.4
yaml: 2.9.0
@@ -19379,9 +19471,9 @@ snapshots:
picocolors: 1.1.1
source-map-js: 1.2.1
dependencies:
- '@posthog/core': 1.30.8
+ '@posthog/core': 1.32.3
optionalDependencies:
rxjs: 7.8.2
@@ -19426,7 +19518,7 @@ snapshots:
'@protobufjs/path': 1.1.2
'@protobufjs/pool': 1.1.0
'@protobufjs/utf8': 1.1.0
- '@types/node': 25.9.1
+ '@types/node': 25.9.3
long: 5.3.2
@@ -19488,26 +19580,26 @@ snapshots:
dependencies:
dnd-core: 16.0.1
dependencies:
dnd-core: 16.0.1
dnd-multi-backend: 8.1.2([email protected])
react: 19.2.7
- react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
+ react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
react-dom: 19.2.7([email protected])
dependencies:
react: 19.2.7
- react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
+ react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
dependencies:
'@react-dnd/invariant': 4.0.2
dnd-core: 16.0.1
dependencies:
'@react-dnd/invariant': 4.0.2
'@react-dnd/shallowequal': 4.0.2
@@ -19517,7 +19609,7 @@ snapshots:
react: 19.2.7
optionalDependencies:
'@types/node': 25.9.3
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
@@ -19562,7 +19654,7 @@ snapshots:
dependencies:
classnames: 2.5.1
immutability-helper: 3.1.1
@@ -19570,9 +19662,9 @@ snapshots:
prop-types: 15.8.1
rdndmb-html5-to-touch: 8.1.2([email protected])
react: 19.2.7
- react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
+ react-dnd: 16.0.1(@types/[email protected])(@types/[email protected])([email protected])
react-dnd-html5-backend: 16.0.1
react-dnd-touch-backend: 16.0.1
uuid: 9.0.1
transitivePeerDependencies:
@@ -19582,32 +19674,32 @@ snapshots:
- dnd-core
- react-dom
dependencies:
react: 19.2.7
- react-style-singleton: 2.2.3(@types/[email protected])([email protected])
+ react-style-singleton: 2.2.3(@types/[email protected])([email protected])
tslib: 2.8.1
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
react: 19.2.7
- react-remove-scroll-bar: 2.3.8(@types/[email protected])([email protected])
- react-style-singleton: 2.2.3(@types/[email protected])([email protected])
+ react-remove-scroll-bar: 2.3.8(@types/[email protected])([email protected])
+ react-style-singleton: 2.2.3(@types/[email protected])([email protected])
tslib: 2.8.1
- use-callback-ref: 1.3.3(@types/[email protected])([email protected])
- use-sidecar: 1.1.3(@types/[email protected])([email protected])
+ use-callback-ref: 1.3.3(@types/[email protected])([email protected])
+ use-sidecar: 1.1.3(@types/[email protected])([email protected])
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
get-nonce: 1.0.1
react: 19.2.7
tslib: 2.8.1
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
@@ -19705,7 +19797,7 @@ snapshots:
dependencies:
'@nodeutils/defaults-deep': 1.1.0
'@octokit/rest': 22.0.1
@@ -19715,7 +19807,7 @@ snapshots:
ci-info: 4.3.1
eta: 4.5.0
git-url-parse: 16.1.0
- inquirer: 12.11.1(@types/[email protected])
+ inquirer: 12.11.1(@types/[email protected])
issue-parser: 7.0.1
lodash.merge: 4.6.2
mime-types: 3.0.2
@@ -20528,7 +20620,7 @@ snapshots:
minimist: 1.2.8
strip-bom: 3.0.0
dependencies:
ansis: 4.3.1
cac: 7.0.0
@@ -20546,8 +20638,8 @@ snapshots:
tree-kill: 1.2.2
unconfig-core: 7.5.0
optionalDependencies:
- tsx: 4.22.3
+ tsx: 4.22.4
typescript: 6.0.3
unrun: 0.2.35([email protected])
transitivePeerDependencies:
@@ -20556,7 +20648,7 @@ snapshots:
- oxc-resolver
- vue-tsc
dependencies:
ansis: 4.3.1
cac: 7.0.0
@@ -20574,8 +20666,8 @@ snapshots:
tree-kill: 1.2.2
unconfig-core: 7.5.0
optionalDependencies:
- tsx: 4.22.3
+ tsx: 4.22.4
typescript: 6.0.3
unrun: 0.2.35([email protected])
transitivePeerDependencies:
@@ -20586,20 +20678,20 @@ snapshots:
dependencies:
esbuild: 0.28.0
optionalDependencies:
fsevents: 2.3.3
optionalDependencies:
- '@turbo/darwin-64': 2.9.16
- '@turbo/darwin-arm64': 2.9.16
- '@turbo/linux-64': 2.9.16
- '@turbo/linux-arm64': 2.9.16
- '@turbo/windows-64': 2.9.16
- '@turbo/windows-arm64': 2.9.16
+ '@turbo/darwin-64': 2.9.18
+ '@turbo/darwin-arm64': 2.9.18
+ '@turbo/linux-64': 2.9.18
+ '@turbo/linux-arm64': 2.9.18
+ '@turbo/windows-64': 2.9.18
+ '@turbo/windows-arm64': 2.9.18
dependencies:
@@ -20711,14 +20803,14 @@ snapshots:
dependencies:
'@jridgewell/gen-mapping': 0.3.13
'@jridgewell/trace-mapping': 0.3.31
'@vue/reactivity': 3.5.34
obug: 2.1.1
unplugin: 3.0.0
vue: 3.5.35([email protected])
transitivePeerDependencies:
- '@types/node'
@@ -20779,20 +20871,20 @@ snapshots:
dependencies:
react: 19.2.7
tslib: 2.8.1
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
detect-node-es: 1.1.0
react: 19.2.7
tslib: 2.8.1
optionalDependencies:
- '@types/react': 19.2.16
+ '@types/react': 19.2.17
dependencies:
@@ -20830,24 +20922,7 @@ snapshots:
- dependencies:
- lightningcss: 1.32.0
- picomatch: 4.0.4
- postcss: 8.5.15
- rolldown: 1.0.0-rc.18
- tinyglobby: 0.2.17
- optionalDependencies:
- '@types/node': 25.9.1
- esbuild: 0.28.0
- fsevents: 2.3.3
- jiti: 2.7.0
- sass: 1.87.0
- terser: 5.47.1
- tsx: 4.22.3
- yaml: 2.9.0
-
dependencies:
lightningcss: 1.32.0
picomatch: 4.0.4
@@ -20861,43 +20936,13 @@ snapshots:
jiti: 2.7.0
sass: 1.87.0
terser: 5.47.1
- tsx: 4.22.3
+ tsx: 4.22.4
yaml: 2.9.0
- dependencies:
- '@vitest/expect': 4.1.8
- '@vitest/pretty-format': 4.1.8
- '@vitest/runner': 4.1.8
- '@vitest/snapshot': 4.1.8
- '@vitest/spy': 4.1.8
- '@vitest/utils': 4.1.8
- es-module-lexer: 2.1.0
- expect-type: 1.3.0
- magic-string: 0.30.21
- obug: 2.1.2
- pathe: 2.0.3
- picomatch: 4.0.4
- std-env: 4.1.0
- tinybench: 2.9.0
- tinyexec: 1.2.4
- tinyglobby: 0.2.17
- tinyrainbow: 3.1.0
- why-is-node-running: 2.3.0
- optionalDependencies:
- '@types/node': 25.9.1
- '@vitest/coverage-istanbul': 4.1.8([email protected])
- happy-dom: 20.10.1
- jsdom: 29.1.1
- transitivePeerDependencies:
- - msw
-
dependencies:
'@vitest/expect': 4.1.8
'@vitest/pretty-format': 4.1.8
'@vitest/runner': 4.1.8
'@vitest/snapshot': 4.1.8
@@ -20914,7 +20959,7 @@ snapshots:
tinyexec: 1.2.4
tinyglobby: 0.2.17
tinyrainbow: 3.1.0
why-is-node-running: 2.3.0
optionalDependencies:
'@types/node': 25.9.3
@@ -20926,10 +20971,10 @@ snapshots:
dependencies:
debug: 4.4.3
- eslint: 10.4.1([email protected])
+ eslint: 10.5.0([email protected])
eslint-scope: 9.1.2
eslint-visitor-keys: 5.0.1
espree: 11.2.0