@latticexyz/react 1.34.0 → 1.35.0
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/CHANGELOG.md +4 -0
- package/dist/index.js +69 -11
- package/dist/index.js.map +1 -1
- package/dist/useEntityQuery.d.ts +2 -4
- package/dist/utils/useDeepMemo.d.ts +1 -0
- package/package.json +12 -9
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.35.0](https://github.com/latticexyz/mud/compare/v1.34.0...v1.35.0) (2023-02-15)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @latticexyz/react
|
|
9
|
+
|
|
6
10
|
# [1.34.0](https://github.com/latticexyz/mud/compare/v1.33.1...v1.34.0) (2023-01-29)
|
|
7
11
|
|
|
8
12
|
**Note:** Version bump only for package @latticexyz/react
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getComponentValue, defineQuery, Has, isComponentUpdate } from '@latticexyz/recs';
|
|
2
2
|
import { useState, useEffect, useMemo } from 'react';
|
|
3
|
+
import { map, distinctUntilChanged } from 'rxjs';
|
|
3
4
|
|
|
4
5
|
function useComponentValue(component, entityIndex, defaultValue) {
|
|
5
6
|
const [value, setValue] = useState(entityIndex != null ? getComponentValue(component, entityIndex) : undefined);
|
|
@@ -30,20 +31,77 @@ const useDeprecatedComputedValue = (computedValue) => {
|
|
|
30
31
|
return value;
|
|
31
32
|
};
|
|
32
33
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
34
|
+
// do not edit .js files directly - edit src/index.jst
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
var fastDeepEqual = function equal(a, b) {
|
|
39
|
+
if (a === b) return true;
|
|
40
|
+
|
|
41
|
+
if (a && b && typeof a == 'object' && typeof b == 'object') {
|
|
42
|
+
if (a.constructor !== b.constructor) return false;
|
|
43
|
+
|
|
44
|
+
var length, i, keys;
|
|
45
|
+
if (Array.isArray(a)) {
|
|
46
|
+
length = a.length;
|
|
47
|
+
if (length != b.length) return false;
|
|
48
|
+
for (i = length; i-- !== 0;)
|
|
49
|
+
if (!equal(a[i], b[i])) return false;
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
if (a.constructor === RegExp) return a.source === b.source && a.flags === b.flags;
|
|
56
|
+
if (a.valueOf !== Object.prototype.valueOf) return a.valueOf() === b.valueOf();
|
|
57
|
+
if (a.toString !== Object.prototype.toString) return a.toString() === b.toString();
|
|
58
|
+
|
|
59
|
+
keys = Object.keys(a);
|
|
60
|
+
length = keys.length;
|
|
61
|
+
if (length !== Object.keys(b).length) return false;
|
|
62
|
+
|
|
63
|
+
for (i = length; i-- !== 0;)
|
|
64
|
+
if (!Object.prototype.hasOwnProperty.call(b, keys[i])) return false;
|
|
65
|
+
|
|
66
|
+
for (i = length; i-- !== 0;) {
|
|
67
|
+
var key = keys[i];
|
|
68
|
+
|
|
69
|
+
if (!equal(a[key], b[key])) return false;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
return true;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
// true if both NaN, false otherwise
|
|
76
|
+
return a!==a && b!==b;
|
|
77
|
+
};
|
|
78
|
+
|
|
79
|
+
const useDeepMemo = (currentValue) => {
|
|
80
|
+
const [stableValue, setStableValue] = useState(currentValue);
|
|
38
81
|
useEffect(() => {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
setValue([...queryResult.matching]);
|
|
82
|
+
if (!fastDeepEqual(currentValue, stableValue)) {
|
|
83
|
+
setStableValue(currentValue);
|
|
42
84
|
}
|
|
43
|
-
|
|
85
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
86
|
+
}, [currentValue]);
|
|
87
|
+
return stableValue;
|
|
88
|
+
};
|
|
89
|
+
|
|
90
|
+
// This does a little more rendering than is necessary when arguments change,
|
|
91
|
+
// but at least it's giving correct results now. Will optimize later!
|
|
92
|
+
function useEntityQuery(fragments) {
|
|
93
|
+
const stableFragments = useDeepMemo(fragments);
|
|
94
|
+
const query = useMemo(() => defineQuery(stableFragments, { runOnInit: true }), [stableFragments]);
|
|
95
|
+
const [entities, setEntities] = useState([...query.matching]);
|
|
96
|
+
useEffect(() => {
|
|
97
|
+
setEntities([...query.matching]);
|
|
98
|
+
const subscription = query.update$
|
|
99
|
+
.pipe(map(() => [...query.matching]))
|
|
100
|
+
.pipe(distinctUntilChanged((a, b) => fastDeepEqual(a, b)))
|
|
101
|
+
.subscribe((entities) => setEntities(entities));
|
|
44
102
|
return () => subscription.unsubscribe();
|
|
45
|
-
}, [
|
|
46
|
-
return
|
|
103
|
+
}, [query]);
|
|
104
|
+
return entities;
|
|
47
105
|
}
|
|
48
106
|
|
|
49
107
|
function useObservableValue(observable, defaultValue) {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../src/useComponentValue.ts","../src/useDeprecatedComputedValue.ts","../src/useEntityQuery.ts","../src/useObservableValue.ts"],"sourcesContent":[null,null,null,null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../src/useComponentValue.ts","../src/useDeprecatedComputedValue.ts","../../../node_modules/fast-deep-equal/index.js","../src/utils/useDeepMemo.ts","../src/useEntityQuery.ts","../src/useObservableValue.ts"],"sourcesContent":[null,null,"'use strict';\n\n// do not edit .js files directly - edit src/index.jst\n\n\n\nmodule.exports = function equal(a, b) {\n if (a === b) return true;\n\n if (a && b && typeof a == 'object' && typeof b == 'object') {\n if (a.constructor !== b.constructor) return false;\n\n var length, i, keys;\n if (Array.isArray(a)) {\n length = a.length;\n if (length != b.length) return false;\n for (i = length; i-- !== 0;)\n if (!equal(a[i], b[i])) return false;\n return true;\n }\n\n\n\n if (a.constructor === RegExp) return a.source === b.source && a.flags === b.flags;\n if (a.valueOf !== Object.prototype.valueOf) return a.valueOf() === b.valueOf();\n if (a.toString !== Object.prototype.toString) return a.toString() === b.toString();\n\n keys = Object.keys(a);\n length = keys.length;\n if (length !== Object.keys(b).length) return false;\n\n for (i = length; i-- !== 0;)\n if (!Object.prototype.hasOwnProperty.call(b, keys[i])) return false;\n\n for (i = length; i-- !== 0;) {\n var key = keys[i];\n\n if (!equal(a[key], b[key])) return false;\n }\n\n return true;\n }\n\n // true if both NaN, false otherwise\n return a!==a && b!==b;\n};\n",null,null,null],"names":["isEqual"],"mappings":"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"}
|
package/dist/useEntityQuery.d.ts
CHANGED
|
@@ -1,4 +1,2 @@
|
|
|
1
|
-
import {
|
|
2
|
-
declare
|
|
3
|
-
export declare function useEntityQuery(...args: Args): import("@latticexyz/recs").EntityIndex[];
|
|
4
|
-
export {};
|
|
1
|
+
import { QueryFragment } from "@latticexyz/recs";
|
|
2
|
+
export declare function useEntityQuery(fragments: QueryFragment[]): import("@latticexyz/recs").EntityIndex[];
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const useDeepMemo: <T>(currentValue: T) => T;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@latticexyz/react",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.35.0",
|
|
4
4
|
"description": "React tools for MUD client.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"source": "src/index.ts",
|
|
@@ -20,8 +20,17 @@
|
|
|
20
20
|
"build": "rimraf dist && rollup -c rollup.config.js",
|
|
21
21
|
"release": "npm publish || echo 'version already published'"
|
|
22
22
|
},
|
|
23
|
+
"peerDependencies": {
|
|
24
|
+
"@latticexyz/recs": "^1.32.0",
|
|
25
|
+
"mobx": "^6.4.2",
|
|
26
|
+
"react": "^18.2.0",
|
|
27
|
+
"rxjs": "^7.5.5"
|
|
28
|
+
},
|
|
29
|
+
"dependencies": {
|
|
30
|
+
"fast-deep-equal": "^3.1.3"
|
|
31
|
+
},
|
|
23
32
|
"devDependencies": {
|
|
24
|
-
"@latticexyz/recs": "^1.
|
|
33
|
+
"@latticexyz/recs": "^1.35.0",
|
|
25
34
|
"@rollup/plugin-json": "^4.1.0",
|
|
26
35
|
"@rollup/plugin-node-resolve": "^13.1.3",
|
|
27
36
|
"@rollup/plugin-typescript": "^8.3.1",
|
|
@@ -44,11 +53,5 @@
|
|
|
44
53
|
"typedoc-plugin-markdown": "^3.13.6",
|
|
45
54
|
"typescript": "^4.5.5"
|
|
46
55
|
},
|
|
47
|
-
"
|
|
48
|
-
"@latticexyz/recs": "^1.32.0",
|
|
49
|
-
"mobx": "^6.4.2",
|
|
50
|
-
"react": "^18.2.0",
|
|
51
|
-
"rxjs": "^7.5.5"
|
|
52
|
-
},
|
|
53
|
-
"gitHead": "a722415d7a91dab1cc849f1c8c877146872a0444"
|
|
56
|
+
"gitHead": "1d894904dd99b617afb8e8b1c334f631f51ffb4f"
|
|
54
57
|
}
|