@wordpress/block-library 7.8.0 → 7.11.0

package/build/quote/edit.js

@@ -9,6 +9,8 @@ exports.default = QuoteEdit;
 
 var _element = require("@wordpress/element");
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _i18n = require("@wordpress/i18n");
@@ -17,8 +19,14 @@ var _blockEditor = require("@wordpress/block-editor");
 
 var _components = require("@wordpress/components");
 
+var _data = require("@wordpress/data");
+
 var _blocks = require("@wordpress/blocks");
 
+var _deprecated = _interopRequireDefault(require("@wordpress/deprecated"));
+
+var _deprecated2 = require("./deprecated");
+
 /**
  * External dependencies
  */
@@ -26,29 +34,79 @@ var _blocks = require("@wordpress/blocks");
 /**
  * WordPress dependencies
  */
+
+/**
+ * Internal dependencies
+ */
 const isWebPlatform = _element.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 = (0, _data.useRegistry)();
+  const {
+    updateBlockAttributes,
+    replaceInnerBlocks
+  } = (0, _data.useDispatch)(_blockEditor.store);
+  (0, _element.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] = (0, _deprecated2.migrateToQuoteV2)(attributes);
+    (0, _deprecated.default)('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]);
+};
 
 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 = (0, _data.useSelect)(select => {
+    const {
+      isBlockSelected,
+      hasSelectedInnerBlock
+    } = select(_blockEditor.store);
+    return hasSelectedInnerBlock(clientId) || isBlockSelected(clientId);
+  }, []);
   const blockProps = (0, _blockEditor.useBlockProps)({
     className: (0, _classnames.default)(className, {
       [`has-text-align-${align}`]: align
     }),
-    style
+    ...(!isWebPlatform && {
+      style
+    })
+  });
+  const innerBlocksProps = (0, _blockEditor.useInnerBlocksProps)(blockProps, {
+    template: TEMPLATE,
+    templateInsertUpdatesSelection: true
   });
   return (0, _element.createElement)(_element.Fragment, null, (0, _element.createElement)(_blockEditor.BlockControls, {
     group: "block"
@@ -59,48 +117,27 @@ function QuoteEdit(_ref) {
         align: nextAlign
       });
     }
-  })), (0, _element.createElement)(_components.BlockQuotation, blockProps, (0, _element.createElement)(_blockEditor.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": (0, _i18n.__)('Quote text'),
-    placeholder: // translators: placeholder text used for the quote
-    (0, _i18n.__)('Add quote'),
-    onReplace: onReplace,
-    onSplit: piece => (0, _blocks.createBlock)('core/quote', { ...attributes,
-      value: piece
-    }),
-    __unstableOnSplitMiddle: () => (0, _blocks.createBlock)('core/paragraph'),
-    textAlign: align,
-    __unstableEmbedURLOnPaste: true
-  }), (!_blockEditor.RichText.isEmpty(citation) || isSelected) && (0, _element.createElement)(_blockEditor.RichText, {
+  })), (0, _element.createElement)(_components.BlockQuotation, innerBlocksProps, innerBlocksProps.children, (!_blockEditor.RichText.isEmpty(citation) || hasSelection) && (0, _element.createElement)(_blockEditor.RichText, (0, _extends2.default)({
     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": (0, _i18n.__)('Quote citation text'),
-    placeholder: // translators: placeholder text used for the citation
+    "aria-label": (0, _i18n.__)('Quote citation'),
+    placeholder: // translators: placeholder text used for the
+    // citation
     (0, _i18n.__)('Add citation'),
     className: "wp-block-quote__citation",
-    textAlign: align,
     __unstableOnSplitAtEnd: () => insertBlocksAfter((0, _blocks.createBlock)((0, _blocks.getDefaultBlockName)()))
-  })));
+  }, !isWebPlatform ? {
+    textAlign: align
+  } : {}))));
 }
 //# sourceMappingURL=edit.js.map

package/build/quote/edit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/quote/edit.js"],"names":["isWebPlatform","Platform","OS","QuoteEdit","attributes","setAttributes","isSelected","mergeBlocks","onReplace","className","insertBlocksAfter","style","align","value","citation","blockProps","nextAlign","nextValue","forward","hasEmptyCitation","length","piece","RichText","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":["isWebPlatform","Platform","OS","TEMPLATE","useMigrateOnLoad","attributes","clientId","registry","updateBlockAttributes","replaceInnerBlocks","blockEditorStore","value","newAttributes","newInnerBlocks","since","version","alternative","batch","QuoteEdit","setAttributes","insertBlocksAfter","className","style","align","citation","hasSelection","select","isBlockSelected","hasSelectedInnerBlock","blockProps","innerBlocksProps","template","templateInsertUpdatesSelection","nextAlign","children","RichText","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/quote/index.js

