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): unify sidebar spacing and mobile controls (#8136)

白熱733b46dce5cb
diff --git a/packages/design/src/components/button/Button.tsx b/packages/design/src/components/button/Button.tsx
index f7dcc4f523..5b518a17de 100644
--- a/packages/design/src/components/button/Button.tsx
+++ b/packages/design/src/components/button/Button.tsx
@@ -82,6 +82,7 @@ export const buttonVariants = cva(
small: 'univer-h-6 univer-rounded-md univer-px-1.5 univer-text-xs',
middle: 'univer-h-8 univer-rounded-md univer-px-2 univer-text-sm',
large: 'univer-h-10 univer-rounded-md univer-px-3 univer-text-sm',
+ 'extra-large': 'univer-h-auto univer-min-h-12 univer-rounded-md univer-px-3 univer-text-base',
},
},
defaultVariants: {
diff --git a/packages/design/src/components/color-picker/MobileColorPicker.tsx b/packages/design/src/components/color-picker/MobileColorPicker.tsx
index 97be21c55d..e19d1c1965 100644
--- a/packages/design/src/components/color-picker/MobileColorPicker.tsx
+++ b/packages/design/src/components/color-picker/MobileColorPicker.tsx
@@ -161,8 +161,8 @@ export function MobileColorPicker({ format = 'hex', value, onChange }: IMobileCo
/>
<MobileActionRowGroup>
- <Button onClick={() => setVisible(false)}>{locale?.ColorPicker.cancel}</Button>
- <Button variant="primary" onClick={handleConfirmCustomColor}>{locale?.ColorPicker.confirm}</Button>
+ <Button onClick={() => setVisible(false)} size="extra-large">{locale?.ColorPicker.cancel}</Button>
+ <Button variant="primary" onClick={handleConfirmCustomColor} size="extra-large">{locale?.ColorPicker.confirm}</Button>
</MobileActionRowGroup>
</div>
</MobileDialog>
diff --git a/packages/design/src/components/config-provider/ConfigProvider.tsx b/packages/design/src/components/config-provider/ConfigProvider.tsx
index 2dfdf80f7a..8fd2db9b9e 100644
--- a/packages/design/src/components/config-provider/ConfigProvider.tsx
+++ b/packages/design/src/components/config-provider/ConfigProvider.tsx
@@ -16,15 +16,13 @@
import type { ReactNode } from 'react';
import { DirectionProvider } from '@radix-ui/react-direction';
-import { createContext, useContext, useMemo } from 'react';
+import { createContext, useMemo } from 'react';
import { isBrowser } from '../../helper/is-browser';
export interface IConfigProviderProps {
children: ReactNode;
locale?: any;
direction?: 'ltr' | 'rtl';
- /** Default field density. Explicit component sizes take precedence. */
- density?: 'default' | 'touch';
mountContainer: HTMLElement | null;
mobileKeyboardViewport?: IMobileKeyboardViewport | null;
}
@@ -41,8 +39,7 @@ export const ConfigContext = createContext<Omit<IConfigProviderProps, 'children'
});
export function ConfigProvider(props: IConfigProviderProps) {
- const parentConfig = useContext(ConfigContext);
- const { children, locale, mountContainer, direction, mobileKeyboardViewport, density = parentConfig.density } = props;
+ const { children, locale, mountContainer, direction, mobileKeyboardViewport } = props;
const value = useMemo(() => {
return {
@@ -50,9 +47,8 @@ export function ConfigProvider(props: IConfigProviderProps) {
direction,
mountContainer,
mobileKeyboardViewport,
- density,
};
- }, [locale, direction, mobileKeyboardViewport, mountContainer, density]);
+ }, [locale, direction, mobileKeyboardViewport, mountContainer]);
return (
<ConfigContext.Provider value={value}>
diff --git a/packages/design/src/components/config-provider/__tests__/ConfigProvider.spec.tsx b/packages/design/src/components/config-provider/__tests__/ConfigProvider.spec.tsx
index 77ae896918..4ea6cf6005 100644
--- a/packages/design/src/components/config-provider/__tests__/ConfigProvider.spec.tsx
+++ b/packages/design/src/components/config-provider/__tests__/ConfigProvider.spec.tsx
@@ -14,12 +14,11 @@
* limitations under the License.
*/
-import { cleanup, fireEvent, render } from '@testing-library/react';
+import { cleanup, render } from '@testing-library/react';
import { useContext } from 'react';
import { afterEach, describe, expect, it } from 'vitest';
import type enUS from '../../../locale/en-US';
import zhCN from '../../../locale/zh-CN';
-import { InputNumber } from '../../input-number/InputNumber';
import { ConfigContext, ConfigProvider } from '../ConfigProvider';
afterEach(cleanup);
@@ -74,36 +73,4 @@ describe('ConfigProvider', () => {
root.unmount();
});
-
- it('inherits touch density through nested providers and preserves explicit compact controls', () => {
- const { getByRole, queryByRole, rerender } = render(
- <ConfigProvider density="touch" mountContainer={document.body}>
- <ConfigProvider locale={zhCN.design} mountContainer={document.body}>
- <InputNumber aria-label="Paragraph spacing" min={0} defaultValue={12} />
- </ConfigProvider>
- </ConfigProvider>
- );
- expect(queryByRole('button', { name: zhCN.design.Accessibility.increment })).toBeNull();
- const input = getByRole('textbox', { name: 'Paragraph spacing' }) as HTMLInputElement;
- fireEvent.change(input, { target: { value: '18' } });
- fireEvent.keyDown(input, { key: 'ArrowUp' });
- expect(input.value).toBe('19');
- expect(input.inputMode).toBe('decimal');
-
- rerender(
- <ConfigProvider density="touch" locale={zhCN.design} mountContainer={document.body}>
- <InputNumber size="mini" defaultValue={12} />
- </ConfigProvider>
- );
- expect(getByRole('button', { name: zhCN.design.Accessibility.increment })).toBeTruthy();
-
- rerender(
- <ConfigProvider density="touch" mountContainer={document.body}>
- <ConfigProvider density="default" locale={zhCN.design} mountContainer={document.body}>
- <InputNumber defaultValue={12} />
- </ConfigProvider>
- </ConfigProvider>
- );
- expect(getByRole('button', { name: zhCN.design.Accessibility.increment })).toBeTruthy();
- });
});
diff --git a/packages/design/src/components/confirm/MobileConfirm.tsx b/packages/design/src/components/confirm/MobileConfirm.tsx
index e2ce27b754..929438b78d 100644
--- a/packages/design/src/components/confirm/MobileConfirm.tsx
+++ b/packages/design/src/components/confirm/MobileConfirm.tsx
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-import type { IConfirmProps } from './Confirm';
import { useContext } from 'react';
+import type { IConfirmProps } from './Confirm';
import { MobileActionRowGroup } from '../action-row/MobileActionRowGroup';
import { Button } from '../button/Button';
import { ConfigContext } from '../config-provider/ConfigProvider';
@@ -43,8 +43,8 @@ export function MobileConfirm(props: IMobileConfirmProps) {
maskClosable={false}
footer={(
<MobileActionRowGroup>
- {closable && <Button onClick={onClose}>{cancelText ?? locale?.Confirm.cancel}</Button>}
- <Button variant="primary" onClick={onConfirm}>
+ {closable && <Button onClick={onClose} size="extra-large">{cancelText ?? locale?.Confirm.cancel}</Button>}
+ <Button variant="primary" onClick={onConfirm} size="extra-large">
{confirmText ?? locale?.Confirm.confirm}
</Button>
</MobileActionRowGroup>
diff --git a/packages/design/src/components/dialog/MobileDialog.tsx b/packages/design/src/components/dialog/MobileDialog.tsx
index b6512bc350..e67257fda7 100644
--- a/packages/design/src/components/dialog/MobileDialog.tsx
+++ b/packages/design/src/components/dialog/MobileDialog.tsx
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-import type { IDialogProps } from './Dialog';
import { useContext, useRef } from 'react';
+import type { IDialogProps } from './Dialog';
import { clsx } from '../../helper/clsx';
import { useMobileKeyboardViewportLayout } from '../../hooks/use-mobile-keyboard-viewport';
import { MobileActionRowGroup } from '../action-row/MobileActionRowGroup';
@@ -59,8 +59,8 @@ export function MobileDialog(props: IMobileDialogProps) {
const footer = propFooter ?? (showOk || showCancel
? (
<MobileActionRowGroup>
- {showCancel && <Button onClick={onCancel}>{locale?.Confirm.cancel}</Button>}
- {showOk && <Button variant="primary" onClick={onOk}>{locale?.Confirm.confirm}</Button>}
+ {showCancel && <Button onClick={onCancel} size="extra-large">{locale?.Confirm.cancel}</Button>}
+ {showOk && <Button variant="primary" onClick={onOk} size="extra-large">{locale?.Confirm.confirm}</Button>}
</MobileActionRowGroup>
)
: null);
diff --git a/packages/design/src/components/gradient-color-picker/GradientColorPicker.tsx b/packages/design/src/components/gradient-color-picker/GradientColorPicker.tsx
index e3a8d3ee36..5255c29369 100644
--- a/packages/design/src/components/gradient-color-picker/GradientColorPicker.tsx
+++ b/packages/design/src/components/gradient-color-picker/GradientColorPicker.tsx
@@ -41,6 +41,7 @@ export interface IGradientValue {
export interface IGradientColorPickerProps {
className?: string;
compact?: boolean;
+ size?: 'small' | 'large';
value?: IGradientValue;
onChange?: (value: IGradientValue) => void;
types?: readonly GradientType[];
@@ -102,7 +103,7 @@ function getCssLinearGradientAngle(value: IGradientValue): number {
}
export function GradientColorPicker(props: IGradientColorPickerProps) {
- const { className, compact = false, value = DEFAULT_VALUE, onChange } = props;
+ const { className, compact = false, size = 'small', value = DEFAULT_VALUE, onChange } = props;
const { locale } = useContext(ConfigContext);
const [draftValue, setDraftValue] = useState<IGradientValue>(value);
const [selectedIndex, setSelectedIndex] = useState<number>(0);
@@ -247,75 +248,18 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
onClick={(e) => e.stopPropagation()}
onPointerDown={(e) => e.stopPropagation()}
>
- {compact
- ? (
- <div
- className="
- univer-flex univer-min-w-0 univer-items-center univer-gap-4 univer-border-b
- univer-border-gray-100
- dark:!univer-border-gray-700
- "
- >
- {[
- { label: locale?.GradientColorPicker.linear, value: 'linear' },
- { label: locale?.GradientColorPicker.radial, value: 'radial' },
- { label: locale?.GradientColorPicker.angular, value: 'angular' },
- { label: locale?.GradientColorPicker.diamond, value: 'diamond' },
- ].filter((item) => !props.types || props.types.some((type) => type === item.value)).map((item) => {
- const selected = draftValue.type === item.value;
-
- return (
- <button
- key={item.value}
- type="button"
- className={clsx(
- `
- univer-relative univer-min-w-0 univer-flex-1 univer-cursor-pointer
- univer-truncate univer-border-none univer-bg-transparent univer-px-0
- univer-pb-2 univer-pt-0 univer-text-xs univer-transition-colors
- `,
- selected
- ? `
- univer-font-medium univer-text-primary-600
- dark:!univer-text-primary-300
- `
- : `
- univer-text-gray-500
- hover:univer-text-gray-900
- dark:!univer-text-gray-300
- dark:hover:!univer-text-gray-0
- `
- )}
- onClick={() => handleTypeChange(item.value as GradientType)}
- >
- {item.label}
- {selected && (
- <span
- className="
- univer-absolute univer-inset-x-2 -univer-bottom-px univer-h-0.5
- univer-rounded-full univer-bg-primary-600
- dark:!univer-bg-primary-300
- "
- />
- )}
- </button>
- );
- })}
- </div>
- )
- : (
- <Segmented
- className="univer-w-full univer-min-w-0 univer-gap-1 univer-overflow-hidden"
- items={[
- { label: locale?.GradientColorPicker.linear, value: 'linear' },
- { label: locale?.GradientColorPicker.radial, value: 'radial' },
- { label: locale?.GradientColorPicker.angular, value: 'angular' },
- { label: locale?.GradientColorPicker.diamond, value: 'diamond' },
- ].filter((item) => !props.types || props.types.some((type) => type === item.value))}
- value={draftValue.type}
- onChange={(v) => handleTypeChange(v as GradientType)}
- />
- )}
+ <Segmented
+ size={size}
+ className="univer-w-full univer-min-w-0 univer-gap-1 univer-overflow-hidden"
+ items={[
+ { label: locale?.GradientColorPicker.linear, value: 'linear' },
+ { label: locale?.GradientColorPicker.radial, value: 'radial' },
+ { label: locale?.GradientColorPicker.angular, value: 'angular' },
+ { label: locale?.GradientColorPicker.diamond, value: 'diamond' },
+ ].filter((item) => !props.types || props.types.some((type) => type === item.value))}
+ value={draftValue.type}
+ onChange={(v) => handleTypeChange(v as GradientType)}
+ />
{showAngleEditor && (
<div
@@ -331,6 +275,8 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
{locale?.GradientColorPicker.angle}
</span>
<InputNumber
+ size={size}
+ controls={size !== 'large'}
className="univer-w-24"
value={getGradientAngle(draftValue)}
min={0}
@@ -429,6 +375,8 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
{locale?.GradientColorPicker.offset}
</div>
<InputNumber
+ size={size}
+ controls={size !== 'large'}
value={draftValue.stops[selectedIndex]?.offset}
min={0}
max={100}
@@ -445,6 +393,8 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
{locale?.GradientColorPicker.transparency}
</div>
<InputNumber
+ size={size}
+ controls={size !== 'large'}
value={Math.round((1 - getStopOpacity(draftValue.stops[selectedIndex])) * 100)}
min={0}
max={100}
@@ -457,6 +407,7 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
<div className="univer-flex univer-gap-1">
<Tooltip title={locale?.GradientColorPicker.delete}>
<Button
+ size={size === 'large' ? 'extra-large' : 'middle'}
data-u-comp="gradient-color-picker-delete"
variant="danger"
onClick={handleRemoveStop}
@@ -471,7 +422,7 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
<div
className={clsx(
`
- univer-border-t univer-border-gray-100
+ univer-flex univer-justify-center univer-border-t univer-border-gray-100
dark:!univer-border-gray-700
`,
compact ? 'univer-pt-3' : 'univer-pt-4'
diff --git a/packages/design/src/components/gradient-color-picker/MobileGradientColorPicker.tsx b/packages/design/src/components/gradient-color-picker/MobileGradientColorPicker.tsx
index a22982cfc3..9f845041a7 100644
--- a/packages/design/src/components/gradient-color-picker/MobileGradientColorPicker.tsx
+++ b/packages/design/src/components/gradient-color-picker/MobileGradientColorPicker.tsx
@@ -26,7 +26,6 @@ import { InputNumber } from '../input-number/InputNumber';
import { MobileActionRow } from '../mobile-action-row/MobileActionRow';
const GRADIENT_TYPES: readonly GradientType[] = ['linear', 'radial', 'angular', 'diamond'];
-const NUMBER_CLASS = 'univer-w-full [&_input]:!univer-h-12 [&_input]:!univer-text-base';
export function MobileGradientColorPicker({ value = { type: 'linear', stops: [{ color: '#ffffff', offset: 0 }, { color: '#000000', offset: 100 }], angle: 0 }, onChange, types = GRADIENT_TYPES, className }: IGradientColorPickerProps) {
const { locale } = useContext(ConfigContext);
@@ -62,7 +61,7 @@ export function MobileGradientColorPicker({ value = { type: 'linear', stops: [{
{(value.type === 'linear' || value.type === 'angular') && (
<label className="univer-grid univer-gap-2 univer-text-base">
{locale?.GradientColorPicker.angle}
- <InputNumber className={NUMBER_CLASS} controls={false} value={value.angle ?? 0} min={0} max={360} onChange={(angle) => onChange?.({ ...value, angle: angle ?? 0 })} />
+ <InputNumber className="univer-w-full" controls={false} value={value.angle ?? 0} min={0} max={360} onChange={(angle) => onChange?.({ ...value, angle: angle ?? 0 })} size="large" inputClassName="univer-text-base" />
</label>
)}
<div className="univer-flex univer-flex-wrap univer-gap-2">
@@ -91,7 +90,7 @@ export function MobileGradientColorPicker({ value = { type: 'linear', stops: [{
{`${stop.offset}%`}
</button>
))}
- <Button className="univer-size-12" aria-label={locale?.Accessibility.increment} onClick={addStop}><IncreaseIcon /></Button>
+ <Button className="univer-size-12" aria-label={locale?.Accessibility.increment} onClick={addStop} size="extra-large"><IncreaseIcon /></Button>
<Button
className="univer-size-12"
aria-label={locale?.GradientColorPicker.delete}
@@ -100,6 +99,7 @@ export function MobileGradientColorPicker({ value = { type: 'linear', stops: [{
onChange?.({ ...value, stops: value.stops.filter((_, stopIndex) => stopIndex !== index) });
setSelectedIndex(0);
}}
+ size="extra-large"
>
<DeleteIcon />
</Button>
@@ -109,11 +109,11 @@ export function MobileGradientColorPicker({ value = { type: 'linear', stops: [{
<div className="univer-grid univer-grid-cols-2 univer-gap-3">
<label className="univer-grid univer-gap-2 univer-text-base">
{locale?.GradientColorPicker.offset}
- <InputNumber className={NUMBER_CLASS} controls={false} value={selectedStop.offset} min={0} max={100} onChange={(offset) => updateStop({ offset: offset ?? 0 })} />
+ <InputNumber className="univer-w-full" controls={false} value={selectedStop.offset} min={0} max={100} onChange={(offset) => updateStop({ offset: offset ?? 0 })} size="large" inputClassName="univer-text-base" />
</label>
<label className="univer-grid univer-gap-2 univer-text-base">
{locale?.GradientColorPicker.transparency}
- <InputNumber className={NUMBER_CLASS} controls={false} value={Math.round((1 - (selectedStop.opacity ?? 1)) * 100)} min={0} max={100} onChange={(transparency) => updateStop({ opacity: 1 - (transparency ?? 0) / 100 })} />
+ <InputNumber className="univer-w-full" controls={false} value={Math.round((1 - (selectedStop.opacity ?? 1)) * 100)} min={0} max={100} onChange={(transparency) => updateStop({ opacity: 1 - (transparency ?? 0) / 100 })} size="large" inputClassName="univer-text-base" />
</label>
</div>
<MobileColorPicker value={selectedStop.color} onChange={(color) => updateStop({ color })} />
diff --git a/packages/design/src/components/gradient-color-picker/__tests__/index.spec.tsx b/packages/design/src/components/gradient-color-picker/__tests__/GradientColorPicker.spec.tsx
similarity index 71%
rename from packages/design/src/components/gradient-color-picker/__tests__/index.spec.tsx
rename to packages/design/src/components/gradient-color-picker/__tests__/GradientColorPicker.spec.tsx
index e008425d89..5254022fc6 100644
--- a/packages/design/src/components/gradient-color-picker/__tests__/index.spec.tsx
+++ b/packages/design/src/components/gradient-color-picker/__tests__/GradientColorPicker.spec.tsx
@@ -18,17 +18,21 @@
* @vitest-environment jsdom
*/
-import type { IGradientValue } from '../GradientColorPicker';
import { cleanup, fireEvent, render, waitFor } from '@testing-library/react';
-import { useState } from 'react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { IGradientValue } from '../GradientColorPicker';
import enUS from '../../../locale/en-US';
import { ConfigProvider } from '../../config-provider/ConfigProvider';
import { GradientColorPicker } from '../GradientColorPicker';
-import { MobileGradientColorPicker } from '../MobileGradientColorPicker';
import '@testing-library/jest-dom/vitest';
-beforeEach(() => vi.stubGlobal('CSS', { ...globalThis.CSS, supports: () => false }));
+beforeEach(() => {
+ vi.stubGlobal('CSS', { ...globalThis.CSS, supports: () => false });
+ vi.stubGlobal('ResizeObserver', class {
+ observe() {}
+ disconnect() {}
+ });
+});
afterEach(() => {
cleanup();
vi.unstubAllGlobals();
@@ -43,74 +47,18 @@ const defaultValue: IGradientValue = {
angle: 0,
};
-describe('mobile GradientColorPicker', () => {
- it('updates the selected stop, adds and removes stops without desktop hover controls', () => {
- const onChange = vi.fn();
- function Editor() {
- const [value, setValue] = useState(defaultValue);
- return (
- <ConfigProvider mountContainer={document.body} locale={enUS.design}>
- <MobileGradientColorPicker
- value={value}
- types={['linear']}
- onChange={(next) => {
- setValue(next);
- onChange(next);
- }}
- />
- </ConfigProvider>
- );
- }
- const view = render(<Editor />);
- expect(view.queryByText(enUS.design.GradientColorPicker.radial)).toBeNull();
- fireEvent.click(view.getByRole('button', { name: enUS.design.Accessibility.increment }));
- expect(onChange).toHaveBeenLastCalledWith(expect.objectContaining({ stops: [defaultValue.stops[0], defaultValue.stops[1], { ...defaultValue.stops[0], offset: 50 }] }));
- expect(view.getByRole('button', { name: `${enUS.design.GradientColorPicker.offset} 50%` })).toHaveAttribute('aria-pressed', 'true');
- fireEvent.change(view.getByLabelText(enUS.design.GradientColorPicker.angle), { target: { value: '180' } });
- fireEvent.change(view.getByLabelText(enUS.design.GradientColorPicker.offset), { target: { value: '60' } });
- fireEvent.change(view.getByLabelText(enUS.design.GradientColorPicker.transparency), { target: { value: '40' } });
- expect(onChange).toHaveBeenLastCalledWith(expect.objectContaining({ angle: 180, stops: expect.arrayContaining([{ color: '#ffffff', offset: 60, opacity: 0.6 }]) }));
- fireEvent.click(view.getByRole('button', { name: enUS.design.GradientColorPicker.delete }));
- expect(onChange).toHaveBeenLastCalledWith({ ...defaultValue, angle: 180 });
- expect(view.getByRole('button', { name: enUS.design.GradientColorPicker.delete })).toBeDisabled();
- });
-
- it('supports every registered gradient type and controlled value updates', () => {
- const onChange = vi.fn();
- const view = render(<ConfigProvider mountContainer={document.body} locale={enUS.design}><MobileGradientColorPicker value={defaultValue} onChange={onChange} /></ConfigProvider>);
- for (const type of ['linear', 'radial', 'angular', 'diamond'] as const) {
- fireEvent.click(view.getByRole('button', { name: enUS.design.GradientColorPicker[type] }));
- expect(onChange).toHaveBeenLastCalledWith({ ...defaultValue, type });
- }
- view.rerender(<ConfigProvider mountContainer={document.body} locale={enUS.design}><MobileGradientColorPicker value={{ ...defaultValue, type: 'radial' }} onChange={onChange} /></ConfigProvider>);
- expect(view.getByRole('button', { name: enUS.design.GradientColorPicker.radial })).toHaveAttribute('aria-pressed', 'true');
- expect(view.queryByLabelText(enUS.design.GradientColorPicker.angle)).toBeNull();
- });
-});
-
describe('GradientColorPicker', () => {
- it('renders correctly', () => {
- const { container } = render(<GradientColorPicker value={defaultValue} />);
- expect(container).toBeDefined();
- // Check if segmented items are rendered - they are buttons inside the segmented container
- const segmented = container.querySelector('[data-u-comp="segmented"]');
- expect(segmented?.querySelectorAll('button').length).toBe(4);
- });
-
- it('should call onChange when type changes', () => {
+ it.each([false, true])('changes gradient type without changing its stops (compact: %s)', (compact) => {
const onChange = vi.fn();
- const { container } = render(<GradientColorPicker value={defaultValue} onChange={onChange} />);
-
- const segmented = container.querySelector('[data-u-comp="segmented"]');
- const items = segmented?.querySelectorAll('button');
- // Click 'radial' (index 1)
- if (items && items[1]) {
- fireEvent.click(items[1]);
- }
-
- expect(onChange).toHaveBeenCalledWith(expect.objectContaining({
- type: 'radial',
- }));
+ const view = render(
+ <ConfigProvider mountContainer={document.body} locale={enUS.design}>
+ <GradientColorPicker compact={compact} value={defaultValue} onChange={onChange} />
+ </ConfigProvider>
+ );
+ fireEvent.click(view.getByRole('button', { name: enUS.design.GradientColorPicker.radial }));
+ expect(onChange).toHaveBeenLastCalledWith({ ...defaultValue, type: 'radial' });
+ expect(view.getByRole('button', { name: enUS.design.GradientColorPicker.radial })).toHaveAttribute('aria-pressed', 'true');
+ expect(view.queryByText(enUS.design.GradientColorPicker.angle)).toBeNull();
});
it('should call onChange when offset changes', () => {
@@ -192,12 +140,6 @@ describe('GradientColorPicker', () => {
expect(calledValue.stops.length).toBe(2);
});
- it('should disable delete button when only 2 stops remain', () => {
- const { container } = render(<GradientColorPicker value={defaultValue} />);
- const deleteButton = container.querySelector('[data-u-comp="gradient-color-picker-delete"]');
- expect(deleteButton).toBeDisabled();
- });
-
it('should call onChange when clicking the bar to add a stop', () => {
const onChange = vi.fn();
const { container } = render(<GradientColorPicker value={defaultValue} onChange={onChange} />);
diff --git a/packages/design/src/components/gradient-color-picker/__tests__/MobileGradientColorPicker.spec.tsx b/packages/design/src/components/gradient-color-picker/__tests__/MobileGradientColorPicker.spec.tsx
new file mode 100644
index 0000000000..8a9565218c
--- /dev/null
+++ b/packages/design/src/components/gradient-color-picker/__tests__/MobileGradientColorPicker.spec.tsx
@@ -0,0 +1,89 @@
+/**
+ * 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.
+ */
+
+/**
+ * @vitest-environment jsdom
+ */
+
+import { cleanup, fireEvent, render } from '@testing-library/react';
+import { useState } from 'react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { IGradientValue } from '../GradientColorPicker';
+import enUS from '../../../locale/en-US';
+import { ConfigProvider } from '../../config-provider/ConfigProvider';
+import { MobileGradientColorPicker } from '../MobileGradientColorPicker';
+import '@testing-library/jest-dom/vitest';
+
+beforeEach(() => vi.stubGlobal('CSS', { ...globalThis.CSS, supports: () => false }));
+afterEach(() => {
+ cleanup();
+ vi.unstubAllGlobals();
+});
+
+const defaultValue: IGradientValue = {
+ type: 'linear',
+ stops: [
+ { color: '#ffffff', offset: 0 },
+ { color: '#000000', offset: 100 },
+ ],
+ angle: 0,
+};
+
+function Editor({ onChange }: { onChange: (value: IGradientValue) => void }) {
+ const [value, setValue] = useState(defaultValue);
+ return (
+ <ConfigProvider mountContainer={document.body} locale={enUS.design}>
+ <MobileGradientColorPicker
+ value={value}
+ types={['linear']}
+ onChange={(next) => {
+ setValue(next);
+ onChange(next);
+ }}
+ />
+ </ConfigProvider>
+ );
+}
+
+describe('mobile GradientColorPicker', () => {
+ it('updates the selected stop, adds and removes stops without desktop hover controls', () => {
+ const onChange = vi.fn();
+ const view = render(<Editor onChange={onChange} />);
+ expect(view.queryByText(enUS.design.GradientColorPicker.radial)).toBeNull();
+ fireEvent.click(view.getByRole('button', { name: enUS.design.Accessibility.increment }));
+ expect(onChange).toHaveBeenLastCalledWith(expect.objectContaining({ stops: [defaultValue.stops[0], defaultValue.stops[1], { ...defaultValue.stops[0], offset: 50 }] }));
+ expect(view.getByRole('button', { name: `${enUS.design.GradientColorPicker.offset} 50%` })).toHaveAttribute('aria-pressed', 'true');
+ fireEvent.change(view.getByLabelText(enUS.design.GradientColorPicker.angle), { target: { value: '180' } });
+ fireEvent.change(view.getByLabelText(enUS.design.GradientColorPicker.offset), { target: { value: '60' } });
+ fireEvent.change(view.getByLabelText(enUS.design.GradientColorPicker.transparency), { target: { value: '40' } });
+ expect(onChange).toHaveBeenLastCalledWith(expect.objectContaining({ angle: 180, stops: expect.arrayContaining([{ color: '#ffffff', offset: 60, opacity: 0.6 }]) }));
+ fireEvent.click(view.getByRole('button', { name: enUS.design.GradientColorPicker.delete }));
+ expect(onChange).toHaveBeenLastCalledWith({ ...defaultValue, angle: 180 });
+ expect(view.getByRole('button', { name: enUS.design.GradientColorPicker.delete })).toBeDisabled();
+ });
+
+ it('supports every registered gradient type and controlled value updates', () => {
+ const onChange = vi.fn();
+ const view = render(<ConfigProvider mountContainer={document.body} locale={enUS.design}><MobileGradientColorPicker value={defaultValue} onChange={onChange} /></ConfigProvider>);
+ for (const type of ['linear', 'radial', 'angular', 'diamond'] as const) {
+ fireEvent.click(view.getByRole('button', { name: enUS.design.GradientColorPicker[type] }));
+ expect(onChange).toHaveBeenLastCalledWith({ ...defaultValue, type });
+ }
+ view.rerender(<ConfigProvider mountContainer={document.body} locale={enUS.design}><MobileGradientColorPicker value={{ ...defaultValue, type: 'radial' }} onChange={onChange} /></ConfigProvider>);
+ expect(view.getByRole('button', { name: enUS.design.GradientColorPicker.radial })).toHaveAttribute('aria-pressed', 'true');
+ expect(view.queryByLabelText(enUS.design.GradientColorPicker.angle)).toBeNull();
+ });
+});
diff --git a/packages/design/src/components/input-number/InputNumber.tsx b/packages/design/src/components/input-number/InputNumber.tsx
index fbeacc1ded..e179987b0e 100644
--- a/packages/design/src/components/input-number/InputNumber.tsx
+++ b/packages/design/src/components/input-number/InputNumber.tsx
@@ -16,6 +16,7 @@
import type { FocusEvent, InputHTMLAttributes, KeyboardEvent } from 'react';
import { forwardRef, useContext, useEffect, useRef, useState } from 'react';
+import type { IInputProps } from '../input/Input';
import { borderLeftClassName, borderLeftRTLClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
import { ConfigContext } from '../config-provider/ConfigProvider';
@@ -25,14 +26,13 @@ export interface IInputNumberProps
extends Omit<InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'value' | 'defaultValue' | 'size'> {
value?: number | null;
defaultValue?: number;
- size?: 'mini' | 'small';
+ size?: IInputProps['size'];
min?: number;
max?: number;
step?: number;
precision?: number;
formatter?: (value: string | number | undefined) => string;
parser?: (displayValue: string | undefined) => string;
- /** Hidden by default in touch density unless an explicit size is supplied. */
controls?: boolean;
className?: string;
inputClassName?: string;
@@ -56,7 +56,7 @@ export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>(
precision,
formatter,
parser,
- controls,
+ controls = true,
className,
inputClassName,
controlsClassName,
@@ -72,8 +72,7 @@ export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>(
},
ref
) => {
- const { locale, density } = useContext(ConfigContext);
- const showControls = controls ?? (density !== 'touch' || Boolean(size));
+ const { locale } = useContext(ConfigContext);
const [internalValue, setInternalValue] = useState<number | null>(
() => {
if (value !== undefined) {
@@ -357,7 +356,7 @@ export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>(
onKeyDown={handleKeyDown}
/>
- {showControls && (
+ {controls && (
<div
className={clsx(
`
diff --git a/packages/design/src/components/input-number/__tests__/InputNumber.spec.tsx b/packages/design/src/components/input-number/__tests__/InputNumber.spec.tsx
index bade686374..161ce286b2 100644
--- a/packages/design/src/components/input-number/__tests__/InputNumber.spec.tsx
+++ b/packages/design/src/components/input-number/__tests__/InputNumber.spec.tsx
@@ -198,6 +198,22 @@ describe('InputNumber', () => {
expect(onPressEnter).toHaveBeenCalled();
});
+ it('keeps numeric editing and bounds when a large input hides its stepper controls', () => {
+ const onChange = vi.fn();
+ const { getByRole, queryByRole } = render(
+ <InputNumber size="large" controls={false} defaultValue={12} min={0} max={19} onChange={onChange} />
+ );
+ const input = getByRole('textbox');
+ expect(queryByRole('button')).toBeNull();
+ fireEvent.change(input, { target: { value: '18' } });
+ fireEvent.keyDown(input, { key: 'ArrowUp' });
+ expect(input).toHaveValue('19');
+ fireEvent.keyDown(input, { key: 'ArrowUp' });
+ expect(input).toHaveValue('19');
+ fireEvent.keyDown(input, { key: 'ArrowDown' });
+ expect(onChange).toHaveBeenLastCalledWith(18);
+ });
+
it('should hide controls when controls is false and keep input disabled', () => {
const { container } = render(<InputNumber defaultValue={3} controls={false} disabled />);
expect(container.querySelector('[role="button"]')).toBeNull();
diff --git a/packages/design/src/components/input/Input.tsx b/packages/design/src/components/input/Input.tsx
index 742cbc9d6c..ab0e52c104 100644
--- a/packages/design/src/components/input/Input.tsx
+++ b/packages/design/src/components/input/Input.tsx
@@ -88,9 +88,8 @@ export const Input = forwardRef<HTMLInputElement, IInputProps>(
inputStyle,
...props
}, ref) => {
- const { direction, locale, density } = useContext(ConfigContext);
+ const { direction, locale } = useContext(ConfigContext);
const invalid = useContext(FormLayoutContext);
- const touchSize = !size && density === 'touch';
const handleClear = (e: React.MouseEvent) => {
e.stopPropagation();
@@ -148,10 +147,9 @@ export const Input = forwardRef<HTMLInputElement, IInputProps>(
ref={ref}
type={type}
className={clsx(
- inputVariants({ size: size ?? (touchSize ? 'large' : 'small') }),
+ inputVariants({ size }),
borderClassName,
inputStateClassName,
- touchSize && 'univer-text-base',
disabled && `
univer-cursor-not-allowed univer-bg-gray-50 univer-text-gray-400
dark:!univer-text-gray-500
diff --git a/packages/design/src/components/segmented/Segmented.tsx b/packages/design/src/components/segmented/Segmented.tsx
index d56cdb442e..d6e22c20d2 100644
--- a/packages/design/src/components/segmented/Segmented.tsx
+++ b/packages/design/src/components/segmented/Segmented.tsx
@@ -14,25 +14,28 @@
* limitations under the License.
*/
-import type { ReactNode } from 'react';
+import type { ButtonHTMLAttributes, KeyboardEvent, ReactNode } from 'react';
import { useContext, useLayoutEffect, useRef, useState } from 'react';
+import { focusClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
import { ConfigContext } from '../config-provider/ConfigProvider';
type ItemValue = string | number;
-const SEGMENTED_PADDING = 4;
-interface ISegmentedItem<T extends ItemValue = ItemValue> {
+interface ISegmentedItem<T extends ItemValue = ItemValue> extends Pick<ButtonHTMLAttributes<HTMLButtonElement>, 'id' | 'aria-controls' | 'disabled'> {
label: ReactNode;
value: T;
}
interface ISegmentedProps<T extends ItemValue = ItemValue> {
- items: ISegmentedItem<T>[];
+ items: ReadonlyArray<ISegmentedItem<T>>;
value?: T;
defaultValue?: T;
onChange?: (value: T) => void;
className?: string;
+ size?: 'small' | 'large';
+ role?: 'group' | 'tablist';
+ 'aria-label'?: string;
}
export function Segmented<T extends ItemValue = ItemValue>({
@@ -41,67 +44,124 @@ export function Segmented<T extends ItemValue = ItemValue>({
defaultValue,
onChange,
className = '',
+ size = 'small',
+ role = 'group',
+ 'aria-label': ariaLabel,
}: ISegmentedProps<T>) {
const { direction } = useContext(ConfigContext);
- const [internalValue, setInternalValue] = useState<T>(defaultValue ?? items[0].value);
+ const padding = size === 'large' ? 2 : 4;
+ const [internalValue, setInternalValue] = useState(defaultValue ?? items.find((item) => !item.disabled)?.value);
const selectedItem = value ?? internalValue;
const itemsRef = useRef<Map<T, HTMLButtonElement>>(new Map());
const containerRef = useRef<HTMLDivElement>(null);
const sliderRef = useRef<HTMLDivElement>(null);
useLayoutEffect(() => {
- const selectedElement = itemsRef.current.get(selectedItem);
+ const selectedElement = selectedItem === undefined ? undefined : itemsRef.current.get(selectedItem);
const slider = sliderRef.current;
- if (selectedElement && containerRef.current && slider) {
- const containerRect = containerRef.current.getBoundingClientRect();
+ const container = containerRef.current;
+ if (!selectedElement || !container || !slider) {
+ return;
+ }
+ const updateSlider = () => {
+ const containerRect = container.getBoundingClientRect();
const selectedRect = selectedElement.getBoundingClientRect();
slider.style.width = `${selectedRect.width}px`;
- slider.style.transform = `translateX(${selectedRect.left - containerRect.left - SEGMENTED_PADDING}px)`;
- }
- }, [direction, items, selectedItem]);
+ slider.style.transform = `translateX(${selectedRect.left - containerRect.left - padding}px)`;
+ };
+ updateSlider();
+ const observer = new ResizeObserver(updateSlider);
+ observer.observe(container);
+ observer.observe(selectedElement);
+ return () => observer.disconnect();
+ }, [direction, items, padding, selectedItem]);
const handleClick = (itemValue: T) => {
setInternalValue(itemValue);
onChange?.(itemValue);
};
+ const handleKeyDown = (event: KeyboardEvent<HTMLButtonElement>, itemValue: T) => {
+ if (role !== 'tablist') {
+ return;
+ }
+ const enabledItems = items.filter((item) => !item.disabled);
+ const index = enabledItems.findIndex((item) => item.value === itemValue);
+ let nextIndex = index;
+ const step = direction === 'rtl' ? -1 : 1;
+ if (event.key === 'ArrowRight') {
+ nextIndex = (index + step + enabledItems.length) % enabledItems.length;
+ } else if (event.key === 'ArrowLeft') {
+ nextIndex = (index - step + enabledItems.length) % enabledItems.length;
+ } else if (event.key === 'Home') {
+ nextIndex = 0;
+ } else if (event.key === 'End') {
+ nextIndex = enabledItems.length - 1;
+ } else {
+ return;
+ }
+ event.preventDefault();
+ const nextItem = enabledItems[nextIndex];
+ if (nextItem) {
+ handleClick(nextItem.value);
+ itemsRef.current.get(nextItem.value)?.focus();
+ }
+ };
+
return (
<div
data-u-comp="segmented"
+ role={role}
+ aria-label={ariaLabel}
dir={direction}
ref={containerRef}
className={clsx(`
univer-relative univer-box-border univer-flex univer-min-w-0 univer-gap-1 univer-rounded-lg
- univer-bg-gray-100 univer-p-1
+ univer-bg-gray-100
dark:!univer-bg-gray-800
- `, className)}
+ `, size === 'large' ? 'univer-p-0.5' : 'univer-p-1', className)}
>
<div
className={`
- univer-absolute univer-h-6 univer-rounded-md univer-bg-gray-0 univer-shadow-sm univer-transition-all
+ univer-absolute univer-rounded-md univer-bg-gray-0 univer-shadow-sm univer-transition-all
univer-duration-200
dark:!univer-bg-gray-700 dark:!univer-text-gray-400
`}
ref={sliderRef}
- style={{ left: SEGMENTED_PADDING }}
+ style={{ left: padding, top: padding, bottom: padding }}
/>
{items.map((item) => (
<button
key={String(item.value)}
+ id={item.id}
+ aria-controls={item['aria-controls']}
+ aria-selected={role === 'tablist' ? selectedItem === item.value : undefined}
+ aria-pressed={role === 'group' ? selectedItem === item.value : undefined}
+ role={role === 'tablist' ? 'tab' : undefined}
+ tabIndex={role === 'tablist' && selectedItem !== item.value ? -1 : 0}
+ disabled={item.disabled}
ref={(el) => {
- if (el) itemsRef.current.set(item.value, el);
+ if (el) {
+ itemsRef.current.set(item.value, el);
+ } else {
+ itemsRef.current.delete(item.value);
+ }
}}
className={clsx(`
univer-relative univer-box-border univer-min-w-0 univer-flex-1 univer-cursor-pointer
- univer-truncate univer-border-none univer-bg-transparent univer-px-3 univer-py-1 univer-text-xs
- univer-font-medium univer-transition-colors
- `, {
+ univer-border-none univer-bg-transparent univer-px-3 univer-py-1 univer-text-xs univer-font-medium
+ univer-transition-colors
+ disabled:univer-cursor-not-allowed disabled:univer-opacity-50
+ `, focusClassName, size === 'large' && 'univer-min-h-11', role === 'tablist'
+ ? 'univer-whitespace-normal univer-break-words'
+ : 'univer-truncate', {
'univer-text-gray-900 dark:!univer-text-gray-0': selectedItem === item.value,
'univer-text-gray-500 hover:univer-text-gray-900 dark:!univer-text-gray-300 dark:hover:!univer-text-gray-0': selectedItem !== item.value,
})}
type="button"
onClick={() => handleClick(item.value)}
+ onKeyDown={(event) => handleKeyDown(event, item.value)}
>
{item.label}
</button>
diff --git a/packages/design/src/components/segmented/__tests__/Segmented.spec.tsx b/packages/design/src/components/segmented/__tests__/Segmented.spec.tsx
index 737f2ed04a..dbb9cf4d65 100644
--- a/packages/design/src/components/segmented/__tests__/Segmented.spec.tsx
+++ b/packages/design/src/components/segmented/__tests__/Segmented.spec.tsx
@@ -20,7 +20,10 @@ import { ConfigProvider } from '../../config-provider/ConfigProvider';
import { Segmented } from '../Segmented';
import '@testing-library/jest-dom/vitest';
-afterEach(cleanup);
+afterEach(() => {
+ cleanup();
+ vi.unstubAllGlobals();
+});
describe('Segmented', () => {
const items = [
@@ -29,51 +32,98 @@ describe('Segmented', () => {
{ label: 'C', value: 'c' },
];
- it('should render and select first by default', () => {
- const { getByText } = render(<Segmented items={items} />);
- expect(getByText('A')).toHaveClass('univer-text-gray-900', { exact: false });
- expect(getByText('B')).not.toHaveClass('univer-text-gray-900', { exact: false });
+ it('selects the first enabled option and updates uncontrolled selection on click', () => {
+ const onChange = vi.fn();
+ const { getByRole } = render(
+ <Segmented items={[{ label: 'Unavailable', value: 'disabled', disabled: true }, ...items]} onChange={onChange} />
+ );
+ expect(getByRole('button', { name: 'A' })).toHaveAttribute('aria-pressed', 'true');
+ fireEvent.click(getByRole('button', { name: 'Unavailable' }));
+ expect(onChange).not.toHaveBeenCalled();
+ fireEvent.click(getByRole('button', { name: 'B' }));
+ expect(onChange).toHaveBeenCalledWith('b');
+ expect(getByRole('button', { name: 'A' })).toHaveAttribute('aria-pressed', 'false');
+ expect(getByRole('button', { name: 'B' })).toHaveAttribute('aria-pressed', 'true');
});
- it('should select by defaultValue', () => {
- const { getByText } = render(<Segmented items={items} defaultValue="b" />);
- expect(getByText('B')).toHaveClass('univer-text-gray-900', { exact: false });
+ it('starts from defaultValue but accepts later user selection', () => {
+ const { getByRole } = render(<Segmented items={items} defaultValue="b" />);
+ expect(getByRole('button', { name: 'B' })).toHaveAttribute('aria-pressed', 'true');
+ fireEvent.click(getByRole('button', { name: 'C' }));
+ expect(getByRole('button', { name: 'C' })).toHaveAttribute('aria-pressed', 'true');
});
- it('should call onChange when click', () => {
- const handleChange = vi.fn();
- const { getByText } = render(<Segmented items={items} onChange={handleChange} />);
- fireEvent.click(getByText('B'));
- expect(handleChange).toHaveBeenCalledWith('b');
+ it('notifies selection changes while leaving a controlled value to its owner', () => {
+ const onChange = vi.fn();
+ const options = [{ label: <span>Icon label</span>, value: 'icon' }, ...items];
+ const { getByRole, rerender } = render(<Segmented items={options} value="a" onChange={onChange} />);
+ fireEvent.click(getByRole('button', { name: 'Icon label' }));
+ expect(onChange).toHaveBeenCalledWith('icon');
+ expect(getByRole('button', { name: 'A' })).toHaveAttribute('aria-pressed', 'true');
+ expect(getByRole('button', { name: 'Icon label' })).toHaveAttribute('aria-pressed', 'false');
+ rerender(<Segmented items={options} value="icon" onChange={onChange} />);
+ expect(getByRole('button', { name: 'Icon label' })).toHaveAttribute('aria-pressed', 'true');
});
- it('should render ReactNode labels', () => {
- const { getByText } = render(
- <Segmented
- items={[
- { label: <span>Icon label</span>, value: 'icon' },
- ]}
- />
+ it.each(['ltr', 'rtl'] as const)('navigates tabs in %s order, skipping disabled options and linking panels', (direction) => {
+ const { getByRole } = render(
+ <ConfigProvider mountContainer={document.body} direction={direction}>
+ <Segmented
+ role="tablist"
+ aria-label="Chart editor"
+ items={[
+ { label: 'Setup', value: 'setup', id: 'setup-tab', 'aria-controls': 'setup-panel' },
+ { label: 'Unavailable', value: 'disabled', disabled: true },
+ { label: 'Style', value: 'style' },
+ { label: 'Data', value: 'data' },
+ ]}
+ />
+ </ConfigProvider>
);
-
- expect(getByText('Icon label')).toBeInTheDocument();
+ const setup = getByRole('tab', { name: 'Setup' });
+ const style = getByRole('tab', { name: 'Style' });
+ const data = getByRole('tab', { name: 'Data' });
+ expect(getByRole('tablist', { name: 'Chart editor' })).toBeInTheDocument();
+ expect(setup).toHaveAttribute('aria-controls', 'setup-panel');
+ expect(setup).toHaveAttribute('aria-selected', 'true');
+ expect(style).toHaveAttribute('tabindex', '-1');
+ expect(getByRole('tab', { name: 'Unavailable' })).toBeDisabled();
+ setup.focus();
+ fireEvent.keyDown(setup, { key: direction === 'ltr' ? 'ArrowRight' : 'ArrowLeft' });
+ expect(style).toHaveFocus();
+ expect(style).toHaveAttribute('aria-selected', 'true');
+ expect(setup).toHaveAttribute('tabindex', '-1');
+ fireEvent.keyDown(style, { key: direction === 'ltr' ? 'ArrowLeft' : 'ArrowRight' });
+ expect(setup).toHaveFocus();
+ fireEvent.keyDown(setup, { key: direction === 'ltr' ? 'ArrowLeft' : 'ArrowRight' });
+ expect(data).toHaveFocus();
+ fireEvent.keyDown(data, { key: 'Home' });
+ expect(setup).toHaveFocus();
+ fireEvent.keyDown(setup, { key: 'End' });
+ expect(data).toHaveFocus();
});
- it('should support controlled value', () => {
- const { getByText, rerender } = render(<Segmented items={items} value="a" />);
- expect(getByText('A')).toHaveClass('univer-text-gray-900', { exact: false });
- rerender(<Segmented items={items} value="c" />);
- expect(getByText('C')).toHaveClass('univer-text-gray-900', { exact: false });
- });
+ it('repositions the indicator when a hidden drawer becomes measurable and disconnects on unmount', () => {
+ let resize = () => {};
+ const disconnect = vi.fn();
+ vi.stubGlobal('ResizeObserver', class {
+ constructor(callback: () => void) {
+ resize = callback;
+ }
- it('should apply rtl direction from ConfigProvider', () => {
- const { container } = render(
- <ConfigProvider mountContainer={document.body} direction="rtl">
- <Segmented items={items} />
- </ConfigProvider>
- );
-
- expect(container.querySelector('[data-u-comp="segmented"]')?.getAttribute('dir')).toBe('rtl');
+ observe() {}
+ disconnect = disconnect;
+ });
+ const { container, getByRole, unmount } = render(<Segmented items={items} />);
+ const root = container.querySelector('[data-u-comp="segmented"]') as HTMLDivElement;
+ const slider = root.firstElementChild as HTMLDivElement;
+ vi.spyOn(root, 'getBoundingClientRect').mockReturnValue({ left: 16, width: 358 } as DOMRect);
+ vi.spyOn(getByRole('button', { name: 'A' }), 'getBoundingClientRect')
+ .mockReturnValue({ left: 20, width: 173 } as DOMRect);
+ resize();
+ expect(slider).toHaveStyle({ width: '173px', transform: 'translateX(0px)' });
+ unmount();
+ expect(disconnect).toHaveBeenCalledOnce();
});
it('should position the selected slider from a stable physical left origin in rtl', () => {
diff --git a/packages/design/src/components/select/MobileSelect.tsx b/packages/design/src/components/select/MobileSelect.tsx
index acefcfdadc..843cd91e42 100644
--- a/packages/design/src/components/select/MobileSelect.tsx
+++ b/packages/design/src/components/select/MobileSelect.tsx
@@ -35,6 +35,7 @@ export type IMobileSelectProps = ISelectProps;
export function MobileSelect(props: IMobileSelectProps) {
const {
className,
+ size = 'large',
value,
disabled = false,
options = EMPTY_OPTIONS,
@@ -107,7 +108,7 @@ export function MobileSelect(props: IMobileSelectProps) {
aria-expanded={open}
data-u-comp="mobile-select"
aria-invalid={triggerProps['aria-invalid'] ?? (invalid || undefined)}
- className={clsx(selectClassName, '!univer-h-auto !univer-min-h-12 univer-text-left', {
+ className={clsx(selectClassName, 'univer-text-left', size === 'large' && 'univer-h-auto univer-min-h-12', {
'!univer-border-primary-600 univer-outline-none univer-ring-2 univer-ring-primary-50 dark:!univer-border-primary-300 dark:!univer-ring-primary-900': open && !borderless,
'univer-border-transparent univer-bg-transparent': borderless,
'univer-cursor-not-allowed univer-opacity-50': disabled,
diff --git a/packages/design/src/components/select/MultipleSelect.tsx b/packages/design/src/components/select/MultipleSelect.tsx
index b084fd7269..2caec0ab18 100644
--- a/packages/design/src/components/select/MultipleSelect.tsx
+++ b/packages/design/src/components/select/MultipleSelect.tsx
@@ -32,6 +32,7 @@ interface IOption {
export interface IMultipleSelectProps {
className?: string;
+ size?: 'small' | 'large';
/**
* The value of select
@@ -65,6 +66,7 @@ export interface IMultipleSelectProps {
export function MultipleSelect(props: IMultipleSelectProps) {
const {
className,
+ size = 'small',
value = [],
disabled = false,
options = [],
@@ -127,7 +129,7 @@ export function MultipleSelect(props: IMultipleSelectProps) {
<div
data-u-comp="multiple-select"
aria-invalid={invalid || undefined}
- className={clsx(selectClassName, {
+ className={clsx(selectClassName, size === 'large' && 'univer-h-auto univer-min-h-12', {
'!univer-border-primary-600 univer-outline-none univer-ring-2 univer-ring-primary-50 dark:!univer-border-primary-300 dark:!univer-ring-primary-900': open && !borderless,
'univer-border-transparent univer-bg-transparent hover:univer-border-transparent': borderless,
'univer-cursor-not-allowed univer-opacity-50': disabled,
diff --git a/packages/design/src/components/select/Select.tsx b/packages/design/src/components/select/Select.tsx
index 7e493093c6..b400ef83e9 100644
--- a/packages/design/src/components/select/Select.tsx
+++ b/packages/design/src/components/select/Select.tsx
@@ -37,6 +37,7 @@ interface IOptionSeparator {
export interface ISelectProps extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'children' | 'onChange' | 'value'> {
className?: string;
+ size?: 'small' | 'large';
/**
* The value of select
@@ -84,6 +85,7 @@ const EMPTY_OPTIONS: NonNullable<ISelectProps['options']> = [];
export function Select(props: ISelectProps) {
const {
className,
+ size = 'small',
value,
disabled = false,
options = EMPTY_OPTIONS,
@@ -174,7 +176,7 @@ export function Select(props: ISelectProps) {
disabled={disabled}
data-u-comp="select"
aria-invalid={triggerProps['aria-invalid'] ?? (invalid || undefined)}
- className={clsx(selectClassName, {
+ className={clsx(selectClassName, size === 'large' && 'univer-h-auto univer-min-h-12', {
'!univer-border-primary-600 univer-outline-none univer-ring-2 univer-ring-primary-50 dark:!univer-border-primary-300 dark:!univer-ring-primary-900': open && !borderless,
'univer-border-transparent univer-bg-transparent hover:univer-border-transparent': borderless,
'univer-cursor-not-allowed': disabled,
diff --git a/packages/design/src/components/textarea/Textarea.tsx b/packages/design/src/components/textarea/Textarea.tsx
index 9f48c0aa42..215373b503 100644
--- a/packages/design/src/components/textarea/Textarea.tsx
+++ b/packages/design/src/components/textarea/Textarea.tsx
@@ -18,11 +18,11 @@ import type { ChangeEvent, ComponentProps } from 'react';
import { forwardRef, useContext, useImperativeHandle, useLayoutEffect, useRef } from 'react';
import { borderClassName, inputStateClassName, scrollbarClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
-import { ConfigContext } from '../config-provider/ConfigProvider';
import { FormLayoutContext } from '../form-layout/FormLayout';
interface ITextareaProps extends ComponentProps<'textarea'> {
className?: string;
+ size?: 'small' | 'large';
onResize?: (width: number, height: number) => void;
onValueChange?: (value: string) => void;
}
@@ -31,9 +31,8 @@ export const Textarea = forwardRef<HTMLTextAreaElement, ITextareaProps>((props,
const textareaRef = useRef<HTMLTextAreaElement>(null);
const lastSizeRef = useRef<{ width: number; height: number }>({ width: 0, height: 0 });
- const { className, onResize, onValueChange, ...restProps } = props;
+ const { className, size = 'small', onResize, onValueChange, ...restProps } = props;
const invalid = useContext(FormLayoutContext);
- const { density } = useContext(ConfigContext);
useImperativeHandle(ref, () => textareaRef.current as HTMLTextAreaElement, []);
@@ -84,8 +83,8 @@ export const Textarea = forwardRef<HTMLTextAreaElement, ITextareaProps>((props,
`,
borderClassName,
inputStateClassName,
- density === 'touch' && 'univer-text-base',
scrollbarClassName,
+ size === 'large' && 'univer-text-base',
className
)}
onChange={handleChange}
diff --git a/packages/docs-drawing-ui/src/views/doc-image-panel/MobileDocDrawingPosition.tsx b/packages/docs-drawing-ui/src/views/doc-image-panel/MobileDocDrawingPosition.tsx
index f04217a7c3..5bc3ef0f25 100644
--- a/packages/docs-drawing-ui/src/views/doc-image-panel/MobileDocDrawingPosition.tsx
+++ b/packages/docs-drawing-ui/src/views/doc-image-panel/MobileDocDrawingPosition.tsx
@@ -15,13 +15,13 @@
*/
import type { IObjectPositionH, IObjectPositionV } from '@univerjs/core';
-import type { LocaleKey } from '../../locale/types';
-import type { IDocDrawingPositionProps } from './DocDrawingPosition';
import { DocumentFlavor, LocaleService } from '@univerjs/core';
import { InputNumber, MobileActionRow } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
import { CheckMarkIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
+import type { LocaleKey } from '../../locale/types';
+import type { IDocDrawingPositionProps } from './DocDrawingPosition';
import { useDocDrawingPosition } from './use-doc-drawing-position';
interface IMobileDocDrawingPositionProps {
@@ -90,6 +90,7 @@ function MobileDocDrawingPositionControls(props: IMobileDocDrawingPositionProps)
axis.onOffsetChange(value);
}
}}
+ size="large"
/>
</label>
<div className="univer-grid univer-grid-cols-2 univer-gap-2" role="group" aria-label={localeService.t<LocaleKey>(axis.reference)}>
diff --git a/packages/docs-drawing-ui/src/views/doc-image-panel/MobileDocDrawingTextWrap.tsx b/packages/docs-drawing-ui/src/views/doc-image-panel/MobileDocDrawingTextWrap.tsx
index 0905a8a58e..eda6e59624 100644
--- a/packages/docs-drawing-ui/src/views/doc-image-panel/MobileDocDrawingTextWrap.tsx
+++ b/packages/docs-drawing-ui/src/views/doc-image-panel/MobileDocDrawingTextWrap.tsx
@@ -15,14 +15,14 @@
*/
import type { IDocDrawingBase } from '@univerjs/core';
-import type { LocaleKey } from '../../locale/types';
-import type { IDocDrawingTextWrapProps } from './DocDrawingTextWrap';
import { LocaleService, WrapTextType } from '@univerjs/core';
import { InputNumber, MobileActionRow } from '@univerjs/design';
import { TextWrappingStyle } from '@univerjs/docs-drawing';
import { IRenderManagerService } from '@univerjs/engine-render';
import { CheckMarkIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
+import type { LocaleKey } from '../../locale/types';
+import type { IDocDrawingTextWrapProps } from './DocDrawingTextWrap';
import { useDocDrawingTextWrap } from './use-doc-drawing-text-wrap';
const styles: { value: TextWrappingStyle; label: LocaleKey }[] = [
@@ -117,6 +117,7 @@ function MobileDocDrawingTextWrapControls(props: IMobileDocDrawingTextWrapProps)
precision={1}
value={props.distToText[key] ?? 0}
onChange={(value) => props.onDistanceChange(value, key)}
+ size="large"
/>
</label>
))}
diff --git a/packages/docs-hyper-link-ui/src/views/MobileDocHyperLinkEdit.tsx b/packages/docs-hyper-link-ui/src/views/MobileDocHyperLinkEdit.tsx
index b0a13a3ca0..2950988e71 100644
--- a/packages/docs-hyper-link-ui/src/views/MobileDocHyperLinkEdit.tsx
+++ b/packages/docs-hyper-link-ui/src/views/MobileDocHyperLinkEdit.tsx
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-import type { LocaleKey } from '../locale/types';
import { LocaleService } from '@univerjs/core';
import { Button, FormLayout, Input } from '@univerjs/design';
import { KeyCode, useDependency } from '@univerjs/ui';
+import type { LocaleKey } from '../locale/types';
import { useDocHyperLinkEdit } from './hyper-link-edit/use-doc-hyper-link-edit';
import { isBlankInput } from './hyper-link-edit/utils';
@@ -63,6 +63,8 @@ export function MobileDocHyperLinkEdit() {
handleConfirm();
}
}}
+ size="large"
+ inputClass="univer-text-base"
/>
</FormLayout>
)
@@ -80,11 +82,13 @@ export function MobileDocHyperLinkEdit() {
handleConfirm();
}
}}
+ size="large"
+ inputClass="univer-text-base"
/>
</FormLayout>
</div>
<div className="univer-mt-5 univer-flex univer-gap-3">
- <Button className="univer-h-12 univer-flex-1" onClick={handleCancel}>
+ <Button className="univer-h-12 univer-flex-1" onClick={handleCancel} size="extra-large">
{localeService.t<LocaleKey>('docs-hyper-link-ui.edit.cancel')}
</Button>
<Button
@@ -92,6 +96,7 @@ export function MobileDocHyperLinkEdit() {
className="univer-h-12 univer-flex-1"
disabled={isBlankInput(link)}
onClick={handleConfirm}
+ size="extra-large"
>
{localeService.t<LocaleKey>('docs-hyper-link-ui.edit.confirm')}
</Button>
diff --git a/packages/docs-ui/src/views/header-footer/panel/DocHeaderFooterOptions.tsx b/packages/docs-ui/src/views/header-footer/panel/DocHeaderFooterOptions.tsx
index 16d71bca76..198a18ecdd 100644
--- a/packages/docs-ui/src/views/header-footer/panel/DocHeaderFooterOptions.tsx
+++ b/packages/docs-ui/src/views/header-footer/panel/DocHeaderFooterOptions.tsx
@@ -15,11 +15,11 @@
*/
import type { ComponentType } from 'react';
-import type { LocaleKey } from '../../../locale/types';
import { BooleanNumber, LocaleService } from '@univerjs/core';
import { Button, Checkbox, InputNumber } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
import { useDependency, useObservable } from '@univerjs/ui';
+import type { LocaleKey } from '../../../locale/types';
import { DocSelectionRenderService } from '../../../services/selection/doc-selection-render.service';
import { useHeaderFooterOptions } from './use-header-footer-options';
@@ -71,11 +71,11 @@ function DocHeaderFooterOptionsContent({ unitId }: { unitId: string }) {
</div>
</div>
- <div className="univer-mb-1 univer-flex">
+ <div className="univer-mb-1 univer-grid univer-grid-cols-2 univer-items-end univer-gap-4">
<div>
<span>{localeService.t<LocaleKey>('docs-ui.headerFooter.headerTopMargin')}</span>
<InputNumber
- className="univer-mt-1.5 univer-w-4/5"
+ className="univer-mt-1.5 univer-w-full"
min={0}
max={200}
precision={1}
@@ -86,7 +86,7 @@ function DocHeaderFooterOptionsContent({ unitId }: { unitId: string }) {
<div>
<span>{localeService.t<LocaleKey>('docs-ui.headerFooter.footerBottomMargin')}</span>
<InputNumber
- className="univer-mt-1.5 univer-w-4/5"
+ className="univer-mt-1.5 univer-w-full"
min={0}
max={200}
precision={1}
diff --git a/packages/docs-ui/src/views/mobile-rich-text-editor/MobileRichTextEditor.tsx b/packages/docs-ui/src/views/mobile-rich-text-editor/MobileRichTextEditor.tsx
index 61042dd058..3896debe2d 100644
--- a/packages/docs-ui/src/views/mobile-rich-text-editor/MobileRichTextEditor.tsx
+++ b/packages/docs-ui/src/views/mobile-rich-text-editor/MobileRichTextEditor.tsx
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-import type { Editor } from '../../services/editor/editor';
-import type { IRichTextEditorProps } from '../RichTextEditor';
import { Button, clsx, useMobileKeyboardViewportLayout } from '@univerjs/design';
import { DocSkeletonManagerService } from '@univerjs/docs';
import { CheckMarkIcon, CloseIcon, DownIcon } from '@univerjs/icons';
import { MobileKeyboardInsetContext, useEvent, useMobileCanvasPanel } from '@univerjs/ui';
import { useContext, useEffect, useRef, useState } from 'react';
+import type { Editor } from '../../services/editor/editor';
+import type { IRichTextEditorProps } from '../RichTextEditor';
import { MobileRichTextToolbar } from '../mobile-rich-text-toolbar/MobileRichTextToolbar';
import { RichTextEditor } from '../RichTextEditor';
@@ -74,6 +74,7 @@ export function MobileRichTextEditor(props: IMobileRichTextEditorProps) {
aria-expanded={expanded}
onPointerDown={(event) => event.preventDefault()}
onClick={() => onExpandedChange(!expanded)}
+ size="extra-large"
>
<DownIcon className={clsx('univer-size-5', !expanded && 'univer-rotate-180')} />
</Button>
@@ -117,10 +118,10 @@ export function MobileRichTextEditor(props: IMobileRichTextEditorProps) {
dark:!univer-bg-gray-800
`)}
>
- <Button variant="ghost" className={buttonClassName} aria-label={labels.cancel} onPointerDown={(event) => event.preventDefault()} onClick={onCancel}>
+ <Button variant="ghost" className={buttonClassName} aria-label={labels.cancel} onPointerDown={(event) => event.preventDefault()} onClick={onCancel} size="extra-large">
<CloseIcon />
</Button>
- <Button variant="ghost" className={clsx(buttonClassName, 'univer-text-primary-600')} aria-label={labels.confirm} onPointerDown={(event) => event.preventDefault()} onClick={onConfirm}>
+ <Button variant="ghost" className={clsx(buttonClassName, 'univer-text-primary-600')} aria-label={labels.confirm} onPointerDown={(event) => event.preventDefault()} onClick={onConfirm} size="extra-large">
<CheckMarkIcon />
</Button>
{expanded && expandButton}
diff --git a/packages/docs-ui/src/views/mobile/MobileDocPasteOptions.tsx b/packages/docs-ui/src/views/mobile/MobileDocPasteOptions.tsx
index d60533e5f5..5fc361bd34 100644
--- a/packages/docs-ui/src/views/mobile/MobileDocPasteOptions.tsx
+++ b/packages/docs-ui/src/views/mobile/MobileDocPasteOptions.tsx
@@ -15,15 +15,15 @@
*/
import type { IPopupWithExtraProps, MobileDrawerSnap } from '@univerjs/ui';
-import type { LocaleKey } from '../../locale/types';
-import type { DocPasteMode } from '../../services/clipboard/paste-options';
-import type { MobileDocSelectionRenderService } from '../../services/mobile/doc-selection-render.service';
import { ICommandService, LocaleService } from '@univerjs/core';
import { Button } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
import { CheckMarkIcon, DocPasteOptionsIcon } from '@univerjs/icons';
import { MobileDrawer, useDependency, useObservable } from '@univerjs/ui';
import { useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
+import type { DocPasteMode } from '../../services/clipboard/paste-options';
+import type { MobileDocSelectionRenderService } from '../../services/mobile/doc-selection-render.service';
import { DocChangePasteModeCommand } from '../../commands/commands/clipboard.command';
import { IDocClipboardService } from '../../services/clipboard/clipboard.service';
import { DOC_PASTE_OPTIONS } from '../../services/clipboard/paste-options';
@@ -76,6 +76,7 @@ export function MobileDocPasteOptions({ popup }: { popup: IPopupWithExtraProps<{
selection?.suspendMobileEditingInput();
setOpen(true);
}}
+ size="icon"
>
<DocPasteOptionsIcon aria-hidden="true" />
</Button>
@@ -101,7 +102,7 @@ export function MobileDocPasteOptions({ popup }: { popup: IPopupWithExtraProps<{
"
>
<span>{localeService.t<LocaleKey>('docs-ui.pasteOptions.title')}</span>
- <Button variant="text" className="univer-min-h-11" onClick={() => setOpen(false)}>
+ <Button variant="text" className="univer-min-h-11" onClick={() => setOpen(false)} size="extra-large">
{localeService.t<LocaleKey>('docs-ui.mobile.done')}
</Button>
</div>
@@ -124,6 +125,7 @@ export function MobileDocPasteOptions({ popup }: { popup: IPopupWithExtraProps<{
univer-py-3 univer-text-start
"
onClick={() => changeMode(option.value)}
+ size="extra-large"
>
<span
className="univer-inline-flex univer-size-5 univer-shrink-0 univer-items-center"
diff --git a/packages/docs-ui/src/views/mobile/MobileDocSettings.tsx b/packages/docs-ui/src/views/mobile/MobileDocSettings.tsx
index a4da7136d1..c2798cfa5c 100644
--- a/packages/docs-ui/src/views/mobile/MobileDocSettings.tsx
+++ b/packages/docs-ui/src/views/mobile/MobileDocSettings.tsx
@@ -16,12 +16,12 @@
import type { IConfirmChildrenProps } from '@univerjs/ui';
import type { ComponentProps, ReactNode } from 'react';
-import type { LocaleKey } from '../../locale/types';
-import type { IParagraphAlignmentButtonProps, IParagraphSettingProps } from '../paragraph-setting/Setting';
import { BooleanNumber, LocaleService } from '@univerjs/core';
import { Button, Checkbox, clsx, InputNumber, MobileSelect } from '@univerjs/design';
import { useDependency } from '@univerjs/ui';
import { forwardRef } from 'react';
+import type { LocaleKey } from '../../locale/types';
+import type { IParagraphAlignmentButtonProps, IParagraphSettingProps } from '../paragraph-setting/Setting';
import { DocHeaderFooterPanel } from '../header-footer/panel/DocHeaderFooterPanel';
import { useHeaderFooterOptions } from '../header-footer/panel/use-header-footer-options';
import { PageSettings } from '../PageSettings';
@@ -51,6 +51,8 @@ const MobileSettingNumber = forwardRef<HTMLInputElement, ComponentProps<typeof I
ref={ref}
className={clsx(props.className, 'univer-h-12 univer-w-full')}
inputClassName={clsx(props.inputClassName, 'univer-text-base')}
+ size="large"
+ controls={false}
/>
));
@@ -71,6 +73,7 @@ function MobileParagraphAlignmentButton({ label, selected, onClick, children }:
aria-pressed={selected}
className={clsx('univer-h-12 univer-w-full', { '!univer-bg-gray-200 dark:!univer-bg-gray-700': selected })}
onClick={onClick}
+ size="extra-large"
>
<span className="univer-flex univer-size-5 univer-items-center univer-justify-center univer-text-lg">
{children}
@@ -159,7 +162,7 @@ function MobileHeaderFooterOptions({ unitId }: { unitId: string }) {
</div>
<div className="univer-flex">
- <Button className="univer-h-12 univer-w-full" onClick={closeHeaderFooter}>
+ <Button className="univer-h-12 univer-w-full" onClick={closeHeaderFooter} size="extra-large">
{localeService.t<LocaleKey>('docs-ui.headerFooter.closeHeaderFooter')}
</Button>
</div>
diff --git a/packages/drawing-ui/src/views/object-list-panel/MobileObjectListPanel.tsx b/packages/drawing-ui/src/views/object-list-panel/MobileObjectListPanel.tsx
index 549ae68d1c..aca4d3e2bd 100644
--- a/packages/drawing-ui/src/views/object-list-panel/MobileObjectListPanel.tsx
+++ b/packages/drawing-ui/src/views/object-list-panel/MobileObjectListPanel.tsx
@@ -34,6 +34,7 @@ function MobileObjectListInput(props: ComponentProps<typeof Input>) {
{...props}
className={clsx(props.className, 'univer-h-12')}
inputClass={clsx(props.inputClass, '!univer-text-base')}
+ size="large"
/>
);
}
@@ -120,6 +121,7 @@ export function MobileObjectListPanel(props: IObjectListPanelBaseProps) {
aria-label={labels.search}
placeholder={labels.search}
onChange={setSearchQuery}
+ size="large"
/>
<div className="univer-flex univer-min-w-0 univer-gap-1">
{([
diff --git a/packages/drawing-ui/src/views/panel/MobileDrawingArrange.tsx b/packages/drawing-ui/src/views/panel/MobileDrawingArrange.tsx
index cf2aa416ce..4494de4a03 100644
--- a/packages/drawing-ui/src/views/panel/MobileDrawingArrange.tsx
+++ b/packages/drawing-ui/src/views/panel/MobileDrawingArrange.tsx
@@ -15,11 +15,11 @@
*/
import type { IDrawingParam } from '@univerjs/core';
-import type { LocaleKey } from '../../locale/types';
import { ArrangeTypeEnum, ICommandService, LocaleService } from '@univerjs/core';
import { Button, clsx } from '@univerjs/design';
import { IDrawingManagerService } from '@univerjs/drawing';
import { IconManager, useDependency, useObservable } from '@univerjs/ui';
+import type { LocaleKey } from '../../locale/types';
import { SetDrawingArrangeOperation } from '../../commands/operations/drawing-arrange.operation';
interface IMobileDrawingArrangeProps {
@@ -64,19 +64,19 @@ export function MobileDrawingArrange(props: IMobileDrawingArrangeProps) {
</header>
<div className="univer-grid univer-grid-cols-2 univer-gap-2">
- <Button className="univer-h-12 univer-w-full" onClick={() => arrange(ArrangeTypeEnum.forward)}>
+ <Button className="univer-h-12 univer-w-full" onClick={() => arrange(ArrangeTypeEnum.forward)} size="extra-large">
<MoveUpIcon />
{localeService.t<LocaleKey>('drawing-ui.image-panel.arrange.forward')}
</Button>
- <Button className="univer-h-12 univer-w-full" onClick={() => arrange(ArrangeTypeEnum.backward)}>
+ <Button className="univer-h-12 univer-w-full" onClick={() => arrange(ArrangeTypeEnum.backward)} size="extra-large">
<MoveDownIcon />
{localeService.t<LocaleKey>('drawing-ui.image-panel.arrange.backward')}
</Button>
- <Button className="univer-h-12 univer-w-full" onClick={() => arrange(ArrangeTypeEnum.front)}>
+ <Button className="univer-h-12 univer-w-full" onClick={() => arrange(ArrangeTypeEnum.front)} size="extra-large">
<TopmostIcon />
{localeService.t<LocaleKey>('drawing-ui.image-panel.arrange.front')}
</Button>
- <Button className="univer-h-12 univer-w-full" onClick={() => arrange(ArrangeTypeEnum.back)}>
+ <Button className="univer-h-12 univer-w-full" onClick={() => arrange(ArrangeTypeEnum.back)} size="extra-large">
<BottomIcon />
{localeService.t<LocaleKey>('drawing-ui.image-panel.arrange.back')}
</Button>
diff --git a/packages/drawing-ui/src/views/panel/MobileDrawingControls.tsx b/packages/drawing-ui/src/views/panel/MobileDrawingControls.tsx
index e478e2903f..a80593a26e 100644
--- a/packages/drawing-ui/src/views/panel/MobileDrawingControls.tsx
+++ b/packages/drawing-ui/src/views/panel/MobileDrawingControls.tsx
@@ -17,7 +17,6 @@
import type { IDrawingParam, Nullable } from '@univerjs/core';
import type { IChangeObserverConfig, Scene } from '@univerjs/engine-render';
import type { ComponentProps } from 'react';
-import type { LocaleKey } from '../../locale/types';
import { debounce, DrawingTypeEnum, ICommandService, LocaleService } from '@univerjs/core';
import { Button, Checkbox, clsx, InputNumber, MobileSelect } from '@univerjs/design';
import { IDrawingManagerService } from '@univerjs/drawing';
@@ -25,6 +24,7 @@ import { IRenderManagerService } from '@univerjs/engine-render';
import { IconManager, useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useState } from 'react';
import { filter, map, merge } from 'rxjs';
+import type { LocaleKey } from '../../locale/types';
import { AlignType, SetDrawingAlignOperation } from '../../commands/operations/drawing-align.operation';
import { CancelDrawingGroupOperation, SetDrawingGroupOperation } from '../../commands/operations/drawing-group.operation';
import { MIN_DRAWING_HEIGHT_LIMIT, MIN_DRAWING_WIDTH_LIMIT, RANGE_DRAWING_ROTATION_LIMIT } from '../../utils/config';
@@ -56,6 +56,7 @@ function MobileDrawingInputNumber(props: ComponentProps<typeof InputNumber>) {
controls={false}
className={clsx('univer-h-12 univer-w-full', props.className)}
inputClassName={clsx('[&_input]:!univer-h-12 [&_input]:!univer-text-base', props.inputClassName)}
+ size="large"
/>
);
}
@@ -72,6 +73,7 @@ function MobileDrawingButton(props: ComponentProps<typeof Button>) {
univer-flex univer-min-h-12 univer-flex-1 univer-items-center univer-justify-center univer-gap-2
univer-text-base
`, props.className)}
+ size="extra-large"
/>
);
}
diff --git a/packages/find-replace/src/views/mobile/MobileFindReplaceBar.tsx b/packages/find-replace/src/views/mobile/MobileFindReplaceBar.tsx
index 80b45d83fd..535ce34b95 100644
--- a/packages/find-replace/src/views/mobile/MobileFindReplaceBar.tsx
+++ b/packages/find-replace/src/views/mobile/MobileFindReplaceBar.tsx
@@ -15,12 +15,12 @@
*/
import type { ReactNode } from 'react';
-import type { LocaleKey } from '../../locale/types';
import { ICommandService, LocaleService } from '@univerjs/core';
import { Button, Input, useMobileKeyboardViewportLayout } from '@univerjs/design';
import { ArrowDownIcon, ArrowUpIcon, CloseIcon, ConfigureTabIcon, SearchIcon } from '@univerjs/icons';
import { IDialogService, useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useRef, useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
import { ReplaceAllMatchesCommand, ReplaceCurrentMatchCommand } from '../../commands/commands/replace.command';
import {
CloseFindDialogOperation,
@@ -239,6 +239,7 @@ function MobileFindReplaceBarContent() {
value={state.replaceString}
placeholder={localeService.t<LocaleKey>('find-replace.dialog.replace-placeholder')}
onChange={(value) => findReplaceService.changeReplaceString(value)}
+ inputClass="univer-text-base"
/>
<ActionButton
disabled={replaceDisabled}
diff --git a/packages/sheets-conditional-formatting-ui/src/views/ConditionFormattingPanel.tsx b/packages/sheets-conditional-formatting-ui/src/views/ConditionFormattingPanel.tsx
index 5e0bdca611..067fd24635 100644
--- a/packages/sheets-conditional-formatting-ui/src/views/ConditionFormattingPanel.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/views/ConditionFormattingPanel.tsx
@@ -51,7 +51,7 @@ export const ConditionFormattingPanel = (props: IConditionFormattingPanelProps)
};
return (
- <div className="univer-flex univer-h-full univer-flex-col univer-justify-between univer-py-4">
+ <div className="univer-box-border univer-flex univer-h-full univer-flex-col univer-justify-between univer-py-4">
{isShowRuleEditor
? (
<RuleEditComponent onCancel={handleCancel} rule={currentEditRule} />
diff --git a/packages/sheets-filter-ui/src/views/mobile/MobileFilterByCondition.tsx b/packages/sheets-filter-ui/src/views/mobile/MobileFilterByCondition.tsx
index dc64fbed24..ea4502aac8 100644
--- a/packages/sheets-filter-ui/src/views/mobile/MobileFilterByCondition.tsx
+++ b/packages/sheets-filter-ui/src/views/mobile/MobileFilterByCondition.tsx
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-import type { LocaleKey } from '../../locale/types';
-import type { FilterOperator } from '../../models/conditions';
-import type { ByConditionsModel } from '../../services/sheets-filter-panel.service';
import { LocaleService } from '@univerjs/core';
import { Input, MobileSelect, Radio, RadioGroup } from '@univerjs/design';
import { useDependency, useObservable } from '@univerjs/ui';
+import type { LocaleKey } from '../../locale/types';
+import type { FilterOperator } from '../../models/conditions';
+import type { ByConditionsModel } from '../../services/sheets-filter-panel.service';
import { FilterConditionItems } from '../../models/conditions';
export function MobileFilterByCondition(props: { model: ByConditionsModel }) {
@@ -62,6 +62,8 @@ export function MobileFilterByCondition(props: { model: ByConditionsModel }) {
onChange={(nextValue) => model.onConditionFormChange({
[name === 'operator1' ? 'val1' : 'val2']: nextValue,
})}
+ size="large"
+ inputClass="univer-text-base"
/>
)}
</div>
@@ -76,6 +78,8 @@ export function MobileFilterByCondition(props: { model: ByConditionsModel }) {
value={formParams!.val1 ?? ''}
placeholder={localeService.t<LocaleKey>('sheets-filter-ui.panel.input-values-placeholder')}
onChange={(value) => model.onConditionFormChange({ val1: value })}
+ size="large"
+ inputClass="univer-text-base"
/>
)}
{condition!.numOfParameters >= 2 && renderSecondaryCondition(
diff --git a/packages/sheets-filter-ui/src/views/mobile/MobileFilterByValue.tsx b/packages/sheets-filter-ui/src/views/mobile/MobileFilterByValue.tsx
index 9481ee17fb..1deb2a29d4 100644
--- a/packages/sheets-filter-ui/src/views/mobile/MobileFilterByValue.tsx
+++ b/packages/sheets-filter-ui/src/views/mobile/MobileFilterByValue.tsx
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-import type { LocaleKey } from '../../locale/types';
-import type { ByValuesModel, IFilterByValueWithTreeItem } from '../../services/sheets-filter-panel.service';
import { LocaleService } from '@univerjs/core';
import { Checkbox, Input, resetButtonClassName, Tree } from '@univerjs/design';
import { CloseIcon, SearchIcon } from '@univerjs/icons';
import { useDependency, useObservable } from '@univerjs/ui';
import { useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
+import type { ByValuesModel, IFilterByValueWithTreeItem } from '../../services/sheets-filter-panel.service';
import { statisticFilterByValueItems } from '../../models/utils';
function extractCheckedKeys(items: IFilterByValueWithTreeItem[]): string[] {
@@ -65,6 +65,8 @@ export function MobileFilterByValue(props: { model: ByValuesModel }) {
value={searchText}
placeholder={searchLabel}
onChange={(value) => model.setSearchString(value)}
+ size="large"
+ inputClass="univer-text-base"
/>
<button
type="button"
diff --git a/packages/sheets-filter-ui/src/views/mobile/MobileSheetsFilterPanel.tsx b/packages/sheets-filter-ui/src/views/mobile/MobileSheetsFilterPanel.tsx
index 25298eeac1..023bc0b8d6 100644
--- a/packages/sheets-filter-ui/src/views/mobile/MobileSheetsFilterPanel.tsx
+++ b/packages/sheets-filter-ui/src/views/mobile/MobileSheetsFilterPanel.tsx
@@ -231,13 +231,14 @@ function MobileSheetsFilterPanelContent() {
"
>
<MobileActionRowGroup>
- <Button onClick={() => closePanel().catch(() => undefined)}>
+ <Button onClick={() => closePanel().catch(() => undefined)} size="extra-large">
{localeService.t<LocaleKey>('sheets-filter-ui.panel.cancel')}
</Button>
<Button
variant="primary"
disabled={!canApply || !filterByModel}
onClick={() => applyFilter().catch(() => undefined)}
+ size="extra-large"
>
{localeService.t<LocaleKey>('sheets-filter-ui.panel.confirm')}
</Button>
@@ -264,12 +265,14 @@ function MobileSheetsFilterPanelContent() {
<Button
disabled={!filterRange || col <= filterRange.startColumn}
onClick={() => changeColumn(-1)}
+ size="extra-large"
>
{localeService.t<LocaleKey>('sheets-filter-ui.panel.mobile.previous-column')}
</Button>
<Button
disabled={!filterRange || col >= filterRange.endColumn}
onClick={() => changeColumn(1)}
+ size="extra-large"
>
{localeService.t<LocaleKey>('sheets-filter-ui.panel.mobile.next-column')}
</Button>
diff --git a/packages/sheets-formula-ui/src/views/mobile/formula-editor/mobile-function-panel/MobileFunctionPanel.tsx b/packages/sheets-formula-ui/src/views/mobile/formula-editor/mobile-function-panel/MobileFunctionPanel.tsx
index 6b1e4ee158..493665adf1 100644
--- a/packages/sheets-formula-ui/src/views/mobile/formula-editor/mobile-function-panel/MobileFunctionPanel.tsx
+++ b/packages/sheets-formula-ui/src/views/mobile/formula-editor/mobile-function-panel/MobileFunctionPanel.tsx
@@ -15,12 +15,12 @@
*/
import type { IFunctionInfo, ISearchItem } from '@univerjs/engine-formula';
-import type { LocaleKey } from '../../../../locale/types';
import { LocaleService } from '@univerjs/core';
import { clsx, Input, scrollbarClassName } from '@univerjs/design';
import { FunctionType, IDescriptionService } from '@univerjs/engine-formula';
import { useDependency } from '@univerjs/ui';
import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import type { LocaleKey } from '../../../../locale/types';
import { getFunctionTypeValues } from '../../../../services/utils';
const RECENT_FUNCTIONS_KEY = 'univer-mobile-recent-formula-functions';
@@ -252,6 +252,8 @@ export function MobileFunctionPanel(props: {
aria-label={copy.search}
placeholder={copy.search}
onChange={setQuery}
+ size="large"
+ inputClass="univer-text-base"
/>
</div>
{!query && (
diff --git a/packages/sheets-formula-ui/src/views/range-selector/MobileRangeSelector.tsx b/packages/sheets-formula-ui/src/views/range-selector/MobileRangeSelector.tsx
index 8f75596eaf..26144295cd 100644
--- a/packages/sheets-formula-ui/src/views/range-selector/MobileRangeSelector.tsx
+++ b/packages/sheets-formula-ui/src/views/range-selector/MobileRangeSelector.tsx
@@ -17,14 +17,14 @@
import type { IUnitRangeName } from '@univerjs/core';
import type { Editor } from '@univerjs/docs-ui';
import type { ISetSelectionsOperationParams } from '@univerjs/sheets';
-import type { LocaleKey } from '../../locale/types';
-import type { IRangeSelectorProps } from './index';
import { ICommandService, LocaleService, RichTextBuilder } from '@univerjs/core';
import { IEditorService, RichTextEditor } from '@univerjs/docs-ui';
import { SelectRangeIcon } from '@univerjs/icons';
import { SetSelectionsOperation } from '@univerjs/sheets';
import { useDependency, useEvent } from '@univerjs/ui';
import { useEffect, useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
+import type { IRangeSelectorProps } from './index';
import { useStateRef } from '../formula-editor/hooks/use-state-ref';
import { useRangesHighlight } from './hooks/use-ranges-highlight';
import { parseRanges, stringifyRanges } from './index';
@@ -125,6 +125,8 @@ export function MobileRangeSelector(props: IRangeSelectorProps) {
<RichTextEditor
isSingle
{...props}
+ defaultHeight={48}
+ maxHeight={48}
className={className}
preserveHostFocus
onFocusChange={(isFocusing, newValue) => {
diff --git a/packages/sheets-formula-ui/src/views/range-selector/MobileRangeSelectorDialog.tsx b/packages/sheets-formula-ui/src/views/range-selector/MobileRangeSelectorDialog.tsx
index 39dcc8852c..b35d751c02 100644
--- a/packages/sheets-formula-ui/src/views/range-selector/MobileRangeSelectorDialog.tsx
+++ b/packages/sheets-formula-ui/src/views/range-selector/MobileRangeSelectorDialog.tsx
@@ -15,8 +15,6 @@
*/
import type { MobileDrawerSnap } from '@univerjs/ui';
-import type { LocaleKey } from '../../locale/types';
-import type { IRangeSelectorDialogProps } from './index';
import { LocaleService } from '@univerjs/core';
import { Button, clsx, ConfigContext, Input, MobileActionRowGroup, scrollbarClassName } from '@univerjs/design';
import {
@@ -30,6 +28,8 @@ import { DeleteIcon, IncreaseIcon } from '@univerjs/icons';
import { MobileDrawer, useDependency } from '@univerjs/ui';
import { useContext, useEffect, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
+import type { LocaleKey } from '../../locale/types';
+import type { IRangeSelectorDialogProps } from './index';
import { useRangeSelectorSelectionChange } from './hooks/use-selection-change';
import { rangePreProcess } from './utils/range-pre-process';
@@ -146,6 +146,8 @@ export function MobileRangeSelectorDialog(props: IRangeSelectorDialogProps) {
onFocus={() => setFocusIndex(index)}
value={text}
onChange={(value) => handleRangeInput(index, value)}
+ size="large"
+ inputClass="univer-text-base"
/>
{ranges.length > 1 && (
<button
@@ -203,10 +205,10 @@ export function MobileRangeSelectorDialog(props: IRangeSelectorDialogProps) {
footer={(
<footer className="univer-box-border univer-shrink-0 univer-p-4">
<MobileActionRowGroup>
- <Button onClick={onClose}>
+ <Button onClick={onClose} size="extra-large">
{localeService.t<LocaleKey>('sheets-formula-ui.rangeSelector.cancel')}
</Button>
- <Button variant="primary" onClick={confirmRanges}>
+ <Button variant="primary" onClick={confirmRanges} size="extra-large">
{localeService.t<LocaleKey>('sheets-formula-ui.rangeSelector.confirm')}
</Button>
</MobileActionRowGroup>
@@ -227,6 +229,7 @@ export function MobileRangeSelectorDialog(props: IRangeSelectorDialogProps) {
setRanges([...ranges, '']);
setFocusIndex(ranges.length);
}}
+ size="large"
>
<IncreaseIcon />
<span>{localeService.t<LocaleKey>('sheets-formula-ui.rangeSelector.addAnotherRange')}</span>
diff --git a/packages/sheets-hyper-link-ui/src/views/MobileCellLinkEdit.tsx b/packages/sheets-hyper-link-ui/src/views/MobileCellLinkEdit.tsx
index 4bc67faea8..45cd7ee3a4 100644
--- a/packages/sheets-hyper-link-ui/src/views/MobileCellLinkEdit.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/MobileCellLinkEdit.tsx
@@ -16,7 +16,6 @@
import type { DocumentDataModel, Nullable, Workbook } from '@univerjs/core';
import type { ISelectionWithStyle } from '@univerjs/sheets';
-import type { LocaleKey } from '../locale/types';
import {
BuildTextUtils,
ColorKit,
@@ -54,6 +53,7 @@ import {
import { IEditorBridgeService, IMarkSelectionService } from '@univerjs/sheets-ui';
import { KeyCode, useDependency, useEvent, useObservable } from '@univerjs/ui';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import type { LocaleKey } from '../locale/types';
import { CloseHyperLinkPopupOperation } from '../commands/operations/popup.operations';
import { isLegalLink, serializeUrl } from '../common/util';
import { ISheetsHyperLinkPopupService } from '../services/popup.service';
@@ -448,12 +448,14 @@ export const MobileCellLinkEdit = () => {
handleSubmit();
}
}}
+ size="large"
+ inputClass="univer-text-base"
/>
</FormLayout>
)
: null}
<FormLayout label={localeService.t<LocaleKey>('sheets-hyper-link-ui.form.tooltip')}>
- <Input value={tooltip} onChange={setTooltip} />
+ <Input value={tooltip} onChange={setTooltip} size="large" inputClass="univer-text-base" />
</FormLayout>
<FormLayout label={localeService.t<LocaleKey>('sheets-hyper-link-ui.form.type')}>
<MobileSelect
@@ -487,6 +489,8 @@ export const MobileCellLinkEdit = () => {
handleSubmit();
}
}}
+ size="large"
+ inputClass="univer-text-base"
/>
</FormLayout>
)}
@@ -574,12 +578,14 @@ export const MobileCellLinkEdit = () => {
}
await commandService.executeCommand(CloseHyperLinkPopupOperation.id);
}}
+ size="extra-large"
>
{localeService.t<LocaleKey>('sheets-hyper-link-ui.form.cancel')}
</Button>
<Button
variant="primary"
onClick={handleSubmit}
+ size="extra-large"
>
{localeService.t<LocaleKey>('sheets-hyper-link-ui.form.ok')}
</Button>
diff --git a/packages/sheets-numfmt-ui/src/views/SheetNumfmtPanel.tsx b/packages/sheets-numfmt-ui/src/views/SheetNumfmtPanel.tsx
index 883bd19214..4dee867943 100644
--- a/packages/sheets-numfmt-ui/src/views/SheetNumfmtPanel.tsx
+++ b/packages/sheets-numfmt-ui/src/views/SheetNumfmtPanel.tsx
@@ -16,13 +16,13 @@
import type { ISelectProps } from '@univerjs/design';
import type { ComponentType } from 'react';
-import type { LocaleKey } from '../locale/types';
-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, useObservable } from '@univerjs/ui';
import { useCallback, useRef, useState } from 'react';
+import type { LocaleKey } from '../locale/types';
+import type { IBusinessComponentProps } from './components/interface';
import { UserHabitCurrencyContext } from '../controllers/user-habit.controller';
import { AccountingPanel, isAccountingPanel } from './components/Accounting';
import { CurrencyPanel, isCurrencyPanel } from './components/Currency';
@@ -116,7 +116,10 @@ function SheetNumfmtPanelContent(props: ISheetNumfmtPanelProps) {
return (
<div
className={clsx(
- 'univer-flex univer-h-full univer-flex-col univer-justify-between univer-overflow-y-auto univer-pb-5',
+ `
+ univer-box-border univer-flex univer-h-full univer-flex-col univer-justify-between
+ univer-overflow-y-auto univer-pb-5
+ `,
scrollbarClassName
)}
>
diff --git a/packages/sheets-numfmt-ui/src/views/mobile/MobileCustomFormat.tsx b/packages/sheets-numfmt-ui/src/views/mobile/MobileCustomFormat.tsx
index 634c2d6e49..38bb3e5567 100644
--- a/packages/sheets-numfmt-ui/src/views/mobile/MobileCustomFormat.tsx
+++ b/packages/sheets-numfmt-ui/src/views/mobile/MobileCustomFormat.tsx
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-import type { LocaleKey } from '../../locale/types';
import { LocaleService } from '@univerjs/core';
import { Button, Input, MobileActionRowGroup, MobileSelect } from '@univerjs/design';
import { getDateFormatOptions } from '@univerjs/sheets-numfmt';
import { useDependency, useObservable } from '@univerjs/ui';
import { useMemo, useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
export interface IMobileCustomFormatProps {
patterns: string[];
@@ -50,6 +50,8 @@ export function MobileCustomFormat(props: IMobileCustomFormatProps) {
value={pattern}
placeholder={title}
onChange={setPattern}
+ size="large"
+ inputClass="univer-text-base"
/>
<MobileSelect
className="
@@ -69,7 +71,7 @@ export function MobileCustomFormat(props: IMobileCustomFormatProps) {
{localeService.t<LocaleKey>('sheets-numfmt-ui.customFormatDes')}
</div>
<MobileActionRowGroup className="univer-shrink-0">
- <Button variant="primary" disabled={!pattern.trim()} onClick={() => onConfirm(pattern.trim())}>
+ <Button variant="primary" disabled={!pattern.trim()} onClick={() => onConfirm(pattern.trim())} size="extra-large">
{localeService.t<LocaleKey>('sheets-numfmt-ui.confirm')}
</Button>
</MobileActionRowGroup>
diff --git a/packages/sheets-sort-ui/src/views/mobile/MobileCustomSortPanel.tsx b/packages/sheets-sort-ui/src/views/mobile/MobileCustomSortPanel.tsx
index fc17ce49c3..c066829428 100644
--- a/packages/sheets-sort-ui/src/views/mobile/MobileCustomSortPanel.tsx
+++ b/packages/sheets-sort-ui/src/views/mobile/MobileCustomSortPanel.tsx
@@ -15,14 +15,14 @@
*/
import type { IOrderRule } from '@univerjs/sheets-sort';
-import type { LocaleKey } from '../../locale/types';
-import type { ISheetSortLocation } from '../../services/sheets-sort-ui.service';
import { LocaleService } from '@univerjs/core';
import { Button, Checkbox, MobileSelect } from '@univerjs/design';
import { DeleteEmptyIcon } from '@univerjs/icons';
import { SheetsSortService, SortType } from '@univerjs/sheets-sort';
import { useDependency, useObservable } from '@univerjs/ui';
import { useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
+import type { ISheetSortLocation } from '../../services/sheets-sort-ui.service';
import { SheetsSortUIService } from '../../services/sheets-sort-ui.service';
export function MobileCustomSortPanel() {
@@ -82,7 +82,7 @@ function MobileCustomSortPanelContent({ location }: { location: ISheetSortLocati
<Checkbox checked={hasTitle} onChange={(value) => setTitle(Boolean(value))}>
{localeService.t<LocaleKey>('sheets-sort-ui.dialog.first-row-check')}
</Checkbox>
- <Button variant="text" disabled={!canAddCondition} onClick={addCondition}>
+ <Button variant="text" disabled={!canAddCondition} onClick={addCondition} size="extra-large">
{localeService.t<LocaleKey>('sheets-sort-ui.dialog.add-condition')}
</Button>
</div>
diff --git a/packages/sheets-table-ui/src/views/components/MobileSheetTableConditionPanel.tsx b/packages/sheets-table-ui/src/views/components/MobileSheetTableConditionPanel.tsx
index 1eb9bbc162..f87acf89df 100644
--- a/packages/sheets-table-ui/src/views/components/MobileSheetTableConditionPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/MobileSheetTableConditionPanel.tsx
@@ -15,13 +15,6 @@
*/
import type { ITableFilterItem } from '@univerjs/sheets-table';
-import type { LocaleKey } from '../../locale/types';
-import type {
- IConditionCompareTypeEnum,
- IConditionExpect,
- IConditionInfo,
- ITableConditionTypeEnumWithoutLogic,
-} from './type';
import { Injector, LocaleService } from '@univerjs/core';
import {
borderClassName,
@@ -37,6 +30,13 @@ import { MoreDownIcon } from '@univerjs/icons';
import { TableConditionTypeEnum, TableDateCompareTypeEnum, TableStringCompareTypeEnum } from '@univerjs/sheets-table';
import { useDependency } from '@univerjs/ui';
import { useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
+import type {
+ IConditionCompareTypeEnum,
+ IConditionExpect,
+ IConditionInfo,
+ ITableConditionTypeEnumWithoutLogic,
+} from './type';
import { ConditionSubComponentEnum } from './type';
import { datePickerSet, getCascaderListOptions, getConditionDateSelect, getSubComponentType } from './util';
@@ -162,6 +162,8 @@ export function MobileSheetTableConditionPanel(props: IMobileSheetTableCondition
placeholder={localeService.t<LocaleKey>('sheets-table-ui.filter.input-values-placeholder')}
value={conditionInfo.info.string}
onChange={(value) => handleConditionInfo({ string: value })}
+ size="large"
+ inputClass="univer-text-base"
/>
)
: (
@@ -177,6 +179,8 @@ export function MobileSheetTableConditionPanel(props: IMobileSheetTableCondition
handleConditionInfo({ number: Number(value) });
}
}}
+ size="large"
+ inputClass="univer-text-base"
/>
)}
</>
@@ -216,6 +220,8 @@ export function MobileSheetTableConditionPanel(props: IMobileSheetTableCondition
handleConditionInfo({ numberRange: [Number(value), conditionInfo.info.numberRange?.[1]] });
}
}}
+ size="large"
+ inputClass="univer-text-base"
/>
<span> - </span>
<Input
@@ -230,6 +236,8 @@ export function MobileSheetTableConditionPanel(props: IMobileSheetTableCondition
handleConditionInfo({ numberRange: [conditionInfo.info.numberRange?.[0], Number(value)] });
}
}}
+ size="large"
+ inputClass="univer-text-base"
/>
</div>
)}
diff --git a/packages/sheets-table-ui/src/views/components/MobileSheetTableFilterPanel.tsx b/packages/sheets-table-ui/src/views/components/MobileSheetTableFilterPanel.tsx
index 1575d3d54a..415d4a0dcf 100644
--- a/packages/sheets-table-ui/src/views/components/MobileSheetTableFilterPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/MobileSheetTableFilterPanel.tsx
@@ -21,10 +21,6 @@ import type {
ITableFilterItem,
} from '@univerjs/sheets-table';
import type { MobileDrawerSnap } from '@univerjs/ui';
-import type { ITableFilterPanelInfo } from '../../controllers/sheet-table-component.controller';
-import type { LocaleKey } from '../../locale/types';
-import type { ITableFilterColorList } from '../../types';
-import type { IConditionInfo } from './type';
import { generateRandomId, ICommandService, IPermissionService, IUndoRedoService, LocaleService } from '@univerjs/core';
import { Button, MobileActionRow, MobileActionRowGroup, resetButtonClassName } from '@univerjs/design';
import {
@@ -50,6 +46,10 @@ import {
import { MobileDrawer, useDependency } from '@univerjs/ui';
import { useRef, useState } from 'react';
import { createPortal } from 'react-dom';
+import type { ITableFilterPanelInfo } from '../../controllers/sheet-table-component.controller';
+import type { LocaleKey } from '../../locale/types';
+import type { ITableFilterColorList } from '../../types';
+import type { IConditionInfo } from './type';
import { SheetsTableMobileComponentController } from '../../controllers/mobile/sheet-table-component.controller';
import { SheetsTableUiService } from '../../services/sheets-table-ui.service';
import { FilterByEnum } from '../../types';
@@ -303,10 +303,10 @@ function MobileSheetTableFilterPanelContent(props: IMobileSheetTableFilterPanelC
"
>
<MobileActionRowGroup>
- <Button onClick={closeDetail}>
+ <Button onClick={closeDetail} size="extra-large">
{localeService.t<LocaleKey>('sheets-table-ui.filter.cancel')}
</Button>
- <Button variant="primary" onClick={() => applyFilter().catch(() => undefined)}>
+ <Button variant="primary" onClick={() => applyFilter().catch(() => undefined)} size="extra-large">
{localeService.t<LocaleKey>('sheets-table-ui.filter.confirm')}
</Button>
</MobileActionRowGroup>
diff --git a/packages/sheets-table-ui/src/views/components/MobileSheetTableItemsFilterPanel.tsx b/packages/sheets-table-ui/src/views/components/MobileSheetTableItemsFilterPanel.tsx
index cb96bcda3c..d9158b7035 100644
--- a/packages/sheets-table-ui/src/views/components/MobileSheetTableItemsFilterPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/MobileSheetTableItemsFilterPanel.tsx
@@ -15,12 +15,12 @@
*/
import type { Dispatch, SetStateAction } from 'react';
-import type { LocaleKey } from '../../locale/types';
-import type { ITableFilterItemList } from '../../types';
import { LocaleService } from '@univerjs/core';
import { Checkbox, Input } from '@univerjs/design';
import { useDependency } from '@univerjs/ui';
import { useMemo, useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
+import type { ITableFilterItemList } from '../../types';
interface IMobileSheetTableItemsFilterPanelProps {
items: ITableFilterItemList;
@@ -79,6 +79,8 @@ export function MobileSheetTableItemsFilterPanel(props: IMobileSheetTableItemsFi
value={searchText}
placeholder={localeService.t<LocaleKey>('sheets-table-ui.filter.search-placeholder')}
onChange={setSearchText}
+ size="large"
+ inputClass="univer-text-base"
/>
<div
className="
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
index 4a7e39afb1..5e3d3233aa 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
@@ -243,7 +243,7 @@ export const DefinedNameContainer = ({
<div
data-u-comp="defined-name-container"
className="
- univer-relative univer-box-border univer-flex univer-h-full univer-w-full univer-flex-col
+ univer-relative univer-box-border univer-flex univer-h-0 univer-min-h-full univer-w-full univer-flex-col
univer-overflow-hidden
"
>
@@ -278,7 +278,7 @@ export const DefinedNameContainer = ({
className={clsx('univer-min-h-0 univer-flex-1 univer-overflow-y-auto', scrollbarClassName)}
{...virtualActions.containerProps}
>
- <div style={virtualActions.wrapperStyle}>
+ <div className="univer-box-content univer-pb-4" style={virtualActions.wrapperStyle}>
{virtualDefinedNames.map(({ data: definedName, index }) => {
return (
<div
@@ -291,9 +291,9 @@ export const DefinedNameContainer = ({
>
<div
className={clsx(`
- univer-group univer-relative univer-flex univer-w-full univer-cursor-default
- univer-select-none univer-items-center univer-justify-between univer-rounded-md
- univer-p-2
+ univer-group univer-relative univer-box-border univer-flex univer-w-full
+ univer-cursor-default univer-select-none univer-items-center
+ univer-justify-between univer-rounded-md univer-p-2
hover:univer-bg-gray-50
dark:hover:!univer-bg-gray-700
`, {
diff --git a/packages/sheets-ui/src/views/mobile/menu-item-input/MobileMenuItemInput.tsx b/packages/sheets-ui/src/views/mobile/menu-item-input/MobileMenuItemInput.tsx
index ff1772d612..246f8e5d66 100644
--- a/packages/sheets-ui/src/views/mobile/menu-item-input/MobileMenuItemInput.tsx
+++ b/packages/sheets-ui/src/views/mobile/menu-item-input/MobileMenuItemInput.tsx
@@ -15,12 +15,12 @@
*/
import type { KeyboardEvent } from 'react';
-import type { LocaleKey } from '../../../locale/types';
-import type { IMenuItemInputProps } from '../../menu-item-input/interface';
import { LocaleService } from '@univerjs/core';
import { Button, InputNumber } from '@univerjs/design';
import { useDependency, useObservable } from '@univerjs/ui';
import { useState } from 'react';
+import type { LocaleKey } from '../../../locale/types';
+import type { IMenuItemInputProps } from '../../menu-item-input/interface';
export function MobileMenuItemInput(props: IMenuItemInputProps) {
const {
@@ -83,6 +83,7 @@ export function MobileMenuItemInput(props: IMenuItemInputProps) {
disabled={disabled}
onKeyDown={handleKeyDown}
onChange={handleChange}
+ inputClassName="univer-text-base"
/>
</div>
<span className="univer-min-w-0 univer-truncate univer-text-base univer-font-medium">
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 7c598c33df..36bf81032f 100644
--- a/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx
+++ b/packages/sheets-ui/src/views/mobile/sheet-bar/MobileSheetBar.tsx
@@ -368,6 +368,7 @@ function MobileSheetBarImpl(props: { workbook: Workbook }) {
confirmRename();
}
}}
+ inputClass="univer-text-base"
/>
{renameError && (
<div
diff --git a/packages/sheets-ui/src/views/permission/SheetPermissionPanelList.tsx b/packages/sheets-ui/src/views/permission/SheetPermissionPanelList.tsx
index d0931e0522..5c963820be 100644
--- a/packages/sheets-ui/src/views/permission/SheetPermissionPanelList.tsx
+++ b/packages/sheets-ui/src/views/permission/SheetPermissionPanelList.tsx
@@ -27,7 +27,7 @@ import {
UniverInstanceType,
UserManagerService,
} from '@univerjs/core';
-import { ActionRow, Avatar, borderClassName, Button, clsx, Tooltip } from '@univerjs/design';
+import { ActionRow, Avatar, borderClassName, Button, clsx, Segmented, Tooltip } from '@univerjs/design';
import { serializeRange } from '@univerjs/engine-formula';
import { DeleteIcon, WriteIcon } from '@univerjs/icons';
import { UnitAction, UnitObject } from '@univerjs/protocol';
@@ -206,27 +206,19 @@ function SheetPermissionPanelListContent({ ActionRowComponent }: Required<ISheet
sidebarService.open(sidebarProps);
};
- const handleChangeHeaderType = (isCurrentSheet: boolean) => {
- setIsCurrentSheet(isCurrentSheet);
- };
-
const hasSetProtectPermission = permissionService.getPermissionPoint(new WorkbookCreateProtectPermission(unitId).id)?.value;
return (
<div className="univer-mt-2 univer-flex univer-h-[calc(100%-8px)] univer-flex-col">
- <div className="univer-flex univer-h-[30px] univer-py-2">
- <div className="univer-mr-5 univer-flex univer-cursor-pointer univer-flex-col univer-items-center" onClick={() => handleChangeHeaderType(true)}>
- <div className={clsx('univer-h-6 univer-text-base univer-font-medium univer-leading-6', { 'univer-text-blue-500': isCurrentSheet })}>
- {' '}
- {localeService.t<LocaleKey>('sheets-ui.permission.panel.currentSheet')}
- </div>
- <div className={clsx('univer-mt-1 univer-h-0.5 univer-w-6', { 'univer-bg-blue-500': isCurrentSheet })} />
- </div>
- <div className="univer-mr-5 univer-flex univer-cursor-pointer univer-flex-col univer-items-center" onClick={() => handleChangeHeaderType(false)}>
- <div className={clsx('univer-h-6 univer-text-base univer-font-medium univer-leading-6', { 'univer-text-blue-500': !isCurrentSheet })}>{localeService.t<LocaleKey>('sheets-ui.permission.panel.allSheet')}</div>
- <div className={clsx('univer-mt-1 univer-h-0.5 univer-w-6', { 'univer-bg-blue-500': !isCurrentSheet })} />
- </div>
- </div>
+ <Segmented
+ className="univer-my-2 univer-w-full univer-shrink-0"
+ items={[
+ { label: localeService.t<LocaleKey>('sheets-ui.permission.panel.currentSheet'), value: 'current' },
+ { label: localeService.t<LocaleKey>('sheets-ui.permission.panel.allSheet'), value: 'all' },
+ ]}
+ value={isCurrentSheet ? 'current' : 'all'}
+ onChange={(value) => setIsCurrentSheet(value === 'current')}
+ />
{ruleList?.length > 0
? (
diff --git a/packages/thread-comment-ui/src/views/ThreadCommentPanel.tsx b/packages/thread-comment-ui/src/views/ThreadCommentPanel.tsx
index cf74cad5b6..4f5fe86c90 100644
--- a/packages/thread-comment-ui/src/views/ThreadCommentPanel.tsx
+++ b/packages/thread-comment-ui/src/views/ThreadCommentPanel.tsx
@@ -272,7 +272,7 @@ export const ThreadCommentPanel = (props: IThreadCommentPanelProps) => {
);
return (
- <div className="univer-flex univer-min-h-full univer-flex-col univer-pb-3">
+ <div className="univer-box-border univer-flex univer-min-h-full univer-flex-col univer-pb-3">
<div className="univer-mt-3 univer-flex univer-flex-row univer-justify-between">
{type === UniverInstanceType.UNIVER_SHEET
? (
diff --git a/packages/thread-comment-ui/src/views/mobile/MobileThreadCommentPanel.tsx b/packages/thread-comment-ui/src/views/mobile/MobileThreadCommentPanel.tsx
index 5c91a0682e..06a19f27ae 100644
--- a/packages/thread-comment-ui/src/views/mobile/MobileThreadCommentPanel.tsx
+++ b/packages/thread-comment-ui/src/views/mobile/MobileThreadCommentPanel.tsx
@@ -16,15 +16,15 @@
import type { ISelectProps } from '@univerjs/design';
import type { IThreadComment } from '@univerjs/thread-comment';
-import type { LocaleKey } from '../../locale/types';
-import type { ThreadCommentPanelSection } from '../thread-comment-panel/util';
-import type { IThreadCommentPanelProps } from '../ThreadCommentPanel';
import { ICommandService, LocaleService, UniverInstanceType, UserManagerService } from '@univerjs/core';
import { Button, clsx, MobileActionRowGroup, resetButtonClassName } from '@univerjs/design';
import { IncreaseIcon, MoreLeftIcon } from '@univerjs/icons';
import { ThreadCommentModel } from '@univerjs/thread-comment';
import { useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
+import type { ThreadCommentPanelSection } from '../thread-comment-panel/util';
+import type { IThreadCommentPanelProps } from '../ThreadCommentPanel';
import { SetActiveCommentOperation } from '../../commands/operations/comment.operations';
import { ThreadCommentPanelService } from '../../services/thread-comment-panel.service';
import { getThreadCommentPanelItemKey, isSameThreadCommentTarget, shouldClearThreadCommentTarget } from '../thread-comment-panel/util';
@@ -119,7 +119,7 @@ function MobileAddComment({ onAdd }: { onAdd: () => void }) {
const localeService = useDependency(LocaleService);
return (
<MobileActionRowGroup className="univer-mt-3">
- <Button className="univer-w-full" onClick={onAdd}>
+ <Button className="univer-w-full" onClick={onAdd} size="extra-large">
<IncreaseIcon className="univer-mr-1.5" />
{localeService.t<LocaleKey>('thread-comment-ui.panel.addComment')}
</Button>
@@ -336,7 +336,7 @@ export function MobileThreadCommentPanel(props: IThreadCommentPanelProps) {
);
return (
- <div className="univer-flex univer-min-h-full univer-flex-col univer-pb-3">
+ <div className="univer-box-border univer-flex univer-min-h-full univer-flex-col univer-pb-3">
{activeComment && <MobileCommentHeader comment={activeComment} displayRef={formatRef?.(activeComment)} />}
{!activeComment && (
<div className="univer-mt-3 univer-flex univer-flex-col univer-gap-2">
@@ -360,7 +360,7 @@ export function MobileThreadCommentPanel(props: IThreadCommentPanelProps) {
{isFiltering
? (
<MobileActionRowGroup className="univer-mt-2 univer-flex univer-flex-row">
- <Button onClick={handleReset}>
+ <Button onClick={handleReset} size="extra-large">
{localeService.t<LocaleKey>('thread-comment-ui.panel.reset')}
</Button>
</MobileActionRowGroup>
diff --git a/packages/ui/src/views/components/dialog-part/MobileDialogPart.tsx b/packages/ui/src/views/components/dialog-part/MobileDialogPart.tsx
index 72807fcc81..5cccaab5da 100644
--- a/packages/ui/src/views/components/dialog-part/MobileDialogPart.tsx
+++ b/packages/ui/src/views/components/dialog-part/MobileDialogPart.tsx
@@ -69,8 +69,8 @@ export function MobileDialogPart() {
const footer = options.footer ?? (options.showOk || options.showCancel
? (
<>
- {options.showCancel && <Button onClick={options.onCancel}>{locale?.Confirm.cancel}</Button>}
- {options.showOk && <Button variant="primary" onClick={options.onOk}>{locale?.Confirm.confirm}</Button>}
+ {options.showCancel && <Button onClick={options.onCancel} size="extra-large">{locale?.Confirm.cancel}</Button>}
+ {options.showOk && <Button variant="primary" onClick={options.onOk} size="extra-large">{locale?.Confirm.confirm}</Button>}
</>
)
: null);
diff --git a/packages/ui/src/views/components/sidebar/Sidebar.tsx b/packages/ui/src/views/components/sidebar/Sidebar.tsx
index 4e0770e5a8..4765a86184 100644
--- a/packages/ui/src/views/components/sidebar/Sidebar.tsx
+++ b/packages/ui/src/views/components/sidebar/Sidebar.tsx
@@ -294,7 +294,7 @@ export function Sidebar() {
</button>
</header>
- <section className="univer-box-border univer-min-w-0 univer-cursor-default univer-px-4">
+ <section className="univer-box-border univer-min-w-0 univer-cursor-default univer-px-4 univer-pb-4">
{options?.children}
</section>
diff --git a/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx b/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx
index fd98f4ca69..2512d39bb6 100644
--- a/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx
+++ b/packages/ui/src/views/mobile-workbench/MobileWorkbench.tsx
@@ -299,7 +299,6 @@ export function MobileWorkbench(props: IUniverAppProps) {
<ConfigProvider
locale={locale?.design}
direction={direction}
- density="touch"
mountContainer={portalContainer}
mobileKeyboardViewport={keyboardViewport}
>
diff --git a/packages/ui/src/views/object-permission/ObjectPermissionPanel.tsx b/packages/ui/src/views/object-permission/ObjectPermissionPanel.tsx
index 924e0cc543..7ec873b2ad 100644
--- a/packages/ui/src/views/object-permission/ObjectPermissionPanel.tsx
+++ b/packages/ui/src/views/object-permission/ObjectPermissionPanel.tsx
@@ -15,13 +15,13 @@
*/
import type { IAccessor, IObjectPermissionTarget } from '@univerjs/core';
-import type { LocaleKey } from '../../locale/types';
-import type { IObjectPermissionButtonProps } from './ObjectPermissionButton';
import { Injector, IUniverInstanceService, LocaleService, ObjectPermissionService } from '@univerjs/core';
import { Button, Input } from '@univerjs/design';
import { ProtectIcon } from '@univerjs/icons';
import { UnitObject } from '@univerjs/protocol';
import { useEffect, useState } from 'react';
+import type { LocaleKey } from '../../locale/types';
+import type { IObjectPermissionButtonProps } from './ObjectPermissionButton';
import { ISidebarService } from '../../services/sidebar/sidebar.service';
import { useDependency, useObservable } from '../../utils/di';
import { ObjectPermissionButton } from './ObjectPermissionButton';
@@ -133,7 +133,11 @@ export function ObjectPermissionPanel({ unitId, getTargets, expandable }: IObjec
items.push({ ...item, name });
}
return (
- <div className="univer-flex univer-h-full univer-flex-col univer-gap-3 univer-p-4">
+ <div
+ className="
+ univer-box-border univer-flex univer-h-0 univer-min-h-full univer-flex-col univer-gap-3 univer-pt-4
+ "
+ >
{expandable && <Button aria-expanded={expanded} onClick={() => setExpanded((value) => !value)}>{localeService.t<LocaleKey>(kinds[expandable] ?? 'ui.objectPermission.entity')}</Button>}
{(!expandable || expanded) && (
<Input
@@ -146,7 +150,7 @@ export function ObjectPermissionPanel({ unitId, getTargets, expandable }: IObjec
aria-label={localeService.t<LocaleKey>('ui.objectPermission.search')}
/>
)}
- <div className="univer-flex-1 univer-overflow-auto">
+ <div className="univer-min-h-0 univer-flex-1 univer-overflow-auto univer-pb-4">
{items.map((item) => (
<div
key={`${unitId}/${item.target.objectType}/${item.target.objectId}`}