Fix: Delete and backspace deleting block ids and breaking references #8974
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
delete current block instead of next
logseq-cldwalker
changed the title
logseq-cldwalker
approved these changes
Apr 7, 2023
There was a problem hiding this comment.
@megayu Thanks for the fix with tests! 🐛 ⚡ This also fixes #8882. One weird edge case where we still break a block ref with delete/backspace is when there are two blocks with ids next to each other - https://www.loom.com/share/4dec797c81194f3dbb57dd70f6ce403a. I think the current behavior is reasonable but just wanted to note it. The content for that case:
- ((64303d5a-bd52-45b5-b077-b93a1386d10d))
- no ref
id:: 64303d5a-bd52-45b5-b077-b93a1386d10d
- has a ref
id:: 64303d5d-81dc-448c-ab31-9e056d08425d
- ((64303d5d-81dc-448c-ab31-9e056d08425d))
| @@ -82,7 +82,93 @@ test('delete and backspace', async ({ page, block }) => { | |||
| await page.keyboard.press('Delete', { delay: 50 }) | |||
| expect(await page.inputValue('textarea >> nth=0')).toBe('te') | |||
|
|
|||
| // TODO: test delete & backspace across blocks | |||
| // delete & backspace across blocks | |||
| await block.enterNext() | |||
|
|
||
| (declare save-block!) | ||
|
|
||
| (defn- block-has-no-ref? | ||
| [block-or-uuid] |
There was a problem hiding this comment.
Optional: It could be nice to keep this fn simpler and have it just take an entity id (eid) like db/pull or https://cljdoc.org/d/datascript/datascript/1.4.2/api/datascript.core#entity. This would mean passing in the db/entity arg
tiensonqin
approved these changes
Apr 12, 2023
tiensonqin
added a commit
that referenced
this pull request
Apr 17, 2023
tiensonqin
added a commit
that referenced
this pull request
Apr 17, 2023
tiensonqin
added a commit
that referenced
this pull request
Apr 18, 2023
tiensonqin
added a commit
that referenced
this pull request
Apr 18, 2023
7 tasks
tiensonqin
added a commit
that referenced
this pull request
Apr 18, 2023
tiensonqin
added a commit
that referenced
this pull request
Apr 18, 2023
tiensonqin
added a commit
that referenced
this pull request
Apr 18, 2023
tiensonqin
added a commit
that referenced
this pull request
Apr 19, 2023
tiensonqin
added a commit
that referenced
this pull request
Apr 19, 2023
tiensonqin
added a commit
that referenced
this pull request
Apr 19, 2023
bendyorke
pushed a commit
that referenced
this pull request
May 9, 2023
…8974) * press delete at the end of a block, if no refs in current block, delete current block instead of next * enhance backspace behavior to avoid broke ref * fix press backspace at the end of the block of the end of the page issue * add e2e-test for delete and backspace across blocks --------- Co-authored-by: Junyi Du <junyidu.cn@gmail.com> Co-authored-by: Tienson Qin <tiensonqin@gmail.com> Co-authored-by: Gabriel Horner <97210743+logseq-cldwalker@users.noreply.github.com>
bendyorke
pushed a commit
that referenced
this pull request
May 9, 2023
bendyorke
pushed a commit
that referenced
this pull request
May 9, 2023
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.
Enhance delete and backspace behavior to avoid changing the UUID of a block if it contains refs.
Press delete at the end of a block, if there are no refs in the current block and it's not the last block of a page, then delete the current block and add the content of the current block to the start of the next block, otherwise delete the next block and add the content of next block to the end of the current block.
Press backspace at the start of a block, if there are refs in the current block and no refs in the prev block and they are belong to the same page, then delete prev block and add the content of prev block to the start of the current block, otherwise delete the current block and add the content of the current block to the end of the prev block.
Fix #8303