Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(ui): align zoom slider and improve reset control (#7949)
白熱bb9d74a47bd4
diff --git a/packages/ui/src/views/slider/Slider.tsx b/packages/ui/src/views/slider/Slider.tsxindex 36cd8f3b23..1d1886e78c 100644--- a/packages/ui/src/views/slider/Slider.tsx+++ b/packages/ui/src/views/slider/Slider.tsx@@ -16,7 +16,7 @@import type { KeyboardEvent, PointerEvent } from 'react';import { LocaleService } from '@univerjs/core';-import { borderClassName, Button, clsx } from '@univerjs/design';+import { borderClassName, Button, clsx, Tooltip } from '@univerjs/design';import { useEffect, useRef, useState } from 'react';import type { LocaleKey } from '../../locale/types';import { IconManager } from '../../common/icon-manager';@@ -291,11 +291,7 @@ export function Slider(props: ISliderProps) {"><div- className={clsx(`- univer-relative univer-h-1.5 univer-rounded-full univer-bg-gray-200 univer-px-1.5- univer-transition-colors- dark:!univer-bg-gray-600- `, {+ className={clsx('univer-relative univer-h-1.5 univer-px-1.5', {'univer-opacity-60': disabled,})}style={{@@ -306,7 +302,7 @@ export function Slider(props: ISliderProps) {ref={sliderInnerRailRef}role="track"className="- univer-relative univer-h-1.5 univer-bg-gray-200+ univer-relative univer-h-1.5 univer-rounded-full univer-bg-gray-200 univer-transition-colorsdark:!univer-bg-gray-600"onPointerDown={handlePointerDown}@@ -319,34 +315,56 @@ export function Slider(props: ISliderProps) {width: `${sliderOffset}%`,}}/>- <a- key="reset-button"- className={`- univer-absolute univer-left-1/2 univer-top-1/2 univer-box-border univer-block- univer-size-1.5 -univer-translate-x-1/2 -univer-translate-y-1/2 univer-cursor-pointer- univer-rounded-full univer-border univer-border-gray-0 univer-bg-gray-400- dark:!univer-border-gray-700 dark:!univer-bg-gray-300- `}- role="button"- tabIndex={disabled ? -1 : 0}- aria-label={localeService.t<LocaleKey>('ui.accessibility.resetZoom')}- aria-disabled={disabled}- onClick={handleReset}- onKeyDown={(e) => {- if (e.key !== 'Enter' && e.key !== ' ') {- return;- }- e.preventDefault();- e.stopPropagation();- handleReset();- }}- />+ <div+ className="+ univer-absolute univer-left-1/2 univer-top-1/2 univer-size-6 -univer-translate-x-1/2+ -univer-translate-y-1/2+ "+ >+ <Tooltip+ title={`${localeService.t<LocaleKey>('ui.accessibility.resetZoom')} (${resetPoint}%)`}+ placement="top"+ >+ <Button+ className="+ univer-size-6 univer-p-0+ focus-visible:univer-outline-none focus-visible:univer-ring-2+ focus-visible:univer-ring-primary-100+ "+ size="small"+ variant="link"+ type="button"+ data-u-comp="zoom-reset"+ aria-label={localeService.t<LocaleKey>('ui.accessibility.resetZoom')}+ disabled={disabled}+ onPointerDown={(e) => e.stopPropagation()}+ onClick={handleReset}+ onKeyDown={(e) => {+ if (e.key !== 'Enter' && e.key !== ' ') {+ return;+ }+ e.preventDefault();+ e.stopPropagation();+ handleReset();+ }}+ >+ <span+ aria-hidden="true"+ className="+ univer-box-border univer-h-3 univer-w-1 univer-rounded-full univer-border+ univer-border-solid univer-border-gray-0 univer-bg-gray-600+ dark:!univer-border-gray-800 dark:!univer-bg-gray-100+ "+ />+ </Button>+ </Tooltip>+ </div><buttonclassName={clsx(`univer-absolute univer-top-1/2 univer-size-3.5 -univer-translate-x-1/2-univer-translate-y-1/2 univer-rounded-full univer-bg-gray-0 univer-shadow-sm- univer-transition-all+ univer-transitionfocus-visible:univer-outline-none focus-visible:univer-ring-2focus-visible:univer-ring-primary-100dark:!univer-bg-gray-800diff --git a/packages/ui/src/views/slider/__tests__/Slider.spec.tsx b/packages/ui/src/views/slider/__tests__/Slider.spec.tsxindex 84a100e472..028790f68f 100644--- a/packages/ui/src/views/slider/__tests__/Slider.spec.tsx+++ b/packages/ui/src/views/slider/__tests__/Slider.spec.tsx@@ -18,10 +18,10 @@* @vitest-environment jsdom*/-import type { ISliderProps } from '../Slider';import { cleanup, fireEvent, render } from '@testing-library/react';import { DesktopLogService, ILogService, Injector, LocaleService, LocaleType } from '@univerjs/core';import { afterEach, describe, expect, it } from 'vitest';+import type { ISliderProps } from '../Slider';import { ComponentManager } from '../../../common/component-manager';import { IconManager } from '../../../common/icon-manager';import enUS from '../../../locale/en-US';@@ -90,10 +90,6 @@ describe('Slider', () => {return container.querySelector('[role="track"]') as HTMLDivElement;}- function getNativeButtons(container: HTMLElement) {- return Array.from(container.querySelectorAll('button'));- }-it('keeps drag visual responsive, throttles real zoom updates and flushes on pointer up', async () => {const changes: number[] = [];const { container, getByRole } = renderSlider({ onChange: (value) => changes.push(value) });@@ -162,19 +158,65 @@ describe('Slider', () => {it('steps down, resets, and steps up with the toolbar buttons', () => {const changes: number[] = [];- const { container } = renderSlider({ value: 125, onChange: (value) => changes.push(value) });- const buttons = getNativeButtons(container);- const reduceButton = buttons[0];- const increaseButton = buttons[2];- const resetButton = container.querySelector('a[role="button"]') as HTMLElement;+ const { getByRole } = renderSlider({ value: 125, onChange: (value) => changes.push(value) });- fireEvent.click(reduceButton);- fireEvent.click(resetButton);- fireEvent.click(increaseButton);+ fireEvent.click(getByRole('button', { name: 'Zoom out' }));+ fireEvent.click(getByRole('button', { name: 'Reset zoom' }));+ fireEvent.click(getByRole('button', { name: 'Zoom in' }));expect(changes).toEqual([115, 100, 135]);});+ it('resets once without dragging when the reset target is pressed off-center', () => {+ const changes: number[] = [];+ const { container, getByRole } = renderSlider({ value: 200, onChange: (value) => changes.push(value) });+ const resetButton = getByRole('button', { name: 'Reset zoom' });+ defineTrackRect(getTrack(container));++ fireEvent.pointerDown(resetButton, { clientX: 106.25 });+ fireEvent.pointerUp(resetButton, { clientX: 106.25 });+ fireEvent.click(resetButton);++ expect(changes).toEqual([100]);+ });++ it('continues dragging across the reset target without resetting', () => {+ const changes: number[] = [];+ const { container, getByRole } = renderSlider({ value: 50, onChange: (value) => changes.push(value) });+ const track = getTrack(container);+ const resetButton = getByRole('button', { name: 'Reset zoom' });+ defineTrackRect(track);++ fireEvent.pointerDown(getByRole('slider'), { clientX: 50 });+ fireEvent.pointerMove(resetButton, { clientX: 106.25 });+ fireEvent.pointerUp(resetButton, { clientX: 106.25 });++ expect(changes).toEqual([119]);+ });++ it.each(['Enter', ' '])('resets with the %s key', (key) => {+ const changes: number[] = [];+ const { getByRole } = renderSlider({ value: 200, onChange: (value) => changes.push(value) });++ fireEvent.keyDown(getByRole('button', { name: 'Reset zoom' }), { key });++ expect(changes).toEqual([100]);+ });++ it('shows the reset percentage on hover and keyboard focus', () => {+ const { getByRole, queryByRole } = renderSlider({ resetPoint: 125 });+ const resetButton = getByRole('button', { name: 'Reset zoom' });++ fireEvent.mouseOver(resetButton);+ expect(getByRole('tooltip').textContent).toBe('Reset zoom (125%)');++ fireEvent.mouseOut(resetButton);+ expect(queryByRole('tooltip')).toBeNull();++ fireEvent.focus(resetButton);+ expect(getByRole('tooltip').textContent).toBe('Reset zoom (125%)');+ });+it.each([[LocaleType.EN_US, enUS.ui.accessibility],[LocaleType.ZH_CN, zhCN.ui.accessibility],@@ -204,20 +246,20 @@ describe('Slider', () => {it('clamps step buttons at the min and max boundaries', () => {const minChanges: number[] = [];const minRender = renderSlider({ value: 10, min: 10, onChange: (value) => minChanges.push(value) });- fireEvent.click(getNativeButtons(minRender.container)[0]);+ fireEvent.click(minRender.getByRole('button', { name: 'Zoom out' }));expect(minChanges).toEqual([]);minRender.unmount();const maxChanges: number[] = [];const maxRender = renderSlider({ value: 400, max: 400, onChange: (value) => maxChanges.push(value) });- fireEvent.click(getNativeButtons(maxRender.container)[2]);+ fireEvent.click(maxRender.getByRole('button', { name: 'Zoom in' }));expect(maxChanges).toEqual([]);});it('selects shortcut zoom values from the dropdown', async () => {const changes: number[] = [];- const { container, getByText } = renderSlider({ onChange: (value) => changes.push(value) });- const dropdownButton = getNativeButtons(container)[3];+ const { getByRole, getByText } = renderSlider({ onChange: (value) => changes.push(value) });+ const dropdownButton = getByRole('button', { name: 'Menu' });fireEvent.pointerDown(dropdownButton);await wait(0);@@ -292,14 +334,13 @@ describe('Slider', () => {disabled: true,onChange: (value) => changes.push(value),});- const buttons = getNativeButtons(container);const track = getTrack(container);const input = getByDisplayValue('100%') as HTMLInputElement;defineTrackRect(track);- fireEvent.click(buttons[0]);- fireEvent.click(buttons[2]);- fireEvent.click(container.querySelector('a[role="button"]') as HTMLElement);+ fireEvent.click(getByRole('button', { name: 'Zoom out' }));+ fireEvent.click(getByRole('button', { name: 'Zoom in' }));+ fireEvent.click(getByRole('button', { name: 'Reset zoom' }));fireEvent.pointerDown(track, { clientX: 200 });fireEvent.focus(input);