Skip to content

deps: upgrade #55

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
pepakriz merged 1 commit into from
Apr 4, 2026
Merged

deps: upgrade #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ export default function RootLayout({
children: React.ReactNode;
}>) {
return (
<html lang="en" className={"h-dvh"} suppressHydrationWarning>
<html
lang="en"
className={"h-dvh"}
suppressHydrationWarning
data-scroll-behavior="smooth"
>
<body
className={`${geistSans.variable} ${geistMono.variable} antialiased w-full flex flex-col safe-area min-h-full`}
>
Expand Down
39 changes: 24 additions & 15 deletions bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion components/combobox-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
FieldLabel,
} from "@/components/ui/field";
import { useEvoluQuery } from "@/hooks/use-evolu-query";
import type { EvoluSchema } from "@/lib/evolu";

type ComboboxItems<TItem extends JsonValue = JsonValue> = Array<{
value: TItem;
Expand Down Expand Up @@ -86,7 +87,7 @@ export const createComboboxInput =
export const createEvoluComboboxInput =
<TRow extends Row>(
params: {
query: Query<TRow>;
query: Query<EvoluSchema, TRow>;
queryDeps?: DependencyList;
mapRowsToItems: (rows: readonly TRow[]) => ComboboxItems;
} & ComboboxParams,
Expand Down
4 changes: 2 additions & 2 deletions components/nav-user.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {
SidebarMenuItem,
useSidebar,
} from "@/components/ui/sidebar";
import { useEvoluQuery } from "@/hooks/use-evolu-query";
import { useDeviceEvoluQuery } from "@/hooks/use-device-evolu-query";
import { useGlobalDialog } from "@/hooks/use-global-dialog";
import { useInstallPwa } from "@/hooks/use-install-pwa";
import { createDeviceQuery } from "@/lib/evolu/device";
Expand Down Expand Up @@ -63,7 +63,7 @@ export function NavUser({
const deviceEvolu = useAtomValue(deviceEvoluAtom);
const setEvoluCounter = useSetAtom(evoluCounterAtom);

const { data: accounts } = useEvoluQuery(accountsQuery, deviceEvolu);
const { data: accounts } = useDeviceEvoluQuery(accountsQuery);
const activeAccountId = accounts[0]?.id;
const activeAccountName =
accounts[0]?.name ?? t("navigation:account.unknown");
Expand Down
22 changes: 22 additions & 0 deletions hooks/use-device-evolu-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import type { Query, QueryRows, Row } from "@evolu/common";
import { useAtomValue } from "jotai";
import { use, useMemo, useSyncExternalStore } from "react";
import { deviceEvoluAtom } from "@/atoms/device-evolu";
import type { DeviceEvoluSchema } from "@/lib/evolu/device";

export const useDeviceEvoluQuery = <R extends Row>(
query: Query<DeviceEvoluSchema, R>,
): { data: QueryRows<R> } => {
const evolu = useAtomValue(deviceEvoluAtom);

use(evolu.loadQuery(query));

const data = useSyncExternalStore(
useMemo(() => evolu.subscribeQuery(query), [evolu, query]),
useMemo(() => () => evolu.getQueryRows(query), [evolu, query]),
);

return {
data: data as QueryRows<R>,
};
};
13 changes: 9 additions & 4 deletions hooks/use-evolu-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
import type { Query, QueryRows, Row } from "@evolu/common";
import { use, useMemo, useSyncExternalStore } from "react";
import { useEvolu } from "@/hooks/use-evolu";
import type { EvoluSchema } from "@/lib/evolu";

export const useEvoluQuery = <R extends Row>(
query: Query<R>,
query: Query<EvoluSchema, R>,
evoluOverride?: {
loadQuery: (query: Query<NoInfer<R>>) => Promise<QueryRows<NoInfer<R>>>;
getQueryRows: (query: Query<NoInfer<R>>) => QueryRows<NoInfer<R>>;
loadQuery: (
query: Query<EvoluSchema, NoInfer<R>>,
) => Promise<QueryRows<NoInfer<R>>>;
getQueryRows: (
query: Query<EvoluSchema, NoInfer<R>>,
) => QueryRows<NoInfer<R>>;
subscribeQuery: (
query: Query<NoInfer<R>>,
query: Query<EvoluSchema, NoInfer<R>>,
) => (callback: () => void) => () => void;
},
): { data: QueryRows<R> } => {
Expand Down
3 changes: 2 additions & 1 deletion lib/evolu/device.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,5 @@ export const createDeviceEvolu = async () => {
return evolu;
};

export type DeviceEvolu = RawEvolu<typeof DeviceSchema>;
export type DeviceEvoluSchema = typeof DeviceSchema;
export type DeviceEvolu = RawEvolu<DeviceEvoluSchema>;
6 changes: 3 additions & 3 deletions lib/evolu/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,9 +694,9 @@ export const createAppEvolu = async (props: {
})(run),
);

(async () => {
console.log("appOwner", await evolu.appOwner, props.mnemonic);
})();
// (async () => {
// console.log("appOwner", await evolu.appOwner, props.mnemonic);
// })();

// evolu.resetAppOwner();

Expand Down
15 changes: 7 additions & 8 deletions lib/evolu/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import type { Query, QueryRows, Row } from "@evolu/common";
import type { Evolu } from "@/lib/evolu/index";
import type { Evolu, EvoluSchema, Query, QueryRows, Row } from "@evolu/common";

export function subscribeToEvoluQuery<T extends Row>(
evolu: Evolu,
query: Query<T>,
callback: (values: QueryRows<T>) => void,
export function subscribeToEvoluQuery<S extends EvoluSchema, R extends Row>(
evolu: Evolu<S>,
query: Query<S, R>,
callback: (values: QueryRows<R>) => void,
) {
void evolu.loadQuery(query);
callback(evolu.getQueryRows(query));
Expand All @@ -15,8 +14,8 @@ export function subscribeToEvoluQuery<T extends Row>(
}

export const createExternalStoreForEvoluQuery =
<T extends Row>(evolu: Evolu, query: Query<T>) =>
(callback: (values: QueryRows<T>) => void) => {
<S extends EvoluSchema, R extends Row>(evolu: Evolu<S>, query: Query<S, R>) =>
(callback: (values: QueryRows<R>) => void) => {
void evolu.loadQuery(query);
callback(evolu.getQueryRows(query));

Expand Down
Loading
Loading