Skip to content

[pull] master from microsoft:master #82

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 3 commits into from
Apr 7, 2026
+6 −10
Merged

[pull] master from microsoft:master #82

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
8e753de
Icon callback fix
Apr 2, 2026
5012ae4
making callback as nullable
Apr 6, 2026
493d88d
Merge pull request #830 from pranjal-glowingstar/pranjal/iconCallbackFix
kartikeyakhanna Apr 7, 2026
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
8 changes: 2 additions & 6 deletions FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/V2StackableSnackbarActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,7 @@ fun SnackBarStackDemoLayout(context: V2StackableSnackbarActivity) {
}
}
),
getTrailingIconBasedOnOverflow = {
null
},
onTitleOverflowChange = { },
onActionTextClicked = {
stackState.toggleExpandedState()
},
Expand Down Expand Up @@ -175,9 +173,7 @@ fun SnackBarStackDemoLayout(context: V2StackableSnackbarActivity) {
}
}
),
getTrailingIconBasedOnOverflow = {
null
},
onTitleOverflowChange = { },
onActionTextClicked = {
stackState.toggleExpandedState()
},
Expand Down
8 changes: 4 additions & 4 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 @@ -136,7 +136,7 @@ private val DEFAULT_SNACKBAR_TOKENS = StackableSnackBarTokens()
* @property snackBarToken The tokens for customizing the snackbar's appearance.
* @property onActionTextClicked The callback to be invoked when the action button is clicked.
* @property enableSwipeToDismiss If `true`, swiping the snackbar item horizontally will dismiss it.
* @property getTrailingIconBasedOnOverflow The callback to determine the trailing icon based on whether the text has overflow. It receives a boolean indicating if there is an overflow and returns a FluentIcon to be used as the trailing icon.
* @property onTitleOverflowChange The callback to determine on whether the text(title) has overflown. It receives a boolean indicating if there is an overflow.
*/
@Stable
data class SnackBarItemModel(
Expand All @@ -150,7 +150,7 @@ data class SnackBarItemModel(
val snackBarToken: StackableSnackBarTokens = DEFAULT_SNACKBAR_TOKENS,
val onActionTextClicked: () -> Unit = {},
val enableSwipeToDismiss: Boolean = true,
val getTrailingIconBasedOnOverflow: (Boolean) -> FluentIcon? = { _ -> trailingIcon }
val onTitleOverflowChange: ((Boolean) -> Unit)? = null
)

internal data class SnackbarItemInternal(
Expand Down Expand Up @@ -716,7 +716,6 @@ private fun SnackBarStackItem(
) {

var hasTextOverflow by remember { mutableStateOf(false) }
val trailingIcon by remember { derivedStateOf { model.getTrailingIconBasedOnOverflow(hasTextOverflow) ?: model.trailingIcon } }
if (model.leadingIcon != null && model.leadingIcon.isIconAvailable()) {
Box(
modifier = Modifier
Expand Down Expand Up @@ -758,6 +757,7 @@ private fun SnackBarStackItem(
onTextLayout = { textLayout ->
if (hasTextOverflow != textLayout.hasVisualOverflow) {
hasTextOverflow = textLayout.hasVisualOverflow
model.onTitleOverflowChange?.invoke(hasTextOverflow)
}
}
)
Expand Down Expand Up @@ -799,7 +799,7 @@ private fun SnackBarStackItem(
)
}

trailingIcon?.let { icon ->
model.trailingIcon?.let { icon ->
if (icon.isIconAvailable()) {
Box(
modifier = Modifier
Expand Down
Loading