Skip to content
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

PanelMenu MenuItem Id Prop Not Passed #6607

Merged
merged 1 commit into from
May 10, 2024
Merged

PanelMenu MenuItem Id Prop Not Passed #6607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions components/lib/panelmenu/PanelMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,16 @@ export const PanelMenu = React.memo(
return ObjectUtils.equals(item, activeItemState);
};

const getPanelId = (index) => {
const generatePanelId = (index) => {
return `${idState}_${index}`;
};

const getHeaderId = (index) => {
return `${getPanelId(index)}_header`;
const generateHeaderId = (itemId, index) => {
return `${itemId || generatePanelId(index)}_header`;
};

const getContentId = (index) => {
return `${getPanelId(index)}_content`;
const generateContentId = (itemId, index) => {
return `${itemId || generatePanelId(index)}_content`;
};

const onHeaderKeyDown = (event, item) => {
Expand Down Expand Up @@ -299,8 +299,8 @@ export const PanelMenu = React.memo(
const headerActionProps = mergeProps(
{
href: item.url || '#',
className: cx('headerAction'),
tabIndex: '-1'
tabIndex: '-1',
className: cx('headerAction')
},
getPTOptions(item, 'headerAction', index)
);
Expand Down Expand Up @@ -332,6 +332,7 @@ export const PanelMenu = React.memo(
const panelProps = mergeProps(
{
key: key,
id: item?.id || generatePanelId(index),
className: cx('panel', { item }),
style: item.style
},
Expand All @@ -340,12 +341,12 @@ export const PanelMenu = React.memo(

const headerProps = mergeProps(
{
id: getHeaderId(index),
id: generateHeaderId(item?.id, index),
className: cx('header', { active, item }),
'aria-label': item.label,
'aria-expanded': active,
'aria-disabled': item.disabled,
'aria-controls': getContentId(index),
'aria-controls': generateContentId(item?.id, index),
tabIndex: item.disabled ? null : '0',
onClick: (event) => onItemClick(event, item),
onKeyDown: (event) => onHeaderKeyDown(event, item),
Expand Down Expand Up @@ -375,7 +376,7 @@ export const PanelMenu = React.memo(
{
className: cx('toggleableContent', { active }),
role: 'region',
'aria-labelledby': getHeaderId(index)
'aria-labelledby': generateHeaderId(item?.id, index)
},
getPTOptions(item, 'toggleableContent', index)
);
Expand All @@ -398,10 +399,10 @@ export const PanelMenu = React.memo(
<div {...headerContentProps}>{content}</div>
</div>
<CSSTransition nodeRef={menuContentRef} {...transitionProps}>
<div id={getContentId(index)} ref={menuContentRef} {...toggleableContentProps}>
<div id={generateContentId(item?.id, index)} ref={menuContentRef} {...toggleableContentProps}>
<div {...menuContentProps}>
<PanelMenuList
panelId={getPanelId(index)}
panelId={item?.id || generatePanelId(index)}
menuProps={props}
onToggle={changeExpandedKeys}
onHeaderFocus={updateFocusedHeader}
Expand Down
Loading