@@ -5,13 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.settingsV1 = exports.settings = exports.name = exports.metadata = void 0;
-Object.defineProperty(exports, "settingsV2", {
-  enumerable: true,
-  get: function () {
-    return _v.default;
-  }
-});
+exports.settings = exports.name = exports.metadata = void 0;
 
 var _i18n = require("@wordpress/i18n");
 
@@ -25,8 +19,6 @@ var _save = _interopRequireDefault(require("./save"));
 
 var _transforms = _interopRequireDefault(require("./transforms"));
 
-var _v = _interopRequireDefault(require("./v2"));
-
 /**
  * WordPress dependencies
  */
@@ -104,51 +96,23 @@ const {
   name
 } = metadata;
 exports.name = name;
-const settingsV1 = {
+const settings = {
   icon: _icons.quote,
   example: {
     attributes: {
-      value: '<p>' + (0, _i18n.__)('In quoting others, we cite ourselves.') + '</p>',
       citation: 'Julio Cortázar'
-    }
+    },
+    innerBlocks: [{
+      name: 'core/paragraph',
+      attributes: {
+        content: (0, _i18n.__)('In quoting others, we cite ourselves.')
+      }
+    }]
   },
   transforms: _transforms.default,
   edit: _edit.default,
   save: _save.default,
-
-  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: _deprecated.default
 };
-exports.settingsV1 = settingsV1;
-let settings = settingsV1;
 exports.settings = settings;
-
-if (process.env.IS_GUTENBERG_PLUGIN) {
-  var _window;
-
-  exports.settings = settings = (_window = window) !== null && _window !== void 0 && _window.__experimentalEnableQuoteBlockV2 ? _v.default : settingsV1;
-}
 //# sourceMappingURL=index.js.map

package/build/quote/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/quote/index.js"],"names":["name","metadata","settingsV1","icon","example","attributes","value","citation","transforms","edit","save","merge","deprecated","settings","process","env","IS_GUTENBERG_PLUGIN","window","__experimentalEnableQuoteBlockV2","settingsV2"],"mappings":";;;;;;;;;;;;;;;AAGA;;AACA;;AAKA;;AACA;;AAEA;;AACA;;AACA;;AAdA;AACA;AACA;;AAIA;AACA;AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,MAAM;AAAEA,EAAAA;AAAF,IAAWC,QAAjB;;AAIO,MAAMC,UAAU,GAAG;AACzBC,EAAAA,IAAI,EAAJA,YADyB;AAEzBC,EAAAA,OAAO,EAAE;AACRC,IAAAA,UAAU,EAAE;AACXC,MAAAA,KAAK,EACJ,QAAQ,cAAI,uCAAJ,CAAR,GAAwD,MAF9C;AAGXC,MAAAA,QAAQ,EAAE;AAHC;AADJ,GAFgB;AASzBC,EAAAA,UAAU,EAAVA,mBATyB;AAUzBC,EAAAA,IAAI,EAAJA,aAVyB;AAWzBC,EAAAA,IAAI,EAAJA,aAXyB;;AAYzBC,EAAAA,KAAK,CAAEN,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;;AAgCzBK,EAAAA,UAAU,EAAVA;AAhCyB,CAAnB;;AAmCP,IAAIC,QAAQ,GAAGX,UAAf;;;AACA,IAAKY,OAAO,CAACC,GAAR,CAAYC,mBAAjB,EAAuC;AAAA;;AACtC,qBAAAH,QAAQ,GAAG,WAAAI,MAAM,UAAN,kCAAQC,gCAAR,GACRC,UADQ,GAERjB,UAFH;AAGA","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":["name","metadata","settings","icon","example","attributes","citation","innerBlocks","content","transforms","edit","save","deprecated"],"mappings":";;;;;;;;;AAGA;;AACA;;AAKA;;AACA;;AAEA;;AACA;;AAbA;AACA;AACA;;AAIA;AACA;AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,MAAM;AAAEA,EAAAA;AAAF,IAAWC,QAAjB;;AAIO,MAAMC,QAAQ,GAAG;AACvBC,EAAAA,IAAI,EAAJA,YADuB;AAEvBC,EAAAA,OAAO,EAAE;AACRC,IAAAA,UAAU,EAAE;AACXC,MAAAA,QAAQ,EAAE;AADC,KADJ;AAIRC,IAAAA,WAAW,EAAE,CACZ;AACCP,MAAAA,IAAI,EAAE,gBADP;AAECK,MAAAA,UAAU,EAAE;AACXG,QAAAA,OAAO,EAAE,cAAI,uCAAJ;AADE;AAFb,KADY;AAJL,GAFc;AAevBC,EAAAA,UAAU,EAAVA,mBAfuB;AAgBvBC,EAAAA,IAAI,EAAJA,aAhBuB;AAiBvBC,EAAAA,IAAI,EAAJA,aAjBuB;AAkBvBC,EAAAA,UAAU,EAAVA;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/quote/save.js

