Skip to content

Commit 7136883

Browse files
committed
remove revert minWidth from examples, add minWidth to props
1 parent d735bb5 commit 7136883

21 files changed

+24
-27
lines changed

packages/react-core/src/components/Dropdown/Dropdown.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export interface DropdownProps extends React.HTMLProps<HTMLDivElement>, OUIAProp
3131
};
3232
/** Display menu above or below dropdown toggle */
3333
direction?: DropdownDirection | 'up' | 'down';
34+
/** Minimum width of the dropdown menu. If set to "trigger", the minimum width will be set to the toggle width. */
35+
minWidth?: string | 'trigger';
3436
/** The container to append the menu to. Defaults to 'inline'.
3537
* If your menu is being cut off you can append it to an element higher up the DOM tree.
3638
* Some examples:
@@ -72,14 +74,15 @@ export const Dropdown: React.FunctionComponent<DropdownProps> = ({
7274
ouiaSafe,
7375
alignments,
7476
contextProps,
77+
minWidth,
7578
menuAppendTo = 'inline',
7679
isFlipEnabled = true,
7780
zIndex = 9999,
7881
...props
7982
}: DropdownProps) => (
8083
<DropdownContext.Provider
8184
value={{
82-
onSelect: event => onSelect && onSelect(event),
85+
onSelect: (event) => onSelect && onSelect(event),
8386
toggleTextClass: styles.dropdownToggleText,
8487
toggleIconClass: styles.dropdownToggleImage,
8588
toggleIndicatorClass: styles.dropdownToggleIcon,
@@ -104,6 +107,7 @@ export const Dropdown: React.FunctionComponent<DropdownProps> = ({
104107
menuAppendTo={menuAppendTo}
105108
isFlipEnabled={isFlipEnabled}
106109
zIndex={zIndex}
110+
minWidth={minWidth}
107111
{...props}
108112
/>
109113
</DropdownContext.Provider>

packages/react-core/src/components/Dropdown/DropdownWithContext.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export class DropdownWithContext extends React.Component<DropdownProps & OUIAPro
7575
position,
7676
toggle,
7777
autoFocus,
78+
minWidth,
7879
menuAppendTo,
7980
isFlipEnabled,
8081
zIndex,
@@ -175,7 +176,7 @@ export class DropdownWithContext extends React.Component<DropdownProps & OUIAPro
175176
appendTo={menuAppendTo === 'parent' ? getParentElement() : menuAppendTo}
176177
isVisible={isOpen}
177178
zIndex={zIndex}
178-
minWidth="revert"
179+
minWidth={minWidth !== undefined ? minWidth : 'revert'}
179180
/>
180181
);
181182
}}

packages/react-core/src/components/LabelGroup/examples/LabelGroupEditableAddDropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export const LabelGroupEditableAddDropdown: React.FunctionComponent = () => {
114114
categoryName="Label group 1"
115115
numLabels={5}
116116
isEditable
117-
addLabelControl={<Popper trigger={toggle} popper={menu} isVisible={isOpen} minWidth="revert" />}
117+
addLabelControl={<Popper trigger={toggle} popper={menu} isVisible={isOpen} />}
118118
>
119119
{labels.map((label, index) => (
120120
<Label

packages/react-core/src/components/LabelGroup/examples/LabelGroupEditableAddModal.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ export const LabelGroupEditableAddModal: React.FunctionComponent = () => {
287287
popper={colorMenu}
288288
appendTo={colorContainerRef.current as HTMLElement}
289289
isVisible={isColorOpen}
290-
minWidth="revert"
291290
/>
292291
</div>
293292
</FormGroup>
@@ -298,7 +297,6 @@ export const LabelGroupEditableAddModal: React.FunctionComponent = () => {
298297
popper={iconMenu}
299298
appendTo={iconContainerRef.current as HTMLElement}
300299
isVisible={isIconOpen}
301-
minWidth="revert"
302300
/>
303301
</div>
304302
</FormGroup>

packages/react-core/src/components/Pagination/PaginationOptionsMenu.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ export interface PaginationOptionsMenuProps extends React.HTMLProps<HTMLDivEleme
1616
isDisabled?: boolean;
1717
/** Menu will open up or open down from the options menu toggle. */
1818
dropDirection?: 'up' | 'down';
19+
/** Minimum width of the pagination options menu. If set to "trigger", the minimum width will be set to the toggle width. */
20+
minWidth?: string | 'trigger';
1921
/** Array of titles and values which will be the options on the options menu dropdown. */
2022
perPageOptions?: PerPageOptions[];
2123
/** The title of the pagination options menu. */
@@ -58,6 +60,7 @@ export const PaginationOptionsMenu: React.FunctionComponent<PaginationOptionsMen
5860
page: pageProp,
5961
itemCount,
6062
isDisabled = false,
63+
minWidth,
6164
dropDirection = 'down',
6265
perPageOptions = [] as PerPageOptions[],
6366
// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -204,7 +207,7 @@ export const PaginationOptionsMenu: React.FunctionComponent<PaginationOptionsMen
204207
isVisible={isOpen}
205208
direction={dropDirection}
206209
appendTo={containerRef.current || undefined}
207-
minWidth="revert"
210+
minWidth={minWidth !== undefined ? minWidth : 'revert'}
208211
/>
209212
</div>
210213
);

