@wordpress/dataviews 6.0.0 → 7.0.0

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

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = FormPanelField;
 var _clsx = _interopRequireDefault(require("clsx"));
 var _components = require("@wordpress/components");
-var _i18n = require("@wordpress/i18n");
 var _element = require("@wordpress/element");
-var _icons = require("@wordpress/icons");
 var _dataformContext = _interopRequireDefault(require("../../components/dataform-context"));
-var _dataFormLayout = require("../data-form-layout");
 var _isCombinedField = require("../is-combined-field");
+var _normalizeFormFields = require("../../normalize-form-fields");
+var _dropdown = _interopRequireDefault(require("./dropdown"));
+var _modal = _interopRequireDefault(require("./modal"));
 var _jsxRuntime = require("react/jsx-runtime");
 /**
  * External dependencies
@@ -26,137 +26,25 @@ var _jsxRuntime = require("react/jsx-runtime");
  * Internal dependencies
  */
 
-function DropdownHeader({
-  title,
-  onClose
-}) {
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.__experimentalVStack, {
-    className: "dataforms-layouts-panel__dropdown-header",
-    spacing: 4,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.__experimentalHStack, {
-      alignment: "center",
-      children: [title && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.__experimentalHeading, {
-        level: 2,
-        size: 13,
-        children: title
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.__experimentalSpacer, {}), onClose && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
-        label: (0, _i18n.__)('Close'),
-        icon: _icons.closeSmall,
-        onClick: onClose,
-        size: "small"
-      })]
-    })
-  });
-}
-function PanelDropdown({
-  fieldDefinition,
-  popoverAnchor,
-  labelPosition = 'side',
-  data,
-  onChange,
-  field
-}) {
-  const fieldLabel = (0, _isCombinedField.isCombinedField)(field) ? field.label : fieldDefinition?.label;
-  const form = (0, _element.useMemo)(() => {
-    if ((0, _isCombinedField.isCombinedField)(field)) {
-      return {
-        type: 'regular',
-        fields: field.children.map(child => {
-          if (typeof child === 'string') {
-            return {
-              id: child
-            };
-          }
-          return child;
-        })
-      };
-    }
-    // If not explicit children return the field id itself.
-    return {
-      type: 'regular',
-      fields: [{
-        id: field.id
-      }]
-    };
-  }, [field]);
-
-  // Memoize popoverProps to avoid returning a new object every time.
-  const popoverProps = (0, _element.useMemo)(() => ({
-    // Anchor the popover to the middle of the entire row so that it doesn't
-    // move around when the label changes.
-    anchor: popoverAnchor,
-    placement: 'left-start',
-    offset: 36,
-    shift: true
-  }), [popoverAnchor]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Dropdown, {
-    contentClassName: "dataforms-layouts-panel__field-dropdown",
-    popoverProps: popoverProps,
-    focusOnMount: true,
-    toggleProps: {
-      size: 'compact',
-      variant: 'tertiary',
-      tooltipPosition: 'middle left'
-    },
-    renderToggle: ({
-      isOpen,
-      onToggle
-    }) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
-      className: "dataforms-layouts-panel__field-control",
-      size: "compact",
-      variant: ['none', 'top'].includes(labelPosition) ? 'link' : 'tertiary',
-      "aria-expanded": isOpen,
-      "aria-label": (0, _i18n.sprintf)(
-      // translators: %s: Field name.
-      (0, _i18n._x)('Edit %s', 'field'), fieldLabel || ''),
-      onClick: onToggle,
-      disabled: fieldDefinition.readOnly === true,
-      accessibleWhenDisabled: true,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(fieldDefinition.render, {
-        item: data,
-        field: fieldDefinition
-      })
-    }),
-    renderContent: ({
-      onClose
-    }) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(DropdownHeader, {
-        title: fieldLabel,
-        onClose: onClose
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_dataFormLayout.DataFormLayout, {
-        data: data,
-        form: form,
-        onChange: onChange,
-        children: (FieldLayout, nestedField) => {
-          var _form$fields;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(FieldLayout, {
-            data: data,
-            field: nestedField,
-            onChange: onChange,
-            hideLabelFromVision: ((_form$fields = form?.fields) !== null && _form$fields !== void 0 ? _form$fields : []).length < 2
-          }, nestedField.id);
-        }
-      })]
-    })
-  });
-}
 function FormPanelField({
   data,
   field,
   onChange
 }) {
-  var _field$labelPosition;
   const {
     fields
   } = (0, _element.useContext)(_dataformContext.default);
-  const fieldDefinition = fields.find(fieldDef => {
-    // Default to the first child if it is a combined field.
+  const fieldDefinition = fields.find(_field => {
+    // Default to the first simple child if it is a combined field.
     if ((0, _isCombinedField.isCombinedField)(field)) {
-      const children = field.children.filter(child => typeof child === 'string' || !(0, _isCombinedField.isCombinedField)(child));
-      const firstChildFieldId = typeof children[0] === 'string' ? children[0] : children[0].id;
-      return fieldDef.id === firstChildFieldId;
+      const simpleChildren = field.children.filter(child => typeof child === 'string' || !(0, _isCombinedField.isCombinedField)(child));
+      if (simpleChildren.length === 0) {
+        return false;
+      }
+      const firstChildFieldId = typeof simpleChildren[0] === 'string' ? simpleChildren[0] : simpleChildren[0].id;
+      return _field.id === firstChildFieldId;
     }
-    return fieldDef.id === field.id;
+    return _field.id === field.id;
   });
 
   // Use internal state instead of a ref to make sure that the component
@@ -165,9 +53,27 @@ function FormPanelField({
   if (!fieldDefinition) {
     return null;
   }
-  const labelPosition = (_field$labelPosition = field.labelPosition) !== null && _field$labelPosition !== void 0 ? _field$labelPosition : 'side';
+  const layout = (0, _normalizeFormFields.normalizeLayout)({
+    ...field.layout,
+    type: 'panel'
+  });
+  const labelPosition = layout.labelPosition;
   const labelClassName = (0, _clsx.default)('dataforms-layouts-panel__field-label', `dataforms-layouts-panel__field-label--label-position-${labelPosition}`);
   const fieldLabel = (0, _isCombinedField.isCombinedField)(field) ? field.label : fieldDefinition?.label;
+  const renderedControl = layout.openAs === 'modal' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_modal.default, {
+    field: field,
+    fieldDefinition: fieldDefinition,
+    data: data,
+    onChange: onChange,
+    labelPosition: labelPosition
+  }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropdown.default, {
+    field: field,
+    popoverAnchor: popoverAnchor,
+    fieldDefinition: fieldDefinition,
+    data: data,
+    onChange: onChange,
+    labelPosition: labelPosition
+  });
   if (labelPosition === 'top') {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.__experimentalVStack, {
       className: "dataforms-layouts-panel__field",
@@ -180,28 +86,14 @@ function FormPanelField({
         children: fieldLabel
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "dataforms-layouts-panel__field-control",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(PanelDropdown, {
-          field: field,
-          popoverAnchor: popoverAnchor,
-          fieldDefinition: fieldDefinition,
-          data: data,
-          onChange: onChange,
-          labelPosition: labelPosition
-        })
+        children: renderedControl
       })]
     });
   }
   if (labelPosition === 'none') {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "dataforms-layouts-panel__field",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(PanelDropdown, {
-        field: field,
-        popoverAnchor: popoverAnchor,
-        fieldDefinition: fieldDefinition,
-        data: data,
-        onChange: onChange,
-        labelPosition: labelPosition
-      })
+      children: renderedControl
     });
   }
 
