Skip to content

Framework: split block logic out of RichText (part 2) #16309

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
ellatrix merged 10 commits into from
Jul 10, 2019
Merged

Framework: split block logic out of RichText (part 2) #16309

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d528502
wip
ellatrix Jun 26, 2019
a400611
Move enter, delete, paste
ellatrix Jun 26, 2019
f8d5774
Clean up isEmpty
ellatrix Jun 26, 2019
af5b617
Clean up inputRule
ellatrix Jun 26, 2019
bc35682
Update package.json
ellatrix Jun 26, 2019
bc96986
Forgot bind
ellatrix Jun 27, 2019
f2342e5
Fix mistakes
ellatrix Jun 27, 2019
a7c46f9
Simplify
ellatrix Jun 27, 2019
3638170
href => url
ellatrix Jun 27, 2019
92532b2
Fix package.json
ellatrix Jun 27, 2019
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
Prev Previous commit
Next Next commit
Simplify
  • Loading branch information
@ellatrix
ellatrix committed Jun 27, 2019
commit a7c46f9400505f8799f802349d71570ae170aa24
5 changes: 5 additions & 0 deletions packages/format-library/src/link/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
applyFormat,
removeFormat,
slice,
isCollapsed,
} from '@wordpress/rich-text';
import { isURL, isEmail } from '@wordpress/url';
import { RichTextToolbarButton, RichTextShortcut } from '@wordpress/block-editor';
Expand All @@ -32,6 +33,10 @@ export const link = {
target: 'target',
},
__unstablePasteRule( value, { html, plainText } ) {
if ( isCollapsed( value ) ) {
return value;
}

const pastedText = ( html || plainText ).replace( /<[^>]+>/g, '' ).trim();

// A URL was pasted, turn the selection into a link
Expand Down
46 changes: 14 additions & 32 deletions packages/rich-text/src/component/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,29 +228,18 @@ class RichText extends Component {
window.console.log( 'Received plain text:\n\n', plainText );

const record = this.getRecord();

const pasteRules = formatTypes.reduce( ( accumlator, { __unstablePasteRule } ) => {
if ( __unstablePasteRule ) {
accumlator.push( __unstablePasteRule );
const transformed = formatTypes.reduce( ( accumlator, { __unstablePasteRule } ) => {
// Only allow one transform.
if ( __unstablePasteRule && accumlator === record ) {
accumlator = __unstablePasteRule( record, { html, plainText } );
}

return accumlator;
}, [] );

if ( pasteRules.length ) {
const transformed = pasteRules.reduce( ( accumlator, transform ) => {
// Only allow one transform.
if ( accumlator === record ) {
accumlator = transform( record, { html, plainText } );
}
}, record );

return accumlator;
}, record );

if ( transformed !== record ) {
this.onChange( transformed );
return;
}
if ( transformed !== record ) {
this.onChange( transformed );
return;
}

if ( onPaste ) {
Expand Down Expand Up @@ -367,24 +356,17 @@ class RichText extends Component {
inputRule( change, this.valueToFormat );
}

const inputRules = formatTypes.reduce( ( accumlator, { __unstableInputRule } ) => {
const transformed = formatTypes.reduce( ( accumlator, { __unstableInputRule } ) => {
if ( __unstableInputRule ) {
accumlator.push( __unstableInputRule );
accumlator = __unstableInputRule( accumlator );
}

return accumlator;
}, [] );

if ( inputRules.length ) {
const transformed = inputRules.reduce(
( accumlator, transform ) => transform( accumlator ),
change
);
}, change );

if ( transformed !== change ) {
this.onCreateUndoLevel();
this.onChange( { ...transformed, activeFormats } );
}
if ( transformed !== change ) {
this.onCreateUndoLevel();
this.onChange( { ...transformed, activeFormats } );
}

// Create an undo level when input stops for over a second.
Expand Down