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

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/dataforms-layouts/panel/dropdown.js

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __experimentalVStack as VStack, __experimentalHStack as HStack, __experimentalHeading as Heading, __experimentalSpacer as Spacer, Dropdown, Button } from '@wordpress/components';
-import { sprintf, __, _x } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { useMemo } from '@wordpress/element';
 import { closeSmall } from '@wordpress/icons';
 
@@ -13,6 +13,7 @@ import { closeSmall } from '@wordpress/icons';
 import { DataFormLayout } from '../data-form-layout';
 import { isCombinedField } from '../is-combined-field';
 import { DEFAULT_LAYOUT } from '../../normalize-form-fields';
+import SummaryButton from './summary-button';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 function DropdownHeader({
   title,
@@ -38,6 +39,7 @@ function DropdownHeader({
 }
 function PanelDropdown({
   fieldDefinition,
+  summaryFields,
   popoverAnchor,
   labelPosition = 'side',
   data,
@@ -75,21 +77,14 @@ function PanelDropdown({
     renderToggle: ({
       isOpen,
       onToggle
-    }) => /*#__PURE__*/_jsx(Button, {
-      className: "dataforms-layouts-panel__field-control",
-      size: "compact",
-      variant: ['none', 'top'].includes(labelPosition) ? 'link' : 'tertiary',
-      "aria-expanded": isOpen,
-      "aria-label": sprintf(
-      // translators: %s: Field name.
-      _x('Edit %s', 'field'), fieldLabel || ''),
-      onClick: onToggle,
+    }) => /*#__PURE__*/_jsx(SummaryButton, {
+      summaryFields: summaryFields,
+      data: data,
+      labelPosition: labelPosition,
+      fieldLabel: fieldLabel,
       disabled: fieldDefinition.readOnly === true,
-      accessibleWhenDisabled: true,
-      children: /*#__PURE__*/_jsx(fieldDefinition.render, {
-        item: data,
-        field: fieldDefinition
-      })
+      onClick: onToggle,
+      "aria-expanded": isOpen
     }),
     renderContent: ({
       onClose

package/build-module/dataforms-layouts/panel/dropdown.js.map

@@ -1 +1 @@
-{"version":3,"names":["__experimentalVStack","VStack","__experimentalHStack","HStack","__experimentalHeading","Heading","__experimentalSpacer","Spacer","Dropdown","Button","sprintf","__","_x","useMemo","closeSmall","DataFormLayout","isCombinedField","DEFAULT_LAYOUT","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","DropdownHeader","title","onClose","className","spacing","children","alignment","level","size","label","icon","onClick","PanelDropdown","fieldDefinition","popoverAnchor","labelPosition","data","onChange","field","fieldLabel","form","layout","fields","id","popoverProps","anchor","placement","offset","shift","contentClassName","focusOnMount","toggleProps","variant","tooltipPosition","renderToggle","isOpen","onToggle","includes","disabled","readOnly","accessibleWhenDisabled","render","item","renderContent","FieldLayout","nestedField","_form$fields","hideLabelFromVision","length"],"sources":["@wordpress/dataviews/src/dataforms-layouts/panel/dropdown.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalVStack as VStack,\n\t__experimentalHStack as HStack,\n\t__experimentalHeading as Heading,\n\t__experimentalSpacer as Spacer,\n\tDropdown,\n\tButton,\n} from '@wordpress/components';\nimport { sprintf, __, _x } from '@wordpress/i18n';\nimport { useMemo } from '@wordpress/element';\nimport { closeSmall } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport type { Form, FormField, NormalizedField } from '../../types';\nimport { DataFormLayout } from '../data-form-layout';\nimport { isCombinedField } from '../is-combined-field';\nimport { DEFAULT_LAYOUT } from '../../normalize-form-fields';\n\nfunction DropdownHeader( {\n\ttitle,\n\tonClose,\n}: {\n\ttitle?: string;\n\tonClose: () => void;\n} ) {\n\treturn (\n\t\t<VStack\n\t\t\tclassName=\"dataforms-layouts-panel__dropdown-header\"\n\t\t\tspacing={ 4 }\n\t\t>\n\t\t\t<HStack alignment=\"center\">\n\t\t\t\t{ title && (\n\t\t\t\t\t<Heading level={ 2 } size={ 13 }>\n\t\t\t\t\t\t{ title }\n\t\t\t\t\t</Heading>\n\t\t\t\t) }\n\t\t\t\t<Spacer />\n\t\t\t\t{ onClose && (\n\t\t\t\t\t<Button\n\t\t\t\t\t\tlabel={ __( 'Close' ) }\n\t\t\t\t\t\ticon={ closeSmall }\n\t\t\t\t\t\tonClick={ onClose }\n\t\t\t\t\t\tsize=\"small\"\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t</HStack>\n\t\t</VStack>\n\t);\n}\n\nfunction PanelDropdown< Item >( {\n\tfieldDefinition,\n\tpopoverAnchor,\n\tlabelPosition = 'side',\n\tdata,\n\tonChange,\n\tfield,\n}: {\n\tfieldDefinition: NormalizedField< Item >;\n\tpopoverAnchor: HTMLElement | null;\n\tlabelPosition: 'side' | 'top' | 'none';\n\tdata: Item;\n\tonChange: ( value: any ) => void;\n\tfield: FormField;\n} ) {\n\tconst fieldLabel = isCombinedField( field )\n\t\t? field.label\n\t\t: fieldDefinition?.label;\n\n\tconst form: Form = useMemo(\n\t\t(): Form => ( {\n\t\t\tlayout: DEFAULT_LAYOUT,\n\t\t\tfields: isCombinedField( field )\n\t\t\t\t? field.children\n\t\t\t\t: // If not explicit children return the field id itself.\n\t\t\t\t  [ { id: field.id } ],\n\t\t} ),\n\t\t[ field ]\n\t);\n\n\t// Memoize popoverProps to avoid returning a new object every time.\n\tconst popoverProps = useMemo(\n\t\t() => ( {\n\t\t\t// Anchor the popover to the middle of the entire row so that it doesn't\n\t\t\t// move around when the label changes.\n\t\t\tanchor: popoverAnchor,\n\t\t\tplacement: 'left-start',\n\t\t\toffset: 36,\n\t\t\tshift: true,\n\t\t} ),\n\t\t[ popoverAnchor ]\n\t);\n\n\treturn (\n\t\t<Dropdown\n\t\t\tcontentClassName=\"dataforms-layouts-panel__field-dropdown\"\n\t\t\tpopoverProps={ popoverProps }\n\t\t\tfocusOnMount\n\t\t\ttoggleProps={ {\n\t\t\t\tsize: 'compact',\n\t\t\t\tvariant: 'tertiary',\n\t\t\t\ttooltipPosition: 'middle left',\n\t\t\t} }\n\t\t\trenderToggle={ ( { isOpen, onToggle } ) => (\n\t\t\t\t<Button\n\t\t\t\t\tclassName=\"dataforms-layouts-panel__field-control\"\n\t\t\t\t\tsize=\"compact\"\n\t\t\t\t\tvariant={\n\t\t\t\t\t\t[ 'none', 'top' ].includes( labelPosition )\n\t\t\t\t\t\t\t? 'link'\n\t\t\t\t\t\t\t: 'tertiary'\n\t\t\t\t\t}\n\t\t\t\t\taria-expanded={ isOpen }\n\t\t\t\t\taria-label={ sprintf(\n\t\t\t\t\t\t// translators: %s: Field name.\n\t\t\t\t\t\t_x( 'Edit %s', 'field' ),\n\t\t\t\t\t\tfieldLabel || ''\n\t\t\t\t\t) }\n\t\t\t\t\tonClick={ onToggle }\n\t\t\t\t\tdisabled={ fieldDefinition.readOnly === true }\n\t\t\t\t\taccessibleWhenDisabled\n\t\t\t\t>\n\t\t\t\t\t<fieldDefinition.render\n\t\t\t\t\t\titem={ data }\n\t\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t\t/>\n\t\t\t\t</Button>\n\t\t\t) }\n\t\t\trenderContent={ ( { onClose } ) => (\n\t\t\t\t<>\n\t\t\t\t\t<DropdownHeader title={ fieldLabel } onClose={ onClose } />\n\t\t\t\t\t<DataFormLayout\n\t\t\t\t\t\tdata={ data }\n\t\t\t\t\t\tform={ form }\n\t\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ ( FieldLayout, nestedField ) => (\n\t\t\t\t\t\t\t<FieldLayout\n\t\t\t\t\t\t\t\tkey={ nestedField.id }\n\t\t\t\t\t\t\t\tdata={ data }\n\t\t\t\t\t\t\t\tfield={ nestedField }\n\t\t\t\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\t\t\t\thideLabelFromVision={\n\t\t\t\t\t\t\t\t\t( form?.fields ?? [] ).length < 2\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t) }\n\t\t\t\t\t</DataFormLayout>\n\t\t\t\t</>\n\t\t\t) }\n\t\t/>\n\t);\n}\n\nexport default PanelDropdown;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__experimentalVStack","VStack","__experimentalHStack","HStack","__experimentalHeading","Heading","__experimentalSpacer","Spacer","Dropdown","Button","__","useMemo","closeSmall","DataFormLayout","isCombinedField","DEFAULT_LAYOUT","SummaryButton","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","DropdownHeader","title","onClose","className","spacing","children","alignment","level","size","label","icon","onClick","PanelDropdown","fieldDefinition","summaryFields","popoverAnchor","labelPosition","data","onChange","field","fieldLabel","form","layout","fields","id","popoverProps","anchor","placement","offset","shift","contentClassName","focusOnMount","toggleProps","variant","tooltipPosition","renderToggle","isOpen","onToggle","disabled","readOnly","renderContent","FieldLayout","nestedField","_form$fields","hideLabelFromVision","length"],"sources":["@wordpress/dataviews/src/dataforms-layouts/panel/dropdown.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalVStack as VStack,\n\t__experimentalHStack as HStack,\n\t__experimentalHeading as Heading,\n\t__experimentalSpacer as Spacer,\n\tDropdown,\n\tButton,\n} from '@wordpress/components';\nimport { __ } from '@wordpress/i18n';\nimport { useMemo } from '@wordpress/element';\nimport { closeSmall } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport type { Form, FormField, NormalizedField } from '../../types';\nimport { DataFormLayout } from '../data-form-layout';\nimport { isCombinedField } from '../is-combined-field';\nimport { DEFAULT_LAYOUT } from '../../normalize-form-fields';\nimport SummaryButton from './summary-button';\n\nfunction DropdownHeader( {\n\ttitle,\n\tonClose,\n}: {\n\ttitle?: string;\n\tonClose: () => void;\n} ) {\n\treturn (\n\t\t<VStack\n\t\t\tclassName=\"dataforms-layouts-panel__dropdown-header\"\n\t\t\tspacing={ 4 }\n\t\t>\n\t\t\t<HStack alignment=\"center\">\n\t\t\t\t{ title && (\n\t\t\t\t\t<Heading level={ 2 } size={ 13 }>\n\t\t\t\t\t\t{ title }\n\t\t\t\t\t</Heading>\n\t\t\t\t) }\n\t\t\t\t<Spacer />\n\t\t\t\t{ onClose && (\n\t\t\t\t\t<Button\n\t\t\t\t\t\tlabel={ __( 'Close' ) }\n\t\t\t\t\t\ticon={ closeSmall }\n\t\t\t\t\t\tonClick={ onClose }\n\t\t\t\t\t\tsize=\"small\"\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t</HStack>\n\t\t</VStack>\n\t);\n}\n\nfunction PanelDropdown< Item >( {\n\tfieldDefinition,\n\tsummaryFields,\n\tpopoverAnchor,\n\tlabelPosition = 'side',\n\tdata,\n\tonChange,\n\tfield,\n}: {\n\tfieldDefinition: NormalizedField< Item >;\n\tsummaryFields: NormalizedField< Item >[];\n\tpopoverAnchor: HTMLElement | null;\n\tlabelPosition: 'side' | 'top' | 'none';\n\tdata: Item;\n\tonChange: ( value: any ) => void;\n\tfield: FormField;\n} ) {\n\tconst fieldLabel = isCombinedField( field )\n\t\t? field.label\n\t\t: fieldDefinition?.label;\n\n\tconst form: Form = useMemo(\n\t\t(): Form => ( {\n\t\t\tlayout: DEFAULT_LAYOUT,\n\t\t\tfields: isCombinedField( field )\n\t\t\t\t? field.children\n\t\t\t\t: // If not explicit children return the field id itself.\n\t\t\t\t  [ { id: field.id } ],\n\t\t} ),\n\t\t[ field ]\n\t);\n\n\t// Memoize popoverProps to avoid returning a new object every time.\n\tconst popoverProps = useMemo(\n\t\t() => ( {\n\t\t\t// Anchor the popover to the middle of the entire row so that it doesn't\n\t\t\t// move around when the label changes.\n\t\t\tanchor: popoverAnchor,\n\t\t\tplacement: 'left-start',\n\t\t\toffset: 36,\n\t\t\tshift: true,\n\t\t} ),\n\t\t[ popoverAnchor ]\n\t);\n\n\treturn (\n\t\t<Dropdown\n\t\t\tcontentClassName=\"dataforms-layouts-panel__field-dropdown\"\n\t\t\tpopoverProps={ popoverProps }\n\t\t\tfocusOnMount\n\t\t\ttoggleProps={ {\n\t\t\t\tsize: 'compact',\n\t\t\t\tvariant: 'tertiary',\n\t\t\t\ttooltipPosition: 'middle left',\n\t\t\t} }\n\t\t\trenderToggle={ ( { isOpen, onToggle } ) => (\n\t\t\t\t<SummaryButton\n\t\t\t\t\tsummaryFields={ summaryFields }\n\t\t\t\t\tdata={ data }\n\t\t\t\t\tlabelPosition={ labelPosition }\n\t\t\t\t\tfieldLabel={ fieldLabel }\n\t\t\t\t\tdisabled={ fieldDefinition.readOnly === true }\n\t\t\t\t\tonClick={ onToggle }\n\t\t\t\t\taria-expanded={ isOpen }\n\t\t\t\t/>\n\t\t\t) }\n\t\t\trenderContent={ ( { onClose } ) => (\n\t\t\t\t<>\n\t\t\t\t\t<DropdownHeader title={ fieldLabel } onClose={ onClose } />\n\t\t\t\t\t<DataFormLayout\n\t\t\t\t\t\tdata={ data }\n\t\t\t\t\t\tform={ form }\n\t\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ ( FieldLayout, nestedField ) => (\n\t\t\t\t\t\t\t<FieldLayout\n\t\t\t\t\t\t\t\tkey={ nestedField.id }\n\t\t\t\t\t\t\t\tdata={ data }\n\t\t\t\t\t\t\t\tfield={ nestedField }\n\t\t\t\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\t\t\t\thideLabelFromVision={\n\t\t\t\t\t\t\t\t\t( form?.fields ?? [] ).length < 2\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t) }\n\t\t\t\t\t</DataFormLayout>\n\t\t\t\t</>\n\t\t\t) }\n\t\t/>\n\t);\n}\n\nexport default PanelDropdown;\n"],"mappings":"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","ignoreList":[]}

package/build-module/dataforms-layouts/panel/index.js

@@ -27,18 +27,29 @@ export default function FormPanelField({
   const {
     fields
   } = useContext(DataFormContext);
-  const fieldDefinition = fields.find(_field => {
-    // Default to the first simple child if it is a combined field.
-    if (isCombinedField(field)) {
-      const simpleChildren = field.children.filter(child => typeof child === 'string' || !isCombinedField(child));
-      if (simpleChildren.length === 0) {
-        return false;
-      }
-      const firstChildFieldId = typeof simpleChildren[0] === 'string' ? simpleChildren[0] : simpleChildren[0].id;
-      return _field.id === firstChildFieldId;
+  const getSummaryFields = () => {
+    if (!isCombinedField(field)) {
+      const fieldDef = fields.find(_field => _field.id === field.id);
+      return fieldDef ? [fieldDef] : [];
     }
-    return _field.id === field.id;
-  });
+
+    // Use summary field(s) if specified for combined fields
+    if (field.summary) {
+      const summaryIds = Array.isArray(field.summary) ? field.summary : [field.summary];
+      return summaryIds.map(summaryId => fields.find(_field => _field.id === summaryId)).filter(_field => _field !== undefined);
+    }
+
+    // Default to the first simple child
+    const simpleChildren = field.children.filter(child => typeof child === 'string' || !isCombinedField(child));
+    if (simpleChildren.length === 0) {
+      return [];
+    }
+    const firstChildFieldId = typeof simpleChildren[0] === 'string' ? simpleChildren[0] : simpleChildren[0].id;
+    const fieldDef = fields.find(_field => _field.id === firstChildFieldId);
+    return fieldDef ? [fieldDef] : [];
+  };
+  const summaryFields = getSummaryFields();
+  const fieldDefinition = summaryFields[0]; // For backward compatibility
 
   // Use internal state instead of a ref to make sure that the component
   // re-renders when the popover's anchor updates.
@@ -56,6 +67,7 @@ export default function FormPanelField({
   const renderedControl = layout.openAs === 'modal' ? /*#__PURE__*/_jsx(PanelModal, {
     field: field,
     fieldDefinition: fieldDefinition,
+    summaryFields: summaryFields,
     data: data,
     onChange: onChange,
     labelPosition: labelPosition
@@ -63,6 +75,7 @@ export default function FormPanelField({
     field: field,
     popoverAnchor: popoverAnchor,
     fieldDefinition: fieldDefinition,
+    summaryFields: summaryFields,
     data: data,
     onChange: onChange,
     labelPosition: labelPosition

package/build-module/dataforms-layouts/panel/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["clsx","__experimentalVStack","VStack","__experimentalHStack","HStack","useState","useContext","DataFormContext","isCombinedField","normalizeLayout","PanelDropdown","PanelModal","jsx","_jsx","jsxs","_jsxs","FormPanelField","data","field","onChange","fields","fieldDefinition","find","_field","simpleChildren","children","filter","child","length","firstChildFieldId","id","popoverAnchor","setPopoverAnchor","layout","type","labelPosition","labelClassName","fieldLabel","label","renderedControl","openAs","className","spacing","style","paddingBottom","ref"],"sources":["@wordpress/dataviews/src/dataforms-layouts/panel/index.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport clsx from 'clsx';\n\n/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalVStack as VStack,\n\t__experimentalHStack as HStack,\n} from '@wordpress/components';\nimport { useState, useContext } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport type {\n\tFieldLayoutProps,\n\tNormalizedPanelLayout,\n\tSimpleFormField,\n} from '../../types';\nimport DataFormContext from '../../components/dataform-context';\nimport { isCombinedField } from '../is-combined-field';\nimport { normalizeLayout } from '../../normalize-form-fields';\nimport PanelDropdown from './dropdown';\nimport PanelModal from './modal';\n\nexport default function FormPanelField< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n}: FieldLayoutProps< Item > ) {\n\tconst { fields } = useContext( DataFormContext );\n\tconst fieldDefinition = fields.find( ( _field ) => {\n\t\t// Default to the first simple child if it is a combined field.\n\t\tif ( isCombinedField( field ) ) {\n\t\t\tconst simpleChildren = field.children.filter(\n\t\t\t\t( child ): child is string | SimpleFormField =>\n\t\t\t\t\ttypeof child === 'string' || ! isCombinedField( child )\n\t\t\t);\n\n\t\t\tif ( simpleChildren.length === 0 ) {\n\t\t\t\treturn false;\n\t\t\t}\n\n\t\t\tconst firstChildFieldId =\n\t\t\t\ttypeof simpleChildren[ 0 ] === 'string'\n\t\t\t\t\t? simpleChildren[ 0 ]\n\t\t\t\t\t: simpleChildren[ 0 ].id;\n\n\t\t\treturn _field.id === firstChildFieldId;\n\t\t}\n\n\t\treturn _field.id === field.id;\n\t} );\n\n\t// Use internal state instead of a ref to make sure that the component\n\t// re-renders when the popover's anchor updates.\n\tconst [ popoverAnchor, setPopoverAnchor ] = useState< HTMLElement | null >(\n\t\tnull\n\t);\n\n\tif ( ! fieldDefinition ) {\n\t\treturn null;\n\t}\n\n\tconst layout: NormalizedPanelLayout = normalizeLayout( {\n\t\t...field.layout,\n\t\ttype: 'panel',\n\t} ) as NormalizedPanelLayout;\n\n\tconst labelPosition = layout.labelPosition;\n\tconst labelClassName = clsx(\n\t\t'dataforms-layouts-panel__field-label',\n\t\t`dataforms-layouts-panel__field-label--label-position-${ labelPosition }`\n\t);\n\tconst fieldLabel = isCombinedField( field )\n\t\t? field.label\n\t\t: fieldDefinition?.label;\n\n\tconst renderedControl =\n\t\tlayout.openAs === 'modal' ? (\n\t\t\t<PanelModal\n\t\t\t\tfield={ field }\n\t\t\t\tfieldDefinition={ fieldDefinition }\n\t\t\t\tdata={ data }\n\t\t\t\tonChange={ onChange }\n\t\t\t\tlabelPosition={ labelPosition }\n\t\t\t/>\n\t\t) : (\n\t\t\t<PanelDropdown\n\t\t\t\tfield={ field }\n\t\t\t\tpopoverAnchor={ popoverAnchor }\n\t\t\t\tfieldDefinition={ fieldDefinition }\n\t\t\t\tdata={ data }\n\t\t\t\tonChange={ onChange }\n\t\t\t\tlabelPosition={ labelPosition }\n\t\t\t/>\n\t\t);\n\n\tif ( labelPosition === 'top' ) {\n\t\treturn (\n\t\t\t<VStack className=\"dataforms-layouts-panel__field\" spacing={ 0 }>\n\t\t\t\t<div\n\t\t\t\t\tclassName={ labelClassName }\n\t\t\t\t\tstyle={ { paddingBottom: 0 } }\n\t\t\t\t>\n\t\t\t\t\t{ fieldLabel }\n\t\t\t\t</div>\n\t\t\t\t<div className=\"dataforms-layouts-panel__field-control\">\n\t\t\t\t\t{ renderedControl }\n\t\t\t\t</div>\n\t\t\t</VStack>\n\t\t);\n\t}\n\n\tif ( labelPosition === 'none' ) {\n\t\treturn (\n\t\t\t<div className=\"dataforms-layouts-panel__field\">\n\t\t\t\t{ renderedControl }\n\t\t\t</div>\n\t\t);\n\t}\n\n\t// Defaults to label position side.\n\treturn (\n\t\t<HStack\n\t\t\tref={ setPopoverAnchor }\n\t\t\tclassName=\"dataforms-layouts-panel__field\"\n\t\t>\n\t\t\t<div className={ labelClassName }>{ fieldLabel }</div>\n\t\t\t<div className=\"dataforms-layouts-panel__field-control\">\n\t\t\t\t{ renderedControl }\n\t\t\t</div>\n\t\t</HStack>\n\t);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["clsx","__experimentalVStack","VStack","__experimentalHStack","HStack","useState","useContext","DataFormContext","isCombinedField","normalizeLayout","PanelDropdown","PanelModal","jsx","_jsx","jsxs","_jsxs","FormPanelField","data","field","onChange","fields","getSummaryFields","fieldDef","find","_field","id","summary","summaryIds","Array","isArray","map","summaryId","filter","undefined","simpleChildren","children","child","length","firstChildFieldId","summaryFields","fieldDefinition","popoverAnchor","setPopoverAnchor","layout","type","labelPosition","labelClassName","fieldLabel","label","renderedControl","openAs","className","spacing","style","paddingBottom","ref"],"sources":["@wordpress/dataviews/src/dataforms-layouts/panel/index.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport clsx from 'clsx';\n\n/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalVStack as VStack,\n\t__experimentalHStack as HStack,\n} from '@wordpress/components';\nimport { useState, useContext } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport type {\n\tFieldLayoutProps,\n\tNormalizedPanelLayout,\n\tSimpleFormField,\n} from '../../types';\nimport DataFormContext from '../../components/dataform-context';\nimport { isCombinedField } from '../is-combined-field';\nimport { normalizeLayout } from '../../normalize-form-fields';\nimport PanelDropdown from './dropdown';\nimport PanelModal from './modal';\n\nexport default function FormPanelField< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n}: FieldLayoutProps< Item > ) {\n\tconst { fields } = useContext( DataFormContext );\n\tconst getSummaryFields = () => {\n\t\tif ( ! isCombinedField( field ) ) {\n\t\t\tconst fieldDef = fields.find(\n\t\t\t\t( _field ) => _field.id === field.id\n\t\t\t);\n\t\t\treturn fieldDef ? [ fieldDef ] : [];\n\t\t}\n\n\t\t// Use summary field(s) if specified for combined fields\n\t\tif ( field.summary ) {\n\t\t\tconst summaryIds = Array.isArray( field.summary )\n\t\t\t\t? field.summary\n\t\t\t\t: [ field.summary ];\n\t\t\treturn summaryIds\n\t\t\t\t.map( ( summaryId ) =>\n\t\t\t\t\tfields.find( ( _field ) => _field.id === summaryId )\n\t\t\t\t)\n\t\t\t\t.filter( ( _field ) => _field !== undefined );\n\t\t}\n\n\t\t// Default to the first simple child\n\t\tconst simpleChildren = field.children.filter(\n\t\t\t( child ): child is string | SimpleFormField =>\n\t\t\t\ttypeof child === 'string' || ! isCombinedField( child )\n\t\t);\n\n\t\tif ( simpleChildren.length === 0 ) {\n\t\t\treturn [];\n\t\t}\n\n\t\tconst firstChildFieldId =\n\t\t\ttypeof simpleChildren[ 0 ] === 'string'\n\t\t\t\t? simpleChildren[ 0 ]\n\t\t\t\t: simpleChildren[ 0 ].id;\n\n\t\tconst fieldDef = fields.find(\n\t\t\t( _field ) => _field.id === firstChildFieldId\n\t\t);\n\t\treturn fieldDef ? [ fieldDef ] : [];\n\t};\n\n\tconst summaryFields = getSummaryFields();\n\tconst fieldDefinition = summaryFields[ 0 ]; // For backward compatibility\n\n\t// Use internal state instead of a ref to make sure that the component\n\t// re-renders when the popover's anchor updates.\n\tconst [ popoverAnchor, setPopoverAnchor ] = useState< HTMLElement | null >(\n\t\tnull\n\t);\n\n\tif ( ! fieldDefinition ) {\n\t\treturn null;\n\t}\n\n\tconst layout: NormalizedPanelLayout = normalizeLayout( {\n\t\t...field.layout,\n\t\ttype: 'panel',\n\t} ) as NormalizedPanelLayout;\n\n\tconst labelPosition = layout.labelPosition;\n\tconst labelClassName = clsx(\n\t\t'dataforms-layouts-panel__field-label',\n\t\t`dataforms-layouts-panel__field-label--label-position-${ labelPosition }`\n\t);\n\tconst fieldLabel = isCombinedField( field )\n\t\t? field.label\n\t\t: fieldDefinition?.label;\n\n\tconst renderedControl =\n\t\tlayout.openAs === 'modal' ? (\n\t\t\t<PanelModal\n\t\t\t\tfield={ field }\n\t\t\t\tfieldDefinition={ fieldDefinition }\n\t\t\t\tsummaryFields={ summaryFields }\n\t\t\t\tdata={ data }\n\t\t\t\tonChange={ onChange }\n\t\t\t\tlabelPosition={ labelPosition }\n\t\t\t/>\n\t\t) : (\n\t\t\t<PanelDropdown\n\t\t\t\tfield={ field }\n\t\t\t\tpopoverAnchor={ popoverAnchor }\n\t\t\t\tfieldDefinition={ fieldDefinition }\n\t\t\t\tsummaryFields={ summaryFields }\n\t\t\t\tdata={ data }\n\t\t\t\tonChange={ onChange }\n\t\t\t\tlabelPosition={ labelPosition }\n\t\t\t/>\n\t\t);\n\n\tif ( labelPosition === 'top' ) {\n\t\treturn (\n\t\t\t<VStack className=\"dataforms-layouts-panel__field\" spacing={ 0 }>\n\t\t\t\t<div\n\t\t\t\t\tclassName={ labelClassName }\n\t\t\t\t\tstyle={ { paddingBottom: 0 } }\n\t\t\t\t>\n\t\t\t\t\t{ fieldLabel }\n\t\t\t\t</div>\n\t\t\t\t<div className=\"dataforms-layouts-panel__field-control\">\n\t\t\t\t\t{ renderedControl }\n\t\t\t\t</div>\n\t\t\t</VStack>\n\t\t);\n\t}\n\n\tif ( labelPosition === 'none' ) {\n\t\treturn (\n\t\t\t<div className=\"dataforms-layouts-panel__field\">\n\t\t\t\t{ renderedControl }\n\t\t\t</div>\n\t\t);\n\t}\n\n\t// Defaults to label position side.\n\treturn (\n\t\t<HStack\n\t\t\tref={ setPopoverAnchor }\n\t\t\tclassName=\"dataforms-layouts-panel__field\"\n\t\t>\n\t\t\t<div className={ labelClassName }>{ fieldLabel }</div>\n\t\t\t<div className=\"dataforms-layouts-panel__field-control\">\n\t\t\t\t{ renderedControl }\n\t\t\t</div>\n\t\t</HStack>\n\t);\n}\n"],"mappings":"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","ignoreList":[]}

package/build-module/dataforms-layouts/panel/modal.js

@@ -1,8 +1,13 @@
+/**
+ * External dependencies
+ */
+import deepMerge from 'deepmerge';
+
 /**
  * WordPress dependencies
  */
 import { __experimentalHStack as HStack, __experimentalSpacer as Spacer, Button, Modal } from '@wordpress/components';
-import { __, sprintf, _x } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { useState, useMemo } from '@wordpress/element';
 
 /**
@@ -12,6 +17,7 @@ import { useState, useMemo } from '@wordpress/element';
 import { DataFormLayout } from '../data-form-layout';
 import { isCombinedField } from '../is-combined-field';
 import { DEFAULT_LAYOUT } from '../../normalize-form-fields';
+import SummaryButton from './summary-button';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 function ModalContent({
   data,
@@ -21,21 +27,15 @@ function ModalContent({
   onClose
 }) {
   const [changes, setChanges] = useState({});
+  const modalData = useMemo(() => {
+    return deepMerge(data, changes);
+  }, [data, changes]);
   const onApply = () => {
     onChange(changes);
     onClose();
   };
-  const handleOnChange = value => {
-    setChanges(prev => ({
-      ...prev,
-      ...value
-    }));
-  };
-
-  // Merge original data with local changes for display
-  const displayData = {
-    ...data,
-    ...changes
+  const handleOnChange = newValue => {
+    setChanges(prev => deepMerge(prev, newValue));
   };
   return /*#__PURE__*/_jsxs(Modal, {
     className: "dataforms-layouts-panel__modal",
@@ -44,13 +44,13 @@ function ModalContent({
     title: fieldLabel,
     size: "medium",
     children: [/*#__PURE__*/_jsx(DataFormLayout, {
-      data: displayData,
+      data: modalData,
       form: form,
       onChange: handleOnChange,
       children: (FieldLayout, nestedField) => {
         var _form$fields;
         return /*#__PURE__*/_jsx(FieldLayout, {
-          data: displayData,
+          data: modalData,
           field: nestedField,
           onChange: handleOnChange,
           hideLabelFromVision: ((_form$fields = form?.fields) !== null && _form$fields !== void 0 ? _form$fields : []).length < 2
@@ -75,6 +75,7 @@ function ModalContent({
 }
 function PanelModal({
   fieldDefinition,
+  summaryFields,
   labelPosition,
   data,
   onChange,
@@ -91,21 +92,14 @@ function PanelModal({
     }]
   }), [field]);
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(Button, {
-      className: "dataforms-layouts-modal__field-control",
-      size: "compact",
-      variant: ['none', 'top'].includes(labelPosition) ? 'link' : 'tertiary',
-      "aria-expanded": isOpen,
-      "aria-label": sprintf(
-      // translators: %s: Field name.
-      _x('Edit %s', 'field'), fieldLabel || ''),
-      onClick: () => setIsOpen(true),
+    children: [/*#__PURE__*/_jsx(SummaryButton, {
+      summaryFields: summaryFields,
+      data: data,
+      labelPosition: labelPosition,
+      fieldLabel: fieldLabel,
       disabled: fieldDefinition.readOnly === true,
-      accessibleWhenDisabled: true,
-      children: /*#__PURE__*/_jsx(fieldDefinition.render, {
-        item: data,
-        field: fieldDefinition
-      })
+      onClick: () => setIsOpen(true),
+      "aria-expanded": isOpen
     }), isOpen && /*#__PURE__*/_jsx(ModalContent, {
       data: data,
       form: form,

package/build-module/dataforms-layouts/panel/modal.js.map

@@ -1 +1 @@
-{"version":3,"names":["__experimentalHStack","HStack","__experimentalSpacer","Spacer","Button","Modal","__","sprintf","_x","useState","useMemo","DataFormLayout","isCombinedField","DEFAULT_LAYOUT","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","ModalContent","data","form","fieldLabel","onChange","onClose","changes","setChanges","onApply","handleOnChange","value","prev","displayData","className","onRequestClose","isFullScreen","title","size","children","FieldLayout","nestedField","_form$fields","field","hideLabelFromVision","fields","length","id","spacing","variant","onClick","__next40pxDefaultSize","PanelModal","fieldDefinition","labelPosition","isOpen","setIsOpen","label","layout","includes","disabled","readOnly","accessibleWhenDisabled","render","item"],"sources":["@wordpress/dataviews/src/dataforms-layouts/panel/modal.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalHStack as HStack,\n\t__experimentalSpacer as Spacer,\n\tButton,\n\tModal,\n} from '@wordpress/components';\nimport { __, sprintf, _x } from '@wordpress/i18n';\nimport { useState, useMemo } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport type { Form, FormField, NormalizedField } from '../../types';\nimport { DataFormLayout } from '../data-form-layout';\nimport { isCombinedField } from '../is-combined-field';\nimport { DEFAULT_LAYOUT } from '../../normalize-form-fields';\n\nfunction ModalContent< Item >( {\n\tdata,\n\tform,\n\tfieldLabel,\n\tonChange,\n\tonClose,\n}: {\n\tdata: Item;\n\tform: Form;\n\tfieldLabel: string;\n\tonChange: ( data: Partial< Item > ) => void;\n\tonClose: () => void;\n} ) {\n\tconst [ changes, setChanges ] = useState< Partial< Item > >( {} );\n\n\tconst onApply = () => {\n\t\tonChange( changes );\n\t\tonClose();\n\t};\n\n\tconst handleOnChange = ( value: Partial< Item > ) => {\n\t\tsetChanges( ( prev ) => ( { ...prev, ...value } ) );\n\t};\n\n\t// Merge original data with local changes for display\n\tconst displayData = { ...data, ...changes };\n\n\treturn (\n\t\t<Modal\n\t\t\tclassName=\"dataforms-layouts-panel__modal\"\n\t\t\tonRequestClose={ onClose }\n\t\t\tisFullScreen={ false }\n\t\t\ttitle={ fieldLabel }\n\t\t\tsize=\"medium\"\n\t\t>\n\t\t\t<DataFormLayout\n\t\t\t\tdata={ displayData }\n\t\t\t\tform={ form }\n\t\t\t\tonChange={ handleOnChange }\n\t\t\t>\n\t\t\t\t{ ( FieldLayout, nestedField ) => (\n\t\t\t\t\t<FieldLayout\n\t\t\t\t\t\tkey={ nestedField.id }\n\t\t\t\t\t\tdata={ displayData }\n\t\t\t\t\t\tfield={ nestedField }\n\t\t\t\t\t\tonChange={ handleOnChange }\n\t\t\t\t\t\thideLabelFromVision={\n\t\t\t\t\t\t\t( form?.fields ?? [] ).length < 2\n\t\t\t\t\t\t}\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t</DataFormLayout>\n\t\t\t<HStack\n\t\t\t\tclassName=\"dataforms-layouts-panel__modal-footer\"\n\t\t\t\tspacing={ 3 }\n\t\t\t>\n\t\t\t\t<Spacer />\n\t\t\t\t<Button\n\t\t\t\t\tvariant=\"tertiary\"\n\t\t\t\t\tonClick={ onClose }\n\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t>\n\t\t\t\t\t{ __( 'Cancel' ) }\n\t\t\t\t</Button>\n\t\t\t\t<Button\n\t\t\t\t\tvariant=\"primary\"\n\t\t\t\t\tonClick={ onApply }\n\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t>\n\t\t\t\t\t{ __( 'Apply' ) }\n\t\t\t\t</Button>\n\t\t\t</HStack>\n\t\t</Modal>\n\t);\n}\n\nfunction PanelModal< Item >( {\n\tfieldDefinition,\n\tlabelPosition,\n\tdata,\n\tonChange,\n\tfield,\n}: {\n\tfieldDefinition: NormalizedField< Item >;\n\tlabelPosition: 'side' | 'top' | 'none';\n\tdata: Item;\n\tonChange: ( value: any ) => void;\n\tfield: FormField;\n} ) {\n\tconst [ isOpen, setIsOpen ] = useState( false );\n\n\tconst fieldLabel = isCombinedField( field )\n\t\t? field.label\n\t\t: fieldDefinition?.label;\n\n\tconst form: Form = useMemo(\n\t\t(): Form => ( {\n\t\t\tlayout: DEFAULT_LAYOUT,\n\t\t\tfields: isCombinedField( field )\n\t\t\t\t? field.children\n\t\t\t\t: // If not explicit children return the field id itself.\n\t\t\t\t  [ { id: field.id } ],\n\t\t} ),\n\t\t[ field ]\n\t);\n\n\treturn (\n\t\t<>\n\t\t\t<Button\n\t\t\t\tclassName=\"dataforms-layouts-modal__field-control\"\n\t\t\t\tsize=\"compact\"\n\t\t\t\tvariant={\n\t\t\t\t\t[ 'none', 'top' ].includes( labelPosition )\n\t\t\t\t\t\t? 'link'\n\t\t\t\t\t\t: 'tertiary'\n\t\t\t\t}\n\t\t\t\taria-expanded={ isOpen }\n\t\t\t\taria-label={ sprintf(\n\t\t\t\t\t// translators: %s: Field name.\n\t\t\t\t\t_x( 'Edit %s', 'field' ),\n\t\t\t\t\tfieldLabel || ''\n\t\t\t\t) }\n\t\t\t\tonClick={ () => setIsOpen( true ) }\n\t\t\t\tdisabled={ fieldDefinition.readOnly === true }\n\t\t\t\taccessibleWhenDisabled\n\t\t\t>\n\t\t\t\t<fieldDefinition.render\n\t\t\t\t\titem={ data }\n\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t/>\n\t\t\t</Button>\n\t\t\t{ isOpen && (\n\t\t\t\t<ModalContent\n\t\t\t\t\tdata={ data }\n\t\t\t\t\tform={ form as Form }\n\t\t\t\t\tfieldLabel={ fieldLabel ?? '' }\n\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\tonClose={ () => setIsOpen( false ) }\n\t\t\t\t/>\n\t\t\t) }\n\t\t</>\n\t);\n}\n\nexport default PanelModal;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["deepMerge","__experimentalHStack","HStack","__experimentalSpacer","Spacer","Button","Modal","__","useState","useMemo","DataFormLayout","isCombinedField","DEFAULT_LAYOUT","SummaryButton","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","ModalContent","data","form","fieldLabel","onChange","onClose","changes","setChanges","modalData","onApply","handleOnChange","newValue","prev","className","onRequestClose","isFullScreen","title","size","children","FieldLayout","nestedField","_form$fields","field","hideLabelFromVision","fields","length","id","spacing","variant","onClick","__next40pxDefaultSize","PanelModal","fieldDefinition","summaryFields","labelPosition","isOpen","setIsOpen","label","layout","disabled","readOnly"],"sources":["@wordpress/dataviews/src/dataforms-layouts/panel/modal.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport deepMerge from 'deepmerge';\n\n/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalHStack as HStack,\n\t__experimentalSpacer as Spacer,\n\tButton,\n\tModal,\n} from '@wordpress/components';\nimport { __ } from '@wordpress/i18n';\nimport { useState, useMemo } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport type { Form, FormField, NormalizedField } from '../../types';\nimport { DataFormLayout } from '../data-form-layout';\nimport { isCombinedField } from '../is-combined-field';\nimport { DEFAULT_LAYOUT } from '../../normalize-form-fields';\nimport SummaryButton from './summary-button';\n\nfunction ModalContent< Item >( {\n\tdata,\n\tform,\n\tfieldLabel,\n\tonChange,\n\tonClose,\n}: {\n\tdata: Item;\n\tform: Form;\n\tfieldLabel: string;\n\tonChange: ( data: Partial< Item > ) => void;\n\tonClose: () => void;\n} ) {\n\tconst [ changes, setChanges ] = useState< Partial< Item > >( {} );\n\tconst modalData = useMemo( () => {\n\t\treturn deepMerge( data, changes );\n\t}, [ data, changes ] );\n\n\tconst onApply = () => {\n\t\tonChange( changes );\n\t\tonClose();\n\t};\n\n\tconst handleOnChange = ( newValue: Partial< Item > ) => {\n\t\tsetChanges( ( prev ) => deepMerge( prev, newValue ) );\n\t};\n\n\treturn (\n\t\t<Modal\n\t\t\tclassName=\"dataforms-layouts-panel__modal\"\n\t\t\tonRequestClose={ onClose }\n\t\t\tisFullScreen={ false }\n\t\t\ttitle={ fieldLabel }\n\t\t\tsize=\"medium\"\n\t\t>\n\t\t\t<DataFormLayout\n\t\t\t\tdata={ modalData }\n\t\t\t\tform={ form }\n\t\t\t\tonChange={ handleOnChange }\n\t\t\t>\n\t\t\t\t{ ( FieldLayout, nestedField ) => (\n\t\t\t\t\t<FieldLayout\n\t\t\t\t\t\tkey={ nestedField.id }\n\t\t\t\t\t\tdata={ modalData }\n\t\t\t\t\t\tfield={ nestedField }\n\t\t\t\t\t\tonChange={ handleOnChange }\n\t\t\t\t\t\thideLabelFromVision={\n\t\t\t\t\t\t\t( form?.fields ?? [] ).length < 2\n\t\t\t\t\t\t}\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t</DataFormLayout>\n\t\t\t<HStack\n\t\t\t\tclassName=\"dataforms-layouts-panel__modal-footer\"\n\t\t\t\tspacing={ 3 }\n\t\t\t>\n\t\t\t\t<Spacer />\n\t\t\t\t<Button\n\t\t\t\t\tvariant=\"tertiary\"\n\t\t\t\t\tonClick={ onClose }\n\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t>\n\t\t\t\t\t{ __( 'Cancel' ) }\n\t\t\t\t</Button>\n\t\t\t\t<Button\n\t\t\t\t\tvariant=\"primary\"\n\t\t\t\t\tonClick={ onApply }\n\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t>\n\t\t\t\t\t{ __( 'Apply' ) }\n\t\t\t\t</Button>\n\t\t\t</HStack>\n\t\t</Modal>\n\t);\n}\n\nfunction PanelModal< Item >( {\n\tfieldDefinition,\n\tsummaryFields,\n\tlabelPosition,\n\tdata,\n\tonChange,\n\tfield,\n}: {\n\tfieldDefinition: NormalizedField< Item >;\n\tsummaryFields: NormalizedField< Item >[];\n\tlabelPosition: 'side' | 'top' | 'none';\n\tdata: Item;\n\tonChange: ( value: any ) => void;\n\tfield: FormField;\n} ) {\n\tconst [ isOpen, setIsOpen ] = useState( false );\n\n\tconst fieldLabel = isCombinedField( field )\n\t\t? field.label\n\t\t: fieldDefinition?.label;\n\n\tconst form: Form = useMemo(\n\t\t(): Form => ( {\n\t\t\tlayout: DEFAULT_LAYOUT,\n\t\t\tfields: isCombinedField( field )\n\t\t\t\t? field.children\n\t\t\t\t: // If not explicit children return the field id itself.\n\t\t\t\t  [ { id: field.id } ],\n\t\t} ),\n\t\t[ field ]\n\t);\n\n\treturn (\n\t\t<>\n\t\t\t<SummaryButton\n\t\t\t\tsummaryFields={ summaryFields }\n\t\t\t\tdata={ data }\n\t\t\t\tlabelPosition={ labelPosition }\n\t\t\t\tfieldLabel={ fieldLabel }\n\t\t\t\tdisabled={ fieldDefinition.readOnly === true }\n\t\t\t\tonClick={ () => setIsOpen( true ) }\n\t\t\t\taria-expanded={ isOpen }\n\t\t\t/>\n\t\t\t{ isOpen && (\n\t\t\t\t<ModalContent\n\t\t\t\t\tdata={ data }\n\t\t\t\t\tform={ form as Form }\n\t\t\t\t\tfieldLabel={ fieldLabel ?? '' }\n\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\tonClose={ () => setIsOpen( false ) }\n\t\t\t\t/>\n\t\t\t) }\n\t\t</>\n\t);\n}\n\nexport default PanelModal;\n"],"mappings":"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","ignoreList":[]}

package/build-module/dataforms-layouts/panel/summary-button.js

@@ -0,0 +1,60 @@
+/**
+ * WordPress dependencies
+ */
+import { Button } from '@wordpress/components';
+import { sprintf, _x } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { jsx as _jsx } from "react/jsx-runtime";
+function SummaryButton({
+  summaryFields,
+  data,
+  labelPosition,
+  fieldLabel,
+  disabled,
+  onClick,
+  'aria-expanded': ariaExpanded
+}) {
+  return /*#__PURE__*/_jsx(Button, {
+    className: "dataforms-layouts-panel__summary-button",
+    size: "compact",
+    variant: ['none', 'top'].includes(labelPosition) ? 'link' : 'tertiary',
+    "aria-expanded": ariaExpanded,
+    "aria-label": sprintf(
+    // translators: %s: Field name.
+    _x('Edit %s', 'field'), fieldLabel || ''),
+    onClick: onClick,
+    disabled: disabled,
+    accessibleWhenDisabled: true,
+    style: summaryFields.length > 1 ? {
+      minHeight: 'auto',
+      height: 'auto',
+      alignItems: 'flex-start'
+    } : undefined,
+    children: summaryFields.length > 1 ? /*#__PURE__*/_jsx("div", {
+      style: {
+        display: 'flex',
+        flexDirection: 'column',
+        alignItems: 'flex-start',
+        width: '100%',
+        gap: '2px'
+      },
+      children: summaryFields.map(summaryField => /*#__PURE__*/_jsx("div", {
+        style: {
+          width: '100%'
+        },
+        children: /*#__PURE__*/_jsx(summaryField.render, {
+          item: data,
+          field: summaryField
+        })
+      }, summaryField.id))
+    }) : summaryFields.map(summaryField => /*#__PURE__*/_jsx(summaryField.render, {
+      item: data,
+      field: summaryField
+    }, summaryField.id))
+  });
+}
+export default SummaryButton;
+//# sourceMappingURL=summary-button.js.map

package/build-module/dataforms-layouts/panel/summary-button.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Button","sprintf","_x","jsx","_jsx","SummaryButton","summaryFields","data","labelPosition","fieldLabel","disabled","onClick","ariaExpanded","className","size","variant","includes","accessibleWhenDisabled","style","length","minHeight","height","alignItems","undefined","children","display","flexDirection","width","gap","map","summaryField","render","item","field","id"],"sources":["@wordpress/dataviews/src/dataforms-layouts/panel/summary-button.tsx"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { Button } from '@wordpress/components';\nimport { sprintf, _x } from '@wordpress/i18n';\n\n/**\n * Internal dependencies\n */\nimport type { NormalizedField } from '../../types';\n\nfunction SummaryButton< Item >( {\n\tsummaryFields,\n\tdata,\n\tlabelPosition,\n\tfieldLabel,\n\tdisabled,\n\tonClick,\n\t'aria-expanded': ariaExpanded,\n}: {\n\tsummaryFields: NormalizedField< Item >[];\n\tdata: Item;\n\tlabelPosition: 'side' | 'top' | 'none';\n\tfieldLabel?: string;\n\tdisabled?: boolean;\n\tonClick: () => void;\n\t'aria-expanded'?: boolean;\n} ) {\n\treturn (\n\t\t<Button\n\t\t\tclassName=\"dataforms-layouts-panel__summary-button\"\n\t\t\tsize=\"compact\"\n\t\t\tvariant={\n\t\t\t\t[ 'none', 'top' ].includes( labelPosition )\n\t\t\t\t\t? 'link'\n\t\t\t\t\t: 'tertiary'\n\t\t\t}\n\t\t\taria-expanded={ ariaExpanded }\n\t\t\taria-label={ sprintf(\n\t\t\t\t// translators: %s: Field name.\n\t\t\t\t_x( 'Edit %s', 'field' ),\n\t\t\t\tfieldLabel || ''\n\t\t\t) }\n\t\t\tonClick={ onClick }\n\t\t\tdisabled={ disabled }\n\t\t\taccessibleWhenDisabled\n\t\t\tstyle={\n\t\t\t\tsummaryFields.length > 1\n\t\t\t\t\t? {\n\t\t\t\t\t\t\tminHeight: 'auto',\n\t\t\t\t\t\t\theight: 'auto',\n\t\t\t\t\t\t\talignItems: 'flex-start',\n\t\t\t\t\t  }\n\t\t\t\t\t: undefined\n\t\t\t}\n\t\t>\n\t\t\t{ summaryFields.length > 1 ? (\n\t\t\t\t<div\n\t\t\t\t\tstyle={ {\n\t\t\t\t\t\tdisplay: 'flex',\n\t\t\t\t\t\tflexDirection: 'column',\n\t\t\t\t\t\talignItems: 'flex-start',\n\t\t\t\t\t\twidth: '100%',\n\t\t\t\t\t\tgap: '2px',\n\t\t\t\t\t} }\n\t\t\t\t>\n\t\t\t\t\t{ summaryFields.map( ( summaryField ) => (\n\t\t\t\t\t\t<div\n\t\t\t\t\t\t\tkey={ summaryField.id }\n\t\t\t\t\t\t\tstyle={ { width: '100%' } }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t<summaryField.render\n\t\t\t\t\t\t\t\titem={ data }\n\t\t\t\t\t\t\t\tfield={ summaryField }\n\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t</div>\n\t\t\t\t\t) ) }\n\t\t\t\t</div>\n\t\t\t) : (\n\t\t\t\tsummaryFields.map( ( summaryField ) => (\n\t\t\t\t\t<summaryField.render\n\t\t\t\t\t\tkey={ summaryField.id }\n\t\t\t\t\t\titem={ data }\n\t\t\t\t\t\tfield={ summaryField }\n\t\t\t\t\t/>\n\t\t\t\t) )\n\t\t\t) }\n\t\t</Button>\n\t);\n}\n\nexport default SummaryButton;\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,MAAM,QAAQ,uBAAuB;AAC9C,SAASC,OAAO,EAAEC,EAAE,QAAQ,iBAAiB;;AAE7C;AACA;AACA;AAFA,SAAAC,GAAA,IAAAC,IAAA;AAKA,SAASC,aAAaA,CAAU;EAC/BC,aAAa;EACbC,IAAI;EACJC,aAAa;EACbC,UAAU;EACVC,QAAQ;EACRC,OAAO;EACP,eAAe,EAAEC;AASlB,CAAC,EAAG;EACH,oBACCR,IAAA,CAACJ,MAAM;IACNa,SAAS,EAAC,yCAAyC;IACnDC,IAAI,EAAC,SAAS;IACdC,OAAO,EACN,CAAE,MAAM,EAAE,KAAK,CAAE,CAACC,QAAQ,CAAER,aAAc,CAAC,GACxC,MAAM,GACN,UACH;IACD,iBAAgBI,YAAc;IAC9B,cAAaX,OAAO;IACnB;IACAC,EAAE,CAAE,SAAS,EAAE,OAAQ,CAAC,EACxBO,UAAU,IAAI,EACf,CAAG;IACHE,OAAO,EAAGA,OAAS;IACnBD,QAAQ,EAAGA,QAAU;IACrBO,sBAAsB;IACtBC,KAAK,EACJZ,aAAa,CAACa,MAAM,GAAG,CAAC,GACrB;MACAC,SAAS,EAAE,MAAM;MACjBC,MAAM,EAAE,MAAM;MACdC,UAAU,EAAE;IACZ,CAAC,GACDC,SACH;IAAAC,QAAA,EAEClB,aAAa,CAACa,MAAM,GAAG,CAAC,gBACzBf,IAAA;MACCc,KAAK,EAAG;QACPO,OAAO,EAAE,MAAM;QACfC,aAAa,EAAE,QAAQ;QACvBJ,UAAU,EAAE,YAAY;QACxBK,KAAK,EAAE,MAAM;QACbC,GAAG,EAAE;MACN,CAAG;MAAAJ,QAAA,EAEDlB,aAAa,CAACuB,GAAG,CAAIC,YAAY,iBAClC1B,IAAA;QAECc,KAAK,EAAG;UAAES,KAAK,EAAE;QAAO,CAAG;QAAAH,QAAA,eAE3BpB,IAAA,CAAC0B,YAAY,CAACC,MAAM;UACnBC,IAAI,EAAGzB,IAAM;UACb0B,KAAK,EAAGH;QAAc,CACtB;MAAC,GANIA,YAAY,CAACI,EAOf,CACJ;IAAC,CACC,CAAC,GAEN5B,aAAa,CAACuB,GAAG,CAAIC,YAAY,iBAChC1B,IAAA,CAAC0B,YAAY,CAACC,MAAM;MAEnBC,IAAI,EAAGzB,IAAM;MACb0B,KAAK,EAAGH;IAAc,GAFhBA,YAAY,CAACI,EAGnB,CACA;EACF,CACM,CAAC;AAEX;AAEA,eAAe7B,aAAa","ignoreList":[]}

package/build-module/normalize-fields.js

@@ -22,6 +22,19 @@ const getValueFromId = id => ({
   }
   return value;
 };
+export const setValueFromId = id => ({
+  value
+}) => {
+  const path = id.split('.');
+  const result = {};
+  let current = result;
+  for (const segment of path.slice(0, -1)) {
+    current[segment] = {};
+    current = current[segment];
+  }
+  current[path.at(-1)] = value;
+  return result;
+};
 function getFilterBy(field, fieldTypeDefinition) {
   if (field.filterBy === false) {
     return false;
@@ -89,6 +102,7 @@ export function normalizeFields(fields) {
     var _field$sort, _field$render, _field$enableHiding, _ref, _field$enableSorting, _ref2, _field$readOnly;
     const fieldTypeDefinition = getFieldTypeDefinition(field.type);
     const getValue = field.getValue || getValueFromId(field.id);
+    const setValue = field.setValue || setValueFromId(field.id);
     const sort = (_field$sort = field.sort) !== null && _field$sort !== void 0 ? _field$sort : function sort(a, b, direction) {
       return fieldTypeDefinition.sort(getValue({
         item: a
@@ -116,6 +130,7 @@ export function normalizeFields(fields) {
       label: field.label || field.id,
       header: field.header || field.label || field.id,
       getValue,
+      setValue,
       render,
       sort,
       isValid,