Skip to content

Commit

Permalink
fix: improve placeholder rendering and error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
@DylanPiercey
DylanPiercey committed Jan 12, 2023
1 parent 7a3f734 commit c686e0a
Show file tree
Hide file tree
Showing 22 changed files with 203 additions and 181 deletions.
14 changes: 8 additions & 6 deletions .../gql-mutation/__tests__/__snapshots__/mutation-with-query/renders.expected/loading.0.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<span
id="GENERATED-0"
>
<span>
Loading Messages
<div>
<span
id="GENERATED-0"
>
<span>
Loading Messages
</span>
</span>
</span>
</div>
28 changes: 14 additions & 14 deletions .../gql-mutation/__tests__/__snapshots__/mutation-with-query/renders.expected/loading.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<span
id="GENERATED-0"
>
<span>
Loading Messages
<div>
<span
id="GENERATED-0"
>
<span>
Loading Messages
</span>
</span>
</span>
</div>
<div
id="GENERATED-1"
style="display:none"
>
<div>
<h1>
Messages
</h1>
<button>
Add
</button>
</div>
<h1>
Messages
</h1>
<button>
Add
</button>
</div>
9 changes: 3 additions & 6 deletions src/components/gql-mutation/index.marko
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,14 @@ class {
this.state = { results: {}, fetching: false };
}
}
$ const { renderBody, mutation, requestPolicy } = input;

<${input.renderBody}(
<${renderBody}(
(variables, options) => {
const { client } = window.$$GQL || (window.$$GQL = createClient({}));
state.fetching = true;
return client
.mutation(input.mutation, variables, {
...input.context,
requestPolicy: input.requestPolicy,
...options,
})
.mutation(mutation, variables, { requestPolicy, ...options })
.toPromise()
.then((results) => {
state.results = results;
Expand Down
14 changes: 8 additions & 6 deletions .../gql-query/__tests__/__snapshots__/isomorphic-placeholder/renders.expected/loading.0.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<span
id="GENERATED-0"
>
<span>
Loading...
<div>
<span
id="GENERATED-0"
>
<span>
Loading...
</span>
</span>
</span>
</div>
22 changes: 11 additions & 11 deletions .../gql-query/__tests__/__snapshots__/isomorphic-placeholder/renders.expected/loading.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<span
id="GENERATED-0"
>
<span>
Loading...
<div>
<span
id="GENERATED-0"
>
<span>
Loading...
</span>
</span>
</span>
</div>
<div
id="GENERATED-1"
style="display:none"
>
<div>
<span>
Hello world!
</span>
</div>
<span>
Hello world!
</span>
</div>
8 changes: 5 additions & 3 deletions ...ts/gql-query/__tests__/__snapshots__/isomorphic-variables/renders.expected/loading.0.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
16 changes: 8 additions & 8 deletions ...ts/gql-query/__tests__/__snapshots__/isomorphic-variables/renders.expected/loading.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
<div
id="GENERATED-1"
style="display:none"
>
<div>
<span>
Hello John!
</span>
</div>
<span>
Hello John!
</span>
</div>
8 changes: 5 additions & 3 deletions src/components/gql-query/__tests__/__snapshots__/isomorphic/renders.expected/loading.0.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
16 changes: 8 additions & 8 deletions src/components/gql-query/__tests__/__snapshots__/isomorphic/renders.expected/loading.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
<div
id="GENERATED-1"
style="display:none"
>
<div>
<span>
Hello world!
</span>
</div>
<span>
Hello world!
</span>
</div>
8 changes: 5 additions & 3 deletions ...mponents/gql-query/__tests__/__snapshots__/request-policy/renders.expected/loading.0.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
22 changes: 11 additions & 11 deletions ...mponents/gql-query/__tests__/__snapshots__/request-policy/renders.expected/loading.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
<div
id="GENERATED-1"
style="display:none"
>
<div>
<span>
Hello John!
</span>
<button>
Toggle
</button>
</div>
<span>
Hello John!
</span>
<button>
Toggle
</button>
</div>
14 changes: 8 additions & 6 deletions ...gql-query/__tests__/__snapshots__/server-only-placeholder/renders.expected/loading.0.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<span
id="GENERATED-0"
>
<span>
Loading...
<div>
<span
id="GENERATED-0"
>
<span>
Loading...
</span>
</span>
</span>
</div>
22 changes: 11 additions & 11 deletions ...gql-query/__tests__/__snapshots__/server-only-placeholder/renders.expected/loading.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<span
id="GENERATED-0"
>
<span>
Loading...
<div>
<span
id="GENERATED-0"
>
<span>
Loading...
</span>
</span>
</span>
</div>
<div
id="GENERATED-1"
style="display:none"
>
<div>
<span>
Hello world!
</span>
</div>
<span>
Hello world!
</span>
</div>
8 changes: 5 additions & 3 deletions ...s/gql-query/__tests__/__snapshots__/server-only-variables/renders.expected/loading.0.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
16 changes: 8 additions & 8 deletions ...s/gql-query/__tests__/__snapshots__/server-only-variables/renders.expected/loading.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
<div
id="GENERATED-1"
style="display:none"
>
<div>
<span>
Hello John!
</span>
</div>
<span>
Hello John!
</span>
</div>
8 changes: 5 additions & 3 deletions src/components/gql-query/__tests__/__snapshots__/server-only/renders.expected/loading.0.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
16 changes: 8 additions & 8 deletions src/components/gql-query/__tests__/__snapshots__/server-only/renders.expected/loading.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
<div
id="GENERATED-1"
style="display:none"
>
<div>
<span>
Hello world!
</span>
</div>
<span>
Hello world!
</span>
</div>
8 changes: 5 additions & 3 deletions ...onents/gql-query/__tests__/__snapshots__/update-variables/renders.expected/loading.0.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
22 changes: 11 additions & 11 deletions ...onents/gql-query/__tests__/__snapshots__/update-variables/renders.expected/loading.1.html
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<noscript
id="GENERATED-0"
/>
<div>
<noscript
id="GENERATED-0"
/>
</div>
<div
id="GENERATED-1"
style="display:none"
>
<div>
<span>
Hello John!
</span>
<button>
Toggle
</button>
</div>
<span>
Hello John!
</span>
<button>
Toggle
</button>
</div>
Loading

0 comments on commit c686e0a

Please sign in to comment.