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
Expand Up @@ -3,7 +3,7 @@
exports[`ApplicationLauncherSeparator should match snapshot 1`] = `
<DocumentFragment>
<li
role="separator"
role="none"
>
<div
class="pf-c-divider"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,94 +42,100 @@ exports[`ApplicationLauncher custom icon 1`] = `
role="menu"
>
<li
role="menuitem"
role="none"
>
<a
aria-disabled="false"
class="pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-7"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
>
Link
</a>
</li>
<li
role="menuitem"
role="none"
>
<button
aria-disabled="false"
class="pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-8"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
type="button"
>
Action
</button>
</li>
<li
role="menuitem"
role="none"
>
<a
aria-disabled="true"
class="pf-m-disabled pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-9"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
>
Disabled Link
</a>
</li>
<li
role="menuitem"
role="none"
>
<button
aria-disabled="true"
class="pf-m-disabled pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-10"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
type="button"
>
Disabled Action
</button>
</li>
<li
role="separator"
role="none"
>
<div
class="pf-c-divider"
role="separator"
/>
</li>
<li
role="menuitem"
role="none"
>
<a
aria-disabled="false"
class="pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-11"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
>
Separated Link
</a>
</li>
<li
role="menuitem"
role="none"
>
<button
aria-disabled="false"
class="pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-12"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
type="button"
>
Expand Down Expand Up @@ -260,94 +266,100 @@ exports[`ApplicationLauncher expanded 1`] = `
role="menu"
>
<li
role="menuitem"
role="none"
>
<a
aria-disabled="false"
class="pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-1"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
>
Link
</a>
</li>
<li
role="menuitem"
role="none"
>
<button
aria-disabled="false"
class="pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-2"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
type="button"
>
Action
</button>
</li>
<li
role="menuitem"
role="none"
>
<a
aria-disabled="true"
class="pf-m-disabled pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-3"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
>
Disabled Link
</a>
</li>
<li
role="menuitem"
role="none"
>
<button
aria-disabled="true"
class="pf-m-disabled pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-4"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
type="button"
>
Disabled Action
</button>
</li>
<li
role="separator"
role="none"
>
<div
class="pf-c-divider"
role="separator"
/>
</li>
<li
role="menuitem"
role="none"
>
<a
aria-disabled="false"
class="pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-5"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
>
Separated Link
</a>
</li>
<li
role="menuitem"
role="none"
>
<button
aria-disabled="false"
class="pf-c-app-launcher__menu-item"
data-ouia-component-id="OUIA-Generated-DropdownItem-6"
data-ouia-component-type="PF4/DropdownItem"
data-ouia-safe="true"
role="menuitem"
tabindex="-1"
type="button"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ export class InternalDropdownItem extends React.Component<InternalDropdownItemPr
...(styleChildren && {
className: css(element.props.className, classes)
}),
...(this.props.role !== 'separator' && { ref: this.componentRef })
...(this.props.role !== 'separator' && { role, ref: this.componentRef })
});

const renderDefaultComponent = (tag: string) => {
Expand Down Expand Up @@ -240,6 +240,7 @@ export class InternalDropdownItem extends React.Component<InternalDropdownItemPr
ref={this.ref}
className={classes}
id={componentID}
role={role}
>
{componentContent}
</Component>
Expand Down Expand Up @@ -268,7 +269,7 @@ export class InternalDropdownItem extends React.Component<InternalDropdownItemPr
return (
<li
className={listItemClassName || null}
role={role}
role="none"
onKeyDown={this.onKeyDown}
onClick={(event: any) => {
if (!isDisabled && !isAriaDisabled) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`DropdownSeparator should match snapshot 1`] = `
<DocumentFragment>
<li
role="separator"
role="none"
>
<div
class="pf-c-divider ''"
Expand Down
Loading