-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove text align control for paragraph, heading, and button in conte…
…ntOnly editing mode (#57906) * Remove text align control for paragraphs and buttons in contentOnly editing mode * Remove heading level and text align on content only mode heading blocks * Add a react native edit file for the heading block that does not use useBlockEditingMode
- Loading branch information
Showing
4 changed files
with
195 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
| import classnames from 'classnames'; | ||
|
|
||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { __ } from '@wordpress/i18n'; | ||
| import { useEffect, Platform } from '@wordpress/element'; | ||
| import { useDispatch, useSelect } from '@wordpress/data'; | ||
| import { createBlock, getDefaultBlockName } from '@wordpress/blocks'; | ||
| import { | ||
| AlignmentControl, | ||
| BlockControls, | ||
| RichText, | ||
| useBlockProps, | ||
| store as blockEditorStore, | ||
| HeadingLevelDropdown, | ||
| } from '@wordpress/block-editor'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import { generateAnchor, setAnchor } from './autogenerate-anchors'; | ||
|
|
||
| function HeadingEdit( { | ||
| attributes, | ||
| setAttributes, | ||
| mergeBlocks, | ||
| onReplace, | ||
| style, | ||
| clientId, | ||
| } ) { | ||
| const { textAlign, content, level, placeholder, anchor } = attributes; | ||
| const tagName = 'h' + level; | ||
| const blockProps = useBlockProps( { | ||
| className: classnames( { | ||
| [ `has-text-align-${ textAlign }` ]: textAlign, | ||
| } ), | ||
| style, | ||
| } ); | ||
|
|
||
| const { canGenerateAnchors } = useSelect( ( select ) => { | ||
| const { getGlobalBlockCount, getSettings } = select( blockEditorStore ); | ||
| const settings = getSettings(); | ||
|
|
||
| return { | ||
| canGenerateAnchors: | ||
| !! settings.generateAnchors || | ||
| getGlobalBlockCount( 'core/table-of-contents' ) > 0, | ||
| }; | ||
| }, [] ); | ||
|
|
||
| const { __unstableMarkNextChangeAsNotPersistent } = | ||
| useDispatch( blockEditorStore ); | ||
|
|
||
| // Initially set anchor for headings that have content but no anchor set. | ||
| // This is used when transforming a block to heading, or for legacy anchors. | ||
| useEffect( () => { | ||
| if ( ! canGenerateAnchors ) { | ||
| return; | ||
| } | ||
|
|
||
| if ( ! anchor && content ) { | ||
| // This side-effect should not create an undo level. | ||
| __unstableMarkNextChangeAsNotPersistent(); | ||
| setAttributes( { | ||
| anchor: generateAnchor( clientId, content ), | ||
| } ); | ||
| } | ||
| setAnchor( clientId, anchor ); | ||
|
|
||
| // Remove anchor map when block unmounts. | ||
| return () => setAnchor( clientId, null ); | ||
| }, [ anchor, content, clientId, canGenerateAnchors ] ); | ||
|
|
||
| const onContentChange = ( value ) => { | ||
| const newAttrs = { content: value }; | ||
| if ( | ||
| canGenerateAnchors && | ||
| ( ! anchor || | ||
| ! value || | ||
| generateAnchor( clientId, content ) === anchor ) | ||
| ) { | ||
| newAttrs.anchor = generateAnchor( clientId, value ); | ||
| } | ||
| setAttributes( newAttrs ); | ||
| }; | ||
|
|
||
| return ( | ||
| <> | ||
| <BlockControls group="block"> | ||
| <HeadingLevelDropdown | ||
| value={ level } | ||
| onChange={ ( newLevel ) => | ||
| setAttributes( { level: newLevel } ) | ||
| } | ||
| /> | ||
| <AlignmentControl | ||
| value={ textAlign } | ||
| onChange={ ( nextAlign ) => { | ||
| setAttributes( { textAlign: nextAlign } ); | ||
| } } | ||
| /> | ||
| </BlockControls> | ||
| <RichText | ||
| identifier="content" | ||
| tagName={ tagName } | ||
| value={ content } | ||
| onChange={ onContentChange } | ||
| onMerge={ mergeBlocks } | ||
| onSplit={ ( value, isOriginal ) => { | ||
| let block; | ||
|
|
||
| if ( isOriginal || value ) { | ||
| block = createBlock( 'core/heading', { | ||
| ...attributes, | ||
| content: value, | ||
| } ); | ||
| } else { | ||
| block = createBlock( | ||
| getDefaultBlockName() ?? 'core/heading' | ||
| ); | ||
| } | ||
|
|
||
| if ( isOriginal ) { | ||
| block.clientId = clientId; | ||
| } | ||
|
|
||
| return block; | ||
| } } | ||
| onReplace={ onReplace } | ||
| onRemove={ () => onReplace( [] ) } | ||
| placeholder={ placeholder || __( 'Heading' ) } | ||
| textAlign={ textAlign } | ||
| { ...( Platform.isNative && { deleteEnter: true } ) } // setup RichText on native mobile to delete the "Enter" key as it's handled by the JS/RN side | ||
| { ...blockProps } | ||
| /> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| export default HeadingEdit; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters