This repository has been archived by the owner on Aug 11, 2024. It is now read-only.
BlockEditor driven by shared ObservableStore #1000
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
Fork of ObservableStore that allows creating custom Update types for models. This lets us publish a change description along with state changes. The controller can use the change description to perform appropriate updates.
...and update ObservableStore branch
...no longer use this class.
...also remove spacer from cells, since it was messing up constraint resolution in the collection view.
It's handled in its own store now.
...and replace delegate approach with send functions and enums. This lets us simply map between enums.
Not needed when we can use Self.
bfollington
reviewed
Dec 1, 2023
bfollington
reviewed
Dec 1, 2023
| ) | ||
| } | ||
|
|
||
| // TODO: re-implement |
There was a problem hiding this comment.
I'm assuming these TODOs are out of scope for this PR since they're related to bulk selection.
There was a problem hiding this comment.
Yes, out of scope. The selection mode wasn't working properly. Removed commented-out code, and added issues to TODOs.
bfollington
reviewed
Dec 1, 2023
Comment on lines
14
to
15
| // TODO: serialize to nice Subtext whitespace | ||
| blocks.compactMap(\.text).joined(separator: "\n\n") |
There was a problem hiding this comment.
@bfollington yes, it will require a modification to the Subtext parser to enable rendering a "pretty printed" string that places spaces between some lines and not others (e.g. list items can have blank lines between but probably shouldn't for readability purposes". This is purely an aesthetic enhancement.
I'll file a bug to follow up.
bfollington
reviewed
Dec 1, 2023
Comment on lines
+37
to
+48
| textStorage.delegate = self | ||
| // !!!: Hack to trigger initial rendering of attributes | ||
| // UITextView has a bug where a text view that has been created | ||
| // with an empty string does not correctly render attributes until | ||
| // given a non-empty string. This results in a jump triggered by | ||
| // a change in intrinsic content size when the attributes are | ||
| // first applied. | ||
| // | ||
| // After being rendered with a non-empty string, it works properly. | ||
| // 2023-11-22 Gordon | ||
| self.text = " " | ||
| self.text = "" |
bfollington
approved these changes
Dec 1, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #987.
Depends on subconsciousnetwork/ObservableStore#43
This PR implements basic loading and saving of real data from database, including blocks and related notes. I've kept the scope to just saving and loading, and there is more work to be done wrt transcludes and loading states.
Approach
updatespublisher on storesupdatespublisher and performs updates to controller based on state transactions.@StateObjecton the enclosing SwiftUIView and passed down as an@ObservedObjectto the UIViewControllerRepresentable.The result is that we can share the same store between SwiftUI and UIKit land, as well as the same environment and side effects management.
Screenshots