@@ -214,14 +106,7 @@ function FormPanelField({
       children: fieldLabel
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "dataforms-layouts-panel__field-control",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(PanelDropdown, {
-        field: field,
-        popoverAnchor: popoverAnchor,
-        fieldDefinition: fieldDefinition,
-        data: data,
-        onChange: onChange,
-        labelPosition: labelPosition
-      })
+      children: renderedControl
     })]
   });
 }

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

@@ -1 +1 @@
-{"version":3,"names":["_clsx","_interopRequireDefault","require","_components","_i18n","_element","_icons","_dataformContext","_dataFormLayout","_isCombinedField","_jsxRuntime","DropdownHeader","title","onClose","jsx","__experimentalVStack","className","spacing","children","jsxs","__experimentalHStack","alignment","__experimentalHeading","level","size","__experimentalSpacer","Button","label","__","icon","closeSmall","onClick","PanelDropdown","fieldDefinition","popoverAnchor","labelPosition","data","onChange","field","fieldLabel","isCombinedField","form","useMemo","type","fields","map","child","id","popoverProps","anchor","placement","offset","shift","Dropdown","contentClassName","focusOnMount","toggleProps","variant","tooltipPosition","renderToggle","isOpen","onToggle","includes","sprintf","_x","disabled","readOnly","accessibleWhenDisabled","render","item","renderContent","Fragment","DataFormLayout","FieldLayout","nestedField","_form$fields","hideLabelFromVision","length","FormPanelField","_field$labelPosition","useContext","DataFormContext","find","fieldDef","filter","firstChildFieldId","setPopoverAnchor","useState","labelClassName","clsx","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\t__experimentalHeading as Heading,\n\t__experimentalSpacer as Spacer,\n\tDropdown,\n\tButton,\n} from '@wordpress/components';\nimport { sprintf, __, _x } from '@wordpress/i18n';\nimport { useState, useMemo, useContext } from '@wordpress/element';\nimport { closeSmall } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport type {\n\tForm,\n\tFormField,\n\tFieldLayoutProps,\n\tNormalizedField,\n\tSimpleFormField,\n} from '../../types';\nimport DataFormContext from '../../components/dataform-context';\nimport { DataFormLayout } from '../data-form-layout';\nimport { isCombinedField } from '../is-combined-field';\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\tconst form = useMemo( () => {\n\t\tif ( isCombinedField( field ) ) {\n\t\t\treturn {\n\t\t\t\ttype: 'regular' as const,\n\t\t\t\tfields: field.children.map( ( child ) => {\n\t\t\t\t\tif ( typeof child === 'string' ) {\n\t\t\t\t\t\treturn {\n\t\t\t\t\t\t\tid: child,\n\t\t\t\t\t\t};\n\t\t\t\t\t}\n\t\t\t\t\treturn child;\n\t\t\t\t} ),\n\t\t\t};\n\t\t}\n\t\t// If not explicit children return the field id itself.\n\t\treturn {\n\t\t\ttype: 'regular' as const,\n\t\t\tfields: [ { id: field.id } ],\n\t\t};\n\t}, [ field ] );\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 as 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 function FormPanelField< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n}: FieldLayoutProps< Item > ) {\n\tconst { fields } = useContext( DataFormContext );\n\tconst fieldDefinition = fields.find( ( fieldDef ) => {\n\t\t// Default to the first child if it is a combined field.\n\t\tif ( isCombinedField( field ) ) {\n\t\t\tconst children = 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\t\t\tconst firstChildFieldId =\n\t\t\t\ttypeof children[ 0 ] === 'string'\n\t\t\t\t\t? children[ 0 ]\n\t\t\t\t\t: children[ 0 ].id;\n\t\t\treturn fieldDef.id === firstChildFieldId;\n\t\t}\n\t\treturn fieldDef.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 labelPosition = field.labelPosition ?? 'side';\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\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<PanelDropdown\n\t\t\t\t\t\tfield={ field }\n\t\t\t\t\t\tpopoverAnchor={ popoverAnchor }\n\t\t\t\t\t\tfieldDefinition={ fieldDefinition }\n\t\t\t\t\t\tdata={ data }\n\t\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\t\tlabelPosition={ labelPosition }\n\t\t\t\t\t/>\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<PanelDropdown\n\t\t\t\t\tfield={ field }\n\t\t\t\t\tpopoverAnchor={ popoverAnchor }\n\t\t\t\t\tfieldDefinition={ fieldDefinition }\n\t\t\t\t\tdata={ data }\n\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\tlabelPosition={ labelPosition }\n\t\t\t\t/>\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<PanelDropdown\n\t\t\t\t\tfield={ field }\n\t\t\t\t\tpopoverAnchor={ popoverAnchor }\n\t\t\t\t\tfieldDefinition={ fieldDefinition }\n\t\t\t\t\tdata={ data }\n\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\tlabelPosition={ labelPosition }\n\t\t\t\t/>\n\t\t\t</div>\n\t\t</HStack>\n\t);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_clsx","_interopRequireDefault","require","_components","_element","_dataformContext","_isCombinedField","_normalizeFormFields","_dropdown","_modal","_jsxRuntime","FormPanelField","data","field","onChange","fields","useContext","DataFormContext","fieldDefinition","find","_field","isCombinedField","simpleChildren","children","filter","child","length","firstChildFieldId","id","popoverAnchor","setPopoverAnchor","useState","layout","normalizeLayout","type","labelPosition","labelClassName","clsx","fieldLabel","label","renderedControl","openAs","jsx","default","jsxs","__experimentalVStack","className","spacing","style","paddingBottom","__experimentalHStack","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":[]}

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

@@ -0,0 +1,125 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _components = require("@wordpress/components");
+var _i18n = require("@wordpress/i18n");
+var _element = require("@wordpress/element");
+var _dataFormLayout = require("../data-form-layout");
+var _isCombinedField = require("../is-combined-field");
+var _normalizeFormFields = require("../../normalize-form-fields");
+var _jsxRuntime = require("react/jsx-runtime");
+/**
+ * WordPress dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+
+function ModalContent({
+  data,
+  form,
+  fieldLabel,
+  onChange,
+  onClose
+}) {
+  const [changes, setChanges] = (0, _element.useState)({});
+  const onApply = () => {
+    onChange(changes);
+    onClose();
+  };
+  const handleOnChange = value => {
+    setChanges(prev => ({
+      ...prev,
+      ...value
+    }));
+  };
+
+  // Merge original data with local changes for display
+  const displayData = {
+    ...data,
+    ...changes
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Modal, {
+    className: "dataforms-layouts-panel__modal",
+    onRequestClose: onClose,
+    isFullScreen: false,
+    title: fieldLabel,
+    size: "medium",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_dataFormLayout.DataFormLayout, {
+      data: displayData,
+      form: form,
+      onChange: handleOnChange,
+      children: (FieldLayout, nestedField) => {
+        var _form$fields;
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(FieldLayout, {
+          data: displayData,
+          field: nestedField,
+          onChange: handleOnChange,
+          hideLabelFromVision: ((_form$fields = form?.fields) !== null && _form$fields !== void 0 ? _form$fields : []).length < 2
+        }, nestedField.id);
+      }
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.__experimentalHStack, {
+      className: "dataforms-layouts-panel__modal-footer",
+      spacing: 3,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.__experimentalSpacer, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+        variant: "tertiary",
+        onClick: onClose,
+        __next40pxDefaultSize: true,
+        children: (0, _i18n.__)('Cancel')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+        variant: "primary",
+        onClick: onApply,
+        __next40pxDefaultSize: true,
+        children: (0, _i18n.__)('Apply')
+      })]
+    })]
+  });
+}
+function PanelModal({
+  fieldDefinition,
+  labelPosition,
+  data,
+  onChange,
+  field
+}) {
+  const [isOpen, setIsOpen] = (0, _element.useState)(false);
+  const fieldLabel = (0, _isCombinedField.isCombinedField)(field) ? field.label : fieldDefinition?.label;
+  const form = (0, _element.useMemo)(() => ({
+    layout: _normalizeFormFields.DEFAULT_LAYOUT,
+    fields: (0, _isCombinedField.isCombinedField)(field) ? field.children :
+    // If not explicit children return the field id itself.
+    [{
+      id: field.id
+    }]
+  }), [field]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+      className: "dataforms-layouts-modal__field-control",
+      size: "compact",
+      variant: ['none', 'top'].includes(labelPosition) ? 'link' : 'tertiary',
+      "aria-expanded": isOpen,
+      "aria-label": (0, _i18n.sprintf)(
+      // translators: %s: Field name.
+      (0, _i18n._x)('Edit %s', 'field'), fieldLabel || ''),
+      onClick: () => setIsOpen(true),
+      disabled: fieldDefinition.readOnly === true,
+      accessibleWhenDisabled: true,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(fieldDefinition.render, {
+        item: data,
+        field: fieldDefinition
+      })
+    }), isOpen && /*#__PURE__*/(0, _jsxRuntime.jsx)(ModalContent, {
+      data: data,
+      form: form,
+      fieldLabel: fieldLabel !== null && fieldLabel !== void 0 ? fieldLabel : '',
+      onChange: onChange,
+      onClose: () => setIsOpen(false)
+    })]
+  });
+}
+var _default = exports.default = PanelModal;
+//# sourceMappingURL=modal.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_components","require","_i18n","_element","_dataFormLayout","_isCombinedField","_normalizeFormFields","_jsxRuntime","ModalContent","data","form","fieldLabel","onChange","onClose","changes","setChanges","useState","onApply","handleOnChange","value","prev","displayData","jsxs","Modal","className","onRequestClose","isFullScreen","title","size","children","jsx","DataFormLayout","FieldLayout","nestedField","_form$fields","field","hideLabelFromVision","fields","length","id","__experimentalHStack","spacing","__experimentalSpacer","Button","variant","onClick","__next40pxDefaultSize","__","PanelModal","fieldDefinition","labelPosition","isOpen","setIsOpen","isCombinedField","label","useMemo","layout","DEFAULT_LAYOUT","Fragment","includes","sprintf","_x","disabled","readOnly","accessibleWhenDisabled","render","item","_default","exports","default"],"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":[]}

