@wordpress/dataviews 9.1.1-next.f56bd8138.0 → 10.0.1-next.47f435fc9.0

package/src/dataform-controls/date.tsx

@@ -4,18 +4,27 @@
 import {
 	BaseControl,
 	Button,
+	Icon,
 	privateApis as componentsPrivateApis,
 	__experimentalInputControl as InputControl,
 	__experimentalHStack as HStack,
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
-import { useCallback, useMemo, useState } from '@wordpress/element';
+import {
+	useCallback,
+	useEffect,
+	useMemo,
+	useRef,
+	useState,
+} from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { getDate, getSettings } from '@wordpress/date';
+import { error as errorIcon } from '@wordpress/icons';
 
 /**
  * External dependencies
  */
+import clsx from 'clsx';
 import {
 	format,
 	isValid,
@@ -25,14 +34,12 @@ import {
 	startOfMonth,
 	startOfYear,
 } from 'date-fns';
+import deepMerge from 'deepmerge';
 
 /**
  * Internal dependencies
  */
-import RelativeDateControl, {
-	TIME_UNITS_OPTIONS,
-	type DateRelative,
-} from './relative-date-control';
+import RelativeDateControl from './utils/relative-date-control';
 import {
 	OPERATOR_IN_THE_PAST,
 	OPERATOR_OVER,
@@ -139,39 +146,161 @@ const formatDate = ( date?: Date | string ): string => {
 	return typeof date === 'string' ? date : format( date, 'yyyy-MM-dd' );
 };
 
-function CalendarDateControl( {
-	id,
+function ValidatedDateControl< Item >( {
 	value,
-	onChange,
-	label,
-	hideLabelFromVision,
-	className,
+	field,
+	data,
+	setValue,
+	inputRefs,
+	isTouched,
+	setIsTouched,
+	children,
 }: {
-	id: string;
-	value: string | undefined;
-	onChange: ( value: string | undefined ) => void;
-	label: string;
-	hideLabelFromVision?: boolean;
-	className?: string;
+	value: any;
+	field: any;
+	data: Item;
+	setValue: any;
+	inputRefs:
+		| React.RefObject< HTMLInputElement >
+		| React.RefObject< HTMLInputElement >[];
+	isTouched: boolean;
+	setIsTouched: ( touched: boolean ) => void;
+	children: React.ReactNode;
 } ) {
+	const [ customValidity, setCustomValidity ] = useState<
+		{ type: 'invalid'; message: string } | undefined
+	>( undefined );
+
+	const onValidate = useCallback(
+		( newValue: any ) => {
+			// Check custom validation (only if value exists)
+			if ( newValue ) {
+				const customMessage = field.isValid?.custom?.(
+					deepMerge(
+						data,
+						setValue( {
+							item: data,
+							value: newValue,
+						} ) as Partial< Item >
+					),
+					field
+				);
+
+				if ( customMessage ) {
+					setCustomValidity( {
+						type: 'invalid',
+						message: customMessage,
+					} );
+					return;
+				}
+			}
+
+			// Check HTML5 validity on all refs
+			const refs = Array.isArray( inputRefs ) ? inputRefs : [ inputRefs ];
+			for ( const ref of refs ) {
+				const input = ref.current;
+				if ( input && ! input.validity.valid ) {
+					setCustomValidity( {
+						type: 'invalid',
+						message: input.validationMessage,
+					} );
+					return;
+				}
+			}
+
+			// No errors
+			setCustomValidity( undefined );
+		},
+		[ data, field, setValue, inputRefs ]
+	);
+
+	useEffect( () => {
+		if ( isTouched ) {
+			const timeoutId = setTimeout( () => {
+				onValidate( value );
+			}, 0 );
+			return () => clearTimeout( timeoutId );
+		}
+		return undefined;
+	}, [ isTouched, value, onValidate ] );
+
+	const onBlur = ( event: React.FocusEvent< HTMLDivElement > ) => {
+		if ( isTouched ) {
+			return;
+		}
+
+		// Only consider "blurred from the component" if focus has fully left the wrapping div.
+		// This prevents unnecessary blurs from components with multiple focusable elements.
+		if (
+			! event.relatedTarget ||
+			! event.currentTarget.contains( event.relatedTarget )
+		) {
+			setIsTouched( true );
+		}
+	};
+
+	return (
+		<div onBlur={ onBlur }>
+			{ children }
+			<div aria-live="polite">
+				{ customValidity && (
+					<p
+						className={ clsx(
+							'components-validated-control__indicator',
+							'is-invalid'
+						) }
+					>
+						<Icon
+							className="components-validated-control__indicator-icon"
+							icon={ errorIcon }
+							size={ 16 }
+							fill="currentColor"
+						/>
+						{ customValidity.message }
+					</p>
+				) }
+			</div>
+		</div>
+	);
+}
+
+function CalendarDateControl< Item >( {
+	data,
+	field,
+	onChange,
+	hideLabelFromVision,
+}: DataFormControlProps< Item > ) {
+	const { id, label, setValue, getValue } = field;
 	const [ selectedPresetId, setSelectedPresetId ] = useState< string | null >(
 		null
 	);
 
+	const fieldValue = getValue( { item: data } );
+	const value = typeof fieldValue === 'string' ? fieldValue : undefined;
 	const [ calendarMonth, setCalendarMonth ] = useState< Date >( () => {
 		const parsedDate = parseDate( value );
 		return parsedDate || new Date(); // Default to current month
 	} );
 
+	const [ isTouched, setIsTouched ] = useState( false );
+	const validityTargetRef = useRef< HTMLInputElement >( null );
+
+	const onChangeCallback = useCallback(
+		( newValue: string | undefined ) =>
+			onChange( setValue( { item: data, value: newValue } ) ),
+		[ data, onChange, setValue ]
+	);
+
 	const onSelectDate = useCallback(
 		( newDate: Date | undefined | null ) => {
 			const dateValue = newDate
 				? format( newDate, 'yyyy-MM-dd' )
 				: undefined;
-			onChange( dateValue );
+			onChangeCallback( dateValue );
 			setSelectedPresetId( null );
+			setIsTouched( true );
 		},
-		[ onChange ]
+		[ onChangeCallback ]
 	);
 
 	const handlePresetClick = useCallback(
@@ -180,15 +309,16 @@ function CalendarDateControl( {
 			const dateValue = formatDate( presetDate );
 
 			setCalendarMonth( presetDate );
-			onChange( dateValue );
+			onChangeCallback( dateValue );
 			setSelectedPresetId( preset.id );
+			setIsTouched( true );
 		},
-		[ onChange ]
+		[ onChangeCallback ]
 	);
 
 	const handleManualDateChange = useCallback(
 		( newValue?: string ) => {
-			onChange( newValue );
+			onChangeCallback( newValue );
 			if ( newValue ) {
 				const parsedDate = parseDate( newValue );
 				if ( parsedDate ) {
@@ -196,8 +326,9 @@ function CalendarDateControl( {
 				}
 			}
 			setSelectedPresetId( null );
+			setIsTouched( true );
 		},
-		[ onChange ]
+		[ onChangeCallback ]
 	);
 
 	const {
@@ -205,86 +336,118 @@ function CalendarDateControl( {
 		l10n: { startOfWeek },
 	} = getSettings();
 
+	const displayLabel = field.isValid?.required
+		? `${ label } (${ __( 'Required' ) })`
+		: label;
+
 	return (
-		<BaseControl
-			__nextHasNoMarginBottom
-			id={ id }
-			className={ className }
-			label={ label }
-			hideLabelFromVision={ hideLabelFromVision }
+		<ValidatedDateControl
+			value={ value }
+			field={ field }
+			data={ data }
+			setValue={ setValue }
+			inputRefs={ validityTargetRef }
+			isTouched={ isTouched }
+			setIsTouched={ setIsTouched }
 		>
-			<VStack spacing={ 4 }>
-				{ /* Preset buttons */ }
-				<HStack spacing={ 2 } wrap justify="flex-start">
-					{ DATE_PRESETS.map( ( preset ) => {
-						const isSelected = selectedPresetId === preset.id;
-						return (
-							<Button
-								className="dataviews-controls__date-preset"
-								key={ preset.id }
-								variant="tertiary"
-								isPressed={ isSelected }
-								size="small"
-								onClick={ () => handlePresetClick( preset ) }
-							>
-								{ preset.label }
-							</Button>
-						);
-					} ) }
-					<Button
-						className="dataviews-controls__date-preset"
-						variant="tertiary"
-						isPressed={ ! selectedPresetId }
-						size="small"
-						disabled={ !! selectedPresetId }
-						accessibleWhenDisabled={ false }
-					>
-						{ __( 'Custom' ) }
-					</Button>
-				</HStack>
-
-				{ /* Manual date input */ }
-				<InputControl
-					__next40pxDefaultSize
-					type="date"
-					label={ __( 'Date' ) }
-					hideLabelFromVision
-					value={ value }
-					onChange={ handleManualDateChange }
-				/>
-
-				{ /* Calendar widget */ }
-				<DateCalendar
-					style={ { width: '100%' } }
-					selected={
-						value ? parseDate( value ) || undefined : undefined
-					}
-					onSelect={ onSelectDate }
-					month={ calendarMonth }
-					onMonthChange={ setCalendarMonth }
-					timeZone={ timezoneString || undefined }
-					weekStartsOn={ startOfWeek }
-				/>
-			</VStack>
-		</BaseControl>
+			<BaseControl
+				__nextHasNoMarginBottom
+				id={ id }
+				className="dataviews-controls__date"
+				label={ displayLabel }
+				hideLabelFromVision={ hideLabelFromVision }
+			>
+				<VStack spacing={ 4 }>
+					{ /* Preset buttons */ }
+					<HStack spacing={ 2 } wrap justify="flex-start">
+						{ DATE_PRESETS.map( ( preset ) => {
+							const isSelected = selectedPresetId === preset.id;
+							return (
+								<Button
+									className="dataviews-controls__date-preset"
+									key={ preset.id }
+									variant="tertiary"
+									isPressed={ isSelected }
+									size="small"
+									onClick={ () =>
+										handlePresetClick( preset )
+									}
+								>
+									{ preset.label }
+								</Button>
+							);
+						} ) }
+						<Button
+							className="dataviews-controls__date-preset"
+							variant="tertiary"
+							isPressed={ ! selectedPresetId }
+							size="small"
+							disabled={ !! selectedPresetId }
+							accessibleWhenDisabled={ false }
+						>
+							{ __( 'Custom' ) }
+						</Button>
+					</HStack>
+
+					{ /* Manual date input */ }
+					<InputControl
+						__next40pxDefaultSize
+						ref={ validityTargetRef }
+						type="date"
+						label={ __( 'Date' ) }
+						hideLabelFromVision
+						value={ value }
+						onChange={ handleManualDateChange }
+						required={ !! field.isValid?.required }
+					/>
+
+					{ /* Calendar widget */ }
+					<DateCalendar
+						style={ { width: '100%' } }
+						selected={
+							value ? parseDate( value ) || undefined : undefined
+						}
+						onSelect={ onSelectDate }
+						month={ calendarMonth }
+						onMonthChange={ setCalendarMonth }
+						timeZone={ timezoneString || undefined }
+						weekStartsOn={ startOfWeek }
+					/>
+				</VStack>
+			</BaseControl>
+		</ValidatedDateControl>
 	);
 }
 
-function CalendarDateRangeControl( {
-	id,
-	value,
+function CalendarDateRangeControl< Item >( {
+	data,
+	field,
 	onChange,
-	label,
 	hideLabelFromVision,
-	className,
-}: {
-	id: string;
-	value: DateRange;
-	onChange: ( value: DateRange ) => void;
-	label: string;
-	hideLabelFromVision?: boolean;
-	className?: string;
-} ) {
+}: DataFormControlProps< Item > ) {
+	const { id, label, getValue, setValue } = field;
+	let value: DateRange;
+	const fieldValue = getValue( { item: data } );
+	if (
+		Array.isArray( fieldValue ) &&
+		fieldValue.length === 2 &&
+		fieldValue.every( ( date ) => typeof date === 'string' )
+	) {
+		value = fieldValue as DateRange;
+	}
+
+	const onChangeCallback = useCallback(
+		( newValue: DateRange ) => {
+			onChange(
+				setValue( {
+					item: data,
+					value: newValue,
+				} )
+			);
+		},
+		[ data, onChange, setValue ]
+	);
+
 	const [ selectedPresetId, setSelectedPresetId ] = useState< string | null >(
 		null
 	);
@@ -305,16 +468,23 @@ function CalendarDateRangeControl( {
 		return selectedRange.from || new Date();
 	} );
 
+	const [ isTouched, setIsTouched ] = useState( false );
+	const fromInputRef = useRef< HTMLInputElement >( null );
+	const toInputRef = useRef< HTMLInputElement >( null );
+
 	const updateDateRange = useCallback(
 		( fromDate?: Date | string, toDate?: Date | string ) => {
 			if ( fromDate && toDate ) {
-				onChange( [ formatDate( fromDate ), formatDate( toDate ) ] );
+				onChangeCallback( [
+					formatDate( fromDate ),
+					formatDate( toDate ),
+				] );
 			} else if ( ! fromDate && ! toDate ) {
-				onChange( undefined );
+				onChangeCallback( undefined );
 			}
 			// Do nothing if only one date is set - wait for both
 		},
-		[ onChange ]
+		[ onChangeCallback ]
 	);
 
 	const onSelectCalendarRange = useCallback(
@@ -325,6 +495,7 @@ function CalendarDateRangeControl( {
 		) => {
 			updateDateRange( newRange?.from, newRange?.to );
 			setSelectedPresetId( null );
+			setIsTouched( true );
 		},
 		[ updateDateRange ]
 	);
@@ -335,6 +506,7 @@ function CalendarDateRangeControl( {
 			setCalendarMonth( startDate );
 			updateDateRange( startDate, endDate );
 			setSelectedPresetId( preset.id );
+			setIsTouched( true );
 		},
 		[ updateDateRange ]
 	);
@@ -358,85 +530,106 @@ function CalendarDateRangeControl( {
 			}
 
 			setSelectedPresetId( null );
+			setIsTouched( true );
 		},
 		[ value, updateDateRange ]
 	);
 
 	const { timezone, l10n } = getSettings();
 
+	const displayLabel = field.isValid?.required
+		? `${ label } (${ __( 'Required' ) })`
+		: label;
+
 	return (
-		<BaseControl
-			__nextHasNoMarginBottom
-			id={ id }
-			className={ className }
-			label={ label }
-			hideLabelFromVision={ hideLabelFromVision }
+		<ValidatedDateControl
+			value={ value }
+			field={ field }
+			data={ data }
+			setValue={ setValue }
+			inputRefs={ [ fromInputRef, toInputRef ] }
+			isTouched={ isTouched }
+			setIsTouched={ setIsTouched }
 		>
-			<VStack spacing={ 4 }>
-				{ /* Preset buttons */ }
-				<HStack spacing={ 2 } wrap justify="flex-start">
-					{ DATE_RANGE_PRESETS.map( ( preset ) => {
-						const isSelected = selectedPresetId === preset.id;
-						return (
-							<Button
-								className="dataviews-controls__date-preset"
-								key={ preset.id }
-								variant="tertiary"
-								isPressed={ isSelected }
-								size="small"
-								onClick={ () => handlePresetClick( preset ) }
-							>
-								{ preset.label }
-							</Button>
-						);
-					} ) }
-					<Button
-						className="dataviews-controls__date-preset"
-						variant="tertiary"
-						isPressed={ ! selectedPresetId }
-						size="small"
-						accessibleWhenDisabled={ false }
-						disabled={ !! selectedPresetId }
-					>
-						{ __( 'Custom' ) }
-					</Button>
-				</HStack>
-
-				{ /* Manual date range inputs */ }
-				<HStack spacing={ 2 }>
-					<InputControl
-						__next40pxDefaultSize
-						type="date"
-						label={ __( 'From' ) }
-						hideLabelFromVision
-						value={ value?.[ 0 ] }
-						onChange={ ( newValue ) =>
-							handleManualDateChange( 'from', newValue )
-						}
-					/>
-					<InputControl
-						__next40pxDefaultSize
-						type="date"
-						label={ __( 'To' ) }
-						hideLabelFromVision
-						value={ value?.[ 1 ] }
-						onChange={ ( newValue ) =>
-							handleManualDateChange( 'to', newValue )
-						}
+			<BaseControl
+				__nextHasNoMarginBottom
+				id={ id }
+				className="dataviews-controls__date"
+				label={ displayLabel }
+				hideLabelFromVision={ hideLabelFromVision }
+			>
+				<VStack spacing={ 4 }>
+					{ /* Preset buttons */ }
+					<HStack spacing={ 2 } wrap justify="flex-start">
+						{ DATE_RANGE_PRESETS.map( ( preset ) => {
+							const isSelected = selectedPresetId === preset.id;
+							return (
+								<Button
+									className="dataviews-controls__date-preset"
+									key={ preset.id }
+									variant="tertiary"
+									isPressed={ isSelected }
+									size="small"
+									onClick={ () =>
+										handlePresetClick( preset )
+									}
+								>
+									{ preset.label }
+								</Button>
+							);
+						} ) }
+						<Button
+							className="dataviews-controls__date-preset"
+							variant="tertiary"
+							isPressed={ ! selectedPresetId }
+							size="small"
+							accessibleWhenDisabled={ false }
+							disabled={ !! selectedPresetId }
+						>
+							{ __( 'Custom' ) }
+						</Button>
+					</HStack>
+
+					{ /* Manual date range inputs */ }
+					<HStack spacing={ 2 }>
+						<InputControl
+							__next40pxDefaultSize
+							ref={ fromInputRef }
+							type="date"
+							label={ __( 'From' ) }
+							hideLabelFromVision
+							value={ value?.[ 0 ] }
+							onChange={ ( newValue ) =>
+								handleManualDateChange( 'from', newValue )
+							}
+							required={ !! field.isValid?.required }
+						/>
+						<InputControl
+							__next40pxDefaultSize
+							ref={ toInputRef }
+							type="date"
+							label={ __( 'To' ) }
+							hideLabelFromVision
+							value={ value?.[ 1 ] }
+							onChange={ ( newValue ) =>
+								handleManualDateChange( 'to', newValue )
+							}
+							required={ !! field.isValid?.required }
+						/>
+					</HStack>
+
+					<DateRangeCalendar
+						style={ { width: '100%' } }
+						selected={ selectedRange }
+						onSelect={ onSelectCalendarRange }
+						month={ calendarMonth }
+						onMonthChange={ setCalendarMonth }
+						timeZone={ timezone.string || undefined }
+						weekStartsOn={ l10n.startOfWeek }
 					/>
-				</HStack>
-
-				<DateRangeCalendar
-					style={ { width: '100%' } }
-					selected={ selectedRange }
-					onSelect={ onSelectCalendarRange }
-					month={ calendarMonth }
-					onMonthChange={ setCalendarMonth }
-					timeZone={ timezone.string || undefined }
-					weekStartsOn={ l10n.startOfWeek }
-				/>
-			</VStack>
-		</BaseControl>
+				</VStack>
+			</BaseControl>
+		</ValidatedDateControl>
 	);
 }
 
@@ -447,66 +640,25 @@ export default function DateControl< Item >( {
 	hideLabelFromVision,
 	operator,
 }: DataFormControlProps< Item > ) {
-	const { id, label, getValue, setValue } = field;
-	const value = getValue( { item: data } );
-
-	const onChangeRelativeDateControl = useCallback(
-		( newValue: DateRelative ) => {
-			onChange( setValue( { item: data, value: newValue } ) );
-		},
-		[ data, onChange, setValue ]
-	);
-
-	const onChangeCalendarDateRangeControl = useCallback(
-		( newValue: DateRange ) => {
-			onChange(
-				setValue( {
-					item: data,
-					value: newValue,
-				} )
-			);
-		},
-		[ data, onChange, setValue ]
-	);
-
-	const onChangeCalendarDateControl = useCallback(
-		( newValue: string | undefined ) =>
-			onChange( setValue( { item: data, value: newValue } ) ),
-		[ data, onChange, setValue ]
-	);
-
 	if ( operator === OPERATOR_IN_THE_PAST || operator === OPERATOR_OVER ) {
 		return (
 			<RelativeDateControl
 				className="dataviews-controls__date"
-				id={ id }
-				value={ value && typeof value === 'object' ? value : {} }
-				onChange={ onChangeRelativeDateControl }
-				label={ label }
+				data={ data }
+				field={ field }
+				onChange={ onChange }
 				hideLabelFromVision={ hideLabelFromVision }
-				options={ TIME_UNITS_OPTIONS[ operator ] }
+				operator={ operator }
 			/>
 		);
 	}
 
 	if ( operator === OPERATOR_BETWEEN ) {
-		let dateRangeValue: DateRange;
-		if (
-			Array.isArray( value ) &&
-			value.length === 2 &&
-			value.every( ( date ) => typeof date === 'string' )
-		) {
-			// Ensure the value is expected format
-			dateRangeValue = value as DateRange;
-		}
-
 		return (
 			<CalendarDateRangeControl
-				className="dataviews-controls__date"
-				id={ id }
-				value={ dateRangeValue }
-				onChange={ onChangeCalendarDateRangeControl }
-				label={ label }
+				data={ data }
+				field={ field }
+				onChange={ onChange }
 				hideLabelFromVision={ hideLabelFromVision }
 			/>
 		);
@@ -514,11 +666,9 @@ export default function DateControl< Item >( {
 
 	return (
 		<CalendarDateControl
-			className="dataviews-controls__date"
-			id={ id }
-			value={ typeof value === 'string' ? value : undefined }
-			onChange={ onChangeCalendarDateControl }
-			label={ label }
+			data={ data }
+			field={ field }
+			onChange={ onChange }
 			hideLabelFromVision={ hideLabelFromVision }
 		/>
 	);