Skip to content

Commit ccf692b

Browse files
AnubhvvAnubhav Agrawal
andauthored
Patch for Content description being announced twice for clickable icons (microsoft#594)
* Icon announcing it's content description twice for clickable icons * Do not apply clickable for App Icon if onCLick = null * header semantics for app bar basic text --------- Co-authored-by: Anubhav Agrawal <[email protected]>
1 parent c4f488f commit ccf692b

File tree

2 files changed

+9
-4
lines changed
  • fluentui_core/src/main/java/com/microsoft/fluentui/theme/token
  • fluentui_topappbars/src/main/java/com/microsoft/fluentui/tokenized

2 files changed

+9
-4
lines changed

fluentui_core/src/main/java/com/microsoft/fluentui/theme/token/FluentIcon.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ fun Icon(
156156
interactionSource = remember { MutableInteractionSource() },
157157
indication = LocalIndication.current,
158158
enabled = enabled,
159-
onClickLabel = contentDescription,
160159
onClick = onClick
161160
) else Modifier
162161
)

fluentui_topappbars/src/main/java/com/microsoft/fluentui/tokenized/AppBar.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import androidx.compose.ui.geometry.Offset
1818
import androidx.compose.ui.platform.LocalContext
1919
import androidx.compose.ui.platform.LocalDensity
2020
import androidx.compose.ui.platform.testTag
21+
import androidx.compose.ui.semantics.heading
22+
import androidx.compose.ui.semantics.semantics
2123
import androidx.compose.ui.text.ExperimentalTextApi
2224
import androidx.compose.ui.text.TextStyle
2325
import androidx.compose.ui.text.style.TextOverflow
@@ -145,13 +147,16 @@ fun AppBar(
145147
Icon(
146148
navigationIcon,
147149
modifier =
148-
Modifier
149-
.clickable(
150+
Modifier.then(
151+
if(navigationIcon.onClick != null)
152+
Modifier.clickable(
150153
interactionSource = remember { MutableInteractionSource() },
151154
indication = rememberRipple(color = token.navigationIconRippleColor()),
152155
enabled = true,
153156
onClick = navigationIcon.onClick ?: {}
154157
)
158+
else Modifier
159+
)
155160
.padding(token.navigationIconPadding(appBarInfo))
156161
.size(token.leftIconSize(appBarInfo)),
157162
tint = token.navigationIconColor(appBarInfo)
@@ -261,7 +266,8 @@ fun AppBar(
261266
text = title,
262267
modifier = Modifier
263268
.padding(token.textPadding(appBarInfo))
264-
.weight(1F),
269+
.weight(1F)
270+
.semantics { heading() },
265271
style = titleTextStyle.merge(
266272
TextStyle(
267273
color = token.titleTextColor(appBarInfo)

0 commit comments

Comments
 (0)