Skip to content
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.

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

ContextualMenu: Migrate existing ContextualMenu code to react-next #12992

Closed
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5954a4c
Migrate existing ContextualMenu to react-next
MLoughry May 4, 2020
1664ea2
Change files
MLoughry May 4, 2020
dab5287
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry May 4, 2020
93eb810
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry May 5, 2020
83ff894
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry May 5, 2020
537b1f4
Fix test
MLoughry May 5, 2020
c4c9a53
Updating API.
khmakoto May 13, 2020
33700a8
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry May 13, 2020
daa95bb
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry May 18, 2020
944aac0
Fix duplicate exports
MLoughry May 18, 2020
1d470ad
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry May 20, 2020
8e90350
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry Jun 16, 2020
eeb7729
Update example imports
MLoughry Jun 16, 2020
4bded52
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry Jun 17, 2020
29005c4
Fix build
MLoughry Jun 17, 2020
bac92b4
Update API
MLoughry Jun 17, 2020
ae77f60
Update packages/react-next/src/FocusZone.ts
MLoughry Jun 18, 2020
2e7e1a5
Update packages/react-next/src/components/SpinButton/SpinButton.types.ts
MLoughry Jun 18, 2020
71a3621
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry Jun 18, 2020
8fe4134
Copy latest from OUFR
MLoughry Jun 19, 2020
1530cce
Merge branch 'master' of github.com:microsoft/fluentui into react-nex…
MLoughry Jun 22, 2020
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
4 changes: 2 additions & 2 deletions packages/react-next/etc/react-next.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import { ComposePreparedOptions } from '@fluentui/react-compose';
import { IBaseProps } from 'office-ui-fabric-react/lib/Utilities';
import { IButtonProps } from 'office-ui-fabric-react/lib/Button';
import { IButtonStyles } from 'office-ui-fabric-react/lib/Button';
import { IButtonProps } from '@fluentui/react-next/lib/compat/Button';
import { IButtonStyles } from '@fluentui/react-next/lib/compat/Button';
import { ICalloutContentStyleProps } from 'office-ui-fabric-react/lib/Callout';
import { ICalloutContentStyles } from 'office-ui-fabric-react';
import { ICalloutProps } from 'office-ui-fabric-react/lib/Callout';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { ContextualMenu } from './ContextualMenu';
import { canAnyMenuItemsCheck } from './ContextualMenu.base';
import { IContextualMenuItem, ContextualMenuItemType } from './ContextualMenu.types';
import { IContextualMenuRenderItem, IContextualMenuItemStyles } from './ContextualMenuItem.types';
import { DefaultButton, IButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton, IButton } from '@fluentui/react-next/lib/compat/Button';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import { DefaultButton, IButton } from '@fluentui/react-next/lib/compat/Button';
import { DefaultButton, IButton } from '../../compat/Button';


