Skip to content

Expose indentation operations #1353

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
diegoreymendez merged 3 commits into from
Aug 10, 2022
Merged

Expose indentation operations #1353

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4561534
expose indentation operations
cbess Mar 26, 2022
ed55d4a
cleanup whitespace
cbess Mar 26, 2022
1ce621c
cleanup whitespace
cbess Mar 26, 2022
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
42 changes: 20 additions & 22 deletions Aztec/Classes/TextKit/TextView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,43 +555,44 @@ open class TextView: UITextView {
}

@objc func handleShiftTab(command: UIKeyCommand) {

let lists = TextListFormatter.lists(in: typingAttributes)
let quotes = BlockquoteFormatter.blockquotes(in: typingAttributes)

if let list = lists.last {
indent(list: list, increase: false)

} else if let quote = quotes.last {
indent(blockquote: quote, increase: false)

} else {
return
}
decreaseIndent()
}

@objc func handleTab(command: UIKeyCommand) {

increaseIndent()
}

// MARK: - General Indentation

/// Increases the indentation of the selected range
open func increaseIndent() {
let lists = TextListFormatter.lists(in: typingAttributes)
let quotes = BlockquoteFormatter.blockquotes(in: typingAttributes)

if let list = lists.last, lists.count < maximumListIndentationLevels {
indent(list: list)

} else if let quote = quotes.last, quotes.count < maximumBlockquoteIndentationLevels {
indent(blockquote: quote)

} else {
insertText(String(.tab))
}

}


/// Decreases the indentation of the selected range
open func decreaseIndent() {
let lists = TextListFormatter.lists(in: typingAttributes)
let quotes = BlockquoteFormatter.blockquotes(in: typingAttributes)

if let list = lists.last {
indent(list: list, increase: false)
} else if let quote = quotes.last {
indent(blockquote: quote, increase: false)
}
}

// MARK: - Text List indent methods

private func indent(list: TextList, increase: Bool = true) {

let formatter = TextListFormatter(style: list.style, placeholderAttributes: nil, increaseDepth: true)
let li = LiFormatter(placeholderAttributes: nil)

Expand Down Expand Up @@ -629,9 +630,6 @@ open class TextView: UITextView {
// MARK: - Blockquote indent methods

private func indent(blockquote: Blockquote, increase: Bool = true) {



let formatter = BlockquoteFormatter(placeholderAttributes: typingAttributes, increaseDepth: true)
let targetRange = formatter.applicationRange(for: selectedRange, in: storage)

Expand Down