Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions e2e/react-start/basic-auth/src/components/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ export function Login() {
})
}}
afterSubmit={
loginMutation.data ? (
loginMutation.stateData ? (
<>
<div className="text-red-400">{loginMutation.data.message}</div>
{loginMutation.data.userNotFound ? (
<div className="text-red-400">{loginMutation.stateData.message}</div>
{loginMutation.stateData.userNotFound ? (
<div>
<button
className="text-blue-500"
Expand Down
8 changes: 4 additions & 4 deletions e2e/react-start/basic-auth/src/hooks/useMutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
onSuccess?: (ctx: { data: TData }) => void | Promise<void>
}) {
const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
const [variables, setVariables] = React.useState<TVariables | undefined>()
const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
const [error, setError] = React.useState<TError | undefined>()
const [data, setData] = React.useState<TData | undefined>()
const [stateData, setData] = React.useState<TData | undefined>()
const [status, setStatus] = React.useState<
'idle' | 'pending' | 'success' | 'error'
>('idle')
Expand Down Expand Up @@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {

return {
status,
variables,
stateVariables,
submittedAt,
mutate,
error,
data,
stateData,
}
}
4 changes: 2 additions & 2 deletions e2e/react-start/basic-auth/src/routes/signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ function SignupComp() {
})
}}
afterSubmit={
signupMutation.data?.error ? (
signupMutation.stateData?.error ? (
<>
<div className="text-red-400">{signupMutation.data.message}</div>
<div className="text-red-400">{signupMutation.stateData?.message ?? 'an error occurred'}</div>
</>
) : null
}
Expand Down
6 changes: 3 additions & 3 deletions e2e/solid-start/basic-auth/src/components/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ export function Login() {
})
}}
afterSubmit={
loginMutation.data() ? (
loginMutation.signalData() ? (
<>
<div class="text-red-400">{loginMutation.data()?.message}</div>
{loginMutation.data()?.userNotFound ? (
<div class="text-red-400">{loginMutation.signalData()?.message}</div>
{loginMutation.signalData()?.userNotFound ? (
<div>
<button
class="text-blue-500"
Expand Down
8 changes: 4 additions & 4 deletions e2e/solid-start/basic-auth/src/hooks/useMutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
onSuccess?: (ctx: { data: TData }) => void | Promise<void>
}) {
const [submittedAt, setSubmittedAt] = Solid.createSignal<number | undefined>()
const [variables, setVariables] = Solid.createSignal<TVariables | undefined>()
const [signalVariables, setVariables] = Solid.createSignal<TVariables | undefined>()
const [error, setError] = Solid.createSignal<TError | undefined>()
const [data, setData] = Solid.createSignal<TData | undefined>()
const [signalData, setData] = Solid.createSignal<TData | undefined>()
const [status, setStatus] = Solid.createSignal<
'idle' | 'pending' | 'success' | 'error'
>('idle')
Expand All @@ -32,10 +32,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {

return {
status,
variables,
signalVariables,
submittedAt,
mutate,
error,
data,
signalData,
}
}
4 changes: 2 additions & 2 deletions e2e/solid-start/basic-auth/src/routes/signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ function SignupComp() {
})
}}
afterSubmit={
signupMutation.data()?.error ? (
signupMutation.signalData()?.error ? (
<>
<div class="text-red-400">{signupMutation.data()?.message}</div>
<div class="text-red-400">{signupMutation.signalData()?.message}</div>
</>
) : null
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
onSuccess?: (ctx: { data: TData }) => void | Promise<void>
}) {
const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
const [variables, setVariables] = React.useState<TVariables | undefined>()
const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
const [error, setError] = React.useState<TError | undefined>()
const [data, setData] = React.useState<TData | undefined>()
const [stateData, setData] = React.useState<TData | undefined>()
const [status, setStatus] = React.useState<
'idle' | 'pending' | 'success' | 'error'
>('idle')
Expand Down Expand Up @@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {

return {
status,
variables,
stateVariables,
submittedAt,
mutate,
error,
data,
stateData,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function InvoiceComponent() {
Save
</button>
</div>
{updateInvoiceMutation.variables?.id === invoice.id ? (
{updateInvoiceMutation.stateVariables?.id === invoice.id ? (
<div key={updateInvoiceMutation.submittedAt}>
{updateInvoiceMutation.status === 'success' ? (
<div className="inline-block px-2 py-1 rounded-sm bg-green-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
Expand Down
2 changes: 1 addition & 1 deletion examples/react/kitchen-sink/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ function InvoiceComponent() {
Save
</button>
</div>
{updateInvoiceMutation.variables?.id === invoice.id ? (
{updateInvoiceMutation.stateVariables?.id === invoice.id ? (
<div key={updateInvoiceMutation.submittedAt}>
{updateInvoiceMutation.status === 'success' ? (
<div className="inline-block px-2 py-1 rounded-sm bg-green-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
Expand Down
8 changes: 4 additions & 4 deletions examples/react/kitchen-sink/src/useMutation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
onSuccess?: (ctx: { data: TData }) => void | Promise<void>
}) {
const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
const [variables, setVariables] = React.useState<TVariables | undefined>()
const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
const [error, setError] = React.useState<TError | undefined>()
const [data, setData] = React.useState<TData | undefined>()
const [stateData, setData] = React.useState<TData | undefined>()
const [status, setStatus] = React.useState<
'idle' | 'pending' | 'success' | 'error'
>('idle')
Expand Down Expand Up @@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {

return {
status,
variables,
stateVariables,
submittedAt,
mutate,
error,
data,
stateData,
}
}
6 changes: 3 additions & 3 deletions examples/react/start-basic-auth/src/components/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ export function Login() {
})
}}
afterSubmit={
loginMutation.data ? (
loginMutation.stateData ? (
<>
<div className="text-red-400">{loginMutation.data.message}</div>
{loginMutation.data.userNotFound ? (
<div className="text-red-400">{loginMutation.stateData.message}</div>
{loginMutation.stateData.userNotFound ? (
<div>
<button
className="text-blue-500"
Expand Down
8 changes: 4 additions & 4 deletions examples/react/start-basic-auth/src/hooks/useMutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
onSuccess?: (ctx: { data: TData }) => void | Promise<void>
}) {
const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
const [variables, setVariables] = React.useState<TVariables | undefined>()
const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
const [error, setError] = React.useState<TError | undefined>()
const [data, setData] = React.useState<TData | undefined>()
const [stateData, setData] = React.useState<TData | undefined>()
const [status, setStatus] = React.useState<
'idle' | 'pending' | 'success' | 'error'
>('idle')
Expand Down Expand Up @@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {

return {
status,
variables,
stateVariables,
submittedAt,
mutate,
error,
data,
stateData,
}
}
4 changes: 2 additions & 2 deletions examples/react/start-basic-auth/src/routes/signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ function SignupComp() {
})
}}
afterSubmit={
signupMutation.data?.error ? (
signupMutation.stateData?.error ? (
<>
<div className="text-red-400">{signupMutation.data.message}</div>
<div className="text-red-400">{signupMutation.stateData?.message ?? 'an error occurred'}</div>
</>
) : null
}
Expand Down
8 changes: 4 additions & 4 deletions examples/react/start-supabase-basic/src/components/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ export function Login() {
})
}}
afterSubmit={
loginMutation.data ? (
loginMutation.stateData ? (
<>
<div className="text-red-400">{loginMutation.data.message}</div>
{loginMutation.data.error &&
loginMutation.data.message === 'Invalid login credentials' ? (
<div className="text-red-400">{loginMutation.stateData.message}</div>
{loginMutation.stateData.error &&
loginMutation.stateData.message === 'Invalid login credentials' ? (
<div>
<button
className="text-blue-500"
Expand Down
8 changes: 4 additions & 4 deletions examples/react/start-supabase-basic/src/hooks/useMutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
onSuccess?: (ctx: { data: TData }) => void | Promise<void>
}) {
const [submittedAt, setSubmittedAt] = React.useState<number | undefined>()
const [variables, setVariables] = React.useState<TVariables | undefined>()
const [stateVariables, setVariables] = React.useState<TVariables | undefined>()
const [error, setError] = React.useState<TError | undefined>()
const [data, setData] = React.useState<TData | undefined>()
const [stateData, setData] = React.useState<TData | undefined>()
const [status, setStatus] = React.useState<
'idle' | 'pending' | 'success' | 'error'
>('idle')
Expand Down Expand Up @@ -35,10 +35,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {

return {
status,
variables,
stateVariables,
submittedAt,
mutate,
error,
data,
stateData,
}
}
4 changes: 2 additions & 2 deletions examples/react/start-supabase-basic/src/routes/signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ function SignupComp() {
})
}}
afterSubmit={
signupMutation.data?.error ? (
signupMutation.stateData?.error ? (
<>
<div className="text-red-400">{signupMutation.data.message}</div>
<div className="text-red-400">{signupMutation.stateData?.message ?? 'an error occurred'}</div>
</>
) : null
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
onSuccess?: (ctx: { data: TData }) => void | Promise<void>
}) {
const [submittedAt, setSubmittedAt] = Solid.createSignal<number | undefined>()
const [variables, setVariables] = Solid.createSignal<TVariables | undefined>()
const [signalVariables, setVariables] = Solid.createSignal<TVariables | undefined>()
const [error, setError] = Solid.createSignal<TError | undefined>()
const [data, setData] = Solid.createSignal<TData | undefined>()
const [signalData, setData] = Solid.createSignal<TData | undefined>()
const [status, setStatus] = Solid.createSignal<
'idle' | 'pending' | 'success' | 'error'
>('idle')
Expand All @@ -32,10 +32,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {

return {
status,
variables,
signalVariables,
submittedAt,
mutate,
error,
data,
signalData,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function InvoiceComponent() {
Save
</button>
</div>
{updateInvoiceMutation.variables()?.id === invoice()?.id ? (
{updateInvoiceMutation.signalVariables()?.id === invoice()?.id ? (
<div>
{updateInvoiceMutation.status() === 'success' ? (
<div class="inline-block px-2 py-1 rounded-sm bg-green-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
Expand Down
8 changes: 4 additions & 4 deletions examples/solid/kitchen-sink/src/useMutation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
onSuccess?: (ctx: { data: TData }) => void | Promise<void>
}) {
const [submittedAt, setSubmittedAt] = createSignal<number | undefined>()
const [variables, setVariables] = createSignal<TVariables | undefined>()
const [signalVariables, setVariables] = createSignal<TVariables | undefined>()
const [error, setError] = createSignal<TError | undefined>()
const [data, setData] = createSignal<TData | undefined>()
const [signalData, setData] = createSignal<TData | undefined>()
const [status, setStatus] = createSignal<
'idle' | 'pending' | 'success' | 'error'
>('idle')
Expand Down Expand Up @@ -35,7 +35,7 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
return status()
},
get variables() {
return variables()
return signalVariables()
},
get submittedAt() {
return submittedAt()
Expand All @@ -45,7 +45,7 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
return error()
},
get data() {
return data()
return signalData()
},
}
}
6 changes: 3 additions & 3 deletions examples/solid/start-basic-auth/src/components/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ export function Login() {
})
}}
afterSubmit={
loginMutation.data() ? (
loginMutation.signalData() ? (
<>
<div class="text-red-400">{loginMutation.data()?.message}</div>
{loginMutation.data()?.userNotFound ? (
<div class="text-red-400">{loginMutation.signalData()?.message}</div>
{loginMutation.signalData()?.userNotFound ? (
<div>
<button
class="text-blue-500"
Expand Down
8 changes: 4 additions & 4 deletions examples/solid/start-basic-auth/src/hooks/useMutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {
onSuccess?: (ctx: { data: TData }) => void | Promise<void>
}) {
const [submittedAt, setSubmittedAt] = Solid.createSignal<number | undefined>()
const [variables, setVariables] = Solid.createSignal<TVariables | undefined>()
const [signalVariables, setVariables] = Solid.createSignal<TVariables | undefined>()
const [error, setError] = Solid.createSignal<TError | undefined>()
const [data, setData] = Solid.createSignal<TData | undefined>()
const [signalData, setData] = Solid.createSignal<TData | undefined>()
const [status, setStatus] = Solid.createSignal<
'idle' | 'pending' | 'success' | 'error'
>('idle')
Expand All @@ -32,10 +32,10 @@ export function useMutation<TVariables, TData, TError = Error>(opts: {

return {
status,
variables,
signalVariables,
submittedAt,
mutate,
error,
data,
signalData,
}
}
4 changes: 2 additions & 2 deletions examples/solid/start-basic-auth/src/routes/signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ function SignupComp() {
})
}}
afterSubmit={
signupMutation.data()?.error ? (
signupMutation.signalData()?.error ? (
<>
<div class="text-red-400">{signupMutation.data()?.message}</div>
<div class="text-red-400">{signupMutation.signalData()?.message}</div>
</>
) : null
}
Expand Down
Loading