@wordpress/block-editor 11.3.8 → 11.3.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/components/block-list/block-invalid-warning.js +3 -2
- package/build/components/block-list/block-invalid-warning.js.map +1 -1
- package/build/store/selectors.js +2 -2
- package/build/store/selectors.js.map +1 -1
- package/build-module/components/block-list/block-invalid-warning.js +3 -2
- package/build-module/components/block-list/block-invalid-warning.js.map +1 -1
- package/build-module/store/selectors.js +2 -2
- package/build-module/store/selectors.js.map +1 -1
- package/build-style/style-rtl.css +1 -0
- package/build-style/style.css +1 -0
- package/package.json +2 -2
- package/src/components/block-inspector/style.scss +3 -0
- package/src/components/block-list/block-invalid-warning.js +9 -2
- package/src/store/selectors.js +2 -2
|
@@ -42,6 +42,7 @@ function BlockInvalidWarning(_ref) {
|
|
|
42
42
|
block
|
|
43
43
|
} = _ref;
|
|
44
44
|
const hasHTMLBlock = !!(0, _blocks.getBlockType)('core/html');
|
|
45
|
+
const hasClassicBlock = !!(0, _blocks.getBlockType)('core/freeform');
|
|
45
46
|
const [compare, setCompare] = (0, _element.useState)(false);
|
|
46
47
|
const onCompare = (0, _element.useCallback)(() => setCompare(true), []);
|
|
47
48
|
const onCompareClose = (0, _element.useCallback)(() => setCompare(false), []); // We memo the array here to prevent the children components from being updated unexpectedly.
|
|
@@ -53,10 +54,10 @@ function BlockInvalidWarning(_ref) {
|
|
|
53
54
|
}, hasHTMLBlock && {
|
|
54
55
|
title: (0, _i18n.__)('Convert to HTML'),
|
|
55
56
|
onClick: convertToHTML
|
|
56
|
-
}, {
|
|
57
|
+
}, hasClassicBlock && {
|
|
57
58
|
title: (0, _i18n.__)('Convert to Classic Block'),
|
|
58
59
|
onClick: convertToClassic
|
|
59
|
-
}].filter(Boolean), [onCompare, convertToHTML, convertToClassic]);
|
|
60
|
+
}].filter(Boolean), [onCompare, hasHTMLBlock, convertToHTML, hasClassicBlock, convertToClassic]);
|
|
60
61
|
return (0, _element.createElement)(_element.Fragment, null, (0, _element.createElement)(_warning.default, {
|
|
61
62
|
actions: [(0, _element.createElement)(_components.Button, {
|
|
62
63
|
key: "recover",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["@wordpress/block-editor/src/components/block-list/block-invalid-warning.js"],"names":["BlockInvalidWarning","convertToHTML","convertToBlocks","convertToClassic","attemptBlockRecovery","block","hasHTMLBlock","compare","setCompare","onCompare","onCompareClose","hiddenActions","title","onClick","filter","Boolean","blockToBlocks","blockToClassic","content","originalContent","blockToHTML","HTML","recoverBlock","name","attributes","innerBlocks","select","clientId","blockEditorStore","getBlock","dispatch","replaceBlock"],"mappings":";;;;;;;;;;AAKA;;AAFA;;AACA;;AAEA;;AACA;;AACA;;AAKA;;AACA;;AACA;;AAfA;AACA;AACA;;AAQA;AACA;AACA;AAKO,SAASA,mBAAT,OAMH;AAAA,MANiC;AACpCC,IAAAA,aADoC;AAEpCC,IAAAA,eAFoC;AAGpCC,IAAAA,gBAHoC;AAIpCC,IAAAA,oBAJoC;AAKpCC,IAAAA;AALoC,GAMjC;AACH,QAAMC,YAAY,GAAG,CAAC,CAAE,0BAAc,WAAd,CAAxB;AACA,QAAM,CAAEC,OAAF,EAAWC,UAAX,IAA0B,uBAAU,KAAV,CAAhC;AAEA,QAAMC,SAAS,GAAG,0BAAa,MAAMD,UAAU,CAAE,IAAF,CAA7B,EAAuC,EAAvC,CAAlB;AACA,QAAME,cAAc,GAAG,0BAAa,MAAMF,UAAU,CAAE,KAAF,CAA7B,EAAwC,EAAxC,CAAvB,
|
|
1
|
+
{"version":3,"sources":["@wordpress/block-editor/src/components/block-list/block-invalid-warning.js"],"names":["BlockInvalidWarning","convertToHTML","convertToBlocks","convertToClassic","attemptBlockRecovery","block","hasHTMLBlock","hasClassicBlock","compare","setCompare","onCompare","onCompareClose","hiddenActions","title","onClick","filter","Boolean","blockToBlocks","blockToClassic","content","originalContent","blockToHTML","HTML","recoverBlock","name","attributes","innerBlocks","select","clientId","blockEditorStore","getBlock","dispatch","replaceBlock"],"mappings":"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","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __, _x } from '@wordpress/i18n';\nimport { Button, Modal } from '@wordpress/components';\nimport { useState, useCallback, useMemo } from '@wordpress/element';\nimport { getBlockType, createBlock, rawHandler } from '@wordpress/blocks';\nimport { compose } from '@wordpress/compose';\nimport { withDispatch, withSelect } from '@wordpress/data';\n\n/**\n * Internal dependencies\n */\nimport Warning from '../warning';\nimport BlockCompare from '../block-compare';\nimport { store as blockEditorStore } from '../../store';\n\nexport function BlockInvalidWarning( {\n\tconvertToHTML,\n\tconvertToBlocks,\n\tconvertToClassic,\n\tattemptBlockRecovery,\n\tblock,\n} ) {\n\tconst hasHTMLBlock = !! getBlockType( 'core/html' );\n\tconst hasClassicBlock = !! getBlockType( 'core/freeform' );\n\tconst [ compare, setCompare ] = useState( false );\n\n\tconst onCompare = useCallback( () => setCompare( true ), [] );\n\tconst onCompareClose = useCallback( () => setCompare( false ), [] );\n\n\t// We memo the array here to prevent the children components from being updated unexpectedly.\n\tconst hiddenActions = useMemo(\n\t\t() =>\n\t\t\t[\n\t\t\t\t{\n\t\t\t\t\t// translators: Button to fix block content\n\t\t\t\t\ttitle: _x( 'Resolve', 'imperative verb' ),\n\t\t\t\t\tonClick: onCompare,\n\t\t\t\t},\n\t\t\t\thasHTMLBlock && {\n\t\t\t\t\ttitle: __( 'Convert to HTML' ),\n\t\t\t\t\tonClick: convertToHTML,\n\t\t\t\t},\n\t\t\t\thasClassicBlock && {\n\t\t\t\t\ttitle: __( 'Convert to Classic Block' ),\n\t\t\t\t\tonClick: convertToClassic,\n\t\t\t\t},\n\t\t\t].filter( Boolean ),\n\t\t[\n\t\t\tonCompare,\n\t\t\thasHTMLBlock,\n\t\t\tconvertToHTML,\n\t\t\thasClassicBlock,\n\t\t\tconvertToClassic,\n\t\t]\n\t);\n\n\treturn (\n\t\t<>\n\t\t\t<Warning\n\t\t\t\tactions={ [\n\t\t\t\t\t<Button\n\t\t\t\t\t\tkey=\"recover\"\n\t\t\t\t\t\tonClick={ attemptBlockRecovery }\n\t\t\t\t\t\tvariant=\"primary\"\n\t\t\t\t\t>\n\t\t\t\t\t\t{ __( 'Attempt Block Recovery' ) }\n\t\t\t\t\t</Button>,\n\t\t\t\t] }\n\t\t\t\tsecondaryActions={ hiddenActions }\n\t\t\t>\n\t\t\t\t{ __( 'This block contains unexpected or invalid content.' ) }\n\t\t\t</Warning>\n\t\t\t{ compare && (\n\t\t\t\t<Modal\n\t\t\t\t\ttitle={\n\t\t\t\t\t\t// translators: Dialog title to fix block content\n\t\t\t\t\t\t__( 'Resolve Block' )\n\t\t\t\t\t}\n\t\t\t\t\tonRequestClose={ onCompareClose }\n\t\t\t\t\tclassName=\"block-editor-block-compare\"\n\t\t\t\t>\n\t\t\t\t\t<BlockCompare\n\t\t\t\t\t\tblock={ block }\n\t\t\t\t\t\tonKeep={ convertToHTML }\n\t\t\t\t\t\tonConvert={ convertToBlocks }\n\t\t\t\t\t\tconvertor={ blockToBlocks }\n\t\t\t\t\t\tconvertButtonText={ __( 'Convert to Blocks' ) }\n\t\t\t\t\t/>\n\t\t\t\t</Modal>\n\t\t\t) }\n\t\t</>\n\t);\n}\n\nconst blockToClassic = ( block ) =>\n\tcreateBlock( 'core/freeform', {\n\t\tcontent: block.originalContent,\n\t} );\nconst blockToHTML = ( block ) =>\n\tcreateBlock( 'core/html', {\n\t\tcontent: block.originalContent,\n\t} );\nconst blockToBlocks = ( block ) =>\n\trawHandler( {\n\t\tHTML: block.originalContent,\n\t} );\nconst recoverBlock = ( { name, attributes, innerBlocks } ) =>\n\tcreateBlock( name, attributes, innerBlocks );\n\nexport default compose( [\n\twithSelect( ( select, { clientId } ) => ( {\n\t\tblock: select( blockEditorStore ).getBlock( clientId ),\n\t} ) ),\n\twithDispatch( ( dispatch, { block } ) => {\n\t\tconst { replaceBlock } = dispatch( blockEditorStore );\n\n\t\treturn {\n\t\t\tconvertToClassic() {\n\t\t\t\treplaceBlock( block.clientId, blockToClassic( block ) );\n\t\t\t},\n\t\t\tconvertToHTML() {\n\t\t\t\treplaceBlock( block.clientId, blockToHTML( block ) );\n\t\t\t},\n\t\t\tconvertToBlocks() {\n\t\t\t\treplaceBlock( block.clientId, blockToBlocks( block ) );\n\t\t\t},\n\t\t\tattemptBlockRecovery() {\n\t\t\t\treplaceBlock( block.clientId, recoverBlock( block ) );\n\t\t\t},\n\t\t};\n\t} ),\n] )( BlockInvalidWarning );\n"]}
|
package/build/store/selectors.js
CHANGED
|
@@ -2802,14 +2802,14 @@ function __unstableHasActiveBlockOverlayActive(state, clientId) {
|
|
|
2802
2802
|
}
|
|
2803
2803
|
|
|
2804
2804
|
function __unstableIsWithinBlockOverlay(state, clientId) {
|
|
2805
|
-
let parent = state.blocks.parents
|
|
2805
|
+
let parent = state.blocks.parents.get(clientId);
|
|
2806
2806
|
|
|
2807
2807
|
while (!!parent) {
|
|
2808
2808
|
if (__unstableHasActiveBlockOverlayActive(state, parent)) {
|
|
2809
2809
|
return true;
|
|
2810
2810
|
}
|
|
2811
2811
|
|
|
2812
|
-
parent = state.blocks.parents
|
|
2812
|
+
parent = state.blocks.parents.get(parent);
|
|
2813
2813
|
}
|
|
2814
2814
|
|
|
2815
2815
|
return false;
|