@wordpress/block-library 7.9.0 → 7.12.0

package/build-module/quote/edit.js

@@ -1,40 +1,95 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import { createElement, Fragment } from "@wordpress/element";
 
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import classNames from 'classnames';
 /**
  * WordPress dependencies
  */
 
 import { __ } from '@wordpress/i18n';
-import { AlignmentControl, BlockControls, RichText, useBlockProps } from '@wordpress/block-editor';
+import { AlignmentControl, BlockControls, RichText, useBlockProps, useInnerBlocksProps, store as blockEditorStore } from '@wordpress/block-editor';
 import { BlockQuotation } from '@wordpress/components';
+import { useDispatch, useSelect, useRegistry } from '@wordpress/data';
 import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
-import { Platform } from '@wordpress/element';
+import { Platform, useEffect } from '@wordpress/element';
+import deprecated from '@wordpress/deprecated';
+/**
+ * Internal dependencies
+ */
+
+import { migrateToQuoteV2 } from './deprecated';
 const isWebPlatform = Platform.OS === 'web';
+const TEMPLATE = [['core/paragraph', {}]];
+/**
+ * At the moment, deprecations don't handle create blocks from attributes
+ * (like when using CPT templates). For this reason, this hook is necessary
+ * to avoid breaking templates using the old quote block format.
+ *
+ * @param {Object} attributes Block attributes.
+ * @param {string} clientId   Block client ID.
+ */
+
+const useMigrateOnLoad = (attributes, clientId) => {
+  const registry = useRegistry();
+  const {
+    updateBlockAttributes,
+    replaceInnerBlocks
+  } = useDispatch(blockEditorStore);
+  useEffect(() => {
+    // As soon as the block is loaded, migrate it to the new version.
+    if (!attributes.value) {
+      // No need to migrate if it doesn't have the value attribute.
+      return;
+    }
+
+    const [newAttributes, newInnerBlocks] = migrateToQuoteV2(attributes);
+    deprecated('Value attribute on the quote block', {
+      since: '6.0',
+      version: '6.5',
+      alternative: 'inner blocks'
+    });
+    registry.batch(() => {
+      updateBlockAttributes(clientId, newAttributes);
+      replaceInnerBlocks(clientId, newInnerBlocks);
+    });
+  }, [attributes.value]);
+};
+
 export default function QuoteEdit(_ref) {
   let {
     attributes,
     setAttributes,
-    isSelected,
-    mergeBlocks,
-    onReplace,
-    className,
     insertBlocksAfter,
+    clientId,
+    className,
     style
   } = _ref;
   const {
     align,
-    value,
     citation
   } = attributes;
+  useMigrateOnLoad(attributes, clientId);
+  const hasSelection = useSelect(select => {
+    const {
+      isBlockSelected,
+      hasSelectedInnerBlock
+    } = select(blockEditorStore);
+    return hasSelectedInnerBlock(clientId) || isBlockSelected(clientId);
+  }, []);
   const blockProps = useBlockProps({
-    className: classnames(className, {
+    className: classNames(className, {
       [`has-text-align-${align}`]: align
     }),
-    style
+    ...(!isWebPlatform && {
+      style
+    })
+  });
+  const innerBlocksProps = useInnerBlocksProps(blockProps, {
+    template: TEMPLATE,
+    templateInsertUpdatesSelection: true
   });
   return createElement(Fragment, null, createElement(BlockControls, {
     group: "block"
@@ -45,48 +100,27 @@ export default function QuoteEdit(_ref) {
         align: nextAlign
       });
     }
-  })), createElement(BlockQuotation, blockProps, createElement(RichText, {
-    identifier: "value",
-    multiline: true,
-    value: value,
-    onChange: nextValue => setAttributes({
-      value: nextValue
-    }),
-    onMerge: mergeBlocks,
-    onRemove: forward => {
-      const hasEmptyCitation = !citation || citation.length === 0;
-
-      if (!forward && hasEmptyCitation) {
-        onReplace([]);
-      }
-    },
-    "aria-label": __('Quote text'),
-    placeholder: // translators: placeholder text used for the quote
-    __('Add quote'),
-    onReplace: onReplace,
-    onSplit: piece => createBlock('core/quote', { ...attributes,
-      value: piece
-    }),
-    __unstableOnSplitMiddle: () => createBlock('core/paragraph'),
-    textAlign: align,
-    __unstableEmbedURLOnPaste: true
-  }), (!RichText.isEmpty(citation) || isSelected) && createElement(RichText, {
+  })), createElement(BlockQuotation, innerBlocksProps, innerBlocksProps.children, (!RichText.isEmpty(citation) || hasSelection) && createElement(RichText, _extends({
     identifier: "citation",
     tagName: isWebPlatform ? 'cite' : undefined,
     style: {
       display: 'block'
     },
     value: citation,
-    onChange: nextCitation => setAttributes({
-      citation: nextCitation
-    }),
+    onChange: nextCitation => {
+      setAttributes({
+        citation: nextCitation
+      });
+    },
     __unstableMobileNoFocusOnMount: true,
-    "aria-label": __('Quote citation text'),
-    placeholder: // translators: placeholder text used for the citation
+    "aria-label": __('Quote citation'),
+    placeholder: // translators: placeholder text used for the
+    // citation
     __('Add citation'),
     className: "wp-block-quote__citation",
-    textAlign: align,
     __unstableOnSplitAtEnd: () => insertBlocksAfter(createBlock(getDefaultBlockName()))
-  })));
+  }, !isWebPlatform ? {
+    textAlign: align
+  } : {}))));
 }
 //# sourceMappingURL=edit.js.map

