extra-react-store 0.2.1 → 0.2.3
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/lib/store.js +1 -2
- package/lib/store.js.map +1 -1
- package/lib/use-selector.js +26 -10
- package/lib/use-selector.js.map +1 -1
- package/package.json +8 -8
- package/src/use-selector.ts +26 -10
package/lib/store.js
CHANGED
package/lib/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGhD,MAAM,OAAO,KAAK;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGhD,MAAM,OAAO,KAAK;IAIhB,YAAY,YAAmB;QAFvB,YAAO,GAAG,IAAI,OAAO,EAAoC,CAAA;QAG/D,IAAI,CAAC,KAAK,GAAG,YAAY,CAAA;IAC3B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,QAAQ,CAAC,QAAe;QACtB,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAA;QACrB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;IAC7C,CAAC;IAED,SAAS,CAAC,EAA0B;QAClC,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;IAC5C,CAAC;CACF"}
|
package/lib/use-selector.js
CHANGED
|
@@ -1,19 +1,35 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { useIIFE } from 'extra-react-hooks';
|
|
1
|
+
import { useContext, useRef } from 'react';
|
|
2
|
+
import { useIIFE, useForceUpdate } from 'extra-react-hooks';
|
|
3
3
|
import { isReferenceEqual } from 'extra-utils';
|
|
4
4
|
export function useSelector(context, selector, isEqual = isReferenceEqual) {
|
|
5
|
+
const forceUpdate = useForceUpdate();
|
|
5
6
|
const store = useContext(context);
|
|
6
|
-
const
|
|
7
|
+
const updateRequireRef = useRef(true);
|
|
8
|
+
useIIFE(() => {
|
|
9
|
+
return () => {
|
|
10
|
+
updateRequireRef.current = true;
|
|
11
|
+
};
|
|
12
|
+
}, [selector]);
|
|
13
|
+
const valueRef = useRef(undefined);
|
|
14
|
+
if (updateRequireRef.current) {
|
|
15
|
+
valueRef.current = selector(store.getState());
|
|
16
|
+
updateRequireRef.current = false;
|
|
17
|
+
}
|
|
7
18
|
useIIFE(() => {
|
|
8
|
-
let oldValue = value;
|
|
9
19
|
return store.subscribe(state => {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
20
|
+
try {
|
|
21
|
+
const newValue = selector(state);
|
|
22
|
+
if (!isEqual(valueRef.current, newValue)) {
|
|
23
|
+
valueRef.current = newValue;
|
|
24
|
+
forceUpdate();
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
updateRequireRef.current = true;
|
|
29
|
+
forceUpdate();
|
|
14
30
|
}
|
|
15
31
|
});
|
|
16
|
-
}, [store, selector, isEqual,
|
|
17
|
-
return
|
|
32
|
+
}, [store, selector, isEqual, forceUpdate, valueRef, updateRequireRef]);
|
|
33
|
+
return valueRef.current;
|
|
18
34
|
}
|
|
19
35
|
//# sourceMappingURL=use-selector.js.map
|
package/lib/use-selector.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-selector.js","sourceRoot":"","sources":["../src/use-selector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"use-selector.js","sourceRoot":"","sources":["../src/use-selector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9C,MAAM,UAAU,WAAW,CACzB,OAA4B,EAC5B,QAAiC,EACjC,UAA2C,gBAAgB;IAE3D,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IAEjC,MAAM,gBAAgB,GAAG,MAAM,CAAU,IAAI,CAAC,CAAA;IAC9C,OAAO,CAAC,GAAG,EAAE;QACX,OAAO,GAAG,EAAE;YACV,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAA;QACjC,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEd,MAAM,QAAQ,GAAG,MAAM,CAAQ,SAAS,CAAC,CAAA;IACzC,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC7B,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC7C,gBAAgB,CAAC,OAAO,GAAG,KAAK,CAAA;IAClC,CAAC;IAED,OAAO,CAAC,GAAG,EAAE;QACX,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC7B,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;gBAEhC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;oBAC1C,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAA;oBAC3B,WAAW,EAAE,CAAA;gBACf,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAA;gBAC/B,WAAW,EAAE,CAAA;YACf,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAA;IAEvE,OAAO,QAAQ,CAAC,OAAQ,CAAA;AAC1B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "extra-react-store",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"files": [
|
|
@@ -35,13 +35,13 @@
|
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@commitlint/cli": "^19.8.0",
|
|
37
37
|
"@commitlint/config-conventional": "^19.8.0",
|
|
38
|
-
"@eslint/js": "^9.
|
|
38
|
+
"@eslint/js": "^9.24.0",
|
|
39
39
|
"@testing-library/dom": "^10.4.0",
|
|
40
|
-
"@testing-library/react": "^16.
|
|
40
|
+
"@testing-library/react": "^16.3.0",
|
|
41
41
|
"@types/react": "^19.1.0",
|
|
42
42
|
"@vitejs/plugin-react": "^4.3.4",
|
|
43
|
-
"eslint": "^9.
|
|
44
|
-
"eslint-plugin-react": "^7.37.
|
|
43
|
+
"eslint": "^9.24.0",
|
|
44
|
+
"eslint-plugin-react": "^7.37.5",
|
|
45
45
|
"eslint-plugin-react-hooks": "^5.2.0",
|
|
46
46
|
"husky": "4",
|
|
47
47
|
"immer": "^10.1.1",
|
|
@@ -53,17 +53,17 @@
|
|
|
53
53
|
"standard-version": "^9.3.2",
|
|
54
54
|
"ts-patch": "^3.3.0",
|
|
55
55
|
"tslib": "^2.8.1",
|
|
56
|
-
"typescript": "5.8.
|
|
56
|
+
"typescript": "5.8.3",
|
|
57
57
|
"typescript-eslint": "^8.29.0",
|
|
58
58
|
"typescript-transform-paths": "^3.5.5",
|
|
59
|
-
"vite": "^6.2.
|
|
59
|
+
"vite": "^6.2.5",
|
|
60
60
|
"vite-tsconfig-paths": "^5.1.4",
|
|
61
61
|
"vitest": "^3.1.1"
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
64
|
"@blackglory/prelude": "^0.4.0",
|
|
65
65
|
"@blackglory/structures": "^0.14.10",
|
|
66
|
-
"extra-react-hooks": "^0.8.
|
|
66
|
+
"extra-react-hooks": "^0.8.6",
|
|
67
67
|
"extra-utils": "^5.19.0"
|
|
68
68
|
},
|
|
69
69
|
"peerDependencies": {
|
package/src/use-selector.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { useIIFE } from 'extra-react-hooks'
|
|
1
|
+
import { useContext, useRef } from 'react'
|
|
2
|
+
import { useIIFE, useForceUpdate } from 'extra-react-hooks'
|
|
3
3
|
import { StoreContext } from './types.js'
|
|
4
4
|
import { isReferenceEqual } from 'extra-utils'
|
|
5
5
|
|
|
@@ -8,21 +8,37 @@ export function useSelector<State, Value>(
|
|
|
8
8
|
, selector: (state: State) => Value
|
|
9
9
|
, isEqual: (a: Value, b: Value) => boolean = isReferenceEqual
|
|
10
10
|
): Value {
|
|
11
|
+
const forceUpdate = useForceUpdate()
|
|
11
12
|
const store = useContext(context)
|
|
12
|
-
const [[value], setBox] = useState(() => [selector(store.getState())])
|
|
13
13
|
|
|
14
|
+
const updateRequireRef = useRef<boolean>(true)
|
|
14
15
|
useIIFE(() => {
|
|
15
|
-
|
|
16
|
+
return () => {
|
|
17
|
+
updateRequireRef.current = true
|
|
18
|
+
}
|
|
19
|
+
}, [selector])
|
|
16
20
|
|
|
21
|
+
const valueRef = useRef<Value>(undefined)
|
|
22
|
+
if (updateRequireRef.current) {
|
|
23
|
+
valueRef.current = selector(store.getState())
|
|
24
|
+
updateRequireRef.current = false
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
useIIFE(() => {
|
|
17
28
|
return store.subscribe(state => {
|
|
18
|
-
|
|
29
|
+
try {
|
|
30
|
+
const newValue = selector(state)
|
|
19
31
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
32
|
+
if (!isEqual(valueRef.current!, newValue)) {
|
|
33
|
+
valueRef.current = newValue
|
|
34
|
+
forceUpdate()
|
|
35
|
+
}
|
|
36
|
+
} catch {
|
|
37
|
+
updateRequireRef.current = true
|
|
38
|
+
forceUpdate()
|
|
23
39
|
}
|
|
24
40
|
})
|
|
25
|
-
}, [store, selector, isEqual,
|
|
41
|
+
}, [store, selector, isEqual, forceUpdate, valueRef, updateRequireRef])
|
|
26
42
|
|
|
27
|
-
return
|
|
43
|
+
return valueRef.current!
|
|
28
44
|
}
|