Skip to content

Commit af205e2

Browse files
authored
Merge pull request #7696 from QwikDev/q-template-hidden
fix(core): q:templates should be aria-hidden
2 parents 7ca81dd + a6007c6 commit af205e2

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

packages/docs/src/routes/docs/(qwik)/components/slots/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Results in:
145145
<div>
146146
<h1>▶︎</h1>
147147
</div>
148-
<q:template q:slot hidden aria-hidden="true">
148+
<q:template hidden aria-hidden="true">
149149
I am pre-rendered on the Server and hidden until needed.
150150
</q:template>
151151
```

packages/qwik/src/core/tests/README.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ describe.each([
199199
if (render === ssrRenderToDom) {
200200
// We can only assert this is SSR, as CSR does just keeps unused nodes in memory. (No need to write them to DOM)
201201
expect(vnode_getNextSibling(vNode!)).toMatchVDOM(
202-
<q:template style="display:none">
202+
<q:template hidden aria-hidden="true">
203203
<Fragment>
204204
<span q:slot="my-slot">
205205
<b>parent-projection-value</b>

packages/qwik/src/core/tests/projection.spec.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ describe.each([
8989
);
9090
if (render === ssrRenderToDom) {
9191
expect(vnode_getNextSibling(vNode!)).toMatchVDOM(
92-
<q:template style="display:none">parent-contentrender-content</q:template>
92+
<q:template hidden aria-hidden="true">
93+
parent-contentrender-content
94+
</q:template>
9395
);
9496
}
9597
});
@@ -1589,7 +1591,7 @@ describe.each([
15891591
const { document, vNode } = await render(<Cmp>{content}</Cmp>, { debug: DEBUG });
15901592
if (render == ssrRenderToDom) {
15911593
await expect(document.querySelector('q\\:template')).toMatchDOM(
1592-
<q:template key={undefined} style="display: none">
1594+
<q:template key={undefined} hidden aria-hidden="true">
15931595
{content}
15941596
</q:template>
15951597
);
@@ -1679,7 +1681,7 @@ describe.each([
16791681
const { document } = await render(<Parent />, { debug: DEBUG });
16801682
if (render == ssrRenderToDom) {
16811683
await expect(document.querySelector('q\\:template')).toMatchDOM(
1682-
<q:template key={undefined} style="display: none">
1684+
<q:template key={undefined} hidden aria-hidden="true">
16831685
{content}
16841686
</q:template>
16851687
);
@@ -1689,7 +1691,7 @@ describe.each([
16891691
await trigger(document.body, '#slot', 'click');
16901692
if (render == ssrRenderToDom) {
16911693
await expect(document.querySelector('q\\:template')).toMatchDOM(
1692-
<q:template key={undefined} style="display: none"></q:template>
1694+
<q:template key={undefined} hidden aria-hidden="true"></q:template>
16931695
);
16941696
}
16951697
});
@@ -1737,7 +1739,7 @@ describe.each([
17371739
const { document } = await render(<Parent />, { debug: DEBUG });
17381740
if (render == ssrRenderToDom) {
17391741
await expect(document.querySelector('q\\:template')).toMatchDOM(
1740-
<q:template key={undefined} style="display: none">
1742+
<q:template key={undefined} hidden aria-hidden="true">
17411743
{content}
17421744
</q:template>
17431745
);

packages/qwik/src/server/ssr-container.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ class SSRContainer extends _SharedContainer implements ISSRContainer {
868868
if (unclaimedProjections.length) {
869869
const previousCurrentComponentNode = this.currentComponentNode;
870870
try {
871-
this.openElement(QTemplate, ['style', 'display:none'], null);
871+
this.openElement(QTemplate, ['hidden', true, 'aria-hidden', 'true'], null);
872872
let idx = 0;
873873
let ssrComponentNode: ISsrNode | null = null;
874874
let ssrComponentFrame: ISsrComponentFrame | null = null;

0 commit comments

Comments
 (0)