diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e7665d5..a46f48d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * **dashboard**: Add Workflow Tasks section to the Team Dashboard allowing team owners to monitor background workflow jobs, inspect execution payloads and outputs, and stop in-flight tasks +### Fixed + +* **metadata**: Fix an issue where clicking to edit a metadata field on a card or list row inadvertently selected the file, and prevent expanded text overlays or date pickers from being clipped by container borders + ## [0.6.0] - 2026-10-20 ### Added diff --git a/README.md b/README.md index f8a17164..b9930742 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Docker pulls GitHub latest release License - Ask DeepWiki + Ask DeepWiki

diff --git a/README_CN.md b/README_CN.md index f77ad269..bc1196f3 100644 --- a/README_CN.md +++ b/README_CN.md @@ -12,7 +12,7 @@ Docker pulls GitHub latest release License - Ask DeepWiki + Ask DeepWiki

diff --git a/packages/webui/components/fields/date-field.test.tsx b/packages/webui/components/fields/date-field.test.tsx new file mode 100644 index 00000000..7f950861 --- /dev/null +++ b/packages/webui/components/fields/date-field.test.tsx @@ -0,0 +1,94 @@ +// @vitest-environment happy-dom +import { cleanup, fireEvent, render, screen } from '@testing-library/react' +import React from 'react' +import { afterEach, describe, expect, it, vi } from 'vitest' +import DateField from './date-field' + +describe('DateField Component', () => { + afterEach(() => { + cleanup() + vi.clearAllMocks() + }) + + const dummyConfig = { + name: 'Due Date', + type: 'date' as const, + date: { + displayFormat: 'iso' as const, + includeTime: false, + }, + } + + const dummyConfigWithTime = { + name: 'Event Time', + type: 'date' as const, + date: { + displayFormat: 'iso' as const, + includeTime: true, + timeFormat: 'twenty_four_hour' as const, + }, + } + + it('renders Empty state when value is empty', () => { + render() + expect(screen.getByText('Empty')).toBeTruthy() + }) + + it('renders formatted date when value is present', () => { + render() + expect(screen.getByText(/2026-06-15/)).toBeTruthy() + }) + + it('opens calendar popover on click and calls onSave when selecting a day', () => { + const onSave = vi.fn() + render() + + // Click trigger to open popover + const trigger = screen.getByText(/2026-06-15/) + fireEvent.click(trigger) + + // Month heading should be present + expect(screen.getByText(/June 2026/i)).toBeTruthy() + + // Day 20 button should be clickable + const day20 = screen.getByRole('button', { name: '20' }) + fireEvent.click(day20) + + expect(onSave).toHaveBeenCalled() + const savedArg = onSave.mock.calls[0][0] + expect(new Date(savedArg).getDate()).toBe(20) + }) + + it('supports time picker when includeTime is true', () => { + const onSave = vi.fn() + render( + , + ) + + const trigger = screen.getByText(/2026-06-15/) + fireEvent.click(trigger) + + // "Time" section should be visible + expect(screen.getByText(/Time/)).toBeTruthy() + + // Select hour '14' + const hour14 = screen.getByTestId('hour-14') + fireEvent.click(hour14) + + expect(onSave).toHaveBeenCalled() + const savedArg = onSave.mock.calls[0][0] + expect(new Date(savedArg).getHours()).toBe(14) + }) + + it('does not open popover in readOnly mode', () => { + const onSave = vi.fn() + render( + , + ) + + const trigger = screen.getByText(/2026-06-15/) + fireEvent.click(trigger) + + expect(screen.queryByText(/June 2026/i)).toBeNull() + }) +}) diff --git a/packages/webui/components/fields/date-field.tsx b/packages/webui/components/fields/date-field.tsx index 56be93e3..60490782 100644 --- a/packages/webui/components/fields/date-field.tsx +++ b/packages/webui/components/fields/date-field.tsx @@ -12,16 +12,15 @@ import { isValid, } from 'date-fns' import { ChevronLeft, ChevronRight, Clock } from 'lucide-react' -import React, { useEffect, useRef, useState } from 'react' +import React, { useEffect, useState } from 'react' import type { FieldProps } from './field-types' +import { Popover, PopoverContent, PopoverTrigger } from '@/ui/components/ui/popover' const DateField: React.FC> = ({ value, config, onSave, readOnly }) => { const dateConfig = config?.date const [isEditing, setIsEditing] = useState(false) - const containerRef = useRef(null) // Parse value or default to today - // Replaced parseISO with new Date() to avoid import errors const parsedDate = value ? new Date(value) : new Date() const safeDate = isValid(parsedDate) ? parsedDate : new Date() @@ -35,25 +34,17 @@ const DateField: React.FC> = ({ value, config, onSave, readOn } }, [isEditing, value]) - // Click outside to close - useEffect(() => { - const handleClickOutside = (event: MouseEvent) => { - if (containerRef.current && !containerRef.current.contains(event.target as Node)) { - if (isEditing) { - setIsEditing(false) - } - } - } - document.addEventListener('mousedown', handleClickOutside) - return () => document.removeEventListener('mousedown', handleClickOutside) - }, [isEditing]) - const handleStartEdit = () => { if (!readOnly) { setIsEditing(true) } } + const handleOpenChange = (open: boolean) => { + if (readOnly) return + setIsEditing(open) + } + const getDisplayValue = (isoString: string) => { if (!isoString) return '' const date = new Date(isoString) @@ -81,17 +72,14 @@ const DateField: React.FC> = ({ value, config, onSave, readOn } // Calendar Logic - // Replaced startOfMonth with native Date manipulation const monthStart = new Date(viewDate.getFullYear(), viewDate.getMonth(), 1) const monthEnd = endOfMonth(viewDate) const daysInMonth = eachDayOfInterval({ start: monthStart, end: monthEnd }) const startDayOfWeek = getDay(monthStart) // 0 = Sunday const handleDateClick = (day: Date) => { - // Preserve time from current value if exists const newDate = new Date(day) if (dateConfig?.includeTime) { - // Replaced setHours/setMinutes with native methods newDate.setHours(getHours(safeDate)) newDate.setMinutes(getMinutes(safeDate)) } @@ -116,23 +104,36 @@ const DateField: React.FC> = ({ value, config, onSave, readOn const hours = Array.from({ length: 24 }, (_, i) => i) const minutes = Array.from({ length: 12 }, (_, i) => i * 5) // 0, 5, 10... - if (isEditing) { - return ( -

