diff --git a/src/hooks/makeMutation.ts b/src/hooks/makeMutation.ts index 6a022cd75..1c1c57391 100644 --- a/src/hooks/makeMutation.ts +++ b/src/hooks/makeMutation.ts @@ -9,14 +9,12 @@ import { useIntl } from "react-intl"; import { commonMessages } from "@saleor/intl"; import { maybe, getMutationStatus } from "@saleor/misc"; -import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton"; +import { MutationResultAdditionalProps } from "@saleor/types"; import useNotifier from "./useNotifier"; export type UseMutation = [ MutationFunction, - MutationResult & { - state: ConfirmButtonTransitionState; - } + MutationResult & MutationResultAdditionalProps ]; export type UseMutationCbs = Partial<{ onCompleted: (data: TData) => void; diff --git a/src/misc.ts b/src/misc.ts index 9afb814e5..8f784795c 100644 --- a/src/misc.ts +++ b/src/misc.ts @@ -6,7 +6,11 @@ import urlJoin from "url-join"; import { ConfirmButtonTransitionState } from "./components/ConfirmButton/ConfirmButton"; import { APP_MOUNT_URI } from "./config"; import { AddressType, AddressTypeInput } from "./customers/types"; -import { PartialMutationProviderOutput, UserError } from "./types"; +import { + PartialMutationProviderOutput, + UserError, + MutationResultAdditionalProps +} from "./types"; import { AddressInput, AuthorizationKeyType, @@ -250,9 +254,7 @@ export function getMutationStatus< export function getMutationProviderData( mutateFn: MutationFunction, - opts: MutationResult & { - state: ConfirmButtonTransitionState; - } + opts: MutationResult & MutationResultAdditionalProps ): PartialMutationProviderOutput { return { mutate: variables => mutateFn({ variables }), diff --git a/src/mutations.tsx b/src/mutations.tsx index fe9db5891..31e6ed474 100644 --- a/src/mutations.tsx +++ b/src/mutations.tsx @@ -7,14 +7,12 @@ import { useIntl } from "react-intl"; import useNotifier from "./hooks/useNotifier"; import { commonMessages } from "./intl"; import { maybe, getMutationStatus } from "./misc"; -import { ConfirmButtonTransitionState } from "./components/ConfirmButton"; +import { MutationResultAdditionalProps } from "./types"; export interface TypedMutationInnerProps { children: ( mutateFn: MutationFunction, - result: MutationResult & { - state: ConfirmButtonTransitionState; - } + result: MutationResult & MutationResultAdditionalProps ) => React.ReactNode; onCompleted?: (data: TData) => void; onError?: (error: ApolloError) => void; diff --git a/src/types.ts b/src/types.ts index f5f9760a9..a5dcd3cbc 100644 --- a/src/types.ts +++ b/src/types.ts @@ -114,9 +114,7 @@ export interface PartialMutationProviderOutput< TData extends {} = {}, TVariables extends {} = {} > { - opts: MutationResult & { - state: ConfirmButtonTransitionState; - }; + opts: MutationResult & MutationResultAdditionalProps; mutate: (variables: TVariables) => void; } @@ -171,3 +169,7 @@ export type TabActionDialog = "save-search" | "delete-search"; export interface UserPermissionProps { userPermissions: User_permissions[]; } + +export interface MutationResultAdditionalProps { + state: ConfirmButtonTransitionState; +}