Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
import * as React from 'react';
import { Text, View, Switch } from 'react-native';

import {
Text as FURNText,
ButtonV1 as Button,
ContextualMenu,
ContextualMenuItem,
Submenu,
SubmenuItem,
Separator,
Checkbox,
} from '@fluentui/react-native';
import { Text as FURNText, ContextualMenu, ContextualMenuItem, Submenu, SubmenuItem, Separator, Checkbox } from '@fluentui/react-native';
import { CONTEXTUALMENU_TESTPAGE } from '@fluentui-react-native/e2e-testing';
import { MenuButton } from '@fluentui-react-native/experimental-menu-button';

import { E2EContextualMenuTest } from './E2EContextualMenuTest';
import { svgProps, fontProps, testImage } from '../Common/iconExamples';
Expand Down Expand Up @@ -89,9 +81,7 @@ const ContextualMenuMainTest: React.FunctionComponent = () => {
<Text style={{ color: 'blue' }}>none</Text>
)}
</Text>
<Button onClick={toggleShowContextualMenu} componentRef={stdBtnRef}>
Press for ContextualMenu
</Button>
<MenuButton content="Press for ContextualMenu" onClick={toggleShowContextualMenu} componentRef={stdBtnRef} />
</View>
</View>

Expand Down Expand Up @@ -193,9 +183,7 @@ const NestedContextualMenu: React.FunctionComponent = () => {
<Text>Submenu Visibility: </Text>
{isSubmenuVisible ? <Text style={{ color: 'green' }}>Visible</Text> : <Text style={{ color: 'red' }}>Not Visible</Text>}
</Text>
<Button onClick={toggleShowContextualMenu} componentRef={stdBtnRef}>
Press for ContextualMenu
</Button>
<MenuButton content="Press for ContextualMenu" onClick={toggleShowContextualMenu} componentRef={stdBtnRef} />
</View>
</View>

Expand Down Expand Up @@ -290,13 +278,12 @@ const IconContextualMenu: React.FunctionComponent = () => {
<Text>Menu Visibility: </Text>
{isContextualMenuVisible ? <Text style={{ color: 'green' }}>Visible</Text> : <Text style={{ color: 'red' }}>Not Visible</Text>}
</Text>
<Button
<MenuButton
componentRef={stdBtnRef}
style={{ borderWidth: 0 }}
icon={{ svgSource: svgProps, width: 12, height: 12 }}
icon={{ svgSource: svgProps, height: 12, width: 12 }}
onClick={toggleShowContextualMenu}
accessibilityLabel="Wheelchair icon button"
tooltip="Toggle menu"
tooltip="Toggles the wheelchair icon button's contextual menu"
/>
</View>
</View>
Expand Down Expand Up @@ -421,9 +408,7 @@ const ScrollViewContextualMenu: React.FunctionComponent = () => {
<Text>
<Text>Menu and Submenu max height set to 200</Text>
</Text>
<Button onClick={toggleShowContextualMenu} componentRef={stdBtnRef}>
Press for ContextualMenu
</Button>
<MenuButton content="Press for ContextualMenu" onClick={toggleShowContextualMenu} componentRef={stdBtnRef} />
</View>
</View>

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Fix some accessibility issues in the fluent tester contextual menu section",
"packageName": "@fluentui-react-native/tester",
"email": "[email protected]",
"dependentChangeType": "patch"
}