This repository has been archived by the owner on Aug 11, 2024. It is now read-only.
TextKit 2 - Basic Integration #421
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
Lift and shift seemed to "just work" here, but there are plenty of rough edges
We don't need these yet, but we will soon
Not needed until we actually use the transclude block embeds, but I see no harm in including it
bfollington
commented
Feb 28, 2023
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
bfollington
commented
Feb 28, 2023
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
bfollington
commented
Feb 28, 2023
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Show resolved
Hide resolved
bfollington
commented
Feb 28, 2023
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
bfollington
commented
Feb 28, 2023
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
bfollington
commented
Feb 28, 2023
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
TextContentStorageDelegate and TextContentManagerDelegate take its place. Given the comment attached to this method I expected something to break, but unicode and emojis seem to be behaving just fine.
bfollington
force-pushed
the
2023-02-28-textkit-2-mvp
branch
from
1f1062e to
c03bd13
Compare
bfollington
commented
Feb 28, 2023
xcode/Subconscious/Shared/Components/Common/Text/TranscludeBlockLayoutFragment.swift
Outdated
Show resolved
Hide resolved
gordonbrander
suggested changes
Feb 28, 2023
There was a problem hiding this comment.
Remarkable progress! I'm also surprised by how little we actually had to replace/rewrite.
Added a few minor change requests. Mostly let's get rid of all ! and replace with if let, or guard on failure. Instead of panicking via ! we should no-op, and log warnings where appropriate.
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/Text/TranscludeBlockLayoutFragment.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/Text/TranscludeBlockLayoutFragment.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
bfollington
commented
Mar 1, 2023
xcode/Subconscious/Shared/Components/Common/Transclude/TranscludeBlockLayoutFragment.swift
Outdated
Show resolved
Hide resolved
bfollington
commented
Mar 1, 2023
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
gordonbrander
suggested changes
Mar 1, 2023
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
gordonbrander
suggested changes
Mar 1, 2023
xcode/Subconscious/Shared/Components/Common/MarkupTextViewRepresentable.swift
Outdated
Show resolved
Hide resolved
We will re-introduce these when we actually need them, this first batch of work is purely moving TK1 -> TK2
We'll add it back later
gordonbrander
approved these changes
Mar 2, 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.
The goal of this PR is to integrate the TextKit 2 research I've been doing into the main Subconscious app. For this first step (what I'm calling "Basic Integration") I'm aiming for drop-in replacement of the existing editor with one important difference: per-layout-fragment rendering / formatting.
This should, theoretically, improve the experience of working on large documents quite a bit!
Lays the foundation for #214