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.

fix(ui): localize accessibility labels (#7886)

白熱83078cc793f7
diff --git a/packages/design/src/components/dialog/DialogPrimitive.tsx b/packages/design/src/components/dialog/DialogPrimitive.tsx
index 9f950c4878..cc674cc118 100644
--- a/packages/design/src/components/dialog/DialogPrimitive.tsx
+++ b/packages/design/src/components/dialog/DialogPrimitive.tsx
@@ -17,9 +17,11 @@
import type { ComponentPropsWithoutRef, ComponentRef, HTMLAttributes } from 'react';
import { Close, Content, Description, Overlay, Portal, Root, Title, Trigger } from '@radix-ui/react-dialog';
import { CloseIcon } from '@univerjs/icons';
-import { forwardRef } from 'react';
+import { forwardRef, useContext } from 'react';
import { borderClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
+import enUS from '../../locale/en-US';
+import { ConfigContext } from '../config-provider/ConfigProvider';
const Dialog = Root;
@@ -57,56 +59,61 @@ export interface IDialogContentProps {
const DialogContent = forwardRef<
ComponentRef<typeof Content>,
ComponentPropsWithoutRef<typeof Content> & IDialogContentProps
->(({ className, children, closable = true, onClickClose, mountContainer, overlayClassName, ...props }, ref) => (
- <DialogPortal container={mountContainer ?? undefined}>
- <DialogOverlay className={overlayClassName} />
- <Content
- ref={ref}
- className={clsx(
- `
- data-[state=open]:univer-animate-in data-[state=open]:univer-fade-in-0
- data-[state=open]:univer-zoom-in-95 data-[state=open]:univer-slide-in-from-left-1/2
- data-[state=open]:univer-slide-in-from-top-[48%]
- data-[state=closed]:univer-animate-out data-[state=closed]:univer-fade-out-0
- data-[state=closed]:univer-zoom-out-95 data-[state=closed]:univer-slide-out-to-left-1/2
- data-[state=closed]:univer-slide-out-to-top-[48%]
- univer-fixed univer-left-1/2 univer-top-1/2 univer-z-[1080] univer-box-border univer-grid
- univer-w-full univer-max-w-lg -univer-translate-x-1/2 -univer-translate-y-1/2 univer-gap-4
- univer-bg-gray-0 univer-p-4 univer-text-gray-500 univer-shadow-md univer-duration-200
- sm:!univer-rounded-lg
- dark:!univer-bg-gray-700 dark:!univer-text-gray-400
- `,
- borderClassName,
- className
- )}
- {...props}
- >
- {children}
- {closable && (
- <Close
- data-slot="close"
- className={`
- univer-absolute univer-right-4 univer-top-4 univer-size-6 univer-cursor-pointer univer-rounded-sm
- univer-border-none univer-bg-transparent univer-p-0 univer-transition-opacity
- hover:univer-opacity-100
- disabled:univer-pointer-events-none
- rtl:univer-left-4 rtl:univer-right-auto
- `}
- onClick={(event) => {
- if (onClickClose) {
- // The custom callback owns dismissal; skip Radix's second close.
- event.preventDefault();
- onClickClose();
- }
- }}
- >
- <CloseIcon className="univer-size-4 univer-text-gray-400" />
- <span className="univer-sr-only">Close</span>
- </Close>
- )}
- </Content>
- </DialogPortal>
-));
+>(({ className, children, closable = true, onClickClose, mountContainer, overlayClassName, ...props }, ref) => {
+ const { locale } = useContext(ConfigContext);
+
+ return (
+ <DialogPortal container={mountContainer ?? undefined}>
+ <DialogOverlay className={overlayClassName} />
+ <Content
+ ref={ref}
+ className={clsx(
+ `
+ data-[state=open]:univer-animate-in data-[state=open]:univer-fade-in-0
+ data-[state=open]:univer-zoom-in-95 data-[state=open]:univer-slide-in-from-left-1/2
+ data-[state=open]:univer-slide-in-from-top-[48%]
+ data-[state=closed]:univer-animate-out data-[state=closed]:univer-fade-out-0
+ data-[state=closed]:univer-zoom-out-95 data-[state=closed]:univer-slide-out-to-left-1/2
+ data-[state=closed]:univer-slide-out-to-top-[48%]
+ univer-fixed univer-left-1/2 univer-top-1/2 univer-z-[1080] univer-box-border univer-grid
+ univer-w-full univer-max-w-lg -univer-translate-x-1/2 -univer-translate-y-1/2 univer-gap-4
+ univer-bg-gray-0 univer-p-4 univer-text-gray-500 univer-shadow-md univer-duration-200
+ sm:!univer-rounded-lg
+ dark:!univer-bg-gray-700 dark:!univer-text-gray-400
+ `,
+ borderClassName,
+ className
+ )}
+ {...props}
+ >
+ {children}
+ {closable && (
+ <Close
+ data-slot="close"
+ className={`
+ univer-absolute univer-right-4 univer-top-4 univer-size-6 univer-cursor-pointer
+ univer-rounded-sm univer-border-none univer-bg-transparent univer-p-0
+ univer-transition-opacity
+ hover:univer-opacity-100
+ disabled:univer-pointer-events-none
+ rtl:univer-left-4 rtl:univer-right-auto
+ `}
+ onClick={(event) => {
+ if (onClickClose) {
+ // The custom callback owns dismissal; skip Radix's second close.
+ event.preventDefault();
+ onClickClose();
+ }
+ }}
+ >
+ <CloseIcon className="univer-size-4 univer-text-gray-400" />
+ <span className="univer-sr-only">{locale?.Accessibility.close ?? enUS.design.Accessibility.close}</span>
+ </Close>
+ )}
+ </Content>
+ </DialogPortal>
+ );
+});
DialogContent.displayName = Content.displayName;
const DialogHeader = ({
diff --git a/packages/design/src/components/dialog/__tests__/Dialog.spec.tsx b/packages/design/src/components/dialog/__tests__/Dialog.spec.tsx
index 97600a034e..93b10d4764 100644
--- a/packages/design/src/components/dialog/__tests__/Dialog.spec.tsx
+++ b/packages/design/src/components/dialog/__tests__/Dialog.spec.tsx
@@ -16,16 +16,67 @@
import { cleanup, fireEvent, render } from '@testing-library/react';
import { afterEach, describe, expect, it, vi } from 'vitest';
+import enUS from '../../../locale/en-US';
+import zhCN from '../../../locale/zh-CN';
+import { ConfigProvider } from '../../config-provider/ConfigProvider';
import { Dialog } from '../Dialog';
-afterEach(() => cleanup());
+afterEach(() => {
+ cleanup();
+ vi.restoreAllMocks();
+});
describe('Dialog', () => {
+ it('renders its title, content and custom footer only while open', () => {
+ const { queryByRole, getByText, rerender } = render(<Dialog open={false} title="Title">Content</Dialog>);
+ expect(queryByRole('dialog')).toBeNull();
+
+ rerender(<Dialog open title="Title" footer={<button type="button">Custom footer</button>}>Content</Dialog>);
+
+ expect(queryByRole('dialog', { name: 'Title' })).not.toBeNull();
+ expect(getByText('Content')).toBeDefined();
+ expect(queryByRole('button', { name: 'Custom footer' })).not.toBeNull();
+ });
+
+ it('updates the close control with the locale and dismisses exactly once', () => {
+ const onClose = vi.fn();
+ const onOpenChange = vi.fn();
+ const { getByRole, rerender } = render(
+ <ConfigProvider locale={enUS.design} mountContainer={document.body} direction="ltr">
+ <Dialog open title="Title" onClose={onClose} onOpenChange={onOpenChange}>Content</Dialog>
+ </ConfigProvider>
+ );
+
+ rerender(
+ <ConfigProvider locale={zhCN.design} mountContainer={document.body} direction="ltr">
+ <Dialog open title="Title" onClose={onClose} onOpenChange={onOpenChange}>Content</Dialog>
+ </ConfigProvider>
+ );
+
+ fireEvent.click(getByRole('button', { name: '关闭' }));
+ expect(onClose).toHaveBeenCalledOnce();
+ expect(onOpenChange).toHaveBeenCalledExactlyOnceWith(false);
+ });
+
+ it('routes localized confirmation and cancellation actions', () => {
+ const onOk = vi.fn();
+ const onCancel = vi.fn();
+ const { getByRole } = render(
+ <ConfigProvider locale={enUS.design} mountContainer={document.body} direction="ltr">
+ <Dialog open title="Title" showOk showCancel onOk={onOk} onCancel={onCancel}>Content</Dialog>
+ </ConfigProvider>
+ );
+ fireEvent.click(getByRole('button', { name: 'ok' }));
+ fireEvent.click(getByRole('button', { name: 'cancel' }));
+ expect(onOk).toHaveBeenCalledOnce();
+ expect(onCancel).toHaveBeenCalledOnce();
+ });
+
it('keeps the dialog open for IME candidate Escape and closes after composition ends', () => {
const onOpenChange = vi.fn();
const onClose = vi.fn();
const { getByRole } = render(
- <Dialog open onOpenChange={onOpenChange} onClose={onClose}>
+ <Dialog open title="Title" onOpenChange={onOpenChange} onClose={onClose}>
<input aria-label="HEX color" />
</Dialog>
);
@@ -39,13 +90,14 @@ describe('Dialog', () => {
fireEvent.compositionEnd(input);
fireEvent.keyDown(input, { key: 'Escape', code: 'Escape' });
expect(onOpenChange).toHaveBeenCalledExactlyOnceWith(false);
- expect(onClose).toHaveBeenCalledTimes(1);
+ expect(onClose).toHaveBeenCalledOnce();
});
it.each([true, false])('keeps Escape disabled without disabling the close control (mask=%s)', (mask) => {
const onClose = vi.fn();
+ const onOpenChange = vi.fn();
const { getByRole } = render(
- <Dialog open mask={mask} keyboard={false} onClose={onClose}>
+ <Dialog open title="Title" mask={mask} keyboard={false} onClose={onClose} onOpenChange={onOpenChange}>
<input aria-label="Dialog draft" />
</Dialog>
);
@@ -56,5 +108,76 @@ describe('Dialog', () => {
expect(onClose).not.toHaveBeenCalled();
fireEvent.click(getByRole('button', { name: 'Close' }));
expect(onClose).toHaveBeenCalledOnce();
+ expect(onOpenChange).toHaveBeenCalledExactlyOnceWith(false);
+ });
+
+ it.each([
+ { mask: true, maskClosable: true, shouldClose: true },
+ { mask: true, maskClosable: false, shouldClose: false },
+ { mask: false, maskClosable: true, shouldClose: true },
+ ])('honors outside dismissal with mask=$mask and maskClosable=$maskClosable', async ({ mask, maskClosable, shouldClose }) => {
+ const onClose = vi.fn();
+ const onOpenChange = vi.fn();
+ render(<Dialog open title="Title" mask={mask} maskClosable={maskClosable} onClose={onClose} onOpenChange={onOpenChange}>Content</Dialog>);
+ await new Promise((resolve) => setTimeout(resolve, 0));
+
+ fireEvent.pointerDown(document.body, { pointerType: 'mouse', button: 0 });
+ fireEvent.pointerUp(document.body, { pointerType: 'mouse', button: 0 });
+ fireEvent.click(document.body);
+
+ if (shouldClose) {
+ expect(onClose).toHaveBeenCalledOnce();
+ expect(onOpenChange).toHaveBeenCalledExactlyOnceWith(false);
+ } else {
+ expect(onClose).not.toHaveBeenCalled();
+ expect(onOpenChange).not.toHaveBeenCalled();
+ }
+ });
+
+ it('updates its width and keeps dragging within viewport bounds', () => {
+ vi.spyOn(document.documentElement, 'clientWidth', 'get').mockReturnValue(300);
+ vi.spyOn(document.documentElement, 'clientHeight', 'get').mockReturnValue(200);
+ const { getByRole, getByText, rerender } = render(
+ <Dialog open title="Drag" width={320} draggable defaultPosition={{ x: 10, y: 10 }}>Content</Dialog>
+ );
+ const dialog = getByRole('dialog');
+ vi.spyOn(dialog, 'getBoundingClientRect').mockReturnValue({
+ width: 200,
+ height: 100,
+ top: 0,
+ left: 0,
+ right: 200,
+ bottom: 100,
+ x: 0,
+ y: 0,
+ toJSON: () => ({}),
+ });
+ expect(dialog.style.width).toBe('320px');
+ fireEvent.mouseDown(getByText('Drag'), { clientX: 10, clientY: 10 });
+ expect(document.body.style.userSelect).toBe('none');
+ fireEvent.mouseMove(document, { clientX: -100, clientY: -100 });
+ expect(dialog.style.transform).toBe('translate(0px, 0px)');
+ fireEvent.mouseMove(document, { clientX: 500, clientY: 500 });
+ expect(dialog.style.transform).toBe('translate(100px, 100px)');
+ fireEvent.mouseUp(document);
+ expect(document.body.style.userSelect).toBe('');
+
+ rerender(<Dialog open title="Drag" width="40rem" draggable>Content</Dialog>);
+ expect(dialog.style.width).toBe('40rem');
+ });
+
+ it('uses the configured portal container and text direction', () => {
+ const mountContainer = document.createElement('div');
+ document.body.appendChild(mountContainer);
+ const { getByRole, unmount } = render(
+ <ConfigProvider mountContainer={mountContainer} direction="rtl">
+ <Dialog open title="RTL title">Content</Dialog>
+ </ConfigProvider>
+ );
+ const dialog = getByRole('dialog');
+ expect(mountContainer.contains(dialog)).toBe(true);
+ expect(dialog.dir).toBe('rtl');
+ unmount();
+ mountContainer.remove();
});
});
diff --git a/packages/design/src/components/dialog/__tests__/MobileDialog.spec.tsx b/packages/design/src/components/dialog/__tests__/MobileDialog.spec.tsx
index f8124515bf..b589330e05 100644
--- a/packages/design/src/components/dialog/__tests__/MobileDialog.spec.tsx
+++ b/packages/design/src/components/dialog/__tests__/MobileDialog.spec.tsx
@@ -16,6 +16,8 @@
import { cleanup, fireEvent, render, screen } from '@testing-library/react';
import { afterEach, describe, expect, it, vi } from 'vitest';
+import enUS from '../../../locale/en-US';
+import zhCN from '../../../locale/zh-CN';
import { ConfigProvider } from '../../config-provider/ConfigProvider';
import { MobileDialog } from '../MobileDialog';
import '@testing-library/jest-dom/vitest';
@@ -34,11 +36,22 @@ describe('MobileDialog', () => {
expect(screen.getByRole('textbox')).toHaveFocus();
});
- it('closes once when the close control is pressed', () => {
+ it('closes once through the close control after the locale changes', () => {
const onClose = vi.fn();
- render(<MobileDialog open title="Print" onClose={onClose}>Preview</MobileDialog>);
- fireEvent.click(screen.getByRole('button', { name: 'Close' }));
- expect(onClose).toHaveBeenCalledTimes(1);
+ const { getByRole, rerender } = render(
+ <ConfigProvider locale={enUS.design} mountContainer={document.body} direction="ltr">
+ <MobileDialog open title="Print" onClose={onClose}>Preview</MobileDialog>
+ </ConfigProvider>
+ );
+
+ rerender(
+ <ConfigProvider locale={zhCN.design} mountContainer={document.body} direction="ltr">
+ <MobileDialog open title="Print" onClose={onClose}>Preview</MobileDialog>
+ </ConfigProvider>
+ );
+
+ fireEvent.click(getByRole('button', { name: '关闭' }));
+ expect(onClose).toHaveBeenCalledOnce();
});
it('keeps its original geometry while the keyboard viewport is visible', () => {
diff --git a/packages/design/src/components/dialog/__tests__/index.spec.tsx b/packages/design/src/components/dialog/__tests__/index.spec.tsx
deleted file mode 100644
index a3e02edd9a..0000000000
--- a/packages/design/src/components/dialog/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,162 +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 { cleanup, fireEvent, render } from '@testing-library/react';
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import enUS from '../../../locale/en-US';
-import { ConfigProvider } from '../../config-provider/ConfigProvider';
-import { Dialog } from '../Dialog';
-import { MobileDialog } from '../MobileDialog';
-import '@testing-library/jest-dom/vitest';
-
-afterEach(() => {
- cleanup();
- vi.unstubAllGlobals();
-});
-
-describe('Dialog', () => {
- it('should not render when open is false', () => {
- const { queryByText } = render(<Dialog open={false} title="Title">content</Dialog>);
- expect(queryByText('Title')).not.toBeInTheDocument();
- });
-
- it('should render with title and content', () => {
- const { getByText } = render(<Dialog open title="Test Title">Dialog Content</Dialog>);
- expect(getByText('Test Title')).toBeInTheDocument();
- expect(getByText('Dialog Content')).toBeInTheDocument();
- });
-
- it('should render custom footer', () => {
- const { getByText } = render(<Dialog open footer={<div>Custom Footer</div>}>content</Dialog>);
- expect(getByText('Custom Footer')).toBeInTheDocument();
- });
-
- it('should call onOpenChange and onClose when close button clicked', () => {
- const onOpenChange = vi.fn();
- const onClose = vi.fn();
- const { container } = render(<Dialog open title="T" onOpenChange={onOpenChange} onClose={onClose}>content</Dialog>);
- const closeBtn = container.querySelector('[data-slot="close"]') as HTMLElement;
- if (closeBtn) {
- closeBtn.click();
- expect(onOpenChange).toHaveBeenCalledWith(false);
- expect(onClose).toHaveBeenCalled();
- }
- });
-
- it('should call onOk and onCancel', () => {
- const onOk = vi.fn();
- const onCancel = vi.fn();
- const { getByText } = render(
- <ConfigProvider locale={enUS.design} mountContainer={document.body}>
- <Dialog open showOk showCancel onOk={onOk} onCancel={onCancel}>content</Dialog>
- </ConfigProvider>
- );
- getByText(enUS.design.Confirm.confirm).click();
- getByText(enUS.design.Confirm.cancel).click();
- expect(onOk).toHaveBeenCalled();
- expect(onCancel).toHaveBeenCalled();
- });
-
- it('should not close when maskClosable is false', () => {
- const onOpenChange = vi.fn();
- const { container } = render(<Dialog open maskClosable={false} onOpenChange={onOpenChange}>content</Dialog>);
- // mock the mask click event
- const mask = container.querySelector('.univer-fixed');
- if (mask) {
- mask.dispatchEvent(new MouseEvent('click', { bubbles: true }));
- expect(onOpenChange).not.toHaveBeenCalledWith(false);
- }
- });
-
- it('should apply width and draggable styles', () => {
- const { rerender } = render(
- <Dialog open title="drag" width={320} draggable>
- content
- </Dialog>
- );
-
- const content = document.querySelector('[role="dialog"]') as HTMLElement;
- expect(content.style.width).toBe('320px');
- expect(content.style.transform).toContain('translate(');
-
- const header = document.querySelector('[data-drag-handle="true"]') as HTMLElement;
- expect(header).toBeInTheDocument();
- fireEvent.mouseDown(header, { clientX: 20, clientY: 20 });
- fireEvent.mouseMove(document, { clientX: 40, clientY: 50 });
- fireEvent.mouseUp(document);
-
- rerender(
- <Dialog open title="drag" width="40rem" draggable>
- content
- </Dialog>
- );
- expect((document.querySelector('[role="dialog"]') as HTMLElement).style.width).toBe('40rem');
- });
-
- it('should honor keyboard=false and trigger open change from close button', () => {
- const onOpenChange = vi.fn();
- const onClose = vi.fn();
- render(
- <Dialog open keyboard={false} onOpenChange={onOpenChange} onClose={onClose}>
- content
- </Dialog>
- );
-
- fireEvent.keyDown(document, { key: 'Escape' });
-
- const closeBtn = (document.querySelector('.univer-sr-only') as HTMLElement | null)?.parentElement as HTMLElement | null;
- expect(closeBtn).toBeInTheDocument();
- if (!closeBtn) {
- throw new Error('Close button should exist');
- }
- closeBtn.click();
- expect(onOpenChange).toHaveBeenCalledWith(false);
- expect(onClose).toHaveBeenCalled();
- });
-
- it('should render inside the configured mount container with rtl direction', () => {
- const mountContainer = document.createElement('div');
- mountContainer.dir = 'rtl';
- document.body.appendChild(mountContainer);
-
- render(
- <ConfigProvider mountContainer={mountContainer} direction="rtl">
- <Dialog open title="RTL Title">content</Dialog>
- </ConfigProvider>
- );
-
- const dialog = mountContainer.querySelector('[role="dialog"]') as HTMLElement;
- expect(dialog).toBeInTheDocument();
- expect(dialog.dir).toBe('rtl');
-
- mountContainer.remove();
- });
-
- it('should render a touch-first bottom surface from MobileDialog', () => {
- vi.stubGlobal('CSS', { supports: () => false });
- render(
- <ConfigProvider locale={enUS.design} mountContainer={document.body}>
- <MobileDialog open title="Mobile title" showOk>content</MobileDialog>
- </ConfigProvider>
- );
-
- const dialog = document.querySelector('[role="dialog"]') as HTMLElement;
- expect(dialog).toHaveClass('!univer-bottom-0');
- expect(dialog).toHaveStyle({ bottom: '0px', position: 'fixed', width: '100%' });
- expect(dialog.style.maxHeight).toBe('80vh');
- expect(dialog.querySelector('[data-slot="dialog-footer"]')).toBeInTheDocument();
- });
-});
diff --git a/packages/design/src/components/dialog/__tests__/logic.spec.tsx b/packages/design/src/components/dialog/__tests__/logic.spec.tsx
deleted file mode 100644
index e2ee765f4d..0000000000
--- a/packages/design/src/components/dialog/__tests__/logic.spec.tsx
+++ /dev/null
@@ -1,159 +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 { cleanup, fireEvent, render, screen } from '@testing-library/react';
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import { Dialog } from '../Dialog';
-import '@testing-library/jest-dom/vitest';
-
-vi.mock('../DialogPrimitive', async () => {
- const React = await import('react');
-
- const Dialog = ({ children, open, onOpenChange, modal }: any) => (
- <div data-testid="dialog-provider" data-open={String(open)} data-modal={String(modal)}>
- <button type="button" data-testid="provider-close" onClick={() => onOpenChange?.(false)}>
- provider-close
- </button>
- {children}
- </div>
- );
-
- const DialogContent = React.forwardRef<HTMLDivElement, any>((props, ref) => {
- const { children, onEscapeKeyDown, onPointerDownOutside, onClickClose } = props;
- return (
- <div
- ref={ref}
- role="dialog"
- tabIndex={0}
- onKeyDown={(e) => onEscapeKeyDown?.(e)}
- onPointerDown={(e) => onPointerDownOutside?.(e)}
- >
- <button type="button" data-slot="close" onClick={onClickClose}>
- close
- </button>
- {children}
- </div>
- );
- });
-
- const DialogHeader = ({ children, ...props }: any) => <div {...props}>{children}</div>;
- const DialogFooter = ({ children }: any) => <div>{children}</div>;
- const DialogTitle = ({ children }: any) => <div>{children}</div>;
- const DialogDescription = ({ children }: any) => <div>{children}</div>;
-
- return {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle,
- };
-});
-
-afterEach(() => {
- vi.restoreAllMocks();
- cleanup();
-});
-
-describe('Dialog logic branches', () => {
- it('should ignore provider close when mask is false', () => {
- const onOpenChange = vi.fn();
- const onClose = vi.fn();
-
- render(
- <Dialog open mask={false} onOpenChange={onOpenChange} onClose={onClose}>
- content
- </Dialog>
- );
-
- fireEvent.click(screen.getByTestId('provider-close'));
- expect(onOpenChange).not.toHaveBeenCalled();
- expect(onClose).not.toHaveBeenCalled();
- });
-
- it('should close on escape and pointer outside when enabled', () => {
- const onOpenChange = vi.fn();
- const onClose = vi.fn();
-
- render(
- <Dialog open keyboard maskClosable onOpenChange={onOpenChange} onClose={onClose}>
- content
- </Dialog>
- );
-
- const dialog = screen.getByRole('dialog');
- fireEvent.keyDown(dialog, { key: 'Escape' });
- expect(onOpenChange).toHaveBeenCalledWith(false);
- expect(onClose).toHaveBeenCalled();
-
- onOpenChange.mockClear();
- onClose.mockClear();
-
- fireEvent.pointerDown(dialog);
- expect(onOpenChange).toHaveBeenCalledWith(false);
- expect(onClose).toHaveBeenCalled();
- });
-
- it('should not close from pointer outside when maskClosable is false', () => {
- const onOpenChange = vi.fn();
- const onClose = vi.fn();
-
- render(
- <Dialog open maskClosable={false} onOpenChange={onOpenChange} onClose={onClose}>
- content
- </Dialog>
- );
-
- fireEvent.pointerDown(screen.getByRole('dialog'));
- expect(onOpenChange).not.toHaveBeenCalledWith(false);
- expect(onClose).not.toHaveBeenCalled();
- });
-
- it('should run draggable bounds and drag lifecycle', () => {
- Object.defineProperty(document.documentElement, 'clientWidth', { value: 300, configurable: true });
- Object.defineProperty(document.documentElement, 'clientHeight', { value: 200, configurable: true });
-
- render(
- <Dialog open draggable title="drag-title">
- content
- </Dialog>
- );
-
- const dialog = screen.getByRole('dialog') as HTMLDivElement;
- dialog.getBoundingClientRect = vi.fn(() => ({
- width: 200,
- height: 100,
- top: 0,
- left: 0,
- right: 200,
- bottom: 100,
- x: 0,
- y: 0,
- toJSON: () => {},
- }));
-
- fireEvent.mouseMove(document, { clientX: 1, clientY: 1 });
- const header = screen.getByText('drag-title').parentElement as HTMLElement;
- fireEvent.mouseDown(header, { clientX: 10, clientY: 10 });
- expect(document.body.style.userSelect).toBe('none');
-
- fireEvent.mouseMove(document, { clientX: -100, clientY: -100 });
- fireEvent.mouseMove(document, { clientX: 500, clientY: 500 });
- fireEvent.mouseUp(document);
- expect(document.body.style.userSelect).toBe('');
- });
-});
diff --git a/packages/docs-ui/src/views/doc-statistics/__tests__/DocStatistics.spec.tsx b/packages/docs-ui/src/views/doc-statistics/__tests__/DocStatistics.spec.tsx
index f92365cc1c..3045c48fab 100644
--- a/packages/docs-ui/src/views/doc-statistics/__tests__/DocStatistics.spec.tsx
+++ b/packages/docs-ui/src/views/doc-statistics/__tests__/DocStatistics.spec.tsx
@@ -118,17 +118,13 @@ describe('DocStatistics', () => {
});
expect(useDocStatistics).toHaveBeenLastCalledWith(true);
- expect(document.body.textContent).toContain('Document statistics');
- expect(document.body.textContent).toContain('Pages');
- expect(document.body.textContent).toContain('Characters (no spaces)');
- expect(document.body.textContent).toContain('Asian characters and Korean words');
- expect(document.querySelector('[role="dialog"]')?.getAttribute('aria-label')).toBe('Document statistics');
+ expect(document.querySelector('[role="dialog"]')).not.toBeNull();
act(() => {
document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
});
- expect(document.body.textContent).not.toContain('Document statistics');
+ expect(document.querySelector('[role="dialog"]')).toBeNull();
expect(useDocStatistics).toHaveBeenLastCalledWith(false);
});
diff --git a/packages/docs-ui/src/views/header-footer/panel/__tests__/DocHeaderFooterFields.spec.tsx b/packages/docs-ui/src/views/header-footer/panel/__tests__/DocHeaderFooterFields.spec.tsx
index aba73521aa..a9e91380d0 100644
--- a/packages/docs-ui/src/views/header-footer/panel/__tests__/DocHeaderFooterFields.spec.tsx
+++ b/packages/docs-ui/src/views/header-footer/panel/__tests__/DocHeaderFooterFields.spec.tsx
@@ -173,7 +173,6 @@ describe('DocHeaderFooterFields', () => {
const { model, injector, editor } = await renderFields();
const trigger = document.querySelector<HTMLButtonElement>('button[data-u-comp="select"]')!;
expect(trigger.tagName).toBe('BUTTON');
- expect(trigger.getAttribute('aria-label')).toBe('Date & time');
expect(document.querySelector('[role="dialog"]')!.contains(trigger)).toBe(true);
await act(async () => {
trigger.focus();
diff --git a/packages/sheets-table-ui/src/locale/ar-SA.ts b/packages/sheets-table-ui/src/locale/ar-SA.ts
index 83c4bd8ac7..e53fd6a9a8 100644
--- a/packages/sheets-table-ui/src/locale/ar-SA.ts
+++ b/packages/sheets-table-ui/src/locale/ar-SA.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'النمط الافتراضي {0}',
+ customStyleNumber: 'النمط المخصص {0}',
+ removeCustomStyle: 'حذف النمط المخصص {0}',
calculatedColumn: 'عمود محسوب',
columnFormula: 'الصيغة',
columnFormulaHint: 'يستبدل فورًا {0} خلية بيانات دون الرأس والإجمالي. إيقاف التعبئة يحافظ على الخلايا الحالية. يمكن التراجع.',
diff --git a/packages/sheets-table-ui/src/locale/ca-ES.ts b/packages/sheets-table-ui/src/locale/ca-ES.ts
index a181f7cfc0..9f74113ca7 100644
--- a/packages/sheets-table-ui/src/locale/ca-ES.ts
+++ b/packages/sheets-table-ui/src/locale/ca-ES.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Estil predeterminat {0}',
+ customStyleNumber: 'Estil personalitzat {0}',
+ removeCustomStyle: 'Suprimeix l’estil personalitzat {0}',
calculatedColumn: 'Columna calculada',
columnFormula: 'Fórmula',
columnFormulaHint: 'Substitueix immediatament les {0} cel·les de dades, sense capçalera ni totals. Aturar conserva les cel·les existents. Es pot desfer.',
diff --git a/packages/sheets-table-ui/src/locale/de-DE.ts b/packages/sheets-table-ui/src/locale/de-DE.ts
index 06cdac32aa..a931148461 100644
--- a/packages/sheets-table-ui/src/locale/de-DE.ts
+++ b/packages/sheets-table-ui/src/locale/de-DE.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Standardstil {0}',
+ customStyleNumber: 'Benutzerdefinierter Stil {0}',
+ removeCustomStyle: 'Benutzerdefinierten Stil {0} löschen',
calculatedColumn: 'Berechnete Spalte',
columnFormula: 'Formel',
columnFormulaHint: 'Ersetzt sofort alle {0} Datenzellen ohne Kopf- und Ergebniszeile. Beim Stoppen bleiben vorhandene Zellen erhalten. Rückgängig möglich.',
diff --git a/packages/sheets-table-ui/src/locale/en-US.ts b/packages/sheets-table-ui/src/locale/en-US.ts
index f47c9d8615..d7dffe40a8 100644
--- a/packages/sheets-table-ui/src/locale/en-US.ts
+++ b/packages/sheets-table-ui/src/locale/en-US.ts
@@ -16,6 +16,9 @@
const locale = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Default style {0}',
+ customStyleNumber: 'Custom style {0}',
+ removeCustomStyle: 'Delete custom style {0}',
calculatedColumn: 'Calculated column',
columnFormula: 'Formula',
columnFormulaHint: 'Apply replaces all {0} data cells in this column immediately. Header and footer are excluded. Stop preserves existing cells. Changes can be undone.',
diff --git a/packages/sheets-table-ui/src/locale/es-ES.ts b/packages/sheets-table-ui/src/locale/es-ES.ts
index 8b01dd9c9d..a72717312b 100644
--- a/packages/sheets-table-ui/src/locale/es-ES.ts
+++ b/packages/sheets-table-ui/src/locale/es-ES.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Estilo predeterminado {0}',
+ customStyleNumber: 'Estilo personalizado {0}',
+ removeCustomStyle: 'Eliminar el estilo personalizado {0}',
calculatedColumn: 'Columna calculada',
columnFormula: 'Fórmula',
columnFormulaHint: 'Reemplaza inmediatamente las {0} celdas de datos, sin encabezado ni totales. Detener conserva las celdas existentes. Se puede deshacer.',
diff --git a/packages/sheets-table-ui/src/locale/fa-IR.ts b/packages/sheets-table-ui/src/locale/fa-IR.ts
index 63a73667b6..3811f8815c 100644
--- a/packages/sheets-table-ui/src/locale/fa-IR.ts
+++ b/packages/sheets-table-ui/src/locale/fa-IR.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'سبک پیش‌فرض {0}',
+ customStyleNumber: 'سبک سفارشی {0}',
+ removeCustomStyle: 'حذف سبک سفارشی {0}',
calculatedColumn: 'ستون محاسباتی',
columnFormula: 'فرمول',
columnFormulaHint: 'بلافاصله {0} سلول داده را بدون سربرگ و جمع جایگزین می‌کند. توقف، سلول‌های موجود را حفظ می‌کند. قابل واگرد است.',
diff --git a/packages/sheets-table-ui/src/locale/fr-FR.ts b/packages/sheets-table-ui/src/locale/fr-FR.ts
index 5e85c857a9..89063ceff5 100644
--- a/packages/sheets-table-ui/src/locale/fr-FR.ts
+++ b/packages/sheets-table-ui/src/locale/fr-FR.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Style par défaut {0}',
+ customStyleNumber: 'Style personnalisé {0}',
+ removeCustomStyle: 'Supprimer le style personnalisé {0}',
calculatedColumn: 'Colonne calculée',
columnFormula: 'Formule',
columnFormulaHint: 'Remplace immédiatement les {0} cellules de données, hors en-tête et total. Arrêter conserve les cellules existantes. Annulation possible.',
diff --git a/packages/sheets-table-ui/src/locale/id-ID.ts b/packages/sheets-table-ui/src/locale/id-ID.ts
index 7fb3eb3695..5c9f874dfe 100644
--- a/packages/sheets-table-ui/src/locale/id-ID.ts
+++ b/packages/sheets-table-ui/src/locale/id-ID.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Gaya default {0}',
+ customStyleNumber: 'Gaya kustom {0}',
+ removeCustomStyle: 'Hapus gaya kustom {0}',
calculatedColumn: 'Kolom terhitung',
columnFormula: 'Rumus',
columnFormulaHint: 'Langsung mengganti {0} sel data, kecuali header dan total. Berhenti mempertahankan sel yang ada. Perubahan dapat diurungkan.',
diff --git a/packages/sheets-table-ui/src/locale/it-IT.ts b/packages/sheets-table-ui/src/locale/it-IT.ts
index a9c6f14d55..f7c6a7059b 100644
--- a/packages/sheets-table-ui/src/locale/it-IT.ts
+++ b/packages/sheets-table-ui/src/locale/it-IT.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Stile predefinito {0}',
+ customStyleNumber: 'Stile personalizzato {0}',
+ removeCustomStyle: 'Elimina lo stile personalizzato {0}',
calculatedColumn: 'Colonna calcolata',
columnFormula: 'Formula',
columnFormulaHint: 'Sostituisce subito {0} celle dati, escluse intestazione e totali. Arrestare mantiene le celle esistenti. È possibile annullare.',
diff --git a/packages/sheets-table-ui/src/locale/ja-JP.ts b/packages/sheets-table-ui/src/locale/ja-JP.ts
index 9640ac2e8f..0c07855485 100644
--- a/packages/sheets-table-ui/src/locale/ja-JP.ts
+++ b/packages/sheets-table-ui/src/locale/ja-JP.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: '標準スタイル {0}',
+ customStyleNumber: 'カスタムスタイル {0}',
+ removeCustomStyle: 'カスタムスタイル {0} を削除',
calculatedColumn: '集計列',
columnFormula: '数式',
columnFormulaHint: '適用すると列のデータセル {0} 個を置換します。見出しと集計行は除きます。自動入力の停止は既存セルを保持します。元に戻せます。',
diff --git a/packages/sheets-table-ui/src/locale/ko-KR.ts b/packages/sheets-table-ui/src/locale/ko-KR.ts
index fdb5482ddc..2b4650f830 100644
--- a/packages/sheets-table-ui/src/locale/ko-KR.ts
+++ b/packages/sheets-table-ui/src/locale/ko-KR.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: '기본 스타일 {0}',
+ customStyleNumber: '사용자 지정 스타일 {0}',
+ removeCustomStyle: '사용자 지정 스타일 {0} 삭제',
calculatedColumn: '계산 열',
columnFormula: '수식',
columnFormulaHint: '적용하면 머리글과 합계 행을 제외한 데이터 셀 {0}개를 즉시 바꿉니다. 자동 채우기를 중지해도 기존 셀은 유지됩니다. 실행 취소할 수 있습니다.',
diff --git a/packages/sheets-table-ui/src/locale/pl-PL.ts b/packages/sheets-table-ui/src/locale/pl-PL.ts
index d3a899b5a8..c696b613eb 100644
--- a/packages/sheets-table-ui/src/locale/pl-PL.ts
+++ b/packages/sheets-table-ui/src/locale/pl-PL.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Styl domyślny {0}',
+ customStyleNumber: 'Styl niestandardowy {0}',
+ removeCustomStyle: 'Usuń styl niestandardowy {0}',
calculatedColumn: 'Kolumna obliczeniowa',
columnFormula: 'Formuła',
columnFormulaHint: 'Natychmiast zastępuje {0} komórek danych bez nagłówka i sumy. Zatrzymanie zachowuje istniejące komórki. Można cofnąć.',
diff --git a/packages/sheets-table-ui/src/locale/pt-BR.ts b/packages/sheets-table-ui/src/locale/pt-BR.ts
index 44136e81f3..f57cfb224a 100644
--- a/packages/sheets-table-ui/src/locale/pt-BR.ts
+++ b/packages/sheets-table-ui/src/locale/pt-BR.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Estilo padrão {0}',
+ customStyleNumber: 'Estilo personalizado {0}',
+ removeCustomStyle: 'Excluir estilo personalizado {0}',
calculatedColumn: 'Coluna calculada',
columnFormula: 'Fórmula',
columnFormulaHint: 'Substitui imediatamente {0} células de dados, exceto cabeçalho e totais. Parar mantém as células existentes. É possível desfazer.',
diff --git a/packages/sheets-table-ui/src/locale/ru-RU.ts b/packages/sheets-table-ui/src/locale/ru-RU.ts
index a53955a1b7..8171523364 100644
--- a/packages/sheets-table-ui/src/locale/ru-RU.ts
+++ b/packages/sheets-table-ui/src/locale/ru-RU.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Стандартный стиль {0}',
+ customStyleNumber: 'Пользовательский стиль {0}',
+ removeCustomStyle: 'Удалить пользовательский стиль {0}',
calculatedColumn: 'Вычисляемый столбец',
columnFormula: 'Формула',
columnFormulaHint: 'Сразу заменяет {0} ячеек данных без заголовка и итогов. Остановка сохраняет текущие ячейки. Действие можно отменить.',
diff --git a/packages/sheets-table-ui/src/locale/sk-SK.ts b/packages/sheets-table-ui/src/locale/sk-SK.ts
index 94d9a41f7e..419cb1d195 100644
--- a/packages/sheets-table-ui/src/locale/sk-SK.ts
+++ b/packages/sheets-table-ui/src/locale/sk-SK.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Predvolený štýl {0}',
+ customStyleNumber: 'Vlastný štýl {0}',
+ removeCustomStyle: 'Odstrániť vlastný štýl {0}',
calculatedColumn: 'Vypočítaný stĺpec',
columnFormula: 'Vzorec',
columnFormulaHint: 'Okamžite nahradí {0} dátových buniek bez hlavičky a súhrnu. Zastavenie zachová existujúce bunky. Zmenu možno vrátiť späť.',
diff --git a/packages/sheets-table-ui/src/locale/vi-VN.ts b/packages/sheets-table-ui/src/locale/vi-VN.ts
index 4cc2630276..ac13ae3553 100644
--- a/packages/sheets-table-ui/src/locale/vi-VN.ts
+++ b/packages/sheets-table-ui/src/locale/vi-VN.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: 'Kiểu mặc định {0}',
+ customStyleNumber: 'Kiểu tùy chỉnh {0}',
+ removeCustomStyle: 'Xóa kiểu tùy chỉnh {0}',
calculatedColumn: 'Cột tính toán',
columnFormula: 'Công thức',
columnFormulaHint: 'Thay ngay {0} ô dữ liệu, không gồm tiêu đề và tổng. Dừng điền tự động giữ nguyên các ô hiện có. Có thể hoàn tác.',
diff --git a/packages/sheets-table-ui/src/locale/zh-CN.ts b/packages/sheets-table-ui/src/locale/zh-CN.ts
index dad8e8b438..a45b6484e2 100644
--- a/packages/sheets-table-ui/src/locale/zh-CN.ts
+++ b/packages/sheets-table-ui/src/locale/zh-CN.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: '默认样式 {0}',
+ customStyleNumber: '自定义样式 {0}',
+ removeCustomStyle: '删除自定义样式 {0}',
calculatedColumn: '计算列',
columnFormula: '公式',
columnFormulaHint: '应用后立即覆盖此列的 {0} 个数据单元格,不包含表头和汇总行。停止自动填充会保留现有单元格。操作可撤销。',
diff --git a/packages/sheets-table-ui/src/locale/zh-HK.ts b/packages/sheets-table-ui/src/locale/zh-HK.ts
index 639beb6f25..ccce83fb4a 100644
--- a/packages/sheets-table-ui/src/locale/zh-HK.ts
+++ b/packages/sheets-table-ui/src/locale/zh-HK.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: '預設樣式 {0}',
+ customStyleNumber: '自訂樣式 {0}',
+ removeCustomStyle: '刪除自訂樣式 {0}',
calculatedColumn: '計算欄',
columnFormula: '公式',
columnFormulaHint: '套用後立即覆寫此欄的 {0} 個資料儲存格,不含標題和合計列。停止自動填入會保留現有儲存格。操作可復原。',
diff --git a/packages/sheets-table-ui/src/locale/zh-TW.ts b/packages/sheets-table-ui/src/locale/zh-TW.ts
index 639beb6f25..ccce83fb4a 100644
--- a/packages/sheets-table-ui/src/locale/zh-TW.ts
+++ b/packages/sheets-table-ui/src/locale/zh-TW.ts
@@ -18,6 +18,9 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'sheets-table-ui': {
+ defaultStyleNumber: '預設樣式 {0}',
+ customStyleNumber: '自訂樣式 {0}',
+ removeCustomStyle: '刪除自訂樣式 {0}',
calculatedColumn: '計算欄',
columnFormula: '公式',
columnFormulaHint: '套用後立即覆寫此欄的 {0} 個資料儲存格,不含標題和合計列。停止自動填入會保留現有儲存格。操作可復原。',
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableThemePanel.tsx b/packages/sheets-table-ui/src/views/components/SheetTableThemePanel.tsx
index 4253ad820e..bd11cfd5b1 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableThemePanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableThemePanel.tsx
@@ -30,7 +30,6 @@ import {
TableManager,
} from '@univerjs/sheets-table';
import { useDependency, useObservable } from '@univerjs/ui';
-import { useEffect, useState } from 'react';
import {
TABLE_BORDER_DEFAULT,
TABLE_BORDER_NONE,
@@ -71,13 +70,11 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
const rangeThemeModel = useDependency(SheetRangeThemeModel);
const sheetTableThemeUIController = useDependency(SheetTableThemeUIController);
- const rangeThemeMapChanged = useObservable(rangeThemeModel.rangeThemeMapChange$);
- const tableRefresh = useObservable(sheetTableThemeUIController.refreshTable$);
+ useObservable(rangeThemeModel.rangeThemeMapChange$);
+ useObservable(sheetTableThemeUIController.refreshTable$);
const errorService = useDependency(ErrorService);
- const [, setRefresh] = useState(Math.random);
-
const themeConfig = useObservable(tableManager.tableThemeChanged$, {
theme: table?.getTableStyleId(),
oldTheme: table?.getTableStyleId(),
@@ -142,11 +139,9 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
});
};
- useEffect(() => {
- setRefresh(Math.random());
- }, [rangeThemeMapChanged, tableRefresh]);
-
- if (!table) return null;
+ if (!table) {
+ return null;
+ }
const headerBgIsDark = new ColorKit(headerBg).isDark();
const firstRowBgIsDark = new ColorKit(firstRowBg).isDark();
@@ -223,6 +218,7 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
</h5>
<div className="univer-grid univer-grid-cols-6 univer-gap-2">
{defaultRangeThemes.map((item) => {
+ const label = localeService.t<LocaleKey>('sheets-table-ui.defaultStyleNumber', item.slice(TABLE_DEFAULT_NAME_PREFIX.length));
const rangeThemeItem = rangeThemeModel.getDefaultRangeThemeStyle(item);
const rowBackgrounds = [
rangeThemeItem?.getHeaderRowStyle()?.bg?.rgb || TABLE_DEFAULT_BG_COLOR,
@@ -236,8 +232,8 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
<button
key={item}
type="button"
- title={item}
- aria-label={item}
+ title={label}
+ aria-label={label}
aria-pressed={selected}
className={clsx(`
univer-flex univer-h-12 univer-w-full univer-cursor-pointer univer-flex-col
@@ -300,6 +296,8 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
<IncreaseIcon className="univer-size-4" />
</button>
{customRangeThemes.map((item) => {
+ const styleNumber = item.slice(TABLE_CUSTOM_NAME_PREFIX.length);
+ const label = localeService.t<LocaleKey>('sheets-table-ui.customStyleNumber', styleNumber);
const rangeThemeItem = rangeThemeModel.getCustomRangeThemeStyle(unitId, item);
const rowBackgrounds = [
rangeThemeItem?.getHeaderRowStyle()?.bg?.rgb,
@@ -313,8 +311,8 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
<div key={item} className="univer-group univer-relative univer-h-12 univer-min-w-0">
<button
type="button"
- title={item}
- aria-label={item}
+ title={label}
+ aria-label={label}
aria-pressed={selected}
className={clsx(`
univer-flex univer-size-full univer-cursor-pointer univer-flex-col
@@ -342,7 +340,7 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
<button
type="button"
data-u-comp="sheet-table-theme-remove"
- aria-label={`${localeService.t<LocaleKey>('sheets-table-ui.customStyle')} ${item}`}
+ aria-label={localeService.t<LocaleKey>('sheets-table-ui.removeCustomStyle', styleNumber)}
className={clsx(`
univer-absolute univer-right-[-6px] univer-top-[-6px] univer-z-10 univer-flex
univer-size-5 univer-cursor-pointer univer-items-center univer-justify-center
diff --git a/packages/sheets-thread-comment-ui/src/views/__tests__/SheetsThreadCommentPanel.spec.tsx b/packages/sheets-thread-comment-ui/src/views/__tests__/SheetsThreadCommentPanel.spec.tsx
index 101d701190..17779791ba 100644
--- a/packages/sheets-thread-comment-ui/src/views/__tests__/SheetsThreadCommentPanel.spec.tsx
+++ b/packages/sheets-thread-comment-ui/src/views/__tests__/SheetsThreadCommentPanel.spec.tsx
@@ -561,15 +561,6 @@ function dispatchMouseEvent(element: Element, type: string) {
});
}
-function getRootDeleteAction(panelItem: Element) {
- const header = panelItem.firstElementChild;
- const controls = header?.lastElementChild;
- const action = controls?.lastElementChild;
- expect(action).toBeInstanceOf(HTMLElement);
-
- return action as HTMLElement;
-}
-
function waitForTreeRefresh() {
return new Promise((resolve) => setTimeout(resolve, 40));
}
@@ -1005,8 +996,11 @@ describe('SheetsThreadCommentPanel', () => {
dispatchMouseEvent(panelThread!, 'mouseover');
expect(TestState.shapes).toHaveLength(1);
+ const deleteButton = panelThread!.querySelector<HTMLButtonElement>(
+ `button[aria-label="${threadCommentEnUS['thread-comment-ui'].item.delete}"]`
+ )!;
await act(async () => {
- getRootDeleteAction(panelThread!).dispatchEvent(new MouseEvent('click', { bubbles: true }));
+ deleteButton.click();
await waitForTreeRefresh();
});
diff --git a/packages/sheets-ui/src/locale/ar-SA.ts b/packages/sheets-ui/src/locale/ar-SA.ts
index ae7d5fbfbb..ade2c677e7 100644
--- a/packages/sheets-ui/src/locale/ar-SA.ts
+++ b/packages/sheets-ui/src/locale/ar-SA.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'موافق',
cancel: 'إلغاء',
},
+ borderStyle: {
+ thin: 'رفيع',
+ hair: 'رفيع جدًا',
+ dotted: 'منقّط',
+ dashed: 'متقطّع',
+ dashDot: 'شرطة ونقطة',
+ dashDotDot: 'شرطة ونقطتان',
+ medium: 'متوسط',
+ mediumDashed: 'متقطّع متوسط',
+ mediumDashDot: 'شرطة ونقطة متوسط',
+ mediumDashDotDot: 'شرطة ونقطتان متوسط',
+ thick: 'سميك',
+ double: 'مزدوج',
+ },
borderLine: {
borderTop: 'الحد العلوي',
borderBottom: 'الحد السفلي',
diff --git a/packages/sheets-ui/src/locale/ca-ES.ts b/packages/sheets-ui/src/locale/ca-ES.ts
index 92e8120a1c..8359d9f962 100644
--- a/packages/sheets-ui/src/locale/ca-ES.ts
+++ b/packages/sheets-ui/src/locale/ca-ES.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'D\'acord',
cancel: 'Cancel·lar',
},
+ borderStyle: {
+ thin: 'Fi',
+ hair: 'Molt fi',
+ dotted: 'Puntejat',
+ dashed: 'Discontinu',
+ dashDot: 'Guió i punt',
+ dashDotDot: 'Guió i dos punts',
+ medium: 'Mitjà',
+ mediumDashed: 'Discontinu mitjà',
+ mediumDashDot: 'Guió i punt mitjà',
+ mediumDashDotDot: 'Guió i dos punts mitjà',
+ thick: 'Gruixut',
+ double: 'Doble',
+ },
borderLine: {
borderTop: 'voraSuperior',
borderBottom: 'voraInferior',
diff --git a/packages/sheets-ui/src/locale/de-DE.ts b/packages/sheets-ui/src/locale/de-DE.ts
index a2869bbfc6..0ea5c28a04 100644
--- a/packages/sheets-ui/src/locale/de-DE.ts
+++ b/packages/sheets-ui/src/locale/de-DE.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'OK',
cancel: 'Abbrechen',
},
+ borderStyle: {
+ thin: 'Dünn',
+ hair: 'Haarlinie',
+ dotted: 'Gepunktet',
+ dashed: 'Gestrichelt',
+ dashDot: 'Strich-Punkt',
+ dashDotDot: 'Strich-Punkt-Punkt',
+ medium: 'Mittel',
+ mediumDashed: 'Mittel gestrichelt',
+ mediumDashDot: 'Mittel Strich-Punkt',
+ mediumDashDotDot: 'Mittel Strich-Punkt-Punkt',
+ thick: 'Dick',
+ double: 'Doppelt',
+ },
borderLine: {
borderTop: 'Rahmen oben',
borderBottom: 'Rahmen unten',
diff --git a/packages/sheets-ui/src/locale/en-US.ts b/packages/sheets-ui/src/locale/en-US.ts
index c4e3f41445..78d44a3448 100644
--- a/packages/sheets-ui/src/locale/en-US.ts
+++ b/packages/sheets-ui/src/locale/en-US.ts
@@ -68,6 +68,20 @@ const locale = {
confirm: 'OK',
cancel: 'Cancel',
},
+ borderStyle: {
+ thin: 'Thin',
+ hair: 'Hairline',
+ dotted: 'Dotted',
+ dashed: 'Dashed',
+ dashDot: 'Dash-dot',
+ dashDotDot: 'Dash-dot-dot',
+ medium: 'Medium',
+ mediumDashed: 'Medium dashed',
+ mediumDashDot: 'Medium dash-dot',
+ mediumDashDotDot: 'Medium dash-dot-dot',
+ thick: 'Thick',
+ double: 'Double',
+ },
borderLine: {
borderTop: 'borderTop',
borderBottom: 'borderBottom',
diff --git a/packages/sheets-ui/src/locale/es-ES.ts b/packages/sheets-ui/src/locale/es-ES.ts
index 17edf3313d..6a13a7f11b 100644
--- a/packages/sheets-ui/src/locale/es-ES.ts
+++ b/packages/sheets-ui/src/locale/es-ES.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'Aceptar',
cancel: 'Cancelar',
},
+ borderStyle: {
+ thin: 'Fino',
+ hair: 'Muy fino',
+ dotted: 'Punteado',
+ dashed: 'Discontinuo',
+ dashDot: 'Guion y punto',
+ dashDotDot: 'Guion y dos puntos',
+ medium: 'Medio',
+ mediumDashed: 'Discontinuo medio',
+ mediumDashDot: 'Guion y punto medio',
+ mediumDashDotDot: 'Guion y dos puntos medio',
+ thick: 'Grueso',
+ double: 'Doble',
+ },
borderLine: {
borderTop: 'bordeSuperior',
borderBottom: 'bordeInferior',
diff --git a/packages/sheets-ui/src/locale/fa-IR.ts b/packages/sheets-ui/src/locale/fa-IR.ts
index c3ba961990..29d4269db5 100644
--- a/packages/sheets-ui/src/locale/fa-IR.ts
+++ b/packages/sheets-ui/src/locale/fa-IR.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'تایید',
cancel: 'انصراف',
},
+ borderStyle: {
+ thin: 'نازک',
+ hair: 'بسیار نازک',
+ dotted: 'نقطه‌چین',
+ dashed: 'خط‌چین',
+ dashDot: 'خط و نقطه',
+ dashDotDot: 'خط و دو نقطه',
+ medium: 'متوسط',
+ mediumDashed: 'خط‌چین متوسط',
+ mediumDashDot: 'خط و نقطه متوسط',
+ mediumDashDotDot: 'خط و دو نقطه متوسط',
+ thick: 'ضخیم',
+ double: 'دوتایی',
+ },
borderLine: {
borderTop: 'خط بالای قاب',
borderBottom: 'خط پایینی قاب',
diff --git a/packages/sheets-ui/src/locale/fr-FR.ts b/packages/sheets-ui/src/locale/fr-FR.ts
index aa416ffb7e..ae4e103104 100644
--- a/packages/sheets-ui/src/locale/fr-FR.ts
+++ b/packages/sheets-ui/src/locale/fr-FR.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'OK',
cancel: 'Annuler',
},
+ borderStyle: {
+ thin: 'Fin',
+ hair: 'Très fin',
+ dotted: 'Pointillé',
+ dashed: 'Tirets',
+ dashDot: 'Tiret-point',
+ dashDotDot: 'Tiret-point-point',
+ medium: 'Moyen',
+ mediumDashed: 'Tirets moyens',
+ mediumDashDot: 'Tiret-point moyen',
+ mediumDashDotDot: 'Tiret-point-point moyen',
+ thick: 'Épais',
+ double: 'Double',
+ },
borderLine: {
borderTop: 'bordureHaut',
borderBottom: 'bordureBas',
diff --git a/packages/sheets-ui/src/locale/id-ID.ts b/packages/sheets-ui/src/locale/id-ID.ts
index caf9c53d6e..6374734fcb 100644
--- a/packages/sheets-ui/src/locale/id-ID.ts
+++ b/packages/sheets-ui/src/locale/id-ID.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'OK',
cancel: 'Batal',
},
+ borderStyle: {
+ thin: 'Tipis',
+ hair: 'Sangat tipis',
+ dotted: 'Titik-titik',
+ dashed: 'Putus-putus',
+ dashDot: 'Garis-titik',
+ dashDotDot: 'Garis-dua titik',
+ medium: 'Sedang',
+ mediumDashed: 'Putus-putus sedang',
+ mediumDashDot: 'Garis-titik sedang',
+ mediumDashDotDot: 'Garis-dua titik sedang',
+ thick: 'Tebal',
+ double: 'Ganda',
+ },
borderLine: {
borderTop: 'Batas atas',
borderBottom: 'Batas bawah',
diff --git a/packages/sheets-ui/src/locale/it-IT.ts b/packages/sheets-ui/src/locale/it-IT.ts
index 91e3ad9dca..3b36aea841 100644
--- a/packages/sheets-ui/src/locale/it-IT.ts
+++ b/packages/sheets-ui/src/locale/it-IT.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'OK',
cancel: 'Annulla',
},
+ borderStyle: {
+ thin: 'Sottile',
+ hair: 'Sottilissimo',
+ dotted: 'Punteggiato',
+ dashed: 'Tratteggiato',
+ dashDot: 'Tratto-punto',
+ dashDotDot: 'Tratto-punto-punto',
+ medium: 'Medio',
+ mediumDashed: 'Tratteggiato medio',
+ mediumDashDot: 'Tratto-punto medio',
+ mediumDashDotDot: 'Tratto-punto-punto medio',
+ thick: 'Spesso',
+ double: 'Doppio',
+ },
borderLine: {
borderTop: 'bordoSuperiore',
borderBottom: 'bordoInferiore',
diff --git a/packages/sheets-ui/src/locale/ja-JP.ts b/packages/sheets-ui/src/locale/ja-JP.ts
index 11a27a0c93..52e290cc33 100644
--- a/packages/sheets-ui/src/locale/ja-JP.ts
+++ b/packages/sheets-ui/src/locale/ja-JP.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: '確認',
cancel: 'キャンセル',
},
+ borderStyle: {
+ thin: '細線',
+ hair: '極細線',
+ dotted: '点線',
+ dashed: '破線',
+ dashDot: '一点鎖線',
+ dashDotDot: '二点鎖線',
+ medium: '中太線',
+ mediumDashed: '中太の破線',
+ mediumDashDot: '中太の一点鎖線',
+ mediumDashDotDot: '中太の二点鎖線',
+ thick: '太線',
+ double: '二重線',
+ },
borderLine: {
borderTop: '上',
borderBottom: '下',
diff --git a/packages/sheets-ui/src/locale/ko-KR.ts b/packages/sheets-ui/src/locale/ko-KR.ts
index 8830ce4daf..5e9d200de0 100644
--- a/packages/sheets-ui/src/locale/ko-KR.ts
+++ b/packages/sheets-ui/src/locale/ko-KR.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: '확인',
cancel: '취소',
},
+ borderStyle: {
+ thin: '가는 실선',
+ hair: '매우 가는 선',
+ dotted: '점선',
+ dashed: '파선',
+ dashDot: '일점쇄선',
+ dashDotDot: '이점쇄선',
+ medium: '중간 실선',
+ mediumDashed: '중간 파선',
+ mediumDashDot: '중간 일점쇄선',
+ mediumDashDotDot: '중간 이점쇄선',
+ thick: '굵은 실선',
+ double: '이중선',
+ },
borderLine: {
borderTop: '위쪽',
borderBottom: '아래쪽',
diff --git a/packages/sheets-ui/src/locale/pl-PL.ts b/packages/sheets-ui/src/locale/pl-PL.ts
index 63b1e42ad8..ec9fd4ca75 100644
--- a/packages/sheets-ui/src/locale/pl-PL.ts
+++ b/packages/sheets-ui/src/locale/pl-PL.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'OK',
cancel: 'Anuluj',
},
+ borderStyle: {
+ thin: 'Cienka',
+ hair: 'Bardzo cienka',
+ dotted: 'Kropkowana',
+ dashed: 'Kreskowana',
+ dashDot: 'Kreska-kropka',
+ dashDotDot: 'Kreska-kropka-kropka',
+ medium: 'Średnia',
+ mediumDashed: 'Średnia kreskowana',
+ mediumDashDot: 'Średnia kreska-kropka',
+ mediumDashDotDot: 'Średnia kreska-kropka-kropka',
+ thick: 'Gruba',
+ double: 'Podwójna',
+ },
borderLine: {
borderTop: 'Góra',
borderBottom: 'Dół',
diff --git a/packages/sheets-ui/src/locale/pt-BR.ts b/packages/sheets-ui/src/locale/pt-BR.ts
index b95a36e6e2..8875718059 100644
--- a/packages/sheets-ui/src/locale/pt-BR.ts
+++ b/packages/sheets-ui/src/locale/pt-BR.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'OK',
cancel: 'Cancelar',
},
+ borderStyle: {
+ thin: 'Fina',
+ hair: 'Muito fina',
+ dotted: 'Pontilhada',
+ dashed: 'Tracejada',
+ dashDot: 'Traço e ponto',
+ dashDotDot: 'Traço e dois pontos',
+ medium: 'Média',
+ mediumDashed: 'Tracejada média',
+ mediumDashDot: 'Traço e ponto médio',
+ mediumDashDotDot: 'Traço e dois pontos médio',
+ thick: 'Grossa',
+ double: 'Dupla',
+ },
borderLine: {
borderTop: 'borda superior',
borderBottom: 'borda inferior',
diff --git a/packages/sheets-ui/src/locale/ru-RU.ts b/packages/sheets-ui/src/locale/ru-RU.ts
index 779caf926e..232dbc3e11 100644
--- a/packages/sheets-ui/src/locale/ru-RU.ts
+++ b/packages/sheets-ui/src/locale/ru-RU.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'ОК',
cancel: 'Отмена',
},
+ borderStyle: {
+ thin: 'Тонкая',
+ hair: 'Волосяная',
+ dotted: 'Точечная',
+ dashed: 'Штриховая',
+ dashDot: 'Штрихпунктирная',
+ dashDotDot: 'Штрихпунктирная с двумя точками',
+ medium: 'Средняя',
+ mediumDashed: 'Средняя штриховая',
+ mediumDashDot: 'Средняя штрихпунктирная',
+ mediumDashDotDot: 'Средняя штрихпунктирная с двумя точками',
+ thick: 'Толстая',
+ double: 'Двойная',
+ },
borderLine: {
borderTop: 'верхняя граница',
borderBottom: 'нижняя граница',
diff --git a/packages/sheets-ui/src/locale/sk-SK.ts b/packages/sheets-ui/src/locale/sk-SK.ts
index 9c4c50793b..2d72dfc0d4 100644
--- a/packages/sheets-ui/src/locale/sk-SK.ts
+++ b/packages/sheets-ui/src/locale/sk-SK.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'OK',
cancel: 'Zrušiť',
},
+ borderStyle: {
+ thin: 'Tenká',
+ hair: 'Vlasová',
+ dotted: 'Bodkovaná',
+ dashed: 'Čiarkovaná',
+ dashDot: 'Bodkočiarkovaná',
+ dashDotDot: 'Dvojbodkočiarkovaná',
+ medium: 'Stredná',
+ mediumDashed: 'Stredná čiarkovaná',
+ mediumDashDot: 'Stredná bodkočiarkovaná',
+ mediumDashDotDot: 'Stredná dvojbodkočiarkovaná',
+ thick: 'Hrubá',
+ double: 'Dvojitá',
+ },
borderLine: {
borderTop: 'hornéOhraničenie',
borderBottom: 'dolnéOhraničenie',
diff --git a/packages/sheets-ui/src/locale/vi-VN.ts b/packages/sheets-ui/src/locale/vi-VN.ts
index 6ea51c9578..7920c6ba12 100644
--- a/packages/sheets-ui/src/locale/vi-VN.ts
+++ b/packages/sheets-ui/src/locale/vi-VN.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: 'Xác nhận',
cancel: 'Hủy',
},
+ borderStyle: {
+ thin: 'Nét mảnh',
+ hair: 'Nét cực mảnh',
+ dotted: 'Nét chấm',
+ dashed: 'Nét đứt',
+ dashDot: 'Gạch chấm',
+ dashDotDot: 'Gạch hai chấm',
+ medium: 'Nét vừa',
+ mediumDashed: 'Nét đứt vừa',
+ mediumDashDot: 'Gạch chấm vừa',
+ mediumDashDotDot: 'Gạch hai chấm vừa',
+ thick: 'Nét đậm',
+ double: 'Nét đôi',
+ },
borderLine: {
borderTop: 'Viền trên',
borderBottom: 'Viền dưới',
diff --git a/packages/sheets-ui/src/locale/zh-CN.ts b/packages/sheets-ui/src/locale/zh-CN.ts
index c1932a70fa..e8089bd355 100644
--- a/packages/sheets-ui/src/locale/zh-CN.ts
+++ b/packages/sheets-ui/src/locale/zh-CN.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: '确定',
cancel: '取消',
},
+ borderStyle: {
+ thin: '细实线',
+ hair: '极细线',
+ dotted: '点线',
+ dashed: '虚线',
+ dashDot: '点划线',
+ dashDotDot: '双点划线',
+ medium: '中等实线',
+ mediumDashed: '中等虚线',
+ mediumDashDot: '中等点划线',
+ mediumDashDotDot: '中等双点划线',
+ thick: '粗实线',
+ double: '双线',
+ },
borderLine: {
borderTop: '上框线',
borderBottom: '下框线',
diff --git a/packages/sheets-ui/src/locale/zh-HK.ts b/packages/sheets-ui/src/locale/zh-HK.ts
index 430a42a2cb..9faab82944 100644
--- a/packages/sheets-ui/src/locale/zh-HK.ts
+++ b/packages/sheets-ui/src/locale/zh-HK.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: '確定',
cancel: '取消',
},
+ borderStyle: {
+ thin: '細實線',
+ hair: '極細線',
+ dotted: '點線',
+ dashed: '虛線',
+ dashDot: '點劃線',
+ dashDotDot: '雙點劃線',
+ medium: '中等實線',
+ mediumDashed: '中等虛線',
+ mediumDashDot: '中等點劃線',
+ mediumDashDotDot: '中等雙點劃線',
+ thick: '粗實線',
+ double: '雙線',
+ },
borderLine: {
borderTop: '上框線',
borderBottom: '下框線',
diff --git a/packages/sheets-ui/src/locale/zh-TW.ts b/packages/sheets-ui/src/locale/zh-TW.ts
index 70423d430e..332222b26a 100644
--- a/packages/sheets-ui/src/locale/zh-TW.ts
+++ b/packages/sheets-ui/src/locale/zh-TW.ts
@@ -70,6 +70,20 @@ const locale: typeof enUS = {
confirm: '確定',
cancel: '取消',
},
+ borderStyle: {
+ thin: '細實線',
+ hair: '極細線',
+ dotted: '點線',
+ dashed: '虛線',
+ dashDot: '點劃線',
+ dashDotDot: '雙點劃線',
+ medium: '中等實線',
+ mediumDashed: '中等虛線',
+ mediumDashDot: '中等點劃線',
+ mediumDashDotDot: '中等雙點劃線',
+ thick: '粗實線',
+ double: '雙線',
+ },
borderLine: {
borderTop: '上框線',
borderBottom: '下框線',
diff --git a/packages/sheets-ui/src/views/border-panel/BorderPanel.tsx b/packages/sheets-ui/src/views/border-panel/BorderPanel.tsx
index 99a4d8e201..b69fcc1e54 100644
--- a/packages/sheets-ui/src/views/border-panel/BorderPanel.tsx
+++ b/packages/sheets-ui/src/views/border-panel/BorderPanel.tsx
@@ -16,14 +16,14 @@
import type { IBorderData, Nullable } from '@univerjs/core';
import type { IBorderInfo } from '@univerjs/sheets';
+import type { LocaleKey } from '../../locale/types';
import type { IBorderPanelProps } from './interface';
-import { BorderStyleTypes } from '@univerjs/core';
+import { LocaleService } from '@univerjs/core';
import { clsx, ColorPicker, ConfigContext, Dropdown, Separator } from '@univerjs/design';
import { MoreDownIcon, PaintBucketDoubleIcon } from '@univerjs/icons';
import { SheetsSelectionsService } from '@univerjs/sheets';
import { IconManager, useDependency } from '@univerjs/ui';
import { useContext } from 'react';
-
import { BorderLine } from './border-line/BorderLine';
import { BORDER_LINE_CHILDREN, BORDER_SIZE_CHILDREN } from './interface';
@@ -33,6 +33,7 @@ export interface IResponsiveBorderPanelProps extends IBorderPanelProps {
}
export function BorderPanel(props: IResponsiveBorderPanelProps) {
+ const localeService = useDependency(LocaleService);
const iconManager = useDependency(IconManager);
const selectionManagerService = useDependency(SheetsSelectionsService);
const { direction } = useContext(ConfigContext);
@@ -43,10 +44,14 @@ export function BorderPanel(props: IResponsiveBorderPanelProps) {
const { onChange, value, ColorPickerComponent = ColorPicker, DropdownComponent = Dropdown } = props;
function getBorderColor(borderData: Nullable<IBorderData>): string | undefined {
- if (!borderData) return;
+ if (!borderData) {
+ return;
+ }
for (const key in borderData) {
const border = borderData[key as keyof IBorderData];
- if (border?.cl?.rgb) return border.cl.rgb;
+ if (border?.cl?.rgb) {
+ return border.cl.rgb;
+ }
}
}
@@ -133,7 +138,7 @@ export function BorderPanel(props: IResponsiveBorderPanelProps) {
<li key={item.value}>
<button
type="button"
- aria-label={BorderStyleTypes[item.value]}
+ aria-label={localeService.t<LocaleKey>(item.label)}
aria-pressed={item.value === value.style}
className={clsx(`
univer-flex univer-w-full univer-cursor-pointer univer-items-center
diff --git a/packages/sheets-ui/src/views/border-panel/__tests__/BorderPanel.spec.tsx b/packages/sheets-ui/src/views/border-panel/__tests__/BorderPanel.spec.tsx
index 349c197e52..8f2bf0f660 100644
--- a/packages/sheets-ui/src/views/border-panel/__tests__/BorderPanel.spec.tsx
+++ b/packages/sheets-ui/src/views/border-panel/__tests__/BorderPanel.spec.tsx
@@ -16,7 +16,7 @@
import type { IBorderInfo } from '@univerjs/sheets';
import type { Root } from 'react-dom/client';
-import { BorderStyleTypes, BorderType, Univer } from '@univerjs/core';
+import { BorderStyleTypes, BorderType, LocaleService, LocaleType, Univer } from '@univerjs/core';
import { ConfigProvider } from '@univerjs/design';
import * as icons from '@univerjs/icons';
import { SheetsSelectionsService } from '@univerjs/sheets';
@@ -24,31 +24,22 @@ import { IconManager, RediContext } from '@univerjs/ui';
import { act } from 'react';
import { createRoot } from 'react-dom/client';
import { describe, expect, it, onTestFinished } from 'vitest';
-
+import arSA from '../../../locale/ar-SA';
+import enUS from '../../../locale/en-US';
import { BorderPanel } from '../BorderPanel';
(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
-class TestSheetsSelectionsService {
- getCellStylesProperty() {
- return {
- isAllValuesSame: true,
- value: {
- t: {
- s: BorderStyleTypes.THIN,
- cl: { rgb: '#123456' },
- },
- },
- };
- }
-}
-
-function renderPanel(value: IBorderInfo, direction: 'ltr' | 'rtl' = 'ltr') {
+function renderPanel(value: IBorderInfo, direction: 'ltr' | 'rtl' = 'ltr', locale = LocaleType.EN_US) {
const univer = new Univer();
const injector = univer.__getInjector();
injector.add([IconManager]);
- injector.add([SheetsSelectionsService, { useClass: TestSheetsSelectionsService as never }]);
+ injector.add([SheetsSelectionsService]);
injector.get(IconManager).register(icons);
+ const localeService = injector.get(LocaleService);
+ localeService.load({ [LocaleType.EN_US]: enUS, [LocaleType.AR_SA]: arSA });
+ localeService.setLocale(locale);
+ localeService.setDirection(direction);
const container = document.createElement('div');
document.body.appendChild(container);
@@ -105,13 +96,16 @@ describe('BorderPanel', () => {
]);
});
- it.each(['ltr', 'rtl'] as const)('keeps the line preview and selected option in sync in %s', async (direction) => {
+ it.each([
+ { direction: 'ltr', locale: LocaleType.EN_US },
+ { direction: 'rtl', locale: LocaleType.AR_SA },
+ ] as const)('keeps the selected border style and preview in sync in $direction', async ({ direction, locale }) => {
const rendered = renderPanel({
type: BorderType.ALL,
color: '#123456',
style: BorderStyleTypes.DOTTED,
activeBorderType: true,
- }, direction);
+ }, direction, locale);
expect(rendered.container.querySelector('section')?.getAttribute('dir')).toBe(direction);
const trigger = rendered.container.querySelectorAll('button')[1];
diff --git a/packages/sheets-ui/src/views/border-panel/interface.ts b/packages/sheets-ui/src/views/border-panel/interface.ts
index 5d215a026b..3a62c860f8 100644
--- a/packages/sheets-ui/src/views/border-panel/interface.ts
+++ b/packages/sheets-ui/src/views/border-panel/interface.ts
@@ -105,51 +105,51 @@ export const BORDER_LINE_CHILDREN = [
export const BORDER_SIZE_CHILDREN = [
{
- label: BorderStyleTypes.THIN,
+ label: 'sheets-ui.borderStyle.thin',
value: BorderStyleTypes.THIN,
},
{
- label: BorderStyleTypes.HAIR,
+ label: 'sheets-ui.borderStyle.hair',
value: BorderStyleTypes.HAIR,
},
{
- label: BorderStyleTypes.DOTTED,
+ label: 'sheets-ui.borderStyle.dotted',
value: BorderStyleTypes.DOTTED,
},
{
- label: BorderStyleTypes.DASHED,
+ label: 'sheets-ui.borderStyle.dashed',
value: BorderStyleTypes.DASHED,
},
{
- label: BorderStyleTypes.DASH_DOT,
+ label: 'sheets-ui.borderStyle.dashDot',
value: BorderStyleTypes.DASH_DOT,
},
{
- label: BorderStyleTypes.DASH_DOT_DOT,
+ label: 'sheets-ui.borderStyle.dashDotDot',
value: BorderStyleTypes.DASH_DOT_DOT,
},
{
- label: BorderStyleTypes.MEDIUM,
+ label: 'sheets-ui.borderStyle.medium',
value: BorderStyleTypes.MEDIUM,
},
{
- label: BorderStyleTypes.MEDIUM_DASHED,
+ label: 'sheets-ui.borderStyle.mediumDashed',
value: BorderStyleTypes.MEDIUM_DASHED,
},
{
- label: BorderStyleTypes.MEDIUM_DASH_DOT,
+ label: 'sheets-ui.borderStyle.mediumDashDot',
value: BorderStyleTypes.MEDIUM_DASH_DOT,
},
{
- label: BorderStyleTypes.MEDIUM_DASH_DOT_DOT,
+ label: 'sheets-ui.borderStyle.mediumDashDotDot',
value: BorderStyleTypes.MEDIUM_DASH_DOT_DOT,
},
{
- label: BorderStyleTypes.THICK,
+ label: 'sheets-ui.borderStyle.thick',
value: BorderStyleTypes.THICK,
},
{
- label: BorderStyleTypes.DOUBLE,
+ label: 'sheets-ui.borderStyle.double',
value: BorderStyleTypes.DOUBLE,
},
-];
+] satisfies Array<{ label: LocaleKey; value: BorderStyleTypes }>;
diff --git a/packages/sheets-ui/src/views/mobile/action-panel/MobileStylePanel.tsx b/packages/sheets-ui/src/views/mobile/action-panel/MobileStylePanel.tsx
index 79eb4dd60f..f6dfa502fd 100644
--- a/packages/sheets-ui/src/views/mobile/action-panel/MobileStylePanel.tsx
+++ b/packages/sheets-ui/src/views/mobile/action-panel/MobileStylePanel.tsx
@@ -15,10 +15,25 @@
*/
import type { IBorderInfo } from '@univerjs/sheets';
-import type { IDisplayMenuItem, IFontConfig, IMenuItem, IMenuSchema, IMenuSelectorItem, IValueOption, MenuItemDefaultValueType } from '@univerjs/ui';
+import type {
+ IDisplayMenuItem,
+ IFontConfig,
+ IMenuItem,
+ IMenuSchema,
+ IMenuSelectorItem,
+ IValueOption,
+ MenuItemDefaultValueType,
+} from '@univerjs/ui';
import type { LocaleKey } from '../../../locale/types';
import { BorderStyleTypes, BorderType, LocaleService, ThemeService } from '@univerjs/core';
-import { borderBottomClassName, clsx, ColorPickerPanel, MobileActionRow, MobileColorPresets, resetButtonClassName } from '@univerjs/design';
+import {
+ borderBottomClassName,
+ clsx,
+ ColorPickerPanel,
+ MobileActionRow,
+ MobileColorPresets,
+ resetButtonClassName,
+} from '@univerjs/design';
import { CheckMarkIcon, MoreDownIcon, MoreRightIcon, NoColorDoubleIcon } from '@univerjs/icons';
import {
AddWorksheetMergeCommand,
@@ -290,7 +305,9 @@ function MobileStyleRoot(props: {
<div className="univer-grid univer-gap-3">
{groups.map((group) => {
const items = group.children?.filter(hasMenuItem) ?? [];
- if (items.length === 0) return null;
+ if (items.length === 0) {
+ return null;
+ }
const textStyleItems = items.filter((schema) => TEXT_STYLE_COMMANDS.has(schema.item.id));
const inlineSelectorItems = items
.filter(isMobileSelectorSchema)
@@ -407,7 +424,9 @@ function MobileRotationNavigation(props: {
const title = typeof titleKey === 'string' ? localeService.t(titleKey) : schema.key;
const value = selected ? getOptionLabel(localeService, selected) : undefined;
- if (status.hidden) return null;
+ if (status.hidden) {
+ return null;
+ }
return (
<div
@@ -439,7 +458,9 @@ function MobileMergeGroup(props: {
const title = typeof titleKey === 'string' ? localeService.t(titleKey) : schema.key;
const children = schema.children?.filter(hasMenuItem) ?? [];
- if (status.hidden || children.length === 0) return null;
+ if (status.hidden || children.length === 0) {
+ return null;
+ }
return (
<section className="univer-grid univer-gap-2">
@@ -478,7 +499,9 @@ function MobileMergeOption(props: {
const titleKey = item.title ?? item.tooltip;
const title = typeof titleKey === 'string' ? localeService.t(titleKey) : schema.key;
- if (status.hidden) return null;
+ if (status.hidden) {
+ return null;
+ }
return (
<button
@@ -512,7 +535,9 @@ function MobileNumberFormatGroup(props: {
const localeService = useDependency(LocaleService);
const status = useToolbarItemStatus(item);
- if (status.hidden) return null;
+ if (status.hidden) {
+ return null;
+ }
return (
<section className="univer-grid univer-gap-2">
@@ -607,7 +632,9 @@ function MobileNumberFormatTab(props: {
const title = option.label ? localeService.t(option.label) : '';
const selected = title === currentValue;
- if (status.hidden) return null;
+ if (status.hidden) {
+ return null;
+ }
return (
<button
@@ -742,7 +769,9 @@ function MobileTextStyleItem(props: {
const Icon = iconName ? iconManager.get(iconName) : null;
const titleKey = item.title ?? item.tooltip;
const title = typeof titleKey === 'string' ? localeService.t(titleKey) : schema.key;
- if (status.hidden) return null;
+ if (status.hidden) {
+ return null;
+ }
return (
<button
@@ -779,7 +808,9 @@ function MobileInlineSelector(props: { schema: SelectorMenuSchema; onExecute: (p
? selections[selections.length - 1]?.value
: selections[0]?.value);
- if (status.hidden || selections.length === 0) return null;
+ if (status.hidden || selections.length === 0) {
+ return null;
+ }
return (
<div
@@ -860,7 +891,9 @@ function MobileStyleNavigationItem(props: {
const title = typeof titleKey === 'string' ? localeService.t(titleKey) : schema.key;
const target = item.id === SetRangeTextColorCommand.id ? 'text' : 'background';
- if (status.hidden) return null;
+ if (status.hidden) {
+ return null;
+ }
return (
<MobileActionRow
@@ -902,7 +935,9 @@ function MobileStyleRootItem(props: { schema: MenuSchemaWithItem; onOpenView: (v
!isBorder &&
isMobileSelectorItem(item)
) {
- if (status.hidden) return null;
+ if (status.hidden) {
+ return null;
+ }
return (
<button
type="button"
@@ -953,7 +988,9 @@ function MobileStyleRootItem(props: { schema: MenuSchemaWithItem; onOpenView: (v
);
}
- if (status.hidden) return null;
+ if (status.hidden) {
+ return null;
+ }
return (
<button
@@ -1270,6 +1307,7 @@ function MobileBorderStyleView(props: {
onExecute: (params: IMobileStyleCommand) => void;
}) {
const { value, onExecute } = props;
+ const localeService = useDependency(LocaleService);
return (
<div
@@ -1301,7 +1339,7 @@ function MobileBorderStyleView(props: {
"
type={option.value}
/>
- <span className="univer-flex-1 univer-text-left univer-text-sm">{option.value}</span>
+ <span className="univer-flex-1 univer-text-left univer-text-sm">{localeService.t<LocaleKey>(option.label)}</span>
{value.style === option.value && (
<CheckMarkIcon
className="
@@ -1359,7 +1397,9 @@ function executeColor(
}
function isBorderInfo(value: unknown): value is IBorderInfo {
- if (!value || typeof value !== 'object') return false;
+ if (!value || typeof value !== 'object') {
+ return false;
+ }
return 'type' in value
&& BORDER_TYPES.has(value.type)
@@ -1386,10 +1426,14 @@ function isMobileSelectorSchema(schema: MenuSchemaWithItem): schema is SelectorM
function isMobileNumberFormatSchema(
schema: MenuSchemaWithItem
): schema is MenuSchemaWithItem & { item: ConfiguredMobileNumberFormatItem } {
- if (!isMobileSelectorItem(schema.item) || !('mobileNumberFormat' in schema.item)) return false;
+ if (!isMobileSelectorItem(schema.item) || !('mobileNumberFormat' in schema.item)) {
+ return false;
+ }
const config = schema.item.mobileNumberFormat;
- if (!config || typeof config !== 'object') return false;
+ if (!config || typeof config !== 'object') {
+ return false;
+ }
return 'kind' in config
&& config.kind === 'number-format'
diff --git a/packages/sheets-ui/src/views/mobile/action-panel/__tests__/MobileStylePanel.spec.tsx b/packages/sheets-ui/src/views/mobile/action-panel/__tests__/MobileStylePanel.spec.tsx
index c5ace700d8..17a37ad7a8 100644
--- a/packages/sheets-ui/src/views/mobile/action-panel/__tests__/MobileStylePanel.spec.tsx
+++ b/packages/sheets-ui/src/views/mobile/action-panel/__tests__/MobileStylePanel.spec.tsx
@@ -61,6 +61,8 @@ import {
SetRangeTextColorCommand,
SetRangeUnderlineCommand,
} from '../../../../commands/commands/inline-format.command';
+import enUS from '../../../../locale/en-US';
+import zhCN from '../../../../locale/zh-CN';
import { BORDER_LINE_CHILDREN, BORDER_SIZE_CHILDREN } from '../../../border-panel/interface';
import { MobileStylePanel } from '../MobileStylePanel';
@@ -77,6 +79,8 @@ function renderStylePanel(
injector.add([ComponentManager]);
injector.add([IFontService, { useClass: FontService }]);
injector.get(LocaleService).load({ [LocaleType.ZH_CN]: {} });
+ injector.get(LocaleService).setLocale(LocaleType.ZH_CN);
+ injector.get(LocaleService).setDirection('ltr');
configureInjector?.(injector);
const resolvedProps: ComponentProps<typeof MobileStylePanel> = {
groups: [],
@@ -110,7 +114,9 @@ function renderStylePanel(
function getButton(container: HTMLElement, name: string): HTMLButtonElement {
const button = Array.from(container.querySelectorAll('button')).find((element) =>
element.getAttribute('aria-label') === name || element.textContent?.trim() === name);
- if (!button) throw new Error(`Button "${name}" was not rendered.`);
+ if (!button) {
+ throw new Error(`Button "${name}" was not rendered.`);
+ }
return button;
}
@@ -131,6 +137,34 @@ afterEach(() => {
});
describe('MobileStylePanel', () => {
+ it.each([
+ [LocaleType.EN_US, 'Dashed'],
+ [LocaleType.ZH_CN, '虚线'],
+ ])('applies the numeric border style selected by its localized name in %s', (language, label) => {
+ const onExecute = vi.fn();
+ const rendered = renderStylePanel({
+ currentView: {
+ kind: 'border-style',
+ title: 'Border style',
+ item: { id: SetBorderBasicCommand.id, type: MenuItemType.BUTTON },
+ },
+ onExecute,
+ }, (injector) => {
+ const localeService = injector.get(LocaleService);
+ localeService.load({ [LocaleType.EN_US]: enUS, [LocaleType.ZH_CN]: zhCN });
+ localeService.setLocale(language);
+ });
+ root = rendered.root;
+ container = rendered.container;
+
+ clickButton(container, label);
+
+ expect(onExecute).toHaveBeenCalledExactlyOnceWith({
+ id: SetBorderBasicCommand.id,
+ value: expect.objectContaining({ style: BorderStyleTypes.DASHED }),
+ });
+ });
+
it('keeps BIUS controls independently selected and clickable', () => {
const commandIds = [
SetRangeBoldCommand.id,
@@ -509,7 +543,7 @@ describe('MobileStylePanel', () => {
rendered = renderStylePanel({ currentView: { kind: 'border-style', title: 'Border style', item }, onExecute });
root = rendered.root;
container = rendered.container;
- BORDER_SIZE_CHILDREN.forEach((option) => clickButton(rendered.container, String(option.value)));
+ BORDER_SIZE_CHILDREN.forEach((option) => clickButton(rendered.container, option.label));
expect(onExecute.mock.calls.map(([command]) => command)).toEqual(BORDER_SIZE_CHILDREN.map((option) => ({
id: SetBorderBasicCommand.id,
value: { ...borderValue, style: option.value },
diff --git a/packages/thread-comment-ui/src/views/__tests__/ThreadCommentTree.spec.tsx b/packages/thread-comment-ui/src/views/__tests__/ThreadCommentTree.spec.tsx
index d23e1a6b07..2fbe662214 100644
--- a/packages/thread-comment-ui/src/views/__tests__/ThreadCommentTree.spec.tsx
+++ b/packages/thread-comment-ui/src/views/__tests__/ThreadCommentTree.spec.tsx
@@ -767,19 +767,6 @@ describe('ThreadCommentTree', () => {
expect(onActivate).toHaveBeenCalledOnce();
});
- it('exposes icon-only thread actions as labeled keyboard controls', () => {
- const testBed = createTreeTestBed();
- addRootComment(testBed.threadCommentModel, createComment({ id: 'accessible-thread' }));
-
- const rendered = renderDefaultTree(testBed.injector, 'accessible-thread');
- root = rendered.root;
- container = rendered.container;
-
- expect(container.querySelector('button[aria-label="thread-comment-ui.item.more"]')).not.toBeNull();
- expect(container.querySelector('button[aria-label="thread-comment-ui.item.markResolved"]')).not.toBeNull();
- expect(container.querySelector('button[aria-label="thread-comment-ui.item.delete"]')).not.toBeNull();
- });
-
it('keeps comment content visible when its author is no longer in the user directory', () => {
const testBed = createTreeTestBed();
addRootComment(testBed.threadCommentModel, createComment({
diff --git a/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx b/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx
index ac24c0a236..364e07166c 100644
--- a/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx
+++ b/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx
@@ -129,7 +129,6 @@ describe('ToolbarItem', () => {
expect(trigger.getAttribute('role')).toBe('button');
expect(trigger.getAttribute('tabindex')).toBe('0');
- expect(trigger.getAttribute('aria-label')).toBe('Format');
trigger.focus();
expect(document.activeElement).toBe(trigger);
fireEvent.keyDown(trigger, { key: 'Enter' });