[stable25] Make images block nodes #3431
Merged
Conversation
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
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
backportbot-nextcloud
bot
requested review from
juliusknorr,
max-nextcloud and
mejo-
|
Test summaryRun details
View run in Cypress Dashboard ➡️ This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard |
|
This PR mainly exists as a reminder to discuss if we want to backport this. |
|
@juliushaertl since this fixes a bug in 25 (#2873), I think we should backport it to stable25 which is rather fresh still. Any objections? |
mejo-
force-pushed
the
backport/3282/stable25
branch
2 times, most recently
from
d97e0a7
to
de40ce7
Compare
|
Yep, agreed that a backport makes sense 👍 |
Signed-off-by: Jonas <[email protected]>
Use markdown-it-image-figures to render standalone images inside `<figure>` elements instead of `<p>` when markdown source gets parsed into HTML. This allows to treat images as block elements by TipTap. Also keep support for inline images to not break markdown files that have inline images. Fixes: #2873 Signed-off-by: Jonas <[email protected]>
Replace `<p>` with `<figure>` now that we use markdown-it-image-figures. Signed-off-by: Jonas <[email protected]>
Signed-off-by: Jonas <[email protected]>
Needed to prevent block images getting merged with next paragraph. Signed-off-by: Jonas <[email protected]>
Tiptap `setImage()` marks the added image as selected when added as first element in the document), which leads to the image being overwritten by subsequent `insertContent()` command. See ueberdosis/tiptap#3355 for the relevant upstream bug. Mitigate this bug by explicitly placing the cursor at the end of the selection between adding the image and the line break. Signed-off-by: Jonas <[email protected]>
Right now we add an empty line after each image so it lives in its own paragraph. This is not needed at the end of the file and we should preserve the number of newlines instead (#3428). But for now it should not block merging the block images pr #3282. Signed-off-by: Max <[email protected]>
Signed-off-by: Jonas <[email protected]>
mejo-
force-pushed
the
backport/3282/stable25
branch
from
303f4d7
to
518099f
Compare
|
/compile |
Signed-off-by: nextcloud-command <[email protected]>
| @@ -27,7 +27,7 @@ jobs: | |||
| containers: [1, 2, 3, 4] | |||
| php-versions: [ '7.4' ] | |||
| databases: [ 'sqlite' ] | |||
| server-versions: [ 'master' ] | |||
| server-versions: [ 'stable25' ] | |||
max-nextcloud
approved these changes
Nov 16, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport of #3282