Skip to content

Commit 6845aac

Browse files
committed
don't output UI in wrapRootElement
1 parent 98d30a4 commit 6845aac

File tree

2 files changed

+33
-25
lines changed

2 files changed

+33
-25
lines changed

e2e-tests/production-runtime/src/pages/static-query.js

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,36 @@
1-
import * as React from "react"
1+
import React, { useContext } from "react"
22

33
import Layout from "../components/layout"
44
import Seo from "../components/seo"
55
import * as StaticQuery from "../components/static-query"
66
import * as UseStaticQuery from "../components/static-query/use-static-query"
7+
import { WrapRootContext } from "../wrap-root-context"
78

8-
const StaticQueryPage = () => (
9-
<Layout>
10-
<h1>
11-
<code>StaticQuery</code>
12-
</h1>
13-
<StaticQuery.ExportedVariable data-testid="exported" />
14-
<StaticQuery.Variable data-testid="variable" />
15-
<StaticQuery.Inline data-testid="inline" />
16-
<h2>
17-
<code>useStaticQuery</code>
18-
</h2>
19-
<UseStaticQuery.Inline data-testid="use-static-query-inline" />
20-
<UseStaticQuery.Variable data-testid="use-static-query-variable" />
21-
<UseStaticQuery.ExportedVariable data-testid="use-static-query-exported" />
22-
<UseStaticQuery.Destructuring data-testid="use-static-query-destructuring" />
23-
</Layout>
24-
)
9+
const StaticQueryPage = () => {
10+
const { title } = useContext(WrapRootContext)
11+
12+
return (
13+
<Layout>
14+
<h1>
15+
<code>StaticQuery</code>
16+
</h1>
17+
<StaticQuery.ExportedVariable data-testid="exported" />
18+
<StaticQuery.Variable data-testid="variable" />
19+
<StaticQuery.Inline data-testid="inline" />
20+
<h2>
21+
<code>useStaticQuery</code>
22+
</h2>
23+
<UseStaticQuery.Inline data-testid="use-static-query-inline" />
24+
<UseStaticQuery.Variable data-testid="use-static-query-variable" />
25+
<UseStaticQuery.ExportedVariable data-testid="use-static-query-exported" />
26+
<UseStaticQuery.Destructuring data-testid="use-static-query-destructuring" />
27+
<div>
28+
StaticQuery in wrapRootElement test (should show site title):
29+
<span data-testid="wrap-root-element-result">{title}</span>
30+
</div>
31+
</Layout>
32+
)
33+
}
2534

2635
export const Head = () => <Seo />
2736

e2e-tests/production-runtime/src/wrap-root-element.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as React from "react"
22
import { StaticQuery, graphql, Script } from "gatsby"
33
import { scripts } from "../gatsby-script-scripts"
44
import { ContextForSlicesProvider } from "./context-for-slices"
5+
import { WrapRootContext } from "./wrap-root-context"
56

67
export default ({ element }) => {
78
return (
@@ -21,13 +22,11 @@ export default ({ element }) => {
2122
},
2223
}) => (
2324
<ContextForSlicesProvider>
24-
{element}
25-
<Script src={scripts.jQuery} strategy="post-hydrate" />
26-
<Script src={scripts.popper} strategy="idle" />
27-
<div>
28-
StaticQuery in wrapRootElement test (should show site title):
29-
<span data-testid="wrap-root-element-result">{title}</span>
30-
</div>
25+
<WrapRootContext.Provider value={{ title }}>
26+
{element}
27+
<Script src={scripts.jQuery} strategy="post-hydrate" />
28+
<Script src={scripts.popper} strategy="idle" />
29+
</WrapRootContext.Provider>
3130
</ContextForSlicesProvider>
3231
)}
3332
/>

0 commit comments

Comments
 (0)