Skip to content

Commit fcd3d45

Browse files
rrfangRoy Fang
andauthored
Fix some accessibility issues in the fluent tester contextual menu (#3953)
* Fix some accessibility issues in the fluent tester contextual menu section * Change files * Changes per comments * Reverting to experimental menu button to test automation failure --------- Co-authored-by: Roy Fang <[email protected]>
1 parent 6853f24 commit fcd3d45

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

apps/fluent-tester/src/TestComponents/ContextualMenu/ContextualMenuTest.tsx

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
import * as React from 'react';
22
import { Text, View, Switch } from 'react-native';
33

4-
import {
5-
Text as FURNText,
6-
ButtonV1 as Button,
7-
ContextualMenu,
8-
ContextualMenuItem,
9-
Submenu,
10-
SubmenuItem,
11-
Separator,
12-
Checkbox,
13-
} from '@fluentui/react-native';
4+
import { Text as FURNText, ContextualMenu, ContextualMenuItem, Submenu, SubmenuItem, Separator, Checkbox } from '@fluentui/react-native';
145
import { CONTEXTUALMENU_TESTPAGE } from '@fluentui-react-native/e2e-testing';
6+
import { MenuButton } from '@fluentui-react-native/experimental-menu-button';
157

168
import { E2EContextualMenuTest } from './E2EContextualMenuTest';
179
import { svgProps, fontProps, testImage } from '../Common/iconExamples';
@@ -89,9 +81,7 @@ const ContextualMenuMainTest: React.FunctionComponent = () => {
8981
<Text style={{ color: 'blue' }}>none</Text>
9082
)}
9183
</Text>
92-
<Button onClick={toggleShowContextualMenu} componentRef={stdBtnRef}>
93-
Press for ContextualMenu
94-
</Button>
84+
<MenuButton content="Press for ContextualMenu" onClick={toggleShowContextualMenu} componentRef={stdBtnRef} />
9585
</View>
9686
</View>
9787

@@ -193,9 +183,7 @@ const NestedContextualMenu: React.FunctionComponent = () => {
193183
<Text>Submenu Visibility: </Text>
194184
{isSubmenuVisible ? <Text style={{ color: 'green' }}>Visible</Text> : <Text style={{ color: 'red' }}>Not Visible</Text>}
195185
</Text>
196-
<Button onClick={toggleShowContextualMenu} componentRef={stdBtnRef}>
197-
Press for ContextualMenu
198-
</Button>
186+
<MenuButton content="Press for ContextualMenu" onClick={toggleShowContextualMenu} componentRef={stdBtnRef} />
199187
</View>
200188
</View>
201189

@@ -290,13 +278,12 @@ const IconContextualMenu: React.FunctionComponent = () => {
290278
<Text>Menu Visibility: </Text>
291279
{isContextualMenuVisible ? <Text style={{ color: 'green' }}>Visible</Text> : <Text style={{ color: 'red' }}>Not Visible</Text>}
292280
</Text>
293-
<Button
281+
<MenuButton
294282
componentRef={stdBtnRef}
295-
style={{ borderWidth: 0 }}
296-
icon={{ svgSource: svgProps, width: 12, height: 12 }}
283+
icon={{ svgSource: svgProps, height: 12, width: 12 }}
297284
onClick={toggleShowContextualMenu}
298285
accessibilityLabel="Wheelchair icon button"
299-
tooltip="Toggle menu"
286+
tooltip="Toggles the wheelchair icon button's contextual menu"
300287
/>
301288
</View>
302289
</View>
@@ -421,9 +408,7 @@ const ScrollViewContextualMenu: React.FunctionComponent = () => {
421408
<Text>
422409
<Text>Menu and Submenu max height set to 200</Text>
423410
</Text>
424-
<Button onClick={toggleShowContextualMenu} componentRef={stdBtnRef}>
425-
Press for ContextualMenu
426-
</Button>
411+
<MenuButton content="Press for ContextualMenu" onClick={toggleShowContextualMenu} componentRef={stdBtnRef} />
427412
</View>
428413
</View>
429414

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix some accessibility issues in the fluent tester contextual menu section",
4+
"packageName": "@fluentui-react-native/tester",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

0 commit comments

Comments
 (0)