Skip to content

[Compose component] - Add loading param to WCOutlinedButton #14768

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 3 commits into from
Oct 20, 2025
Merged

[Compose component] - Add loading param to WCOutlinedButton #14768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bab9d80
Add loading param to WCOutlinedButton
AdamGrzybkowski Oct 16, 2025
ef4a400
Use new WCOutlinedButton loading param in BookingAppointmentDetails
AdamGrzybkowski Oct 16, 2025
d1e3f49
Keep WCOutlinedButton enabled when loading but block the click events
AdamGrzybkowski Oct 17, 2025
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
16 changes: 3 additions & 13 deletions .../src/main/kotlin/com/woocommerce/android/ui/bookings/compose/BookingAppointmentDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -93,16 +90,9 @@ fun BookingAppointmentDetails(
),
onClick = onCancelBooking,
enabled = model.cancelButtonEnabled,
) {
if (model.cancelInProgressShown) {
CircularProgressIndicator(
color = LocalContentColor.current,
modifier = Modifier.size(24.dp)
)
} else {
Text(text = stringResource(R.string.booking_details_cancel_booking_button))
}
}
text = stringResource(R.string.booking_details_cancel_booking_button),
loading = model.cancelInProgressShown,
)
HorizontalDivider(thickness = 0.5.dp)
}
}
Expand Down
49 changes: 37 additions & 12 deletions WooCommerce/src/main/kotlin/com/woocommerce/android/ui/compose/component/Buttons.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,8 @@ fun WCColoredButton(
) {
Box {
if (loading) {
CircularProgressIndicator(
color = LocalContentColor.current,
ButtonCircularProgressIndicator(
modifier = Modifier
.size(24.dp)
.align(Alignment.Center)
)
}
Expand Down Expand Up @@ -185,14 +183,15 @@ fun WCOutlinedButton(
leadingIcon: @Composable (() -> Unit)? = null,
trailingIcon: @Composable (() -> Unit)? = null,
enabled: Boolean = true,
loading: Boolean = false,
shape: Shape = MaterialTheme.shapes.small,
colors: ButtonColors = ButtonDefaults.wcOutlinedButtonColors(),
border: BorderStroke? = ButtonDefaults.wcOutlinedButtonBorder(enabled),
contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
interactionSource: MutableInteractionSource? = null,
) {
WCOutlinedButton(
onClick = onClick,
onClick = { if (!loading) onClick() },
modifier = modifier,
enabled = enabled,
shape = shape,
Expand All @@ -201,14 +200,21 @@ fun WCOutlinedButton(
contentPadding = contentPadding,
interactionSource = interactionSource
) {
if (leadingIcon != null) {
leadingIcon()
Spacer(modifier = Modifier.width(dimensionResource(id = R.dimen.minor_100)))
}
Text(text = text)
if (trailingIcon != null) {
Spacer(modifier = Modifier.width(dimensionResource(id = R.dimen.minor_100)))
trailingIcon()
if (loading) {
ButtonCircularProgressIndicator(
modifier = Modifier
.align(Alignment.CenterVertically)
)
} else {
if (leadingIcon != null) {
leadingIcon()
Spacer(modifier = Modifier.width(dimensionResource(id = R.dimen.minor_100)))
}
Text(text = text)
if (trailingIcon != null) {
Spacer(modifier = Modifier.width(dimensionResource(id = R.dimen.minor_100)))
trailingIcon()
}
}
}
}
Expand Down Expand Up @@ -415,6 +421,15 @@ private fun ProvideMaterial3CompositionForMaterial2(
}
}

@Composable
private fun ButtonCircularProgressIndicator(modifier: Modifier = Modifier) {
CircularProgressIndicator(
color = LocalContentColor.current,
modifier = modifier
.size(24.dp)
)
}

@LightDarkThemePreviews
@Composable
private fun ButtonsPreview() {
Expand Down Expand Up @@ -459,6 +474,11 @@ private fun ButtonsPreview() {
)
}
)
WCColoredButton(
text = "Button Loading",
loading = true,
onClick = {},
)

WCOutlinedButton(onClick = {}) {
Text(text = "Outlined Button")
Expand All @@ -475,6 +495,11 @@ private fun ButtonsPreview() {
Icon(imageVector = Icons.Default.Check, contentDescription = null, modifier = Modifier.size(16.dp))
}
)
WCOutlinedButton(
text = "Outlined Button Loading",
loading = true,
onClick = {},
)

WCTextButton(onClick = {}) {
Text(text = "Text button")
Expand Down