Skip to content
Merged
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
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "macOS: Only show scroll indicators if maxHeight/maxWidth is specified",
"packageName": "@fluentui-react-native/menu",
"email": "email not defined",
"dependentChangeType": "patch"
}
1 change: 1 addition & 0 deletions packages/components/Menu/src/Menu/Menu.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ export interface MenuState extends MenuProps {
shouldFocusOnContainer: boolean;
triggerRef: React.RefObject<React.Component>;
hasMaxHeight?: boolean;
hasMaxWidth?: boolean;
}
5 changes: 4 additions & 1 deletion packages/components/Menu/src/MenuList/MenuList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ export const MenuList = compose<MenuListType>({
const content =
Platform.OS === 'macos' ? (
<Slots.root>
<Slots.scrollView>
<Slots.scrollView
showsVerticalScrollIndicator={menuContext.hasMaxHeight}
showsHorizontalScrollIndicator={menuContext.hasMaxWidth}
>
<Slots.focusZone
componentRef={focusZoneRef}
focusZoneDirection={'vertical'}
Expand Down
1 change: 1 addition & 0 deletions packages/components/Menu/src/MenuList/MenuList.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export interface MenuListState extends Omit<MenuListProps, 'checked' | 'onChecke
addRadioItem: (name: string) => void;
removeRadioItem: (name: string) => void;
hasMaxHeight?: boolean;
hasMaxWidth?: boolean;
}

export interface MenuListSlotProps {
Expand Down
1 change: 1 addition & 0 deletions packages/components/Menu/src/MenuList/useMenuList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,6 @@ export const useMenuList = (_props: MenuListProps): MenuListState => {
addRadioItem,
removeRadioItem,
hasMaxHeight: context.hasMaxHeight,
hasMaxWidth: context.hasMaxWidth,
};
};
1 change: 1 addition & 0 deletions packages/components/Menu/src/context/menuContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const MenuContext = React.createContext<MenuContextValue>({
shouldFocusOnContainer: false,
triggerRef: null,
hasMaxHeight: false,
hasMaxWidth: false,
});

export const MenuProvider = MenuContext.Provider;
Expand Down