Fix merge conflicts

microsoft · Aug 24, 2021 · f3fd6e0 · f3fd6e0
1 parent 321e912
commit f3fd6e0
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 70 deletions.
diff --git a/packages/react-menu/src/components/Menu/Menu.types.ts b/packages/react-menu/src/components/Menu/Menu.types.ts
@@ -1,16 +1,8 @@
 import * as React from 'react';
-<<<<<<< HEAD
-import { usePopperMouseTarget } from '@fluentui/react-positioning';
-import type { ComponentProps, ComponentState } from '@fluentui/react-utilities';
-import type { PositioningShorthand } from '@fluentui/react-positioning';
-import type { MenuListProps } from '../MenuList/index';
-import type { MenuContextValue } from '../../contexts/menuContext';
-=======
 import { ComponentProps, ComponentState } from '@fluentui/react-utilities';
 import { usePopperMouseTarget, PositioningShorthand } from '@fluentui/react-positioning';
 import { MenuListCommons } from '../MenuList/index';
 import { MenuContextValue } from '../../contexts/menuContext';
->>>>>>> Updates react-menu to use root as slot
 
 interface MenuCommons extends MenuListCommons {
   /**

diff --git a/packages/react-menu/src/components/MenuDivider/MenuDivider.types.ts b/packages/react-menu/src/components/MenuDivider/MenuDivider.types.ts
@@ -1,13 +1,9 @@
 import * as React from 'react';
-<<<<<<< HEAD
-import type { ComponentProps, ComponentState } from '@fluentui/react-utilities';
-=======
 import { ComponentProps, ComponentState, ObjectShorthandProps } from '@fluentui/react-utilities';
 
 export type MenuDividerSlots = {
   root: ObjectShorthandProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
 };
->>>>>>> Updates react-menu to use root as slot
 
 /**
  * {@docCategory MenuDivider}

diff --git a/packages/react-menu/src/components/MenuDivider/renderMenuDivider.tsx b/packages/react-menu/src/components/MenuDivider/renderMenuDivider.tsx
@@ -1,10 +1,6 @@
 import * as React from 'react';
 import { getSlots } from '@fluentui/react-utilities';
-<<<<<<< HEAD
-import type { MenuDividerState } from './MenuDivider.types';
-=======
 import { MenuDividerSlots, MenuDividerState } from './MenuDivider.types';
->>>>>>> Updates react-menu to use root as slot
 
 /**
  * Redefine the render function to add slots. Reuse the menudivider structure but add

diff --git a/packages/react-menu/src/components/MenuGroup/MenuGroup.types.ts b/packages/react-menu/src/components/MenuGroup/MenuGroup.types.ts
@@ -1,11 +1,6 @@
 import * as React from 'react';
-<<<<<<< HEAD
-import type { ComponentProps, ComponentState } from '@fluentui/react-utilities';
-import type { MenuGroupContextValue } from '../../contexts/menuGroupContext';
-=======
 import { ComponentProps, ComponentState, ObjectShorthandProps } from '@fluentui/react-utilities';
 import { MenuGroupContextValue } from '../../contexts/menuGroupContext';
->>>>>>> Updates react-menu to use root as slot
 
 export type MenuGroupSlots = {
   root: ObjectShorthandProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;

diff --git a/packages/react-menu/src/components/MenuGroup/renderMenuGroup.tsx b/packages/react-menu/src/components/MenuGroup/renderMenuGroup.tsx
@@ -1,11 +1,7 @@
 import * as React from 'react';
 import { getSlots } from '@fluentui/react-utilities';
-<<<<<<< HEAD
-=======
 import { MenuGroupContextValues, MenuGroupSlots, MenuGroupState } from './MenuGroup.types';
->>>>>>> Updates react-menu to use root as slot
 import { MenuGroupContextProvider } from '../../contexts/menuGroupContext';
-import type { MenuGroupContextValues, MenuGroupState } from './MenuGroup.types';
 
 /**
  * Redefine the render function to add slots. Reuse the menugroup structure but add

diff --git a/packages/react-menu/src/components/MenuGroup/useMenuGroup.ts b/packages/react-menu/src/components/MenuGroup/useMenuGroup.ts
@@ -1,11 +1,6 @@
 import * as React from 'react';
-<<<<<<< HEAD
-import { useId } from '@fluentui/react-utilities';
-import type { MenuGroupProps, MenuGroupState } from './MenuGroup.types';
-=======
 import { getNativeElementProps, useId } from '@fluentui/react-utilities';
 import { MenuGroupProps, MenuGroupState } from './MenuGroup.types';
->>>>>>> Updates react-menu to use root as slot
 
 /**
  * Given user props, returns state and render function for a MenuGroup.

diff --git a/packages/react-menu/src/components/MenuGroupHeader/MenuGroupHeader.types.ts b/packages/react-menu/src/components/MenuGroupHeader/MenuGroupHeader.types.ts
@@ -1,13 +1,9 @@
 import * as React from 'react';
-<<<<<<< HEAD
-import type { ComponentProps, ComponentState } from '@fluentui/react-utilities';
-=======
 import { ComponentProps, ComponentState, ObjectShorthandProps } from '@fluentui/react-utilities';
 
 export type MenuGroupHeaderSlots = {
   root: ObjectShorthandProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;
 };
->>>>>>> Updates react-menu to use root as slot
 
 /**
  * {@docCategory MenuGroupHeader}

diff --git a/packages/react-menu/src/components/MenuGroupHeader/renderMenuGroupHeader.tsx b/packages/react-menu/src/components/MenuGroupHeader/renderMenuGroupHeader.tsx
@@ -1,10 +1,6 @@
 import * as React from 'react';
 import { getSlots } from '@fluentui/react-utilities';
-<<<<<<< HEAD
-import type { MenuGroupHeaderState } from './MenuGroupHeader.types';
-=======
 import { MenuGroupHeaderSlots, MenuGroupHeaderState } from './MenuGroupHeader.types';
->>>>>>> Updates react-menu to use root as slot
 
 /**
  * Redefine the render function to add slots. Reuse the menugroupheader structure but add

diff --git a/packages/react-menu/src/components/MenuGroupHeader/useMenuGroupHeader.ts b/packages/react-menu/src/components/MenuGroupHeader/useMenuGroupHeader.ts
@@ -1,10 +1,7 @@
 import * as React from 'react';
 import { useMenuGroupContext } from '../../contexts/menuGroupContext';
-<<<<<<< HEAD
-import type { MenuGroupHeaderProps, MenuGroupHeaderState } from './MenuGroupHeader.types';
-=======
 import { getNativeElementProps } from '@fluentui/react-utilities';
->>>>>>> Updates react-menu to use root as slot
+import { MenuGroupHeaderProps, MenuGroupHeaderState } from './MenuGroupHeader.types';
 
 /**
  * Given user props, returns state and render function for a MenuGroupHeader.

diff --git a/packages/react-menu/src/components/MenuItem/MenuItem.types.ts b/packages/react-menu/src/components/MenuItem/MenuItem.types.ts
@@ -1,9 +1,5 @@
 import * as React from 'react';
-<<<<<<< HEAD
-import type { ComponentProps, ComponentState } from '@fluentui/react-utilities';
-=======
 import { ComponentProps, ComponentState, ObjectShorthandProps } from '@fluentui/react-utilities';
->>>>>>> Updates react-menu to use root as slot
 
 export type MenuItemSlots = {
   root: ObjectShorthandProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;

diff --git a/packages/react-menu/src/components/MenuList/MenuList.types.ts b/packages/react-menu/src/components/MenuList/MenuList.types.ts
@@ -1,13 +1,7 @@
 import * as React from 'react';
-<<<<<<< HEAD
-import type { ComponentProps, ComponentState } from '@fluentui/react-utilities';
-import type { MenuListContextValue } from '../../contexts/menuListContext';
-import type { SelectableHandler } from '../../selectable/index';
-=======
 import { ComponentProps, ComponentState, ObjectShorthandProps } from '@fluentui/react-utilities';
 import { MenuListContextValue } from '../../contexts/menuListContext';
 import { SelectableHandler } from '../../selectable/index';
->>>>>>> Updates react-menu to use root as slot
 
 export interface MenuListCommons {
   /**

diff --git a/packages/react-menu/src/components/MenuList/renderMenuList.tsx b/packages/react-menu/src/components/MenuList/renderMenuList.tsx
@@ -1,11 +1,7 @@
 import * as React from 'react';
 import { getSlots } from '@fluentui/react-utilities';
-<<<<<<< HEAD
-=======
 import { MenuListContextValues, MenuListSlots, MenuListState } from './MenuList.types';
->>>>>>> Updates react-menu to use root as slot
 import { MenuListProvider } from '../../contexts/menuListContext';
-import type { MenuListContextValues, MenuListState } from './MenuList.types';
 
 /**
  * Function that renders the final JSX of the component

diff --git a/packages/react-menu/src/components/MenuPopover/MenuPopover.types.ts b/packages/react-menu/src/components/MenuPopover/MenuPopover.types.ts
@@ -1,11 +1,6 @@
 import * as React from 'react';
-<<<<<<< HEAD
-import type { ComponentProps, ComponentState } from '@fluentui/react-utilities';
-import type { MenuState } from '../Menu/Menu.types';
-=======
 import { ComponentProps, ComponentState, ObjectShorthandProps } from '@fluentui/react-utilities';
 import { MenuState } from '../Menu/Menu.types';
->>>>>>> Updates react-menu to use root as slot
 
 export type MenuPopoverSlots = {
   root: ObjectShorthandProps<React.HTMLAttributes<HTMLElement>, HTMLElement>;

diff --git a/packages/react-menu/src/components/MenuPopover/renderMenuPopover.tsx b/packages/react-menu/src/components/MenuPopover/renderMenuPopover.tsx
@@ -1,11 +1,7 @@
 import * as React from 'react';
 import { getSlots } from '@fluentui/react-utilities';
-<<<<<<< HEAD
-=======
 import { MenuPopoverSlots, MenuPopoverState } from './MenuPopover.types';
->>>>>>> Updates react-menu to use root as slot
 import { Portal } from '@fluentui/react-portal';
-import type { MenuPopoverState } from './MenuPopover.types';
 
 /**
  * Render the final JSX of MenuPopover

diff --git a/packages/react-menu/src/components/MenuPopover/useMenuPopover.ts b/packages/react-menu/src/components/MenuPopover/useMenuPopover.ts
@@ -1,16 +1,11 @@
 import * as React from 'react';
 import { getCode, ArrowLeftKey, TabKey, ArrowRightKey } from '@fluentui/keyboard-key';
-<<<<<<< HEAD
-import { useEventCallback, useMergedRefs } from '@fluentui/react-utilities';
-=======
 import { getNativeElementProps, useEventCallback, useMergedRefs } from '@fluentui/react-utilities';
 import { MenuPopoverProps, MenuPopoverState } from './MenuPopover.types';
->>>>>>> Updates react-menu to use root as slot
 import { useMenuContext } from '../../contexts/menuContext';
 import { dispatchMenuEnterEvent } from '../../utils/index';
 import { useFluent } from '@fluentui/react-shared-contexts';
 import { useIsSubmenu } from '../../utils/useIsSubmenu';
-import type { MenuPopoverProps, MenuPopoverState } from './MenuPopover.types';
 
 /**
  * Create the state required to render MenuPopover.