Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Textkit 2: Fixed gesture recognizer so tapping into text does not fallback to text kit 1 #1691

Merged
merged 6 commits into from
Dec 28, 2024
Merged

Textkit 2: Fixed gesture recognizer so tapping into text does not fallback to text kit 1 #1691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1ef98e
Update text view gesture recognizer to use textkit 2
charliescheer Dec 21, 2024
abbe73d
Ensure textkit 1 still works on older devices
charliescheer Dec 21, 2024
534d52e
Restored package.resolved file
charliescheer Dec 26, 2024
4175376
Removed unused makeContainer method
charliescheer Dec 26, 2024
fa0f31b
Fixes issue where editing a new note wont apply header style
charliescheer Dec 26, 2024
2fde51e
Move initialization of spTextView text storage out of setupTextContainer
charliescheer Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Simplenote.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,8 @@
BAB6C04726BA4CAF007495C4 /* WidgetController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB6C04626BA4CAF007495C4 /* WidgetController.swift */; };
BAB898D32BEC404200E238B8 /* CreateNewNoteIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */; };
BABB22DF2D14DA6600FCF47D /* SPTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABB22DE2D14DA6300FCF47D /* SPTextView.swift */; };
BABB22E12D162E6D00FCF47D /* NSTextLayoutManager+Simplenote.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABB22E02D162E6200FCF47D /* NSTextLayoutManager+Simplenote.swift */; };
BABB22E32D162E8400FCF47D /* NSTextLayoutFragment.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABB22E22D162E7D00FCF47D /* NSTextLayoutFragment.swift */; };
BABFFF2226CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
BABFFF2326CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
BABFFF2426CF9094003A4C25 /* WidgetDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */; };
Expand Down Expand Up @@ -1244,6 +1246,8 @@
BAB6C04626BA4CAF007495C4 /* WidgetController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetController.swift; sourceTree = "<group>"; };
BAB898D22BEC404200E238B8 /* CreateNewNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateNewNoteIntentHandler.swift; sourceTree = "<group>"; };
BABB22DE2D14DA6300FCF47D /* SPTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPTextView.swift; sourceTree = "<group>"; };
BABB22E02D162E6200FCF47D /* NSTextLayoutManager+Simplenote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextLayoutManager+Simplenote.swift"; sourceTree = "<group>"; };
BABB22E22D162E7D00FCF47D /* NSTextLayoutFragment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSTextLayoutFragment.swift; sourceTree = "<group>"; };
BABFFF2126CF9094003A4C25 /* WidgetDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetDefaults.swift; sourceTree = "<group>"; };
BAD0F1EC2BED49C200E73E45 /* FindNoteIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindNoteIntentHandler.swift; sourceTree = "<group>"; };
BAE08625261282D1009D40CD /* Note+Publish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Note+Publish.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1879,6 +1883,8 @@
E21F57B817C1244E001F02D3 /* SPEditorTextView.m */,
A6BBDA45255034E6005C8343 /* SPEditorTextView+Simplenote.swift */,
B52E2B142537480A0074509A /* SPEditorTapRecognizerDelegate.swift */,
BABB22E02D162E6200FCF47D /* NSTextLayoutManager+Simplenote.swift */,
BABB22E22D162E7D00FCF47D /* NSTextLayoutFragment.swift */,
);
name = Editor;
sourceTree = "<group>";
Expand Down Expand Up @@ -3471,6 +3477,7 @@
A60DF30825A44F0F00FDADF3 /* PinLockRemoveController.swift in Sources */,
A694ABAB25D1549D00CC3A2D /* FileStorage.swift in Sources */,
B513FB2422EF6A4B00B178AC /* SPUserInterface.swift in Sources */,
BABB22E32D162E8400FCF47D /* NSTextLayoutFragment.swift in Sources */,
B5DF734022A54EE800602CE7 /* SPDefaultTableViewCell.swift in Sources */,
B5796549250684EC00DFD6F7 /* EditorFactory.swift in Sources */,
A6C2721825AF0C1E00593731 /* TagListViewCell.swift in Sources */,
Expand Down Expand Up @@ -3542,6 +3549,7 @@
A6CDF900256B9CB900CF2F27 /* ViewSpinner.swift in Sources */,
375D24B721E01131007AB25A /* stack.c in Sources */,
373AD30821C4739500A4EA89 /* NSMutableAttributedString+Styling.m in Sources */,
BABB22E12D162E6D00FCF47D /* NSTextLayoutManager+Simplenote.swift in Sources */,
B524AE112352CC7900EA11D4 /* UIScreen+Simplenote.swift in Sources */,
A68A4345256FEE3000D1CA5D /* SPSettingsViewController+Extensions.swift in Sources */,
B543C7E523CF775C00003A80 /* NSSortDescriptor+Simplenote.swift in Sources */,
Expand Down
3 changes: 0 additions & 3 deletions Simplenote/Classes/SPTextView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,12 @@
@implementation SPTextView

