@livestore/livestore 0.0.46-dev.2 → 0.0.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -0
- package/dist/.tsbuildinfo +1 -1
- package/dist/__tests__/react/fixture.d.ts +17 -1
- package/dist/__tests__/react/fixture.d.ts.map +1 -1
- package/dist/__tests__/react/fixture.js +27 -3
- package/dist/__tests__/react/fixture.js.map +1 -1
- package/dist/__tests__/react/utils/otel.d.ts +10 -0
- package/dist/__tests__/react/utils/otel.d.ts.map +1 -0
- package/dist/__tests__/react/utils/otel.js +42 -0
- package/dist/__tests__/react/utils/otel.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/react/LiveStoreProvider.js +39 -6
- package/dist/react/LiveStoreProvider.js.map +1 -1
- package/dist/react/LiveStoreProvider.test.d.ts +2 -0
- package/dist/react/LiveStoreProvider.test.d.ts.map +1 -0
- package/dist/react/LiveStoreProvider.test.js +51 -0
- package/dist/react/LiveStoreProvider.test.js.map +1 -0
- package/dist/react/components/DiffableList copy.d.ts +19 -0
- package/dist/react/components/DiffableList copy.d.ts.map +1 -0
- package/dist/react/components/DiffableList copy.js +62 -0
- package/dist/react/components/DiffableList copy.js.map +1 -0
- package/dist/react/components/DiffableList.d.ts +13 -0
- package/dist/react/components/DiffableList.d.ts.map +1 -0
- package/dist/react/components/DiffableList.js +21 -0
- package/dist/react/components/DiffableList.js.map +1 -0
- package/dist/react/components/DiffableList2.d.ts +20 -0
- package/dist/react/components/DiffableList2.d.ts.map +1 -0
- package/dist/react/components/DiffableList2.js +119 -0
- package/dist/react/components/DiffableList2.js.map +1 -0
- package/dist/react/components/DiffableList3.d.ts +19 -0
- package/dist/react/components/DiffableList3.d.ts.map +1 -0
- package/dist/react/components/DiffableList3.js +62 -0
- package/dist/react/components/DiffableList3.js.map +1 -0
- package/dist/react/components/LiveList.d.ts +21 -0
- package/dist/react/components/LiveList.d.ts.map +1 -0
- package/dist/react/components/LiveList.js +31 -0
- package/dist/react/components/LiveList.js.map +1 -0
- package/dist/react/index.d.ts +1 -0
- package/dist/react/index.d.ts.map +1 -1
- package/dist/react/index.js +1 -0
- package/dist/react/index.js.map +1 -1
- package/dist/react/useAtom.d.ts +1 -1
- package/dist/react/useAtom.d.ts.map +1 -1
- package/dist/react/useAtom.js.map +1 -1
- package/dist/react/useQuery.d.ts +4 -1
- package/dist/react/useQuery.d.ts.map +1 -1
- package/dist/react/useQuery.js +24 -19
- package/dist/react/useQuery.js.map +1 -1
- package/dist/react/useQuery.test.js +11 -11
- package/dist/react/useQuery.test.js.map +1 -1
- package/dist/react/useRow.d.ts.map +1 -1
- package/dist/react/useRow.js +14 -69
- package/dist/react/useRow.js.map +1 -1
- package/dist/react/useRow.test.js +440 -28
- package/dist/react/useRow.test.js.map +1 -1
- package/dist/react/useRowOld.d.ts +40 -0
- package/dist/react/useRowOld.d.ts.map +1 -0
- package/dist/react/useRowOld.js +134 -0
- package/dist/react/useRowOld.js.map +1 -0
- package/dist/react/useTemporaryQuery.d.ts +15 -3
- package/dist/react/useTemporaryQuery.d.ts.map +1 -1
- package/dist/react/useTemporaryQuery.js +60 -27
- package/dist/react/useTemporaryQuery.js.map +1 -1
- package/dist/react/useTemporaryQuery.test.js +10 -9
- package/dist/react/useTemporaryQuery.test.js.map +1 -1
- package/dist/reactive.d.ts +23 -5
- package/dist/reactive.d.ts.map +1 -1
- package/dist/reactive.js +44 -11
- package/dist/reactive.js.map +1 -1
- package/dist/reactive.test.js +1 -1
- package/dist/reactive.test.js.map +1 -1
- package/dist/reactiveQueries/base-class.d.ts +1 -1
- package/dist/reactiveQueries/base-class.d.ts.map +1 -1
- package/dist/reactiveQueries/base-class.js.map +1 -1
- package/dist/reactiveQueries/graphql.d.ts +2 -2
- package/dist/reactiveQueries/graphql.d.ts.map +1 -1
- package/dist/reactiveQueries/graphql.js +16 -10
- package/dist/reactiveQueries/graphql.js.map +1 -1
- package/dist/reactiveQueries/sql.d.ts +1 -1
- package/dist/reactiveQueries/sql.d.ts.map +1 -1
- package/dist/reactiveQueries/sql.js +15 -11
- package/dist/reactiveQueries/sql.js.map +1 -1
- package/dist/reactiveQueries/sql.test.js +1 -40
- package/dist/reactiveQueries/sql.test.js.map +1 -1
- package/dist/store.d.ts +2 -2
- package/dist/store.d.ts.map +1 -1
- package/dist/store.js +10 -7
- package/dist/store.js.map +1 -1
- package/package.json +6 -6
- package/src/__tests__/react/fixture.tsx +35 -2
- package/src/__tests__/react/utils/otel.ts +61 -0
- package/src/index.ts +12 -1
- package/src/react/LiveStoreProvider.test.tsx +82 -0
- package/src/react/LiveStoreProvider.tsx +42 -7
- package/src/react/components/LiveList.tsx +84 -0
- package/src/react/index.ts +2 -0
- package/src/react/useAtom.ts +1 -1
- package/src/react/useQuery.test.tsx +11 -11
- package/src/react/useQuery.ts +29 -22
- package/src/react/useRow.test.tsx +502 -30
- package/src/react/useRow.ts +19 -107
- package/src/react/useTemporaryQuery.test.tsx +17 -16
- package/src/react/useTemporaryQuery.ts +96 -28
- package/src/reactive.test.ts +1 -1
- package/src/reactive.ts +76 -15
- package/src/reactiveQueries/base-class.ts +2 -1
- package/src/reactiveQueries/graphql.ts +21 -15
- package/src/reactiveQueries/sql.test.ts +1 -54
- package/src/reactiveQueries/sql.ts +20 -14
- package/src/store.ts +12 -8
- package/tsconfig.json +6 -1
- package/src/react/utils/useCleanup.ts +0 -25
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { FI } from '@livestore/fractional-index';
|
|
2
|
+
import { casesHandled } from '@livestore/utils';
|
|
3
|
+
import React from 'react';
|
|
4
|
+
import ReactDOM from 'react-dom/client';
|
|
5
|
+
import { computed } from '../../reactiveQueries/js.js';
|
|
6
|
+
import { LiveStoreContext, useStore } from '../LiveStoreContext.js';
|
|
7
|
+
import { useQuery } from '../useQuery.js';
|
|
8
|
+
export const DiffableList_ = ({ items$, renderContainer, renderItem, getKey, }) => {
|
|
9
|
+
const ref = React.useRef(null);
|
|
10
|
+
const container = renderContainer(ref);
|
|
11
|
+
const [hasMounted, setHasMounted] = React.useState(false);
|
|
12
|
+
React.useEffect(() => setHasMounted(true), []);
|
|
13
|
+
const keys$ = computed((get) => get(items$).map(getKey));
|
|
14
|
+
const elsRef = React.useRef([]);
|
|
15
|
+
// const ContextBridge = itsFine.useContextBridge()
|
|
16
|
+
const { store } = useStore();
|
|
17
|
+
const renderListEl = React.useCallback((parentEl, index, item$) => {
|
|
18
|
+
const root = ReactDOM.createRoot(parentEl);
|
|
19
|
+
root.render(
|
|
20
|
+
// <ContextBridge>
|
|
21
|
+
React.createElement(LiveStoreContext.Provider, { value: { store } },
|
|
22
|
+
React.createElement(ItemWrapper, { "item$": item$, renderItem: renderItem, opts: { index, isInitialListRender: !hasMounted } })));
|
|
23
|
+
return root;
|
|
24
|
+
}, [hasMounted, renderItem, store]);
|
|
25
|
+
React.useLayoutEffect(() => {
|
|
26
|
+
if (ref.current === null) {
|
|
27
|
+
throw new Error('ref.current is null');
|
|
28
|
+
}
|
|
29
|
+
const keys = keys$.run();
|
|
30
|
+
for (let index = 0; index < keys.length; index++) {
|
|
31
|
+
const parentEl = document.createElement('div');
|
|
32
|
+
ref.current.append(parentEl);
|
|
33
|
+
const item$ = computed((get) => get(items$)[index]);
|
|
34
|
+
const root = renderListEl(parentEl, index, item$);
|
|
35
|
+
elsRef.current.push({ el: parentEl, item$, root, id: keys[index] });
|
|
36
|
+
}
|
|
37
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
38
|
+
}, []);
|
|
39
|
+
React.useEffect(() => () => keys$.destroy(), [keys$]);
|
|
40
|
+
React.useEffect(() => {
|
|
41
|
+
// const keys = keys$.run()
|
|
42
|
+
return keys$.subscribe((keys) => {
|
|
43
|
+
const prevKeys = elsRef.current.map((el) => el.id);
|
|
44
|
+
let arrayIsEqual = true;
|
|
45
|
+
for (let i = 0; i < keys.length; i++) {
|
|
46
|
+
if (keys[i] !== prevKeys[i]) {
|
|
47
|
+
arrayIsEqual = false;
|
|
48
|
+
break;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
if (arrayIsEqual)
|
|
52
|
+
return;
|
|
53
|
+
const previousAgg = FI.aggregateMake(prevKeys, FI.fractionalIndexImplNumber);
|
|
54
|
+
const { newEvents } = FI.getNewEvents(previousAgg, keys, FI.fractionalIndexImplNumber);
|
|
55
|
+
console.log('newEvents', newEvents);
|
|
56
|
+
for (const event of newEvents) {
|
|
57
|
+
switch (event.op) {
|
|
58
|
+
case 'remove': {
|
|
59
|
+
const { index } = event;
|
|
60
|
+
const el = elsRef.current[index];
|
|
61
|
+
el.root.unmount();
|
|
62
|
+
el.el.remove();
|
|
63
|
+
el.item$.destroy();
|
|
64
|
+
elsRef.current.splice(index, 1);
|
|
65
|
+
break;
|
|
66
|
+
}
|
|
67
|
+
case 'add': {
|
|
68
|
+
const { index } = event;
|
|
69
|
+
const parentEl = document.createElement('div');
|
|
70
|
+
ref.current.append(parentEl);
|
|
71
|
+
const item$ = computed((get) => get(items$)[index]);
|
|
72
|
+
const root = renderListEl(parentEl, index, item$);
|
|
73
|
+
elsRef.current.splice(index, 0, { el: parentEl, item$, root, id: keys[index] });
|
|
74
|
+
break;
|
|
75
|
+
}
|
|
76
|
+
case 'move': {
|
|
77
|
+
// const { newIndex, previousIndex } = event
|
|
78
|
+
// const el = elsRef.current[previousIndex]!
|
|
79
|
+
// const item$ = el.item$
|
|
80
|
+
// const root = el.root
|
|
81
|
+
// const elEl = el.el
|
|
82
|
+
// elsRef.current.splice(previousIndex, 1)
|
|
83
|
+
// elsRef.current.splice(newIndex, 0, { el: elEl, item$, root })
|
|
84
|
+
// ref.current!.insertBefore(elEl, elsRef.current[newIndex + 1]?.el)
|
|
85
|
+
// // move dom element
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
default: {
|
|
89
|
+
casesHandled(event);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
// for (let index = 0; index < keys.length; index++) {
|
|
95
|
+
// if (prevKeys[index] === keys[index]) continue
|
|
96
|
+
// // check if `keys[index]` === `prevKeys[index + 1]`
|
|
97
|
+
// // which probably means that
|
|
98
|
+
// if (keys[index] === prevKeys[index + 1]) {
|
|
99
|
+
// // sp
|
|
100
|
+
// }
|
|
101
|
+
// prevKeys[index] = keys[index] as any
|
|
102
|
+
// }
|
|
103
|
+
// TODO in the future use a more efficient diffing algorithm that re-uses elements more optimally
|
|
104
|
+
// right now we're only looking one step ahead
|
|
105
|
+
// reconcile until `keys` and `prevKeys` are equal
|
|
106
|
+
// prevKeys = keys
|
|
107
|
+
}, [items$, keys$, renderListEl]);
|
|
108
|
+
return React.createElement(React.Fragment, null, container);
|
|
109
|
+
};
|
|
110
|
+
export const DiffableList2 = ({ items$, renderContainer, renderItem, getKey, }) => (
|
|
111
|
+
// <itsFine.FiberProvider>
|
|
112
|
+
React.createElement(DiffableList_, { "items$": items$, renderContainer: renderContainer, renderItem: renderItem, getKey: getKey })
|
|
113
|
+
// </itsFine.FiberProvider>
|
|
114
|
+
);
|
|
115
|
+
const ItemWrapper = ({ item$, opts, renderItem, }) => {
|
|
116
|
+
const item = useQuery(item$);
|
|
117
|
+
return React.createElement(React.Fragment, null, renderItem(item, opts));
|
|
118
|
+
};
|
|
119
|
+
//# sourceMappingURL=DiffableList2.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DiffableList2.js","sourceRoot":"","sources":["../../../src/react/components/DiffableList2.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import type { LiveQuery } from '../../reactiveQueries/base-class.js';
|
|
3
|
+
export type Props<TItem> = {
|
|
4
|
+
items$: LiveQuery<ReadonlyArray<TItem>>;
|
|
5
|
+
/**
|
|
6
|
+
* @example
|
|
7
|
+
* ```tsx
|
|
8
|
+
* renderContainer={(children) => <ul>{children}</ul>}
|
|
9
|
+
* ```
|
|
10
|
+
*/
|
|
11
|
+
renderContainer: (ref: React.LegacyRef<any>) => React.ReactNode;
|
|
12
|
+
renderItem: (item: TItem, opts: {
|
|
13
|
+
index: number;
|
|
14
|
+
isInitialListRender: boolean;
|
|
15
|
+
}) => React.ReactNode;
|
|
16
|
+
getKey: (item: TItem, index: number) => string | number;
|
|
17
|
+
};
|
|
18
|
+
export declare const DiffableList: <TItem>({ items$, renderContainer, renderItem, getKey, }: Props<TItem>) => React.ReactNode;
|
|
19
|
+
//# sourceMappingURL=DiffableList3.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DiffableList3.d.ts","sourceRoot":"","sources":["../../../src/react/components/DiffableList3.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAUpE,MAAM,MAAM,KAAK,CAAC,KAAK,IAAI;IACzB,MAAM,EAAE,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;IACvC;;;;;OAKG;IACH,eAAe,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,SAAS,CAAA;IAE/D,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,mBAAmB,EAAE,OAAO,CAAA;KAAE,KAAK,KAAK,CAAC,SAAS,CAAA;IACnG,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAA;CACxD,CAAA;AAED,eAAO,MAAM,YAAY,4DAKtB,MAAM,KAAK,CAAC,KAAG,MAAM,SAwEvB,CAAA"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import * as million from 'million';
|
|
2
|
+
import React from 'react';
|
|
3
|
+
import { computed } from '../../reactiveQueries/js.js';
|
|
4
|
+
import { useQuery } from '../useQuery.js';
|
|
5
|
+
export const DiffableList = ({ items$, renderContainer, renderItem, getKey, }) => {
|
|
6
|
+
const ref = React.useRef(null);
|
|
7
|
+
const container = renderContainer(ref);
|
|
8
|
+
const [hasMounted, setHasMounted] = React.useState(false);
|
|
9
|
+
React.useEffect(() => setHasMounted(true), []);
|
|
10
|
+
const keys$ = computed((get) => get(items$).map(getKey));
|
|
11
|
+
const elsRef = React.useRef([]);
|
|
12
|
+
// const ContextBridge = itsFine.useContextBridge()
|
|
13
|
+
// const { store } = useStore()
|
|
14
|
+
// const renderListEl = React.useCallback(
|
|
15
|
+
// (parentEl: HTMLElement, index: number, item$: LiveQuery<TItem>) => {
|
|
16
|
+
// const root = ReactDOM.createRoot(parentEl)
|
|
17
|
+
// root.render(
|
|
18
|
+
// // <ContextBridge>
|
|
19
|
+
// <LiveStoreContext.Provider value={{ store }}>
|
|
20
|
+
// <ItemWrapper item$={item$} renderItem={renderItem} opts={{ index, isInitialListRender: !hasMounted }} />
|
|
21
|
+
// </LiveStoreContext.Provider>,
|
|
22
|
+
// // </ContextBridge>,
|
|
23
|
+
// )
|
|
24
|
+
// return root
|
|
25
|
+
// },
|
|
26
|
+
// [hasMounted, renderItem, store],
|
|
27
|
+
// )
|
|
28
|
+
React.useLayoutEffect(() => {
|
|
29
|
+
if (ref.current === null) {
|
|
30
|
+
throw new Error('ref.current is null');
|
|
31
|
+
}
|
|
32
|
+
const keys = keys$.run();
|
|
33
|
+
const queries$ = keys.map((_key, index) => computed((get) => get(items$)[index]));
|
|
34
|
+
// const list = million.mapArray(
|
|
35
|
+
// queries$.map((item$, index) =>
|
|
36
|
+
// ItemWrapperBlock({
|
|
37
|
+
// item$,
|
|
38
|
+
// opts: { index, isInitialListRender: !hasMounted },
|
|
39
|
+
// renderItem,
|
|
40
|
+
// }),
|
|
41
|
+
// ),
|
|
42
|
+
// )
|
|
43
|
+
// million.mount(list, ref.current)
|
|
44
|
+
// const keys = keys$.run()
|
|
45
|
+
// for (let index = 0; index < keys.length; index++) {
|
|
46
|
+
// const parentEl = document.createElement('div')
|
|
47
|
+
// ref.current!.append(parentEl)
|
|
48
|
+
// const item$ = computed((get) => get(items$)[index]!) as LiveQuery<TItem>
|
|
49
|
+
// const root = renderListEl(parentEl, index, item$)
|
|
50
|
+
// elsRef.current.push({ el: parentEl, item$, root, id: keys[index]! })
|
|
51
|
+
// }
|
|
52
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
53
|
+
}, []);
|
|
54
|
+
React.useEffect(() => () => keys$.destroy(), [keys$]);
|
|
55
|
+
return React.createElement(React.Fragment, null, container);
|
|
56
|
+
};
|
|
57
|
+
const ItemWrapper = ({ item$, opts, renderItem, }) => {
|
|
58
|
+
const item = useQuery(item$);
|
|
59
|
+
return React.createElement(React.Fragment, null, renderItem(item, opts));
|
|
60
|
+
};
|
|
61
|
+
const ItemWrapperBlock = million.block(ItemWrapper);
|
|
62
|
+
//# sourceMappingURL=DiffableList3.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DiffableList3.js","sourceRoot":"","sources":["../../../src/react/components/DiffableList3.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAGtD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAoBzC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAS,EACnC,MAAM,EACN,eAAe,EACf,UAAU,EACV,MAAM,GACO,EAAmB,EAAE;IAClC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAc,IAAI,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;IAEtC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEzD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;IAE9C,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IAOxD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAU,EAAE,CAAC,CAAA;IAExC,mDAAmD;IACnD,+BAA+B;IAE/B,0CAA0C;IAC1C,yEAAyE;IACzE,iDAAiD;IACjD,mBAAmB;IACnB,2BAA2B;IAC3B,sDAAsD;IACtD,mHAAmH;IACnH,sCAAsC;IACtC,6BAA6B;IAC7B,QAAQ;IAER,kBAAkB;IAClB,OAAO;IACP,qCAAqC;IACrC,IAAI;IAEJ,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE;QACzB,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACxC,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAE,CAAA;QAExB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAE,CAAC,CAAuB,CAAA;QAExG,iCAAiC;QACjC,mCAAmC;QACnC,yBAAyB;QACzB,eAAe;QACf,2DAA2D;QAC3D,oBAAoB;QACpB,UAAU;QACV,OAAO;QACP,IAAI;QAEJ,mCAAmC;QAEnC,2BAA2B;QAE3B,sDAAsD;QACtD,mDAAmD;QACnD,kCAAkC;QAClC,6EAA6E;QAC7E,sDAAsD;QACtD,yEAAyE;QACzE,IAAI;QACJ,uDAAuD;IACzD,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAErD,OAAO,0CAAG,SAAS,CAAI,CAAA;AACzB,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAS,EAC3B,KAAK,EACL,IAAI,EACJ,UAAU,GAKX,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE5B,OAAO,0CAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAI,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,WAAkB,CAAC,CAAA"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import type { LiveQuery } from '../../reactiveQueries/base-class.js';
|
|
3
|
+
export type LiveListProps<TItem> = {
|
|
4
|
+
items$: LiveQuery<ReadonlyArray<TItem>>;
|
|
5
|
+
renderItem: (item: TItem, opts: {
|
|
6
|
+
index: number;
|
|
7
|
+
isInitialListRender: boolean;
|
|
8
|
+
}) => React.ReactNode;
|
|
9
|
+
/** Needs to be unique across all list items */
|
|
10
|
+
getKey: (item: TItem, index: number) => string | number;
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
* This component is a helper component for rendering a list of items for a LiveQuery of an array of items.
|
|
14
|
+
* The idea is that instead of letting React handle the rendering of the items array directly,
|
|
15
|
+
* we derive a item LiveQuery for each item which moves the reactivity to the item level when a single item changes.
|
|
16
|
+
*
|
|
17
|
+
* In the future we want to make this component even more efficient by using incremental rendering (https://github.com/livestorejs/livestore/pull/55)
|
|
18
|
+
* e.g. when an item is added/removed/moved to only re-render the affected DOM nodes.
|
|
19
|
+
*/
|
|
20
|
+
export declare const LiveList: <TItem>({ items$, renderItem, getKey }: LiveListProps<TItem>) => React.ReactNode;
|
|
21
|
+
//# sourceMappingURL=LiveList.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LiveList.d.ts","sourceRoot":"","sources":["../../../src/react/components/LiveList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAWpE,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI;IACjC,MAAM,EAAE,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAA;IAEvC,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,mBAAmB,EAAE,OAAO,CAAA;KAAE,KAAK,KAAK,CAAC,SAAS,CAAA;IACnG,+CAA+C;IAC/C,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,CAAA;CACxD,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,0CAA4C,cAAc,KAAK,CAAC,KAAG,MAAM,SA8B7F,CAAA"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { computed } from '../../reactiveQueries/js.js';
|
|
3
|
+
import { useQuery } from '../useQuery.js';
|
|
4
|
+
import { useTemporaryQuery } from '../useTemporaryQuery.js';
|
|
5
|
+
/**
|
|
6
|
+
* This component is a helper component for rendering a list of items for a LiveQuery of an array of items.
|
|
7
|
+
* The idea is that instead of letting React handle the rendering of the items array directly,
|
|
8
|
+
* we derive a item LiveQuery for each item which moves the reactivity to the item level when a single item changes.
|
|
9
|
+
*
|
|
10
|
+
* In the future we want to make this component even more efficient by using incremental rendering (https://github.com/livestorejs/livestore/pull/55)
|
|
11
|
+
* e.g. when an item is added/removed/moved to only re-render the affected DOM nodes.
|
|
12
|
+
*/
|
|
13
|
+
export const LiveList = ({ items$, renderItem, getKey }) => {
|
|
14
|
+
const [hasMounted, setHasMounted] = React.useState(false);
|
|
15
|
+
React.useEffect(() => setHasMounted(true), []);
|
|
16
|
+
const keysCb = React.useCallback(() => computed((get) => get(items$).map(getKey)), [getKey, items$]);
|
|
17
|
+
const keys = useTemporaryQuery(keysCb, 'fixed');
|
|
18
|
+
const arr = React.useMemo(() => keys.map((key) =>
|
|
19
|
+
// TODO figure out a way so that `item$` returns an ordered lookup map to more efficiently find the item by key
|
|
20
|
+
[key, computed((get) => get(items$).find((item) => getKey(item, 0) === key))]), [getKey, items$, keys]);
|
|
21
|
+
return (React.createElement(React.Fragment, null, arr.map(([key, item$], index) => (React.createElement(ItemWrapperMemo, { key: key, itemKey: key, "item$": item$, opts: { isInitialListRender: !hasMounted, index }, renderItem: renderItem })))));
|
|
22
|
+
};
|
|
23
|
+
const ItemWrapper = ({ item$, opts, renderItem, }) => {
|
|
24
|
+
const item = useQuery(item$);
|
|
25
|
+
return React.createElement(React.Fragment, null, renderItem(item, opts));
|
|
26
|
+
};
|
|
27
|
+
const ItemWrapperMemo = React.memo(ItemWrapper, (prev, next) => prev.itemKey === next.itemKey &&
|
|
28
|
+
prev.renderItem === prev.renderItem &&
|
|
29
|
+
prev.opts.index === next.opts.index &&
|
|
30
|
+
prev.opts.isInitialListRender === next.opts.isInitialListRender);
|
|
31
|
+
//# sourceMappingURL=LiveList.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LiveList.js","sourceRoot":"","sources":["../../../src/react/components/LiveList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAgB3D;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAwB,EAAmB,EAAE;IACxG,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEzD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;IAE9C,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACpG,MAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/C,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CACvB,GAAG,EAAE,CACH,IAAI,CAAC,GAAG,CACN,CAAC,GAAG,EAAE,EAAE;IACN,+GAA+G;IAC/G,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,GAAG,CAAE,CAAqB,CAAU,CAC9G,EACH,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CACvB,CAAA;IAED,OAAO,CACL,0CACG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAChC,oBAAC,eAAe,IACd,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,GAAG,WACL,KAAK,EACZ,IAAI,EAAE,EAAE,mBAAmB,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,EACjD,UAAU,EAAE,UAAU,GACtB,CACH,CAAC,CACD,CACJ,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAS,EAC3B,KAAK,EACL,IAAI,EACJ,UAAU,GAMX,EAAE,EAAE;IACH,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE5B,OAAO,0CAAG,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAI,CAAA;AACtC,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAChC,WAAW,EACX,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CACb,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO;IAC7B,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU;IACnC,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK;IACnC,IAAI,CAAC,IAAI,CAAC,mBAAmB,KAAK,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAC5C,CAAA"}
|
package/dist/react/index.d.ts
CHANGED
|
@@ -5,5 +5,6 @@ export { useTemporaryQuery } from './useTemporaryQuery.js';
|
|
|
5
5
|
export { useStackInfo } from './utils/stack-info.js';
|
|
6
6
|
export { useRow, type StateSetters, type SetStateAction, type Dispatch, type UseRowResult as UseStateResult, } from './useRow.js';
|
|
7
7
|
export { useAtom } from './useAtom.js';
|
|
8
|
+
export { LiveList, type LiveListProps } from './components/LiveList.js';
|
|
8
9
|
export type { TypedDocumentNode } from '@graphql-typed-document-node/core';
|
|
9
10
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/react/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EACL,MAAM,EACN,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,YAAY,IAAI,cAAc,GACpC,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/react/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EACL,MAAM,EACN,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,YAAY,IAAI,cAAc,GACpC,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAGvE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA"}
|
package/dist/react/index.js
CHANGED
|
@@ -5,4 +5,5 @@ export { useTemporaryQuery } from './useTemporaryQuery.js';
|
|
|
5
5
|
export { useStackInfo } from './utils/stack-info.js';
|
|
6
6
|
export { useRow, } from './useRow.js';
|
|
7
7
|
export { useAtom } from './useAtom.js';
|
|
8
|
+
export { LiveList } from './components/LiveList.js';
|
|
8
9
|
//# sourceMappingURL=index.js.map
|
package/dist/react/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/react/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EACL,MAAM,GAKP,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/react/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EACL,MAAM,GAKP,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAAsB,MAAM,0BAA0B,CAAA"}
|
package/dist/react/useAtom.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type QueryInfoCol, type QueryInfoRow } from '../query-info.js';
|
|
2
2
|
import type { LiveQuery } from '../reactiveQueries/base-class.js';
|
|
3
3
|
import type { Dispatch, SetStateAction } from './useRow.js';
|
|
4
|
-
export declare const useAtom: <TQuery extends LiveQuery<any, QueryInfoRow<any> | QueryInfoCol<any, any>>>(query$: TQuery) => [value: TQuery["__result!"], setValue: Dispatch<SetStateAction<TQuery["__result!"]
|
|
4
|
+
export declare const useAtom: <TQuery extends LiveQuery<any, QueryInfoRow<any> | QueryInfoCol<any, any>>>(query$: TQuery) => [value: TQuery["__result!"], setValue: Dispatch<SetStateAction<Partial<TQuery["__result!"]>>>];
|
|
5
5
|
//# sourceMappingURL=useAtom.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAtom.d.ts","sourceRoot":"","sources":["../../src/react/useAtom.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC7F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAGjE,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAE3D,eAAO,MAAM,OAAO,sFACV,MAAM,
|
|
1
|
+
{"version":3,"file":"useAtom.d.ts","sourceRoot":"","sources":["../../src/react/useAtom.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC7F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAGjE,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAE3D,eAAO,MAAM,OAAO,sFACV,MAAM,mGAef,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAtom.js","sourceRoot":"","sources":["../../src/react/useAtom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,oBAAoB,EAAwC,MAAM,kBAAkB,CAAA;AAE7F,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAG3C,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAAc,
|
|
1
|
+
{"version":3,"file":"useAtom.js","sourceRoot":"","sources":["../../src/react/useAtom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,oBAAoB,EAAwC,MAAM,kBAAkB,CAAA;AAE7F,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAG3C,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAAc,EACkF,EAAE;IAClG,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;IAErC,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAA;IAE5B,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAgD,GAAG,EAAE;QACjF,OAAO,CAAC,YAAiB,EAAE,EAAE;YAC3B,MAAM,QAAQ,GAAG,OAAO,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;YAEpG,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,SAAU,EAAE,QAAQ,CAAC,CAAC,CAAA;QACjE,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAA;IAExC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;AACtC,CAAC,CAAA"}
|
package/dist/react/useQuery.d.ts
CHANGED
|
@@ -2,5 +2,8 @@ import * as otel from '@opentelemetry/api';
|
|
|
2
2
|
import React from 'react';
|
|
3
3
|
import type { GetResult, LiveQueryAny } from '../reactiveQueries/base-class.js';
|
|
4
4
|
export declare const useQuery: <TQuery extends LiveQueryAny>(query: TQuery) => GetResult<TQuery>;
|
|
5
|
-
|
|
5
|
+
/**
|
|
6
|
+
*
|
|
7
|
+
*/
|
|
8
|
+
export declare const useQueryRef: <TQuery extends LiveQueryAny>(query$: TQuery, parentOtelContext?: otel.Context) => React.MutableRefObject<GetResult<TQuery>>;
|
|
6
9
|
//# sourceMappingURL=useQuery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../../src/react/useQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;
|
|
1
|
+
{"version":3,"file":"useQuery.d.ts","sourceRoot":"","sources":["../../src/react/useQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAiB/E,eAAO,MAAM,QAAQ,uCAAwC,MAAM,KAAG,UAAU,MAAM,CAA+B,CAAA;AAErH;;GAEG;AACH,eAAO,MAAM,WAAW,wCACd,MAAM,sBACM,KAAK,OAAO,KAC/B,MAAM,gBAAgB,CAAC,UAAU,MAAM,CAAC,CA2E1C,CAAA"}
|
package/dist/react/useQuery.js
CHANGED
|
@@ -4,6 +4,10 @@ import React from 'react';
|
|
|
4
4
|
import { useStore } from './LiveStoreContext.js';
|
|
5
5
|
import { extractStackInfoFromStackTrace, originalStackLimit } from './utils/stack-info.js';
|
|
6
6
|
import { useStateRefWithReactiveInput } from './utils/useStateRefWithReactiveInput.js';
|
|
7
|
+
/**
|
|
8
|
+
* NOTE Some folks have suggested to use `React.useSyncExternalStore`, however, it's not doing anything special
|
|
9
|
+
* for what's needed here, so we handle everything manually.
|
|
10
|
+
*/
|
|
7
11
|
/**
|
|
8
12
|
* This is needed because the `React.useMemo` call below, can sometimes be called multiple times 🤷,
|
|
9
13
|
* so we need to "cache" the fact that we've already started a span for this component.
|
|
@@ -11,9 +15,12 @@ import { useStateRefWithReactiveInput } from './utils/useStateRefWithReactiveInp
|
|
|
11
15
|
*/
|
|
12
16
|
const spanAlreadyStartedCache = new Map();
|
|
13
17
|
export const useQuery = (query) => useQueryRef(query).current;
|
|
14
|
-
|
|
18
|
+
/**
|
|
19
|
+
*
|
|
20
|
+
*/
|
|
21
|
+
export const useQueryRef = (query$, parentOtelContext) => {
|
|
15
22
|
const { store } = useStore();
|
|
16
|
-
React.useDebugValue(`LiveStore:useQuery:${query
|
|
23
|
+
React.useDebugValue(`LiveStore:useQuery:${query$.id}:${query$.label}`);
|
|
17
24
|
const stackInfo = React.useMemo(() => {
|
|
18
25
|
Error.stackTraceLimit = 10;
|
|
19
26
|
// eslint-disable-next-line unicorn/error-message
|
|
@@ -23,42 +30,40 @@ export const useQueryRef = (query, parentOtelContext) => {
|
|
|
23
30
|
}, []);
|
|
24
31
|
// The following `React.useMemo` and `React.useEffect` calls are used to start and end a span for the lifetime of this component.
|
|
25
32
|
const { span, otelContext } = React.useMemo(() => {
|
|
26
|
-
const existingSpan = spanAlreadyStartedCache.get(query);
|
|
33
|
+
const existingSpan = spanAlreadyStartedCache.get(query$);
|
|
27
34
|
if (existingSpan !== undefined)
|
|
28
35
|
return existingSpan;
|
|
29
|
-
const span = store.otel.tracer.startSpan(`LiveStore:useQuery:${query
|
|
36
|
+
const span = store.otel.tracer.startSpan(`LiveStore:useQuery:${query$.label}`, { attributes: { label: query$.label, stackInfo: JSON.stringify(stackInfo) } }, parentOtelContext ?? store.otel.queriesSpanContext);
|
|
30
37
|
const otelContext = otel.trace.setSpan(otel.context.active(), span);
|
|
31
|
-
spanAlreadyStartedCache.set(query
|
|
38
|
+
spanAlreadyStartedCache.set(query$, { span, otelContext });
|
|
32
39
|
return { span, otelContext };
|
|
33
|
-
}, [parentOtelContext, query
|
|
34
|
-
const initialResult = React.useMemo(() => query
|
|
40
|
+
}, [parentOtelContext, query$, stackInfo, store.otel.queriesSpanContext, store.otel.tracer]);
|
|
41
|
+
const initialResult = React.useMemo(() => query$.run(otelContext, {
|
|
35
42
|
_tag: 'react',
|
|
36
43
|
api: 'useQuery',
|
|
37
|
-
label: query
|
|
44
|
+
label: query$.label,
|
|
38
45
|
stackInfo,
|
|
39
|
-
}), [otelContext, query
|
|
46
|
+
}), [otelContext, query$, stackInfo]);
|
|
40
47
|
// We know the query has a result by the time we use it; so we can synchronously populate a default state
|
|
41
48
|
const [valueRef, setValue] = useStateRefWithReactiveInput(initialResult);
|
|
42
49
|
React.useEffect(() => () => {
|
|
43
|
-
spanAlreadyStartedCache.delete(query);
|
|
50
|
+
spanAlreadyStartedCache.delete(query$);
|
|
44
51
|
span.end();
|
|
45
|
-
}, [query
|
|
52
|
+
}, [query$, span]);
|
|
46
53
|
// Subscribe to future updates for this query
|
|
47
54
|
React.useEffect(() => {
|
|
48
|
-
query
|
|
49
|
-
|
|
55
|
+
query$.activeSubscriptions.add(stackInfo);
|
|
56
|
+
return store.subscribe(query$, (newValue) => {
|
|
50
57
|
// NOTE: we return a reference to the result object within LiveStore;
|
|
51
58
|
// this implies that app code must not mutate the results, or else
|
|
52
59
|
// there may be weird reactivity bugs.
|
|
53
60
|
if (isEqual(newValue, valueRef.current) === false) {
|
|
54
61
|
setValue(newValue);
|
|
55
62
|
}
|
|
56
|
-
},
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
};
|
|
61
|
-
}, [stackInfo, query, setValue, store, valueRef, otelContext, span]);
|
|
63
|
+
}, () => {
|
|
64
|
+
query$.activeSubscriptions.delete(stackInfo);
|
|
65
|
+
}, { label: query$.label, otelContext });
|
|
66
|
+
}, [stackInfo, query$, setValue, store, valueRef, otelContext, span]);
|
|
62
67
|
return valueRef;
|
|
63
68
|
};
|
|
64
69
|
//# sourceMappingURL=useQuery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/react/useQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,8BAA8B,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1F,OAAO,EAAE,4BAA4B,EAAE,MAAM,yCAAyC,CAAA;AAEtF;;;;GAIG;AACH,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAgE,CAAA;AAEvG,MAAM,CAAC,MAAM,QAAQ,GAAG,CAA8B,KAAa,EAAqB,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,OAAO,CAAA;AAErH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,
|
|
1
|
+
{"version":3,"file":"useQuery.js","sourceRoot":"","sources":["../../src/react/useQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,39 +6,39 @@ import { querySQL } from '../reactiveQueries/sql.js';
|
|
|
6
6
|
import * as LiveStoreReact from './index.js';
|
|
7
7
|
describe('useQuery', () => {
|
|
8
8
|
it('simple', async () => {
|
|
9
|
-
|
|
10
|
-
const
|
|
9
|
+
const { wrapper, store, cud, makeRenderCount } = await makeTodoMvc();
|
|
10
|
+
const renderCount = makeRenderCount();
|
|
11
11
|
const allTodos$ = querySQL(`select * from todos`, { map: parseTodos });
|
|
12
12
|
const { result } = renderHook(() => {
|
|
13
|
-
renderCount
|
|
13
|
+
renderCount.inc();
|
|
14
14
|
return LiveStoreReact.useQuery(allTodos$);
|
|
15
15
|
}, { wrapper });
|
|
16
16
|
expect(result.current.length).toBe(0);
|
|
17
|
-
expect(renderCount).toBe(1);
|
|
17
|
+
expect(renderCount.val).toBe(1);
|
|
18
18
|
act(() => store.mutate(cud.todos.insert({ id: 't1', text: 'buy milk', completed: false })));
|
|
19
19
|
expect(result.current.length).toBe(1);
|
|
20
20
|
expect(result.current[0].text).toBe('buy milk');
|
|
21
|
-
expect(renderCount).toBe(2);
|
|
21
|
+
expect(renderCount.val).toBe(2);
|
|
22
22
|
});
|
|
23
23
|
it('same `useQuery` hook invoked with different queries', async () => {
|
|
24
|
-
|
|
25
|
-
const
|
|
24
|
+
const { wrapper, store, cud, makeRenderCount } = await makeTodoMvc();
|
|
25
|
+
const renderCount = makeRenderCount();
|
|
26
26
|
const todo1$ = querySQL(`select * from todos where id = 't1'`, { label: 'libraryTracksView1', map: parseTodos });
|
|
27
27
|
const todo2$ = querySQL(`select * from todos where id = 't2'`, { label: 'libraryTracksView2', map: parseTodos });
|
|
28
28
|
store.mutate(cud.todos.insert({ id: 't1', text: 'buy milk', completed: false }), cud.todos.insert({ id: 't2', text: 'buy eggs', completed: false }));
|
|
29
29
|
const { result, rerender } = renderHook((todoId) => {
|
|
30
|
-
renderCount
|
|
30
|
+
renderCount.inc();
|
|
31
31
|
const query$ = React.useMemo(() => (todoId === 't1' ? todo1$ : todo2$), [todoId]);
|
|
32
32
|
return LiveStoreReact.useQuery(query$)[0].text;
|
|
33
33
|
}, { wrapper, initialProps: 't1' });
|
|
34
34
|
expect(result.current).toBe('buy milk');
|
|
35
|
-
expect(renderCount).toBe(1);
|
|
35
|
+
expect(renderCount.val).toBe(1);
|
|
36
36
|
act(() => store.mutate(cud.todos.update({ where: { id: 't1' }, values: { text: 'buy soy milk' } })));
|
|
37
37
|
expect(result.current).toBe('buy soy milk');
|
|
38
|
-
expect(renderCount).toBe(2);
|
|
38
|
+
expect(renderCount.val).toBe(2);
|
|
39
39
|
rerender('t2');
|
|
40
40
|
expect(result.current).toBe('buy eggs');
|
|
41
|
-
expect(renderCount).toBe(3);
|
|
41
|
+
expect(renderCount.val).toBe(3);
|
|
42
42
|
});
|
|
43
43
|
});
|
|
44
44
|
//# sourceMappingURL=useQuery.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useQuery.test.js","sourceRoot":"","sources":["../../src/react/useQuery.test.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAE7C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAA;AACpD,OAAO,KAAK,cAAc,MAAM,YAAY,CAAA;AAE5C,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;QACtB,
|
|
1
|
+
{"version":3,"file":"useQuery.test.js","sourceRoot":"","sources":["../../src/react/useQuery.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRow.d.ts","sourceRoot":"","sources":["../../src/react/useRow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"useRow.d.ts","sourceRoot":"","sources":["../../src/react/useRow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAKnD,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAMhD,MAAM,MAAM,YAAY,CAAC,SAAS,SAAS,QAAQ,CAAC,QAAQ,IAAI;IAC9D,GAAG,EAAE,SAAS,CAAC,SAAS,CAAC;IACzB,MAAM,EAAE,YAAY,CAAC,SAAS,CAAC;IAC/B,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;CACnD,CAAA;AAED,MAAM,MAAM,yBAAyB,CAAC,SAAS,SAAS,QAAQ,CAAC,QAAQ,IAAI;IAC3E,aAAa,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAA;CAC9C,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,EAAE;IACnB,CACE,SAAS,SAAS,QAAQ,CAAC,QAAQ,CACjC,QAAQ,CAAC,qBAAqB,EAC9B,OAAO,EACP,QAAQ,CAAC,YAAY,GAAG;QAAE,WAAW,EAAE,IAAI,CAAA;KAAE,CAC9C,EAED,KAAK,EAAE,SAAS,EAChB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,YAAY,CAAC,SAAS,CAAC,CAAA;IAC1B,CACE,SAAS,SAAS,QAAQ,CAAC,QAAQ,CACjC,QAAQ,CAAC,qBAAqB,EAC9B,OAAO,EACP,QAAQ,CAAC,YAAY,GAAG;QAAE,WAAW,EAAE,KAAK,CAAA;KAAE,CAC/C,EAED,KAAK,EAAE,SAAS,EAEhB,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE,iBAAiB,GAAG,yBAAyB,CAAC,SAAS,CAAC,GACjE,YAAY,CAAC,SAAS,CAAC,CAAA;CAiF3B,CAAA;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAA;AAC7C,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;AAE7D,MAAM,MAAM,YAAY,CAAC,SAAS,SAAS,QAAQ,CAAC,QAAQ,IAAI,SAAS,CAAC,gBAAgB,CAAC,SAAS,IAAI,GACpG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAC9C;KACG,CAAC,IAAI,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACrF,GAAG;IACF,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;CACjE,CAAA"}
|