[MM-61597]: Provide proper name, role, and state information in Channel menu's submenu (#29658)
* [MA-25]: Provide proper name, role, and state information in move to option * [MA-25]: Concatenate Id --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e923879c52
Коммит
326804ba44
@@ -62,6 +62,7 @@ exports[`components/widgets/menu/menu_items/submenu_item empty subMenu should ma
|
|||||||
onKeyDown={[Function]}
|
onKeyDown={[Function]}
|
||||||
onMouseEnter={[Function]}
|
onMouseEnter={[Function]}
|
||||||
onMouseLeave={[Function]}
|
onMouseLeave={[Function]}
|
||||||
|
role="button"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
@@ -79,6 +80,7 @@ exports[`components/widgets/menu/menu_items/submenu_item empty subMenu should ma
|
|||||||
</div>
|
</div>
|
||||||
<ul
|
<ul
|
||||||
className="a11y__popup Menu dropdown-menu SubMenu"
|
className="a11y__popup Menu dropdown-menu SubMenu"
|
||||||
|
id="1_submenu"
|
||||||
style={
|
style={
|
||||||
Object {
|
Object {
|
||||||
"right": "100%",
|
"right": "100%",
|
||||||
@@ -156,6 +158,9 @@ exports[`components/widgets/menu/menu_items/submenu_item present subMenu should
|
|||||||
text="test"
|
text="test"
|
||||||
>
|
>
|
||||||
<li
|
<li
|
||||||
|
aria-controls="1_submenu"
|
||||||
|
aria-expanded={false}
|
||||||
|
aria-haspopup="menu"
|
||||||
className="SubMenuItem MenuItem"
|
className="SubMenuItem MenuItem"
|
||||||
id="1_menuitem"
|
id="1_menuitem"
|
||||||
onClick={[Function]}
|
onClick={[Function]}
|
||||||
@@ -167,6 +172,7 @@ exports[`components/widgets/menu/menu_items/submenu_item present subMenu should
|
|||||||
onKeyDown={[Function]}
|
onKeyDown={[Function]}
|
||||||
onMouseEnter={[Function]}
|
onMouseEnter={[Function]}
|
||||||
onMouseLeave={[Function]}
|
onMouseLeave={[Function]}
|
||||||
|
role="button"
|
||||||
tabIndex={0}
|
tabIndex={0}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
@@ -184,6 +190,7 @@ exports[`components/widgets/menu/menu_items/submenu_item present subMenu should
|
|||||||
</div>
|
</div>
|
||||||
<ul
|
<ul
|
||||||
className="a11y__popup Menu dropdown-menu SubMenu"
|
className="a11y__popup Menu dropdown-menu SubMenu"
|
||||||
|
id="1_submenu"
|
||||||
style={
|
style={
|
||||||
Object {
|
Object {
|
||||||
"right": "100%",
|
"right": "100%",
|
||||||
@@ -257,6 +264,7 @@ exports[`components/widgets/menu/menu_items/submenu_item present subMenu should
|
|||||||
onKeyDown={[Function]}
|
onKeyDown={[Function]}
|
||||||
onMouseEnter={[Function]}
|
onMouseEnter={[Function]}
|
||||||
onMouseLeave={[Function]}
|
onMouseLeave={[Function]}
|
||||||
|
role="button"
|
||||||
tabIndex={1}
|
tabIndex={1}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
@@ -274,6 +282,7 @@ exports[`components/widgets/menu/menu_items/submenu_item present subMenu should
|
|||||||
</div>
|
</div>
|
||||||
<ul
|
<ul
|
||||||
className="a11y__popup Menu dropdown-menu SubMenu"
|
className="a11y__popup Menu dropdown-menu SubMenu"
|
||||||
|
id="A_submenu"
|
||||||
style={
|
style={
|
||||||
Object {
|
Object {
|
||||||
"right": "100%",
|
"right": "100%",
|
||||||
@@ -351,6 +360,7 @@ exports[`components/widgets/menu/menu_items/submenu_item present subMenu should
|
|||||||
onKeyDown={[Function]}
|
onKeyDown={[Function]}
|
||||||
onMouseEnter={[Function]}
|
onMouseEnter={[Function]}
|
||||||
onMouseLeave={[Function]}
|
onMouseLeave={[Function]}
|
||||||
|
role="button"
|
||||||
tabIndex={1}
|
tabIndex={1}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
@@ -368,6 +378,7 @@ exports[`components/widgets/menu/menu_items/submenu_item present subMenu should
|
|||||||
</div>
|
</div>
|
||||||
<ul
|
<ul
|
||||||
className="a11y__popup Menu dropdown-menu SubMenu"
|
className="a11y__popup Menu dropdown-menu SubMenu"
|
||||||
|
id="B_submenu"
|
||||||
style={
|
style={
|
||||||
Object {
|
Object {
|
||||||
"right": "100%",
|
"right": "100%",
|
||||||
|
|||||||
@@ -187,6 +187,7 @@ export class SubMenuItem extends React.PureComponent<Props, State> {
|
|||||||
<ul
|
<ul
|
||||||
className={classNames(['a11y__popup Menu dropdown-menu SubMenu', {styleSelectableItem}])}
|
className={classNames(['a11y__popup Menu dropdown-menu SubMenu', {styleSelectableItem}])}
|
||||||
style={subMenuStyle}
|
style={subMenuStyle}
|
||||||
|
id={`${id}_submenu`}
|
||||||
>
|
>
|
||||||
{hasSubmenu ? subMenu!.map((s) => {
|
{hasSubmenu ? subMenu!.map((s) => {
|
||||||
const hasDivider = s.id === 'ChannelMenu-moveToDivider';
|
const hasDivider = s.id === 'ChannelMenu-moveToDivider';
|
||||||
@@ -233,12 +234,14 @@ export class SubMenuItem extends React.PureComponent<Props, State> {
|
|||||||
id={id + '_menuitem'}
|
id={id + '_menuitem'}
|
||||||
ref={this.node}
|
ref={this.node}
|
||||||
onClick={this.onClick}
|
onClick={this.onClick}
|
||||||
|
{...(Boolean(hasSubmenu) && {'aria-haspopup': 'menu', 'aria-controls': id + '_submenu', 'aria-expanded': this.state.show})}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className={classNames([{styleSelectableItemDiv: styleSelectableItem}])}
|
className={classNames([{styleSelectableItemDiv: styleSelectableItem}])}
|
||||||
id={id}
|
id={id}
|
||||||
aria-label={ariaLabel}
|
aria-label={ariaLabel}
|
||||||
onMouseEnter={this.show}
|
onMouseEnter={this.show}
|
||||||
|
role='button'
|
||||||
onMouseLeave={this.hide}
|
onMouseLeave={this.hide}
|
||||||
tabIndex={tabIndex ?? 0}
|
tabIndex={tabIndex ?? 0}
|
||||||
onKeyDown={this.handleKeyDown}
|
onKeyDown={this.handleKeyDown}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user