Skip to content

Pressing back after dismissing keyboard in find in page close find in page view #797

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
May 12, 2020
Merged

Pressing back after dismissing keyboard in find in page close find in page view #797

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
97fe2cb
Fixed backButton behavior when findInPage is active
AndrewR8 Apr 27, 2020
243fd81
Added test for backButton behavior when findInPage is active
AndrewR8 Apr 27, 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
13 changes: 13 additions & 0 deletions app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,19 @@ class BrowserTabViewModelTest {
assertTrue(browserViewState().canGoForward)
}

@Test
fun whenFindInPageShowingByPressingBackOnBrowserThenViewStateUpdatedInvisibleAndDoesNotGoToPreviousPage() {
setupNavigation(isBrowsing = true, canGoBack = true)
testee.onFindInPageSelected()
testee.onUserPressedBack()

assertFalse(findInPageViewState().visible)
assertCommandIssued<Command.DismissFindInPage>()

val issuedCommand = commandCaptor.allValues.find { it is Command.NavigateBack }
assertNull(issuedCommand)
}

@Test
fun whenHomeShowingByPressingBackOnInvalidatedBrowserThenForwardButtonInactive() {
setupNavigation(isBrowsing = true)
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,11 @@ class BrowserTabViewModel(
fun onUserPressedBack(): Boolean {
val navigation = webNavigationState ?: return false

if (currentFindInPageViewState().visible) {
dismissFindInView()
return true
}

if (!currentBrowserViewState().browserShowing) {
return false
}
Expand Down