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(design): normalize hue values >= 360 and fix stale closure in event handlers (#6912)

白熱42dcf43d450a
diff --git a/packages/design/src/components/color-picker/AlphaSlider.tsx b/packages/design/src/components/color-picker/AlphaSlider.tsx
index cba98da051..c928e2c32b 100644
--- a/packages/design/src/components/color-picker/AlphaSlider.tsx
+++ b/packages/design/src/components/color-picker/AlphaSlider.tsx
@@ -28,6 +28,7 @@ export function AlphaSlider({ hsv, alpha, onChange, onChanged }: IAlphaSliderPro
const [isDragging, setIsDragging] = useState(false);
const sliderRef = useRef<HTMLDivElement>(null);
const thumbRef = useRef<HTMLDivElement>(null);
+ const alphaRef = useRef(alpha);
const calculateAlpha = useCallback((clientX: number) => {
const slider = sliderRef.current;
@@ -51,10 +52,14 @@ export function AlphaSlider({ hsv, alpha, onChange, onChanged }: IAlphaSliderPro
calculateAlpha(e.clientX);
}, [isDragging, calculateAlpha]);
+ useEffect(() => {
+ alphaRef.current = alpha;
+ }, [alpha]);
+
const handlePointerUp = useCallback(() => {
setIsDragging(false);
- onChanged?.(alpha);
- }, [alpha]);
+ onChanged?.(alphaRef.current);
+ }, [onChanged]);
useEffect(() => {
if (isDragging) {
@@ -82,7 +87,7 @@ export function AlphaSlider({ hsv, alpha, onChange, onChanged }: IAlphaSliderPro
const color = hsvToRgb(...hsv);
return (
- <div className="univer-relative univer-w-full univer-select-none">
+ <div data-u-comp="color-picker-alpha-slider" className="univer-relative univer-w-full univer-select-none">
{/* Chessboard background */}
<div
className="univer-absolute univer-inset-0 univer-rounded-full"
@@ -95,6 +100,7 @@ export function AlphaSlider({ hsv, alpha, onChange, onChanged }: IAlphaSliderPro
{/* Slider */}
<div
ref={sliderRef}
+ data-u-comp="color-picker-alpha-slider-track"
className={`
univer-relative univer-h-2 univer-w-full univer-cursor-pointer univer-rounded-full univer-shadow-inner
`}
@@ -109,6 +115,7 @@ export function AlphaSlider({ hsv, alpha, onChange, onChanged }: IAlphaSliderPro
{/* Indicator */}
<div
ref={thumbRef}
+ data-u-comp="color-picker-alpha-slider-thumb"
className={`
univer-absolute univer-top-1/2 univer-box-border univer-size-2 univer-rounded-full
univer-bg-transparent univer-shadow-md univer-ring-2 univer-ring-white univer-transition-transform
diff --git a/packages/design/src/components/color-picker/ColorSpectrum.tsx b/packages/design/src/components/color-picker/ColorSpectrum.tsx
index 4a4b459f23..26db168fc5 100644
--- a/packages/design/src/components/color-picker/ColorSpectrum.tsx
+++ b/packages/design/src/components/color-picker/ColorSpectrum.tsx
@@ -46,7 +46,7 @@ export function ColorSpectrum({ hsv, onChange, onChanged }: IColorSpectrumProps)
gradientV.addColorStop(1, 'rgba(0, 0, 0, 1)');
ctx.fillStyle = gradientV;
ctx.fillRect(0, 0, canvas.width, canvas.height);
- }, [hsv]);
+ }, [hsv[0]]);
const handlePointerEvent = (e: PointerEvent) => {
e.stopPropagation();
@@ -66,7 +66,7 @@ export function ColorSpectrum({ hsv, onChange, onChanged }: IColorSpectrumProps)
const handlePointerUp = useCallback(() => {
setIsDragging(false);
- }, [hsv]);
+ }, []);
function handleChange() {
onChanged?.(hsv[0], hsv[1], hsv[2]);
@@ -123,6 +123,7 @@ export function ColorSpectrum({ hsv, onChange, onChanged }: IColorSpectrumProps)
>
<canvas
ref={canvasRef}
+ data-u-comp="color-picker-spectrum-canvas"
className="univer-size-full univer-cursor-crosshair univer-rounded"
onPointerDown={(e) => {
setIsDragging(true);
diff --git a/packages/design/src/components/color-picker/HueSlider.tsx b/packages/design/src/components/color-picker/HueSlider.tsx
index 46191e6c03..b26b798e29 100644
--- a/packages/design/src/components/color-picker/HueSlider.tsx
+++ b/packages/design/src/components/color-picker/HueSlider.tsx
@@ -26,6 +26,7 @@ export function HueSlider({ hsv, onChange, onChanged }: IHueSliderProps) {
const [isDragging, setIsDragging] = useState(false);
const sliderRef = useRef<HTMLDivElement>(null);
const thumbRef = useRef<HTMLDivElement>(null);
+ const hsvRef = useRef(hsv);
const calculateHue = useCallback((clientX: number) => {
const slider = sliderRef.current;
@@ -52,10 +53,15 @@ export function HueSlider({ hsv, onChange, onChanged }: IHueSliderProps) {
calculateHue(e.clientX);
}, [isDragging, calculateHue]);
+ useEffect(() => {
+ hsvRef.current = hsv;
+ }, [hsv]);
+
const handlePointerUp = useCallback(() => {
setIsDragging(false);
- onChanged?.(hsv[0], hsv[1], hsv[2]);
- }, [hsv, onChanged]);
+ const [h, s, v] = hsvRef.current;
+ onChanged?.(h, s, v);
+ }, [onChanged]);
useEffect(() => {
if (isDragging) {
@@ -107,6 +113,7 @@ export function HueSlider({ hsv, onChange, onChanged }: IHueSliderProps) {
>
<div
ref={thumbRef}
+ data-u-comp="color-picker-hue-slider-thumb"
className={`
univer-absolute univer-top-1/2 univer-box-border univer-size-2 univer-rounded-full
univer-bg-transparent univer-shadow-md univer-ring-2 univer-ring-white univer-transition-transform
diff --git a/packages/design/src/components/color-picker/__tests__/alpha-and-input.spec.tsx b/packages/design/src/components/color-picker/__tests__/alpha-and-input.spec.tsx
index aa2b1155ad..cd83f48353 100644
--- a/packages/design/src/components/color-picker/__tests__/alpha-and-input.spec.tsx
+++ b/packages/design/src/components/color-picker/__tests__/alpha-and-input.spec.tsx
@@ -30,8 +30,8 @@ describe('AlphaSlider', () => {
<AlphaSlider hsv={[0, 100, 100]} alpha={0.3} onChange={onChange} onChanged={onChanged} />
);
- const slider = container.querySelector('.univer-h-2') as HTMLDivElement;
- const thumb = container.querySelector('.univer-size-2') as HTMLDivElement;
+ const slider = container.querySelector('[data-u-comp="color-picker-alpha-slider-track"]') as HTMLDivElement;
+ const thumb = container.querySelector('[data-u-comp="color-picker-alpha-slider-thumb"]') as HTMLDivElement;
expect(slider).toBeInTheDocument();
expect(thumb).toBeInTheDocument();
@@ -55,6 +55,52 @@ describe('AlphaSlider', () => {
expect(onChange).toHaveBeenCalled();
expect(onChanged).toHaveBeenCalledWith(0.3);
});
+
+ it('should emit latest alpha on pointer up after prop update', () => {
+ const onChange = vi.fn();
+ const onChanged = vi.fn();
+
+ function Wrapper() {
+ const [alpha, setAlpha] = useState(0.3);
+ return (
+ <AlphaSlider
+ hsv={[0, 100, 100]}
+ alpha={alpha}
+ onChange={(a) => {
+ setAlpha(a);
+ onChange(a);
+ }}
+ onChanged={onChanged}
+ />
+ );
+ }
+
+ const { container } = render(<Wrapper />);
+ const slider = container.querySelector('[data-u-comp="color-picker-alpha-slider-track"]') as HTMLDivElement;
+ const thumb = container.querySelector('[data-u-comp="color-picker-alpha-slider-thumb"]') as HTMLDivElement;
+
+ Object.defineProperty(thumb, 'clientWidth', { value: 10, configurable: true });
+ vi.spyOn(slider, 'getBoundingClientRect').mockReturnValue({
+ x: 0,
+ y: 0,
+ top: 0,
+ left: 0,
+ width: 100,
+ height: 8,
+ right: 100,
+ bottom: 8,
+ toJSON: () => ({}),
+ } as DOMRect);
+
+ fireEvent.pointerDown(slider, { clientX: 50 });
+ fireEvent.pointerMove(window, { clientX: 80 });
+ fireEvent.pointerUp(window);
+
+ expect(onChange).toHaveBeenCalled();
+ expect(onChanged).toHaveBeenCalled();
+ const lastCall = onChanged.mock.calls[onChanged.mock.calls.length - 1];
+ expect(lastCall[0]).toBeGreaterThan(0.3);
+ });
});
describe('ColorInput', () => {
diff --git a/packages/design/src/components/color-picker/__tests__/color-conversion.spec.ts b/packages/design/src/components/color-picker/__tests__/color-conversion.spec.ts
index f190024719..ac37282359 100644
--- a/packages/design/src/components/color-picker/__tests__/color-conversion.spec.ts
+++ b/packages/design/src/components/color-picker/__tests__/color-conversion.spec.ts
@@ -27,6 +27,12 @@ describe('color-conversion', () => {
expect(hsvToRgb(300, 100, 100)).toEqual([255, 0, 255]);
});
+ it('should normalize hue values >= 360 to equivalent hue in [0, 360)', () => {
+ expect(hsvToRgb(360, 100, 100)).toEqual([255, 0, 0]);
+ expect(hsvToRgb(720, 100, 100)).toEqual([255, 0, 0]);
+ expect(hsvToRgb(420, 100, 100)).toEqual([255, 255, 0]);
+ });
+
it('should convert rgb and hsv values', () => {
expect(rgbToHex(255, 0, 16)).toBe('#ff0010');
expect(hsvToHex(0, 100, 100)).toBe('#ff0000');
diff --git a/packages/design/src/components/color-picker/__tests__/color-spectrum-extra.spec.tsx b/packages/design/src/components/color-picker/__tests__/color-spectrum-extra.spec.tsx
index e241ad19ee..8ce24fd3ca 100644
--- a/packages/design/src/components/color-picker/__tests__/color-spectrum-extra.spec.tsx
+++ b/packages/design/src/components/color-picker/__tests__/color-spectrum-extra.spec.tsx
@@ -41,7 +41,7 @@ describe('ColorSpectrum extra', () => {
const onChanged = vi.fn();
const { container } = render(<ColorSpectrum hsv={[120, 20, 80]} onChange={onChange} onChanged={onChanged} />);
- const canvas = container.querySelector('canvas') as HTMLCanvasElement;
+ const canvas = container.querySelector('[data-u-comp="color-picker-spectrum-canvas"]') as HTMLCanvasElement;
const wrapper = container.querySelector('[data-u-comp="color-picker-spectrum"]') as HTMLDivElement;
Object.defineProperty(wrapper, 'clientWidth', { value: 100, configurable: true });
Object.defineProperty(wrapper, 'clientHeight', { value: 100, configurable: true });
diff --git a/packages/design/src/components/color-picker/__tests__/hue-slider-extra.spec.tsx b/packages/design/src/components/color-picker/__tests__/hue-slider-extra.spec.tsx
index 19cee321d7..bc27475f78 100644
--- a/packages/design/src/components/color-picker/__tests__/hue-slider-extra.spec.tsx
+++ b/packages/design/src/components/color-picker/__tests__/hue-slider-extra.spec.tsx
@@ -15,6 +15,7 @@
*/
import { cleanup, fireEvent, render } from '@testing-library/react';
+import { useState } from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { HueSlider } from '../HueSlider';
import '@testing-library/jest-dom/vitest';
@@ -30,7 +31,7 @@ describe('HueSlider extra', () => {
const onChanged = vi.fn();
const { container } = render(<HueSlider hsv={[120, 60, 70]} onChange={onChange} onChanged={onChanged} />);
const slider = container.querySelector('[data-u-comp="color-picker-hue-slider"] > div') as HTMLDivElement;
- const thumb = container.querySelector('.univer-size-2') as HTMLDivElement;
+ const thumb = container.querySelector('[data-u-comp="color-picker-hue-slider-thumb"]') as HTMLDivElement;
Object.defineProperty(thumb, 'clientWidth', { value: 10, configurable: true });
Object.defineProperty((slider.parentElement as HTMLDivElement), 'clientWidth', { value: 100, configurable: true });
@@ -54,4 +55,50 @@ describe('HueSlider extra', () => {
expect(onChange).toHaveBeenCalled();
expect(onChanged).toHaveBeenCalledWith(120, 60, 70);
});
+
+ it('should emit latest hsv on pointer up after prop update', () => {
+ const onChange = vi.fn();
+ const onChanged = vi.fn();
+
+ function Wrapper() {
+ const [hsv, setHsv] = useState<[number, number, number]>([120, 60, 70]);
+ return (
+ <HueSlider
+ hsv={hsv}
+ onChange={(h, s, v) => {
+ setHsv([h, s, v]);
+ onChange(h, s, v);
+ }}
+ onChanged={onChanged}
+ />
+ );
+ }
+
+ const { container } = render(<Wrapper />);
+ const slider = container.querySelector('[data-u-comp="color-picker-hue-slider"] > div') as HTMLDivElement;
+ const thumb = container.querySelector('[data-u-comp="color-picker-hue-slider-thumb"]') as HTMLDivElement;
+
+ Object.defineProperty(thumb, 'clientWidth', { value: 10, configurable: true });
+ Object.defineProperty((slider.parentElement as HTMLDivElement), 'clientWidth', { value: 100, configurable: true });
+ slider.getBoundingClientRect = vi.fn(() => ({
+ left: 0,
+ top: 0,
+ width: 100,
+ height: 8,
+ right: 100,
+ bottom: 8,
+ x: 0,
+ y: 0,
+ toJSON: () => {},
+ }));
+
+ fireEvent.pointerDown(slider, { clientX: 40 });
+ fireEvent.pointerMove(window, { clientX: 70 });
+ fireEvent.pointerUp(window);
+
+ expect(onChange).toHaveBeenCalled();
+ expect(onChanged).toHaveBeenCalled();
+ const lastCall = onChanged.mock.calls[onChanged.mock.calls.length - 1];
+ expect(lastCall[0]).not.toBe(120);
+ });
});
diff --git a/packages/design/src/components/color-picker/__tests__/index.spec.tsx b/packages/design/src/components/color-picker/__tests__/index.spec.tsx
index 893cb1730a..cc4d078998 100644
--- a/packages/design/src/components/color-picker/__tests__/index.spec.tsx
+++ b/packages/design/src/components/color-picker/__tests__/index.spec.tsx
@@ -134,7 +134,7 @@ describe('ColorSpectrum', () => {
it('should call onChange when color changes by pointer', () => {
const { container } = render(<TestComponent onChange={onChange} />);
- const spectrum = container.querySelector('[data-u-comp="color-picker-spectrum"] > canvas');
+ const spectrum = container.querySelector('[data-u-comp="color-picker-spectrum"] > [data-u-comp="color-picker-spectrum-canvas"]');
if (spectrum) {
spectrum.dispatchEvent(new PointerEvent('pointerdown', { bubbles: true, clientX: 50 }));
expect(onChange).toHaveBeenCalled();
diff --git a/packages/design/src/components/color-picker/color-conversion.ts b/packages/design/src/components/color-picker/color-conversion.ts
index f9a9e9fcd0..0331d6a20c 100644
--- a/packages/design/src/components/color-picker/color-conversion.ts
+++ b/packages/design/src/components/color-picker/color-conversion.ts
@@ -15,6 +15,7 @@
*/
export const hsvToRgb = (h: number, s: number, v: number): [number, number, number] => {
+ h = h % 360; // Normalize hue to [0, 360)
s = s / 100; // Normalize saturation to [0, 1]
v = v / 100; // Normalize value to [0, 1]
diff --git a/packages/design/src/components/gradient-color-picker/GradientColorPicker.tsx b/packages/design/src/components/gradient-color-picker/GradientColorPicker.tsx
index 4690afbfc7..aaa6061e73 100644
--- a/packages/design/src/components/gradient-color-picker/GradientColorPicker.tsx
+++ b/packages/design/src/components/gradient-color-picker/GradientColorPicker.tsx
@@ -15,7 +15,7 @@
*/
import { DeleteIcon } from '@univerjs/icons';
-import { useContext, useMemo, useRef, useState } from 'react';
+import { useContext, useEffect, useMemo, useRef, useState } from 'react';
import { clsx } from '../../helper/clsx';
import { Button } from '../button/Button';
import { ColorPicker } from '../color-picker/ColorPicker';
@@ -57,6 +57,22 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
const { locale } = useContext(ConfigContext);
const [selectedIndex, setSelectedIndex] = useState<number>(0);
const barRef = useRef<HTMLDivElement>(null);
+ const cleanupRef = useRef<(() => void) | null>(null);
+
+ useEffect(() => {
+ setSelectedIndex((prev) => {
+ if (prev >= value.stops.length) {
+ return Math.max(0, value.stops.length - 1);
+ }
+ return prev;
+ });
+ }, [value.stops.length]);
+
+ useEffect(() => {
+ return () => {
+ cleanupRef.current?.();
+ };
+ }, []);
const stops = useMemo(() => {
return [...value.stops].sort((a, b) => a.offset - b.offset);
@@ -155,6 +171,7 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
/>
<div
+ data-u-comp="gradient-color-picker-preview"
className={`
univer-h-32 univer-w-full univer-rounded-md univer-border univer-border-gray-200
dark:!univer-border-gray-600
@@ -165,6 +182,7 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
<div className="univer-relative univer-mt-4 univer-h-6">
<div
ref={barRef}
+ data-u-comp="gradient-color-picker-bar"
className={`
univer-absolute univer-inset-x-0 univer-top-1/2 univer-h-2 -univer-translate-y-1/2
univer-cursor-crosshair univer-rounded-full
@@ -175,6 +193,8 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
{value.stops.map((stop, index) => (
<div
key={index}
+ data-u-comp="gradient-color-picker-stop"
+ data-selected={selectedIndex === index}
className={clsx(
`
univer-absolute univer-top-1/2 univer-size-4 -univer-translate-x-1/2
@@ -210,8 +230,10 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
const handlePointerUp = () => {
window.removeEventListener('pointermove', handlePointerMove);
window.removeEventListener('pointerup', handlePointerUp);
+ cleanupRef.current = null;
};
+ cleanupRef.current = handlePointerUp;
window.addEventListener('pointermove', handlePointerMove);
window.addEventListener('pointerup', handlePointerUp);
}}
@@ -243,6 +265,7 @@ export function GradientColorPicker(props: IGradientColorPickerProps) {
<div className="univer-flex univer-gap-1">
<Tooltip title={locale?.GradientColorPicker.delete}>
<Button
+ data-u-comp="gradient-color-picker-delete"
variant="danger"
onClick={handleRemoveStop}
disabled={value.stops.length <= 2}
diff --git a/packages/design/src/components/gradient-color-picker/__tests__/index.spec.tsx b/packages/design/src/components/gradient-color-picker/__tests__/index.spec.tsx
index fc3e52b47b..8ed246aaed 100644
--- a/packages/design/src/components/gradient-color-picker/__tests__/index.spec.tsx
+++ b/packages/design/src/components/gradient-color-picker/__tests__/index.spec.tsx
@@ -19,7 +19,7 @@
*/
import type { IGradientValue } from '../GradientColorPicker';
-import { cleanup, fireEvent, render } from '@testing-library/react';
+import { cleanup, fireEvent, render, waitFor } from '@testing-library/react';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { GradientColorPicker } from '../GradientColorPicker';
import '@testing-library/jest-dom/vitest';
@@ -92,15 +92,13 @@ describe('GradientColorPicker', () => {
it('should select stop when clicked', () => {
const { container } = render(<GradientColorPicker value={defaultValue} />);
- // Find stops by their style (left: 0% or left: 100%) or by their common classes
- // The stops have univer-absolute and univer-rounded-full
- const stops = container.querySelectorAll('.univer-absolute.univer-rounded-full.univer-border-2');
+ const stops = container.querySelectorAll('[data-u-comp="gradient-color-picker-stop"]');
// Click the second stop
fireEvent.click(stops[1]);
- // The second stop should have the selected class (z-10)
- expect(stops[1]).toHaveClass('univer-z-10');
+ // The second stop should be selected
+ expect(stops[1]).toHaveAttribute('data-selected', 'true');
});
it('should call onChange when a stop is removed', () => {
@@ -115,8 +113,7 @@ describe('GradientColorPicker', () => {
};
const { container } = render(<GradientColorPicker value={valueWithThreeStops} onChange={onChange} />);
- // Find delete button - it's the one with univer-border-red-500 or similar
- const deleteButton = container.querySelector('.univer-border-red-500');
+ const deleteButton = container.querySelector('[data-u-comp="gradient-color-picker-delete"]');
if (deleteButton) {
fireEvent.click(deleteButton);
}
@@ -128,7 +125,7 @@ describe('GradientColorPicker', () => {
it('should disable delete button when only 2 stops remain', () => {
const { container } = render(<GradientColorPicker value={defaultValue} />);
- const deleteButton = container.querySelector('.univer-border-red-500');
+ const deleteButton = container.querySelector('[data-u-comp="gradient-color-picker-delete"]');
expect(deleteButton).toBeDisabled();
});
@@ -136,7 +133,7 @@ describe('GradientColorPicker', () => {
const onChange = vi.fn();
const { container } = render(<GradientColorPicker value={defaultValue} onChange={onChange} />);
- const bar = container.querySelector('.univer-cursor-crosshair');
+ const bar = container.querySelector('[data-u-comp="gradient-color-picker-bar"]');
if (bar) {
// Mock getBoundingClientRect for the bar
bar.getBoundingClientRect = vi.fn(() => ({
@@ -185,24 +182,24 @@ describe('GradientColorPicker', () => {
it('should support radial/angular/diamond and fallback preview background', () => {
const { container, rerender } = render(<GradientColorPicker value={{ ...defaultValue, type: 'radial' }} />);
- const preview = container.querySelector('.univer-h-32') as HTMLDivElement;
+ const preview = container.querySelector('[data-u-comp="gradient-color-picker-preview"]') as HTMLDivElement;
expect(preview.style.background).toContain('radial-gradient');
rerender(<GradientColorPicker value={{ ...defaultValue, type: 'angular' }} />);
- expect((container.querySelector('.univer-h-32') as HTMLDivElement).style.background).toContain('conic-gradient');
+ expect((container.querySelector('[data-u-comp="gradient-color-picker-preview"]') as HTMLDivElement).style.background).toContain('conic-gradient');
rerender(<GradientColorPicker value={{ ...defaultValue, type: 'diamond' }} />);
- expect((container.querySelector('.univer-h-32') as HTMLDivElement).style.background).toContain('radial-gradient');
+ expect((container.querySelector('[data-u-comp="gradient-color-picker-preview"]') as HTMLDivElement).style.background).toContain('radial-gradient');
rerender(<GradientColorPicker value={{ ...defaultValue, type: 'unexpected' as unknown as IGradientValue['type'] }} />);
- expect((container.querySelector('.univer-h-32') as HTMLDivElement).style.background).toContain('linear-gradient');
+ expect((container.querySelector('[data-u-comp="gradient-color-picker-preview"]') as HTMLDivElement).style.background).toContain('linear-gradient');
});
it('should drag a stop and emit new offset', () => {
const onChange = vi.fn();
const { container } = render(<GradientColorPicker value={defaultValue} onChange={onChange} />);
- const bar = container.querySelector('.univer-cursor-crosshair') as HTMLDivElement;
- const stop = container.querySelector('.univer-absolute.univer-rounded-full.univer-border-2') as HTMLDivElement;
+ const bar = container.querySelector('[data-u-comp="gradient-color-picker-bar"]') as HTMLDivElement;
+ const stop = container.querySelector('[data-u-comp="gradient-color-picker-stop"]') as HTMLDivElement;
bar.getBoundingClientRect = vi.fn(() => ({
left: 0,
@@ -228,9 +225,36 @@ describe('GradientColorPicker', () => {
it('should not remove stop when there are only two stops', () => {
const onChange = vi.fn();
const { container } = render(<GradientColorPicker value={defaultValue} onChange={onChange} />);
- const deleteButton = container.querySelector('.univer-border-red-500') as HTMLButtonElement;
+ const deleteButton = container.querySelector('[data-u-comp="gradient-color-picker-delete"]') as HTMLButtonElement;
expect(deleteButton).toBeDisabled();
fireEvent.click(deleteButton);
expect(onChange).not.toHaveBeenCalled();
});
+
+ it('should adjust selectedIndex when stops are reduced externally', async () => {
+ const valueWithThreeStops: IGradientValue = {
+ ...defaultValue,
+ stops: [
+ { color: '#ffffff', offset: 0 },
+ { color: '#ff0000', offset: 50 },
+ { color: '#000000', offset: 100 },
+ ],
+ };
+ const { container, rerender } = render(<GradientColorPicker value={valueWithThreeStops} />);
+
+ // Select the third stop (index 2)
+ const stops = container.querySelectorAll('[data-u-comp="gradient-color-picker-stop"]');
+ fireEvent.click(stops[2]);
+ expect(stops[2]).toHaveAttribute('data-selected', 'true');
+
+ // Externally reduce stops to 2
+ rerender(<GradientColorPicker value={defaultValue} />);
+
+ // selectedIndex should be clamped to the last valid index (1)
+ await waitFor(() => {
+ const updatedStops = container.querySelectorAll('[data-u-comp="gradient-color-picker-stop"]');
+ expect(updatedStops[1]).toHaveAttribute('data-selected', 'true');
+ expect(updatedStops[0]).toHaveAttribute('data-selected', 'false');
+ });
+ });
});