describe('ContextualMenu', () => {
afterEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { IFocusZoneProps } from '../../FocusZone';
import { IIconProps } from '@fluentui/react-next/lib/Icon';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import { IIconProps } from '@fluentui/react-next/lib/Icon';
import { IIconProps } from '../../Icon';

import { ICalloutProps, ICalloutContentStyleProps, Target } from '../../Callout';
import { ITheme, IStyle } from '../../Styling';
import { IButtonStyles } from '../../Button';
import { IButtonStyles } from '@fluentui/react-next/lib/compat/Button';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import { IButtonStyles } from '@fluentui/react-next/lib/compat/Button';
import { IButtonStyles } from '../../compat/Button';

import { IRefObject, IBaseProps, IRectangle, IRenderFunction, IStyleFunctionOrObject } from '../../Utilities';
import { IWithResponsiveModeState } from 'office-ui-fabric-react/lib/utilities/decorators/withResponsiveMode';
import { IContextualMenuClassNames, IMenuItemClassNames } from './ContextualMenu.classNames';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { IContextualMenuItem } from './ContextualMenu.types';
import { IMenuItemClassNames } from './ContextualMenu.classNames';
import { IStyle, ITheme } from '../../Styling';
import { IRefObject, IStyleFunctionOrObject } from '../../Utilities';
import { IButtonStyles } from '../../Button';
import { IButtonStyles } from '@fluentui/react-next/lib/compat/Button';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import { IButtonStyles } from '@fluentui/react-next/lib/compat/Button';
import { IButtonStyles } from '../../compat/Button';


/**
* {@docCategory ContextualMenu}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import {
ContextualMenuItemType,
IContextualMenuItem,
IContextualMenuProps,
DefaultButton,
DirectionalHint,
} from '@fluentui/react-next';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';

const keys: string[] = [
'newItem',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
IContextualMenuItem,
IContextualMenuItemProps,
} from '@fluentui/react-next/lib/ContextualMenu';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';

export const ContextualMenuWithCustomMenuItemExample: React.FunctionComponent = () => {
const menuProps: IContextualMenuProps = React.useMemo(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { useConstCallback } from '@uifabric/react-hooks';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';
import { ISearchBoxStyles, SearchBox } from '@fluentui/react-next/lib/SearchBox';
import { Icon } from '@fluentui/react-next/lib/Icon';
import { IContextualMenuListProps, IContextualMenuItem } from '@fluentui/react-next/lib/ContextualMenu';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ import {
IContextualMenuProps,
IContextualMenuItem,
DirectionalHint,
DefaultButton,
IconButton,
FocusZoneDirection,
} from '@fluentui/react-next';
import './ContextualMenuExample.scss';
import { DefaultButton, IconButton } from '@fluentui/react-next/lib/compat/Button';

export const ContextualMenuCustomizationExample: React.FunctionComponent = () => {
return <DefaultButton className="ContextualMenuButton3" text="Click for ContextualMenu" menuProps={menuProps} />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ import {
IContextualMenuProps,
IContextualMenuItem,
DirectionalHint,
DefaultButton,
IconButton,
FocusZoneDirection,
IButtonProps,
} from '@fluentui/react-next';
import './ContextualMenuExample.scss';
import { DefaultButton, IconButton, IButtonProps } from '@fluentui/react-next/lib/compat/Button';

export const ContextualMenuCustomizationWithNoWrapExample: React.FunctionComponent = () => {
return <DefaultButton className="ContextualMenuButton3" text="Click for ContextualMenu" menuProps={menuProps} />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
IContextualMenuProps,
IContextualMenuItem,
} from '@fluentui/react-next/lib/ContextualMenu';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';

export const ContextualMenuDefaultExample: React.FunctionComponent = () => {
return <DefaultButton text="Click for ContextualMenu" menuProps={menuProps} />;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { useConstCallback } from '@uifabric/react-hooks';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';
import { Checkbox, ICheckboxStyles } from '@fluentui/react-next/lib/Checkbox';
import {
ContextualMenuItemType,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';
import {
ContextualMenuItemType,
IContextualMenuProps,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { useConst, useConstCallback } from '@uifabric/react-hooks';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';
import { Callout } from '@fluentui/react-next/lib/Callout';
import {
ContextualMenuItemType,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';
import { IContextualMenuProps, IContextualMenuItem } from '@fluentui/react-next/lib/ContextualMenu';

export const ContextualMenuIconSecondaryTextExample: React.FunctionComponent = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
IContextualMenuProps,
IContextualMenuItem,
} from '@fluentui/react-next/lib/ContextualMenu';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';

export const ContextualMenuPersistedExample: React.FunctionComponent = () => {
return <DefaultButton text="Click for ContextualMenu" persistMenu={true} menuProps={menuProps} />;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { IContextualMenuProps, IContextualMenuItem, DirectionalHint, DefaultButton } from '@fluentui/react-next';
import { IContextualMenuProps, IContextualMenuItem, DirectionalHint } from '@fluentui/react-next';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';

export const ContextualMenuWithScrollBarExample: React.FunctionComponent = () => {
return <DefaultButton text="Click for ContextualMenu" menuProps={menuProps} />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
IContextualMenuProps,
IContextualMenuItem,
} from '@fluentui/react-next/lib/ContextualMenu';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';

export const ContextualMenuSectionExample: React.FunctionComponent = () => {
return <DefaultButton text="Click for ContextualMenu" menuProps={menuProps} />;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { useConstCallback } from '@uifabric/react-hooks';
import { DefaultButton } from '@fluentui/react-next/lib/Button';
import { DefaultButton } from '@fluentui/react-next/lib/compat/Button';
import { IContextualMenuProps, IContextualMenuItem } from '@fluentui/react-next/lib/ContextualMenu';
import { TextField, ITextFieldStyles } from '@fluentui/react-next/lib/TextField';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import * as React from 'react';
import { Position } from 'office-ui-fabric-react/lib/utilities/positioning';
import { IButtonStyles } from '@fluentui/react-next/lib/compat/Button';
import { IButtonStyles, IButtonProps } from '@fluentui/react-next/lib/compat/Button';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
import { IButtonStyles, IButtonProps } from '@fluentui/react-next/lib/compat/Button';
import { IButtonStyles, IButtonProps } from '../../compat/Button';

import { IIconProps } from '../../Icon';
import { ITheme, IStyle } from '../../Styling';
import { ISpinButtonClassNames } from './SpinButton.classNames';
import { KeyboardSpinDirection } from './SpinButton';
import { IButtonStyles, IButtonProps } from '../../Button';
import { IKeytipProps } from '../../Keytip';
import { IRefObject } from '../../Utilities';

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.