@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
|
@@ -25,6 +25,7 @@ export function BlockInvalidWarning(_ref) {
|
|
|
25
25
|
block
|
|
26
26
|
} = _ref;
|
|
27
27
|
const hasHTMLBlock = !!getBlockType('core/html');
|
|
28
|
+
const hasClassicBlock = !!getBlockType('core/freeform');
|
|
28
29
|
const [compare, setCompare] = useState(false);
|
|
29
30
|
const onCompare = useCallback(() => setCompare(true), []);
|
|
30
31
|
const onCompareClose = useCallback(() => setCompare(false), []); // We memo the array here to prevent the children components from being updated unexpectedly.
|
|
@@ -36,10 +37,10 @@ export function BlockInvalidWarning(_ref) {
|
|
|
36
37
|
}, hasHTMLBlock && {
|
|
37
38
|
title: __('Convert to HTML'),
|
|
38
39
|
onClick: convertToHTML
|
|
39
|
-
}, {
|
|
40
|
+
}, hasClassicBlock && {
|
|
40
41
|
title: __('Convert to Classic Block'),
|
|
41
42
|
onClick: convertToClassic
|
|
42
|
-
}].filter(Boolean), [onCompare, convertToHTML, convertToClassic]);
|
|
43
|
+
}].filter(Boolean), [onCompare, hasHTMLBlock, convertToHTML, hasClassicBlock, convertToClassic]);
|
|
43
44
|
return createElement(Fragment, null, createElement(Warning, {
|
|
44
45
|
actions: [createElement(Button, {
|
|
45
46
|
key: "recover",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["@wordpress/block-editor/src/components/block-list/block-invalid-warning.js"],"names":["__","_x","Button","Modal","useState","useCallback","useMemo","getBlockType","createBlock","rawHandler","compose","withDispatch","withSelect","Warning","BlockCompare","store","blockEditorStore","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","getBlock","dispatch","replaceBlock"],"mappings":";;AAAA;AACA;AACA;AACA,SAASA,EAAT,EAAaC,EAAb,QAAuB,iBAAvB;AACA,SAASC,MAAT,EAAiBC,KAAjB,QAA8B,uBAA9B;AACA,SAASC,QAAT,EAAmBC,WAAnB,EAAgCC,OAAhC,QAA+C,oBAA/C;AACA,SAASC,YAAT,EAAuBC,WAAvB,EAAoCC,UAApC,QAAsD,mBAAtD;AACA,SAASC,OAAT,QAAwB,oBAAxB;AACA,SAASC,YAAT,EAAuBC,UAAvB,QAAyC,iBAAzC;AAEA;AACA;AACA;;AACA,OAAOC,OAAP,MAAoB,YAApB;AACA,OAAOC,YAAP,MAAyB,kBAAzB;AACA,SAASC,KAAK,IAAIC,gBAAlB,QAA0C,aAA1C;AAEA,OAAO,SAASC,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,CAAEhB,YAAY,CAAE,WAAF,CAApC;AACA,QAAM,
|
|
1
|
+
{"version":3,"sources":["@wordpress/block-editor/src/components/block-list/block-invalid-warning.js"],"names":["__","_x","Button","Modal","useState","useCallback","useMemo","getBlockType","createBlock","rawHandler","compose","withDispatch","withSelect","Warning","BlockCompare","store","blockEditorStore","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","getBlock","dispatch","replaceBlock"],"mappings":";;AAAA;AACA;AACA;AACA,SAASA,EAAT,EAAaC,EAAb,QAAuB,iBAAvB;AACA,SAASC,MAAT,EAAiBC,KAAjB,QAA8B,uBAA9B;AACA,SAASC,QAAT,EAAmBC,WAAnB,EAAgCC,OAAhC,QAA+C,oBAA/C;AACA,SAASC,YAAT,EAAuBC,WAAvB,EAAoCC,UAApC,QAAsD,mBAAtD;AACA,SAASC,OAAT,QAAwB,oBAAxB;AACA,SAASC,YAAT,EAAuBC,UAAvB,QAAyC,iBAAzC;AAEA;AACA;AACA;;AACA,OAAOC,OAAP,MAAoB,YAApB;AACA,OAAOC,YAAP,MAAyB,kBAAzB;AACA,SAASC,KAAK,IAAIC,gBAAlB,QAA0C,aAA1C;AAEA,OAAO,SAASC,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,CAAEhB,YAAY,CAAE,WAAF,CAApC;AACA,QAAMiB,eAAe,GAAG,CAAC,CAAEjB,YAAY,CAAE,eAAF,CAAvC;AACA,QAAM,CAAEkB,OAAF,EAAWC,UAAX,IAA0BtB,QAAQ,CAAE,KAAF,CAAxC;AAEA,QAAMuB,SAAS,GAAGtB,WAAW,CAAE,MAAMqB,UAAU,CAAE,IAAF,CAAlB,EAA4B,EAA5B,CAA7B;AACA,QAAME,cAAc,GAAGvB,WAAW,CAAE,MAAMqB,UAAU,CAAE,KAAF,CAAlB,EAA6B,EAA7B,CAAlC,CANG,CAQH;;AACA,QAAMG,aAAa,GAAGvB,OAAO,CAC5B,MACC,CACC;AACC;AACAwB,IAAAA,KAAK,EAAE7B,EAAE,CAAE,SAAF,EAAa,iBAAb,CAFV;AAGC8B,IAAAA,OAAO,EAAEJ;AAHV,GADD,EAMCJ,YAAY,IAAI;AACfO,IAAAA,KAAK,EAAE9B,EAAE,CAAE,iBAAF,CADM;AAEf+B,IAAAA,OAAO,EAAEb;AAFM,GANjB,EAUCM,eAAe,IAAI;AAClBM,IAAAA,KAAK,EAAE9B,EAAE,CAAE,0BAAF,CADS;AAElB+B,IAAAA,OAAO,EAAEX;AAFS,GAVpB,EAcEY,MAdF,CAcUC,OAdV,CAF2B,EAiB5B,CACCN,SADD,EAECJ,YAFD,EAGCL,aAHD,EAICM,eAJD,EAKCJ,gBALD,CAjB4B,CAA7B;AA0BA,SACC,8BACC,cAAC,OAAD;AACC,IAAA,OAAO,EAAG,CACT,cAAC,MAAD;AACC,MAAA,GAAG,EAAC,SADL;AAEC,MAAA,OAAO,EAAGC,oBAFX;AAGC,MAAA,OAAO,EAAC;AAHT,OAKGrB,EAAE,CAAE,wBAAF,CALL,CADS,CADX;AAUC,IAAA,gBAAgB,EAAG6B;AAVpB,KAYG7B,EAAE,CAAE,oDAAF,CAZL,CADD,EAeGyB,OAAO,IACR,cAAC,KAAD;AACC,IAAA,KAAK,EACJ;AACAzB,IAAAA,EAAE,CAAE,eAAF,CAHJ;AAKC,IAAA,cAAc,EAAG4B,cALlB;AAMC,IAAA,SAAS,EAAC;AANX,KAQC,cAAC,YAAD;AACC,IAAA,KAAK,EAAGN,KADT;AAEC,IAAA,MAAM,EAAGJ,aAFV;AAGC,IAAA,SAAS,EAAGC,eAHb;AAIC,IAAA,SAAS,EAAGe,aAJb;AAKC,IAAA,iBAAiB,EAAGlC,EAAE,CAAE,mBAAF;AALvB,IARD,CAhBF,CADD;AAoCA;;AAED,MAAMmC,cAAc,GAAKb,KAAF,IACtBd,WAAW,CAAE,eAAF,EAAmB;AAC7B4B,EAAAA,OAAO,EAAEd,KAAK,CAACe;AADc,CAAnB,CADZ;;AAIA,MAAMC,WAAW,GAAKhB,KAAF,IACnBd,WAAW,CAAE,WAAF,EAAe;AACzB4B,EAAAA,OAAO,EAAEd,KAAK,CAACe;AADU,CAAf,CADZ;;AAIA,MAAMH,aAAa,GAAKZ,KAAF,IACrBb,UAAU,CAAE;AACX8B,EAAAA,IAAI,EAAEjB,KAAK,CAACe;AADD,CAAF,CADX;;AAIA,MAAMG,YAAY,GAAG;AAAA,MAAE;AAAEC,IAAAA,IAAF;AAAQC,IAAAA,UAAR;AAAoBC,IAAAA;AAApB,GAAF;AAAA,SACpBnC,WAAW,CAAEiC,IAAF,EAAQC,UAAR,EAAoBC,WAApB,CADS;AAAA,CAArB;;AAGA,eAAejC,OAAO,CAAE,CACvBE,UAAU,CAAE,CAAEgC,MAAF;AAAA,MAAU;AAAEC,IAAAA;AAAF,GAAV;AAAA,SAA8B;AACzCvB,IAAAA,KAAK,EAAEsB,MAAM,CAAE5B,gBAAF,CAAN,CAA2B8B,QAA3B,CAAqCD,QAArC;AADkC,GAA9B;AAAA,CAAF,CADa,EAIvBlC,YAAY,CAAE,CAAEoC,QAAF,YAA2B;AAAA,MAAf;AAAEzB,IAAAA;AAAF,GAAe;AACxC,QAAM;AAAE0B,IAAAA;AAAF,MAAmBD,QAAQ,CAAE/B,gBAAF,CAAjC;AAEA,SAAO;AACNI,IAAAA,gBAAgB,GAAG;AAClB4B,MAAAA,YAAY,CAAE1B,KAAK,CAACuB,QAAR,EAAkBV,cAAc,CAAEb,KAAF,CAAhC,CAAZ;AACA,KAHK;;AAINJ,IAAAA,aAAa,GAAG;AACf8B,MAAAA,YAAY,CAAE1B,KAAK,CAACuB,QAAR,EAAkBP,WAAW,CAAEhB,KAAF,CAA7B,CAAZ;AACA,KANK;;AAONH,IAAAA,eAAe,GAAG;AACjB6B,MAAAA,YAAY,CAAE1B,KAAK,CAACuB,QAAR,EAAkBX,aAAa,CAAEZ,KAAF,CAA/B,CAAZ;AACA,KATK;;AAUND,IAAAA,oBAAoB,GAAG;AACtB2B,MAAAA,YAAY,CAAE1B,KAAK,CAACuB,QAAR,EAAkBL,YAAY,CAAElB,KAAF,CAA9B,CAAZ;AACA;;AAZK,GAAP;AAcA,CAjBW,CAJW,CAAF,CAAP,CAsBVL,mBAtBU,CAAf","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"]}
|
|
@@ -2551,14 +2551,14 @@ export function __unstableHasActiveBlockOverlayActive(state, clientId) {
|
|
|
2551
2551
|
return shouldEnableIfUnselected && !isBlockSelected(state, clientId) && !hasSelectedInnerBlock(state, clientId, true);
|
|
2552
2552
|
}
|
|
2553
2553
|
export function __unstableIsWithinBlockOverlay(state, clientId) {
|
|
2554
|
-
let parent = state.blocks.parents
|
|
2554
|
+
let parent = state.blocks.parents.get(clientId);
|
|
2555
2555
|
|
|
2556
2556
|
while (!!parent) {
|
|
2557
2557
|
if (__unstableHasActiveBlockOverlayActive(state, parent)) {
|
|
2558
2558
|
return true;
|
|
2559
2559
|
}
|
|
2560
2560
|
|
|
2561
|
-
parent = state.blocks.parents
|
|
2561
|
+
parent = state.blocks.parents.get(parent);
|
|
2562
2562
|
}
|
|
2563
2563
|
|
|
2564
2564
|
return false;
|