Skip to content

[pull] master from microsoft:master #73

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
pull merged 2 commits into from
Dec 17, 2025
Merged

[pull] master from microsoft:master #73

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d66f6aa
Modifying trailing icon
kartikeyakhanna Dec 16, 2025
8aea540
Merge pull request #814 from microsoft/kakhanna/modifyTrailingIcon
kartikeyakhanna Dec 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
10 changes: 5 additions & 5 deletions ...fication/src/main/java/com/microsoft/fluentui/tokenized/notification/StackableSnackbar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ data class SnackBarItemModel(
val id: String = java.util.UUID.randomUUID().toString(),
val style: SnackbarStyle = SnackbarStyle.Neutral,
val leadingIcon: FluentIcon? = null,
val trailingIcon: FluentIcon? = null,
var trailingIcon: FluentIcon? = null,
val subTitle: String? = null,
val actionText: String? = null,
val snackBarToken: StackableSnackBarTokens = DEFAULT_SNACKBAR_TOKENS,
Expand Down Expand Up @@ -786,24 +786,24 @@ private fun SnackBarStackItem(
)
}

if (model.trailingIcon != null && model.trailingIcon.isIconAvailable()) {
if (model.trailingIcon != null && model.trailingIcon!!.isIconAvailable()) {
Box(
modifier = Modifier
.testTag(SnackBarTestTags.SNACK_BAR_ICON)
.then(
if (model.trailingIcon.onClick != null) {
if (model.trailingIcon!!.onClick != null) {
Modifier.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = rememberRipple(),
enabled = true,
role = Role.Image,
onClick = model.trailingIcon.onClick!!
onClick = model.trailingIcon!!.onClick!!
)
} else Modifier
)
) {
Icon(
model.trailingIcon,
model.trailingIcon!!,
modifier = Modifier
.padding(top = 12.dp, bottom = 12.dp, end = 16.dp)
.size(token.leftIconSize(snackBarInfo)),
Expand Down