@wordpress/block-library 7.8.0 → 7.11.0

package/build/list/v2/transforms.js

@@ -5,12 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _lodash = require("lodash");
+
 var _blocks = require("@wordpress/blocks");
 
 var _richText = require("@wordpress/rich-text");
 
 var _migrate = require("./migrate");
 
+/**
+ * WordPress dependencies
+ */
+
+/**
+ * External dependencies
+ */
+
 /**
  * WordPress dependencies
  */
@@ -41,6 +51,22 @@ function getListContentSchema(_ref) {
   return listContentSchema;
 }
 
+function getListContentFlat(blocks) {
+  return (0, _lodash.flatMap)(blocks, _ref2 => {
+    let {
+      name,
+      attributes,
+      innerBlocks = []
+    } = _ref2;
+
+    if (name === 'core/list-item') {
+      return [attributes.content, ...getListContentFlat(innerBlocks)];
+    }
+
+    return getListContentFlat(innerBlocks);
+  });
+}
+
 const transforms = {
   from: [{
     type: 'block',
@@ -50,10 +76,10 @@ const transforms = {
       let childBlocks = [];
 
       if (blockAttributes.length > 1) {
-        childBlocks = blockAttributes.map(_ref2 => {
+        childBlocks = blockAttributes.map(_ref3 => {
           let {
             content
-          } = _ref2;
+          } = _ref3;
           return (0, _blocks.createBlock)('core/list-item', {
             content
           });
@@ -75,27 +101,6 @@ const transforms = {
         anchor: blockAttributes.anchor
       }, childBlocks);
     }
-  }, {
-    type: 'block',
-    blocks: ['core/quote', 'core/pullquote'],
-    transform: _ref3 => {
-      let {
-        value,
-        anchor
-      } = _ref3;
-      return (0, _blocks.createBlock)('core/list', {
-        anchor
-      }, (0, _richText.split)((0, _richText.create)({
-        html: value,
-        multilineTag: 'p'
-      }), _richText.__UNSTABLE_LINE_SEPARATOR).map(result => {
-        return (0, _blocks.createBlock)('core/list-item', {
-          content: (0, _richText.toHTMLString)({
-            value: result
-          })
-        });
-      }));
-    }
   }, ...['*', '-'].map(prefix => ({
     type: 'prefix',
     prefix,
@@ -131,25 +136,9 @@ const transforms = {
     type: 'block',
     blocks: [block],
     transform: (_attributes, childBlocks) => {
-      return childBlocks.filter(_ref4 => {
-        let {
-          name
-        } = _ref4;
-        return name === 'core/list-item';
-      }).map(_ref5 => {
-        let {
-          attributes
-        } = _ref5;
-        return (0, _blocks.createBlock)(block, {
-          content: attributes.content
-        });
-      });
-    }
-  })), ...['core/quote', 'core/pullquote'].map(block => ({
-    type: 'block',
-    blocks: [block],
-    transform: (attributes, innerBlocks) => {
-      return (0, _blocks.switchToBlockType)((0, _blocks.switchToBlockType)((0, _blocks.createBlock)('core/list', attributes, innerBlocks), 'core/paragraph'), block);
+      return getListContentFlat(childBlocks).map(content => (0, _blocks.createBlock)(block, {
+        content
+      }));
     }
   }))]
 };

package/build/list/v2/transforms.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/list/v2/transforms.js"],"names":["getListContentSchema","phrasingContentSchema","listContentSchema","ul","ol","attributes","forEach","tag","children","li","transforms","from","type","isMultiBlock","blocks","transform","blockAttributes","childBlocks","length","map","content","value","html","result","anchor","multilineTag","__UNSTABLE_LINE_SEPARATOR","prefix","ordered","selector","schema","args","createListBlockFromDOMElement","to","block","_attributes","filter","name","innerBlocks"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { createBlock, switchToBlockType } from '@wordpress/blocks';\nimport {\n\t__UNSTABLE_LINE_SEPARATOR,\n\tcreate,\n\tsplit,\n\ttoHTMLString,\n} from '@wordpress/rich-text';\n\n/**\n * Internal dependencies\n */\nimport { createListBlockFromDOMElement } from './migrate';\n\nfunction getListContentSchema( { phrasingContentSchema } ) {\n\tconst listContentSchema = {\n\t\t...phrasingContentSchema,\n\t\tul: {},\n\t\tol: { attributes: [ 'type', 'start', 'reversed' ] },\n\t};\n\n\t// Recursion is needed.\n\t// Possible: ul > li > ul.\n\t// Impossible: ul > ul.\n\t[ 'ul', 'ol' ].forEach( ( tag ) => {\n\t\tlistContentSchema[ tag ].children = {\n\t\t\tli: {\n\t\t\t\tchildren: listContentSchema,\n\t\t\t},\n\t\t};\n\t} );\n\n\treturn listContentSchema;\n}\n\nconst transforms = {\n\tfrom: [\n\t\t{\n\t\t\ttype: 'block',\n\t\t\tisMultiBlock: true,\n\t\t\tblocks: [ 'core/paragraph', 'core/heading' ],\n\t\t\ttransform: ( blockAttributes ) => {\n\t\t\t\tlet childBlocks = [];\n\t\t\t\tif ( blockAttributes.length > 1 ) {\n\t\t\t\t\tchildBlocks = blockAttributes.map( ( { content } ) => {\n\t\t\t\t\t\treturn createBlock( 'core/list-item', { content } );\n\t\t\t\t\t} );\n\t\t\t\t} else if ( blockAttributes.length === 1 ) {\n\t\t\t\t\tconst value = create( {\n\t\t\t\t\t\thtml: blockAttributes[ 0 ].content,\n\t\t\t\t\t} );\n\t\t\t\t\tchildBlocks = split( value, '\\n' ).map( ( result ) => {\n\t\t\t\t\t\treturn createBlock( 'core/list-item', {\n\t\t\t\t\t\t\tcontent: toHTMLString( { value: result } ),\n\t\t\t\t\t\t} );\n\t\t\t\t\t} );\n\t\t\t\t}\n\t\t\t\treturn createBlock(\n\t\t\t\t\t'core/list',\n\t\t\t\t\t{\n\t\t\t\t\t\tanchor: blockAttributes.anchor,\n\t\t\t\t\t},\n\t\t\t\t\tchildBlocks\n\t\t\t\t);\n\t\t\t},\n\t\t},\n\t\t{\n\t\t\ttype: 'block',\n\t\t\tblocks: [ 'core/quote', 'core/pullquote' ],\n\t\t\ttransform: ( { value, anchor } ) => {\n\t\t\t\treturn createBlock(\n\t\t\t\t\t'core/list',\n\t\t\t\t\t{\n\t\t\t\t\t\tanchor,\n\t\t\t\t\t},\n\t\t\t\t\tsplit(\n\t\t\t\t\t\tcreate( { html: value, multilineTag: 'p' } ),\n\t\t\t\t\t\t__UNSTABLE_LINE_SEPARATOR\n\t\t\t\t\t).map( ( result ) => {\n\t\t\t\t\t\treturn createBlock( 'core/list-item', {\n\t\t\t\t\t\t\tcontent: toHTMLString( { value: result } ),\n\t\t\t\t\t\t} );\n\t\t\t\t\t} )\n\t\t\t\t);\n\t\t\t},\n\t\t},\n\t\t...[ '*', '-' ].map( ( prefix ) => ( {\n\t\t\ttype: 'prefix',\n\t\t\tprefix,\n\t\t\ttransform( content ) {\n\t\t\t\treturn createBlock( 'core/list', {}, [\n\t\t\t\t\tcreateBlock( 'core/list-item', { content } ),\n\t\t\t\t] );\n\t\t\t},\n\t\t} ) ),\n\t\t...[ '1.', '1)' ].map( ( prefix ) => ( {\n\t\t\ttype: 'prefix',\n\t\t\tprefix,\n\t\t\ttransform( content ) {\n\t\t\t\treturn createBlock(\n\t\t\t\t\t'core/list',\n\t\t\t\t\t{\n\t\t\t\t\t\tordered: true,\n\t\t\t\t\t},\n\t\t\t\t\t[ createBlock( 'core/list-item', { content } ) ]\n\t\t\t\t);\n\t\t\t},\n\t\t} ) ),\n\t\t{\n\t\t\ttype: 'raw',\n\t\t\tselector: 'ol,ul',\n\t\t\tschema: ( args ) => ( {\n\t\t\t\tol: getListContentSchema( args ).ol,\n\t\t\t\tul: getListContentSchema( args ).ul,\n\t\t\t} ),\n\t\t\ttransform: createListBlockFromDOMElement,\n\t\t},\n\t],\n\tto: [\n\t\t...[ 'core/paragraph', 'core/heading' ].map( ( block ) => ( {\n\t\t\ttype: 'block',\n\t\t\tblocks: [ block ],\n\t\t\ttransform: ( _attributes, childBlocks ) => {\n\t\t\t\treturn childBlocks\n\t\t\t\t\t.filter( ( { name } ) => name === 'core/list-item' )\n\t\t\t\t\t.map( ( { attributes } ) =>\n\t\t\t\t\t\tcreateBlock( block, {\n\t\t\t\t\t\t\tcontent: attributes.content,\n\t\t\t\t\t\t} )\n\t\t\t\t\t);\n\t\t\t},\n\t\t} ) ),\n\t\t...[ 'core/quote', 'core/pullquote' ].map( ( block ) => ( {\n\t\t\ttype: 'block',\n\t\t\tblocks: [ block ],\n\t\t\ttransform: ( attributes, innerBlocks ) => {\n\t\t\t\treturn switchToBlockType(\n\t\t\t\t\tswitchToBlockType(\n\t\t\t\t\t\tcreateBlock( 'core/list', attributes, innerBlocks ),\n\t\t\t\t\t\t'core/paragraph'\n\t\t\t\t\t),\n\t\t\t\t\tblock\n\t\t\t\t);\n\t\t\t},\n\t\t} ) ),\n\t],\n};\n\nexport default transforms;\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/list/v2/transforms.js"],"names":["getListContentSchema","phrasingContentSchema","listContentSchema","ul","ol","attributes","forEach","tag","children","li","getListContentFlat","blocks","name","innerBlocks","content","transforms","from","type","isMultiBlock","transform","blockAttributes","childBlocks","length","map","value","html","result","anchor","prefix","ordered","selector","schema","args","createListBlockFromDOMElement","to","block","_attributes"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\n/**\n * External dependencies\n */\nimport { flatMap } from 'lodash';\n\n/**\n * WordPress dependencies\n */\nimport { createBlock } from '@wordpress/blocks';\nimport { create, split, toHTMLString } from '@wordpress/rich-text';\n\n/**\n * Internal dependencies\n */\nimport { createListBlockFromDOMElement } from './migrate';\n\nfunction getListContentSchema( { phrasingContentSchema } ) {\n\tconst listContentSchema = {\n\t\t...phrasingContentSchema,\n\t\tul: {},\n\t\tol: { attributes: [ 'type', 'start', 'reversed' ] },\n\t};\n\n\t// Recursion is needed.\n\t// Possible: ul > li > ul.\n\t// Impossible: ul > ul.\n\t[ 'ul', 'ol' ].forEach( ( tag ) => {\n\t\tlistContentSchema[ tag ].children = {\n\t\t\tli: {\n\t\t\t\tchildren: listContentSchema,\n\t\t\t},\n\t\t};\n\t} );\n\n\treturn listContentSchema;\n}\n\nfunction getListContentFlat( blocks ) {\n\treturn flatMap( blocks, ( { name, attributes, innerBlocks = [] } ) => {\n\t\tif ( name === 'core/list-item' ) {\n\t\t\treturn [ attributes.content, ...getListContentFlat( innerBlocks ) ];\n\t\t}\n\t\treturn getListContentFlat( innerBlocks );\n\t} );\n}\n\nconst transforms = {\n\tfrom: [\n\t\t{\n\t\t\ttype: 'block',\n\t\t\tisMultiBlock: true,\n\t\t\tblocks: [ 'core/paragraph', 'core/heading' ],\n\t\t\ttransform: ( blockAttributes ) => {\n\t\t\t\tlet childBlocks = [];\n\t\t\t\tif ( blockAttributes.length > 1 ) {\n\t\t\t\t\tchildBlocks = blockAttributes.map( ( { content } ) => {\n\t\t\t\t\t\treturn createBlock( 'core/list-item', { content } );\n\t\t\t\t\t} );\n\t\t\t\t} else if ( blockAttributes.length === 1 ) {\n\t\t\t\t\tconst value = create( {\n\t\t\t\t\t\thtml: blockAttributes[ 0 ].content,\n\t\t\t\t\t} );\n\t\t\t\t\tchildBlocks = split( value, '\\n' ).map( ( result ) => {\n\t\t\t\t\t\treturn createBlock( 'core/list-item', {\n\t\t\t\t\t\t\tcontent: toHTMLString( { value: result } ),\n\t\t\t\t\t\t} );\n\t\t\t\t\t} );\n\t\t\t\t}\n\t\t\t\treturn createBlock(\n\t\t\t\t\t'core/list',\n\t\t\t\t\t{\n\t\t\t\t\t\tanchor: blockAttributes.anchor,\n\t\t\t\t\t},\n\t\t\t\t\tchildBlocks\n\t\t\t\t);\n\t\t\t},\n\t\t},\n\t\t...[ '*', '-' ].map( ( prefix ) => ( {\n\t\t\ttype: 'prefix',\n\t\t\tprefix,\n\t\t\ttransform( content ) {\n\t\t\t\treturn createBlock( 'core/list', {}, [\n\t\t\t\t\tcreateBlock( 'core/list-item', { content } ),\n\t\t\t\t] );\n\t\t\t},\n\t\t} ) ),\n\t\t...[ '1.', '1)' ].map( ( prefix ) => ( {\n\t\t\ttype: 'prefix',\n\t\t\tprefix,\n\t\t\ttransform( content ) {\n\t\t\t\treturn createBlock(\n\t\t\t\t\t'core/list',\n\t\t\t\t\t{\n\t\t\t\t\t\tordered: true,\n\t\t\t\t\t},\n\t\t\t\t\t[ createBlock( 'core/list-item', { content } ) ]\n\t\t\t\t);\n\t\t\t},\n\t\t} ) ),\n\t\t{\n\t\t\ttype: 'raw',\n\t\t\tselector: 'ol,ul',\n\t\t\tschema: ( args ) => ( {\n\t\t\t\tol: getListContentSchema( args ).ol,\n\t\t\t\tul: getListContentSchema( args ).ul,\n\t\t\t} ),\n\t\t\ttransform: createListBlockFromDOMElement,\n\t\t},\n\t],\n\tto: [\n\t\t...[ 'core/paragraph', 'core/heading' ].map( ( block ) => ( {\n\t\t\ttype: 'block',\n\t\t\tblocks: [ block ],\n\t\t\ttransform: ( _attributes, childBlocks ) => {\n\t\t\t\treturn getListContentFlat( childBlocks ).map( ( content ) =>\n\t\t\t\t\tcreateBlock( block, {\n\t\t\t\t\t\tcontent,\n\t\t\t\t\t} )\n\t\t\t\t);\n\t\t\t},\n\t\t} ) ),\n\t],\n};\n\nexport default transforms;\n"]}

package/build/list-item/edit.js

@@ -19,6 +19,8 @@ var _compose = require("@wordpress/compose");
 
 var _hooks = require("./hooks");
 
+var _utils = require("./utils");
+
 /**
  * WordPress dependencies
  */
@@ -37,13 +39,13 @@ function IndentUI(_ref) {
     title: (0, _i18n.__)('Outdent'),
     describedBy: (0, _i18n.__)('Outdent list item'),
     disabled: !canOutdent,
-    onClick: outdentListItem
+    onClick: () => outdentListItem()
   }), (0, _element.createElement)(_components.ToolbarButton, {
     icon: (0, _i18n.isRTL)() ? _icons.formatIndentRTL : _icons.formatIndent,
     title: (0, _i18n.__)('Indent'),
     describedBy: (0, _i18n.__)('Indent list item'),
     isDisabled: !canIndent,
-    onClick: indentListItem
+    onClick: () => indentListItem()
   }));
 }
 
@@ -51,7 +53,6 @@ function ListItemEdit(_ref2) {
   let {
     attributes,
     setAttributes,
-    mergeBlocks,
     onReplace,
     clientId
   } = _ref2;
@@ -67,13 +68,11 @@ function ListItemEdit(_ref2) {
     content,
     clientId
   });
-  const useBackspaceRef = (0, _hooks.useBackspace)({
-    clientId
-  });
   const useSpaceRef = (0, _hooks.useSpace)(clientId);
   const onSplit = (0, _hooks.useSplit)(clientId);
+  const onMerge = (0, _hooks.useMerge)(clientId);
   return (0, _element.createElement)(_element.Fragment, null, (0, _element.createElement)("li", innerBlocksProps, (0, _element.createElement)(_blockEditor.RichText, {
-    ref: (0, _compose.useMergeRefs)([useEnterRef, useBackspaceRef, useSpaceRef]),
+    ref: (0, _compose.useMergeRefs)([useEnterRef, useSpaceRef]),
     identifier: "content",
     tagName: "div",
     onChange: nextContent => setAttributes({
@@ -83,8 +82,14 @@ function ListItemEdit(_ref2) {
     "aria-label": (0, _i18n.__)('List text'),
     placeholder: placeholder || (0, _i18n.__)('List'),
     onSplit: onSplit,
-    onMerge: mergeBlocks,
-    onReplace: onReplace
+    onMerge: onMerge,
+    onReplace: function (blocks) {
+      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = arguments[_key];
+      }
+
+      onReplace((0, _utils.convertToListItems)(blocks), ...args);
+    }
   }), innerBlocksProps.children), (0, _element.createElement)(_blockEditor.BlockControls, {
     group: "block"
   }, (0, _element.createElement)(IndentUI, {

package/build/list-item/edit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/list-item/edit.js"],"names":["IndentUI","clientId","canIndent","indentListItem","canOutdent","outdentListItem","formatOutdentRTL","formatOutdent","formatIndentRTL","formatIndent","ListItemEdit","attributes","setAttributes","mergeBlocks","onReplace","placeholder","content","blockProps","innerBlocksProps","allowedBlocks","useEnterRef","useBackspaceRef","useSpaceRef","onSplit","nextContent","children"],"mappings":";;;;;;;;;AAGA;;AAMA;;AACA;;AACA;;AAMA;;AAKA;;AAtBA;AACA;AACA;;AAiBA;AACA;AACA;AAUA,SAASA,QAAT,OAAkC;AAAA,MAAf;AAAEC,IAAAA;AAAF,GAAe;AACjC,QAAM,CAAEC,SAAF,EAAaC,cAAb,IAAgC,8BAAmBF,QAAnB,CAAtC;AACA,QAAM,CAAEG,UAAF,EAAcC,eAAd,IAAkC,+BAAoBJ,QAApB,CAAxC;AAEA,SACC,qDACC,4BAAC,yBAAD;AACC,IAAA,IAAI,EAAG,qBAAUK,uBAAV,GAA6BC,oBADrC;AAEC,IAAA,KAAK,EAAG,cAAI,SAAJ,CAFT;AAGC,IAAA,WAAW,EAAG,cAAI,mBAAJ,CAHf;AAIC,IAAA,QAAQ,EAAG,CAAEH,UAJd;AAKC,IAAA,OAAO,EAAGC;AALX,IADD,EAQC,4BAAC,yBAAD;AACC,IAAA,IAAI,EAAG,qBAAUG,sBAAV,GAA4BC,mBADpC;AAEC,IAAA,KAAK,EAAG,cAAI,QAAJ,CAFT;AAGC,IAAA,WAAW,EAAG,cAAI,kBAAJ,CAHf;AAIC,IAAA,UAAU,EAAG,CAAEP,SAJhB;AAKC,IAAA,OAAO,EAAGC;AALX,IARD,CADD;AAkBA;;AAEc,SAASO,YAAT,QAMX;AAAA,MANkC;AACrCC,IAAAA,UADqC;AAErCC,IAAAA,aAFqC;AAGrCC,IAAAA,WAHqC;AAIrCC,IAAAA,SAJqC;AAKrCb,IAAAA;AALqC,GAMlC;AACH,QAAM;AAAEc,IAAAA,WAAF;AAAeC,IAAAA;AAAf,MAA2BL,UAAjC;AACA,QAAMM,UAAU,GAAG,iCAAnB;AACA,QAAMC,gBAAgB,GAAG,sCAAqBD,UAArB,EAAiC;AACzDE,IAAAA,aAAa,EAAE,CAAE,WAAF;AAD0C,GAAjC,CAAzB;AAGA,QAAMC,WAAW,GAAG,qBAAU;AAAEJ,IAAAA,OAAF;AAAWf,IAAAA;AAAX,GAAV,CAApB;AACA,QAAMoB,eAAe,GAAG,yBAAc;AAAEpB,IAAAA;AAAF,GAAd,CAAxB;AACA,QAAMqB,WAAW,GAAG,qBAAUrB,QAAV,CAApB;AACA,QAAMsB,OAAO,GAAG,qBAAUtB,QAAV,CAAhB;AACA,SACC,qDACC,kCAASiB,gBAAT,EACC,4BAAC,qBAAD;AACC,IAAA,GAAG,EAAG,2BAAc,CACnBE,WADmB,EAEnBC,eAFmB,EAGnBC,WAHmB,CAAd,CADP;AAMC,IAAA,UAAU,EAAC,SANZ;AAOC,IAAA,OAAO,EAAC,KAPT;AAQC,IAAA,QAAQ,EAAKE,WAAF,IACVZ,aAAa,CAAE;AAAEI,MAAAA,OAAO,EAAEQ;AAAX,KAAF,CATf;AAWC,IAAA,KAAK,EAAGR,OAXT;AAYC,kBAAa,cAAI,WAAJ,CAZd;AAaC,IAAA,WAAW,EAAGD,WAAW,IAAI,cAAI,MAAJ,CAb9B;AAcC,IAAA,OAAO,EAAGQ,OAdX;AAeC,IAAA,OAAO,EAAGV,WAfX;AAgBC,IAAA,SAAS,EAAGC;AAhBb,IADD,EAmBGI,gBAAgB,CAACO,QAnBpB,CADD,EAsBC,4BAAC,0BAAD;AAAe,IAAA,KAAK,EAAC;AAArB,KACC,4BAAC,QAAD;AAAU,IAAA,QAAQ,EAAGxB;AAArB,IADD,CAtBD,CADD;AA4BA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tRichText,\n\tuseBlockProps,\n\tuseInnerBlocksProps,\n\tBlockControls,\n} from '@wordpress/block-editor';\nimport { isRTL, __ } from '@wordpress/i18n';\nimport { ToolbarButton } from '@wordpress/components';\nimport {\n\tformatOutdent,\n\tformatOutdentRTL,\n\tformatIndentRTL,\n\tformatIndent,\n} from '@wordpress/icons';\nimport { useMergeRefs } from '@wordpress/compose';\n\n/**\n * Internal dependencies\n */\nimport {\n\tuseEnter,\n\tuseBackspace,\n\tuseSpace,\n\tuseIndentListItem,\n\tuseOutdentListItem,\n\tuseSplit,\n} from './hooks';\n\nfunction IndentUI( { clientId } ) {\n\tconst [ canIndent, indentListItem ] = useIndentListItem( clientId );\n\tconst [ canOutdent, outdentListItem ] = useOutdentListItem( clientId );\n\n\treturn (\n\t\t<>\n\t\t\t<ToolbarButton\n\t\t\t\ticon={ isRTL() ? formatOutdentRTL : formatOutdent }\n\t\t\t\ttitle={ __( 'Outdent' ) }\n\t\t\t\tdescribedBy={ __( 'Outdent list item' ) }\n\t\t\t\tdisabled={ ! canOutdent }\n\t\t\t\tonClick={ outdentListItem }\n\t\t\t/>\n\t\t\t<ToolbarButton\n\t\t\t\ticon={ isRTL() ? formatIndentRTL : formatIndent }\n\t\t\t\ttitle={ __( 'Indent' ) }\n\t\t\t\tdescribedBy={ __( 'Indent list item' ) }\n\t\t\t\tisDisabled={ ! canIndent }\n\t\t\t\tonClick={ indentListItem }\n\t\t\t/>\n\t\t</>\n\t);\n}\n\nexport default function ListItemEdit( {\n\tattributes,\n\tsetAttributes,\n\tmergeBlocks,\n\tonReplace,\n\tclientId,\n} ) {\n\tconst { placeholder, content } = attributes;\n\tconst blockProps = useBlockProps();\n\tconst innerBlocksProps = useInnerBlocksProps( blockProps, {\n\t\tallowedBlocks: [ 'core/list' ],\n\t} );\n\tconst useEnterRef = useEnter( { content, clientId } );\n\tconst useBackspaceRef = useBackspace( { clientId } );\n\tconst useSpaceRef = useSpace( clientId );\n\tconst onSplit = useSplit( clientId );\n\treturn (\n\t\t<>\n\t\t\t<li { ...innerBlocksProps }>\n\t\t\t\t<RichText\n\t\t\t\t\tref={ useMergeRefs( [\n\t\t\t\t\t\tuseEnterRef,\n\t\t\t\t\t\tuseBackspaceRef,\n\t\t\t\t\t\tuseSpaceRef,\n\t\t\t\t\t] ) }\n\t\t\t\t\tidentifier=\"content\"\n\t\t\t\t\ttagName=\"div\"\n\t\t\t\t\tonChange={ ( nextContent ) =>\n\t\t\t\t\t\tsetAttributes( { content: nextContent } )\n\t\t\t\t\t}\n\t\t\t\t\tvalue={ content }\n\t\t\t\t\taria-label={ __( 'List text' ) }\n\t\t\t\t\tplaceholder={ placeholder || __( 'List' ) }\n\t\t\t\t\tonSplit={ onSplit }\n\t\t\t\t\tonMerge={ mergeBlocks }\n\t\t\t\t\tonReplace={ onReplace }\n\t\t\t\t/>\n\t\t\t\t{ innerBlocksProps.children }\n\t\t\t</li>\n\t\t\t<BlockControls group=\"block\">\n\t\t\t\t<IndentUI clientId={ clientId } />\n\t\t\t</BlockControls>\n\t\t</>\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/list-item/edit.js"],"names":["IndentUI","clientId","canIndent","indentListItem","canOutdent","outdentListItem","formatOutdentRTL","formatOutdent","formatIndentRTL","formatIndent","ListItemEdit","attributes","setAttributes","onReplace","placeholder","content","blockProps","innerBlocksProps","allowedBlocks","useEnterRef","useSpaceRef","onSplit","onMerge","nextContent","blocks","args","children"],"mappings":";;;;;;;;;AAGA;;AAMA;;AACA;;AACA;;AAMA;;AAKA;;AAQA;;AA9BA;AACA;AACA;;AAiBA;AACA;AACA;AAWA,SAASA,QAAT,OAAkC;AAAA,MAAf;AAAEC,IAAAA;AAAF,GAAe;AACjC,QAAM,CAAEC,SAAF,EAAaC,cAAb,IAAgC,8BAAmBF,QAAnB,CAAtC;AACA,QAAM,CAAEG,UAAF,EAAcC,eAAd,IAAkC,+BAAoBJ,QAApB,CAAxC;AAEA,SACC,qDACC,4BAAC,yBAAD;AACC,IAAA,IAAI,EAAG,qBAAUK,uBAAV,GAA6BC,oBADrC;AAEC,IAAA,KAAK,EAAG,cAAI,SAAJ,CAFT;AAGC,IAAA,WAAW,EAAG,cAAI,mBAAJ,CAHf;AAIC,IAAA,QAAQ,EAAG,CAAEH,UAJd;AAKC,IAAA,OAAO,EAAG,MAAMC,eAAe;AALhC,IADD,EAQC,4BAAC,yBAAD;AACC,IAAA,IAAI,EAAG,qBAAUG,sBAAV,GAA4BC,mBADpC;AAEC,IAAA,KAAK,EAAG,cAAI,QAAJ,CAFT;AAGC,IAAA,WAAW,EAAG,cAAI,kBAAJ,CAHf;AAIC,IAAA,UAAU,EAAG,CAAEP,SAJhB;AAKC,IAAA,OAAO,EAAG,MAAMC,cAAc;AAL/B,IARD,CADD;AAkBA;;AAEc,SAASO,YAAT,QAKX;AAAA,MALkC;AACrCC,IAAAA,UADqC;AAErCC,IAAAA,aAFqC;AAGrCC,IAAAA,SAHqC;AAIrCZ,IAAAA;AAJqC,GAKlC;AACH,QAAM;AAAEa,IAAAA,WAAF;AAAeC,IAAAA;AAAf,MAA2BJ,UAAjC;AACA,QAAMK,UAAU,GAAG,iCAAnB;AACA,QAAMC,gBAAgB,GAAG,sCAAqBD,UAArB,EAAiC;AACzDE,IAAAA,aAAa,EAAE,CAAE,WAAF;AAD0C,GAAjC,CAAzB;AAGA,QAAMC,WAAW,GAAG,qBAAU;AAAEJ,IAAAA,OAAF;AAAWd,IAAAA;AAAX,GAAV,CAApB;AACA,QAAMmB,WAAW,GAAG,qBAAUnB,QAAV,CAApB;AACA,QAAMoB,OAAO,GAAG,qBAAUpB,QAAV,CAAhB;AACA,QAAMqB,OAAO,GAAG,qBAAUrB,QAAV,CAAhB;AACA,SACC,qDACC,kCAASgB,gBAAT,EACC,4BAAC,qBAAD;AACC,IAAA,GAAG,EAAG,2BAAc,CAAEE,WAAF,EAAeC,WAAf,CAAd,CADP;AAEC,IAAA,UAAU,EAAC,SAFZ;AAGC,IAAA,OAAO,EAAC,KAHT;AAIC,IAAA,QAAQ,EAAKG,WAAF,IACVX,aAAa,CAAE;AAAEG,MAAAA,OAAO,EAAEQ;AAAX,KAAF,CALf;AAOC,IAAA,KAAK,EAAGR,OAPT;AAQC,kBAAa,cAAI,WAAJ,CARd;AASC,IAAA,WAAW,EAAGD,WAAW,IAAI,cAAI,MAAJ,CAT9B;AAUC,IAAA,OAAO,EAAGO,OAVX;AAWC,IAAA,OAAO,EAAGC,OAXX;AAYC,IAAA,SAAS,EAAG,UAAEE,MAAF,EAAuB;AAAA,wCAAVC,IAAU;AAAVA,QAAAA,IAAU;AAAA;;AAClCZ,MAAAA,SAAS,CAAE,+BAAoBW,MAApB,CAAF,EAAgC,GAAGC,IAAnC,CAAT;AACA;AAdF,IADD,EAiBGR,gBAAgB,CAACS,QAjBpB,CADD,EAoBC,4BAAC,0BAAD;AAAe,IAAA,KAAK,EAAC;AAArB,KACC,4BAAC,QAAD;AAAU,IAAA,QAAQ,EAAGzB;AAArB,IADD,CApBD,CADD;AA0BA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tRichText,\n\tuseBlockProps,\n\tuseInnerBlocksProps,\n\tBlockControls,\n} from '@wordpress/block-editor';\nimport { isRTL, __ } from '@wordpress/i18n';\nimport { ToolbarButton } from '@wordpress/components';\nimport {\n\tformatOutdent,\n\tformatOutdentRTL,\n\tformatIndentRTL,\n\tformatIndent,\n} from '@wordpress/icons';\nimport { useMergeRefs } from '@wordpress/compose';\n\n/**\n * Internal dependencies\n */\nimport {\n\tuseEnter,\n\tuseSpace,\n\tuseIndentListItem,\n\tuseOutdentListItem,\n\tuseSplit,\n\tuseMerge,\n} from './hooks';\nimport { convertToListItems } from './utils';\n\nfunction IndentUI( { clientId } ) {\n\tconst [ canIndent, indentListItem ] = useIndentListItem( clientId );\n\tconst [ canOutdent, outdentListItem ] = useOutdentListItem( clientId );\n\n\treturn (\n\t\t<>\n\t\t\t<ToolbarButton\n\t\t\t\ticon={ isRTL() ? formatOutdentRTL : formatOutdent }\n\t\t\t\ttitle={ __( 'Outdent' ) }\n\t\t\t\tdescribedBy={ __( 'Outdent list item' ) }\n\t\t\t\tdisabled={ ! canOutdent }\n\t\t\t\tonClick={ () => outdentListItem() }\n\t\t\t/>\n\t\t\t<ToolbarButton\n\t\t\t\ticon={ isRTL() ? formatIndentRTL : formatIndent }\n\t\t\t\ttitle={ __( 'Indent' ) }\n\t\t\t\tdescribedBy={ __( 'Indent list item' ) }\n\t\t\t\tisDisabled={ ! canIndent }\n\t\t\t\tonClick={ () => indentListItem() }\n\t\t\t/>\n\t\t</>\n\t);\n}\n\nexport default function ListItemEdit( {\n\tattributes,\n\tsetAttributes,\n\tonReplace,\n\tclientId,\n} ) {\n\tconst { placeholder, content } = attributes;\n\tconst blockProps = useBlockProps();\n\tconst innerBlocksProps = useInnerBlocksProps( blockProps, {\n\t\tallowedBlocks: [ 'core/list' ],\n\t} );\n\tconst useEnterRef = useEnter( { content, clientId } );\n\tconst useSpaceRef = useSpace( clientId );\n\tconst onSplit = useSplit( clientId );\n\tconst onMerge = useMerge( clientId );\n\treturn (\n\t\t<>\n\t\t\t<li { ...innerBlocksProps }>\n\t\t\t\t<RichText\n\t\t\t\t\tref={ useMergeRefs( [ useEnterRef, useSpaceRef ] ) }\n\t\t\t\t\tidentifier=\"content\"\n\t\t\t\t\ttagName=\"div\"\n\t\t\t\t\tonChange={ ( nextContent ) =>\n\t\t\t\t\t\tsetAttributes( { content: nextContent } )\n\t\t\t\t\t}\n\t\t\t\t\tvalue={ content }\n\t\t\t\t\taria-label={ __( 'List text' ) }\n\t\t\t\t\tplaceholder={ placeholder || __( 'List' ) }\n\t\t\t\t\tonSplit={ onSplit }\n\t\t\t\t\tonMerge={ onMerge }\n\t\t\t\t\tonReplace={ ( blocks, ...args ) => {\n\t\t\t\t\t\tonReplace( convertToListItems( blocks ), ...args );\n\t\t\t\t\t} }\n\t\t\t\t/>\n\t\t\t\t{ innerBlocksProps.children }\n\t\t\t</li>\n\t\t\t<BlockControls group=\"block\">\n\t\t\t\t<IndentUI clientId={ clientId } />\n\t\t\t</BlockControls>\n\t\t</>\n\t);\n}\n"]}

package/build/list-item/hooks/index.js

@@ -5,12 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "useBackspace", {
-  enumerable: true,
-  get: function () {
-    return _useBackspace.default;
-  }
-});
 Object.defineProperty(exports, "useEnter", {
   enumerable: true,
   get: function () {
@@ -23,6 +17,12 @@ Object.defineProperty(exports, "useIndentListItem", {
     return _useIndentListItem.default;
   }
 });
+Object.defineProperty(exports, "useMerge", {
+  enumerable: true,
+  get: function () {
+    return _useMerge.default;
+  }
+});
 Object.defineProperty(exports, "useOutdentListItem", {
   enumerable: true,
   get: function () {
@@ -48,9 +48,9 @@ var _useIndentListItem = _interopRequireDefault(require("./use-indent-list-item"
 
 var _useEnter = _interopRequireDefault(require("./use-enter"));
 
-var _useBackspace = _interopRequireDefault(require("./use-backspace"));
-
 var _useSpace = _interopRequireDefault(require("./use-space"));
 
 var _useSplit = _interopRequireDefault(require("./use-split"));
+
+var _useMerge = _interopRequireDefault(require("./use-merge"));
 //# sourceMappingURL=index.js.map

package/build/list-item/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/list-item/hooks/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA","sourcesContent":["export { default as useOutdentListItem } from './use-outdent-list-item';\nexport { default as useIndentListItem } from './use-indent-list-item';\nexport { default as useEnter } from './use-enter';\nexport { default as useBackspace } from './use-backspace';\nexport { default as useSpace } from './use-space';\nexport { default as useSplit } from './use-split';\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/list-item/hooks/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA","sourcesContent":["export { default as useOutdentListItem } from './use-outdent-list-item';\nexport { default as useIndentListItem } from './use-indent-list-item';\nexport { default as useEnter } from './use-enter';\nexport { default as useSpace } from './use-space';\nexport { default as useSplit } from './use-split';\nexport { default as useMerge } from './use-merge';\n"]}

package/build/list-item/hooks/use-enter.js

@@ -30,7 +30,8 @@ var _useOutdentListItem = _interopRequireDefault(require("./use-outdent-list-ite
  */
 function useEnter(props) {
   const {
-    replaceBlocks
+    replaceBlocks,
+    selectionChange
   } = (0, _data.useDispatch)(_blockEditor.store);
   const {
     getBlock,
@@ -65,8 +66,7 @@ function useEnter(props) {
       } // Here we are in top level list so we need to split.
 
 
-      const blockRootClientId = getBlockRootClientId(clientId);
-      const topParentListBlock = getBlock(blockRootClientId);
+      const topParentListBlock = getBlock(getBlockRootClientId(clientId));
       const blockIndex = getBlockIndex(clientId);
       const head = (0, _blocks.cloneBlock)({ ...topParentListBlock,
         innerBlocks: topParentListBlock.innerBlocks.slice(0, blockIndex)
@@ -78,7 +78,10 @@ function useEnter(props) {
       const tail = after.length ? [(0, _blocks.cloneBlock)({ ...topParentListBlock,
         innerBlocks: after
       })] : [];
-      replaceBlocks(blockRootClientId, [head, middle, ...tail], 1, 0);
+      replaceBlocks(topParentListBlock.clientId, [head, middle, ...tail], 1); // We manually change the selection here because we are replacing
+      // a different block than the selected one.
+
+      selectionChange(middle.clientId);
     }
 
     element.addEventListener('keydown', onKeyDown);

package/build/list-item/hooks/use-enter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/block-library/src/list-item/hooks/use-enter.js"],"names":["useEnter","props","replaceBlocks","blockEditorStore","getBlock","getBlockRootClientId","getBlockIndex","propsRef","current","canOutdent","outdentListItem","clientId","element","onKeyDown","event","defaultPrevented","keyCode","ENTER","content","length","preventDefault","blockRootClientId","topParentListBlock","blockIndex","head","innerBlocks","slice","middle","after","tail","addEventListener","removeEventListener"],"mappings":";;;;;;;;;AAGA;;AAKA;;AACA;;AACA;;AACA;;AACA;;AAKA;;AAjBA;AACA;AACA;;AAYA;AACA;AACA;AAGe,SAASA,QAAT,CAAmBC,KAAnB,EAA2B;AACzC,QAAM;AAAEC,IAAAA;AAAF,MAAoB,uBAAaC,kBAAb,CAA1B;AACA,QAAM;AAAEC,IAAAA,QAAF;AAAYC,IAAAA,oBAAZ;AAAkCC,IAAAA;AAAlC,MACL,qBAAWH,kBAAX,CADD;AAEA,QAAMI,QAAQ,GAAG,qBAAQN,KAAR,CAAjB;AACAM,EAAAA,QAAQ,CAACC,OAAT,GAAmBP,KAAnB;AACA,QAAM,CAAEQ,UAAF,EAAcC,eAAd,IAAkC,iCACvCH,QAAQ,CAACC,OAAT,CAAiBG,QADsB,CAAxC;AAGA,SAAO,2BACJC,OAAF,IAAe;AACd,aAASC,SAAT,CAAoBC,KAApB,EAA4B;AAAA;;AAC3B,UAAKA,KAAK,CAACC,gBAAN,IAA0BD,KAAK,CAACE,OAAN,KAAkBC,eAAjD,EAAyD;AACxD;AACA;;AACD,YAAM;AAAEC,QAAAA,OAAF;AAAWP,QAAAA;AAAX,UAAwBJ,QAAQ,CAACC,OAAvC;;AACA,UAAKU,OAAO,CAACC,MAAb,EAAsB;AACrB;AACA;;AACDL,MAAAA,KAAK,CAACM,cAAN;;AACA,UAAKX,UAAL,EAAkB;AACjBC,QAAAA,eAAe;AACf;AACA,OAZ0B,CAa3B;;;AACA,YAAMW,iBAAiB,GAAGhB,oBAAoB,CAAEM,QAAF,CAA9C;AACA,YAAMW,kBAAkB,GAAGlB,QAAQ,CAAEiB,iBAAF,CAAnC;AACA,YAAME,UAAU,GAAGjB,aAAa,CAAEK,QAAF,CAAhC;AACA,YAAMa,IAAI,GAAG,wBAAY,EACxB,GAAGF,kBADqB;AAExBG,QAAAA,WAAW,EAAEH,kBAAkB,CAACG,WAAnB,CAA+BC,KAA/B,CACZ,CADY,EAEZH,UAFY;AAFW,OAAZ,CAAb;AAOA,YAAMI,MAAM,GAAG,yBAAa,kCAAb,CAAf,CAxB2B,CAyB3B;AACA;;AACA,YAAMC,KAAK,GAAG,CACb,IAAK,0BAAAN,kBAAkB,CAACG,WAAnB,CAAgCF,UAAhC,EACHE,WADG,CACU,CADV,iFACeA,WADf,KAC8B,EADnC,CADa,EAGb,GAAGH,kBAAkB,CAACG,WAAnB,CAA+BC,KAA/B,CAAsCH,UAAU,GAAG,CAAnD,CAHU,CAAd;AAKA,YAAMM,IAAI,GAAGD,KAAK,CAACT,MAAN,GACV,CACA,wBAAY,EACX,GAAGG,kBADQ;AAEXG,QAAAA,WAAW,EAAEG;AAFF,OAAZ,CADA,CADU,GAOV,EAPH;AAQA1B,MAAAA,aAAa,CACZmB,iBADY,EAEZ,CAAEG,IAAF,EAAQG,MAAR,EAAgB,GAAGE,IAAnB,CAFY,EAGZ,CAHY,EAIZ,CAJY,CAAb;AAMA;;AAEDjB,IAAAA,OAAO,CAACkB,gBAAR,CAA0B,SAA1B,EAAqCjB,SAArC;AACA,WAAO,MAAM;AACZD,MAAAA,OAAO,CAACmB,mBAAR,CAA6B,SAA7B,EAAwClB,SAAxC;AACA,KAFD;AAGA,GAtDK,EAuDN,CAAEJ,UAAF,CAvDM,CAAP;AAyDA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tcreateBlock,\n\tgetDefaultBlockName,\n\tcloneBlock,\n} from '@wordpress/blocks';\nimport { useRef } from '@wordpress/element';\nimport { useRefEffect } from '@wordpress/compose';\nimport { ENTER } from '@wordpress/keycodes';\nimport { useSelect, useDispatch } from '@wordpress/data';\nimport { store as blockEditorStore } from '@wordpress/block-editor';\n\n/**\n * Internal dependencies\n */\nimport useOutdentListItem from './use-outdent-list-item';\n\nexport default function useEnter( props ) {\n\tconst { replaceBlocks } = useDispatch( blockEditorStore );\n\tconst { getBlock, getBlockRootClientId, getBlockIndex } =\n\t\tuseSelect( blockEditorStore );\n\tconst propsRef = useRef( props );\n\tpropsRef.current = props;\n\tconst [ canOutdent, outdentListItem ] = useOutdentListItem(\n\t\tpropsRef.current.clientId\n\t);\n\treturn useRefEffect(\n\t\t( element ) => {\n\t\t\tfunction onKeyDown( event ) {\n\t\t\t\tif ( event.defaultPrevented || event.keyCode !== ENTER ) {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tconst { content, clientId } = propsRef.current;\n\t\t\t\tif ( content.length ) {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tevent.preventDefault();\n\t\t\t\tif ( canOutdent ) {\n\t\t\t\t\toutdentListItem();\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\t// Here we are in top level list so we need to split.\n\t\t\t\tconst blockRootClientId = getBlockRootClientId( clientId );\n\t\t\t\tconst topParentListBlock = getBlock( blockRootClientId );\n\t\t\t\tconst blockIndex = getBlockIndex( clientId );\n\t\t\t\tconst head = cloneBlock( {\n\t\t\t\t\t...topParentListBlock,\n\t\t\t\t\tinnerBlocks: topParentListBlock.innerBlocks.slice(\n\t\t\t\t\t\t0,\n\t\t\t\t\t\tblockIndex\n\t\t\t\t\t),\n\t\t\t\t} );\n\t\t\t\tconst middle = createBlock( getDefaultBlockName() );\n\t\t\t\t// Last list item might contain a `list` block innerBlock\n\t\t\t\t// In that case append remaining innerBlocks blocks.\n\t\t\t\tconst after = [\n\t\t\t\t\t...( topParentListBlock.innerBlocks[ blockIndex ]\n\t\t\t\t\t\t.innerBlocks[ 0 ]?.innerBlocks || [] ),\n\t\t\t\t\t...topParentListBlock.innerBlocks.slice( blockIndex + 1 ),\n\t\t\t\t];\n\t\t\t\tconst tail = after.length\n\t\t\t\t\t? [\n\t\t\t\t\t\t\tcloneBlock( {\n\t\t\t\t\t\t\t\t...topParentListBlock,\n\t\t\t\t\t\t\t\tinnerBlocks: after,\n\t\t\t\t\t\t\t} ),\n\t\t\t\t\t  ]\n\t\t\t\t\t: [];\n\t\t\t\treplaceBlocks(\n\t\t\t\t\tblockRootClientId,\n\t\t\t\t\t[ head, middle, ...tail ],\n\t\t\t\t\t1,\n\t\t\t\t\t0\n\t\t\t\t);\n\t\t\t}\n\n\t\t\telement.addEventListener( 'keydown', onKeyDown );\n\t\t\treturn () => {\n\t\t\t\telement.removeEventListener( 'keydown', onKeyDown );\n\t\t\t};\n\t\t},\n\t\t[ canOutdent ]\n\t);\n}\n"]}
+{"version":3,"sources":["@wordpress/block-library/src/list-item/hooks/use-enter.js"],"names":["useEnter","props","replaceBlocks","selectionChange","blockEditorStore","getBlock","getBlockRootClientId","getBlockIndex","propsRef","current","canOutdent","outdentListItem","clientId","element","onKeyDown","event","defaultPrevented","keyCode","ENTER","content","length","preventDefault","topParentListBlock","blockIndex","head","innerBlocks","slice","middle","after","tail","addEventListener","removeEventListener"],"mappings":";;;;;;;;;AAGA;;AAKA;;AACA;;AACA;;AACA;;AACA;;AAKA;;AAjBA;AACA;AACA;;AAYA;AACA;AACA;AAGe,SAASA,QAAT,CAAmBC,KAAnB,EAA2B;AACzC,QAAM;AAAEC,IAAAA,aAAF;AAAiBC,IAAAA;AAAjB,MAAqC,uBAAaC,kBAAb,CAA3C;AACA,QAAM;AAAEC,IAAAA,QAAF;AAAYC,IAAAA,oBAAZ;AAAkCC,IAAAA;AAAlC,MACL,qBAAWH,kBAAX,CADD;AAEA,QAAMI,QAAQ,GAAG,qBAAQP,KAAR,CAAjB;AACAO,EAAAA,QAAQ,CAACC,OAAT,GAAmBR,KAAnB;AACA,QAAM,CAAES,UAAF,EAAcC,eAAd,IAAkC,iCACvCH,QAAQ,CAACC,OAAT,CAAiBG,QADsB,CAAxC;AAGA,SAAO,2BACJC,OAAF,IAAe;AACd,aAASC,SAAT,CAAoBC,KAApB,EAA4B;AAAA;;AAC3B,UAAKA,KAAK,CAACC,gBAAN,IAA0BD,KAAK,CAACE,OAAN,KAAkBC,eAAjD,EAAyD;AACxD;AACA;;AACD,YAAM;AAAEC,QAAAA,OAAF;AAAWP,QAAAA;AAAX,UAAwBJ,QAAQ,CAACC,OAAvC;;AACA,UAAKU,OAAO,CAACC,MAAb,EAAsB;AACrB;AACA;;AACDL,MAAAA,KAAK,CAACM,cAAN;;AACA,UAAKX,UAAL,EAAkB;AACjBC,QAAAA,eAAe;AACf;AACA,OAZ0B,CAa3B;;;AACA,YAAMW,kBAAkB,GAAGjB,QAAQ,CAClCC,oBAAoB,CAAEM,QAAF,CADc,CAAnC;AAGA,YAAMW,UAAU,GAAGhB,aAAa,CAAEK,QAAF,CAAhC;AACA,YAAMY,IAAI,GAAG,wBAAY,EACxB,GAAGF,kBADqB;AAExBG,QAAAA,WAAW,EAAEH,kBAAkB,CAACG,WAAnB,CAA+BC,KAA/B,CACZ,CADY,EAEZH,UAFY;AAFW,OAAZ,CAAb;AAOA,YAAMI,MAAM,GAAG,yBAAa,kCAAb,CAAf,CAzB2B,CA0B3B;AACA;;AACA,YAAMC,KAAK,GAAG,CACb,IAAK,0BAAAN,kBAAkB,CAACG,WAAnB,CAAgCF,UAAhC,EACHE,WADG,CACU,CADV,iFACeA,WADf,KAC8B,EADnC,CADa,EAGb,GAAGH,kBAAkB,CAACG,WAAnB,CAA+BC,KAA/B,CAAsCH,UAAU,GAAG,CAAnD,CAHU,CAAd;AAKA,YAAMM,IAAI,GAAGD,KAAK,CAACR,MAAN,GACV,CACA,wBAAY,EACX,GAAGE,kBADQ;AAEXG,QAAAA,WAAW,EAAEG;AAFF,OAAZ,CADA,CADU,GAOV,EAPH;AAQA1B,MAAAA,aAAa,CACZoB,kBAAkB,CAACV,QADP,EAEZ,CAAEY,IAAF,EAAQG,MAAR,EAAgB,GAAGE,IAAnB,CAFY,EAGZ,CAHY,CAAb,CAzC2B,CA8C3B;AACA;;AACA1B,MAAAA,eAAe,CAAEwB,MAAM,CAACf,QAAT,CAAf;AACA;;AAEDC,IAAAA,OAAO,CAACiB,gBAAR,CAA0B,SAA1B,EAAqChB,SAArC;AACA,WAAO,MAAM;AACZD,MAAAA,OAAO,CAACkB,mBAAR,CAA6B,SAA7B,EAAwCjB,SAAxC;AACA,KAFD;AAGA,GAzDK,EA0DN,CAAEJ,UAAF,CA1DM,CAAP;AA4DA","sourcesContent":["/**\n * WordPress dependencies\n */\nimport {\n\tcreateBlock,\n\tgetDefaultBlockName,\n\tcloneBlock,\n} from '@wordpress/blocks';\nimport { useRef } from '@wordpress/element';\nimport { useRefEffect } from '@wordpress/compose';\nimport { ENTER } from '@wordpress/keycodes';\nimport { useSelect, useDispatch } from '@wordpress/data';\nimport { store as blockEditorStore } from '@wordpress/block-editor';\n\n/**\n * Internal dependencies\n */\nimport useOutdentListItem from './use-outdent-list-item';\n\nexport default function useEnter( props ) {\n\tconst { replaceBlocks, selectionChange } = useDispatch( blockEditorStore );\n\tconst { getBlock, getBlockRootClientId, getBlockIndex } =\n\t\tuseSelect( blockEditorStore );\n\tconst propsRef = useRef( props );\n\tpropsRef.current = props;\n\tconst [ canOutdent, outdentListItem ] = useOutdentListItem(\n\t\tpropsRef.current.clientId\n\t);\n\treturn useRefEffect(\n\t\t( element ) => {\n\t\t\tfunction onKeyDown( event ) {\n\t\t\t\tif ( event.defaultPrevented || event.keyCode !== ENTER ) {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tconst { content, clientId } = propsRef.current;\n\t\t\t\tif ( content.length ) {\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tevent.preventDefault();\n\t\t\t\tif ( canOutdent ) {\n\t\t\t\t\toutdentListItem();\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\t// Here we are in top level list so we need to split.\n\t\t\t\tconst topParentListBlock = getBlock(\n\t\t\t\t\tgetBlockRootClientId( clientId )\n\t\t\t\t);\n\t\t\t\tconst blockIndex = getBlockIndex( clientId );\n\t\t\t\tconst head = cloneBlock( {\n\t\t\t\t\t...topParentListBlock,\n\t\t\t\t\tinnerBlocks: topParentListBlock.innerBlocks.slice(\n\t\t\t\t\t\t0,\n\t\t\t\t\t\tblockIndex\n\t\t\t\t\t),\n\t\t\t\t} );\n\t\t\t\tconst middle = createBlock( getDefaultBlockName() );\n\t\t\t\t// Last list item might contain a `list` block innerBlock\n\t\t\t\t// In that case append remaining innerBlocks blocks.\n\t\t\t\tconst after = [\n\t\t\t\t\t...( topParentListBlock.innerBlocks[ blockIndex ]\n\t\t\t\t\t\t.innerBlocks[ 0 ]?.innerBlocks || [] ),\n\t\t\t\t\t...topParentListBlock.innerBlocks.slice( blockIndex + 1 ),\n\t\t\t\t];\n\t\t\t\tconst tail = after.length\n\t\t\t\t\t? [\n\t\t\t\t\t\t\tcloneBlock( {\n\t\t\t\t\t\t\t\t...topParentListBlock,\n\t\t\t\t\t\t\t\tinnerBlocks: after,\n\t\t\t\t\t\t\t} ),\n\t\t\t\t\t  ]\n\t\t\t\t\t: [];\n\t\t\t\treplaceBlocks(\n\t\t\t\t\ttopParentListBlock.clientId,\n\t\t\t\t\t[ head, middle, ...tail ],\n\t\t\t\t\t1\n\t\t\t\t);\n\t\t\t\t// We manually change the selection here because we are replacing\n\t\t\t\t// a different block than the selected one.\n\t\t\t\tselectionChange( middle.clientId );\n\t\t\t}\n\n\t\t\telement.addEventListener( 'keydown', onKeyDown );\n\t\t\treturn () => {\n\t\t\t\telement.removeEventListener( 'keydown', onKeyDown );\n\t\t\t};\n\t\t},\n\t\t[ canOutdent ]\n\t);\n}\n"]}

package/build/list-item/hooks/use-merge.js

@@ -0,0 +1,174 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = useMerge;
+
+var _data = require("@wordpress/data");
+
+var _blockEditor = require("@wordpress/block-editor");
+
+var _blocks = require("@wordpress/blocks");
+
+var _useOutdentListItem = _interopRequireDefault(require("./use-outdent-list-item"));
+
+/**
+ * WordPress dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+const {
+  name: listItemName
+} = {
+  $schema: "https://schemas.wp.org/trunk/block.json",
+  apiVersion: 2,
+  __experimental: "list-v2",
+  name: "core/list-item",
+  title: "List item",
+  category: "text",
+  parent: ["core/list"],
+  description: "Create a list item.",
+  textdomain: "default",
+  attributes: {
+    placeholder: {
+      type: "string"
+    },
+    content: {
+      type: "string",
+      source: "html",
+      selector: "li",
+      "default": "",
+      __experimentalRole: "content"
+    }
+  },
+  supports: {
+    className: false,
+    __experimentalSelector: "li"
+  }
+};
+
+function useMerge(clientId) {
+  const registry = (0, _data.useRegistry)();
+  const {
+    getPreviousBlockClientId,
+    getNextBlockClientId,
+    getBlockOrder,
+    getBlockRootClientId,
+    getBlockName,
+    getBlock
+  } = (0, _data.useSelect)(_blockEditor.store);
+  const {
+    mergeBlocks,
+    moveBlocksToPosition,
+    replaceBlock,
+    selectBlock
+  } = (0, _data.useDispatch)(_blockEditor.store);
+  const [, outdentListItem] = (0, _useOutdentListItem.default)(clientId);
+
+  function getTrailingId(id) {
+    const order = getBlockOrder(id);
+
+    if (!order.length) {
+      return id;
+    }
+
+    return getTrailingId(order[order.length - 1]);
+  }
+
+  function getParentListItemId(id) {
+    const listId = getBlockRootClientId(id);
+    const parentListItemId = getBlockRootClientId(listId);
+    if (!parentListItemId) return;
+    if (getBlockName(parentListItemId) !== listItemName) return;
+    return parentListItemId;
+  }
+  /**
+   * Return the next list item with respect to the given list item. If none,
+   * return the next list item of the parent list item if it exists.
+   *
+   * @param {string} id A list item client ID.
+   * @return {string?} The client ID of the next list item.
+   */
+
+
+  function _getNextId(id) {
+    const next = getNextBlockClientId(id);
+    if (next) return next;
+    const parentListItemId = getParentListItemId(id);
+    if (!parentListItemId) return;
+    return _getNextId(parentListItemId);
+  }
+  /**
+   * Given a client ID, return the client ID of the list item on the next
+   * line, regardless of indentation level.
+   *
+   * @param {string} id The client ID of the current list item.
+   * @return {string?} The client ID of the next list item.
+   */
+
+
+  function getNextId(id) {
+    const order = getBlockOrder(id); // If the list item does not have a nested list, return the next list
+    // item.
+
+    if (!order.length) {
+      return _getNextId(id);
+    } // Get the first list item in the nested list.
+
+
+    return getBlockOrder(order[0])[0];
+  }
+
+  function switchToDefaultBlockType(forward) {
+    const rootClientId = getBlockRootClientId(clientId);
+    const replacement = (0, _blocks.switchToBlockType)(getBlock(rootClientId), (0, _blocks.getDefaultBlockName)());
+    const indexToSelect = forward ? replacement.length - 1 : 0;
+    const initialPosition = forward ? -1 : 0;
+    registry.batch(() => {
+      replaceBlock(rootClientId, replacement);
+      selectBlock(replacement[indexToSelect].clientId, initialPosition);
+    });
+  }
+
+  return forward => {
+    if (forward) {
+      const nextBlockClientId = getNextId(clientId);
+
+      if (!nextBlockClientId) {
+        switchToDefaultBlockType(forward);
+        return;
+      }
+
+      if (getParentListItemId(nextBlockClientId)) {
+        outdentListItem(nextBlockClientId);
+      } else {
+        registry.batch(() => {
+          moveBlocksToPosition(getBlockOrder(nextBlockClientId), nextBlockClientId, getPreviousBlockClientId(nextBlockClientId));
+          mergeBlocks(clientId, nextBlockClientId);
+        });
+      }
+    } else {
+      // Merging is only done from the top level. For lowel levels, the
+      // list item is outdented instead.
+      const previousBlockClientId = getPreviousBlockClientId(clientId);
+
+      if (getParentListItemId(clientId)) {
+        outdentListItem(clientId);
+      } else if (previousBlockClientId) {
+        const trailingId = getTrailingId(previousBlockClientId);
+        registry.batch(() => {
+          moveBlocksToPosition(getBlockOrder(clientId), clientId, previousBlockClientId);
+          mergeBlocks(trailingId, clientId);
+        });
+      } else {
+        switchToDefaultBlockType(forward);
+      }
+    }
+  };
+}
+//# sourceMappingURL=use-merge.js.map

package/build/list-item/hooks/use-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["@wordpress/block-library/src/list-item/hooks/use-merge.js"],"names":["useMerge","clientId","registry","getPreviousBlockClientId","getNextBlockClientId","getBlockOrder","getBlockRootClientId","getBlockName","getBlock","blockEditorStore","mergeBlocks","moveBlocksToPosition","replaceBlock","selectBlock","outdentListItem","getTrailingId","id","order","length","getParentListItemId","listId","parentListItemId","listItemName","_getNextId","next","getNextId","switchToDefaultBlockType","forward","rootClientId","replacement","indexToSelect","initialPosition","batch","nextBlockClientId","previousBlockClientId","trailingId"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { useRegistry, useDispatch, useSelect } from '@wordpress/data';\nimport { store as blockEditorStore } from '@wordpress/block-editor';\nimport { getDefaultBlockName, switchToBlockType } from '@wordpress/blocks';\n\n/**\n * Internal dependencies\n */\nimport useOutdentListItem from './use-outdent-list-item';\n\nimport { name as listItemName } from '../block.json';\n\nexport default function useMerge( clientId ) {\n\tconst registry = useRegistry();\n\tconst {\n\t\tgetPreviousBlockClientId,\n\t\tgetNextBlockClientId,\n\t\tgetBlockOrder,\n\t\tgetBlockRootClientId,\n\t\tgetBlockName,\n\t\tgetBlock,\n\t} = useSelect( blockEditorStore );\n\tconst { mergeBlocks, moveBlocksToPosition, replaceBlock, selectBlock } =\n\t\tuseDispatch( blockEditorStore );\n\tconst [ , outdentListItem ] = useOutdentListItem( clientId );\n\n\tfunction getTrailingId( id ) {\n\t\tconst order = getBlockOrder( id );\n\n\t\tif ( ! order.length ) {\n\t\t\treturn id;\n\t\t}\n\n\t\treturn getTrailingId( order[ order.length - 1 ] );\n\t}\n\n\tfunction getParentListItemId( id ) {\n\t\tconst listId = getBlockRootClientId( id );\n\t\tconst parentListItemId = getBlockRootClientId( listId );\n\t\tif ( ! parentListItemId ) return;\n\t\tif ( getBlockName( parentListItemId ) !== listItemName ) return;\n\t\treturn parentListItemId;\n\t}\n\n\t/**\n\t * Return the next list item with respect to the given list item. If none,\n\t * return the next list item of the parent list item if it exists.\n\t *\n\t * @param {string} id A list item client ID.\n\t * @return {string?} The client ID of the next list item.\n\t */\n\tfunction _getNextId( id ) {\n\t\tconst next = getNextBlockClientId( id );\n\t\tif ( next ) return next;\n\t\tconst parentListItemId = getParentListItemId( id );\n\t\tif ( ! parentListItemId ) return;\n\t\treturn _getNextId( parentListItemId );\n\t}\n\n\t/**\n\t * Given a client ID, return the client ID of the list item on the next\n\t * line, regardless of indentation level.\n\t *\n\t * @param {string} id The client ID of the current list item.\n\t * @return {string?} The client ID of the next list item.\n\t */\n\tfunction getNextId( id ) {\n\t\tconst order = getBlockOrder( id );\n\n\t\t// If the list item does not have a nested list, return the next list\n\t\t// item.\n\t\tif ( ! order.length ) {\n\t\t\treturn _getNextId( id );\n\t\t}\n\n\t\t// Get the first list item in the nested list.\n\t\treturn getBlockOrder( order[ 0 ] )[ 0 ];\n\t}\n\n\tfunction switchToDefaultBlockType( forward ) {\n\t\tconst rootClientId = getBlockRootClientId( clientId );\n\t\tconst replacement = switchToBlockType(\n\t\t\tgetBlock( rootClientId ),\n\t\t\tgetDefaultBlockName()\n\t\t);\n\t\tconst indexToSelect = forward ? replacement.length - 1 : 0;\n\t\tconst initialPosition = forward ? -1 : 0;\n\t\tregistry.batch( () => {\n\t\t\treplaceBlock( rootClientId, replacement );\n\t\t\tselectBlock(\n\t\t\t\treplacement[ indexToSelect ].clientId,\n\t\t\t\tinitialPosition\n\t\t\t);\n\t\t} );\n\t}\n\n\treturn ( forward ) => {\n\t\tif ( forward ) {\n\t\t\tconst nextBlockClientId = getNextId( clientId );\n\n\t\t\tif ( ! nextBlockClientId ) {\n\t\t\t\tswitchToDefaultBlockType( forward );\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tif ( getParentListItemId( nextBlockClientId ) ) {\n\t\t\t\toutdentListItem( nextBlockClientId );\n\t\t\t} else {\n\t\t\t\tregistry.batch( () => {\n\t\t\t\t\tmoveBlocksToPosition(\n\t\t\t\t\t\tgetBlockOrder( nextBlockClientId ),\n\t\t\t\t\t\tnextBlockClientId,\n\t\t\t\t\t\tgetPreviousBlockClientId( nextBlockClientId )\n\t\t\t\t\t);\n\t\t\t\t\tmergeBlocks( clientId, nextBlockClientId );\n\t\t\t\t} );\n\t\t\t}\n\t\t} else {\n\t\t\t// Merging is only done from the top level. For lowel levels, the\n\t\t\t// list item is outdented instead.\n\t\t\tconst previousBlockClientId = getPreviousBlockClientId( clientId );\n\t\t\tif ( getParentListItemId( clientId ) ) {\n\t\t\t\toutdentListItem( clientId );\n\t\t\t} else if ( previousBlockClientId ) {\n\t\t\t\tconst trailingId = getTrailingId( previousBlockClientId );\n\t\t\t\tregistry.batch( () => {\n\t\t\t\t\tmoveBlocksToPosition(\n\t\t\t\t\t\tgetBlockOrder( clientId ),\n\t\t\t\t\t\tclientId,\n\t\t\t\t\t\tpreviousBlockClientId\n\t\t\t\t\t);\n\t\t\t\t\tmergeBlocks( trailingId, clientId );\n\t\t\t\t} );\n\t\t\t} else {\n\t\t\t\tswitchToDefaultBlockType( forward );\n\t\t\t}\n\t\t}\n\t};\n}\n"]}