@@ -26,7 +26,6 @@ function save(_ref) {
   } = _ref;
   const {
     align,
-    value,
     citation
   } = attributes;
   const className = (0, _classnames.default)({
@@ -34,10 +33,7 @@ function save(_ref) {
   });
   return (0, _element.createElement)("blockquote", _blockEditor.useBlockProps.save({
     className
-  }), (0, _element.createElement)(_blockEditor.RichText.Content, {
-    multiline: true,
-    value: value
-  }), !_blockEditor.RichText.isEmpty(citation) && (0, _element.createElement)(_blockEditor.RichText.Content, {
+  }), (0, _element.createElement)(_blockEditor.InnerBlocks.Content, null), !_blockEditor.RichText.isEmpty(citation) && (0, _element.createElement)(_blockEditor.RichText.Content, {
     tagName: "cite",
     value: citation
   }));

package/build/quote/save.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/quote/save.js"],"names":["save","attributes","align","value","citation","className","useBlockProps","RichText","isEmpty"],"mappings":";;;;;;;;;;;AAGA;;AAKA;;AARA;AACA;AACA;;AAGA;AACA;AACA;AAGe,SAASA,IAAT,OAAgC;AAAA,MAAjB;AAAEC,IAAAA;AAAF,GAAiB;AAC9C,QAAM;AAAEC,IAAAA,KAAF;AAASC,IAAAA,KAAT;AAAgBC,IAAAA;AAAhB,MAA6BH,UAAnC;AAEA,QAAMI,SAAS,GAAG,yBAAY;AAC7B,KAAG,kBAAkBH,KAAO,EAA5B,GAAiCA;AADJ,GAAZ,CAAlB;AAIA,SACC,0CAAiBI,2BAAcN,IAAd,CAAoB;AAAEK,IAAAA;AAAF,GAApB,CAAjB,EACC,4BAAC,qBAAD,CAAU,OAAV;AAAkB,IAAA,SAAS,MAA3B;AAA4B,IAAA,KAAK,EAAGF;AAApC,IADD,EAEG,CAAEI,sBAASC,OAAT,CAAkBJ,QAAlB,CAAF,IACD,4BAAC,qBAAD,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":["save","attributes","align","citation","className","useBlockProps","RichText","isEmpty"],"mappings":";;;;;;;;;;;AAGA;;AAKA;;AARA;AACA;AACA;;AAGA;AACA;AACA;AAGe,SAASA,IAAT,OAAgC;AAAA,MAAjB;AAAEC,IAAAA;AAAF,GAAiB;AAC9C,QAAM;AAAEC,IAAAA,KAAF;AAASC,IAAAA;AAAT,MAAsBF,UAA5B;AAEA,QAAMG,SAAS,GAAG,yBAAY;AAC7B,KAAG,kBAAkBF,KAAO,EAA5B,GAAiCA;AADJ,GAAZ,CAAlB;AAIA,SACC,0CAAiBG,2BAAcL,IAAd,CAAoB;AAAEI,IAAAA;AAAF,GAApB,CAAjB,EACC,4BAAC,wBAAD,CAAa,OAAb,OADD,EAEG,CAAEE,sBAASC,OAAT,CAAkBJ,QAAlB,CAAF,IACD,4BAAC,qBAAD,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/quote/transforms.js

@@ -7,201 +7,153 @@ exports.default = void 0;
 
 var _blocks = require("@wordpress/blocks");
 
-var _richText = require("@wordpress/rich-text");
-
 /**
  * WordPress dependencies
  */
 const transforms = {
   from: [{
     type: 'block',
-    isMultiBlock: true,
-    blocks: ['core/paragraph'],
-    transform: attributes => {
-      return (0, _blocks.createBlock)('core/quote', {
-        value: (0, _richText.toHTMLString)({
-          value: (0, _richText.join)(attributes.map(_ref => {
-            let {
-              content
-            } = _ref;
-            return (0, _richText.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 (0, _blocks.createBlock)('core/quote', {
-        value: `<p>${content}</p>`,
-        anchor
-      });
+        citation,
+        anchor,
+        fontSize,
+        style
+      }, (0, _blocks.parseWithAttributeSchema)(value, {
+        type: 'array',
+        source: 'query',
+        selector: 'p',
+        query: {
+          content: {
+            type: 'string',
+            source: 'html'
+          }
+        }
+      }).map(_ref2 => {
+        let {
+          content
+        } = _ref2;
+        return (0, _blocks.createBlock)('core/paragraph', {
+          content
+        });
+      }));
     }
   }, {
     type: 'block',
-    blocks: ['core/pullquote'],
-    transform: _ref3 => {
+    blocks: ['core/group'],
+    transform: (_ref3, innerBlocks) => {
       let {
-        value,
-        citation,
         anchor
       } = _ref3;
       return (0, _blocks.createBlock)('core/quote', {
-        value,
-        citation,
         anchor
-      });
+      }, innerBlocks);
     }
   }, {
     type: 'prefix',
     prefix: '>',
-    transform: content => {
-      return (0, _blocks.createBlock)('core/quote', {
-        value: `<p>${content}</p>`
-      });
-    }
+    transform: content => (0, _blocks.createBlock)('core/quote', {}, [(0, _blocks.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(...(0, _richText.split)((0, _richText.create)({
-          html: value,
-          multilineTag: 'p'
-        }), '\u2028').map(piece => (0, _blocks.createBlock)('core/paragraph', {
-          content: (0, _richText.toHTMLString)({
-            value: piece
-          })
-        })));
-      }
-
-      if (citation && citation !== '<p></p>') {
-        paragraphs.push((0, _blocks.createBlock)('core/paragraph', {
-          content: citation
-        }));
-      }
-
-      if (paragraphs.length === 0) {
-        return (0, _blocks.createBlock)('core/paragraph', {
-          content: ''
-        });
+    schema: () => ({
+      blockquote: {
+        children: '*'
       }
-
-      return paragraphs;
+    }),
+    selector: 'blockquote',
+    transform: node => {
+      return (0, _blocks.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.
+      {}, (0, _blocks.rawHandler)({
+        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 => (0, _blocks.createBlock)('core/quote', {}, blocks.map(block => (0, _blocks.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 (0, _blocks.createBlock)('core/heading', {
-          content: citation
-        });
-      }
-
-      const pieces = (0, _richText.split)((0, _richText.create)({
-        html: value,
-        multilineTag: 'p'
-      }), '\u2028');
-      const headingBlock = (0, _blocks.createBlock)('core/heading', {
-        content: (0, _richText.toHTMLString)({
-          value: pieces[0]
-        })
-      });
-
-      if (!citation && pieces.length === 1) {
-        return headingBlock;
-      }
-
-      const quotePieces = pieces.slice(1);
-      const quoteBlock = (0, _blocks.createBlock)('core/quote', { ...attrs,
+        anchor,
+        fontSize,
+        style
+      } = _ref8;
+      const value = innerBlocks.map(_ref9 => {
+        let {
+          attributes
+        } = _ref9;
+        return `<p>${attributes.content}</p>`;
+      }).join('');
+      return (0, _blocks.createBlock)('core/pullquote', {
+        value,
         citation,
-        value: (0, _richText.toHTMLString)({
-          value: quotePieces.length ? (0, _richText.join)(pieces.slice(1), '\u2028') : (0, _richText.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 (0, _blocks.createBlock)('core/pullquote', {
-        value,
-        citation,
+      } = _ref10;
+      return (0, _blocks.createBlock)('core/group', {
         anchor
-      });
+      }, citation ? [...innerBlocks, (0, _blocks.createBlock)('core/paragraph', {
+        content: citation
+      })] : innerBlocks);
+    }
+  }, {
+    type: 'block',
+    blocks: ['*'],
+    transform: (_ref11, innerBlocks) => {
+      let {
+        citation
+      } = _ref11;
+      return citation ? [...innerBlocks, (0, _blocks.createBlock)('core/paragraph', {
+        content: citation
+      })] : innerBlocks;
     }
   }]
 };