package/build-module/quote/edit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/quote/edit.js"],"names":["classnames","__","AlignmentControl","BlockControls","RichText","useBlockProps","BlockQuotation","createBlock","getDefaultBlockName","Platform","isWebPlatform","OS","QuoteEdit","attributes","setAttributes","isSelected","mergeBlocks","onReplace","className","insertBlocksAfter","style","align","value","citation","blockProps","nextAlign","nextValue","forward","hasEmptyCitation","length","piece","isEmpty","undefined","display","nextCitation"],"mappings":"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","sourcesContent":["/**\n * External dependencies\n */\nimport classnames from 'classnames';\n\n/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport {\n\tAlignmentControl,\n\tBlockControls,\n\tRichText,\n\tuseBlockProps,\n} from '@wordpress/block-editor';\nimport { BlockQuotation } from '@wordpress/components';\nimport { createBlock, getDefaultBlockName } from '@wordpress/blocks';\nimport { Platform } from '@wordpress/element';\n\nconst isWebPlatform = Platform.OS === 'web';\n\nexport default function QuoteEdit( {\n\tattributes,\n\tsetAttributes,\n\tisSelected,\n\tmergeBlocks,\n\tonReplace,\n\tclassName,\n\tinsertBlocksAfter,\n\tstyle,\n} ) {\n\tconst { align, value, citation } = attributes;\n\tconst blockProps = useBlockProps( {\n\t\tclassName: classnames( className, {\n\t\t\t[ `has-text-align-${ align }` ]: align,\n\t\t} ),\n\t\tstyle,\n\t} );\n\n\treturn (\n\t\t<>\n\t\t\t<BlockControls group=\"block\">\n\t\t\t\t<AlignmentControl\n\t\t\t\t\tvalue={ align }\n\t\t\t\t\tonChange={ ( nextAlign ) => {\n\t\t\t\t\t\tsetAttributes( { align: nextAlign } );\n\t\t\t\t\t} }\n\t\t\t\t/>\n\t\t\t</BlockControls>\n\t\t\t<BlockQuotation { ...blockProps }>\n\t\t\t\t<RichText\n\t\t\t\t\tidentifier=\"value\"\n\t\t\t\t\tmultiline\n\t\t\t\t\tvalue={ value }\n\t\t\t\t\tonChange={ ( nextValue ) =>\n\t\t\t\t\t\tsetAttributes( {\n\t\t\t\t\t\t\tvalue: nextValue,\n\t\t\t\t\t\t} )\n\t\t\t\t\t}\n\t\t\t\t\tonMerge={ mergeBlocks }\n\t\t\t\t\tonRemove={ ( forward ) => {\n\t\t\t\t\t\tconst hasEmptyCitation =\n\t\t\t\t\t\t\t! citation || citation.length === 0;\n\t\t\t\t\t\tif ( ! forward && hasEmptyCitation ) {\n\t\t\t\t\t\t\tonReplace( [] );\n\t\t\t\t\t\t}\n\t\t\t\t\t} }\n\t\t\t\t\taria-label={ __( 'Quote text' ) }\n\t\t\t\t\tplaceholder={\n\t\t\t\t\t\t// translators: placeholder text used for the quote\n\t\t\t\t\t\t__( 'Add quote' )\n\t\t\t\t\t}\n\t\t\t\t\tonReplace={ onReplace }\n\t\t\t\t\tonSplit={ ( piece ) =>\n\t\t\t\t\t\tcreateBlock( 'core/quote', {\n\t\t\t\t\t\t\t...attributes,\n\t\t\t\t\t\t\tvalue: piece,\n\t\t\t\t\t\t} )\n\t\t\t\t\t}\n\t\t\t\t\t__unstableOnSplitMiddle={ () =>\n\t\t\t\t\t\tcreateBlock( 'core/paragraph' )\n\t\t\t\t\t}\n\t\t\t\t\ttextAlign={ align }\n\t\t\t\t\t__unstableEmbedURLOnPaste\n\t\t\t\t/>\n\t\t\t\t{ ( ! RichText.isEmpty( citation ) || isSelected ) && (\n\t\t\t\t\t<RichText\n\t\t\t\t\t\tidentifier=\"citation\"\n\t\t\t\t\t\ttagName={ isWebPlatform ? 'cite' : undefined }\n\t\t\t\t\t\tstyle={ { display: 'block' } }\n\t\t\t\t\t\tvalue={ citation }\n\t\t\t\t\t\tonChange={ ( nextCitation ) =>\n\t\t\t\t\t\t\tsetAttributes( {\n\t\t\t\t\t\t\t\tcitation: nextCitation,\n\t\t\t\t\t\t\t} )\n\t\t\t\t\t\t}\n\t\t\t\t\t\t__unstableMobileNoFocusOnMount\n\t\t\t\t\t\taria-label={ __( 'Quote citation text' ) }\n\t\t\t\t\t\tplaceholder={\n\t\t\t\t\t\t\t// translators: placeholder text used for the citation\n\t\t\t\t\t\t\t__( 'Add citation' )\n\t\t\t\t\t\t}\n\t\t\t\t\t\tclassName=\"wp-block-quote__citation\"\n\t\t\t\t\t\ttextAlign={ align }\n\t\t\t\t\t\t__unstableOnSplitAtEnd={ () =>\n\t\t\t\t\t\t\tinsertBlocksAfter(\n\t\t\t\t\t\t\t\tcreateBlock( getDefaultBlockName() )\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t}\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t</BlockQuotation>\n\t\t</>\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/quote/edit.js"],"names":["classNames","__","AlignmentControl","BlockControls","RichText","useBlockProps","useInnerBlocksProps","store","blockEditorStore","BlockQuotation","useDispatch","useSelect","useRegistry","createBlock","getDefaultBlockName","Platform","useEffect","deprecated","migrateToQuoteV2","isWebPlatform","OS","TEMPLATE","useMigrateOnLoad","attributes","clientId","registry","updateBlockAttributes","replaceInnerBlocks","value","newAttributes","newInnerBlocks","since","version","alternative","batch","QuoteEdit","setAttributes","insertBlocksAfter","className","style","align","citation","hasSelection","select","isBlockSelected","hasSelectedInnerBlock","blockProps","innerBlocksProps","template","templateInsertUpdatesSelection","nextAlign","children","isEmpty","undefined","display","nextCitation","textAlign"],"mappings":"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","sourcesContent":["/**\n * External dependencies\n */\nimport classNames from 'classnames';\n\n/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport {\n\tAlignmentControl,\n\tBlockControls,\n\tRichText,\n\tuseBlockProps,\n\tuseInnerBlocksProps,\n\tstore as blockEditorStore,\n} from '@wordpress/block-editor';\nimport { BlockQuotation } from '@wordpress/components';\nimport { useDispatch, useSelect, useRegistry } from '@wordpress/data';\nimport { createBlock, getDefaultBlockName } from '@wordpress/blocks';\nimport { Platform, useEffect } from '@wordpress/element';\nimport deprecated from '@wordpress/deprecated';\n\n/**\n * Internal dependencies\n */\nimport { migrateToQuoteV2 } from './deprecated';\n\nconst isWebPlatform = Platform.OS === 'web';\n\nconst TEMPLATE = [ [ 'core/paragraph', {} ] ];\n\n/**\n * At the moment, deprecations don't handle create blocks from attributes\n * (like when using CPT templates). For this reason, this hook is necessary\n * to avoid breaking templates using the old quote block format.\n *\n * @param {Object} attributes Block attributes.\n * @param {string} clientId   Block client ID.\n */\nconst useMigrateOnLoad = ( attributes, clientId ) => {\n\tconst registry = useRegistry();\n\tconst { updateBlockAttributes, replaceInnerBlocks } =\n\t\tuseDispatch( blockEditorStore );\n\tuseEffect( () => {\n\t\t// As soon as the block is loaded, migrate it to the new version.\n\n\t\tif ( ! attributes.value ) {\n\t\t\t// No need to migrate if it doesn't have the value attribute.\n\t\t\treturn;\n\t\t}\n\n\t\tconst [ newAttributes, newInnerBlocks ] =\n\t\t\tmigrateToQuoteV2( attributes );\n\n\t\tdeprecated( 'Value attribute on the quote block', {\n\t\t\tsince: '6.0',\n\t\t\tversion: '6.5',\n\t\t\talternative: 'inner blocks',\n\t\t} );\n\n\t\tregistry.batch( () => {\n\t\t\tupdateBlockAttributes( clientId, newAttributes );\n\t\t\treplaceInnerBlocks( clientId, newInnerBlocks );\n\t\t} );\n\t}, [ attributes.value ] );\n};\n\nexport default function QuoteEdit( {\n\tattributes,\n\tsetAttributes,\n\tinsertBlocksAfter,\n\tclientId,\n\tclassName,\n\tstyle,\n} ) {\n\tconst { align, citation } = attributes;\n\n\tuseMigrateOnLoad( attributes, clientId );\n\n\tconst hasSelection = useSelect( ( select ) => {\n\t\tconst { isBlockSelected, hasSelectedInnerBlock } =\n\t\t\tselect( blockEditorStore );\n\t\treturn hasSelectedInnerBlock( clientId ) || isBlockSelected( clientId );\n\t}, [] );\n\n\tconst blockProps = useBlockProps( {\n\t\tclassName: classNames( className, {\n\t\t\t[ `has-text-align-${ align }` ]: align,\n\t\t} ),\n\t\t...( ! isWebPlatform && { style } ),\n\t} );\n\tconst innerBlocksProps = useInnerBlocksProps( blockProps, {\n\t\ttemplate: TEMPLATE,\n\t\ttemplateInsertUpdatesSelection: true,\n\t} );\n\n\treturn (\n\t\t<>\n\t\t\t<BlockControls group=\"block\">\n\t\t\t\t<AlignmentControl\n\t\t\t\t\tvalue={ align }\n\t\t\t\t\tonChange={ ( nextAlign ) => {\n\t\t\t\t\t\tsetAttributes( { align: nextAlign } );\n\t\t\t\t\t} }\n\t\t\t\t/>\n\t\t\t</BlockControls>\n\t\t\t<BlockQuotation { ...innerBlocksProps }>\n\t\t\t\t{ innerBlocksProps.children }\n\t\t\t\t{ ( ! RichText.isEmpty( citation ) || hasSelection ) && (\n\t\t\t\t\t<RichText\n\t\t\t\t\t\tidentifier=\"citation\"\n\t\t\t\t\t\ttagName={ isWebPlatform ? 'cite' : undefined }\n\t\t\t\t\t\tstyle={ { display: 'block' } }\n\t\t\t\t\t\tvalue={ citation }\n\t\t\t\t\t\tonChange={ ( nextCitation ) => {\n\t\t\t\t\t\t\tsetAttributes( {\n\t\t\t\t\t\t\t\tcitation: nextCitation,\n\t\t\t\t\t\t\t} );\n\t\t\t\t\t\t} }\n\t\t\t\t\t\t__unstableMobileNoFocusOnMount\n\t\t\t\t\t\taria-label={ __( 'Quote citation' ) }\n\t\t\t\t\t\tplaceholder={\n\t\t\t\t\t\t\t// translators: placeholder text used for the\n\t\t\t\t\t\t\t// citation\n\t\t\t\t\t\t\t__( 'Add citation' )\n\t\t\t\t\t\t}\n\t\t\t\t\t\tclassName=\"wp-block-quote__citation\"\n\t\t\t\t\t\t__unstableOnSplitAtEnd={ () =>\n\t\t\t\t\t\t\tinsertBlocksAfter(\n\t\t\t\t\t\t\t\tcreateBlock( getDefaultBlockName() )\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t}\n\t\t\t\t\t\t{ ...( ! isWebPlatform ? { textAlign: align } : {} ) }\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t</BlockQuotation>\n\t\t</>\n\t);\n}\n"]}

