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

Jump to bottom

Prevent item selection during closing animation #234

Merged
merged 2 commits into from
Mar 1, 2020
Merged

Prevent item selection during closing animation #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96570bb
add test for double tap on action item
jjochen Mar 1, 2020
d25864c
prevent items to be tapped during closing animation
jjochen Mar 1, 2020
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
17 changes: 17 additions & 0 deletions Example/Tests/JJFloatingActionButtonSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,23 @@ class JJFloatingActionButtonSpec: QuickSpec {
expect(actionCount).toEventually(equal(1))
}
}

context("and item is tapped twice") {
beforeEach {
let item = actionButton.items[0]
item.sendActions(for: .touchUpInside)
item.sendActions(for: .touchUpInside)
}

it("closes") {
expect(actionButton.buttonState) == .closing
expect(actionButton.buttonState).toEventually(equal(.closed))
}

it("performs action once") {
expect(actionCount).toEventually(equal(1))
}
}
}

context("and is closed animated") {
Expand Down
4 changes: 4 additions & 0 deletions Sources/JJFloatingActionButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,10 @@ fileprivate extension JJFloatingActionButton {
}

@objc func itemWasTapped(sender: JJActionItem) {
guard buttonState == .open || buttonState == .opening else {
return
}

if closeAutomatically {
close()
}
Expand Down