- (instancetype)init {

SPInteractiveTextStorage *textStorage = [[SPInteractiveTextStorage alloc] init];

NSTextContainer *container = [self setupTextContainerWith:textStorage];

self = [super initWithFrame:CGRectZero textContainer:container];
if (self) {
self.interactiveTextStorage = textStorage;

/*
Issue #188:
===========
Expand Down
14 changes: 11 additions & 3 deletions Simplenote/Classes/UIGestureRecognizer+Simplenote.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,16 @@ extension UIGestureRecognizer {
locationInContainer.x -= textView.textContainerInset.left
locationInContainer.y -= textView.textContainerInset.top

return textView.layoutManager.characterIndex(for: locationInContainer,
in: textView.textContainer,
fractionOfDistanceBetweenInsertionPoints: nil)
guard #available(iOS 17.0, *),
let textLayoutManager = textView.textLayoutManager else {
// TextKit 1 fallback
return textView.layoutManager.characterIndex(
for: locationInContainer,
in: textView.textContainer,
fractionOfDistanceBetweenInsertionPoints: nil)
}

// TextKit 2
return textLayoutManager.characterIndex(for: locationInContainer) ?? .zero
}
}
17 changes: 17 additions & 0 deletions Simplenote/NSTextLayoutFragment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// NSTextLayoutFragment.swift
// Simplenote
//
// Created by Charlie Scheer on 12/20/24.
// Copyright © 2024 Automattic. All rights reserved.
//

extension NSTextLayoutFragment {
@available(iOS 17.0, *)
func characterIndex(for location: CGPoint) -> Int? {
guard let lineFragment = textLineFragment(forVerticalOffset: location.y, requiresExactMatch: true) else {
return nil
}
return lineFragment.characterIndex(for: location)
}
}
17 changes: 17 additions & 0 deletions Simplenote/NSTextLayoutManager+Simplenote.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// NSTextLayoutManager+Simplenote.swift
// Simplenote
//
// Created by Charlie Scheer on 12/20/24.
// Copyright © 2024 Automattic. All rights reserved.
//

extension NSTextLayoutManager {
@available(iOS 17.0, *)
func characterIndex(for location: CGPoint) -> Int? {
guard let lineFragment = textLayoutFragment(for: location) else {
return nil
}
return lineFragment.characterIndex(for: location)
}
}
4 changes: 2 additions & 2 deletions Simplenote/SPTextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ extension SPTextView {
container.widthTracksTextView = true
container.heightTracksTextView = true


if #available(iOS 16.0, *) {
let textLayoutManager = NSTextLayoutManager()
let contentStorage = NSTextContentStorage()
Expand All @@ -22,6 +21,7 @@ extension SPTextView {
textLayoutManager.textContainer = container

} else {
let layoutManager = NSLayoutManager()
layoutManager.addTextContainer(container)
textStorage.addLayoutManager(layoutManager)
}
Expand All @@ -34,7 +34,7 @@ extension SPTextView {
//
extension SPTextView: NSTextContentStorageDelegate {
public func textContentStorage(_ textContentStorage: NSTextContentStorage, textParagraphWith range: NSRange) -> NSTextParagraph? {
guard let originalText = textContentStorage.textStorage?.attributedSubstring(from: range) as? NSMutableAttributedString else {
guard let originalText = textContentStorage.textStorage?.attributedSubstring(from: range).mutableCopy() as? NSMutableAttributedString else {
return nil
}

Expand Down