diff --git a/common/changes/office-ui-fabric-react/master_2018-05-22-13-15.json b/common/changes/office-ui-fabric-react/master_2018-05-22-13-15.json new file mode 100644 index 00000000000000..5768724f11fbde --- /dev/null +++ b/common/changes/office-ui-fabric-react/master_2018-05-22-13-15.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "office-ui-fabric-react", + "comment": "Fixing circular dependency and non-AMD references in ContextualMenu", + "type": "patch" + } + ], + "packageName": "office-ui-fabric-react", + "email": "serkani@microsoft.com" +} \ No newline at end of file diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuAnchor.tsx b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuAnchor.tsx index f1ab2089c88156..8544bf7797eb34 100644 --- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuAnchor.tsx +++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuAnchor.tsx @@ -5,9 +5,9 @@ import { createRef } from '../../../Utilities'; import { ContextualMenuItemWrapper } from './ContextualMenuItemWrapper'; -import { KeytipData } from '../../KeytipData'; +import { KeytipData } from '../../../KeytipData'; import { isItemDisabled, hasSubmenu } from '../../../utilities/contextualMenu/index'; -import { ContextualMenuItem } from '../../ContextualMenu'; +import { ContextualMenuItem } from '../ContextualMenuItem'; export class ContextualMenuAnchor extends ContextualMenuItemWrapper { private _anchor = createRef(); diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuButton.tsx b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuButton.tsx index dd01a524cdffe9..e58f18c46b3117 100644 --- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuButton.tsx +++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuButton.tsx @@ -5,9 +5,9 @@ import { createRef } from '../../../Utilities'; import { ContextualMenuItemWrapper } from './ContextualMenuItemWrapper'; -import { KeytipData } from '../../KeytipData'; +import { KeytipData } from '../../../KeytipData'; import { getIsChecked, isItemDisabled, hasSubmenu } from '../../../utilities/contextualMenu/index'; -import { ContextualMenuItem } from '../../ContextualMenu'; +import { ContextualMenuItem } from '../ContextualMenuItem'; export class ContextualMenuButton extends ContextualMenuItemWrapper { private _btn = createRef(); diff --git a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuSplitButton.tsx b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuSplitButton.tsx index e1c19dae6b79bc..93dc809ae71613 100644 --- a/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuSplitButton.tsx +++ b/packages/office-ui-fabric-react/src/components/ContextualMenu/ContextualMenuItemWrapper/ContextualMenuSplitButton.tsx @@ -5,14 +5,15 @@ import { getNativeProps, KeyCodes } from '../../../Utilities'; -import { IContextualMenuItem, ContextualMenuItem } from '../../ContextualMenu'; +import { ContextualMenuItem } from '../ContextualMenuItem'; +import { IContextualMenuItem } from '../ContextualMenu.types'; import { IMenuItemClassNames, getSplitButtonVerticalDividerClassNames } from '../ContextualMenu.classNames'; -import { KeytipData } from '../../KeytipData'; +import { KeytipData } from '../../../KeytipData'; import { isItemDisabled, hasSubmenu } from '../../../utilities/contextualMenu/index'; -import { VerticalDivider } from '../../Divider'; +import { VerticalDivider } from '../../../Divider'; import { ContextualMenuItemWrapper } from './ContextualMenuItemWrapper'; export interface IContextualMenuSplitButtonState { }