Skip to content
Closed
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
Expand Up @@ -34,7 +34,7 @@ export type MenuCheckedValueChangeData = {
export type MenuCheckedValueChangeEvent = React_2.MouseEvent | React_2.KeyboardEvent;

// @public
export type MenuContextValue = Pick<MenuState, 'openOnHover' | 'openOnContext' | 'triggerRef' | 'menuPopoverRef' | 'setOpen' | 'isSubmenu' | 'triggerId' | 'hasIcons' | 'hasCheckmarks' | 'persistOnItemClick' | 'inline' | 'checkedValues' | 'onCheckedValueChange'> & {
export type MenuContextValue = Pick<MenuState, 'openOnHover' | 'openOnContext' | 'triggerRef' | 'menuPopoverRef' | 'setOpen' | 'isSubmenu' | 'triggerId' | 'hasIcons' | 'hasCheckmarks' | 'persistOnItemClick' | 'inline' | 'checkedValues' | 'onCheckedValueChange' | 'autoSize'> & {
open: boolean;
triggerId: string;
defaultCheckedValues?: Record<string, string[]>;
Expand Down Expand Up @@ -282,6 +282,7 @@ export type MenuPopoverSlots = {
// @public
export type MenuPopoverState = ComponentState<MenuPopoverSlots> & {
inline: boolean;
autoSize: boolean;
};

// @public
Expand Down Expand Up @@ -335,6 +336,7 @@ export type MenuState = ComponentState<MenuSlots> & Required<Pick<MenuProps, 'ha
triggerRef: React_2.MutableRefObject<HTMLElement>;
onOpenChange?: (e: MenuOpenEvent, data: MenuOpenChangeData) => void;
defaultCheckedValues?: Record<string, string[]>;
autoSize: boolean;
};

// @public
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ export type MenuState = ComponentState<MenuSlots> &
* the signature remains just to avoid breaking changes
*/
defaultCheckedValues?: Record<string, string[]>;

autoSize: boolean;
};

export type MenuContextValues = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export const useMenu_unstable = (props: MenuProps): MenuState => {
checkedValues,
onCheckedValueChange,
persistOnItemClick,
autoSize: !!positioningState.autoSize,
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export function useMenuContextValues_unstable(state: MenuState): MenuContextValu
setOpen,
triggerId,
triggerRef,
autoSize,
} = state;

// This context is created with "@fluentui/react-context-selector", these is no sense to memoize it
Expand All @@ -34,6 +35,7 @@ export function useMenuContextValues_unstable(state: MenuState): MenuContextValu
setOpen,
triggerId,
triggerRef,
autoSize,
};

return { menu };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ export type MenuPopoverState = ComponentState<MenuPopoverSlots> & {
* This option is disregarded for submenus
*/
inline: boolean;

autoSize: boolean;
};
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const useMenuPopover_unstable = (props: MenuPopoverProps, ref: React.Ref<
const setOpen = useMenuContext_unstable(context => context.setOpen);
const open = useMenuContext_unstable(context => context.open);
const openOnHover = useMenuContext_unstable(context => context.openOnHover);
const autoSize = useMenuContext_unstable(context => context.autoSize);
const isSubmenu = useIsSubmenu();
const canDispatchCustomEventRef = React.useRef(true);
const throttleDispatchTimerRef = React.useRef(0);
Expand Down Expand Up @@ -96,5 +97,6 @@ export const useMenuPopover_unstable = (props: MenuPopoverProps, ref: React.Ref<
root: 'div',
},
root: rootProps,
autoSize,
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,23 @@ const useStyles = makeStyles({
...shorthands.border('1px', 'solid', tokens.colorTransparentStroke),
...typographyStyles.body1,
},

autoSize: {
overflowX: 'auto',
overflowY: 'auto',
},
});

/**
* Apply styling to the Menu slots based on the state
*/
export const useMenuPopoverStyles_unstable = (state: MenuPopoverState): MenuPopoverState => {
const styles = useStyles();
state.root.className = mergeClasses(menuPopoverClassNames.root, styles.root, state.root.className);
state.root.className = mergeClasses(
menuPopoverClassNames.root,
styles.root,
state.root.className,
state.autoSize && styles.autoSize,
);
return state;
};
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const menuContextDefaultValue: MenuContextValue = {
hasCheckmarks: false,
inline: false,
persistOnItemClick: false,
autoSize: false,
};

/**
Expand All @@ -44,6 +45,7 @@ export type MenuContextValue = Pick<
| 'inline'
| 'checkedValues'
| 'onCheckedValueChange'
| 'autoSize'
> & {
open: boolean;
triggerId: string;
Expand Down