-
- {value ? ( - getDisplayValue(value) - ) : ( - Select date... - )} -
+ return ( +
e.stopPropagation()}> + + +
+ {value ? ( + getDisplayValue(value) + ) : ( + Empty + )} +
+
-
+ e.stopPropagation()} + > {/* Date Picker */}
- {/* Replaced subMonths with addMonths(-1) */} {format(viewDate, 'MMMM yyyy')}
-
- ) - } - - return ( -
- {value ? getDisplayValue(value) : Empty} + +
) } diff --git a/packages/webui/components/fields/long-text-field.test.tsx b/packages/webui/components/fields/long-text-field.test.tsx index 400a5bad..7d0f4228 100644 --- a/packages/webui/components/fields/long-text-field.test.tsx +++ b/packages/webui/components/fields/long-text-field.test.tsx @@ -17,8 +17,9 @@ describe('LongTextField Component', () => { it('renders collapsed placeholder with fixed 2-row height and whitespace-pre-wrap', () => { render() - const collapsed = screen.getByTitle('Click to expand') + const collapsed = screen.getByTestId('long-text-placeholder') expect(collapsed).toBeTruthy() + expect(collapsed.title).toBe('Click to edit') expect(collapsed.className).toContain('h-[48px]') expect(collapsed.className).toContain('line-clamp-2') expect(collapsed.className).toContain('whitespace-pre-wrap') @@ -26,17 +27,102 @@ describe('LongTextField Component', () => { it('renders Empty state inside 2-row container when value is empty', () => { render() - const collapsed = screen.getByTitle('Click to expand') + const collapsed = screen.getByTestId('long-text-placeholder') expect(collapsed.className).toContain('h-[48px]') expect(screen.getByText('Empty')).toBeTruthy() }) - it('expands on click to show full content overlay', () => { - render() - const collapsed = screen.getByTitle('Click to expand') + it('single click expands directly into textarea editing mode and positions cursor at the end', () => { + const text = 'Line 1\nLine 2\nLine 3' + render() + const collapsed = screen.getByTestId('long-text-placeholder') fireEvent.click(collapsed) - const elements = screen.getAllByText(/Line 1/) - expect(elements.length).toBe(2) + const textarea = screen.getByRole('textbox') as HTMLTextAreaElement + expect(textarea).toBeTruthy() + expect(textarea.value).toBe(text) + expect(textarea.selectionStart).toBe(text.length) + expect(textarea.selectionEnd).toBe(text.length) + expect(collapsed.className).toContain('invisible') + }) + + it('saves updated content on blur', () => { + const onSave = vi.fn() + render() + + // Single click directly opens editing textarea + fireEvent.click(screen.getByTestId('long-text-placeholder')) + + const textarea = screen.getByRole('textbox') as HTMLTextAreaElement + expect(textarea).toBeTruthy() + expect(textarea.value).toBe('Initial content') + + // Change value and blur + fireEvent.change(textarea, { target: { value: 'Updated content' } }) + fireEvent.blur(textarea) + + expect(onSave).toHaveBeenCalledWith('Updated content') + expect(screen.queryByRole('textbox')).toBeNull() + }) + + it('does not call onSave on blur if value did not change', () => { + const onSave = vi.fn() + render() + + fireEvent.click(screen.getByTestId('long-text-placeholder')) + const textarea = screen.getByRole('textbox') as HTMLTextAreaElement + fireEvent.blur(textarea) + + expect(onSave).not.toHaveBeenCalled() + expect(screen.queryByRole('textbox')).toBeNull() + }) + + it('blurs and saves when pressing Cmd+Enter in textarea', () => { + const onSave = vi.fn() + render() + + fireEvent.click(screen.getByTestId('long-text-placeholder')) + + const textarea = screen.getByRole('textbox') as HTMLTextAreaElement + fireEvent.change(textarea, { target: { value: 'Content saved via shortcut' } }) + fireEvent.keyDown(textarea, { key: 'Enter', metaKey: true }) + + expect(onSave).toHaveBeenCalledWith('Content saved via shortcut') + expect(screen.queryByRole('textbox')).toBeNull() + }) + + it('cancels editing on Escape key and discards changes', () => { + const onSave = vi.fn() + render() + + fireEvent.click(screen.getByTestId('long-text-placeholder')) + const textarea = screen.getByRole('textbox') as HTMLTextAreaElement + expect(textarea).toBeTruthy() + + fireEvent.change(textarea, { target: { value: 'Changed content' } }) + fireEvent.keyDown(document, { key: 'Escape' }) + + expect(screen.queryByRole('textbox')).toBeNull() + expect(onSave).not.toHaveBeenCalled() + }) + + it('does not allow editing in readOnly mode, only expanding view', () => { + const onSave = vi.fn() + render() + + const collapsed = screen.getByTestId('long-text-placeholder') + expect(collapsed.title).toBe('Click to expand') + fireEvent.click(collapsed) + + // Expanded read-only overlay is present, but no textarea + expect(screen.queryByRole('textbox')).toBeNull() + const expandedView = screen.getByTestId('long-text-expanded-overlay') + expect(expandedView).toBeTruthy() + expect(expandedView.textContent).toContain('Readonly text') + + // Escape closes read-only overlay + fireEvent.keyDown(document, { key: 'Escape' }) + expect(screen.queryByTestId('long-text-expanded-overlay')).toBeNull() + expect(onSave).not.toHaveBeenCalled() }) }) diff --git a/packages/webui/components/fields/long-text-field.tsx b/packages/webui/components/fields/long-text-field.tsx index 0d161073..297f6c26 100644 --- a/packages/webui/components/fields/long-text-field.tsx +++ b/packages/webui/components/fields/long-text-field.tsx @@ -1,4 +1,5 @@ -import React, { useEffect, useRef, useState } from 'react' +import React, { useEffect, useLayoutEffect, useRef, useState } from 'react' +import { createPortal } from 'react-dom' import type { FieldProps } from './field-types' const LongTextField: React.FC> = ({ value, onSave, readOnly }) => { @@ -6,92 +7,210 @@ const LongTextField: React.FC> = ({ value, onSave, readOnly } const [localValue, setLocalValue] = useState(value || '') const textareaRef = useRef(null) const containerRef = useRef(null) + const overlayRef = useRef(null) const [expanded, setExpanded] = useState(false) + const [coords, setCoords] = useState<{ + top: number + left: number + width: number + height: number + } | null>(null) useEffect(() => { setLocalValue(value || '') }, [value]) + const updateCoords = () => { + if (containerRef.current) { + const rect = containerRef.current.getBoundingClientRect() + setCoords({ + top: rect.top, + left: rect.left, + width: rect.width, + height: rect.height, + }) + } + } + + useLayoutEffect(() => { + if (expanded || isEditing) { + updateCoords() + } + }, [expanded, isEditing]) + + const adjustHeight = () => { + if (textareaRef.current) { + textareaRef.current.style.height = 'auto' + const baseHeight = Math.max(80, coords?.height || 0) + const newHeight = Math.min(240, Math.max(baseHeight, textareaRef.current.scrollHeight)) + textareaRef.current.style.height = `${newHeight}px` + } + } + + useLayoutEffect(() => { + if (isEditing) { + adjustHeight() + } + }, [isEditing, localValue]) + useEffect(() => { if (isEditing && textareaRef.current) { textareaRef.current.focus() - setExpanded(false) + const len = textareaRef.current.value.length + textareaRef.current.setSelectionRange(len, len) } }, [isEditing]) - // Handle click outside to close expanded state + // Handle click outside and Escape to close expanded or editing state useEffect(() => { const handleClickOutside = (event: MouseEvent) => { + const target = event.target as Node if ( - expanded && containerRef.current && - !containerRef.current.contains(event.target as Node) + !containerRef.current.contains(target) && + overlayRef.current && + !overlayRef.current.contains(target) ) { - setExpanded(false) + if (isEditing) { + handleBlur() + } else { + setExpanded(false) + } } } - if (expanded) { + const handleKeyDownGlobal = (event: KeyboardEvent) => { + if (event.key === 'Escape') { + if (isEditing) { + setIsEditing(false) + setLocalValue(value || '') + } else { + setExpanded(false) + } + } + } + + const handleScrollOrResize = (event: Event) => { + if (overlayRef.current && overlayRef.current.contains(event.target as Node)) { + return + } + updateCoords() + } + + if (expanded || isEditing) { document.addEventListener('mousedown', handleClickOutside) + document.addEventListener('keydown', handleKeyDownGlobal) + window.addEventListener('scroll', handleScrollOrResize, true) + window.addEventListener('resize', handleScrollOrResize) } return () => { document.removeEventListener('mousedown', handleClickOutside) + document.removeEventListener('keydown', handleKeyDownGlobal) + window.removeEventListener('scroll', handleScrollOrResize, true) + window.removeEventListener('resize', handleScrollOrResize) } - }, [expanded]) + }, [expanded, isEditing, localValue, value]) const handleBlur = () => { setIsEditing(false) - onSave(localValue) + setExpanded(false) + if (localValue !== (value || '')) { + onSave(localValue) + } } const handlePlaceholderClick = (e: React.MouseEvent) => { e.stopPropagation() - setExpanded(true) - } - - const handleOverlayClick = (e: React.MouseEvent) => { - e.stopPropagation() + updateCoords() if (!readOnly) { setIsEditing(true) + } else { + setExpanded(true) } } - if (isEditing) { - return ( -