Skip to content

fix: revert fix to icon list item, use splitting instead #3384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bfintal merged 1 commit into from
Jan 15, 2025
Merged

fix: revert fix to icon list item, use splitting instead #3384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/block/icon-list-item/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import blockStyles from './style'
import { getUseSvgDef } from '../icon-list/util'
import {
convertToListItems,
useOnPaste,
useEnter,
} from './util'

Expand Down Expand Up @@ -110,7 +109,6 @@ const Edit = props => {
] )

const useEnterRef = useEnter( text, clientId )
const onPaste = useOnPaste( clientId, parentBlock?.clientId, attributes, setAttributes )

const onMerge = forward => {
mergeBlocks( forward )
Expand Down Expand Up @@ -173,7 +171,6 @@ const Edit = props => {
tagName="span"
className={ textClassNames }
onMerge={ onMerge }
onPaste={ onPaste }
onReplace={ onReplace
? ( blocks, ...args ) => {
onReplace(
Expand Down
47 changes: 3 additions & 44 deletions src/block/icon-list-item/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
* WordPress dependencies
*/
import { useRefEffect } from '@wordpress/compose'
import { useCallback, useRef } from '@wordpress/element'
import { useRef } from '@wordpress/element'
import {
useSelect, useDispatch, dispatch,
useSelect,
useDispatch,
} from '@wordpress/data'
import {
cloneBlock,
switchToBlockType,
createBlock,
getDefaultBlockName,
pasteHandler,
} from '@wordpress/blocks'
import { store as blockEditorStore } from '@wordpress/block-editor'
import { ENTER } from '@wordpress/keycodes'
Expand Down Expand Up @@ -123,44 +123,3 @@ export const useEnter = ( text, clientId ) => {
[ clientId ]
)
}

export const useOnPaste = ( clientId, parentClientId, attributes, setAttributes ) => {
const { insertBlocks } = useDispatch( blockEditorStore )
const { getBlockIndex } = useSelect( blockEditorStore )

return useCallback( event => {
event.preventDefault()
const html = event.clipboardData.getData( 'text/html' )
const plain = event.clipboardData.getData( 'text/plain' )

// Convert first to core/list block.
const list = pasteHandler( {
HTML: html,
plainText: plain,
mode: 'BLOCKS',
} )

// If list[0] has inner blocks, it has been converted to core/list block, else list has core/paragraph elements.
const items = list[ 0 ].innerBlocks.length ? list[ 0 ].innerBlocks : list

const content = items.map( item => item.attributes.content.toPlainText().replaceAll( '\n', '<br>' ) )

// If current icon list item has no text, use the first item as text.
if ( ! attributes.text ) {
const firstItem = content.shift()
setAttributes( { text: firstItem } )
}

// create new icon list items
const newBlocks = content.map( text => {
const block = createBlock( 'stackable/icon-list-item', {
...attributes,
text,
} )

return block
} )
dispatch( 'core/block-editor' ).__unstableMarkNextChangeAsNotPersistent()
insertBlocks( newBlocks, getBlockIndex( clientId ) + 1, parentClientId )
}, [ clientId, parentClientId, attributes, setAttributes ] )
}
Loading