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

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

@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import deepMerge from 'deepmerge';
+
 /**
  * WordPress dependencies
  */
@@ -17,43 +22,50 @@ export default function Textarea({
   data,
   field,
   onChange,
-  hideLabelFromVision
+  hideLabelFromVision,
+  config
 }) {
   const {
-    id,
+    rows = 4
+  } = config || {};
+  const {
     label,
     placeholder,
-    description
+    description,
+    setValue
   } = field;
   const value = field.getValue({
     item: data
   });
   const [customValidity, setCustomValidity] = useState(undefined);
-  const onChangeControl = useCallback(newValue => onChange({
-    [id]: newValue
-  }), [id, onChange]);
+  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]);
   return /*#__PURE__*/_jsx(ValidatedTextareaControl, {
     required: !!field.isValid?.required,
-    onValidate: newValue => {
-      const message = field.isValid?.custom?.({
-        ...data,
-        [id]: newValue
-      }, field);
-      if (message) {
-        setCustomValidity({
-          type: 'invalid',
-          message
-        });
-        return;
-      }
-      setCustomValidity(undefined);
-    },
+    onValidate: onValidateControl,
     customValidity: customValidity,
     label: label,
     placeholder: placeholder,
     value: value !== null && value !== void 0 ? value : '',
     help: description,
     onChange: onChangeControl,
+    rows: rows,
     __next40pxDefaultSize: true,
     __nextHasNoMarginBottom: true,
     hideLabelFromVision: hideLabelFromVision

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

@@ -1 +1 @@
-{"version":3,"names":["privateApis","useCallback","useState","unlock","jsx","_jsx","ValidatedTextareaControl","Textarea","data","field","onChange","hideLabelFromVision","id","label","placeholder","description","value","getValue","item","customValidity","setCustomValidity","undefined","onChangeControl","newValue","required","isValid","onValidate","message","custom","type","help","__next40pxDefaultSize","__nextHasNoMarginBottom"],"sources":["@wordpress/dataviews/src/dataform-controls/textarea.tsx"],"sourcesContent":["/**\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 { ValidatedTextareaControl } = unlock( privateApis );\n\nexport default function Textarea< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n}: DataFormControlProps< Item > ) {\n\tconst { id, label, placeholder, 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 ValidatedTextareaControl\n\t\t\t>[ 'customValidity' ]\n\t\t>( undefined );\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\treturn (\n\t\t<ValidatedTextareaControl\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 ]: 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\tplaceholder={ placeholder }\n\t\t\tvalue={ value ?? '' }\n\t\t\thelp={ description }\n\t\t\tonChange={ onChangeControl }\n\t\t\t__next40pxDefaultSize\n\t\t\t__nextHasNoMarginBottom\n\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t/>\n\t);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,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;AAAyB,CAAC,GAAGH,MAAM,CAAEH,WAAY,CAAC;AAE1D,eAAe,SAASO,QAAQA,CAAU;EACzCC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC;AAC6B,CAAC,EAAG;EACjC,MAAM;IAAEC,EAAE;IAAEC,KAAK;IAAEC,WAAW;IAAEC;EAAY,CAAC,GAAGN,KAAK;EACrD,MAAMO,KAAK,GAAGP,KAAK,CAACQ,QAAQ,CAAE;IAAEC,IAAI,EAAEV;EAAK,CAAE,CAAC;EAC9C,MAAM,CAAEW,cAAc,EAAEC,iBAAiB,CAAE,GAC1ClB,QAAQ,CAILmB,SAAU,CAAC;EAEf,MAAMC,eAAe,GAAGrB,WAAW,CAChCsB,QAAgB,IACjBb,QAAQ,CAAE;IACT,CAAEE,EAAE,GAAIW;EACT,CAAE,CAAC,EACJ,CAAEX,EAAE,EAAEF,QAAQ,CACf,CAAC;EAED,oBACCL,IAAA,CAACC,wBAAwB;IACxBkB,QAAQ,EAAG,CAAC,CAAEf,KAAK,CAACgB,OAAO,EAAED,QAAU;IACvCE,UAAU,EAAKH,QAAa,IAAM;MACjC,MAAMI,OAAO,GAAGlB,KAAK,CAACgB,OAAO,EAAEG,MAAM,GACpC;QACC,GAAGpB,IAAI;QACP,CAAEI,EAAE,GAAIW;MACT,CAAC,EACDd,KACD,CAAC;MAED,IAAKkB,OAAO,EAAG;QACdP,iBAAiB,CAAE;UAClBS,IAAI,EAAE,SAAS;UACfF;QACD,CAAE,CAAC;QACH;MACD;MAEAP,iBAAiB,CAAEC,SAAU,CAAC;IAC/B,CAAG;IACHF,cAAc,EAAGA,cAAgB;IACjCN,KAAK,EAAGA,KAAO;IACfC,WAAW,EAAGA,WAAa;IAC3BE,KAAK,EAAGA,KAAK,aAALA,KAAK,cAALA,KAAK,GAAI,EAAI;IACrBc,IAAI,EAAGf,WAAa;IACpBL,QAAQ,EAAGY,eAAiB;IAC5BS,qBAAqB;IACrBC,uBAAuB;IACvBrB,mBAAmB,EAAGA;EAAqB,CAC3C,CAAC;AAEJ","ignoreList":[]}
+{"version":3,"names":["deepMerge","privateApis","useCallback","useState","unlock","jsx","_jsx","ValidatedTextareaControl","Textarea","data","field","onChange","hideLabelFromVision","config","rows","label","placeholder","description","setValue","value","getValue","item","customValidity","setCustomValidity","undefined","onChangeControl","newValue","onValidateControl","message","isValid","custom","type","required","onValidate","help","__next40pxDefaultSize","__nextHasNoMarginBottom"],"sources":["@wordpress/dataviews/src/dataform-controls/textarea.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 { ValidatedTextareaControl } = unlock( privateApis );\n\nexport default function Textarea< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n\tconfig,\n}: DataFormControlProps< Item > ) {\n\tconst { rows = 4 } = config || {};\n\tconst { label, placeholder, description, setValue } = 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 ValidatedTextareaControl\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\treturn (\n\t\t<ValidatedTextareaControl\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\tplaceholder={ placeholder }\n\t\t\tvalue={ value ?? '' }\n\t\t\thelp={ description }\n\t\t\tonChange={ onChangeControl }\n\t\t\trows={ rows }\n\t\t\t__next40pxDefaultSize\n\t\t\t__nextHasNoMarginBottom\n\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t/>\n\t);\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;AAAyB,CAAC,GAAGH,MAAM,CAAEH,WAAY,CAAC;AAE1D,eAAe,SAASO,QAAQA,CAAU;EACzCC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC,mBAAmB;EACnBC;AAC6B,CAAC,EAAG;EACjC,MAAM;IAAEC,IAAI,GAAG;EAAE,CAAC,GAAGD,MAAM,IAAI,CAAC,CAAC;EACjC,MAAM;IAAEE,KAAK;IAAEC,WAAW;IAAEC,WAAW;IAAEC;EAAS,CAAC,GAAGR,KAAK;EAC3D,MAAMS,KAAK,GAAGT,KAAK,CAACU,QAAQ,CAAE;IAAEC,IAAI,EAAEZ;EAAK,CAAE,CAAC;EAC9C,MAAM,CAAEa,cAAc,EAAEC,iBAAiB,CAAE,GAC1CpB,QAAQ,CAILqB,SAAU,CAAC;EAEf,MAAMC,eAAe,GAAGvB,WAAW,CAChCwB,QAAgB,IACjBf,QAAQ,CAAEO,QAAQ,CAAE;IAAEG,IAAI,EAAEZ,IAAI;IAAEU,KAAK,EAAEO;EAAS,CAAE,CAAE,CAAC,EACxD,CAAEjB,IAAI,EAAEE,QAAQ,EAAEO,QAAQ,CAC3B,CAAC;EAED,MAAMS,iBAAiB,GAAGzB,WAAW,CAClCwB,QAAa,IAAM;IACpB,MAAME,OAAO,GAAGlB,KAAK,CAACmB,OAAO,EAAEC,MAAM,GACpC9B,SAAS,CACRS,IAAI,EACJS,QAAQ,CAAE;MACTG,IAAI,EAAEZ,IAAI;MACVU,KAAK,EAAEO;IACR,CAAE,CACH,CAAC,EACDhB,KACD,CAAC;IAED,IAAKkB,OAAO,EAAG;MACdL,iBAAiB,CAAE;QAClBQ,IAAI,EAAE,SAAS;QACfH;MACD,CAAE,CAAC;MACH;IACD;IAEAL,iBAAiB,CAAEC,SAAU,CAAC;EAC/B,CAAC,EACD,CAAEf,IAAI,EAAEC,KAAK,EAAEQ,QAAQ,CACxB,CAAC;EAED,oBACCZ,IAAA,CAACC,wBAAwB;IACxByB,QAAQ,EAAG,CAAC,CAAEtB,KAAK,CAACmB,OAAO,EAAEG,QAAU;IACvCC,UAAU,EAAGN,iBAAmB;IAChCL,cAAc,EAAGA,cAAgB;IACjCP,KAAK,EAAGA,KAAO;IACfC,WAAW,EAAGA,WAAa;IAC3BG,KAAK,EAAGA,KAAK,aAALA,KAAK,cAALA,KAAK,GAAI,EAAI;IACrBe,IAAI,EAAGjB,WAAa;IACpBN,QAAQ,EAAGc,eAAiB;IAC5BX,IAAI,EAAGA,IAAM;IACbqB,qBAAqB;IACrBC,uBAAuB;IACvBxB,mBAAmB,EAAGA;EAAqB,CAC3C,CAAC;AAEJ","ignoreList":[]}

package/build-module/dataform-controls/toggle-group.js

@@ -1,13 +1,23 @@
+/**
+ * External dependencies
+ */
+import deepMerge from 'deepmerge';
+
 /**
  * WordPress dependencies
  */
-import { __experimentalToggleGroupControl as ToggleGroupControl, __experimentalToggleGroupControlOption as ToggleGroupControlOption } from '@wordpress/components';
-import { useCallback } from '@wordpress/element';
+import { privateApis, __experimentalToggleGroupControlOption as ToggleGroupControlOption } 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 {
+  ValidatedToggleGroupControl
+} = unlock(privateApis);
 export default function ToggleGroup({
   data,
   field,
@@ -15,17 +25,37 @@ export default function ToggleGroup({
   hideLabelFromVision
 }) {
   const {
-    id
+    getValue,
+    setValue
   } = field;
-  const value = field.getValue({
+  const [customValidity, setCustomValidity] = useState(undefined);
+  const value = getValue({
     item: data
   });
-  const onChangeControl = useCallback(newValue => onChange({
-    [id]: newValue
-  }), [id, onChange]);
+  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 (field.elements) {
     const selectedOption = field.elements.find(el => el.value === value);
-    return /*#__PURE__*/_jsx(ToggleGroupControl, {
+    return /*#__PURE__*/_jsx(ValidatedToggleGroupControl, {
+      required: !!field.isValid?.required,
+      onValidate: onValidateControl,
+      customValidity: customValidity,
       __next40pxDefaultSize: true,
       __nextHasNoMarginBottom: true,
       isBlock: true,

package/build-module/dataform-controls/toggle-group.js.map

@@ -1 +1 @@
-{"version":3,"names":["__experimentalToggleGroupControl","ToggleGroupControl","__experimentalToggleGroupControlOption","ToggleGroupControlOption","useCallback","jsx","_jsx","ToggleGroup","data","field","onChange","hideLabelFromVision","id","value","getValue","item","onChangeControl","newValue","elements","selectedOption","find","el","__next40pxDefaultSize","__nextHasNoMarginBottom","isBlock","label","help","description","children","map"],"sources":["@wordpress/dataviews/src/dataform-controls/toggle-group.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalToggleGroupControl as ToggleGroupControl,\n\t__experimentalToggleGroupControlOption as ToggleGroupControlOption,\n} from '@wordpress/components';\nimport { useCallback } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\n\nexport default function ToggleGroup< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n}: DataFormControlProps< Item > ) {\n\tconst { id } = field;\n\tconst value = field.getValue( { item: data } );\n\n\tconst onChangeControl = useCallback(\n\t\t( newValue: string | number | undefined ) =>\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\tconst selectedOption = field.elements.find(\n\t\t\t( el ) => el.value === value\n\t\t);\n\t\treturn (\n\t\t\t<ToggleGroupControl\n\t\t\t\t__next40pxDefaultSize\n\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\tisBlock\n\t\t\t\tlabel={ field.label }\n\t\t\t\thelp={ selectedOption?.description || field.description }\n\t\t\t\tonChange={ onChangeControl }\n\t\t\t\tvalue={ value }\n\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t>\n\t\t\t\t{ field.elements.map( ( el ) => (\n\t\t\t\t\t<ToggleGroupControlOption\n\t\t\t\t\t\tkey={ el.value }\n\t\t\t\t\t\tlabel={ el.label }\n\t\t\t\t\t\tvalue={ el.value }\n\t\t\t\t\t/>\n\t\t\t\t) ) }\n\t\t\t</ToggleGroupControl>\n\t\t);\n\t}\n\n\treturn null;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SACCA,gCAAgC,IAAIC,kBAAkB,EACtDC,sCAAsC,IAAIC,wBAAwB,QAC5D,uBAAuB;AAC9B,SAASC,WAAW,QAAQ,oBAAoB;;AAEhD;AACA;AACA;AAFA,SAAAC,GAAA,IAAAC,IAAA;AAKA,eAAe,SAASC,WAAWA,CAAU;EAC5CC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC;AAC6B,CAAC,EAAG;EACjC,MAAM;IAAEC;EAAG,CAAC,GAAGH,KAAK;EACpB,MAAMI,KAAK,GAAGJ,KAAK,CAACK,QAAQ,CAAE;IAAEC,IAAI,EAAEP;EAAK,CAAE,CAAC;EAE9C,MAAMQ,eAAe,GAAGZ,WAAW,CAChCa,QAAqC,IACtCP,QAAQ,CAAE;IACT,CAAEE,EAAE,GAAIK;EACT,CAAE,CAAC,EACJ,CAAEL,EAAE,EAAEF,QAAQ,CACf,CAAC;EAED,IAAKD,KAAK,CAACS,QAAQ,EAAG;IACrB,MAAMC,cAAc,GAAGV,KAAK,CAACS,QAAQ,CAACE,IAAI,CACvCC,EAAE,IAAMA,EAAE,CAACR,KAAK,KAAKA,KACxB,CAAC;IACD,oBACCP,IAAA,CAACL,kBAAkB;MAClBqB,qBAAqB;MACrBC,uBAAuB;MACvBC,OAAO;MACPC,KAAK,EAAGhB,KAAK,CAACgB,KAAO;MACrBC,IAAI,EAAGP,cAAc,EAAEQ,WAAW,IAAIlB,KAAK,CAACkB,WAAa;MACzDjB,QAAQ,EAAGM,eAAiB;MAC5BH,KAAK,EAAGA,KAAO;MACfF,mBAAmB,EAAGA,mBAAqB;MAAAiB,QAAA,EAEzCnB,KAAK,CAACS,QAAQ,CAACW,GAAG,CAAIR,EAAE,iBACzBf,IAAA,CAACH,wBAAwB;QAExBsB,KAAK,EAAGJ,EAAE,CAACI,KAAO;QAClBZ,KAAK,EAAGQ,EAAE,CAACR;MAAO,GAFZQ,EAAE,CAACR,KAGT,CACA;IAAC,CACgB,CAAC;EAEvB;EAEA,OAAO,IAAI;AACZ","ignoreList":[]}
+{"version":3,"names":["deepMerge","privateApis","__experimentalToggleGroupControlOption","ToggleGroupControlOption","useCallback","useState","unlock","jsx","_jsx","ValidatedToggleGroupControl","ToggleGroup","data","field","onChange","hideLabelFromVision","getValue","setValue","customValidity","setCustomValidity","undefined","value","item","onChangeControl","newValue","onValidateControl","message","isValid","custom","type","elements","selectedOption","find","el","required","onValidate","__next40pxDefaultSize","__nextHasNoMarginBottom","isBlock","label","help","description","children","map"],"sources":["@wordpress/dataviews/src/dataform-controls/toggle-group.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport deepMerge from 'deepmerge';\n\n/**\n * WordPress dependencies\n */\nimport {\n\tprivateApis,\n\t__experimentalToggleGroupControlOption as ToggleGroupControlOption,\n} 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 { ValidatedToggleGroupControl } = unlock( privateApis );\n\nexport default function ToggleGroup< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n}: DataFormControlProps< Item > ) {\n\tconst { getValue, setValue } = field;\n\tconst [ customValidity, setCustomValidity ] =\n\t\tuseState<\n\t\t\tReact.ComponentProps<\n\t\t\t\ttypeof ValidatedToggleGroupControl\n\t\t\t>[ 'customValidity' ]\n\t\t>( undefined );\n\tconst value = getValue( { item: data } );\n\n\tconst onChangeControl = useCallback(\n\t\t( newValue: string | number | undefined ) =>\n\t\t\tonChange( setValue( { item: data, value: newValue } ) ),\n\t\t[ data, onChange, setValue ]\n\t);\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 ( field.elements ) {\n\t\tconst selectedOption = field.elements.find(\n\t\t\t( el ) => el.value === value\n\t\t);\n\t\treturn (\n\t\t\t<ValidatedToggleGroupControl\n\t\t\t\trequired={ !! field.isValid?.required }\n\t\t\t\tonValidate={ onValidateControl }\n\t\t\t\tcustomValidity={ customValidity }\n\t\t\t\t__next40pxDefaultSize\n\t\t\t\t__nextHasNoMarginBottom\n\t\t\t\tisBlock\n\t\t\t\tlabel={ field.label }\n\t\t\t\thelp={ selectedOption?.description || field.description }\n\t\t\t\tonChange={ onChangeControl }\n\t\t\t\tvalue={ value }\n\t\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\t>\n\t\t\t\t{ field.elements.map( ( el ) => (\n\t\t\t\t\t<ToggleGroupControlOption\n\t\t\t\t\t\tkey={ el.value }\n\t\t\t\t\t\tlabel={ el.label }\n\t\t\t\t\t\tvalue={ el.value }\n\t\t\t\t\t/>\n\t\t\t\t) ) }\n\t\t\t</ValidatedToggleGroupControl>\n\t\t);\n\t}\n\n\treturn null;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,OAAOA,SAAS,MAAM,WAAW;;AAEjC;AACA;AACA;AACA,SACCC,WAAW,EACXC,sCAAsC,IAAIC,wBAAwB,QAC5D,uBAAuB;AAC9B,SAASC,WAAW,EAAEC,QAAQ,QAAQ,oBAAoB;;AAE1D;AACA;AACA;;AAEA,SAASC,MAAM,QAAQ,gBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAExC,MAAM;EAAEC;AAA4B,CAAC,GAAGH,MAAM,CAAEL,WAAY,CAAC;AAE7D,eAAe,SAASS,WAAWA,CAAU;EAC5CC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC;AAC6B,CAAC,EAAG;EACjC,MAAM;IAAEC,QAAQ;IAAEC;EAAS,CAAC,GAAGJ,KAAK;EACpC,MAAM,CAAEK,cAAc,EAAEC,iBAAiB,CAAE,GAC1Cb,QAAQ,CAILc,SAAU,CAAC;EACf,MAAMC,KAAK,GAAGL,QAAQ,CAAE;IAAEM,IAAI,EAAEV;EAAK,CAAE,CAAC;EAExC,MAAMW,eAAe,GAAGlB,WAAW,CAChCmB,QAAqC,IACtCV,QAAQ,CAAEG,QAAQ,CAAE;IAAEK,IAAI,EAAEV,IAAI;IAAES,KAAK,EAAEG;EAAS,CAAE,CAAE,CAAC,EACxD,CAAEZ,IAAI,EAAEE,QAAQ,EAAEG,QAAQ,CAC3B,CAAC;EACD,MAAMQ,iBAAiB,GAAGpB,WAAW,CAClCmB,QAAa,IAAM;IACpB,MAAME,OAAO,GAAGb,KAAK,CAACc,OAAO,EAAEC,MAAM,GACpC3B,SAAS,CACRW,IAAI,EACJK,QAAQ,CAAE;MACTK,IAAI,EAAEV,IAAI;MACVS,KAAK,EAAEG;IACR,CAAE,CACH,CAAC,EACDX,KACD,CAAC;IAED,IAAKa,OAAO,EAAG;MACdP,iBAAiB,CAAE;QAClBU,IAAI,EAAE,SAAS;QACfH;MACD,CAAE,CAAC;MACH;IACD;IAEAP,iBAAiB,CAAEC,SAAU,CAAC;EAC/B,CAAC,EACD,CAAER,IAAI,EAAEC,KAAK,EAAEI,QAAQ,CACxB,CAAC;EAED,IAAKJ,KAAK,CAACiB,QAAQ,EAAG;IACrB,MAAMC,cAAc,GAAGlB,KAAK,CAACiB,QAAQ,CAACE,IAAI,CACvCC,EAAE,IAAMA,EAAE,CAACZ,KAAK,KAAKA,KACxB,CAAC;IACD,oBACCZ,IAAA,CAACC,2BAA2B;MAC3BwB,QAAQ,EAAG,CAAC,CAAErB,KAAK,CAACc,OAAO,EAAEO,QAAU;MACvCC,UAAU,EAAGV,iBAAmB;MAChCP,cAAc,EAAGA,cAAgB;MACjCkB,qBAAqB;MACrBC,uBAAuB;MACvBC,OAAO;MACPC,KAAK,EAAG1B,KAAK,CAAC0B,KAAO;MACrBC,IAAI,EAAGT,cAAc,EAAEU,WAAW,IAAI5B,KAAK,CAAC4B,WAAa;MACzD3B,QAAQ,EAAGS,eAAiB;MAC5BF,KAAK,EAAGA,KAAO;MACfN,mBAAmB,EAAGA,mBAAqB;MAAA2B,QAAA,EAEzC7B,KAAK,CAACiB,QAAQ,CAACa,GAAG,CAAIV,EAAE,iBACzBxB,IAAA,CAACL,wBAAwB;QAExBmC,KAAK,EAAGN,EAAE,CAACM,KAAO;QAClBlB,KAAK,EAAGY,EAAE,CAACZ;MAAO,GAFZY,EAAE,CAACZ,KAGT,CACA;IAAC,CACyB,CAAC;EAEhC;EAEA,OAAO,IAAI;AACZ","ignoreList":[]}

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

@@ -1,8 +1,13 @@
+/**
+ * External dependencies
+ */
+import deepMerge from 'deepmerge';
+
 /**
  * WordPress dependencies
  */
 import { privateApis } from '@wordpress/components';
-import { useState } from '@wordpress/element';
+import { useCallback, useState } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -20,28 +25,37 @@ export default function Toggle({
   hideLabelFromVision
 }) {
   const {
-    id,
-    getValue,
     label,
-    description
+    description,
+    getValue,
+    setValue
   } = field;
   const [customValidity, setCustomValidity] = useState(undefined);
+  const onChangeControl = useCallback(() => {
+    onChange(setValue({
+      item: data,
+      value: !getValue({
+        item: data
+      })
+    }));
+  }, [onChange, setValue, data, getValue]);
+  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]);
   return /*#__PURE__*/_jsx(ValidatedToggleControl, {
     required: !!field.isValid.required,
-    onValidate: newValue => {
-      const message = field.isValid?.custom?.({
-        ...data,
-        [id]: newValue
-      }, field);
-      if (message) {
-        setCustomValidity({
-          type: 'invalid',
-          message
-        });
-        return;
-      }
-      setCustomValidity(undefined);
-    },
+    onValidate: onValidateControl,
     customValidity: customValidity,
     hidden: hideLabelFromVision,
     __nextHasNoMarginBottom: true,
@@ -50,11 +64,7 @@ export default function Toggle({
     checked: getValue({
       item: data
     }),
-    onChange: () => onChange({
-      [id]: !getValue({
-        item: data
-      })
-    })
+    onChange: onChangeControl
   });
 }
 //# sourceMappingURL=toggle.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["privateApis","useState","unlock","jsx","_jsx","ValidatedToggleControl","Toggle","field","onChange","data","hideLabelFromVision","id","getValue","label","description","customValidity","setCustomValidity","undefined","required","isValid","onValidate","newValue","message","custom","type","hidden","__nextHasNoMarginBottom","help","checked","item"],"sources":["@wordpress/dataviews/src/dataform-controls/toggle.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { privateApis } from '@wordpress/components';\nimport { useState } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\nimport { unlock } from '../lock-unlock';\n\nconst { ValidatedToggleControl } = unlock( privateApis );\n\nexport default function Toggle< Item >( {\n\tfield,\n\tonChange,\n\tdata,\n\thideLabelFromVision,\n}: DataFormControlProps< Item > ) {\n\tconst { id, getValue, label, description } = field;\n\tconst [ customValidity, setCustomValidity ] =\n\t\tuseState<\n\t\t\tReact.ComponentProps<\n\t\t\t\ttypeof ValidatedToggleControl\n\t\t\t>[ 'customValidity' ]\n\t\t>( undefined );\n\n\treturn (\n\t\t<ValidatedToggleControl\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 ]: 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\thidden={ hideLabelFromVision }\n\t\t\t__nextHasNoMarginBottom\n\t\t\tlabel={ label }\n\t\t\thelp={ description }\n\t\t\tchecked={ getValue( { item: data } ) }\n\t\t\tonChange={ () =>\n\t\t\t\tonChange( { [ id ]: ! getValue( { item: data } ) } )\n\t\t\t}\n\t\t/>\n\t);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,WAAW,QAAQ,uBAAuB;AACnD,SAASC,QAAQ,QAAQ,oBAAoB;;AAE7C;AACA;AACA;;AAEA,SAASC,MAAM,QAAQ,gBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAExC,MAAM;EAAEC;AAAuB,CAAC,GAAGH,MAAM,CAAEF,WAAY,CAAC;AAExD,eAAe,SAASM,MAAMA,CAAU;EACvCC,KAAK;EACLC,QAAQ;EACRC,IAAI;EACJC;AAC6B,CAAC,EAAG;EACjC,MAAM;IAAEC,EAAE;IAAEC,QAAQ;IAAEC,KAAK;IAAEC;EAAY,CAAC,GAAGP,KAAK;EAClD,MAAM,CAAEQ,cAAc,EAAEC,iBAAiB,CAAE,GAC1Cf,QAAQ,CAILgB,SAAU,CAAC;EAEf,oBACCb,IAAA,CAACC,sBAAsB;IACtBa,QAAQ,EAAG,CAAC,CAAEX,KAAK,CAACY,OAAO,CAACD,QAAU;IACtCE,UAAU,EAAKC,QAAa,IAAM;MACjC,MAAMC,OAAO,GAAGf,KAAK,CAACY,OAAO,EAAEI,MAAM,GACpC;QACC,GAAGd,IAAI;QACP,CAAEE,EAAE,GAAIU;MACT,CAAC,EACDd,KACD,CAAC;MAED,IAAKe,OAAO,EAAG;QACdN,iBAAiB,CAAE;UAClBQ,IAAI,EAAE,SAAS;UACfF;QACD,CAAE,CAAC;QACH;MACD;MAEAN,iBAAiB,CAAEC,SAAU,CAAC;IAC/B,CAAG;IACHF,cAAc,EAAGA,cAAgB;IACjCU,MAAM,EAAGf,mBAAqB;IAC9BgB,uBAAuB;IACvBb,KAAK,EAAGA,KAAO;IACfc,IAAI,EAAGb,WAAa;IACpBc,OAAO,EAAGhB,QAAQ,CAAE;MAAEiB,IAAI,EAAEpB;IAAK,CAAE,CAAG;IACtCD,QAAQ,EAAGA,CAAA,KACVA,QAAQ,CAAE;MAAE,CAAEG,EAAE,GAAI,CAAEC,QAAQ,CAAE;QAAEiB,IAAI,EAAEpB;MAAK,CAAE;IAAE,CAAE;EACnD,CACD,CAAC;AAEJ","ignoreList":[]}
+{"version":3,"names":["deepMerge","privateApis","useCallback","useState","unlock","jsx","_jsx","ValidatedToggleControl","Toggle","field","onChange","data","hideLabelFromVision","label","description","getValue","setValue","customValidity","setCustomValidity","undefined","onChangeControl","item","value","onValidateControl","newValue","message","isValid","custom","type","required","onValidate","hidden","__nextHasNoMarginBottom","help","checked"],"sources":["@wordpress/dataviews/src/dataform-controls/toggle.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 { ValidatedToggleControl } = unlock( privateApis );\n\nexport default function Toggle< Item >( {\n\tfield,\n\tonChange,\n\tdata,\n\thideLabelFromVision,\n}: DataFormControlProps< Item > ) {\n\tconst { label, description, getValue, setValue } = field;\n\tconst [ customValidity, setCustomValidity ] =\n\t\tuseState<\n\t\t\tReact.ComponentProps<\n\t\t\t\ttypeof ValidatedToggleControl\n\t\t\t>[ 'customValidity' ]\n\t\t>( undefined );\n\n\tconst onChangeControl = useCallback( () => {\n\t\tonChange(\n\t\t\tsetValue( { item: data, value: ! getValue( { item: data } ) } )\n\t\t);\n\t}, [ onChange, setValue, data, getValue ] );\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\treturn (\n\t\t<ValidatedToggleControl\n\t\t\trequired={ !! field.isValid.required }\n\t\t\tonValidate={ onValidateControl }\n\t\t\tcustomValidity={ customValidity }\n\t\t\thidden={ hideLabelFromVision }\n\t\t\t__nextHasNoMarginBottom\n\t\t\tlabel={ label }\n\t\t\thelp={ description }\n\t\t\tchecked={ getValue( { item: data } ) }\n\t\t\tonChange={ onChangeControl }\n\t\t/>\n\t);\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;AAAuB,CAAC,GAAGH,MAAM,CAAEH,WAAY,CAAC;AAExD,eAAe,SAASO,MAAMA,CAAU;EACvCC,KAAK;EACLC,QAAQ;EACRC,IAAI;EACJC;AAC6B,CAAC,EAAG;EACjC,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,QAAQ;IAAEC;EAAS,CAAC,GAAGP,KAAK;EACxD,MAAM,CAAEQ,cAAc,EAAEC,iBAAiB,CAAE,GAC1Cf,QAAQ,CAILgB,SAAU,CAAC;EAEf,MAAMC,eAAe,GAAGlB,WAAW,CAAE,MAAM;IAC1CQ,QAAQ,CACPM,QAAQ,CAAE;MAAEK,IAAI,EAAEV,IAAI;MAAEW,KAAK,EAAE,CAAEP,QAAQ,CAAE;QAAEM,IAAI,EAAEV;MAAK,CAAE;IAAE,CAAE,CAC/D,CAAC;EACF,CAAC,EAAE,CAAED,QAAQ,EAAEM,QAAQ,EAAEL,IAAI,EAAEI,QAAQ,CAAG,CAAC;EAE3C,MAAMQ,iBAAiB,GAAGrB,WAAW,CAClCsB,QAAa,IAAM;IACpB,MAAMC,OAAO,GAAGhB,KAAK,CAACiB,OAAO,EAAEC,MAAM,GACpC3B,SAAS,CACRW,IAAI,EACJK,QAAQ,CAAE;MACTK,IAAI,EAAEV,IAAI;MACVW,KAAK,EAAEE;IACR,CAAE,CACH,CAAC,EACDf,KACD,CAAC;IAED,IAAKgB,OAAO,EAAG;MACdP,iBAAiB,CAAE;QAClBU,IAAI,EAAE,SAAS;QACfH;MACD,CAAE,CAAC;MACH;IACD;IAEAP,iBAAiB,CAAEC,SAAU,CAAC;EAC/B,CAAC,EACD,CAAER,IAAI,EAAEF,KAAK,EAAEO,QAAQ,CACxB,CAAC;EAED,oBACCV,IAAA,CAACC,sBAAsB;IACtBsB,QAAQ,EAAG,CAAC,CAAEpB,KAAK,CAACiB,OAAO,CAACG,QAAU;IACtCC,UAAU,EAAGP,iBAAmB;IAChCN,cAAc,EAAGA,cAAgB;IACjCc,MAAM,EAAGnB,mBAAqB;IAC9BoB,uBAAuB;IACvBnB,KAAK,EAAGA,KAAO;IACfoB,IAAI,EAAGnB,WAAa;IACpBoB,OAAO,EAAGnB,QAAQ,CAAE;MAAEM,IAAI,EAAEV;IAAK,CAAE,CAAG;IACtCD,QAAQ,EAAGU;EAAiB,CAC5B,CAAC;AAEJ","ignoreList":[]}

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

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

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

@@ -1 +1 @@
-{"version":3,"names":["link","ValidatedText","jsx","_jsx","Url","data","field","onChange","hideLabelFromVision","type","icon"],"sources":["@wordpress/dataviews/src/dataform-controls/url.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { link } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\nimport ValidatedText from './utils/validated-input';\n\nexport default function Url< 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: 'url',\n\t\t\t\ticon: link,\n\t\t\t} }\n\t\t/>\n\t);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,IAAI,QAAQ,kBAAkB;;AAEvC;AACA;AACA;;AAEA,OAAOC,aAAa,MAAM,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEpD,eAAe,SAASC,GAAGA,CAAU;EACpCC,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,KAAK;IACXC,IAAI,EAAEV;EAAI,CAEX,CAAC;AAEJ","ignoreList":[]}
+{"version":3,"names":["Icon","__experimentalInputControlPrefixWrapper","InputControlPrefixWrapper","link","ValidatedText","jsx","_jsx","Url","data","field","onChange","hideLabelFromVision","type","prefix","variant","children","icon"],"sources":["@wordpress/dataviews/src/dataform-controls/url.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tIcon,\n\t__experimentalInputControlPrefixWrapper as InputControlPrefixWrapper,\n} from '@wordpress/components';\nimport { link } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport type { DataFormControlProps } from '../types';\nimport ValidatedText from './utils/validated-input';\n\nexport default function Url< 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: 'url',\n\t\t\t\tprefix: (\n\t\t\t\t\t<InputControlPrefixWrapper variant=\"icon\">\n\t\t\t\t\t\t<Icon icon={ link } />\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,IAAI,QAAQ,kBAAkB;;AAEvC;AACA;AACA;;AAEA,OAAOC,aAAa,MAAM,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEpD,eAAe,SAASC,GAAGA,CAAU;EACpCC,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,KAAK;IACXC,MAAM,eACLP,IAAA,CAACJ,yBAAyB;MAACY,OAAO,EAAC,MAAM;MAAAC,QAAA,eACxCT,IAAA,CAACN,IAAI;QAACgB,IAAI,EAAGb;MAAM,CAAE;IAAC,CACI;EAC3B,CAEF,CAAC;AAEJ","ignoreList":[]}

package/build-module/dataform-controls/utils/validated-input.js

@@ -1,7 +1,12 @@
+/**
+ * External dependencies
+ */
+import deepMerge from 'deepmerge';
+
 /**
  * WordPress dependencies
  */
-import { Icon, privateApis, __experimentalInputControlPrefixWrapper as InputControlPrefixWrapper, __experimentalInputControlSuffixWrapper as InputControlSuffixWrapper } from '@wordpress/components';
+import { privateApis } from '@wordpress/components';
 import { useCallback, useState } from '@wordpress/element';
 
 /**
@@ -19,38 +24,42 @@ export default function ValidatedText({
   onChange,
   hideLabelFromVision,
   type,
-  icon,
+  prefix,
   suffix
 }) {
   const {
-    id,
     label,
     placeholder,
-    description
+    description,
+    getValue,
+    setValue,
+    isValid
   } = field;
-  const value = field.getValue({
+  const value = getValue({
     item: data
   });
   const [customValidity, setCustomValidity] = useState(undefined);
-  const onChangeControl = useCallback(newValue => onChange({
-    [id]: newValue
-  }), [id, onChange]);
+  const onChangeControl = useCallback(newValue => onChange(setValue({
+    item: data,
+    value: newValue
+  })), [data, setValue, onChange]);
+  const onValidateControl = useCallback(newValue => {
+    const message = isValid?.custom?.(deepMerge(data, setValue({
+      item: data,
+      value: newValue
+    })), field);
+    if (message) {
+      setCustomValidity({
+        type: 'invalid',
+        message
+      });
+      return;
+    }
+    setCustomValidity(undefined);
+  }, [data, field, isValid, setValue]);
   return /*#__PURE__*/_jsx(ValidatedInputControl, {
-    required: !!field.isValid?.required,
-    onValidate: newValue => {
-      const message = field.isValid?.custom?.({
-        ...data,
-        [id]: newValue
-      }, field);
-      if (message) {
-        setCustomValidity({
-          type: 'invalid',
-          message
-        });
-        return;
-      }
-      setCustomValidity(undefined);
-    },
+    required: !!isValid?.required,
+    onValidate: onValidateControl,
     customValidity: customValidity,
     label: label,
     placeholder: placeholder,
@@ -59,16 +68,8 @@ export default function ValidatedText({
     onChange: onChangeControl,
     hideLabelFromVision: hideLabelFromVision,
     type: type,
-    prefix: icon ? /*#__PURE__*/_jsx(InputControlPrefixWrapper, {
-      variant: "icon",
-      children: /*#__PURE__*/_jsx(Icon, {
-        icon: icon
-      })
-    }) : undefined,
-    suffix: suffix ? /*#__PURE__*/_jsx(InputControlSuffixWrapper, {
-      variant: "control",
-      children: suffix
-    }) : undefined,
+    prefix: prefix,
+    suffix: suffix,
     __next40pxDefaultSize: true
   });
 }

package/build-module/dataform-controls/utils/validated-input.js.map

@@ -1 +1 @@
-{"version":3,"names":["Icon","privateApis","__experimentalInputControlPrefixWrapper","InputControlPrefixWrapper","__experimentalInputControlSuffixWrapper","InputControlSuffixWrapper","useCallback","useState","unlock","jsx","_jsx","ValidatedInputControl","ValidatedText","data","field","onChange","hideLabelFromVision","type","icon","suffix","id","label","placeholder","description","value","getValue","item","customValidity","setCustomValidity","undefined","onChangeControl","newValue","required","isValid","onValidate","message","custom","help","prefix","variant","children","__next40pxDefaultSize"],"sources":["@wordpress/dataviews/src/dataform-controls/utils/validated-input.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tIcon,\n\tprivateApis,\n\t__experimentalInputControlPrefixWrapper as InputControlPrefixWrapper,\n\t__experimentalInputControlSuffixWrapper as InputControlSuffixWrapper,\n} 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 { ValidatedInputControl } = unlock( privateApis );\n\nexport type DataFormValidatedTextControlProps< Item > =\n\tDataFormControlProps< Item > & {\n\t\t/**\n\t\t * The input type of the control.\n\t\t */\n\t\ttype?: 'text' | 'email' | 'tel' | 'url' | 'password';\n\t\t/**\n\t\t * Optional icon to display as prefix.\n\t\t */\n\t\ticon?: React.ComponentType | React.ReactElement;\n\t\t/**\n\t\t * Optional icon to display as suffix.\n\t\t */\n\t\tsuffix?: React.ReactElement;\n\t};\n\nexport default function ValidatedText< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n\ttype,\n\ticon,\n\tsuffix,\n}: DataFormValidatedTextControlProps< Item > ) {\n\tconst { id, label, placeholder, 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 ValidatedInputControl\n\t\t\t>[ 'customValidity' ]\n\t\t>( undefined );\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\treturn (\n\t\t<ValidatedInputControl\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 ]: 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\tplaceholder={ placeholder }\n\t\t\tvalue={ value ?? '' }\n\t\t\thelp={ description }\n\t\t\tonChange={ onChangeControl }\n\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\ttype={ type }\n\t\t\tprefix={\n\t\t\t\ticon ? (\n\t\t\t\t\t<InputControlPrefixWrapper variant=\"icon\">\n\t\t\t\t\t\t<Icon icon={ icon } />\n\t\t\t\t\t</InputControlPrefixWrapper>\n\t\t\t\t) : undefined\n\t\t\t}\n\t\t\tsuffix={\n\t\t\t\tsuffix ? (\n\t\t\t\t\t<InputControlSuffixWrapper variant=\"control\">\n\t\t\t\t\t\t{ suffix }\n\t\t\t\t\t</InputControlSuffixWrapper>\n\t\t\t\t) : undefined\n\t\t\t}\n\t\t\t__next40pxDefaultSize\n\t\t/>\n\t);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SACCA,IAAI,EACJC,WAAW,EACXC,uCAAuC,IAAIC,yBAAyB,EACpEC,uCAAuC,IAAIC,yBAAyB,QAC9D,uBAAuB;AAC9B,SAASC,WAAW,EAAEC,QAAQ,QAAQ,oBAAoB;;AAE1D;AACA;AACA;;AAEA,SAASC,MAAM,QAAQ,mBAAmB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE3C,MAAM;EAAEC;AAAsB,CAAC,GAAGH,MAAM,CAAEP,WAAY,CAAC;AAkBvD,eAAe,SAASW,aAAaA,CAAU;EAC9CC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC,mBAAmB;EACnBC,IAAI;EACJC,IAAI;EACJC;AAC0C,CAAC,EAAG;EAC9C,MAAM;IAAEC,EAAE;IAAEC,KAAK;IAAEC,WAAW;IAAEC;EAAY,CAAC,GAAGT,KAAK;EACrD,MAAMU,KAAK,GAAGV,KAAK,CAACW,QAAQ,CAAE;IAAEC,IAAI,EAAEb;EAAK,CAAE,CAAC;EAC9C,MAAM,CAAEc,cAAc,EAAEC,iBAAiB,CAAE,GAC1CrB,QAAQ,CAILsB,SAAU,CAAC;EAEf,MAAMC,eAAe,GAAGxB,WAAW,CAChCyB,QAAgB,IACjBhB,QAAQ,CAAE;IACT,CAAEK,EAAE,GAAIW;EACT,CAAE,CAAC,EACJ,CAAEX,EAAE,EAAEL,QAAQ,CACf,CAAC;EAED,oBACCL,IAAA,CAACC,qBAAqB;IACrBqB,QAAQ,EAAG,CAAC,CAAElB,KAAK,CAACmB,OAAO,EAAED,QAAU;IACvCE,UAAU,EAAKH,QAAa,IAAM;MACjC,MAAMI,OAAO,GAAGrB,KAAK,CAACmB,OAAO,EAAEG,MAAM,GACpC;QACC,GAAGvB,IAAI;QACP,CAAEO,EAAE,GAAIW;MACT,CAAC,EACDjB,KACD,CAAC;MAED,IAAKqB,OAAO,EAAG;QACdP,iBAAiB,CAAE;UAClBX,IAAI,EAAE,SAAS;UACfkB;QACD,CAAE,CAAC;QACH;MACD;MAEAP,iBAAiB,CAAEC,SAAU,CAAC;IAC/B,CAAG;IACHF,cAAc,EAAGA,cAAgB;IACjCN,KAAK,EAAGA,KAAO;IACfC,WAAW,EAAGA,WAAa;IAC3BE,KAAK,EAAGA,KAAK,aAALA,KAAK,cAALA,KAAK,GAAI,EAAI;IACrBa,IAAI,EAAGd,WAAa;IACpBR,QAAQ,EAAGe,eAAiB;IAC5Bd,mBAAmB,EAAGA,mBAAqB;IAC3CC,IAAI,EAAGA,IAAM;IACbqB,MAAM,EACLpB,IAAI,gBACHR,IAAA,CAACP,yBAAyB;MAACoC,OAAO,EAAC,MAAM;MAAAC,QAAA,eACxC9B,IAAA,CAACV,IAAI;QAACkB,IAAI,EAAGA;MAAM,CAAE;IAAC,CACI,CAAC,GACzBW,SACJ;IACDV,MAAM,EACLA,MAAM,gBACLT,IAAA,CAACL,yBAAyB;MAACkC,OAAO,EAAC,SAAS;MAAAC,QAAA,EACzCrB;IAAM,CACkB,CAAC,GACzBU,SACJ;IACDY,qBAAqB;EAAA,CACrB,CAAC;AAEJ","ignoreList":[]}
+{"version":3,"names":["deepMerge","privateApis","useCallback","useState","unlock","jsx","_jsx","ValidatedInputControl","ValidatedText","data","field","onChange","hideLabelFromVision","type","prefix","suffix","label","placeholder","description","getValue","setValue","isValid","value","item","customValidity","setCustomValidity","undefined","onChangeControl","newValue","onValidateControl","message","custom","required","onValidate","help","__next40pxDefaultSize"],"sources":["@wordpress/dataviews/src/dataform-controls/utils/validated-input.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 { ValidatedInputControl } = unlock( privateApis );\n\nexport type DataFormValidatedTextControlProps< Item > =\n\tDataFormControlProps< Item > & {\n\t\t/**\n\t\t * The input type of the control.\n\t\t */\n\t\ttype?: 'text' | 'email' | 'tel' | 'url' | 'password';\n\t\t/**\n\t\t * Optional prefix element to display before the input.\n\t\t */\n\t\tprefix?: React.ReactElement;\n\t\t/**\n\t\t * Optional suffix element to display after the input.\n\t\t */\n\t\tsuffix?: React.ReactElement;\n\t};\n\nexport default function ValidatedText< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n\ttype,\n\tprefix,\n\tsuffix,\n}: DataFormValidatedTextControlProps< Item > ) {\n\tconst { label, placeholder, description, getValue, setValue, isValid } =\n\t\tfield;\n\tconst value = getValue( { item: data } );\n\tconst [ customValidity, setCustomValidity ] =\n\t\tuseState<\n\t\t\tReact.ComponentProps<\n\t\t\t\ttypeof ValidatedInputControl\n\t\t\t>[ 'customValidity' ]\n\t\t>( undefined );\n\n\tconst onChangeControl = useCallback(\n\t\t( newValue: string ) =>\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[ data, setValue, onChange ]\n\t);\n\n\tconst onValidateControl = useCallback(\n\t\t( newValue: any ) => {\n\t\t\tconst message = 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, isValid, setValue ]\n\t);\n\n\treturn (\n\t\t<ValidatedInputControl\n\t\t\trequired={ !! isValid?.required }\n\t\t\tonValidate={ onValidateControl }\n\t\t\tcustomValidity={ customValidity }\n\t\t\tlabel={ label }\n\t\t\tplaceholder={ placeholder }\n\t\t\tvalue={ value ?? '' }\n\t\t\thelp={ description }\n\t\t\tonChange={ onChangeControl }\n\t\t\thideLabelFromVision={ hideLabelFromVision }\n\t\t\ttype={ type }\n\t\t\tprefix={ prefix }\n\t\t\tsuffix={ suffix }\n\t\t\t__next40pxDefaultSize\n\t\t/>\n\t);\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,mBAAmB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE3C,MAAM;EAAEC;AAAsB,CAAC,GAAGH,MAAM,CAAEH,WAAY,CAAC;AAkBvD,eAAe,SAASO,aAAaA,CAAU;EAC9CC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC,mBAAmB;EACnBC,IAAI;EACJC,MAAM;EACNC;AAC0C,CAAC,EAAG;EAC9C,MAAM;IAAEC,KAAK;IAAEC,WAAW;IAAEC,WAAW;IAAEC,QAAQ;IAAEC,QAAQ;IAAEC;EAAQ,CAAC,GACrEX,KAAK;EACN,MAAMY,KAAK,GAAGH,QAAQ,CAAE;IAAEI,IAAI,EAAEd;EAAK,CAAE,CAAC;EACxC,MAAM,CAAEe,cAAc,EAAEC,iBAAiB,CAAE,GAC1CtB,QAAQ,CAILuB,SAAU,CAAC;EAEf,MAAMC,eAAe,GAAGzB,WAAW,CAChC0B,QAAgB,IACjBjB,QAAQ,CACPS,QAAQ,CAAE;IACTG,IAAI,EAAEd,IAAI;IACVa,KAAK,EAAEM;EACR,CAAE,CACH,CAAC,EACF,CAAEnB,IAAI,EAAEW,QAAQ,EAAET,QAAQ,CAC3B,CAAC;EAED,MAAMkB,iBAAiB,GAAG3B,WAAW,CAClC0B,QAAa,IAAM;IACpB,MAAME,OAAO,GAAGT,OAAO,EAAEU,MAAM,GAC9B/B,SAAS,CACRS,IAAI,EACJW,QAAQ,CAAE;MACTG,IAAI,EAAEd,IAAI;MACVa,KAAK,EAAEM;IACR,CAAE,CACH,CAAC,EACDlB,KACD,CAAC;IAED,IAAKoB,OAAO,EAAG;MACdL,iBAAiB,CAAE;QAClBZ,IAAI,EAAE,SAAS;QACfiB;MACD,CAAE,CAAC;MACH;IACD;IAEAL,iBAAiB,CAAEC,SAAU,CAAC;EAC/B,CAAC,EACD,CAAEjB,IAAI,EAAEC,KAAK,EAAEW,OAAO,EAAED,QAAQ,CACjC,CAAC;EAED,oBACCd,IAAA,CAACC,qBAAqB;IACrByB,QAAQ,EAAG,CAAC,CAAEX,OAAO,EAAEW,QAAU;IACjCC,UAAU,EAAGJ,iBAAmB;IAChCL,cAAc,EAAGA,cAAgB;IACjCR,KAAK,EAAGA,KAAO;IACfC,WAAW,EAAGA,WAAa;IAC3BK,KAAK,EAAGA,KAAK,aAALA,KAAK,cAALA,KAAK,GAAI,EAAI;IACrBY,IAAI,EAAGhB,WAAa;IACpBP,QAAQ,EAAGgB,eAAiB;IAC5Bf,mBAAmB,EAAGA,mBAAqB;IAC3CC,IAAI,EAAGA,IAAM;IACbC,MAAM,EAAGA,MAAQ;IACjBC,MAAM,EAAGA,MAAQ;IACjBoB,qBAAqB;EAAA,CACrB,CAAC;AAEJ","ignoreList":[]}

package/build-module/dataform-controls/utils/validated-number.js

@@ -0,0 +1,138 @@
+/**
+ * External dependencies
+ */
+import deepMerge from 'deepmerge';
+
+/**
+ * WordPress dependencies
+ */
+import { Flex, BaseControl, __experimentalNumberControl as NumberControl, privateApis } from '@wordpress/components';
+import { useCallback, useState } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { OPERATOR_BETWEEN } from '../../constants';
+import { unlock } from '../../lock-unlock';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const {
+  ValidatedNumberControl
+} = unlock(privateApis);
+function toNumberOrEmpty(value) {
+  if (value === '' || value === undefined) {
+    return '';
+  }
+  const number = Number(value);
+  return Number.isFinite(number) ? number : '';
+}
+function BetweenControls({
+  value,
+  onChange,
+  hideLabelFromVision,
+  step
+}) {
+  const [min = '', max = ''] = value;
+  const onChangeMin = useCallback(newValue => onChange([toNumberOrEmpty(newValue), max]), [onChange, max]);
+  const onChangeMax = useCallback(newValue => onChange([min, toNumberOrEmpty(newValue)]), [onChange, min]);
+  return /*#__PURE__*/_jsx(BaseControl, {
+    __nextHasNoMarginBottom: true,
+    help: __('The max. value must be greater than the min. value.'),
+    children: /*#__PURE__*/_jsxs(Flex, {
+      direction: "row",
+      gap: 4,
+      children: [/*#__PURE__*/_jsx(NumberControl, {
+        label: __('Min.'),
+        value: min,
+        max: max ? Number(max) - step : undefined,
+        onChange: onChangeMin,
+        __next40pxDefaultSize: true,
+        hideLabelFromVision: hideLabelFromVision,
+        step: step
+      }), /*#__PURE__*/_jsx(NumberControl, {
+        label: __('Max.'),
+        value: max,
+        min: min ? Number(min) + step : undefined,
+        onChange: onChangeMax,
+        __next40pxDefaultSize: true,
+        hideLabelFromVision: hideLabelFromVision,
+        step: step
+      })]
+    })
+  });
+}
+export default function ValidatedNumber({
+  data,
+  field,
+  onChange,
+  hideLabelFromVision,
+  operator,
+  decimals
+}) {
+  var _getValue;
+  const step = Math.pow(10, Math.abs(decimals) * -1);
+  const {
+    label,
+    description,
+    getValue,
+    setValue
+  } = field;
+  const value = (_getValue = getValue({
+    item: data
+  })) !== null && _getValue !== void 0 ? _getValue : '';
+  const [customValidity, setCustomValidity] = useState(undefined);
+  const onChangeControl = useCallback(newValue => {
+    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).
+      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, {
+      value: valueBetween,
+      onChange: onChangeBetweenControls,
+      hideLabelFromVision: hideLabelFromVision,
+      step: step
+    });
+  }
+  return /*#__PURE__*/_jsx(ValidatedNumberControl, {
+    required: !!field.isValid?.required,
+    onValidate: onValidateControl,
+    customValidity: customValidity,
+    label: label,
+    help: description,
+    value: value,
+    onChange: onChangeControl,
+    __next40pxDefaultSize: true,
+    hideLabelFromVision: hideLabelFromVision,
+    step: step
+  });
+}
+//# sourceMappingURL=validated-number.js.map

package/build-module/dataform-controls/utils/validated-number.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["deepMerge","Flex","BaseControl","__experimentalNumberControl","NumberControl","privateApis","useCallback","useState","__","OPERATOR_BETWEEN","unlock","jsx","_jsx","jsxs","_jsxs","ValidatedNumberControl","toNumberOrEmpty","value","undefined","number","Number","isFinite","BetweenControls","onChange","hideLabelFromVision","step","min","max","onChangeMin","newValue","onChangeMax","__nextHasNoMarginBottom","help","children","direction","gap","label","__next40pxDefaultSize","ValidatedNumber","data","field","operator","decimals","_getValue","Math","pow","abs","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/utils/validated-number.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 NumberBetween = [ number | string, number | string ];\n\nfunction toNumberOrEmpty( value?: string ) {\n\tif ( value === '' || value === undefined ) {\n\t\treturn '';\n\t}\n\tconst number = Number( value );\n\treturn Number.isFinite( number ) ? number : '';\n}\n\nfunction BetweenControls( {\n\tvalue,\n\tonChange,\n\thideLabelFromVision,\n\tstep,\n}: {\n\tvalue: NumberBetween;\n\tonChange: ( [ min, max ]: NumberBetween ) => void;\n\thideLabelFromVision?: boolean;\n\tstep: number;\n} ) {\n\tconst [ min = '', max = '' ] = value;\n\n\tconst onChangeMin = useCallback(\n\t\t( newValue: string | undefined ) =>\n\t\t\tonChange( [ toNumberOrEmpty( 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, toNumberOrEmpty( 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 ) - step : 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\tstep={ step }\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 ) + step : 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\tstep={ step }\n\t\t\t\t/>\n\t\t\t</Flex>\n\t\t</BaseControl>\n\t);\n}\n\nexport type DataFormValidatedNumberControlProps< Item > =\n\tDataFormControlProps< Item > & {\n\t\t/**\n\t\t * Number of decimals, acceps non-negative integer.\n\t\t */\n\t\tdecimals: number;\n\t};\n\nexport default function ValidatedNumber< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n\toperator,\n\tdecimals,\n}: DataFormValidatedNumberControlProps< Item > ) {\n\tconst step = Math.pow( 10, Math.abs( decimals ) * -1 );\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: NumberBetween ) => {\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: NumberBetween = [ '', '' ];\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 NumberBetween;\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\tstep={ step }\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\tstep={ step }\n\t\t/>\n\t);\n}\n"],"mappings":"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","ignoreList":[]}