Skip to content

fix(Dropdown next): Add support for forward ref and updated docs. #8142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmcfaul merged 3 commits into from
Oct 12, 2022
Merged

fix(Dropdown next): Add support for forward ref and updated docs. #8142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adbe5d8
fix(Dropdown next): Add support for forward ref and updated docs.
Oct 3, 2022
0807528
hide inner ref prop
Oct 4, 2022
459a50e
hide innerRef
Oct 5, 2022
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
11 changes: 9 additions & 2 deletions packages/react-core/src/next/components/Dropdown/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ export interface DropdownProps extends MenuProps {
isScrollable?: boolean;
/** Min width of the menu. */
minWidth?: string;
/** @hide Forwarded ref */
innerRef?: React.Ref<any>;
}

export const Dropdown: React.FunctionComponent<DropdownProps> = ({
const DropdownBase: React.FunctionComponent<DropdownProps> = ({
children,
className,
onSelect,
Expand All @@ -35,13 +37,14 @@ export const Dropdown: React.FunctionComponent<DropdownProps> = ({
isPlain,
isScrollable,
minWidth,
innerRef,
...props
}: DropdownProps) => {
const localMenuRef = React.useRef<HTMLDivElement>();
const toggleRef = React.useRef<HTMLButtonElement>();
const containerRef = React.useRef<HTMLDivElement>();

const menuRef = (props.innerRef as React.RefObject<HTMLDivElement>) || localMenuRef;
const menuRef = (innerRef as React.RefObject<HTMLDivElement>) || localMenuRef;
React.useEffect(() => {
const handleMenuKeys = (event: KeyboardEvent) => {
if (!isOpen && toggleRef.current?.contains(event.target as Node)) {
Expand Down Expand Up @@ -112,4 +115,8 @@ export const Dropdown: React.FunctionComponent<DropdownProps> = ({
</div>
);
};

export const Dropdown = React.forwardRef((props: DropdownProps, ref: React.Ref<any>) => (
<DropdownBase innerRef={ref} {...props} />
));
Dropdown.displayName = 'Dropdown';
2 changes: 0 additions & 2 deletions packages/react-core/src/next/components/Dropdown/examples/DropdownBasic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Divider, MenuToggle } from '@patternfly/react-core';

export const DropdownBasic: React.FunctionComponent = () => {
const [isOpen, setIsOpen] = React.useState(false);
const menuRef = React.useRef<HTMLDivElement>(null);

const onToggleClick = () => {
setIsOpen(!isOpen);
Expand All @@ -18,7 +17,6 @@ export const DropdownBasic: React.FunctionComponent = () => {

return (
<Dropdown
innerRef={menuRef}
isOpen={isOpen}
onSelect={onSelect}
onOpenChange={isOpen => setIsOpen(isOpen)}
Expand Down
2 changes: 0 additions & 2 deletions packages/react-core/src/next/components/Dropdown/examples/DropdownWithDescriptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { MenuToggle } from '@patternfly/react-core';

export const DropdownWithDescriptions: React.FunctionComponent = () => {
const [isOpen, setIsOpen] = React.useState(false);
const menuRef = React.useRef<HTMLDivElement>(null);

const onToggleClick = () => {
setIsOpen(!isOpen);
Expand All @@ -18,7 +17,6 @@ export const DropdownWithDescriptions: React.FunctionComponent = () => {

return (
<Dropdown
innerRef={menuRef}
isOpen={isOpen}
onSelect={onSelect}
minWidth="150px"
Expand Down
2 changes: 0 additions & 2 deletions packages/react-core/src/next/components/Dropdown/examples/DropdownWithGroups.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { MenuToggle, Divider } from '@patternfly/react-core';

export const DropdownWithGroups: React.FunctionComponent = () => {
const [isOpen, setIsOpen] = React.useState(false);
const menuRef = React.useRef<HTMLDivElement>(null);

const onToggleClick = () => {
setIsOpen(!isOpen);
Expand All @@ -18,7 +17,6 @@ export const DropdownWithGroups: React.FunctionComponent = () => {

return (
<Dropdown
innerRef={menuRef}
isOpen={isOpen}
onSelect={onSelect}
onOpenChange={isOpen => setIsOpen(isOpen)}
Expand Down
2 changes: 0 additions & 2 deletions packages/react-core/src/next/components/Dropdown/examples/DropdownWithKebabToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-ico

export const DropdownWithKebab: React.FunctionComponent = () => {
const [isOpen, setIsOpen] = React.useState(false);
const menuRef = React.useRef<HTMLDivElement>(null);

const onToggleClick = () => {
setIsOpen(!isOpen);
Expand All @@ -19,7 +18,6 @@ export const DropdownWithKebab: React.FunctionComponent = () => {

return (
<Dropdown
innerRef={menuRef}
isOpen={isOpen}
onSelect={onSelect}
minWidth="150px"
Expand Down