|
1 | 1 | import * as React from 'react';
|
2 | 2 | import { Text, View, Switch } from 'react-native';
|
3 | 3 |
|
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'; |
14 | 5 | import { CONTEXTUALMENU_TESTPAGE } from '@fluentui-react-native/e2e-testing';
|
| 6 | +import { MenuButton } from '@fluentui-react-native/experimental-menu-button'; |
15 | 7 |
|
16 | 8 | import { E2EContextualMenuTest } from './E2EContextualMenuTest';
|
17 | 9 | import { svgProps, fontProps, testImage } from '../Common/iconExamples';
|
@@ -89,9 +81,7 @@ const ContextualMenuMainTest: React.FunctionComponent = () => {
|
89 | 81 | <Text style={{ color: 'blue' }}>none</Text>
|
90 | 82 | )}
|
91 | 83 | </Text>
|
92 |
| - <Button onClick={toggleShowContextualMenu} componentRef={stdBtnRef}> |
93 |
| - Press for ContextualMenu |
94 |
| - </Button> |
| 84 | + <MenuButton content="Press for ContextualMenu" onClick={toggleShowContextualMenu} componentRef={stdBtnRef} /> |
95 | 85 | </View>
|
96 | 86 | </View>
|
97 | 87 |
|
@@ -193,9 +183,7 @@ const NestedContextualMenu: React.FunctionComponent = () => {
|
193 | 183 | <Text>Submenu Visibility: </Text>
|
194 | 184 | {isSubmenuVisible ? <Text style={{ color: 'green' }}>Visible</Text> : <Text style={{ color: 'red' }}>Not Visible</Text>}
|
195 | 185 | </Text>
|
196 |
| - <Button onClick={toggleShowContextualMenu} componentRef={stdBtnRef}> |
197 |
| - Press for ContextualMenu |
198 |
| - </Button> |
| 186 | + <MenuButton content="Press for ContextualMenu" onClick={toggleShowContextualMenu} componentRef={stdBtnRef} /> |
199 | 187 | </View>
|
200 | 188 | </View>
|
201 | 189 |
|
@@ -290,13 +278,12 @@ const IconContextualMenu: React.FunctionComponent = () => {
|
290 | 278 | <Text>Menu Visibility: </Text>
|
291 | 279 | {isContextualMenuVisible ? <Text style={{ color: 'green' }}>Visible</Text> : <Text style={{ color: 'red' }}>Not Visible</Text>}
|
292 | 280 | </Text>
|
293 |
| - <Button |
| 281 | + <MenuButton |
294 | 282 | componentRef={stdBtnRef}
|
295 |
| - style={{ borderWidth: 0 }} |
296 |
| - icon={{ svgSource: svgProps, width: 12, height: 12 }} |
| 283 | + icon={{ svgSource: svgProps, height: 12, width: 12 }} |
297 | 284 | onClick={toggleShowContextualMenu}
|
298 | 285 | accessibilityLabel="Wheelchair icon button"
|
299 |
| - tooltip="Toggle menu" |
| 286 | + tooltip="Toggles the wheelchair icon button's contextual menu" |
300 | 287 | />
|
301 | 288 | </View>
|
302 | 289 | </View>
|
@@ -421,9 +408,7 @@ const ScrollViewContextualMenu: React.FunctionComponent = () => {
|
421 | 408 | <Text>
|
422 | 409 | <Text>Menu and Submenu max height set to 200</Text>
|
423 | 410 | </Text>
|
424 |
| - <Button onClick={toggleShowContextualMenu} componentRef={stdBtnRef}> |
425 |
| - Press for ContextualMenu |
426 |
| - </Button> |
| 411 | + <MenuButton content="Press for ContextualMenu" onClick={toggleShowContextualMenu} componentRef={stdBtnRef} /> |
427 | 412 | </View>
|
428 | 413 | </View>
|
429 | 414 |
|
|
0 commit comments