Skip to content

Commit 450b8ca

Browse files
author
Eric Olkowski
committed
Updated per feedback
1 parent 302f703 commit 450b8ca

File tree

4 files changed

+13
-22
lines changed

4 files changed

+13
-22
lines changed

packages/react-core/src/components/Breadcrumb/examples/BreadcrumbDropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export const BreadcrumbDropdown: React.FunctionComponent = () => {
4646
toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
4747
<MenuToggle ref={toggleRef} onClick={onToggle} isExpanded={isOpen} variant="plain">
4848
<Badge isRead screenReaderText="additional items">
49-
{dropdownItems.length}
49+
{dropdownItems.length}{' '}
5050
<span>
5151
<CaretDownIcon />
5252
</span>

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ const DropdownBase: React.FunctionComponent<DropdownProps> = ({
5252
}: DropdownProps) => {
5353
const localMenuRef = React.useRef<HTMLDivElement>();
5454
const toggleRef = React.useRef<HTMLButtonElement>();
55-
const containerRef = React.useRef<HTMLDivElement>();
5655
const ouiaProps = useOUIAProps(Dropdown.displayName, ouiaId, ouiaSafe);
5756

5857
const menuRef = (innerRef as React.RefObject<HTMLDivElement>) || localMenuRef;
@@ -106,23 +105,21 @@ const DropdownBase: React.FunctionComponent<DropdownProps> = ({
106105
isPlain={isPlain}
107106
isScrollable={isScrollable}
108107
{...props}
108+
{...ouiaProps}
109109
>
110110
<MenuContent>{children}</MenuContent>
111111
</Menu>
112112
);
113113
return (
114-
<div ref={containerRef} {...ouiaProps}>
115-
<Popper
116-
trigger={toggle(toggleRef)}
117-
triggerRef={toggleRef}
118-
popper={menu}
119-
popperRef={menuRef}
120-
appendTo={containerRef.current || undefined}
121-
isVisible={isOpen}
122-
zIndex={zIndex}
123-
{...popperProps}
124-
/>
125-
</div>
114+
<Popper
115+
trigger={toggle(toggleRef)}
116+
triggerRef={toggleRef}
117+
popper={menu}
118+
popperRef={menuRef}
119+
isVisible={isOpen}
120+
zIndex={zIndex}
121+
{...popperProps}
122+
/>
126123
);
127124
};
128125

packages/react-core/src/components/Menu/examples/MenuWithDrilldownBreadcrumbs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export const MenuWithDrilldownBreadcrumbs: React.FunctionComponent = () => {
118118
toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
119119
<MenuToggle ref={toggleRef} onClick={() => onToggle(true, 'app')} isExpanded={isOpen} variant="plain">
120120
<Badge isRead screenReaderText="additional item">
121-
1
121+
1{' '}
122122
<span>
123123
<CaretDownIcon />
124124
</span>

packages/react-core/src/demos/examples/DateTimePicker/DateTimePicker.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,7 @@ export const DateTimePicker: React.FunctionComponent = () => {
5959
isOpen={isTimeOpen}
6060
onOpenChange={(isOpen: boolean) => setIsTimeOpen(isOpen)}
6161
toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
62-
<MenuToggle
63-
ref={toggleRef}
64-
onClick={onToggleTime}
65-
isExpanded={isTimeOpen}
66-
variant="plain"
67-
aria-label="Time picker"
68-
>
62+
<MenuToggle ref={toggleRef} onClick={onToggleTime} isExpanded={isTimeOpen} aria-label="Time picker">
6963
<OutlinedClockIcon aria-hidden="true" />
7064
</MenuToggle>
7165
)}

0 commit comments

Comments
 (0)