@wordpress/dataviews 9.0.1-next.6f42e1382.0 → 9.0.1-next.a730c9c8c.0

package/build-module/dataform-controls/datetime.js

@@ -1,8 +1,15 @@
 /**
  * WordPress dependencies
  */
-import { BaseControl, TimePicker, VisuallyHidden } from '@wordpress/components';
-import { useCallback } from '@wordpress/element';
+import { BaseControl, privateApis as componentsPrivateApis, __experimentalInputControl as InputControl, __experimentalVStack as VStack } from '@wordpress/components';
+import { useCallback, useState } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+import { getDate, getSettings } from '@wordpress/date';
+
+/**
+ * External dependencies
+ */
+import { format, isValid } from 'date-fns';
 
 /**
  * Internal dependencies
@@ -10,7 +17,111 @@ import { useCallback } from '@wordpress/element';
 
 import { OPERATOR_IN_THE_PAST, OPERATOR_OVER } from '../constants';
 import RelativeDateControl, { TIME_UNITS_OPTIONS } from './relative-date-control';
+import { unlock } from '../lock-unlock';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const {
+  DateCalendar
+} = unlock(componentsPrivateApis);
+const parseDateTime = dateTimeString => {
+  if (!dateTimeString) {
+    return null;
+  }
+  const parsed = getDate(dateTimeString);
+  return parsed && isValid(parsed) ? parsed : null;
+};
+const formatDateTime = date => {
+  if (!date) {
+    return '';
+  }
+  if (typeof date === 'string') {
+    return date;
+  }
+  // Format as datetime-local input expects: YYYY-MM-DDTHH:mm
+  return format(date, "yyyy-MM-dd'T'HH:mm");
+};
+function CalendarDateTimeControl({
+  id,
+  value,
+  onChange,
+  label,
+  description,
+  hideLabelFromVision
+}) {
+  const [calendarMonth, setCalendarMonth] = useState(() => {
+    const parsedDate = parseDateTime(value);
+    return parsedDate || new Date(); // Default to current month
+  });
+  const onSelectDate = useCallback(newDate => {
+    if (newDate) {
+      // Preserve time if it exists in current value, otherwise use current time
+      let finalDateTime = newDate;
+      if (value) {
+        const currentDateTime = parseDateTime(value);
+        if (currentDateTime) {
+          // Preserve the time part
+          finalDateTime = new Date(newDate);
+          finalDateTime.setHours(currentDateTime.getHours());
+          finalDateTime.setMinutes(currentDateTime.getMinutes());
+        }
+      }
+      const dateTimeValue = finalDateTime.toISOString();
+      onChange(dateTimeValue);
+    } else {
+      onChange(undefined);
+    }
+  }, [onChange, value]);
+  const handleManualDateTimeChange = useCallback(newValue => {
+    if (newValue) {
+      // Convert from datetime-local format to ISO string
+      const dateTime = new Date(newValue);
+      onChange(dateTime.toISOString());
+
+      // Update calendar month to match
+      const parsedDate = parseDateTime(dateTime.toISOString());
+      if (parsedDate) {
+        setCalendarMonth(parsedDate);
+      }
+    } else {
+      onChange(undefined);
+    }
+  }, [onChange]);
+  const {
+    timezone: {
+      string: timezoneString
+    },
+    l10n: {
+      startOfWeek
+    }
+  } = getSettings();
+  return /*#__PURE__*/_jsx(BaseControl, {
+    __nextHasNoMarginBottom: true,
+    id: id,
+    label: label,
+    help: description,
+    hideLabelFromVision: hideLabelFromVision,
+    children: /*#__PURE__*/_jsxs(VStack, {
+      spacing: 4,
+      children: [/*#__PURE__*/_jsx(DateCalendar, {
+        style: {
+          width: '100%'
+        },
+        selected: value ? parseDateTime(value) || undefined : undefined,
+        onSelect: onSelectDate,
+        month: calendarMonth,
+        onMonthChange: setCalendarMonth,
+        timeZone: timezoneString || undefined,
+        weekStartsOn: startOfWeek
+      }), /*#__PURE__*/_jsx(InputControl, {
+        __next40pxDefaultSize: true,
+        type: "datetime-local",
+        label: __('Date time'),
+        hideLabelFromVision: true,
+        value: value ? formatDateTime(parseDateTime(value) || undefined) : '',
+        onChange: handleManualDateTimeChange
+      })]
+    })
+  });
+}
 export default function DateTime({
   data,
   field,
@@ -20,37 +131,40 @@ export default function DateTime({
 }) {
   const {
     id,
-    label
+    label,
+    description,
+    getValue,
+    setValue
   } = field;
-  const value = field.getValue({
+  const value = getValue({
     item: data
   });
-  const onChangeControl = useCallback(newValue => onChange({
-    [id]: newValue
-  }), [id, onChange]);
+  const onChangeRelativeDateControl = useCallback(newValue => onChange(setValue({
+    item: data,
+    value: newValue
+  })), [data, onChange, setValue]);
+  const onChangeCalendarDateTimeControl = useCallback(newValue => onChange(setValue({
+    item: data,
+    value: newValue
+  })), [data, onChange, setValue]);
   if (operator === OPERATOR_IN_THE_PAST || operator === OPERATOR_OVER) {
     return /*#__PURE__*/_jsx(RelativeDateControl, {
+      className: "dataviews-controls__datetime",
       id: id,
       value: value && typeof value === 'object' ? value : {},
-      onChange: onChange,
+      onChange: onChangeRelativeDateControl,
       label: label,
       hideLabelFromVision: hideLabelFromVision,
       options: TIME_UNITS_OPTIONS[operator]
     });
   }
-  return /*#__PURE__*/_jsxs("fieldset", {
-    className: "dataviews-controls__datetime",
-    children: [!hideLabelFromVision && /*#__PURE__*/_jsx(BaseControl.VisualLabel, {
-      as: "legend",
-      children: label
-    }), hideLabelFromVision && /*#__PURE__*/_jsx(VisuallyHidden, {
-      as: "legend",
-      children: label
-    }), /*#__PURE__*/_jsx(TimePicker, {
-      currentTime: typeof value === 'string' ? value : undefined,
-      onChange: onChangeControl,
-      hideLabelFromVision: true
-    })]
+  return /*#__PURE__*/_jsx(CalendarDateTimeControl, {
+    id: id,
+    value: typeof value === 'string' ? value : undefined,
+    onChange: onChangeCalendarDateTimeControl,
+    label: label,
+    description: description,
+    hideLabelFromVision: hideLabelFromVision
   });
 }
 //# sourceMappingURL=datetime.js.map

package/build-module/dataform-controls/datetime.js.map

@@ -1 +1 @@
-{"version":3,"names":["BaseControl","TimePicker","VisuallyHidden","useCallback","OPERATOR_IN_THE_PAST","OPERATOR_OVER","RelativeDateControl","TIME_UNITS_OPTIONS","jsx","_jsx","jsxs","_jsxs","DateTime","data","field","onChange","hideLabelFromVision","operator","id","label","value","getValue","item","onChangeControl","newValue","options","className","children","VisualLabel","as","currentTime","undefined"],"sources":["@wordpress/dataviews/src/dataform-controls/datetime.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { BaseControl, TimePicker, VisuallyHidden } from '@wordpress/components';\nimport { useCallback } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\nimport { OPERATOR_IN_THE_PAST, OPERATOR_OVER } from '../constants';\nimport RelativeDateControl, {\n\tTIME_UNITS_OPTIONS,\n} from './relative-date-control';\n\nexport default function DateTime< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n\toperator,\n}: DataFormControlProps< Item > ) {\n\tconst { id, label } = field;\n\tconst value = field.getValue( { item: data } );\n\n\tconst onChangeControl = useCallback(\n\t\t( newValue: string | null ) => onChange( { [ id ]: newValue } ),\n\t\t[ id, onChange ]\n\t);\n\n\tif ( operator === OPERATOR_IN_THE_PAST || operator === OPERATOR_OVER ) {\n\t\treturn (\n\t\t\t<RelativeDateControl\n\t\t\t\tid={ id }\n\t\t\t\tvalue={ value && typeof value === 'object' ? value : {} }\n\t\t\t\tonChange={ onChange }\n\t\t\t\tlabel={ label }\n\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t\toptions={ TIME_UNITS_OPTIONS[ operator ] }\n\t\t\t/>\n\t\t);\n\t}\n\n\treturn (\n\t\t<fieldset className=\"dataviews-controls__datetime\">\n\t\t\t{ ! hideLabelFromVision && (\n\t\t\t\t<BaseControl.VisualLabel as=\"legend\">\n\t\t\t\t\t{ label }\n\t\t\t\t</BaseControl.VisualLabel>\n\t\t\t) }\n\t\t\t{ hideLabelFromVision && (\n\t\t\t\t<VisuallyHidden as=\"legend\">{ label }</VisuallyHidden>\n\t\t\t) }\n\t\t\t<TimePicker\n\t\t\t\tcurrentTime={ typeof value === 'string' ? value : undefined }\n\t\t\t\tonChange={ onChangeControl }\n\t\t\t\thideLabelFromVision\n\t\t\t/>\n\t\t</fieldset>\n\t);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,WAAW,EAAEC,UAAU,EAAEC,cAAc,QAAQ,uBAAuB;AAC/E,SAASC,WAAW,QAAQ,oBAAoB;;AAEhD;AACA;AACA;;AAEA,SAASC,oBAAoB,EAAEC,aAAa,QAAQ,cAAc;AAClE,OAAOC,mBAAmB,IACzBC,kBAAkB,QACZ,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAEjC,eAAe,SAASC,QAAQA,CAAU;EACzCC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC,mBAAmB;EACnBC;AAC6B,CAAC,EAAG;EACjC,MAAM;IAAEC,EAAE;IAAEC;EAAM,CAAC,GAAGL,KAAK;EAC3B,MAAMM,KAAK,GAAGN,KAAK,CAACO,QAAQ,CAAE;IAAEC,IAAI,EAAET;EAAK,CAAE,CAAC;EAE9C,MAAMU,eAAe,GAAGpB,WAAW,CAChCqB,QAAuB,IAAMT,QAAQ,CAAE;IAAE,CAAEG,EAAE,GAAIM;EAAS,CAAE,CAAC,EAC/D,CAAEN,EAAE,EAAEH,QAAQ,CACf,CAAC;EAED,IAAKE,QAAQ,KAAKb,oBAAoB,IAAIa,QAAQ,KAAKZ,aAAa,EAAG;IACtE,oBACCI,IAAA,CAACH,mBAAmB;MACnBY,EAAE,EAAGA,EAAI;MACTE,KAAK,EAAGA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAGA,KAAK,GAAG,CAAC,CAAG;MACzDL,QAAQ,EAAGA,QAAU;MACrBI,KAAK,EAAGA,KAAO;MACfH,mBAAmB,EAAGA,mBAAqB;MAC3CS,OAAO,EAAGlB,kBAAkB,CAAEU,QAAQ;IAAI,CAC1C,CAAC;EAEJ;EAEA,oBACCN,KAAA;IAAUe,SAAS,EAAC,8BAA8B;IAAAC,QAAA,GAC/C,CAAEX,mBAAmB,iBACtBP,IAAA,CAACT,WAAW,CAAC4B,WAAW;MAACC,EAAE,EAAC,QAAQ;MAAAF,QAAA,EACjCR;IAAK,CACiB,CACzB,EACCH,mBAAmB,iBACpBP,IAAA,CAACP,cAAc;MAAC2B,EAAE,EAAC,QAAQ;MAAAF,QAAA,EAAGR;IAAK,CAAkB,CACrD,eACDV,IAAA,CAACR,UAAU;MACV6B,WAAW,EAAG,OAAOV,KAAK,KAAK,QAAQ,GAAGA,KAAK,GAAGW,SAAW;MAC7DhB,QAAQ,EAAGQ,eAAiB;MAC5BP,mBAAmB;IAAA,CACnB,CAAC;EAAA,CACO,CAAC;AAEb","ignoreList":[]}
+{"version":3,"names":["BaseControl","privateApis","componentsPrivateApis","__experimentalInputControl","InputControl","__experimentalVStack","VStack","useCallback","useState","__","getDate","getSettings","format","isValid","OPERATOR_IN_THE_PAST","OPERATOR_OVER","RelativeDateControl","TIME_UNITS_OPTIONS","unlock","jsx","_jsx","jsxs","_jsxs","DateCalendar","parseDateTime","dateTimeString","parsed","formatDateTime","date","CalendarDateTimeControl","id","value","onChange","label","description","hideLabelFromVision","calendarMonth","setCalendarMonth","parsedDate","Date","onSelectDate","newDate","finalDateTime","currentDateTime","setHours","getHours","setMinutes","getMinutes","dateTimeValue","toISOString","undefined","handleManualDateTimeChange","newValue","dateTime","timezone","string","timezoneString","l10n","startOfWeek","__nextHasNoMarginBottom","help","children","spacing","style","width","selected","onSelect","month","onMonthChange","timeZone","weekStartsOn","__next40pxDefaultSize","type","DateTime","data","field","operator","getValue","setValue","item","onChangeRelativeDateControl","onChangeCalendarDateTimeControl","className","options"],"sources":["@wordpress/dataviews/src/dataform-controls/datetime.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tBaseControl,\n\tprivateApis as componentsPrivateApis,\n\t__experimentalInputControl as InputControl,\n\t__experimentalVStack as VStack,\n} from '@wordpress/components';\nimport { useCallback, useState } from '@wordpress/element';\nimport { __ } from '@wordpress/i18n';\nimport { getDate, getSettings } from '@wordpress/date';\n\n/**\n * External dependencies\n */\nimport { format, isValid } from 'date-fns';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\nimport { OPERATOR_IN_THE_PAST, OPERATOR_OVER } from '../constants';\nimport RelativeDateControl, {\n\tTIME_UNITS_OPTIONS,\n\ttype DateRelative,\n} from './relative-date-control';\nimport { unlock } from '../lock-unlock';\n\nconst { DateCalendar } = unlock( componentsPrivateApis );\n\nconst parseDateTime = ( dateTimeString?: string ): Date | null => {\n\tif ( ! dateTimeString ) {\n\t\treturn null;\n\t}\n\tconst parsed = getDate( dateTimeString );\n\treturn parsed && isValid( parsed ) ? parsed : null;\n};\n\nconst formatDateTime = ( date?: Date | string ): string => {\n\tif ( ! date ) {\n\t\treturn '';\n\t}\n\tif ( typeof date === 'string' ) {\n\t\treturn date;\n\t}\n\t// Format as datetime-local input expects: YYYY-MM-DDTHH:mm\n\treturn format( date, \"yyyy-MM-dd'T'HH:mm\" );\n};\n\nfunction CalendarDateTimeControl( {\n\tid,\n\tvalue,\n\tonChange,\n\tlabel,\n\tdescription,\n\thideLabelFromVision,\n}: {\n\tid: string;\n\tvalue: string | undefined;\n\tonChange: ( value: string | undefined ) => void;\n\tlabel: string;\n\tdescription?: string;\n\thideLabelFromVision?: boolean;\n} ) {\n\tconst [ calendarMonth, setCalendarMonth ] = useState< Date >( () => {\n\t\tconst parsedDate = parseDateTime( value );\n\t\treturn parsedDate || new Date(); // Default to current month\n\t} );\n\n\tconst onSelectDate = useCallback(\n\t\t( newDate: Date | undefined | null ) => {\n\t\t\tif ( newDate ) {\n\t\t\t\t// Preserve time if it exists in current value, otherwise use current time\n\t\t\t\tlet finalDateTime = newDate;\n\n\t\t\t\tif ( value ) {\n\t\t\t\t\tconst currentDateTime = parseDateTime( value );\n\t\t\t\t\tif ( currentDateTime ) {\n\t\t\t\t\t\t// Preserve the time part\n\t\t\t\t\t\tfinalDateTime = new Date( newDate );\n\t\t\t\t\t\tfinalDateTime.setHours( currentDateTime.getHours() );\n\t\t\t\t\t\tfinalDateTime.setMinutes(\n\t\t\t\t\t\t\tcurrentDateTime.getMinutes()\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\tconst dateTimeValue = finalDateTime.toISOString();\n\t\t\t\tonChange( dateTimeValue );\n\t\t\t} else {\n\t\t\t\tonChange( undefined );\n\t\t\t}\n\t\t},\n\t\t[ onChange, value ]\n\t);\n\n\tconst handleManualDateTimeChange = useCallback(\n\t\t( newValue?: string ) => {\n\t\t\tif ( newValue ) {\n\t\t\t\t// Convert from datetime-local format to ISO string\n\t\t\t\tconst dateTime = new Date( newValue );\n\t\t\t\tonChange( dateTime.toISOString() );\n\n\t\t\t\t// Update calendar month to match\n\t\t\t\tconst parsedDate = parseDateTime( dateTime.toISOString() );\n\t\t\t\tif ( parsedDate ) {\n\t\t\t\t\tsetCalendarMonth( parsedDate );\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tonChange( undefined );\n\t\t\t}\n\t\t},\n\t\t[ onChange ]\n\t);\n\n\tconst {\n\t\ttimezone: { string: timezoneString },\n\t\tl10n: { startOfWeek },\n\t} = getSettings();\n\n\treturn (\n\t\t<BaseControl\n\t\t\t__nextHasNoMarginBottom\n\t\t\tid={ id }\n\t\t\tlabel={ label }\n\t\t\thelp={ description }\n\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t>\n\t\t\t<VStack spacing={ 4 }>\n\t\t\t\t{ /* Calendar widget */ }\n\t\t\t\t<DateCalendar\n\t\t\t\t\tstyle={ { width: '100%' } }\n\t\t\t\t\tselected={\n\t\t\t\t\t\tvalue ? parseDateTime( value ) || undefined : undefined\n\t\t\t\t\t}\n\t\t\t\t\tonSelect={ onSelectDate }\n\t\t\t\t\tmonth={ calendarMonth }\n\t\t\t\t\tonMonthChange={ setCalendarMonth }\n\t\t\t\t\ttimeZone={ timezoneString || undefined }\n\t\t\t\t\tweekStartsOn={ startOfWeek }\n\t\t\t\t/>\n\t\t\t\t{ /* Manual datetime input */ }\n\t\t\t\t<InputControl\n\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\ttype=\"datetime-local\"\n\t\t\t\t\tlabel={ __( 'Date time' ) }\n\t\t\t\t\thideLabelFromVision\n\t\t\t\t\tvalue={\n\t\t\t\t\t\tvalue\n\t\t\t\t\t\t\t? formatDateTime(\n\t\t\t\t\t\t\t\t\tparseDateTime( value ) || undefined\n\t\t\t\t\t\t\t  )\n\t\t\t\t\t\t\t: ''\n\t\t\t\t\t}\n\t\t\t\t\tonChange={ handleManualDateTimeChange }\n\t\t\t\t/>\n\t\t\t</VStack>\n\t\t</BaseControl>\n\t);\n}\n\nexport default function DateTime< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n\toperator,\n}: DataFormControlProps< Item > ) {\n\tconst { id, label, description, getValue, setValue } = field;\n\tconst value = getValue( { item: data } );\n\n\tconst onChangeRelativeDateControl = useCallback(\n\t\t( newValue: DateRelative ) =>\n\t\t\tonChange( setValue( { item: data, value: newValue } ) ),\n\t\t[ data, onChange, setValue ]\n\t);\n\n\tconst onChangeCalendarDateTimeControl = useCallback(\n\t\t( newValue: string | undefined ) =>\n\t\t\tonChange( setValue( { item: data, value: newValue } ) ),\n\t\t[ data, onChange, setValue ]\n\t);\n\n\tif ( operator === OPERATOR_IN_THE_PAST || operator === OPERATOR_OVER ) {\n\t\treturn (\n\t\t\t<RelativeDateControl\n\t\t\t\tclassName=\"dataviews-controls__datetime\"\n\t\t\t\tid={ id }\n\t\t\t\tvalue={ value && typeof value === 'object' ? value : {} }\n\t\t\t\tonChange={ onChangeRelativeDateControl }\n\t\t\t\tlabel={ label }\n\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t\toptions={ TIME_UNITS_OPTIONS[ operator ] }\n\t\t\t/>\n\t\t);\n\t}\n\n\treturn (\n\t\t<CalendarDateTimeControl\n\t\t\tid={ id }\n\t\t\tvalue={ typeof value === 'string' ? value : undefined }\n\t\t\tonChange={ onChangeCalendarDateTimeControl }\n\t\t\tlabel={ label }\n\t\t\tdescription={ description }\n\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t/>\n\t);\n}\n"],"mappings":"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","ignoreList":[]}

package/build-module/dataform-controls/email.js

@@ -1,6 +1,7 @@
 /**
  * WordPress dependencies
  */
+import { Icon, __experimentalInputControlPrefixWrapper as InputControlPrefixWrapper } from '@wordpress/components';
 import { atSymbol } from '@wordpress/icons';
 
 /**
@@ -21,7 +22,12 @@ export default function Email({
     onChange,
     hideLabelFromVision,
     type: 'email',
-    icon: atSymbol
+    prefix: /*#__PURE__*/_jsx(InputControlPrefixWrapper, {
+      variant: "icon",
+      children: /*#__PURE__*/_jsx(Icon, {
+        icon: atSymbol
+      })
+    })
   });
 }
 //# sourceMappingURL=email.js.map

package/build-module/dataform-controls/email.js.map

@@ -1 +1 @@
-{"version":3,"names":["atSymbol","ValidatedText","jsx","_jsx","Email","data","field","onChange","hideLabelFromVision","type","icon"],"sources":["@wordpress/dataviews/src/dataform-controls/email.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { atSymbol } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\nimport ValidatedText from './utils/validated-input';\n\nexport default function Email< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n}: DataFormControlProps< Item > ) {\n\treturn (\n\t\t<ValidatedText\n\t\t\t{ ...{\n\t\t\t\tdata,\n\t\t\t\tfield,\n\t\t\t\tonChange,\n\t\t\t\thideLabelFromVision,\n\t\t\t\ttype: 'email',\n\t\t\t\ticon: atSymbol,\n\t\t\t} }\n\t\t/>\n\t);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,QAAQ,QAAQ,kBAAkB;;AAE3C;AACA;AACA;;AAEA,OAAOC,aAAa,MAAM,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEpD,eAAe,SAASC,KAAKA,CAAU;EACtCC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC;AAC6B,CAAC,EAAG;EACjC,oBACCL,IAAA,CAACF,aAAa;IAEZI,IAAI;IACJC,KAAK;IACLC,QAAQ;IACRC,mBAAmB;IACnBC,IAAI,EAAE,OAAO;IACbC,IAAI,EAAEV;EAAQ,CAEf,CAAC;AAEJ","ignoreList":[]}
+{"version":3,"names":["Icon","__experimentalInputControlPrefixWrapper","InputControlPrefixWrapper","atSymbol","ValidatedText","jsx","_jsx","Email","data","field","onChange","hideLabelFromVision","type","prefix","variant","children","icon"],"sources":["@wordpress/dataviews/src/dataform-controls/email.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tIcon,\n\t__experimentalInputControlPrefixWrapper as InputControlPrefixWrapper,\n} from '@wordpress/components';\nimport { atSymbol } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\nimport ValidatedText from './utils/validated-input';\n\nexport default function Email< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n}: DataFormControlProps< Item > ) {\n\treturn (\n\t\t<ValidatedText\n\t\t\t{ ...{\n\t\t\t\tdata,\n\t\t\t\tfield,\n\t\t\t\tonChange,\n\t\t\t\thideLabelFromVision,\n\t\t\t\ttype: 'email',\n\t\t\t\tprefix: (\n\t\t\t\t\t<InputControlPrefixWrapper variant=\"icon\">\n\t\t\t\t\t\t<Icon icon={ atSymbol } />\n\t\t\t\t\t</InputControlPrefixWrapper>\n\t\t\t\t),\n\t\t\t} }\n\t\t/>\n\t);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SACCA,IAAI,EACJC,uCAAuC,IAAIC,yBAAyB,QAC9D,uBAAuB;AAC9B,SAASC,QAAQ,QAAQ,kBAAkB;;AAE3C;AACA;AACA;;AAEA,OAAOC,aAAa,MAAM,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEpD,eAAe,SAASC,KAAKA,CAAU;EACtCC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC;AAC6B,CAAC,EAAG;EACjC,oBACCL,IAAA,CAACF,aAAa;IAEZI,IAAI;IACJC,KAAK;IACLC,QAAQ;IACRC,mBAAmB;IACnBC,IAAI,EAAE,OAAO;IACbC,MAAM,eACLP,IAAA,CAACJ,yBAAyB;MAACY,OAAO,EAAC,MAAM;MAAAC,QAAA,eACxCT,IAAA,CAACN,IAAI;QAACgB,IAAI,EAAGb;MAAU,CAAE;IAAC,CACA;EAC3B,CAEF,CAAC;AAEJ","ignoreList":[]}

package/build-module/dataform-controls/index.js

@@ -22,6 +22,7 @@ import toggleGroup from './toggle-group';
 import array from './array';
 import color from './color';
 import password from './password';
+import { jsx as _jsx } from "react/jsx-runtime";
 const FORM_CONTROLS = {
   array,
   checkbox,
@@ -40,6 +41,22 @@ const FORM_CONTROLS = {
   textarea,
   toggleGroup
 };
+function isEditConfig(value) {
+  return value && typeof value === 'object' && typeof value.control === 'string';
+}
+function createConfiguredControl(config) {
+  const {
+    control,
+    ...controlConfig
+  } = config;
+  const BaseControlType = getControlByType(control);
+  return function ConfiguredControl(props) {
+    return /*#__PURE__*/_jsx(BaseControlType, {
+      ...props,
+      config: controlConfig
+    });
+  };
+}
 export function getControl(field, fieldTypeDefinition) {
   if (typeof field.Edit === 'function') {
     return field.Edit;
@@ -47,12 +64,18 @@ export function getControl(field, fieldTypeDefinition) {
   if (typeof field.Edit === 'string') {
     return getControlByType(field.Edit);
   }
+  if (isEditConfig(field.Edit)) {
+    return createConfiguredControl(field.Edit);
+  }
   if (field.elements && field.type !== 'array') {
     return getControlByType('select');
   }
   if (typeof fieldTypeDefinition.Edit === 'string') {
     return getControlByType(fieldTypeDefinition.Edit);
   }
+  if (isEditConfig(fieldTypeDefinition.Edit)) {
+    return createConfiguredControl(fieldTypeDefinition.Edit);
+  }
   return fieldTypeDefinition.Edit;
 }
 export function getControlByType(type) {

package/build-module/dataform-controls/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["checkbox","datetime","date","email","telephone","url","integer","radio","select","text","toggle","textarea","toggleGroup","array","color","password","FORM_CONTROLS","getControl","field","fieldTypeDefinition","Edit","getControlByType","elements","type","Object","keys","includes"],"sources":["@wordpress/dataviews/src/dataform-controls/index.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport type { ComponentType } from 'react';\n\n/**\n * Internal dependencies\n */\nimport type {\n\tDataFormControlProps,\n\tField,\n\tFieldTypeDefinition,\n} from '../types';\nimport checkbox from './checkbox';\nimport datetime from './datetime';\nimport date from './date';\nimport email from './email';\nimport telephone from './telephone';\nimport url from './url';\nimport integer from './integer';\nimport radio from './radio';\nimport select from './select';\nimport text from './text';\nimport toggle from './toggle';\nimport textarea from './textarea';\nimport toggleGroup from './toggle-group';\nimport array from './array';\nimport color from './color';\nimport password from './password';\n\ninterface FormControls {\n\t[ key: string ]: ComponentType< DataFormControlProps< any > >;\n}\n\nconst FORM_CONTROLS: FormControls = {\n\tarray,\n\tcheckbox,\n\tcolor,\n\tdatetime,\n\tdate,\n\temail,\n\ttelephone,\n\turl,\n\tinteger,\n\tpassword,\n\tradio,\n\tselect,\n\ttext,\n\ttoggle,\n\ttextarea,\n\ttoggleGroup,\n};\n\nexport function getControl< Item >(\n\tfield: Field< Item >,\n\tfieldTypeDefinition: FieldTypeDefinition< Item >\n) {\n\tif ( typeof field.Edit === 'function' ) {\n\t\treturn field.Edit;\n\t}\n\n\tif ( typeof field.Edit === 'string' ) {\n\t\treturn getControlByType( field.Edit );\n\t}\n\n\tif ( field.elements && field.type !== 'array' ) {\n\t\treturn getControlByType( 'select' );\n\t}\n\n\tif ( typeof fieldTypeDefinition.Edit === 'string' ) {\n\t\treturn getControlByType( fieldTypeDefinition.Edit );\n\t}\n\n\treturn fieldTypeDefinition.Edit;\n}\n\nexport function getControlByType( type: string ) {\n\tif ( Object.keys( FORM_CONTROLS ).includes( type ) ) {\n\t\treturn FORM_CONTROLS[ type ];\n\t}\n\n\tthrow 'Control ' + type + ' not found';\n}\n"],"mappings":"AAAA;AACA;AACA;;AAGA;AACA;AACA;;AAMA,OAAOA,QAAQ,MAAM,YAAY;AACjC,OAAOC,QAAQ,MAAM,YAAY;AACjC,OAAOC,IAAI,MAAM,QAAQ;AACzB,OAAOC,KAAK,MAAM,SAAS;AAC3B,OAAOC,SAAS,MAAM,aAAa;AACnC,OAAOC,GAAG,MAAM,OAAO;AACvB,OAAOC,OAAO,MAAM,WAAW;AAC/B,OAAOC,KAAK,MAAM,SAAS;AAC3B,OAAOC,MAAM,MAAM,UAAU;AAC7B,OAAOC,IAAI,MAAM,QAAQ;AACzB,OAAOC,MAAM,MAAM,UAAU;AAC7B,OAAOC,QAAQ,MAAM,YAAY;AACjC,OAAOC,WAAW,MAAM,gBAAgB;AACxC,OAAOC,KAAK,MAAM,SAAS;AAC3B,OAAOC,KAAK,MAAM,SAAS;AAC3B,OAAOC,QAAQ,MAAM,YAAY;AAMjC,MAAMC,aAA2B,GAAG;EACnCH,KAAK;EACLb,QAAQ;EACRc,KAAK;EACLb,QAAQ;EACRC,IAAI;EACJC,KAAK;EACLC,SAAS;EACTC,GAAG;EACHC,OAAO;EACPS,QAAQ;EACRR,KAAK;EACLC,MAAM;EACNC,IAAI;EACJC,MAAM;EACNC,QAAQ;EACRC;AACD,CAAC;AAED,OAAO,SAASK,UAAUA,CACzBC,KAAoB,EACpBC,mBAAgD,EAC/C;EACD,IAAK,OAAOD,KAAK,CAACE,IAAI,KAAK,UAAU,EAAG;IACvC,OAAOF,KAAK,CAACE,IAAI;EAClB;EAEA,IAAK,OAAOF,KAAK,CAACE,IAAI,KAAK,QAAQ,EAAG;IACrC,OAAOC,gBAAgB,CAAEH,KAAK,CAACE,IAAK,CAAC;EACtC;EAEA,IAAKF,KAAK,CAACI,QAAQ,IAAIJ,KAAK,CAACK,IAAI,KAAK,OAAO,EAAG;IAC/C,OAAOF,gBAAgB,CAAE,QAAS,CAAC;EACpC;EAEA,IAAK,OAAOF,mBAAmB,CAACC,IAAI,KAAK,QAAQ,EAAG;IACnD,OAAOC,gBAAgB,CAAEF,mBAAmB,CAACC,IAAK,CAAC;EACpD;EAEA,OAAOD,mBAAmB,CAACC,IAAI;AAChC;AAEA,OAAO,SAASC,gBAAgBA,CAAEE,IAAY,EAAG;EAChD,IAAKC,MAAM,CAACC,IAAI,CAAET,aAAc,CAAC,CAACU,QAAQ,CAAEH,IAAK,CAAC,EAAG;IACpD,OAAOP,aAAa,CAAEO,IAAI,CAAE;EAC7B;EAEA,MAAM,UAAU,GAAGA,IAAI,GAAG,YAAY;AACvC","ignoreList":[]}
+{"version":3,"names":["checkbox","datetime","date","email","telephone","url","integer","radio","select","text","toggle","textarea","toggleGroup","array","color","password","jsx","_jsx","FORM_CONTROLS","isEditConfig","value","control","createConfiguredControl","config","controlConfig","BaseControlType","getControlByType","ConfiguredControl","props","getControl","field","fieldTypeDefinition","Edit","elements","type","Object","keys","includes"],"sources":["@wordpress/dataviews/src/dataform-controls/index.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport type { ComponentType } from 'react';\n\n/**\n * Internal dependencies\n */\nimport type {\n\tDataFormControlProps,\n\tField,\n\tFieldTypeDefinition,\n\tEditConfig,\n} from '../types';\nimport checkbox from './checkbox';\nimport datetime from './datetime';\nimport date from './date';\nimport email from './email';\nimport telephone from './telephone';\nimport url from './url';\nimport integer from './integer';\nimport radio from './radio';\nimport select from './select';\nimport text from './text';\nimport toggle from './toggle';\nimport textarea from './textarea';\nimport toggleGroup from './toggle-group';\nimport array from './array';\nimport color from './color';\nimport password from './password';\n\ninterface FormControls {\n\t[ key: string ]: ComponentType< DataFormControlProps< any > >;\n}\n\nconst FORM_CONTROLS: FormControls = {\n\tarray,\n\tcheckbox,\n\tcolor,\n\tdatetime,\n\tdate,\n\temail,\n\ttelephone,\n\turl,\n\tinteger,\n\tpassword,\n\tradio,\n\tselect,\n\ttext,\n\ttoggle,\n\ttextarea,\n\ttoggleGroup,\n};\n\nfunction isEditConfig( value: any ): value is EditConfig {\n\treturn (\n\t\tvalue && typeof value === 'object' && typeof value.control === 'string'\n\t);\n}\n\nfunction createConfiguredControl( config: EditConfig ) {\n\tconst { control, ...controlConfig } = config;\n\tconst BaseControlType = getControlByType( control );\n\n\treturn function ConfiguredControl< Item >(\n\t\tprops: DataFormControlProps< Item >\n\t) {\n\t\treturn <BaseControlType { ...props } config={ controlConfig } />;\n\t};\n}\n\nexport function getControl< Item >(\n\tfield: Field< Item >,\n\tfieldTypeDefinition: FieldTypeDefinition< Item >\n) {\n\tif ( typeof field.Edit === 'function' ) {\n\t\treturn field.Edit;\n\t}\n\n\tif ( typeof field.Edit === 'string' ) {\n\t\treturn getControlByType( field.Edit );\n\t}\n\n\tif ( isEditConfig( field.Edit ) ) {\n\t\treturn createConfiguredControl( field.Edit );\n\t}\n\n\tif ( field.elements && field.type !== 'array' ) {\n\t\treturn getControlByType( 'select' );\n\t}\n\n\tif ( typeof fieldTypeDefinition.Edit === 'string' ) {\n\t\treturn getControlByType( fieldTypeDefinition.Edit );\n\t}\n\n\tif ( isEditConfig( fieldTypeDefinition.Edit ) ) {\n\t\treturn createConfiguredControl( fieldTypeDefinition.Edit );\n\t}\n\n\treturn fieldTypeDefinition.Edit;\n}\n\nexport function getControlByType( type: string ) {\n\tif ( Object.keys( FORM_CONTROLS ).includes( type ) ) {\n\t\treturn FORM_CONTROLS[ type ];\n\t}\n\n\tthrow 'Control ' + type + ' not found';\n}\n"],"mappings":"AAAA;AACA;AACA;;AAGA;AACA;AACA;;AAOA,OAAOA,QAAQ,MAAM,YAAY;AACjC,OAAOC,QAAQ,MAAM,YAAY;AACjC,OAAOC,IAAI,MAAM,QAAQ;AACzB,OAAOC,KAAK,MAAM,SAAS;AAC3B,OAAOC,SAAS,MAAM,aAAa;AACnC,OAAOC,GAAG,MAAM,OAAO;AACvB,OAAOC,OAAO,MAAM,WAAW;AAC/B,OAAOC,KAAK,MAAM,SAAS;AAC3B,OAAOC,MAAM,MAAM,UAAU;AAC7B,OAAOC,IAAI,MAAM,QAAQ;AACzB,OAAOC,MAAM,MAAM,UAAU;AAC7B,OAAOC,QAAQ,MAAM,YAAY;AACjC,OAAOC,WAAW,MAAM,gBAAgB;AACxC,OAAOC,KAAK,MAAM,SAAS;AAC3B,OAAOC,KAAK,MAAM,SAAS;AAC3B,OAAOC,QAAQ,MAAM,YAAY;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMlC,MAAMC,aAA2B,GAAG;EACnCL,KAAK;EACLb,QAAQ;EACRc,KAAK;EACLb,QAAQ;EACRC,IAAI;EACJC,KAAK;EACLC,SAAS;EACTC,GAAG;EACHC,OAAO;EACPS,QAAQ;EACRR,KAAK;EACLC,MAAM;EACNC,IAAI;EACJC,MAAM;EACNC,QAAQ;EACRC;AACD,CAAC;AAED,SAASO,YAAYA,CAAEC,KAAU,EAAwB;EACxD,OACCA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,CAACC,OAAO,KAAK,QAAQ;AAEzE;AAEA,SAASC,uBAAuBA,CAAEC,MAAkB,EAAG;EACtD,MAAM;IAAEF,OAAO;IAAE,GAAGG;EAAc,CAAC,GAAGD,MAAM;EAC5C,MAAME,eAAe,GAAGC,gBAAgB,CAAEL,OAAQ,CAAC;EAEnD,OAAO,SAASM,iBAAiBA,CAChCC,KAAmC,EAClC;IACD,oBAAOX,IAAA,CAACQ,eAAe;MAAA,GAAMG,KAAK;MAAGL,MAAM,EAAGC;IAAe,CAAE,CAAC;EACjE,CAAC;AACF;AAEA,OAAO,SAASK,UAAUA,CACzBC,KAAoB,EACpBC,mBAAgD,EAC/C;EACD,IAAK,OAAOD,KAAK,CAACE,IAAI,KAAK,UAAU,EAAG;IACvC,OAAOF,KAAK,CAACE,IAAI;EAClB;EAEA,IAAK,OAAOF,KAAK,CAACE,IAAI,KAAK,QAAQ,EAAG;IACrC,OAAON,gBAAgB,CAAEI,KAAK,CAACE,IAAK,CAAC;EACtC;EAEA,IAAKb,YAAY,CAAEW,KAAK,CAACE,IAAK,CAAC,EAAG;IACjC,OAAOV,uBAAuB,CAAEQ,KAAK,CAACE,IAAK,CAAC;EAC7C;EAEA,IAAKF,KAAK,CAACG,QAAQ,IAAIH,KAAK,CAACI,IAAI,KAAK,OAAO,EAAG;IAC/C,OAAOR,gBAAgB,CAAE,QAAS,CAAC;EACpC;EAEA,IAAK,OAAOK,mBAAmB,CAACC,IAAI,KAAK,QAAQ,EAAG;IACnD,OAAON,gBAAgB,CAAEK,mBAAmB,CAACC,IAAK,CAAC;EACpD;EAEA,IAAKb,YAAY,CAAEY,mBAAmB,CAACC,IAAK,CAAC,EAAG;IAC/C,OAAOV,uBAAuB,CAAES,mBAAmB,CAACC,IAAK,CAAC;EAC3D;EAEA,OAAOD,mBAAmB,CAACC,IAAI;AAChC;AAEA,OAAO,SAASN,gBAAgBA,CAAEQ,IAAY,EAAG;EAChD,IAAKC,MAAM,CAACC,IAAI,CAAElB,aAAc,CAAC,CAACmB,QAAQ,CAAEH,IAAK,CAAC,EAAG;IACpD,OAAOhB,aAAa,CAAEgB,IAAI,CAAE;EAC7B;EAEA,MAAM,UAAU,GAAGA,IAAI,GAAG,YAAY;AACvC","ignoreList":[]}

package/build-module/dataform-controls/integer.js

@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import deepMerge from 'deepmerge';
+
 /**
  * WordPress dependencies
  */
@@ -15,18 +20,13 @@ const {
   ValidatedNumberControl
 } = unlock(privateApis);
 function BetweenControls({
-  id,
   value,
   onChange,
   hideLabelFromVision
 }) {
-  const [min = '', max = ''] = Array.isArray(value) ? value : [];
-  const onChangeMin = useCallback(newValue => onChange({
-    [id]: [Number(newValue), max]
-  }), [id, onChange, max]);
-  const onChangeMax = useCallback(newValue => onChange({
-    [id]: [min, Number(newValue)]
-  }), [id, onChange, min]);
+  const [min = '', max = ''] = value;
+  const onChangeMin = useCallback(newValue => onChange([Number(newValue), max]), [onChange, max]);
+  const onChangeMax = useCallback(newValue => onChange([min, Number(newValue)]), [onChange, min]);
   return /*#__PURE__*/_jsx(BaseControl, {
     __nextHasNoMarginBottom: true,
     help: __('The max. value must be greater than the min. value.'),
@@ -58,48 +58,60 @@ export default function Integer({
   hideLabelFromVision,
   operator
 }) {
-  var _field$getValue;
+  var _getValue;
   const {
-    id,
     label,
-    description
+    description,
+    getValue,
+    setValue
   } = field;
-  const value = (_field$getValue = field.getValue({
+  const value = (_getValue = getValue({
     item: data
-  })) !== null && _field$getValue !== void 0 ? _field$getValue : '';
+  })) !== null && _getValue !== void 0 ? _getValue : '';
   const [customValidity, setCustomValidity] = useState(undefined);
   const onChangeControl = useCallback(newValue => {
-    onChange({
+    onChange(setValue({
+      item: data,
       // Do not convert an empty string or undefined to a number,
       // otherwise there's a mismatch between the UI control (empty)
       // and the data relied by onChange (0).
-      [id]: ['', undefined].includes(newValue) ? undefined : Number(newValue)
-    });
-  }, [id, onChange]);
+      value: ['', undefined].includes(newValue) ? undefined : Number(newValue)
+    }));
+  }, [data, onChange, setValue]);
+  const onChangeBetweenControls = useCallback(newValue => {
+    onChange(setValue({
+      item: data,
+      value: newValue
+    }));
+  }, [data, onChange, setValue]);
+  const onValidateControl = useCallback(newValue => {
+    const message = field.isValid?.custom?.(deepMerge(data, setValue({
+      item: data,
+      value: [undefined, '', null].includes(newValue) ? undefined : Number(newValue)
+    })), field);
+    if (message) {
+      setCustomValidity({
+        type: 'invalid',
+        message
+      });
+      return;
+    }
+    setCustomValidity(undefined);
+  }, [data, field, setValue]);
   if (operator === OPERATOR_BETWEEN) {
+    let valueBetween = ['', ''];
+    if (Array.isArray(value) && value.length === 2 && value.every(element => typeof element === 'number' || element === '')) {
+      valueBetween = value;
+    }
     return /*#__PURE__*/_jsx(BetweenControls, {
-      id: id,
-      value: value,
-      onChange: onChange,
+      value: valueBetween,
+      onChange: onChangeBetweenControls,
       hideLabelFromVision: hideLabelFromVision
     });
   }
   return /*#__PURE__*/_jsx(ValidatedNumberControl, {
     required: !!field.isValid?.required,
-    onValidate: newValue => {
-      const message = field.isValid?.custom?.({
-        ...data,
-        [id]: [undefined, '', null].includes(newValue) ? undefined : Number(newValue)
-      }, field);
-      if (message) {
-        setCustomValidity({
-          type: 'invalid',
-          message
-        });
-        return;
-      }
-      setCustomValidity(undefined);
-    },
+    onValidate: onValidateControl,
     customValidity: customValidity,
     label: label,
     help: description,

package/build-module/dataform-controls/integer.js.map

@@ -1 +1 @@
-{"version":3,"names":["Flex","BaseControl","__experimentalNumberControl","NumberControl","privateApis","useCallback","useState","__","OPERATOR_BETWEEN","unlock","jsx","_jsx","jsxs","_jsxs","ValidatedNumberControl","BetweenControls","id","value","onChange","hideLabelFromVision","min","max","Array","isArray","onChangeMin","newValue","Number","onChangeMax","__nextHasNoMarginBottom","help","children","direction","gap","label","undefined","__next40pxDefaultSize","Integer","data","field","operator","_field$getValue","description","getValue","item","customValidity","setCustomValidity","onChangeControl","includes","required","isValid","onValidate","message","custom","type"],"sources":["@wordpress/dataviews/src/dataform-controls/integer.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tFlex,\n\tBaseControl,\n\t__experimentalNumberControl as NumberControl,\n\tprivateApis,\n} from '@wordpress/components';\nimport { useCallback, useState } from '@wordpress/element';\nimport { __ } from '@wordpress/i18n';\n\n/**\n * Internal dependencies\n */\nimport { OPERATOR_BETWEEN } from '../constants';\nimport type { DataFormControlProps } from '../types';\nimport { unlock } from '../lock-unlock';\n\nconst { ValidatedNumberControl } = unlock( privateApis );\n\nfunction BetweenControls< Item >( {\n\tid,\n\tvalue,\n\tonChange,\n\thideLabelFromVision,\n}: {\n\tid: string;\n\tvalue: any;\n\tonChange: DataFormControlProps< Item >[ 'onChange' ];\n\thideLabelFromVision?: boolean;\n} ) {\n\tconst [ min = '', max = '' ] = Array.isArray( value ) ? value : [];\n\n\tconst onChangeMin = useCallback(\n\t\t( newValue: string | undefined ) =>\n\t\t\tonChange( {\n\t\t\t\t[ id ]: [ Number( newValue ), max ],\n\t\t\t} ),\n\t\t[ id, onChange, max ]\n\t);\n\n\tconst onChangeMax = useCallback(\n\t\t( newValue: string | undefined ) =>\n\t\t\tonChange( {\n\t\t\t\t[ id ]: [ min, Number( newValue ) ],\n\t\t\t} ),\n\t\t[ id, onChange, min ]\n\t);\n\n\treturn (\n\t\t<BaseControl\n\t\t\t__nextHasNoMarginBottom\n\t\t\thelp={ __( 'The max. value must be greater than the min. value.' ) }\n\t\t>\n\t\t\t<Flex direction=\"row\" gap={ 4 }>\n\t\t\t\t<NumberControl\n\t\t\t\t\tlabel={ __( 'Min.' ) }\n\t\t\t\t\tvalue={ min }\n\t\t\t\t\tmax={ max ? Number( max ) - 1 : undefined }\n\t\t\t\t\tonChange={ onChangeMin }\n\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t\t/>\n\t\t\t\t<NumberControl\n\t\t\t\t\tlabel={ __( 'Max.' ) }\n\t\t\t\t\tvalue={ max }\n\t\t\t\t\tmin={ min ? Number( min ) + 1 : undefined }\n\t\t\t\t\tonChange={ onChangeMax }\n\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t\t/>\n\t\t\t</Flex>\n\t\t</BaseControl>\n\t);\n}\n\nexport default function Integer< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n\toperator,\n}: DataFormControlProps< Item > ) {\n\tconst { id, label, description } = field;\n\tconst value = field.getValue( { item: data } ) ?? '';\n\tconst [ customValidity, setCustomValidity ] =\n\t\tuseState<\n\t\t\tReact.ComponentProps<\n\t\t\t\ttypeof ValidatedNumberControl\n\t\t\t>[ 'customValidity' ]\n\t\t>( undefined );\n\n\tconst onChangeControl = useCallback(\n\t\t( newValue: string | undefined ) => {\n\t\t\tonChange( {\n\t\t\t\t// Do not convert an empty string or undefined to a number,\n\t\t\t\t// otherwise there's a mismatch between the UI control (empty)\n\t\t\t\t// and the data relied by onChange (0).\n\t\t\t\t[ id ]: [ '', undefined ].includes( newValue )\n\t\t\t\t\t? undefined\n\t\t\t\t\t: Number( newValue ),\n\t\t\t} );\n\t\t},\n\t\t[ id, onChange ]\n\t);\n\n\tif ( operator === OPERATOR_BETWEEN ) {\n\t\treturn (\n\t\t\t<BetweenControls\n\t\t\t\tid={ id }\n\t\t\t\tvalue={ value }\n\t\t\t\tonChange={ onChange }\n\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t/>\n\t\t);\n\t}\n\n\treturn (\n\t\t<ValidatedNumberControl\n\t\t\trequired={ !! field.isValid?.required }\n\t\t\tonValidate={ ( newValue: any ) => {\n\t\t\t\tconst message = field.isValid?.custom?.(\n\t\t\t\t\t{\n\t\t\t\t\t\t...data,\n\t\t\t\t\t\t[ id ]: [ undefined, '', null ].includes( newValue )\n\t\t\t\t\t\t\t? undefined\n\t\t\t\t\t\t\t: Number( newValue ),\n\t\t\t\t\t},\n\t\t\t\t\tfield\n\t\t\t\t);\n\n\t\t\t\tif ( message ) {\n\t\t\t\t\tsetCustomValidity( {\n\t\t\t\t\t\ttype: 'invalid',\n\t\t\t\t\t\tmessage,\n\t\t\t\t\t} );\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tsetCustomValidity( undefined );\n\t\t\t} }\n\t\t\tcustomValidity={ customValidity }\n\t\t\tlabel={ label }\n\t\t\thelp={ description }\n\t\t\tvalue={ value }\n\t\t\tonChange={ onChangeControl }\n\t\t\t__next40pxDefaultSize\n\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t/>\n\t);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["deepMerge","Flex","BaseControl","__experimentalNumberControl","NumberControl","privateApis","useCallback","useState","__","OPERATOR_BETWEEN","unlock","jsx","_jsx","jsxs","_jsxs","ValidatedNumberControl","BetweenControls","value","onChange","hideLabelFromVision","min","max","onChangeMin","newValue","Number","onChangeMax","__nextHasNoMarginBottom","help","children","direction","gap","label","undefined","__next40pxDefaultSize","Integer","data","field","operator","_getValue","description","getValue","setValue","item","customValidity","setCustomValidity","onChangeControl","includes","onChangeBetweenControls","onValidateControl","message","isValid","custom","type","valueBetween","Array","isArray","length","every","element","required","onValidate"],"sources":["@wordpress/dataviews/src/dataform-controls/integer.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport deepMerge from 'deepmerge';\n\n/**\n * WordPress dependencies\n */\nimport {\n\tFlex,\n\tBaseControl,\n\t__experimentalNumberControl as NumberControl,\n\tprivateApis,\n} from '@wordpress/components';\nimport { useCallback, useState } from '@wordpress/element';\nimport { __ } from '@wordpress/i18n';\n\n/**\n * Internal dependencies\n */\nimport { OPERATOR_BETWEEN } from '../constants';\nimport type { DataFormControlProps } from '../types';\nimport { unlock } from '../lock-unlock';\n\nconst { ValidatedNumberControl } = unlock( privateApis );\n\ntype IntegerBetween = [ number | string, number | string ];\n\nfunction BetweenControls( {\n\tvalue,\n\tonChange,\n\thideLabelFromVision,\n}: {\n\tvalue: IntegerBetween;\n\tonChange: ( [ min, max ]: IntegerBetween ) => void;\n\thideLabelFromVision?: boolean;\n} ) {\n\tconst [ min = '', max = '' ] = value;\n\n\tconst onChangeMin = useCallback(\n\t\t( newValue: string | undefined ) =>\n\t\t\tonChange( [ Number( newValue ), max ] ),\n\t\t[ onChange, max ]\n\t);\n\n\tconst onChangeMax = useCallback(\n\t\t( newValue: string | undefined ) =>\n\t\t\tonChange( [ min, Number( newValue ) ] ),\n\t\t[ onChange, min ]\n\t);\n\n\treturn (\n\t\t<BaseControl\n\t\t\t__nextHasNoMarginBottom\n\t\t\thelp={ __( 'The max. value must be greater than the min. value.' ) }\n\t\t>\n\t\t\t<Flex direction=\"row\" gap={ 4 }>\n\t\t\t\t<NumberControl\n\t\t\t\t\tlabel={ __( 'Min.' ) }\n\t\t\t\t\tvalue={ min }\n\t\t\t\t\tmax={ max ? Number( max ) - 1 : undefined }\n\t\t\t\t\tonChange={ onChangeMin }\n\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t\t/>\n\t\t\t\t<NumberControl\n\t\t\t\t\tlabel={ __( 'Max.' ) }\n\t\t\t\t\tvalue={ max }\n\t\t\t\t\tmin={ min ? Number( min ) + 1 : undefined }\n\t\t\t\t\tonChange={ onChangeMax }\n\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t\t/>\n\t\t\t</Flex>\n\t\t</BaseControl>\n\t);\n}\n\nexport default function Integer< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n\toperator,\n}: DataFormControlProps< Item > ) {\n\tconst { label, description, getValue, setValue } = field;\n\tconst value = getValue( { item: data } ) ?? '';\n\tconst [ customValidity, setCustomValidity ] =\n\t\tuseState<\n\t\t\tReact.ComponentProps<\n\t\t\t\ttypeof ValidatedNumberControl\n\t\t\t>[ 'customValidity' ]\n\t\t>( undefined );\n\n\tconst onChangeControl = useCallback(\n\t\t( newValue: string | undefined ) => {\n\t\t\tonChange(\n\t\t\t\tsetValue( {\n\t\t\t\t\titem: data,\n\t\t\t\t\t// Do not convert an empty string or undefined to a number,\n\t\t\t\t\t// otherwise there's a mismatch between the UI control (empty)\n\t\t\t\t\t// and the data relied by onChange (0).\n\t\t\t\t\tvalue: [ '', undefined ].includes( newValue )\n\t\t\t\t\t\t? undefined\n\t\t\t\t\t\t: Number( newValue ),\n\t\t\t\t} )\n\t\t\t);\n\t\t},\n\t\t[ data, onChange, setValue ]\n\t);\n\n\tconst onChangeBetweenControls = useCallback(\n\t\t( newValue: IntegerBetween ) => {\n\t\t\tonChange(\n\t\t\t\tsetValue( {\n\t\t\t\t\titem: data,\n\t\t\t\t\tvalue: newValue,\n\t\t\t\t} )\n\t\t\t);\n\t\t},\n\t\t[ data, onChange, setValue ]\n\t);\n\n\tconst onValidateControl = useCallback(\n\t\t( newValue: any ) => {\n\t\t\tconst message = field.isValid?.custom?.(\n\t\t\t\tdeepMerge(\n\t\t\t\t\tdata,\n\t\t\t\t\tsetValue( {\n\t\t\t\t\t\titem: data,\n\t\t\t\t\t\tvalue: [ undefined, '', null ].includes( newValue )\n\t\t\t\t\t\t\t? undefined\n\t\t\t\t\t\t\t: Number( newValue ),\n\t\t\t\t\t} ) as Partial< Item >\n\t\t\t\t),\n\t\t\t\tfield\n\t\t\t);\n\n\t\t\tif ( message ) {\n\t\t\t\tsetCustomValidity( {\n\t\t\t\t\ttype: 'invalid',\n\t\t\t\t\tmessage,\n\t\t\t\t} );\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tsetCustomValidity( undefined );\n\t\t},\n\t\t[ data, field, setValue ]\n\t);\n\n\tif ( operator === OPERATOR_BETWEEN ) {\n\t\tlet valueBetween: IntegerBetween = [ '', '' ];\n\t\tif (\n\t\t\tArray.isArray( value ) &&\n\t\t\tvalue.length === 2 &&\n\t\t\tvalue.every(\n\t\t\t\t( element ) => typeof element === 'number' || element === ''\n\t\t\t)\n\t\t) {\n\t\t\tvalueBetween = value as IntegerBetween;\n\t\t}\n\t\treturn (\n\t\t\t<BetweenControls\n\t\t\t\tvalue={ valueBetween }\n\t\t\t\tonChange={ onChangeBetweenControls }\n\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t/>\n\t\t);\n\t}\n\n\treturn (\n\t\t<ValidatedNumberControl\n\t\t\trequired={ !! field.isValid?.required }\n\t\t\tonValidate={ onValidateControl }\n\t\t\tcustomValidity={ customValidity }\n\t\t\tlabel={ label }\n\t\t\thelp={ description }\n\t\t\tvalue={ value }\n\t\t\tonChange={ onChangeControl }\n\t\t\t__next40pxDefaultSize\n\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t/>\n\t);\n}\n"],"mappings":"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","ignoreList":[]}

package/build-module/dataform-controls/radio.js

@@ -1,13 +1,23 @@
+/**
+ * External dependencies
+ */
+import deepMerge from 'deepmerge';
+
 /**
  * WordPress dependencies
  */
-import { RadioControl } from '@wordpress/components';
-import { useCallback } from '@wordpress/element';
+import { privateApis } from '@wordpress/components';
+import { useCallback, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
+
+import { unlock } from '../lock-unlock';
 import { jsx as _jsx } from "react/jsx-runtime";
+const {
+  ValidatedRadioControl
+} = unlock(privateApis);
 export default function Radio({
   data,
   field,
@@ -15,20 +25,43 @@ export default function Radio({
   hideLabelFromVision
 }) {
   const {
-    id,
-    label
+    label,
+    description,
+    elements,
+    getValue,
+    setValue
   } = field;
-  const value = field.getValue({
+  const value = getValue({
     item: data
   });
-  const onChangeControl = useCallback(newValue => onChange({
-    [id]: newValue
-  }), [id, onChange]);
-  if (field.elements) {
-    return /*#__PURE__*/_jsx(RadioControl, {
+  const [customValidity, setCustomValidity] = useState(undefined);
+  const onChangeControl = useCallback(newValue => onChange(setValue({
+    item: data,
+    value: newValue
+  })), [data, onChange, setValue]);
+  const onValidateControl = useCallback(newValue => {
+    const message = field.isValid?.custom?.(deepMerge(data, setValue({
+      item: data,
+      value: newValue
+    })), field);
+    if (message) {
+      setCustomValidity({
+        type: 'invalid',
+        message
+      });
+      return;
+    }
+    setCustomValidity(undefined);
+  }, [data, field, setValue]);
+  if (elements) {
+    return /*#__PURE__*/_jsx(ValidatedRadioControl, {
+      required: !!field.isValid?.required,
+      onValidate: onValidateControl,
+      customValidity: customValidity,
       label: label,
+      help: description,
       onChange: onChangeControl,
-      options: field.elements,
+      options: elements,
       selected: value,
       hideLabelFromVision: hideLabelFromVision
     });

package/build-module/dataform-controls/radio.js.map

@@ -1 +1 @@
-{"version":3,"names":["RadioControl","useCallback","jsx","_jsx","Radio","data","field","onChange","hideLabelFromVision","id","label","value","getValue","item","onChangeControl","newValue","elements","options","selected"],"sources":["@wordpress/dataviews/src/dataform-controls/radio.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { RadioControl } from '@wordpress/components';\nimport { useCallback } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\n\nexport default function Radio< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n}: DataFormControlProps< Item > ) {\n\tconst { id, label } = field;\n\tconst value = field.getValue( { item: data } );\n\n\tconst onChangeControl = useCallback(\n\t\t( newValue: string ) =>\n\t\t\tonChange( {\n\t\t\t\t[ id ]: newValue,\n\t\t\t} ),\n\t\t[ id, onChange ]\n\t);\n\n\tif ( field.elements ) {\n\t\treturn (\n\t\t\t<RadioControl\n\t\t\t\tlabel={ label }\n\t\t\t\tonChange={ onChangeControl }\n\t\t\t\toptions={ field.elements }\n\t\t\t\tselected={ value }\n\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t/>\n\t\t);\n\t}\n\n\treturn null;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,YAAY,QAAQ,uBAAuB;AACpD,SAASC,WAAW,QAAQ,oBAAoB;;AAEhD;AACA;AACA;AAFA,SAAAC,GAAA,IAAAC,IAAA;AAKA,eAAe,SAASC,KAAKA,CAAU;EACtCC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC;AAC6B,CAAC,EAAG;EACjC,MAAM;IAAEC,EAAE;IAAEC;EAAM,CAAC,GAAGJ,KAAK;EAC3B,MAAMK,KAAK,GAAGL,KAAK,CAACM,QAAQ,CAAE;IAAEC,IAAI,EAAER;EAAK,CAAE,CAAC;EAE9C,MAAMS,eAAe,GAAGb,WAAW,CAChCc,QAAgB,IACjBR,QAAQ,CAAE;IACT,CAAEE,EAAE,GAAIM;EACT,CAAE,CAAC,EACJ,CAAEN,EAAE,EAAEF,QAAQ,CACf,CAAC;EAED,IAAKD,KAAK,CAACU,QAAQ,EAAG;IACrB,oBACCb,IAAA,CAACH,YAAY;MACZU,KAAK,EAAGA,KAAO;MACfH,QAAQ,EAAGO,eAAiB;MAC5BG,OAAO,EAAGX,KAAK,CAACU,QAAU;MAC1BE,QAAQ,EAAGP,KAAO;MAClBH,mBAAmB,EAAGA;IAAqB,CAC3C,CAAC;EAEJ;EAEA,OAAO,IAAI;AACZ","ignoreList":[]}
+{"version":3,"names":["deepMerge","privateApis","useCallback","useState","unlock","jsx","_jsx","ValidatedRadioControl","Radio","data","field","onChange","hideLabelFromVision","label","description","elements","getValue","setValue","value","item","customValidity","setCustomValidity","undefined","onChangeControl","newValue","onValidateControl","message","isValid","custom","type","required","onValidate","help","options","selected"],"sources":["@wordpress/dataviews/src/dataform-controls/radio.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport deepMerge from 'deepmerge';\n\n/**\n * WordPress dependencies\n */\nimport { privateApis } from '@wordpress/components';\nimport { useCallback, useState } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\nimport { unlock } from '../lock-unlock';\n\nconst { ValidatedRadioControl } = unlock( privateApis );\n\nexport default function Radio< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n}: DataFormControlProps< Item > ) {\n\tconst { label, description, elements, getValue, setValue } = field;\n\tconst value = getValue( { item: data } );\n\tconst [ customValidity, setCustomValidity ] =\n\t\tuseState<\n\t\t\tReact.ComponentProps<\n\t\t\t\ttypeof ValidatedRadioControl\n\t\t\t>[ 'customValidity' ]\n\t\t>( undefined );\n\n\tconst onChangeControl = useCallback(\n\t\t( newValue: string ) =>\n\t\t\tonChange( setValue( { item: data, value: newValue } ) ),\n\t\t[ data, onChange, setValue ]\n\t);\n\n\tconst onValidateControl = useCallback(\n\t\t( newValue: any ) => {\n\t\t\tconst message = field.isValid?.custom?.(\n\t\t\t\tdeepMerge(\n\t\t\t\t\tdata,\n\t\t\t\t\tsetValue( {\n\t\t\t\t\t\titem: data,\n\t\t\t\t\t\tvalue: newValue,\n\t\t\t\t\t} ) as Partial< Item >\n\t\t\t\t),\n\t\t\t\tfield\n\t\t\t);\n\n\t\t\tif ( message ) {\n\t\t\t\tsetCustomValidity( {\n\t\t\t\t\ttype: 'invalid',\n\t\t\t\t\tmessage,\n\t\t\t\t} );\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tsetCustomValidity( undefined );\n\t\t},\n\t\t[ data, field, setValue ]\n\t);\n\n\tif ( elements ) {\n\t\treturn (\n\t\t\t<ValidatedRadioControl\n\t\t\t\trequired={ !! field.isValid?.required }\n\t\t\t\tonValidate={ onValidateControl }\n\t\t\t\tcustomValidity={ customValidity }\n\t\t\t\tlabel={ label }\n\t\t\t\thelp={ description }\n\t\t\t\tonChange={ onChangeControl }\n\t\t\t\toptions={ elements }\n\t\t\t\tselected={ value }\n\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t/>\n\t\t);\n\t}\n\n\treturn null;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,OAAOA,SAAS,MAAM,WAAW;;AAEjC;AACA;AACA;AACA,SAASC,WAAW,QAAQ,uBAAuB;AACnD,SAASC,WAAW,EAAEC,QAAQ,QAAQ,oBAAoB;;AAE1D;AACA;AACA;;AAEA,SAASC,MAAM,QAAQ,gBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAExC,MAAM;EAAEC;AAAsB,CAAC,GAAGH,MAAM,CAAEH,WAAY,CAAC;AAEvD,eAAe,SAASO,KAAKA,CAAU;EACtCC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC;AAC6B,CAAC,EAAG;EACjC,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,QAAQ;IAAEC,QAAQ;IAAEC;EAAS,CAAC,GAAGP,KAAK;EAClE,MAAMQ,KAAK,GAAGF,QAAQ,CAAE;IAAEG,IAAI,EAAEV;EAAK,CAAE,CAAC;EACxC,MAAM,CAAEW,cAAc,EAAEC,iBAAiB,CAAE,GAC1ClB,QAAQ,CAILmB,SAAU,CAAC;EAEf,MAAMC,eAAe,GAAGrB,WAAW,CAChCsB,QAAgB,IACjBb,QAAQ,CAAEM,QAAQ,CAAE;IAAEE,IAAI,EAAEV,IAAI;IAAES,KAAK,EAAEM;EAAS,CAAE,CAAE,CAAC,EACxD,CAAEf,IAAI,EAAEE,QAAQ,EAAEM,QAAQ,CAC3B,CAAC;EAED,MAAMQ,iBAAiB,GAAGvB,WAAW,CAClCsB,QAAa,IAAM;IACpB,MAAME,OAAO,GAAGhB,KAAK,CAACiB,OAAO,EAAEC,MAAM,GACpC5B,SAAS,CACRS,IAAI,EACJQ,QAAQ,CAAE;MACTE,IAAI,EAAEV,IAAI;MACVS,KAAK,EAAEM;IACR,CAAE,CACH,CAAC,EACDd,KACD,CAAC;IAED,IAAKgB,OAAO,EAAG;MACdL,iBAAiB,CAAE;QAClBQ,IAAI,EAAE,SAAS;QACfH;MACD,CAAE,CAAC;MACH;IACD;IAEAL,iBAAiB,CAAEC,SAAU,CAAC;EAC/B,CAAC,EACD,CAAEb,IAAI,EAAEC,KAAK,EAAEO,QAAQ,CACxB,CAAC;EAED,IAAKF,QAAQ,EAAG;IACf,oBACCT,IAAA,CAACC,qBAAqB;MACrBuB,QAAQ,EAAG,CAAC,CAAEpB,KAAK,CAACiB,OAAO,EAAEG,QAAU;MACvCC,UAAU,EAAGN,iBAAmB;MAChCL,cAAc,EAAGA,cAAgB;MACjCP,KAAK,EAAGA,KAAO;MACfmB,IAAI,EAAGlB,WAAa;MACpBH,QAAQ,EAAGY,eAAiB;MAC5BU,OAAO,EAAGlB,QAAU;MACpBmB,QAAQ,EAAGhB,KAAO;MAClBN,mBAAmB,EAAGA;IAAqB,CAC3C,CAAC;EAEJ;EAEA,OAAO,IAAI;AACZ","ignoreList":[]}

package/build-module/dataform-controls/relative-date-control.js

@@ -57,17 +57,13 @@ export default function RelativeDateControl({
     unit = options[0].value
   } = value;
   const onChangeValue = useCallback(newValue => onChange({
-    [id]: {
-      value: Number(newValue),
-      unit
-    }
-  }), [id, onChange, unit]);
+    value: Number(newValue),
+    unit
+  }), [onChange, unit]);
   const onChangeUnit = useCallback(newUnit => onChange({
-    [id]: {
-      value: relValue,
-      unit: newUnit
-    }
-  }), [id, onChange, relValue]);
+    value: relValue,
+    unit: newUnit
+  }), [onChange, relValue]);
   return /*#__PURE__*/_jsx(BaseControl, {
     id: id,
     __nextHasNoMarginBottom: true,