@wordpress/dataviews 10.3.1-next.2f1c7c01b.0 → 10.4.1-next.dc3f6d3c1.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dataviews",
-	"version": "10.3.1-next.2f1c7c01b.0",
+	"version": "10.4.1-next.dc3f6d3c1.0",
 	"description": "DataViews is a component that provides an API to render datasets using different types of layouts (table, grid, list, etc.).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -44,19 +44,19 @@
 	"sideEffects": false,
 	"dependencies": {
 		"@ariakit/react": "^0.4.15",
-		"@wordpress/base-styles": "^6.10.1-next.2f1c7c01b.0",
-		"@wordpress/components": "^30.7.2-next.2f1c7c01b.0",
-		"@wordpress/compose": "^7.34.1-next.2f1c7c01b.0",
-		"@wordpress/data": "^10.34.1-next.2f1c7c01b.0",
-		"@wordpress/date": "^5.34.1-next.2f1c7c01b.0",
-		"@wordpress/element": "^6.34.1-next.2f1c7c01b.0",
-		"@wordpress/i18n": "^6.7.1-next.2f1c7c01b.0",
-		"@wordpress/icons": "^11.1.1-next.2f1c7c01b.0",
-		"@wordpress/keycodes": "^4.34.1-next.2f1c7c01b.0",
-		"@wordpress/primitives": "^4.34.1-next.2f1c7c01b.0",
-		"@wordpress/private-apis": "^1.34.1-next.2f1c7c01b.0",
-		"@wordpress/url": "^4.34.1-next.2f1c7c01b.0",
-		"@wordpress/warning": "^3.34.1-next.2f1c7c01b.0",
+		"@wordpress/base-styles": "^6.11.1-next.dc3f6d3c1.0",
+		"@wordpress/components": "^30.8.2-next.dc3f6d3c1.0",
+		"@wordpress/compose": "^7.35.1-next.dc3f6d3c1.0",
+		"@wordpress/data": "^10.35.1-next.dc3f6d3c1.0",
+		"@wordpress/date": "^5.35.1-next.dc3f6d3c1.0",
+		"@wordpress/element": "^6.35.1-next.dc3f6d3c1.0",
+		"@wordpress/i18n": "^6.8.1-next.dc3f6d3c1.0",
+		"@wordpress/icons": "^11.2.1-next.dc3f6d3c1.0",
+		"@wordpress/keycodes": "^4.35.1-next.dc3f6d3c1.0",
+		"@wordpress/primitives": "^4.35.1-next.dc3f6d3c1.0",
+		"@wordpress/private-apis": "^1.35.1-next.dc3f6d3c1.0",
+		"@wordpress/url": "^4.35.1-next.dc3f6d3c1.0",
+		"@wordpress/warning": "^3.35.1-next.dc3f6d3c1.0",
 		"clsx": "^2.1.1",
 		"colord": "^2.7.0",
 		"date-fns": "^4.1.0",
@@ -74,5 +74,5 @@
 	"scripts": {
 		"build:wp": "node build"
 	},
-	"gitHead": "c6ddcdf455bc02567a2c9e03de6862a2061b85e8"
+	"gitHead": "f73b5e69b34fbaccfb8c47783f4f993059ff1a41"
 }

package/src/components/dataviews/style.scss

@@ -14,6 +14,7 @@
 	flex-direction: column;
 	font-size: $default-font-size;
 	line-height: $default-line-height;
+	background-color: inherit;
 }
 
 .dataviews__view-actions,
@@ -23,6 +24,7 @@
 	flex-shrink: 0;
 	position: sticky;
 	left: 0;