packages/react-core/src/components/Tooltip/Tooltip.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ export interface TooltipProps extends Omit<React.HTMLProps<HTMLDivElement>, 'con
9292
| 'right-start'
9393
| 'right-end'
9494
)[];
95+
/** Minimum width of the tooltip. If set to "trigger", the minimum width will be set to the reference element width. */
96+
minWidth?: string | 'trigger';
9597
/** Maximum width of the tooltip (default 18.75rem) */
9698
maxWidth?: string;
9799
/** Callback when tooltip's hide transition has finished executing */
@@ -150,6 +152,7 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
150152
exitDelay = 300,
151153
appendTo = () => document.body,
152154
zIndex = 9999,
155+
minWidth,
153156
maxWidth = tooltipMaxWidth.value,
154157
distance = 15,
155158
aria = 'describedby',
@@ -317,7 +320,7 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
317320
trigger={aria !== 'none' && visible ? addAriaToTrigger() : children}
318321
reference={reference}
319322
popper={content}
320-
minWidth="revert"
323+
minWidth={minWidth !== undefined ? minWidth : 'revert'}
321324
appendTo={appendTo}
322325
isVisible={visible}
323326
positionModifiers={positionModifiers}

packages/react-core/src/demos/ComposableMenu/examples/ComposableActionsMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,5 @@ export const ComposableActionsMenu: React.FunctionComponent = () => {
122122
</Menu>
123123
);
124124

125-
return <Popper trigger={toggle} popper={menu} isVisible={isOpen} minWidth="revert" />;
125+
return <Popper trigger={toggle} popper={menu} isVisible={isOpen} />;
126126
};

packages/react-core/src/demos/ComposableMenu/examples/ComposableApplicationLauncher.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,5 +265,5 @@ export const ComposableApplicationLauncher: React.FunctionComponent = () => {
265265
</MenuContent>
266266
</Menu>
267267
);
268-
return <Popper trigger={toggle} popper={menu} isVisible={isOpen} minWidth="revert" />;
268+
return <Popper trigger={toggle} popper={menu} isVisible={isOpen} />;
269269
};

packages/react-core/src/demos/ComposableMenu/examples/ComposableContextSelector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,5 +198,5 @@ export const ComposableContextSelector: React.FunctionComponent = () => {
198198
</MenuFooter>
199199
</Menu>
200200
);
201-
return <Popper trigger={toggle} popper={menu} isVisible={isOpen} minWidth="revert" />;
201+
return <Popper trigger={toggle} popper={menu} isVisible={isOpen} />;
202202
};

packages/react-core/src/demos/ComposableMenu/examples/ComposableDateSelect.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@ export const ComposableSimpleDropdown: React.FunctionComponent = () => {
109109
</MenuContent>
110110
</Menu>
111111
);
112-
return <Popper trigger={toggle} popper={menu} isVisible={isOpen} minWidth="revert" />;
112+
return <Popper trigger={toggle} popper={menu} isVisible={isOpen} />;
113113
};

0 commit comments

Comments
 (0)