Skip to content

Fix login webview scrolling. #2797

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 1 commit into from
Oct 30, 2025
Merged

Fix login webview scrolling. #2797

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
15 changes: 15 additions & 0 deletions libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components/LoginView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ package com.salesforce.androidsdk.ui.components
import android.content.Context
import android.content.ContextWrapper
import android.content.res.Configuration
import android.os.Build
import android.webkit.WebView
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.animateFloatAsState
Expand All @@ -43,14 +44,17 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.ime
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawing
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
Expand Down Expand Up @@ -233,6 +237,8 @@ internal fun LoginView(
modifier = Modifier
.background(dynamicBackgroundColor.value)
.padding(innerPadding)
.consumeWindowInsets(innerPadding)
.applyImePaddingConditionally()
.graphicsLayer(alpha = alpha),
factory = { webView },
update = { it.loadUrl(loginUrl.value ?: "") },
Expand Down Expand Up @@ -473,6 +479,15 @@ private tailrec fun Context.getActivity(): FragmentActivity? = when (this) {
else -> null
}

@Composable
private fun Modifier.applyImePaddingConditionally() : Modifier =
// TODO: Remove when min API is > 29
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
windowInsetsPadding(WindowInsets.ime)
} else {
this
}

// Note: the light and dark previews should look the same.
@Preview
@Preview("Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES, backgroundColor = 0xFF181818)
Expand Down
Loading