From af680dba46f1c46fa5617eb14fa60ca83c4ca8cf Mon Sep 17 00:00:00 2001 From: Pranjal Singh Date: Thu, 26 Feb 2026 12:24:43 +0530 Subject: [PATCH 1/2] Adding fix for scrim semantics --- .../fluentui/tokenized/notification/StackableSnackbar.kt | 7 +++++++ fluentui_notification/src/main/res/values/strings.xml | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/fluentui_notification/src/main/java/com/microsoft/fluentui/tokenized/notification/StackableSnackbar.kt b/fluentui_notification/src/main/java/com/microsoft/fluentui/tokenized/notification/StackableSnackbar.kt index 4c9b5fb7c..5dfdb2c3d 100644 --- a/fluentui_notification/src/main/java/com/microsoft/fluentui/tokenized/notification/StackableSnackbar.kt +++ b/fluentui_notification/src/main/java/com/microsoft/fluentui/tokenized/notification/StackableSnackbar.kt @@ -56,14 +56,17 @@ import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.LiveRegionMode import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.liveRegion import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.times +import com.microsoft.fluentui.notification.R import com.microsoft.fluentui.theme.token.FluentIcon import com.microsoft.fluentui.theme.token.Icon import com.microsoft.fluentui.theme.token.StateColor @@ -839,6 +842,7 @@ fun Scrim( ) if (scrimColor.alpha > 0f) { + val scrimContentDescription = stringResource(R.string.scrim_content_description) Box( modifier = modifier .fillMaxSize() @@ -848,6 +852,9 @@ fun Scrim( indication = null, onClick = onDismiss ) + .semantics { + contentDescription = scrimContentDescription + } ) } } \ No newline at end of file diff --git a/fluentui_notification/src/main/res/values/strings.xml b/fluentui_notification/src/main/res/values/strings.xml index a6b3daec9..e5104fdf8 100644 --- a/fluentui_notification/src/main/res/values/strings.xml +++ b/fluentui_notification/src/main/res/values/strings.xml @@ -1,2 +1,4 @@ - \ No newline at end of file + + Dismiss Expanded notifications + \ No newline at end of file From d458a4eed6435ad47a0a1d14dc21cfd5d7664162 Mon Sep 17 00:00:00 2001 From: Pranjal Singh Date: Fri, 27 Feb 2026 12:21:57 +0530 Subject: [PATCH 2/2] Padding fix for Action text when trailing icon is absent --- .../fluentui/tokenized/notification/StackableSnackbar.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fluentui_notification/src/main/java/com/microsoft/fluentui/tokenized/notification/StackableSnackbar.kt b/fluentui_notification/src/main/java/com/microsoft/fluentui/tokenized/notification/StackableSnackbar.kt index 4c9b5fb7c..7f77e8c20 100644 --- a/fluentui_notification/src/main/java/com/microsoft/fluentui/tokenized/notification/StackableSnackbar.kt +++ b/fluentui_notification/src/main/java/com/microsoft/fluentui/tokenized/notification/StackableSnackbar.kt @@ -765,10 +765,7 @@ private fun SnackBarStackItem( modifier = Modifier .testTag(SnackBarTestTags.SNACK_BAR_ACTION_BUTTON) .then( - if (model.trailingIcon != null) - Modifier.padding(horizontal = 16.dp, vertical = 12.dp) - else - Modifier.padding(start = 16.dp, top = 12.dp, bottom = 12.dp) + Modifier.padding(horizontal = 16.dp, vertical = 12.dp) ), text = model.actionText, style = ButtonStyle.TextButton,