Skip to content

Adding callback mechanism for Stackable Snackbar #820

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

Draft
pranjal-glowingstar wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Adding callback mechanism for Stackable Snackbar #820

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion 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 @@ -108,7 +108,10 @@ fun SnackBarStackDemoLayout(context: V2StackableSnackbarActivity) {
state = stackState,
snackBarStackConfig = SnackBarStackConfig(
snackbarGapWhenExpanded = 10.dp
)
),
getTrailingIconBasedOnOverflow = {
null
}
)
Spacer(modifier = Modifier.height(10.dp))
Row() {
Expand Down
60 changes: 35 additions & 25 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 @@ -430,6 +430,7 @@ fun SnackBarStack(
state: SnackBarStackState,
snackBarStackConfig: SnackBarStackConfig = SnackBarStackConfig(),
enableSwipeToDismiss: Boolean = true,
getTrailingIconBasedOnOverflow: (Boolean) -> FluentIcon?
) {
val localDensity = LocalDensity.current

Expand Down Expand Up @@ -482,7 +483,8 @@ fun SnackBarStack(
},
snackBarStackConfig = snackBarStackConfig,
enableSwipeToDismiss = enableSwipeToDismiss,
screenWidthPx = screenWidthPx
screenWidthPx = screenWidthPx,
getTrailingIconBasedOnOverflow = getTrailingIconBasedOnOverflow
)
}
}
Expand Down Expand Up @@ -510,7 +512,8 @@ private fun SnackBarStackItem(
onSwipedAway: (String) -> Unit,
snackBarStackConfig: SnackBarStackConfig,
enableSwipeToDismiss: Boolean = true,
screenWidthPx: Float
screenWidthPx: Float,
getTrailingIconBasedOnOverflow: (Boolean) -> FluentIcon?
) {
val modelWrapper = state.snapshotStateList[trueIndex]
val model = modelWrapper.model
Expand Down Expand Up @@ -706,6 +709,8 @@ private fun SnackBarStackItem(
.testTag(SnackBarTestTags.SNACK_BAR),
verticalAlignment = Alignment.CenterVertically
) {

var trailingIcon by remember { mutableStateOf(model.trailingIcon) }
if (model.leadingIcon != null && model.leadingIcon.isIconAvailable()) {
Box(
modifier = Modifier
Expand Down Expand Up @@ -743,7 +748,10 @@ private fun SnackBarStackItem(
text = model.message,
style = token.titleTypography(snackBarInfo),
maxLines = messageMaxLines,
overflow = TextOverflow.Ellipsis
overflow = TextOverflow.Ellipsis,
onTextLayout = { textLayout ->
trailingIcon = getTrailingIconBasedOnOverflow(textLayout.hasVisualOverflow) ?: model.trailingIcon
}
)
if (!model.subTitle.isNullOrBlank()) {
Text(
Expand Down Expand Up @@ -786,29 +794,31 @@ private fun SnackBarStackItem(
)
}

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