Paste: remove non inline elements from inline pasted content #2855

ellatrix · 2017-10-02T12:50:35Z

Description

This PR ensures that non inline elements are removed if the content is forced as inline (inline Editable). At the moment, these elements are left. E.g. paste some blocks in a caption.

How Has This Been Tested?

Copy some blocks or any HTML with block-level HTML.
Paste it in a caption or similar.
Content should be free of block-level HTML, but formatting should be kept.

Checklist:

My code is tested.
My code follows the WordPress code style.
My code follows has proper inline documentation.

codecov · 2017-10-02T12:52:21Z

Codecov Report

Merging #2855 into master will decrease coverage by 0.26%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2855      +/-   ##
==========================================
- Coverage   33.78%   33.51%   -0.27%     
==========================================
  Files         191      191              
  Lines        5692     5788      +96     
  Branches      997     1020      +23     
==========================================
+ Hits         1923     1940      +17     
- Misses       3189     3249      +60     
- Partials      580      599      +19

Impacted Files	Coverage Δ
blocks/api/paste/index.js	`86.66% <100%> (+7.35%)`	⬆️
editor/modes/visual-editor/block-list.js	`0% <0%> (ø)`	⬆️
blocks/library/paragraph/index.js	`34.78% <0%> (+1.44%)`	⬆️
blocks/library/cover-image/index.js	`35.89% <0%> (+2.56%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d420547...e5b8f46. Read the comment docs.

gziolo · 2017-10-03T08:06:29Z

blocks/api/paste/index.js

@@ -19,7 +19,7 @@ import msListConverter from './ms-list-converter';
 import listMerger from './list-merger';
 import imageCorrector from './image-corrector';
 import blockquoteNormaliser from './blockquote-normaliser';
-import { deepFilter, isInvalidInline, isNotWhitelisted, isPlain } from './utils';
+import { deepFilter, isInvalidInline, isNotWhitelisted, isPlain, isInline } from './utils';


It looks like we don't care about the order of import statements. In Calypso they introduced codemod which sorts everything for you. Just saying, no action necessary here :)

Yeah, I saw your ticket #2819. :)

gziolo

Code LGTM 👍
I tested with a heading containing italics and bold. I can confirm it pastes as expected.

Paste: remove non inline elements from inline pasted content

e5b8f46

ellatrix added the [Type] Bug An existing feature does not function as intended label Oct 2, 2017

ellatrix added this to the Beta 1.3 milestone Oct 2, 2017

gziolo reviewed Oct 3, 2017

View reviewed changes

gziolo approved these changes Oct 3, 2017

View reviewed changes

ellatrix merged commit 0cc8444 into master Oct 3, 2017

ellatrix deleted the fix/inline-paste-filter branch October 3, 2017 09:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Paste: remove non inline elements from inline pasted content #2855

Paste: remove non inline elements from inline pasted content #2855

ellatrix commented Oct 2, 2017

codecov bot commented Oct 2, 2017 •

edited

Loading

gziolo Oct 3, 2017

ellatrix Oct 3, 2017

gziolo left a comment

Paste: remove non inline elements from inline pasted content #2855

Paste: remove non inline elements from inline pasted content #2855

Conversation

ellatrix commented Oct 2, 2017

Description

How Has This Been Tested?

Checklist:

codecov bot commented Oct 2, 2017 • edited Loading

Codecov Report

gziolo Oct 3, 2017

Choose a reason for hiding this comment

ellatrix Oct 3, 2017

Choose a reason for hiding this comment

gziolo left a comment

Choose a reason for hiding this comment

codecov bot commented Oct 2, 2017 •

edited

Loading