+	background-color: inherit;
 
 	@media not (prefers-reduced-motion) {
 		transition: padding ease-out 0.1s;

package/src/components/dataviews-filters/filter.tsx

@@ -19,6 +19,7 @@ import {
 import { __, sprintf } from '@wordpress/i18n';
 import { useRef, createInterpolateElement } from '@wordpress/element';
 import { closeSmall } from '@wordpress/icons';
+import { dateI18n, getDate } from '@wordpress/date';
 
 const ENTER = 'Enter';
 const SPACE = ' ';
@@ -498,7 +499,16 @@ export default function Filter( {
 		const field = fields.find( ( f ) => f.id === filter.field );
 		let label = filterInView.value;
 
-		if ( field?.type === 'datetime' && typeof label === 'string' ) {
+		if ( field?.type === 'date' && typeof label === 'string' ) {
+			try {
+				const dateValue = parseDateTime( label );
+				if ( dateValue !== null ) {
+					label = dateI18n( field.format.date, getDate( label ) );
+				}
+			} catch ( e ) {
+				label = filterInView.value;
+			}
+		} else if ( field?.type === 'datetime' && typeof label === 'string' ) {
 			try {
 				const dateValue = parseDateTime( label );
 				if ( dateValue !== null ) {

package/src/components/dataviews-footer/style.scss

@@ -6,7 +6,7 @@
 	position: sticky;
 	bottom: 0;
 	left: 0;
-	background-color: $white;
+	background-color: inherit;
 	padding: $grid-unit-15 $grid-unit-60;
 	border-top: $border-width solid $gray-100;
 	flex-shrink: 0;

package/src/components/dataviews-view-config/index.tsx

@@ -1,8 +1,7 @@
 /**
  * External dependencies
  */
-import type { ChangeEvent, ReactNode } from 'react';
-import clsx from 'clsx';
+import type { ChangeEvent } from 'react';
 
 /**
  * WordPress dependencies
@@ -15,28 +14,16 @@ import {
 	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 	__experimentalToggleGroupControlOptionIcon as ToggleGroupControlOptionIcon,
 	SelectControl,
-	__experimentalItemGroup as ItemGroup,
-	__experimentalItem as Item,
 	__experimentalGrid as Grid,
 	__experimentalVStack as VStack,
 	__experimentalHStack as HStack,
 	__experimentalHeading as Heading,
 	__experimentalText as Text,
 	privateApis as componentsPrivateApis,
-	BaseControl,
-	Icon,
 } from '@wordpress/components';
-import { __, _x, sprintf } from '@wordpress/i18n';
-import { memo, useContext, useMemo, useState } from '@wordpress/element';
-import {
-	chevronDown,
-	chevronUp,
-	cog,
-	seen,
-	unseen,
-	lock,
-	moreVertical,
-} from '@wordpress/icons';
+import { __, _x } from '@wordpress/i18n';
+import { memo, useContext, useMemo } from '@wordpress/element';
+import { cog } from '@wordpress/icons';
 import warning from '@wordpress/warning';
 import { useInstanceId } from '@wordpress/compose';
 
@@ -45,9 +32,10 @@ import { useInstanceId } from '@wordpress/compose';
  */
 import { SORTING_DIRECTIONS, sortIcons, sortLabels } from '../../constants';
 import { VIEW_LAYOUTS } from '../../dataviews-layouts';
-import type { NormalizedField, View } from '../../types';
+import type { View } from '../../types';
 import DataViewsContext from '../dataviews-context';
 import InfiniteScrollToggle from './infinite-scroll-toggle';
+import { PropertiesSection } from './properties-section';
 import { unlock } from '../../lock-unlock';
 
 const { Menu } = unlock( componentsPrivateApis );
@@ -100,6 +88,7 @@ export function ViewTypeMenu() {
 									case 'grid':
 									case 'table':
 									case 'pickerGrid':
+									case 'pickerTable':
 										const viewWithoutLayout = { ...view };
 										if ( 'layout' in viewWithoutLayout ) {
 											delete viewWithoutLayout.layout;
@@ -261,489 +250,6 @@ function ItemsPerPageControl() {
 	);
 }
 
-function PreviewOptions( {
-	previewOptions,
-	onChangePreviewOption,
-	onMenuOpenChange,
-	activeOption,
-}: {
-	previewOptions?: Array< { label: string; id: string } >;
-	onChangePreviewOption?: ( newPreviewOption: string ) => void;
-	onMenuOpenChange: ( isOpen: boolean ) => void;
-	activeOption?: string;
-} ) {
-	const focusPreviewOptionsField = ( id: string ) => {
-		// Focus the visibility button to avoid focus loss.
-		// Our code is safe against the component being unmounted, so we don't need to worry about cleaning the timeout.
-		// eslint-disable-next-line @wordpress/react-no-unsafe-timeout
-		setTimeout( () => {
-			const element = document.querySelector(
-				`.dataviews-field-control__field-${ id } .dataviews-field-control__field-preview-options-button`
-			);
-			if ( element instanceof HTMLElement ) {
-				element.focus();
-			}
-		}, 50 );
-	};
-	return (
-		<Menu onOpenChange={ onMenuOpenChange }>
-			<Menu.TriggerButton
-				render={
-					<Button
-						className="dataviews-field-control__field-preview-options-button"
-						size="compact"
-						icon={ moreVertical }
-						label={ __( 'Preview' ) }
-					/>
-				}
-			/>
-			<Menu.Popover>
-				{ previewOptions?.map( ( { id, label } ) => {
-					return (
-						<Menu.RadioItem
-							key={ id }
-							value={ id }
-							checked={ id === activeOption }
-							onChange={ () => {
-								onChangePreviewOption?.( id );
-								focusPreviewOptionsField( id );
-							} }
-						>
-							<Menu.ItemLabel>{ label }</Menu.ItemLabel>
-						</Menu.RadioItem>
-					);
-				} ) }
-			</Menu.Popover>
-		</Menu>
-	);
-}
-function FieldItem( {
-	field,
-	label,
-	description,
-	isVisible,
-	isFirst,
-	isLast,
-	canMove = true,
-	onToggleVisibility,
-	onMoveUp,
-	onMoveDown,
-	previewOptions,
-	onChangePreviewOption,
-}: {
-	field: NormalizedField< any >;
-	label?: string;
-	description?: string;
-	isVisible: boolean;
-	isFirst?: boolean;
-	isLast?: boolean;
-	canMove?: boolean;
-	onToggleVisibility?: () => void;
-	onMoveUp?: () => void;
-	onMoveDown?: () => void;
-	previewOptions?: Array< { label: string; id: string } >;
-	onChangePreviewOption?: ( newPreviewOption: string ) => void;
-} ) {
-	const [ isChangingPreviewOption, setIsChangingPreviewOption ] =
-		useState< boolean >( false );
-
-	const focusVisibilityField = () => {
-		// Focus the visibility button to avoid focus loss.
-		// Our code is safe against the component being unmounted, so we don't need to worry about cleaning the timeout.
-		// eslint-disable-next-line @wordpress/react-no-unsafe-timeout
-		setTimeout( () => {
-			const element = document.querySelector(
-				`.dataviews-field-control__field-${ field.id } .dataviews-field-control__field-visibility-button`
-			);
-			if ( element instanceof HTMLElement ) {
-				element.focus();
-			}
-		}, 50 );
-	};
-
-	return (
-		<Item>
-			<HStack
-				expanded
-				className={ clsx(
-					'dataviews-field-control__field',
-					`dataviews-field-control__field-${ field.id }`,
-					// The actions are hidden when the mouse is not hovering the item, or focus
-					// is outside the item.
-					// For actions that require a popover, a menu etc, that would mean that when the interactive element
-					// opens and the focus goes there the actions would be hidden.
-					// To avoid that we add a class to the item, that makes sure actions are visible while there is some
-					// interaction with the item.
-					{ 'is-interacting': isChangingPreviewOption }
-				) }
-				justify="flex-start"
-			>
-				<span className="dataviews-field-control__icon">
-					{ ! canMove && ! field.enableHiding && (
-						<Icon icon={ lock } />
-					) }
-				</span>
-				<span className="dataviews-field-control__label-sub-label-container">
-					<span className="dataviews-field-control__label">
-						{ label || field.label }
-					</span>
-					{ description && (
-						<span className="dataviews-field-control__sub-label">
-							{ description }
-						</span>
-					) }
-				</span>
-				<HStack
-					justify="flex-end"
-					expanded={ false }
-					className="dataviews-field-control__actions"
-				>
-					{ isVisible && (
-						<>
-							<Button
-								disabled={ isFirst || ! canMove }
-								accessibleWhenDisabled
-								size="compact"
-								onClick={ onMoveUp }
-								icon={ chevronUp }
-								label={
-									isFirst || ! canMove
-										? __( "This field can't be moved up" )
-										: sprintf(
-												/* translators: %s: field label */
-												__( 'Move %s up' ),
-												field.label
-										  )
-								}
-							/>
-							<Button
-								disabled={ isLast || ! canMove }
-								accessibleWhenDisabled
-								size="compact"
-								onClick={ onMoveDown }
-								icon={ chevronDown }
-								label={
-									isLast || ! canMove
-										? __( "This field can't be moved down" )
-										: sprintf(
-												/* translators: %s: field label */
-												__( 'Move %s down' ),
-												field.label
-										  )
-								}
-							/>
-						</>
-					) }
-					{ onToggleVisibility && (
-						<Button
-							className="dataviews-field-control__field-visibility-button"
-							disabled={ ! field.enableHiding }
-							accessibleWhenDisabled
-							size="compact"
-							onClick={ () => {
-								onToggleVisibility();
-								focusVisibilityField();
-							} }
-							icon={ isVisible ? unseen : seen }
-							label={
-								isVisible
-									? sprintf(
-											/* translators: %s: field label */
-											_x( 'Hide %s', 'field' ),
-											field.label
-									  )
-									: sprintf(
-											/* translators: %s: field label */
-											_x( 'Show %s', 'field' ),
-											field.label
-									  )
-							}
-						/>
-					) }
-					{ previewOptions && (
-						<PreviewOptions
-							previewOptions={ previewOptions }
-							onChangePreviewOption={ onChangePreviewOption }
-							onMenuOpenChange={ setIsChangingPreviewOption }
-							activeOption={ field.id }
-						/>
-					) }
-				</HStack>
-			</HStack>
-		</Item>
-	);
-}
-
-function RegularFieldItem( {
-	index,
-	field,
-	view,
-	onChangeView,
-}: {
-	index?: number;
-	field: NormalizedField< any >;
-	view: View;
-	onChangeView: ( view: View ) => void;
-} ) {
-	const visibleFieldIds = view.fields ?? [];
-	const isVisible =
-		index !== undefined && visibleFieldIds.includes( field.id );
-
-	return (
-		<FieldItem
-			field={ field }
-			isVisible={ isVisible }
-			isFirst={ index !== undefined && index < 1 }
-			isLast={
-				index !== undefined && index === visibleFieldIds.length - 1
-			}
-			onToggleVisibility={ () => {
-				onChangeView( {
-					...view,
-					fields: isVisible
-						? visibleFieldIds.filter(
-								( fieldId ) => fieldId !== field.id
-						  )
-						: [ ...visibleFieldIds, field.id ],
-				} );
-			} }
-			onMoveUp={
-				index !== undefined
-					? () => {
-							onChangeView( {
-								...view,
-								fields: [
-									...( visibleFieldIds.slice(
-										0,
-										index - 1
-									) ?? [] ),
-									field.id,
-									visibleFieldIds[ index - 1 ],
-									...visibleFieldIds.slice( index + 1 ),
-								],
-							} );
-					  }
-					: undefined
-			}
-			onMoveDown={
-				index !== undefined
-					? () => {
-							onChangeView( {
-								...view,
-								fields: [
-									...( visibleFieldIds.slice( 0, index ) ??
-										[] ),
-									visibleFieldIds[ index + 1 ],
-									field.id,
-									...visibleFieldIds.slice( index + 2 ),
-								],
-							} );
-					  }
-					: undefined
-			}
-		/>
-	);
-}
-
-function isDefined< T >( item: T | undefined ): item is T {
-	return !! item;
-}
-
-function FieldControl() {
-	const { view, fields, onChangeView } = useContext( DataViewsContext );
-
-	const togglableFields = [
-		view?.titleField,
-		view?.mediaField,
-		view?.descriptionField,
-	].filter( Boolean );
-	const visibleFieldIds = view.fields ?? [];
-	const hiddenFields = fields.filter(
-		( f ) =>
-			! visibleFieldIds.includes( f.id ) &&
-			! togglableFields.includes( f.id ) &&
-			f.type !== 'media' &&
-			f.enableHiding !== false
-	);
-	let visibleFields = visibleFieldIds
-		.map( ( fieldId ) => fields.find( ( f ) => f.id === fieldId ) )
-		.filter( isDefined );
-
-	if ( ! visibleFields?.length && ! hiddenFields?.length ) {
-		return null;
-	}
-	const titleField = fields.find( ( f ) => f.id === view.titleField );
-	const previewField = fields.find( ( f ) => f.id === view.mediaField );
-	const descriptionField = fields.find(
-		( f ) => f.id === view.descriptionField
-	);
-
-	const previewFields = fields.filter( ( f ) => f.type === 'media' );
-
-	let previewFieldUI;
-	if ( previewFields.length > 1 ) {
-		const isPreviewFieldVisible =
-			isDefined( previewField ) && ( view.showMedia ?? true );
-		previewFieldUI = isDefined( previewField ) && (
-			<FieldItem
-				key={ previewField.id }
-				field={ previewField }
-				label={ __( 'Preview' ) }
-				description={ previewField.label }
-				isVisible={ isPreviewFieldVisible }
-				onToggleVisibility={ () => {
-					onChangeView( {
-						...view,
-						showMedia: ! isPreviewFieldVisible,
-					} );
-				} }
-				canMove={ false }
-				previewOptions={ previewFields.map( ( field ) => ( {
-					label: field.label,
-					id: field.id,
-				} ) ) }
-				onChangePreviewOption={ ( newPreviewId ) =>
-					onChangeView( { ...view, mediaField: newPreviewId } )
-				}
-			/>
-		);
-	}
-	const lockedFields = [
-		{
-			field: titleField,
-			isVisibleFlag: 'showTitle',
-		},
-		{
-			field: previewField,
-			isVisibleFlag: 'showMedia',
-			ui: previewFieldUI,
-		},
-		{
-			field: descriptionField,
-			isVisibleFlag: 'showDescription',
-		},
-	].filter( ( { field } ) => isDefined( field ) );
-	let visibleLockedFields = lockedFields.filter(
-		( { field, isVisibleFlag } ) =>
-			// @ts-expect-error
-			isDefined( field ) && ( view[ isVisibleFlag ] ?? true )
-	) as Array< {
-		field: NormalizedField< any >;
-		isVisibleFlag: string;
-		ui?: ReactNode;
-	} >;
-
-	// If only one locked field is visible, prevent it from being hidden.
-	if ( visibleLockedFields.length === 1 ) {
-		visibleLockedFields = visibleLockedFields.map( ( locked ) => ( {
-			...locked,
-			field: { ...locked.field, enableHiding: false },
-		} ) );
-	}
-
-	// If no locked fields are visible but there are visibleFields, lock the last visible field.
-	if ( visibleLockedFields.length === 0 && visibleFields.length === 1 ) {
-		visibleFields = [ { ...visibleFields[ 0 ], enableHiding: false } ];
-	}
-
-	const hiddenLockedFields = lockedFields.filter(
-		( { field, isVisibleFlag } ) =>
-			// @ts-expect-error
-			isDefined( field ) && ! ( view[ isVisibleFlag ] ?? true )
-	) as Array< {
-		field: NormalizedField< any >;
-		isVisibleFlag: string;
-		ui?: ReactNode;
-	} >;
-
-	return (
-		<VStack className="dataviews-field-control" spacing={ 6 }>
-			<VStack className="dataviews-view-config__properties" spacing={ 0 }>
-				{ ( visibleLockedFields.length > 0 ||
-					!! visibleFields?.length ) && (
-					<ItemGroup isBordered isSeparated>
-						{ visibleLockedFields.map(
-							( { field, isVisibleFlag, ui } ) => {
-								return (
-									ui ?? (
-										<FieldItem
-											key={ field.id }
-											field={ field }
-											isVisible
-											onToggleVisibility={ () => {
-												onChangeView( {
-													...view,
-													[ isVisibleFlag ]: false,
-												} );
-											} }
-											canMove={ false }
-										/>
-									)
-								);
-							}
-						) }
-
-						{ visibleFields.map( ( field, index ) => (
-							<RegularFieldItem
-								key={ field.id }
-								field={ field }
-								view={ view }
-								onChangeView={ onChangeView }
-								index={ index }
-							/>
-						) ) }
-					</ItemGroup>
-				) }
-			</VStack>
-
-			{ ( !! hiddenFields?.length || !! hiddenLockedFields.length ) && (
-				<VStack spacing={ 4 }>
-					<BaseControl.VisualLabel style={ { margin: 0 } }>
-						{ __( 'Hidden' ) }
-					</BaseControl.VisualLabel>
-					<VStack
-						className="dataviews-view-config__properties"
-						spacing={ 0 }
-					>
-						<ItemGroup isBordered isSeparated>
-							{ hiddenLockedFields.length > 0 &&
-								hiddenLockedFields.map(
-									( { field, isVisibleFlag, ui } ) => {
-										return (
-											ui ?? (
-												<FieldItem
-													key={ field.id }
-													field={ field }
-													isVisible={ false }
-													onToggleVisibility={ () => {
-														onChangeView( {
-															...view,
-															[ isVisibleFlag ]:
-																true,
-														} );
-													} }
-													canMove={ false }
-												/>
-											)
-										);
-									}
-								) }
-							{ hiddenFields.map( ( field ) => (
-								<RegularFieldItem
-									key={ field.id }
-									field={ field }
-									view={ view }
-									onChangeView={ onChangeView }
-								/>
-							) ) }
-						</ItemGroup>
-					</VStack>
-				</VStack>
-			) }
-		</VStack>
-	);
-}
-
 function SettingsSection( {
 	title,
 	description,
@@ -826,9 +332,7 @@ export function DataviewsViewConfigDropdown() {
 							) }
 							<InfiniteScrollToggle />
 							<ItemsPerPageControl />
-						</SettingsSection>
-						<SettingsSection title={ __( 'Properties' ) }>
-							<FieldControl />
+							<PropertiesSection />
 						</SettingsSection>
 					</VStack>
 				</DropdownContentWrapper>