Paragraph spans #278

hypest · 2017-03-06T04:09:43Z

Fix #125, #126, #170, #188, #194, #247 (but with a new issue), #251, #264

🎉

This PR introduces a different method of marking and handling block elements. Here's a list of the changes it introduces:

Mark the whole content of a block with the span
Set the block spans with the SPAN_PARAGRAPH flag and never change it. See the Spanned.java source for details. Paragraph spans must start after a newline (or the start of buffer) and end right after a newline (or the end of the buffer). The auto-changing nature of the SPAN_PARAGRAPH span becomes tricky when text is replaced instead of just added/removed and a few classes are dedicated to handling that (ParagraphBleedAdjuster, ParagraphCollapseAdjuster, ParagraphCollapseRemover)
Each block element/span has a nestingLevel field, corresponding to its nesting level in html
Block spans are sorted by position and nesting and then exported recursively to html
Code that performs each block element's behaviour (list, listitem, heading, quote) runs "in parallel" to the other block elements to enforce a separation of concerns between the various types of block elements. AztecText's text mutation (like deleting the double-newline to close a quote) happens only after all block handlers have finished their processing.
Listitem behaviour handling is implemented in a separate handler than the List itself
Double-enter at block's end closes only the inner block when nested. This allows editing in the outer block to continue.
Complex conditionals are split into series of simpler conditionals that return early in order to make the algorithm more readable. Example.

Known issues:

