Skip to content

Use the correct range for undo. #565

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

Merged
merged 2 commits into from
Jun 23, 2017
Merged

Use the correct range for undo. #565

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1c2ac2
Use the correct range for undo.
SergioEstevao Jun 23, 2017
838789e
Pushes a small fix to the final selection after inserting a link.
diegoreymendez Jun 23, 2017
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
11 changes: 6 additions & 5 deletions Aztec/Classes/TextKit/TextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,8 @@ open class TextView: UITextView {
open func setLink(_ url: URL, title: String, inRange range: NSRange) {

let originalText = attributedText.attributedSubstring(from: range)
let finalRange = range
let attributedTitle = NSAttributedString(string: title)
let finalRange = NSRange(location: range.location, length: attributedTitle.length)

undoManager?.registerUndo(withTarget: self, handler: { [weak self] target in
self?.undoTextReplacement(of: originalText, finalRange: finalRange)
Expand All @@ -918,11 +919,11 @@ open class TextView: UITextView {
let formatter = LinkFormatter()
formatter.attributeValue = url
let attributes = formatter.apply(to: typingAttributes)
let linkWasPresent = formatter.present(in: storage, at: range)

storage.replaceCharacters(in: range, with: NSAttributedString(string: title, attributes: attributes))
if range.length == 0 && !linkWasPresent {
selectedRange = NSMakeRange(range.location + (title as NSString).length, 0)
}

selectedRange = NSRange(location: finalRange.location + finalRange.length, length: 0)

delegate?.textViewDidChange?(self)
}

Expand Down