package/build-module/quote/index.js

@@ -76,56 +76,26 @@ const metadata = {
 };
 import save from './save';
 import transforms from './transforms';
-import settingsV2 from './v2';
 const {
   name
 } = metadata;
-export { metadata, name, settingsV2 };
-export const settingsV1 = {
+export { metadata, name };
+export const settings = {
   icon,
   example: {
     attributes: {
-      value: '<p>' + __('In quoting others, we cite ourselves.') + '</p>',
       citation: 'Julio Cortázar'
-    }
+    },
+    innerBlocks: [{
+      name: 'core/paragraph',
+      attributes: {
+        content: __('In quoting others, we cite ourselves.')
+      }
+    }]
   },
   transforms,
   edit,
   save,
-
-  merge(attributes, _ref) {
-    let {
-      value,
-      citation
-    } = _ref;
-
-    // Quote citations cannot be merged. Pick the second one unless it's
-    // empty.
-    if (!citation) {
-      citation = attributes.citation;
-    }
-
-    if (!value || value === '<p></p>') {
-      return { ...attributes,
-        citation
-      };
-    }
-
-    return { ...attributes,
-      value: attributes.value + value,
-      citation
-    };
-  },
-
   deprecated
 };
-let settings = settingsV1;
-
-if (process.env.IS_GUTENBERG_PLUGIN) {
-  var _window;
-
-  settings = (_window = window) !== null && _window !== void 0 && _window.__experimentalEnableQuoteBlockV2 ? settingsV2 : settingsV1;
-}
-
-export { settings };
 //# sourceMappingURL=index.js.map

