Skip to content

Commit e1886fc

Browse files
committed
Set cards tabindex=-1 when selectOnly is enabled
1 parent 3ce8d13 commit e1886fc

File tree

4 files changed

+60
-44
lines changed

4 files changed

+60
-44
lines changed

packages/uui-card-block-type/lib/uui-card-block-type.element.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,12 @@ export class UUICardBlockTypeElement extends UUICardElement {
5656
}
5757

5858
#renderButton() {
59+
const tabIndex = !this.disabled ? (this.selectOnly ? -1 : 0) : undefined;
5960
return html`
6061
<button
6162
id="open-part"
6263
class="uui-text"
63-
tabindex=${this.disabled ? (nothing as any) : '0'}
64+
tabindex=${ifDefined(tabIndex)}
6465
@click=${this.handleOpenClick}
6566
@keydown=${this.handleOpenKeydown}>
6667
${this.#renderContent()}
@@ -69,11 +70,12 @@ export class UUICardBlockTypeElement extends UUICardElement {
6970
}
7071

7172
#renderLink() {
73+
const tabIndex = !this.disabled ? (this.selectOnly ? -1 : 0) : undefined;
7274
return html`
7375
<a
7476
id="open-part"
7577
class="uui-text"
76-
tabindex=${this.disabled ? (nothing as any) : '0'}
78+
tabindex=${ifDefined(tabIndex)}
7779
href=${ifDefined(!this.disabled ? this.href : undefined)}
7880
target=${ifDefined(this.target || undefined)}
7981
rel=${ifDefined(

packages/uui-card-content-node/lib/uui-card-content-node.element.ts

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -86,29 +86,35 @@ export class UUICardContentNodeElement extends UUICardElement {
8686
}
8787

8888
#renderButton() {
89-
return html`<button
90-
id="open-part"
91-
tabindex=${this.disabled ? (nothing as any) : 0}
92-
@click=${this.handleOpenClick}
93-
@keydown=${this.handleOpenKeydown}>
94-
${this.#renderContent()}
95-
</button>`;
89+
const tabIndex = !this.disabled ? (this.selectOnly ? -1 : 0) : undefined;
90+
return html`
91+
<button
92+
id="open-part"
93+
tabindex=${ifDefined(tabIndex)}
94+
@click=${this.handleOpenClick}
95+
@keydown=${this.handleOpenKeydown}>
96+
${this.#renderContent()}
97+
</button>
98+
`;
9699
}
97100

98101
#renderLink() {
99-
return html`<a
100-
id="open-part"
101-
tabindex=${this.disabled ? (nothing as any) : 0}
102-
href=${ifDefined(!this.disabled ? this.href : undefined)}
103-
target=${ifDefined(this.target || undefined)}
104-
rel=${ifDefined(
105-
this.rel ||
106-
ifDefined(
107-
this.target === '_blank' ? 'noopener noreferrer' : undefined,
108-
),
109-
)}>
110-
${this.#renderContent()}
111-
</a>`;
102+
const tabIndex = !this.disabled ? (this.selectOnly ? -1 : 0) : undefined;
103+
return html`
104+
<a
105+
id="open-part"
106+
tabindex=${ifDefined(tabIndex)}
107+
href=${ifDefined(!this.disabled ? this.href : undefined)}
108+
target=${ifDefined(this.target || undefined)}
109+
rel=${ifDefined(
110+
this.rel ||
111+
ifDefined(
112+
this.target === '_blank' ? 'noopener noreferrer' : undefined,
113+
),
114+
)}>
115+
${this.#renderContent()}
116+
</a>
117+
`;
112118
}
113119

114120
public render() {

packages/uui-card-media/lib/uui-card-media.element.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,11 @@ export class UUICardMediaElement extends UUICardElement {
7171
}
7272

7373
#renderButton() {
74+
const tabIndex = !this.disabled ? (this.selectOnly ? -1 : 0) : undefined;
7475
return html`
7576
<button
7677
id="open-part"
77-
tabindex=${this.disabled ? (nothing as any) : '0'}
78+
tabindex=${ifDefined(tabIndex)}
7879
@click=${this.handleOpenClick}
7980
@keydown=${this.handleOpenKeydown}>
8081
${this.#renderContent()}
@@ -83,10 +84,11 @@ export class UUICardMediaElement extends UUICardElement {
8384
}
8485

8586
#renderLink() {
87+
const tabIndex = !this.disabled ? (this.selectOnly ? -1 : 0) : undefined;
8688
return html`
8789
<a
8890
id="open-part"
89-
tabindex=${this.disabled ? (nothing as any) : '0'}
91+
tabindex=${ifDefined(tabIndex)}
9092
href=${ifDefined(!this.disabled ? this.href : undefined)}
9193
target=${ifDefined(this.target || undefined)}
9294
rel=${ifDefined(

packages/uui-card-user/lib/uui-card-user.element.ts

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,35 @@ export class UUICardUserElement extends UUICardElement {
4040
}
4141

4242
#renderButton() {
43-
return html`<div
44-
id="open-part"
45-
tabindex=${this.disabled ? (nothing as any) : '0'}
46-
@click=${this.handleOpenClick}
47-
@keydown=${this.handleOpenKeydown}>
48-
${this.#renderContent()}
49-
</div>`;
43+
const tabIndex = !this.disabled ? (this.selectOnly ? -1 : 0) : undefined;
44+
return html`
45+
<div
46+
id="open-part"
47+
tabindex=${ifDefined(tabIndex)}
48+
@click=${this.handleOpenClick}
49+
@keydown=${this.handleOpenKeydown}>
50+
${this.#renderContent()}
51+
</div>
52+
`;
5053
}
5154

5255
#renderLink() {
53-
return html`<a
54-
id="open-part"
55-
tabindex=${this.disabled ? (nothing as any) : '0'}
56-
href=${ifDefined(!this.disabled ? this.href : undefined)}
57-
target=${ifDefined(this.target || undefined)}
58-
rel=${ifDefined(
59-
this.rel ||
60-
ifDefined(
61-
this.target === '_blank' ? 'noopener noreferrer' : undefined,
62-
),
63-
)}>
64-
${this.#renderContent()}
65-
</a>`;
56+
const tabIndex = !this.disabled ? (this.selectOnly ? -1 : 0) : undefined;
57+
return html`
58+
<a
59+
id="open-part"
60+
tabindex=${ifDefined(tabIndex)}
61+
href=${ifDefined(!this.disabled ? this.href : undefined)}
62+
target=${ifDefined(this.target || undefined)}
63+
rel=${ifDefined(
64+
this.rel ||
65+
ifDefined(
66+
this.target === '_blank' ? 'noopener noreferrer' : undefined,
67+
),
68+
)}>
69+
${this.#renderContent()}
70+
</a>
71+
`;
6672
}
6773

6874
#renderContent() {

0 commit comments

Comments
 (0)