Skip to content

Fix React Typings #176

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Mar 25, 2025
Merged

Fix React Typings #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
743f41b
Fix react typings
maneesht Mar 19, 2025
959c85b
Merge branch 'invertase:main' into main
maneesht Mar 19, 2025
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
3 changes: 1 addition & 2 deletions packages/react/src/data-connect/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ReservedQueryKeys } from "./types";

export {
DataConnectQueryClient,
Expand All @@ -12,4 +11,4 @@ export {
useDataConnectMutation,
type useDataConnectMutationOptions,
} from "./useDataConnectMutation";
export type { FlattenedQueryResult, FlattenedMutationResult } from "./types";
export type { QueryResultRequiredRef, UseDataConnectMutationResult, UseDataConnectQueryResult } from "./types";
11 changes: 5 additions & 6 deletions packages/react/src/data-connect/query-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ import {
type QueryResult,
executeQuery,
} from "firebase/data-connect";
import type { FlattenedQueryResult } from "./types";

export type DataConnectQueryOptions<Data, Variables> = Omit<
FetchQueryOptions<
FlattenedQueryResult<Data, Variables>,
Data,
FirebaseError,
FlattenedQueryResult<Data, Variables>,
Data,
QueryKey
>,
"queryFn" | "queryKey"
Expand All @@ -30,7 +29,7 @@ export class DataConnectQueryClient extends QueryClient {
options?: DataConnectQueryOptions<Data, Variables>,
) {
let queryRef: QueryRef<Data, Variables>;
let initialData: FlattenedQueryResult<Data, Variables> | undefined;
let initialData: Data | undefined;

if ("ref" in refOrResult) {
queryRef = refOrResult.ref;
Expand All @@ -45,9 +44,9 @@ export class DataConnectQueryClient extends QueryClient {
}

return this.prefetchQuery<
FlattenedQueryResult<Data, Variables>,
Data,
FirebaseError,
FlattenedQueryResult<Data, Variables>,
Data,
QueryKey
>({
...options,
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/data-connect/useDataConnectQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import type { PartialBy } from "../../utils";
import {
QueryResultRequiredRef,
UseDataConnectQuery,
UseDataConnectQueryResult,
} from "./types";
import { useState } from "react";

Expand All @@ -26,7 +26,7 @@ export function useDataConnectQuery<Data = unknown, Variables = unknown>(
FirebaseError
>,
_callerSdkType: CallerSdkType = CallerSdkTypeEnum.TanstackReactCore
): UseDataConnectQuery<Data, Variables> {
): UseDataConnectQueryResult<Data, Variables> {
const [dataConnectResult, setDataConnectResult] = useState<QueryResultRequiredRef<Data, Variables>>('ref' in refOrResult ? refOrResult : { ref: refOrResult });
let initialData: Data | undefined;
const { ref } = dataConnectResult;
Expand Down