package/build-module/quote/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/quote/index.js"],"names":["__","quote","icon","deprecated","edit","save","transforms","settingsV2","name","metadata","settingsV1","example","attributes","value","citation","merge","settings","process","env","IS_GUTENBERG_PLUGIN","window","__experimentalEnableQuoteBlockV2"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,EAAT,QAAmB,iBAAnB;AACA,SAASC,KAAK,IAAIC,IAAlB,QAA8B,kBAA9B;AAEA;AACA;AACA;;AACA,OAAOC,UAAP,MAAuB,cAAvB;AACA,OAAOC,IAAP,MAAiB,QAAjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,OAAOC,IAAP,MAAiB,QAAjB;AACA,OAAOC,UAAP,MAAuB,cAAvB;AACA,OAAOC,UAAP,MAAuB,MAAvB;AAEA,MAAM;AAAEC,EAAAA;AAAF,IAAWC,QAAjB;AAEA,SAASA,QAAT,EAAmBD,IAAnB,EAAyBD,UAAzB;AAEA,OAAO,MAAMG,UAAU,GAAG;AACzBR,EAAAA,IADyB;AAEzBS,EAAAA,OAAO,EAAE;AACRC,IAAAA,UAAU,EAAE;AACXC,MAAAA,KAAK,EACJ,QAAQb,EAAE,CAAE,uCAAF,CAAV,GAAwD,MAF9C;AAGXc,MAAAA,QAAQ,EAAE;AAHC;AADJ,GAFgB;AASzBR,EAAAA,UATyB;AAUzBF,EAAAA,IAVyB;AAWzBC,EAAAA,IAXyB;;AAYzBU,EAAAA,KAAK,CAAEH,UAAF,QAAoC;AAAA,QAAtB;AAAEC,MAAAA,KAAF;AAASC,MAAAA;AAAT,KAAsB;;AACxC;AACA;AACA,QAAK,CAAEA,QAAP,EAAkB;AACjBA,MAAAA,QAAQ,GAAGF,UAAU,CAACE,QAAtB;AACA;;AAED,QAAK,CAAED,KAAF,IAAWA,KAAK,KAAK,SAA1B,EAAsC;AACrC,aAAO,EACN,GAAGD,UADG;AAENE,QAAAA;AAFM,OAAP;AAIA;;AAED,WAAO,EACN,GAAGF,UADG;AAENC,MAAAA,KAAK,EAAED,UAAU,CAACC,KAAX,GAAmBA,KAFpB;AAGNC,MAAAA;AAHM,KAAP;AAKA,GA/BwB;;AAgCzBX,EAAAA;AAhCyB,CAAnB;AAmCP,IAAIa,QAAQ,GAAGN,UAAf;;AACA,IAAKO,OAAO,CAACC,GAAR,CAAYC,mBAAjB,EAAuC;AAAA;;AACtCH,EAAAA,QAAQ,GAAG,WAAAI,MAAM,UAAN,kCAAQC,gCAAR,GACRd,UADQ,GAERG,UAFH;AAGA;;AACD,SAASM,QAAT","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { quote as icon } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport deprecated from './deprecated';\nimport edit from './edit';\nimport metadata from './block.json';\nimport save from './save';\nimport transforms from './transforms';\nimport settingsV2 from './v2';\n\nconst { name } = metadata;\n\nexport { metadata, name, settingsV2 };\n\nexport const settingsV1 = {\n\ticon,\n\texample: {\n\t\tattributes: {\n\t\t\tvalue:\n\t\t\t\t'<p>' + __( 'In quoting others, we cite ourselves.' ) + '</p>',\n\t\t\tcitation: 'Julio Cortázar',\n\t\t},\n\t},\n\ttransforms,\n\tedit,\n\tsave,\n\tmerge( attributes, { value, citation } ) {\n\t\t// Quote citations cannot be merged. Pick the second one unless it's\n\t\t// empty.\n\t\tif ( ! citation ) {\n\t\t\tcitation = attributes.citation;\n\t\t}\n\n\t\tif ( ! value || value === '<p></p>' ) {\n\t\t\treturn {\n\t\t\t\t...attributes,\n\t\t\t\tcitation,\n\t\t\t};\n\t\t}\n\n\t\treturn {\n\t\t\t...attributes,\n\t\t\tvalue: attributes.value + value,\n\t\t\tcitation,\n\t\t};\n\t},\n\tdeprecated,\n};\n\nlet settings = settingsV1;\nif ( process.env.IS_GUTENBERG_PLUGIN ) {\n\tsettings = window?.__experimentalEnableQuoteBlockV2\n\t\t? settingsV2\n\t\t: settingsV1;\n}\nexport { settings };\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/quote/index.js"],"names":["__","quote","icon","deprecated","edit","save","transforms","name","metadata","settings","example","attributes","citation","innerBlocks","content"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,EAAT,QAAmB,iBAAnB;AACA,SAASC,KAAK,IAAIC,IAAlB,QAA8B,kBAA9B;AAEA;AACA;AACA;;AACA,OAAOC,UAAP,MAAuB,cAAvB;AACA,OAAOC,IAAP,MAAiB,QAAjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,OAAOC,IAAP,MAAiB,QAAjB;AACA,OAAOC,UAAP,MAAuB,cAAvB;AAEA,MAAM;AAAEC,EAAAA;AAAF,IAAWC,QAAjB;AAEA,SAASA,QAAT,EAAmBD,IAAnB;AAEA,OAAO,MAAME,QAAQ,GAAG;AACvBP,EAAAA,IADuB;AAEvBQ,EAAAA,OAAO,EAAE;AACRC,IAAAA,UAAU,EAAE;AACXC,MAAAA,QAAQ,EAAE;AADC,KADJ;AAIRC,IAAAA,WAAW,EAAE,CACZ;AACCN,MAAAA,IAAI,EAAE,gBADP;AAECI,MAAAA,UAAU,EAAE;AACXG,QAAAA,OAAO,EAAEd,EAAE,CAAE,uCAAF;AADA;AAFb,KADY;AAJL,GAFc;AAevBM,EAAAA,UAfuB;AAgBvBF,EAAAA,IAhBuB;AAiBvBC,EAAAA,IAjBuB;AAkBvBF,EAAAA;AAlBuB,CAAjB","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { quote as icon } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport deprecated from './deprecated';\nimport edit from './edit';\nimport metadata from './block.json';\nimport save from './save';\nimport transforms from './transforms';\n\nconst { name } = metadata;\n\nexport { metadata, name };\n\nexport const settings = {\n\ticon,\n\texample: {\n\t\tattributes: {\n\t\t\tcitation: 'Julio Cortázar',\n\t\t},\n\t\tinnerBlocks: [\n\t\t\t{\n\t\t\t\tname: 'core/paragraph',\n\t\t\t\tattributes: {\n\t\t\t\t\tcontent: __( 'In quoting others, we cite ourselves.' ),\n\t\t\t\t},\n\t\t\t},\n\t\t],\n\t},\n\ttransforms,\n\tedit,\n\tsave,\n\tdeprecated,\n};\n"]}

package/build-module/quote/save.js

@@ -3,30 +3,26 @@ import { createElement } from "@wordpress/element";
 /**
  * External dependencies
  */
-import classnames from 'classnames';
+import classNames from 'classnames';
 /**
  * WordPress dependencies
  */
 
-import { RichText, useBlockProps } from '@wordpress/block-editor';
+import { InnerBlocks, RichText, useBlockProps } from '@wordpress/block-editor';
 export default function save(_ref) {
   let {
     attributes
   } = _ref;
   const {
     align,
-    value,
     citation
   } = attributes;
-  const className = classnames({
+  const className = classNames({
     [`has-text-align-${align}`]: align
   });
   return createElement("blockquote", useBlockProps.save({
     className
-  }), createElement(RichText.Content, {
-    multiline: true,
-    value: value
-  }), !RichText.isEmpty(citation) && createElement(RichText.Content, {
+  }), createElement(InnerBlocks.Content, null), !RichText.isEmpty(citation) && createElement(RichText.Content, {
     tagName: "cite",
     value: citation
   }));

package/build-module/quote/save.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/quote/save.js"],"names":["classnames","RichText","useBlockProps","save","attributes","align","value","citation","className","isEmpty"],"mappings":";;AAAA;AACA;AACA;AACA,OAAOA,UAAP,MAAuB,YAAvB;AAEA;AACA;AACA;;AACA,SAASC,QAAT,EAAmBC,aAAnB,QAAwC,yBAAxC;AAEA,eAAe,SAASC,IAAT,OAAgC;AAAA,MAAjB;AAAEC,IAAAA;AAAF,GAAiB;AAC9C,QAAM;AAAEC,IAAAA,KAAF;AAASC,IAAAA,KAAT;AAAgBC,IAAAA;AAAhB,MAA6BH,UAAnC;AAEA,QAAMI,SAAS,GAAGR,UAAU,CAAE;AAC7B,KAAG,kBAAkBK,KAAO,EAA5B,GAAiCA;AADJ,GAAF,CAA5B;AAIA,SACC,4BAAiBH,aAAa,CAACC,IAAd,CAAoB;AAAEK,IAAAA;AAAF,GAApB,CAAjB,EACC,cAAC,QAAD,CAAU,OAAV;AAAkB,IAAA,SAAS,MAA3B;AAA4B,IAAA,KAAK,EAAGF;AAApC,IADD,EAEG,CAAEL,QAAQ,CAACQ,OAAT,CAAkBF,QAAlB,CAAF,IACD,cAAC,QAAD,CAAU,OAAV;AAAkB,IAAA,OAAO,EAAC,MAA1B;AAAiC,IAAA,KAAK,EAAGA;AAAzC,IAHF,CADD;AAQA","sourcesContent":["/**\n * External dependencies\n */\nimport classnames from 'classnames';\n\n/**\n * WordPress dependencies\n */\nimport { RichText, useBlockProps } from '@wordpress/block-editor';\n\nexport default function save( { attributes } ) {\n\tconst { align, value, citation } = attributes;\n\n\tconst className = classnames( {\n\t\t[ `has-text-align-${ align }` ]: align,\n\t} );\n\n\treturn (\n\t\t<blockquote { ...useBlockProps.save( { className } ) }>\n\t\t\t<RichText.Content multiline value={ value } />\n\t\t\t{ ! RichText.isEmpty( citation ) && (\n\t\t\t\t<RichText.Content tagName=\"cite\" value={ citation } />\n\t\t\t) }\n\t\t</blockquote>\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/quote/save.js"],"names":["classNames","InnerBlocks","RichText","useBlockProps","save","attributes","align","citation","className","isEmpty"],"mappings":";;AAAA;AACA;AACA;AACA,OAAOA,UAAP,MAAuB,YAAvB;AAEA;AACA;AACA;;AACA,SAASC,WAAT,EAAsBC,QAAtB,EAAgCC,aAAhC,QAAqD,yBAArD;AAEA,eAAe,SAASC,IAAT,OAAgC;AAAA,MAAjB;AAAEC,IAAAA;AAAF,GAAiB;AAC9C,QAAM;AAAEC,IAAAA,KAAF;AAASC,IAAAA;AAAT,MAAsBF,UAA5B;AAEA,QAAMG,SAAS,GAAGR,UAAU,CAAE;AAC7B,KAAG,kBAAkBM,KAAO,EAA5B,GAAiCA;AADJ,GAAF,CAA5B;AAIA,SACC,4BAAiBH,aAAa,CAACC,IAAd,CAAoB;AAAEI,IAAAA;AAAF,GAApB,CAAjB,EACC,cAAC,WAAD,CAAa,OAAb,OADD,EAEG,CAAEN,QAAQ,CAACO,OAAT,CAAkBF,QAAlB,CAAF,IACD,cAAC,QAAD,CAAU,OAAV;AAAkB,IAAA,OAAO,EAAC,MAA1B;AAAiC,IAAA,KAAK,EAAGA;AAAzC,IAHF,CADD;AAQA","sourcesContent":["/**\n * External dependencies\n */\nimport classNames from 'classnames';\n\n/**\n * WordPress dependencies\n */\nimport { InnerBlocks, RichText, useBlockProps } from '@wordpress/block-editor';\n\nexport default function save( { attributes } ) {\n\tconst { align, citation } = attributes;\n\n\tconst className = classNames( {\n\t\t[ `has-text-align-${ align }` ]: align,\n\t} );\n\n\treturn (\n\t\t<blockquote { ...useBlockProps.save( { className } ) }>\n\t\t\t<InnerBlocks.Content />\n\t\t\t{ ! RichText.isEmpty( citation ) && (\n\t\t\t\t<RichText.Content tagName=\"cite\" value={ citation } />\n\t\t\t) }\n\t\t</blockquote>\n\t);\n}\n"]}

package/build-module/quote/transforms.js

@@ -1,198 +1,151 @@
 /**
  * WordPress dependencies
  */
-import { createBlock } from '@wordpress/blocks';
-import { create, join, split, toHTMLString } from '@wordpress/rich-text';
+import { createBlock, parseWithAttributeSchema } from '@wordpress/blocks';
 const transforms = {
   from: [{
     type: 'block',
-    isMultiBlock: true,
-    blocks: ['core/paragraph'],
-    transform: attributes => {
-      return createBlock('core/quote', {
-        value: toHTMLString({
-          value: join(attributes.map(_ref => {
-            let {
-              content
-            } = _ref;
-            return create({
-              html: content
-            });
-          }), '\u2028'),
-          multilineTag: 'p'
-        }),
-        anchor: attributes.anchor
-      });
-    }
-  }, {
-    type: 'block',
-    blocks: ['core/heading'],
-    transform: _ref2 => {
+    blocks: ['core/pullquote'],
+    transform: _ref => {
       let {
-        content,
-        anchor
-      } = _ref2;
+        value,
+        citation,
+        anchor,
+        fontSize,
+        style
+      } = _ref;
       return createBlock('core/quote', {
-        value: `<p>${content}</p>`,
-        anchor
-      });
+        citation,
+        anchor,
+        fontSize,
+        style
+      }, parseWithAttributeSchema(value, {
+        type: 'array',
+        source: 'query',
+        selector: 'p',
+        query: {
+          content: {
+            type: 'string',
+            source: 'html'
+          }
+        }
+      }).map(_ref2 => {
+        let {
+          content
+        } = _ref2;
+        return createBlock('core/paragraph', {
+          content
+        });
+      }));
     }
   }, {
     type: 'block',
-    blocks: ['core/pullquote'],
-    transform: _ref3 => {
+    blocks: ['core/group'],
+    transform: (_ref3, innerBlocks) => {
       let {
-        value,
-        citation,
         anchor
       } = _ref3;
       return createBlock('core/quote', {
-        value,
-        citation,
         anchor
-      });
+      }, innerBlocks);
     }
   }, {
     type: 'prefix',
     prefix: '>',
-    transform: content => {
-      return createBlock('core/quote', {
-        value: `<p>${content}</p>`
-      });
-    }
+    transform: content => createBlock('core/quote', {}, [createBlock('core/paragraph', {
+      content
+    })])
   }, {
     type: 'raw',
-    isMatch: node => {
-      const isParagraphOrSingleCite = (() => {
-        let hasCitation = false;
-        return child => {
-          // Child is a paragraph.
-          if (child.nodeName === 'P') {
-            return true;
-          } // Child is a cite and no other cite child exists before it.
-
-
-          if (!hasCitation && child.nodeName === 'CITE') {
-            hasCitation = true;
-            return true;
-          }
-        };
-      })();
-
-      return node.nodeName === 'BLOCKQUOTE' && // The quote block can only handle multiline paragraph
-      // content with an optional cite child.
-      Array.from(node.childNodes).every(isParagraphOrSingleCite);
-    },
-    schema: _ref4 => {
-      let {
-        phrasingContentSchema
-      } = _ref4;
-      return {
-        blockquote: {
-          children: {
-            p: {
-              children: phrasingContentSchema
-            },
-            cite: {
-              children: phrasingContentSchema
-            }
-          }
-        }
-      };
-    }
-  }],
-  to: [{
-    type: 'block',
-    blocks: ['core/paragraph'],
-    transform: _ref5 => {
-      let {
-        value,
-        citation
-      } = _ref5;
-      const paragraphs = [];
-
-      if (value && value !== '<p></p>') {
-        paragraphs.push(...split(create({
-          html: value,
-          multilineTag: 'p'
-        }), '\u2028').map(piece => createBlock('core/paragraph', {
-          content: toHTMLString({
-            value: piece
-          })
-        })));
+    schema: () => ({
+      blockquote: {
+        children: '*'
       }
-
-      if (citation && citation !== '<p></p>') {
-        paragraphs.push(createBlock('core/paragraph', {
-          content: citation
-        }));
-      }
-
-      if (paragraphs.length === 0) {
-        return createBlock('core/paragraph', {
-          content: ''
-        });
-      }
-
-      return paragraphs;
+    }),
+    selector: 'blockquote',
+    transform: (node, handler) => {
+      return createBlock('core/quote', // Don't try to parse any `cite` out of this content.
+      // * There may be more than one cite.
+      // * There may be more attribution text than just the cite.
+      // * If the cite is nested in the quoted text, it's wrong to
+      //   remove it.
+      {}, handler({
+        HTML: node.innerHTML,
+        mode: 'BLOCKS'
+      }));
     }
   }, {
     type: 'block',
-    blocks: ['core/heading'],
-    transform: _ref6 => {
+    isMultiBlock: true,
+    blocks: ['*'],
+    isMatch: (_ref4, blocks) => {
+      let {} = _ref4;
+      return !blocks.some(_ref5 => {
+        let {
+          name
+        } = _ref5;
+        return name === 'core/quote';
+      });
+    },
+    __experimentalConvert: blocks => createBlock('core/quote', {}, blocks.map(block => createBlock(block.name, block.attributes, block.innerBlocks)))
+  }],
+  to: [{
+    type: 'block',
+    blocks: ['core/pullquote'],
+    isMatch: (_ref6, block) => {
+      let {} = _ref6;
+      return block.innerBlocks.every(_ref7 => {
+        let {
+          name
+        } = _ref7;
+        return name === 'core/paragraph';
+      });
+    },
+    transform: (_ref8, innerBlocks) => {
       let {
-        value,
         citation,
-        ...attrs
-      } = _ref6;
-
-      // If there is no quote content, use the citation as the
-      // content of the resulting heading. A nonexistent citation
-      // will result in an empty heading.
-      if (value === '<p></p>') {
-        return createBlock('core/heading', {
-          content: citation
-        });
-      }
-
-      const pieces = split(create({
-        html: value,
-        multilineTag: 'p'
-      }), '\u2028');
-      const headingBlock = createBlock('core/heading', {
-        content: toHTMLString({
-          value: pieces[0]
-        })
-      });
-
-      if (!citation && pieces.length === 1) {
-        return headingBlock;
-      }
-
-      const quotePieces = pieces.slice(1);
-      const quoteBlock = createBlock('core/quote', { ...attrs,
+        anchor,
+        fontSize,
+        style
+      } = _ref8;
+      const value = innerBlocks.map(_ref9 => {
+        let {
+          attributes
+        } = _ref9;
+        return `<p>${attributes.content}</p>`;
+      }).join('');
+      return createBlock('core/pullquote', {
+        value,
         citation,
-        value: toHTMLString({
-          value: quotePieces.length ? join(pieces.slice(1), '\u2028') : create(),
-          multilineTag: 'p'
-        })
+        anchor,
+        fontSize,
+        style
       });
-      return [headingBlock, quoteBlock];
     }
   }, {
     type: 'block',
-    blocks: ['core/pullquote'],
-    transform: _ref7 => {
+    blocks: ['core/group'],
+    transform: (_ref10, innerBlocks) => {
       let {
-        value,
         citation,
         anchor
-      } = _ref7;
-      return createBlock('core/pullquote', {
-        value,
-        citation,
+      } = _ref10;
+      return createBlock('core/group', {
         anchor
-      });
+      }, citation ? [...innerBlocks, createBlock('core/paragraph', {
+        content: citation
+      })] : innerBlocks);
+    }
+  }, {
+    type: 'block',
+    blocks: ['*'],
+    transform: (_ref11, innerBlocks) => {
+      let {
+        citation
+      } = _ref11;
+      return citation ? [...innerBlocks, createBlock('core/paragraph', {
+        content: citation
+      })] : innerBlocks;
     }
   }]
 };