Text is now never empty (there's a ZWJ if buffer empty) so, hint text is never shown. We can prolly tackle that in a separate PR.
Nested blockquotes inside lists don't show the bullet/number of the list item they're on

This is a fairly big and broad PR, sorry for that :(. The changes are too close to the core to keep it small though. I'm open to ideas on how to break it down to smaller PRs if needed :). Thanks!

* <li> is a block element so, treat it like one: span's range covers the whole of its content, not just a mark on a newline as before * add visual newlines to block elements as an extra parsing step, after all block spans have been added to the Spannable. This way, it's simppler to find the spots that visual newlines are needed * Recursive html production by translating each block span to its own block * AztecParserTest tests pass but other tests (mainly the editor ones) are broken UnknownHtmlSpan is an exception to the above: it's handling has been left as it was. Will probably refactor it later.

The outer one is the list and the inner one is the first list item. BlockElementsTest are also green now.

Now all HeadingTest tests pass.

For instance, expand both the list and the list item block.

That was a Kotlin gotcha for me! The "-1" seemed to be counted twice for some reason.

Editing works.

So to be able to render a block element in the "empty" text.

That is, no <br> that can be assumed by looking at the visual editor. The list itself is a block element.

theck13 · 2017-03-06T14:54:07Z

Add #264 to the list of fixes. Thanks, @hypest!

And don't show the bullet/number when the depth is greater than the current list item.

For example, a nested list starts a line after the list item that encloses it.

hypest · 2017-03-07T17:02:54Z

Added a couple of commits (6960ea2, 07ff6be) that fix an issue where closing a nested list didn't properly close the parent list item.

Also added a fix for #125 (Nested lists show multiple bullets) with commits d5be1db and ab20128.

since the handlers it manages only actually care about the addition of newlines (or the END_OF_BUFFER_MARKER)

This regression was caused with the split of the list item block handler from the list handler.

hypest · 2017-03-07T18:30:12Z

Fixed (with 6981223) a rather "invisible" regression that happened with 56f9427.

0nko · 2017-03-16T14:29:00Z

Awesome work, @hypest!

hypest added 30 commits February 19, 2017 03:38

Mark visual newlines when added from editor

d511a92

List block is actually two nested spans

b026035

The outer one is the list and the inner one is the first list item. BlockElementsTest are also green now.

Remove visual newlines marks before syncing them

52f06b7

Fix: Set the spans in the blocks list

3d4fad6

Set block style instead of recreating block spans

1f85d11

Now all HeadingTest tests pass.

Fix: set the new list item's span

9e6b460

Use an arrow to denote newline in SpanLogger

2bff71b

Expand all block elements to engulf text

6774120

For instance, expand both the list and the list item block.

Add a parser test with deep nesting of lists

b97918f

Add a parser test with mixed content in listitem

9a3a19c

Nicer symbol for newline, symbol for ZWJ

df4f693

Correct detection of aft-element visual newline

ef3339b

More fixes of list editing

1296894

Fix for ListTest.deleteFirstItemWithKeyboard

b7143ce

Fix for some list item creation with newline cases

212b122

Revise the test: prepending empty list items supported

0d0881d

Fix: the subtraction needs to be in the same line

1fb3ceb

That was a Kotlin gotcha for me! The "-1" seemed to be counted twice for some reason.

Expand test to cover closing of list before another

f06a32b

Fix accidentally commented out tests

d34b88c

Install EndOfTextMarker listener

efbf9b0

Lists as SPAN_PARAGRAPH

e51873b

Editing works.

Include the newline for block text line

14b1859

End of text marker is needed in empty text

28f70dd

So to be able to render a block element in the "empty" text.

Able to delete block style at text start

b81f7d6

Don't hold a reference to text. Can be obsolete.

e597a58

Cleanup the no longer needed ZWJs from parsing

6622427

Fixes in parser, end marker, some tests

9cff6d2

Remove unused imports

4447298

Safe append, newline is visual if trailing test

f616a50

That is, no <br> that can be assumed by looking at the visual editor. The list itself is a block element.

hypest added 2 commits March 6, 2017 05:50

Gradual exit from nested blocks by double-enter

e91df12

Merge branch 'develop' into experiment/paragraph-spans

8ff6180

hypest mentioned this pull request Mar 6, 2017

Cursor Jumps When Deleting Text Before Images on Devices with Nougat #213

Closed

hypest added 5 commits March 6, 2017 19:51

Calculate, show bullet/number for same nesting level

d5be1db

And don't show the bullet/number when the depth is greater than the current list item.

Replay the double-enter newline for parents

6960ea2

Ordered list numbers using nesting level

ab20128

Show nesting level in SpanLogger

b42e9d4

Non child-blocks need extra newline before them

07ff6be

For example, a nested list starts a line after the list item that encloses it.

hypest force-pushed the experiment/paragraph-spans branch from 8ec075c to 07ff6be Compare March 7, 2017 17:06

hypest added 3 commits March 7, 2017 19:57

Move getParent intto AztecNestable

2519256

Block watcher doesn't actually care for deletions

86bb711

since the handlers it manages only actually care about the addition of newlines (or the END_OF_BUFFER_MARKER)

Remove list item only when at the end of its list

6981223

This regression was caused with the split of the list item block handler from the list handler.

Merge branch 'develop' into experiment/paragraph-spans

f898186

theck13 requested review from 0nko, khaykov and theck13 March 15, 2017 16:06

theck13 approved these changes Mar 16, 2017

View reviewed changes

0nko approved these changes Mar 16, 2017

View reviewed changes

khaykov approved these changes Mar 16, 2017

View reviewed changes

0nko merged commit 86008eb into develop Mar 16, 2017

This was referenced Mar 17, 2017

Strange behavior when using backspace below block elements #283

Closed

Weird cursor behavior when deleting text in a Blockquote #236

Closed

Heading inside list inside quote keeps adding newlines #251

Closed

theck13 mentioned this pull request Mar 21, 2017

Heading Menu Regression #297

Closed

hypest mentioned this pull request Apr 5, 2017

Text Inside Paragraph Moves Outside Block Format When Toggling HTML #247

Closed

theck13 mentioned this pull request Apr 18, 2017

Toolbar Highlights Block Formats Not Selected #317

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Paragraph spans #278

Paragraph spans #278

Uh oh!

hypest commented Mar 6, 2017 •

edited

Loading

Uh oh!

theck13 commented Mar 6, 2017

Uh oh!

hypest commented Mar 7, 2017 •

edited

Loading

Uh oh!

hypest commented Mar 7, 2017

Uh oh!

0nko commented Mar 16, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Paragraph spans #278

Paragraph spans #278

Uh oh!

Conversation

hypest commented Mar 6, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Fix #125, #126, #170, #188, #194, #247 (but with a new issue), #251, #264

Uh oh!

theck13 commented Mar 6, 2017

Uh oh!

hypest commented Mar 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hypest commented Mar 7, 2017

Uh oh!

0nko commented Mar 16, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

hypest commented Mar 6, 2017 •

edited

Loading

hypest commented Mar 7, 2017 •

edited

Loading