package/build/dataforms-layouts/regular/index.js

@@ -11,6 +11,7 @@ var _components = require("@wordpress/components");
 var _dataformContext = _interopRequireDefault(require("../../components/dataform-context"));
 var _dataFormLayout = require("../data-form-layout");
 var _isCombinedField = require("../is-combined-field");
+var _normalizeFormFields = require("../../normalize-form-fields");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
  * External dependencies
@@ -46,29 +47,13 @@ function FormRegularField({
   onChange,
   hideLabelFromVision
 }) {
-  var _field$labelPosition;
   const {
     fields
   } = (0, _element.useContext)(_dataformContext.default);
-  const form = (0, _element.useMemo)(() => {
-    if ((0, _isCombinedField.isCombinedField)(field)) {
-      return {
-        fields: field.children.map(child => {
-          if (typeof child === 'string') {
-            return {
-              id: child
-            };
-          }
-          return child;
-        }),
-        type: 'regular'
-      };
-    }
-    return {
-      type: 'regular',
-      fields: []
-    };
-  }, [field]);
+  const form = (0, _element.useMemo)(() => ({
+    layout: _normalizeFormFields.DEFAULT_LAYOUT,
+    fields: (0, _isCombinedField.isCombinedField)(field) ? field.children : []
+  }), [field]);
   if ((0, _isCombinedField.isCombinedField)(field)) {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [!hideLabelFromVision && field.label && /*#__PURE__*/(0, _jsxRuntime.jsx)(Header, {
@@ -80,7 +65,11 @@ function FormRegularField({
       })]
     });
   }
-  const labelPosition = (_field$labelPosition = field.labelPosition) !== null && _field$labelPosition !== void 0 ? _field$labelPosition : 'top';
+  const layout = (0, _normalizeFormFields.normalizeLayout)({
+    ...field.layout,
+    type: 'regular'
+  });
+  const labelPosition = layout.labelPosition;
   const fieldDefinition = fields.find(fieldDef => fieldDef.id === field.id);
   if (!fieldDefinition || !fieldDefinition.Edit) {
     return null;

package/build/dataforms-layouts/regular/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_clsx","_interopRequireDefault","require","_element","_components","_dataformContext","_dataFormLayout","_isCombinedField","_jsxRuntime","Header","title","jsx","__experimentalVStack","className","spacing","children","jsxs","__experimentalHStack","alignment","__experimentalHeading","level","size","__experimentalSpacer","FormRegularField","data","field","onChange","hideLabelFromVision","_field$labelPosition","fields","useContext","DataFormContext","form","useMemo","isCombinedField","map","child","id","type","Fragment","label","DataFormLayout","labelPosition","fieldDefinition","find","fieldDef","Edit","clsx","readOnly","render","item"],"sources":["@wordpress/dataviews/src/dataforms-layouts/regular/index.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport clsx from 'clsx';\n\n/**\n * WordPress dependencies\n */\nimport { useContext, useMemo } from '@wordpress/element';\nimport {\n\t__experimentalHStack as HStack,\n\t__experimentalVStack as VStack,\n\t__experimentalHeading as Heading,\n\t__experimentalSpacer as Spacer,\n} from '@wordpress/components';\n\n/**\n * Internal dependencies\n */\nimport type { Form, FieldLayoutProps } from '../../types';\nimport DataFormContext from '../../components/dataform-context';\nimport { DataFormLayout } from '../data-form-layout';\nimport { isCombinedField } from '../is-combined-field';\n\nfunction Header( { title }: { title: string } ) {\n\treturn (\n\t\t<VStack className=\"dataforms-layouts-regular__header\" spacing={ 4 }>\n\t\t\t<HStack alignment=\"center\">\n\t\t\t\t<Heading level={ 2 } size={ 13 }>\n\t\t\t\t\t{ title }\n\t\t\t\t</Heading>\n\t\t\t\t<Spacer />\n\t\t\t</HStack>\n\t\t</VStack>\n\t);\n}\n\nexport default function FormRegularField< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n}: FieldLayoutProps< Item > ) {\n\tconst { fields } = useContext( DataFormContext );\n\n\tconst form = useMemo( () => {\n\t\tif ( isCombinedField( field ) ) {\n\t\t\treturn {\n\t\t\t\tfields: field.children.map( ( child ) => {\n\t\t\t\t\tif ( typeof child === 'string' ) {\n\t\t\t\t\t\treturn {\n\t\t\t\t\t\t\tid: child,\n\t\t\t\t\t\t};\n\t\t\t\t\t}\n\t\t\t\t\treturn child;\n\t\t\t\t} ),\n\t\t\t\ttype: 'regular' as const,\n\t\t\t};\n\t\t}\n\n\t\treturn {\n\t\t\ttype: 'regular' as const,\n\t\t\tfields: [],\n\t\t};\n\t}, [ field ] );\n\n\tif ( isCombinedField( field ) ) {\n\t\treturn (\n\t\t\t<>\n\t\t\t\t{ ! hideLabelFromVision && field.label && (\n\t\t\t\t\t<Header title={ field.label } />\n\t\t\t\t) }\n\t\t\t\t<DataFormLayout\n\t\t\t\t\tdata={ data }\n\t\t\t\t\tform={ form as Form }\n\t\t\t\t\tonChange={ onChange }\n\t\t\t\t/>\n\t\t\t</>\n\t\t);\n\t}\n\n\tconst labelPosition = field.labelPosition ?? 'top';\n\tconst fieldDefinition = fields.find(\n\t\t( fieldDef ) => fieldDef.id === field.id\n\t);\n\n\tif ( ! fieldDefinition || ! fieldDefinition.Edit ) {\n\t\treturn null;\n\t}\n\tif ( labelPosition === 'side' ) {\n\t\treturn (\n\t\t\t<HStack className=\"dataforms-layouts-regular__field\">\n\t\t\t\t<div\n\t\t\t\t\tclassName={ clsx(\n\t\t\t\t\t\t'dataforms-layouts-regular__field-label',\n\t\t\t\t\t\t`dataforms-layouts-regular__field-label--label-position-${ labelPosition }`\n\t\t\t\t\t) }\n\t\t\t\t>\n\t\t\t\t\t{ fieldDefinition.label }\n\t\t\t\t</div>\n\t\t\t\t<div className=\"dataforms-layouts-regular__field-control\">\n\t\t\t\t\t{ fieldDefinition.readOnly === true ? (\n\t\t\t\t\t\t<fieldDefinition.render\n\t\t\t\t\t\t\titem={ data }\n\t\t\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t\t\t/>\n\t\t\t\t\t) : (\n\t\t\t\t\t\t<fieldDefinition.Edit\n\t\t\t\t\t\t\tkey={ fieldDefinition.id }\n\t\t\t\t\t\t\tdata={ data }\n\t\t\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\t\t\thideLabelFromVision\n\t\t\t\t\t\t/>\n\t\t\t\t\t) }\n\t\t\t\t</div>\n\t\t\t</HStack>\n\t\t);\n\t}\n\n\treturn (\n\t\t<div className=\"dataforms-layouts-regular__field\">\n\t\t\t{ fieldDefinition.readOnly === true ? (\n\t\t\t\t<>\n\t\t\t\t\t{ ! hideLabelFromVision && labelPosition !== 'none' && (\n\t\t\t\t\t\t<div className=\"dataforms-layouts-regular__field-label\">\n\t\t\t\t\t\t\t{ fieldDefinition.label }\n\t\t\t\t\t\t</div>\n\t\t\t\t\t) }\n\t\t\t\t\t<div className=\"dataforms-layouts-regular__field-control\">\n\t\t\t\t\t\t<fieldDefinition.render\n\t\t\t\t\t\t\titem={ data }\n\t\t\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t\t\t/>\n\t\t\t\t\t</div>\n\t\t\t\t</>\n\t\t\t) : (\n\t\t\t\t<fieldDefinition.Edit\n\t\t\t\t\tdata={ data }\n\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\thideLabelFromVision={\n\t\t\t\t\t\tlabelPosition === 'none' ? true : hideLabelFromVision\n\t\t\t\t\t}\n\t\t\t\t/>\n\t\t\t) }\n\t\t</div>\n\t);\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_clsx","_interopRequireDefault","require","_element","_components","_dataformContext","_dataFormLayout","_isCombinedField","_normalizeFormFields","_jsxRuntime","Header","title","jsx","__experimentalVStack","className","spacing","children","jsxs","__experimentalHStack","alignment","__experimentalHeading","level","size","__experimentalSpacer","FormRegularField","data","field","onChange","hideLabelFromVision","fields","useContext","DataFormContext","form","useMemo","layout","DEFAULT_LAYOUT","isCombinedField","Fragment","label","DataFormLayout","normalizeLayout","type","labelPosition","fieldDefinition","find","fieldDef","id","Edit","clsx","readOnly","render","item"],"sources":["@wordpress/dataviews/src/dataforms-layouts/regular/index.tsx"],"sourcesContent":["/**\n * External dependencies\n */\nimport clsx from 'clsx';\n\n/**\n * WordPress dependencies\n */\nimport { useContext, useMemo } from '@wordpress/element';\nimport {\n\t__experimentalHStack as HStack,\n\t__experimentalVStack as VStack,\n\t__experimentalHeading as Heading,\n\t__experimentalSpacer as Spacer,\n} from '@wordpress/components';\n\n/**\n * Internal dependencies\n */\nimport type {\n\tForm,\n\tFieldLayoutProps,\n\tNormalizedRegularLayout,\n} from '../../types';\nimport DataFormContext from '../../components/dataform-context';\nimport { DataFormLayout } from '../data-form-layout';\nimport { isCombinedField } from '../is-combined-field';\nimport { DEFAULT_LAYOUT, normalizeLayout } from '../../normalize-form-fields';\n\nfunction Header( { title }: { title: string } ) {\n\treturn (\n\t\t<VStack className=\"dataforms-layouts-regular__header\" spacing={ 4 }>\n\t\t\t<HStack alignment=\"center\">\n\t\t\t\t<Heading level={ 2 } size={ 13 }>\n\t\t\t\t\t{ title }\n\t\t\t\t</Heading>\n\t\t\t\t<Spacer />\n\t\t\t</HStack>\n\t\t</VStack>\n\t);\n}\n\nexport default function FormRegularField< Item >( {\n\tdata,\n\tfield,\n\tonChange,\n\thideLabelFromVision,\n}: FieldLayoutProps< Item > ) {\n\tconst { fields } = useContext( DataFormContext );\n\n\tconst form: Form = useMemo(\n\t\t(): Form => ( {\n\t\t\tlayout: DEFAULT_LAYOUT,\n\t\t\tfields: isCombinedField( field ) ? field.children : [],\n\t\t} ),\n\t\t[ field ]\n\t);\n\n\tif ( isCombinedField( field ) ) {\n\t\treturn (\n\t\t\t<>\n\t\t\t\t{ ! hideLabelFromVision && field.label && (\n\t\t\t\t\t<Header title={ field.label } />\n\t\t\t\t) }\n\t\t\t\t<DataFormLayout\n\t\t\t\t\tdata={ data }\n\t\t\t\t\tform={ form }\n\t\t\t\t\tonChange={ onChange }\n\t\t\t\t/>\n\t\t\t</>\n\t\t);\n\t}\n\n\tconst layout: NormalizedRegularLayout = normalizeLayout( {\n\t\t...field.layout,\n\t\ttype: 'regular',\n\t} ) as NormalizedRegularLayout;\n\n\tconst labelPosition = layout.labelPosition;\n\tconst fieldDefinition = fields.find(\n\t\t( fieldDef ) => fieldDef.id === field.id\n\t);\n\n\tif ( ! fieldDefinition || ! fieldDefinition.Edit ) {\n\t\treturn null;\n\t}\n\tif ( labelPosition === 'side' ) {\n\t\treturn (\n\t\t\t<HStack className=\"dataforms-layouts-regular__field\">\n\t\t\t\t<div\n\t\t\t\t\tclassName={ clsx(\n\t\t\t\t\t\t'dataforms-layouts-regular__field-label',\n\t\t\t\t\t\t`dataforms-layouts-regular__field-label--label-position-${ labelPosition }`\n\t\t\t\t\t) }\n\t\t\t\t>\n\t\t\t\t\t{ fieldDefinition.label }\n\t\t\t\t</div>\n\t\t\t\t<div className=\"dataforms-layouts-regular__field-control\">\n\t\t\t\t\t{ fieldDefinition.readOnly === true ? (\n\t\t\t\t\t\t<fieldDefinition.render\n\t\t\t\t\t\t\titem={ data }\n\t\t\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t\t\t/>\n\t\t\t\t\t) : (\n\t\t\t\t\t\t<fieldDefinition.Edit\n\t\t\t\t\t\t\tkey={ fieldDefinition.id }\n\t\t\t\t\t\t\tdata={ data }\n\t\t\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\t\t\thideLabelFromVision\n\t\t\t\t\t\t/>\n\t\t\t\t\t) }\n\t\t\t\t</div>\n\t\t\t</HStack>\n\t\t);\n\t}\n\n\treturn (\n\t\t<div className=\"dataforms-layouts-regular__field\">\n\t\t\t{ fieldDefinition.readOnly === true ? (\n\t\t\t\t<>\n\t\t\t\t\t{ ! hideLabelFromVision && labelPosition !== 'none' && (\n\t\t\t\t\t\t<div className=\"dataforms-layouts-regular__field-label\">\n\t\t\t\t\t\t\t{ fieldDefinition.label }\n\t\t\t\t\t\t</div>\n\t\t\t\t\t) }\n\t\t\t\t\t<div className=\"dataforms-layouts-regular__field-control\">\n\t\t\t\t\t\t<fieldDefinition.render\n\t\t\t\t\t\t\titem={ data }\n\t\t\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t\t\t/>\n\t\t\t\t\t</div>\n\t\t\t\t</>\n\t\t\t) : (\n\t\t\t\t<fieldDefinition.Edit\n\t\t\t\t\tdata={ data }\n\t\t\t\t\tfield={ fieldDefinition }\n\t\t\t\t\tonChange={ onChange }\n\t\t\t\t\thideLabelFromVision={\n\t\t\t\t\t\tlabelPosition === 'none' ? true : hideLabelFromVision\n\t\t\t\t\t}\n\t\t\t\t/>\n\t\t\t) }\n\t\t</div>\n\t);\n}\n"],"mappings":";;;;;;;AAGA,IAAAA,KAAA,GAAAC,sBAAA,CAAAC,OAAA;AAKA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAeA,IAAAG,gBAAA,GAAAJ,sBAAA,CAAAC,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,gBAAA,GAAAL,OAAA;AACA,IAAAM,oBAAA,GAAAN,OAAA;AAA8E,IAAAO,WAAA,GAAAP,OAAA;AA3B9E;AACA;AACA;;AAGA;AACA;AACA;;AASA;AACA;AACA;;AAWA,SAASQ,MAAMA,CAAE;EAAEC;AAAyB,CAAC,EAAG;EAC/C,oBACC,IAAAF,WAAA,CAAAG,GAAA,EAACR,WAAA,CAAAS,oBAAM;IAACC,SAAS,EAAC,mCAAmC;IAACC,OAAO,EAAG,CAAG;IAAAC,QAAA,eAClE,IAAAP,WAAA,CAAAQ,IAAA,EAACb,WAAA,CAAAc,oBAAM;MAACC,SAAS,EAAC,QAAQ;MAAAH,QAAA,gBACzB,IAAAP,WAAA,CAAAG,GAAA,EAACR,WAAA,CAAAgB,qBAAO;QAACC,KAAK,EAAG,CAAG;QAACC,IAAI,EAAG,EAAI;QAAAN,QAAA,EAC7BL;MAAK,CACC,CAAC,eACV,IAAAF,WAAA,CAAAG,GAAA,EAACR,WAAA,CAAAmB,oBAAM,IAAE,CAAC;IAAA,CACH;EAAC,CACF,CAAC;AAEX;AAEe,SAASC,gBAAgBA,CAAU;EACjDC,IAAI;EACJC,KAAK;EACLC,QAAQ;EACRC;AACyB,CAAC,EAAG;EAC7B,MAAM;IAAEC;EAAO,CAAC,GAAG,IAAAC,mBAAU,EAAEC,wBAAgB,CAAC;EAEhD,MAAMC,IAAU,GAAG,IAAAC,gBAAO,EACzB,OAAc;IACbC,MAAM,EAAEC,mCAAc;IACtBN,MAAM,EAAE,IAAAO,gCAAe,EAAEV,KAAM,CAAC,GAAGA,KAAK,CAACV,QAAQ,GAAG;EACrD,CAAC,CAAE,EACH,CAAEU,KAAK,CACR,CAAC;EAED,IAAK,IAAAU,gCAAe,EAAEV,KAAM,CAAC,EAAG;IAC/B,oBACC,IAAAjB,WAAA,CAAAQ,IAAA,EAAAR,WAAA,CAAA4B,QAAA;MAAArB,QAAA,GACG,CAAEY,mBAAmB,IAAIF,KAAK,CAACY,KAAK,iBACrC,IAAA7B,WAAA,CAAAG,GAAA,EAACF,MAAM;QAACC,KAAK,EAAGe,KAAK,CAACY;MAAO,CAAE,CAC/B,eACD,IAAA7B,WAAA,CAAAG,GAAA,EAACN,eAAA,CAAAiC,cAAc;QACdd,IAAI,EAAGA,IAAM;QACbO,IAAI,EAAGA,IAAM;QACbL,QAAQ,EAAGA;MAAU,CACrB,CAAC;IAAA,CACD,CAAC;EAEL;EAEA,MAAMO,MAA+B,GAAG,IAAAM,oCAAe,EAAE;IACxD,GAAGd,KAAK,CAACQ,MAAM;IACfO,IAAI,EAAE;EACP,CAAE,CAA4B;EAE9B,MAAMC,aAAa,GAAGR,MAAM,CAACQ,aAAa;EAC1C,MAAMC,eAAe,GAAGd,MAAM,CAACe,IAAI,CAChCC,QAAQ,IAAMA,QAAQ,CAACC,EAAE,KAAKpB,KAAK,CAACoB,EACvC,CAAC;EAED,IAAK,CAAEH,eAAe,IAAI,CAAEA,eAAe,CAACI,IAAI,EAAG;IAClD,OAAO,IAAI;EACZ;EACA,IAAKL,aAAa,KAAK,MAAM,EAAG;IAC/B,oBACC,IAAAjC,WAAA,CAAAQ,IAAA,EAACb,WAAA,CAAAc,oBAAM;MAACJ,SAAS,EAAC,kCAAkC;MAAAE,QAAA,gBACnD,IAAAP,WAAA,CAAAG,GAAA;QACCE,SAAS,EAAG,IAAAkC,aAAI,EACf,wCAAwC,EACxC,0DAA2DN,aAAa,EACzE,CAAG;QAAA1B,QAAA,EAED2B,eAAe,CAACL;MAAK,CACnB,CAAC,eACN,IAAA7B,WAAA,CAAAG,GAAA;QAAKE,SAAS,EAAC,0CAA0C;QAAAE,QAAA,EACtD2B,eAAe,CAACM,QAAQ,KAAK,IAAI,gBAClC,IAAAxC,WAAA,CAAAG,GAAA,EAAC+B,eAAe,CAACO,MAAM;UACtBC,IAAI,EAAG1B,IAAM;UACbC,KAAK,EAAGiB;QAAiB,CACzB,CAAC,gBAEF,IAAAlC,WAAA,CAAAG,GAAA,EAAC+B,eAAe,CAACI,IAAI;UAEpBtB,IAAI,EAAGA,IAAM;UACbC,KAAK,EAAGiB,eAAiB;UACzBhB,QAAQ,EAAGA,QAAU;UACrBC,mBAAmB;QAAA,GAJbe,eAAe,CAACG,EAKtB;MACD,CACG,CAAC;IAAA,CACC,CAAC;EAEX;EAEA,oBACC,IAAArC,WAAA,CAAAG,GAAA;IAAKE,SAAS,EAAC,kCAAkC;IAAAE,QAAA,EAC9C2B,eAAe,CAACM,QAAQ,KAAK,IAAI,gBAClC,IAAAxC,WAAA,CAAAQ,IAAA,EAAAR,WAAA,CAAA4B,QAAA;MAAArB,QAAA,GACG,CAAEY,mBAAmB,IAAIc,aAAa,KAAK,MAAM,iBAClD,IAAAjC,WAAA,CAAAG,GAAA;QAAKE,SAAS,EAAC,wCAAwC;QAAAE,QAAA,EACpD2B,eAAe,CAACL;MAAK,CACnB,CACL,eACD,IAAA7B,WAAA,CAAAG,GAAA;QAAKE,SAAS,EAAC,0CAA0C;QAAAE,QAAA,eACxD,IAAAP,WAAA,CAAAG,GAAA,EAAC+B,eAAe,CAACO,MAAM;UACtBC,IAAI,EAAG1B,IAAM;UACbC,KAAK,EAAGiB;QAAiB,CACzB;MAAC,CACE,CAAC;IAAA,CACL,CAAC,gBAEH,IAAAlC,WAAA,CAAAG,GAAA,EAAC+B,eAAe,CAACI,IAAI;MACpBtB,IAAI,EAAGA,IAAM;MACbC,KAAK,EAAGiB,eAAiB;MACzBhB,QAAQ,EAAGA,QAAU;MACrBC,mBAAmB,EAClBc,aAAa,KAAK,MAAM,GAAG,IAAI,GAAGd;IAClC,CACD;EACD,CACG,CAAC;AAER","ignoreList":[]}

package/build/dataviews-layouts/grid/index.js

@@ -49,12 +49,14 @@ function GridItem({
   regularFields,
   badgeFields,
   hasBulkActions,
-  config
+  config,
+  posinset
 }) {
   const {
     showTitle = true,
     showMedia = true,
-    showDescription = true
+    showDescription = true,
+    infiniteScrollEnabled
   } = view;
   const hasBulkAction = (0, _dataviewsBulkActions.useHasAPossibleBulkAction)(actions, item);
   const id = getItemId(item);
@@ -85,6 +87,9 @@ function GridItem({
       };
     }
   }
+  const {
+    paginationInfo
+  } = (0, _element.useContext)(_dataviewsContext.default);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.__experimentalVStack, {
     spacing: 0,
     className: (0, _clsx.default)('dataviews-view-grid__card', {
@@ -100,6 +105,9 @@ function GridItem({
         onChangeSelection(selection.includes(id) ? selection.filter(itemId => id !== itemId) : [...selection, id]);
       }
     },
+    role: infiniteScrollEnabled ? 'article' : undefined,
+    "aria-setsize": infiniteScrollEnabled ? paginationInfo.totalItems : undefined,
+    "aria-posinset": posinset,
     children: [showMedia && renderedMediaField && /*#__PURE__*/(0, _jsxRuntime.jsx)(_itemClickWrapper.ItemClickWrapper, {
       item: item,
       isItemClickable: isItemClickable,
@@ -165,9 +173,12 @@ function GridItem({
             },
             direction: "row",
             children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.FlexItem, {
-                className: "dataviews-view-grid__field-name",
-                children: field.header
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Tooltip, {
+                text: field.label,
+                children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.FlexItem, {
+                  className: "dataviews-view-grid__field-name",
+                  children: field.header
+                })
               }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.FlexItem, {
                 className: "dataviews-view-grid__field-value",
                 style: {
@@ -248,6 +259,7 @@ function ViewGrid({
     groups.get(groupName)?.push(item);
     return groups;
   }, new Map()) : null;
+  const isInfiniteScroll = view.infiniteScrollEnabled && !dataByGroup;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [
     // Render multiple groups.
@@ -300,7 +312,8 @@ function ViewGrid({
       },
       "aria-busy": isLoading,
       ref: resizeObserverRef,
-      children: data.map(item => {
+      role: isInfiniteScroll ? 'feed' : undefined,
+      children: data.map((item, index) => {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(GridItem, {
           view: view,
           selection: selection,
@@ -319,7 +332,8 @@ function ViewGrid({
           hasBulkActions: hasBulkActions,
           config: {
             sizes: size
-          }
+          },
+          posinset: isInfiniteScroll ? index + 1 : undefined
         }, getItemId(item));
       })
     }),
@@ -332,6 +346,9 @@ function ViewGrid({
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
         children: isLoading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {}) : empty
       })
+    }), hasData && isLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+      className: "dataviews-loading-more",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {})
     })]
   });
 }