Skip to content

Handle touch cancellation / touch up away from button correctly #2

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle touch cancellation / touch up away from button correctly #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 20 additions & 6 deletions Sources/KeyboardToolbar/Views/KeyboardToolButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ final class KeyboardToolButton: UIButton {
}
addSubview(backgroundView)
addTarget(self, action: #selector(touchDown(_:event:)), for: .touchDown)
addTarget(self, action: #selector(touchUp), for: .touchUpInside)
addTarget(self, action: #selector(touchUp), for: .touchUpOutside)
addTarget(self, action: #selector(touchUp), for: .touchCancel)
addTarget(self, action: #selector(touchUpInside), for: .touchUpInside)
addTarget(self, action: #selector(touchUpOutside), for: .touchUpOutside)
addTarget(self, action: #selector(touchCancelled), for: .touchCancel)
addTarget(self, action: #selector(touchDragged(_:event:)), for: .touchDragInside)
addTarget(self, action: #selector(touchDragged(_:event:)), for: .touchDragOutside)
setupRepresentativeTool()
Expand Down Expand Up @@ -142,17 +142,31 @@ private extension KeyboardToolButton {
presentToolPicker(with: item.allTools, atSize: .large)
}
}

@objc private func touchUp() {

@objc private func touchUpInside() {
cleanupAfterTouch()
handleTouchUp(insideButton: true)
}
@objc private func touchUpOutside() {
cleanupAfterTouch()
handleTouchUp(insideButton: false)
}
@objc private func touchCancelled() {
cleanupAfterTouch()
}
private func cleanupAfterTouch() {
setContentHidden(false)
cancelToolPickerTimer()
backgroundView.isHidden = false
toolPickerView.removeFromSuperview()
toolPickerBackgroundView.removeFromSuperview()
}
private func handleTouchUp(insideButton: Bool) {
if let highlightedIndex = toolPickerView.highlightedIndex {
let tool = item.allTools[highlightedIndex]
tool.performAction()
} else {
} else if insideButton {
// If not using the picker menu, we should only act on a press if still inside the main button
item.representativeTool.performAction()
}
}
Expand Down