extra-react-hooks 0.8.3 → 0.8.4

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 CHANGED
@@ -167,9 +167,17 @@ function useRenderCounter(): number
167
167
 
168
168
  ### useIIFE
169
169
  ```ts
170
- function useIIFE(iife: () => void, deps: React.DependencyList): void
170
+ function useIIFE(
171
+ iife: (() => () => void)
172
+ | (() => void)
173
+ , deps?: React.DependencyList
174
+ ): void
171
175
  ```
172
176
 
177
+ [If you don't need an effect], then you probably need an IIFE.
178
+
179
+ [If you don't need an effect]: https://react.dev/learn/you-might-not-need-an-effect
180
+
173
181
  ### useMemoWithCleanup
174
182
  ```ts
175
183
  function useMemoWithCleanup<T>(
@@ -1,9 +1,10 @@
1
- import { useRef, useEffect } from 'react';
1
+ import { useRef } from 'react';
2
2
  import { setTimeout } from 'extra-timers';
3
+ import { useIIFE } from './use-iife.js';
3
4
  export function useDebounce(fn, timeout, deps) {
4
5
  const fnRef = useRef(fn);
5
6
  const cancelTimeoutRef = useRef(undefined);
6
- useEffect(() => {
7
+ useIIFE(() => {
7
8
  fnRef.current = fn;
8
9
  }, deps);
9
10
  return (...args) => {
@@ -1 +1 @@
1
- {"version":3,"file":"use-debounce.js","sourceRoot":"","sources":["../src/use-debounce.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAEzC,MAAM,UAAU,WAAW,CACzB,EAA2B,EAC3B,OAAe,EACf,IAA2B;IAE3B,MAAM,KAAK,GAAG,MAAM,CAA0B,EAAE,CAAC,CAAA;IACjD,MAAM,gBAAgB,GAAG,MAAM,CAAa,SAAS,CAAC,CAAA;IAEtD,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,CAAC,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,OAAO,CAAC,GAAG,IAAU,EAAQ,EAAE;;QAC7B,MAAA,gBAAgB,CAAC,OAAO,gEAAI,CAAA;QAE5B,gBAAgB,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE;YAClD,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;YAEtB,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAA;QACtC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"use-debounce.js","sourceRoot":"","sources":["../src/use-debounce.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,UAAU,WAAW,CACzB,EAA2B,EAC3B,OAAe,EACf,IAA2B;IAE3B,MAAM,KAAK,GAAG,MAAM,CAA0B,EAAE,CAAC,CAAA;IACjD,MAAM,gBAAgB,GAAG,MAAM,CAAa,SAAS,CAAC,CAAA;IAEtD,OAAO,CAAC,GAAG,EAAE;QACX,KAAK,CAAC,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,OAAO,CAAC,GAAG,IAAU,EAAQ,EAAE;;QAC7B,MAAA,gBAAgB,CAAC,OAAO,gEAAI,CAAA;QAE5B,gBAAgB,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE;YAClD,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;YAEtB,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAA;QACtC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC"}
@@ -1,10 +1,11 @@
1
- import { useMemo, useEffect } from 'react';
1
+ import { useMemo } from 'react';
2
2
  import { ObservableFiniteStateMachine } from 'extra-fsm';
3
3
  import { useForceUpdate } from './use-force-update.js';
4
+ import { useIIFE } from './use-iife.js';
4
5
  export function useFiniteStateMachine(schema, initialState) {
5
6
  const forceUpdate = useForceUpdate();
6
7
  const fsm = useMemo(() => new ObservableFiniteStateMachine(schema, initialState), [schema, initialState]);
7
- useEffect(() => {
8
+ useIIFE(() => {
8
9
  const observable = fsm.observeStateChanges();
9
10
  const subscription = observable.subscribe(() => forceUpdate());
10
11
  return () => subscription.unsubscribe();
@@ -1 +1 @@
1
- {"version":3,"file":"use-finite-state-machine.js","sourceRoot":"","sources":["../src/use-finite-state-machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,4BAA4B,EAA6B,MAAM,WAAW,CAAA;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAOtD,MAAM,UAAU,qBAAqB,CAInC,MAA+C,EAC/C,YAAmB;IAEnB,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,GAAG,GAAG,OAAO,CACjB,GAAG,EAAE,CAAC,IAAI,4BAA4B,CAAC,MAAM,EAAE,YAAY,CAAC,EAC5D,CAAC,MAAM,EAAE,YAAY,CAAC,CACvB,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,GAAG,CAAC,mBAAmB,EAAE,CAAA;QAC5C,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAA;QAE9D,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAA;IACzC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IAET,OAAO,GAAG,CAAA;AACZ,CAAC"}
1
+ {"version":3,"file":"use-finite-state-machine.js","sourceRoot":"","sources":["../src/use-finite-state-machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,4BAA4B,EAA6B,MAAM,WAAW,CAAA;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAOvC,MAAM,UAAU,qBAAqB,CAInC,MAA+C,EAC/C,YAAmB;IAEnB,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,GAAG,GAAG,OAAO,CACjB,GAAG,EAAE,CAAC,IAAI,4BAA4B,CAAC,MAAM,EAAE,YAAY,CAAC,EAC5D,CAAC,MAAM,EAAE,YAAY,CAAC,CACvB,CAAA;IAED,OAAO,CAAC,GAAG,EAAE;QACX,MAAM,UAAU,GAAG,GAAG,CAAC,mBAAmB,EAAE,CAAA;QAC5C,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAA;QAE9D,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,CAAA;IACzC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IAET,OAAO,GAAG,CAAA;AACZ,CAAC"}
package/lib/use-iife.d.ts CHANGED
@@ -1 +1 @@
1
- export declare function useIIFE(iife: () => void, deps: React.DependencyList): void;
1
+ export declare function useIIFE(iife: (() => () => void) | (() => void), deps?: React.DependencyList): void;
package/lib/use-iife.js CHANGED
@@ -1,21 +1,26 @@
1
- import { useRef } from 'react';
2
- import { useIsFirstRender } from "./use-is-first-render.js";
1
+ import { useLayoutEffect, useRef } from 'react';
2
+ import { useIsFirstRender } from './use-is-first-render.js';
3
3
  export function useIIFE(iife, deps) {
4
- const oldDeps = useRef([]);
4
+ var _a;
5
5
  const isFirstRender = useIsFirstRender();
6
- if (isFirstRender()) {
7
- iife();
8
- }
9
- else {
10
- if (deps.length === oldDeps.current.length) {
11
- if (deps.some((x, i) => x !== oldDeps.current[i])) {
12
- iife();
13
- }
14
- }
15
- else {
16
- iife();
17
- }
6
+ const oldDeps = useRef([]);
7
+ const cleanup = useRef(undefined);
8
+ useLayoutEffect(() => {
9
+ return () => {
10
+ var _a;
11
+ (_a = cleanup.current) === null || _a === void 0 ? void 0 : _a.call(cleanup);
12
+ cleanup.current = undefined;
13
+ };
14
+ }, []);
15
+ if (!deps ||
16
+ isFirstRender() ||
17
+ deps.length !== oldDeps.current.length ||
18
+ deps.some((x, i) => x !== oldDeps.current[i])) {
19
+ (_a = cleanup.current) === null || _a === void 0 ? void 0 : _a.call(cleanup);
20
+ cleanup.current = iife();
21
+ oldDeps.current = deps
22
+ ? [...deps]
23
+ : [];
18
24
  }
19
- oldDeps.current = Array.from(deps);
20
25
  }
21
26
  //# sourceMappingURL=use-iife.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"use-iife.js","sourceRoot":"","sources":["../src/use-iife.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,gBAAgB,EAAE,iCAAmC;AAE9D,MAAM,UAAU,OAAO,CAAC,IAAgB,EAAE,IAA0B;IAClE,MAAM,OAAO,GAAG,MAAM,CAAuB,EAAE,CAAC,CAAA;IAChD,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IAExC,IAAI,aAAa,EAAE,EAAE,CAAC;QACpB,IAAI,EAAE,CAAA;IACR,CAAC;SAAM,CAAC;QACN,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,IAAI,EAAE,CAAA;YACR,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,EAAE,CAAA;QACR,CAAC;IACH,CAAC;IAED,OAAO,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACpC,CAAC"}
1
+ {"version":3,"file":"use-iife.js","sourceRoot":"","sources":["../src/use-iife.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAE3D,MAAM,UAAU,OAAO,CACrB,IACkB,EAClB,IAA2B;;IAE3B,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IACxC,MAAM,OAAO,GAAG,MAAM,CAAuB,EAAE,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,MAAM,CAAsB,SAAS,CAAC,CAAA;IAEtD,eAAe,CAAC,GAAG,EAAE;QACnB,OAAO,GAAG,EAAE;;YACV,MAAA,OAAO,CAAC,OAAO,uDAAI,CAAA;YACnB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;QAC7B,CAAC,CAAA;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,IACE,CAAC,IAAI;QACL,aAAa,EAAE;QACf,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,MAAM;QACtC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAC7C,CAAC;QACD,MAAA,OAAO,CAAC,OAAO,uDAAI,CAAA;QACnB,OAAO,CAAC,OAAO,GAAG,IAAI,EAAE,CAAA;QAExB,OAAO,CAAC,OAAO,GAAG,IAAI;YACN,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;YACX,CAAC,CAAC,EAAE,CAAA;IACtB,CAAC;AACH,CAAC"}
@@ -1,9 +1,9 @@
1
- import { useState, useMemo, useEffect } from 'react';
1
+ import { useState, useMemo } from 'react';
2
+ import { useIIFE } from './use-iife.js';
2
3
  export function useMediaQuery(query) {
3
4
  const mediaQuery = useMemo(() => matchMedia(query), [query]);
4
5
  const [matches, setMatches] = useState(mediaQuery.matches);
5
- useEffect(() => {
6
- updateMatches();
6
+ useIIFE(() => {
7
7
  mediaQuery.addEventListener('change', updateMatches);
8
8
  return () => mediaQuery.removeEventListener('change', updateMatches);
9
9
  function updateMatches() {
@@ -1 +1 @@
1
- {"version":3,"file":"use-media-query.js","sourceRoot":"","sources":["../src/use-media-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEpD,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAC5D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAU,UAAU,CAAC,OAAO,CAAC,CAAA;IAEnE,SAAS,CAAC,GAAG,EAAE;QACb,aAAa,EAAE,CAAA;QAEf,UAAU,CAAC,gBAAgB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QACpD,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAEpE,SAAS,aAAa;YACpB,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QAChC,CAAC;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO,OAAO,CAAA;AAChB,CAAC"}
1
+ {"version":3,"file":"use-media-query.js","sourceRoot":"","sources":["../src/use-media-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAC5D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAU,UAAU,CAAC,OAAO,CAAC,CAAA;IAEnE,OAAO,CAAC,GAAG,EAAE;QACX,UAAU,CAAC,gBAAgB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QACpD,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAEpE,SAAS,aAAa;YACpB,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QAChC,CAAC;IACH,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;IAEhB,OAAO,OAAO,CAAA;AAChB,CAAC"}
@@ -1,7 +1,8 @@
1
- import { useMemo, useEffect } from 'react';
1
+ import { useMemo } from 'react';
2
+ import { useIIFE } from './use-iife.js';
2
3
  export function useMemoWithCleanup(factory, cleanup, deps) {
3
4
  const value = useMemo(factory, deps);
4
- useEffect(() => {
5
+ useIIFE(() => {
5
6
  return () => cleanup(value);
6
7
  }, deps);
7
8
  return value;
@@ -1 +1 @@
1
- {"version":3,"file":"use-memo-with-cleanup.js","sourceRoot":"","sources":["../src/use-memo-with-cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAE1C,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,OAA2B,EAC3B,IAA2B;IAE3B,MAAM,KAAK,GAAG,OAAO,CACnB,OAAO,EAEP,IAAI,CACL,CAAA;IAED,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,OAAO,KAAK,CAAA;AACd,CAAC"}
1
+ {"version":3,"file":"use-memo-with-cleanup.js","sourceRoot":"","sources":["../src/use-memo-with-cleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,OAA2B,EAC3B,IAA2B;IAE3B,MAAM,KAAK,GAAG,OAAO,CACnB,OAAO,EAEP,IAAI,CACL,CAAA;IAED,OAAO,CAAC,GAAG,EAAE;QACX,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,OAAO,KAAK,CAAA;AACd,CAAC"}
@@ -1,19 +1,20 @@
1
- import { useEffect, useState } from 'react';
1
+ import { useState } from 'react';
2
2
  import { isntNaN } from 'extra-utils';
3
+ import { useIIFE } from './use-iife.js';
3
4
  export function useNumberInput({ value, lazy, onChange }) {
4
5
  const [displayValue, setDisplayValue] = useState(() => value.toString());
5
- useEffect(() => {
6
+ useIIFE(() => {
6
7
  if (!lazy) {
7
8
  const oldValue = Number(displayValue);
8
9
  if (oldValue !== value)
9
10
  setDisplayValue(value.toString());
10
11
  }
11
- }, [value, displayValue]);
12
- useEffect(() => {
12
+ }, [lazy, value, displayValue]);
13
+ useIIFE(() => {
13
14
  if (lazy) {
14
15
  setDisplayValue(value.toString());
15
16
  }
16
- }, [value]);
17
+ }, [lazy, value]);
17
18
  return {
18
19
  getInputProps() {
19
20
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"use-number-input.js","sourceRoot":"","sources":["../src/use-number-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,MAAM,UAAU,cAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAKrD;IAQC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAS,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;IAEhF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;YAGrC,IAAI,QAAQ,KAAK,KAAK;gBAAE,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAA;IAEzB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE,CAAC;YAGT,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QACnC,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAEX,OAAO;QACL,aAAa;YACX,OAAO;gBACL,KAAK,EAAE,YAAY;gBACnB,QAAQ,CAAC,CAAC;oBACR,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAE/B,IAAI,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;wBAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;4BACV,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,aAAa,CAAA;4BAEvC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gCAC5C,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;4BAC3B,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,MAAM,CAAC,CAAC;oBACN,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC;wBAC7B,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,aAAa,CAAA;wBAEvC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,KAAK,CAAC,EAAE,CAAC;4BACvD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;4BAIxB,eAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;4BAEpC,OAAM;wBACR,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,IAAI,EAAE,CAAC;4BACV,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;4BAErB,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;4BAEjC,OAAM;wBACR,CAAC;oBACH,CAAC;oBAGD,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACnC,CAAC;aACF,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"use-number-input.js","sourceRoot":"","sources":["../src/use-number-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,UAAU,cAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAKrD;IAQC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAS,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;IAEhF,OAAO,CAAC,GAAG,EAAE;QACX,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;YAGrC,IAAI,QAAQ,KAAK,KAAK;gBAAE,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAA;IAE/B,OAAO,CAAC,GAAG,EAAE;QACX,IAAI,IAAI,EAAE,CAAC;YAGT,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;QACnC,CAAC;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;IAEjB,OAAO;QACL,aAAa;YACX,OAAO;gBACL,KAAK,EAAE,YAAY;gBACnB,QAAQ,CAAC,CAAC;oBACR,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAE/B,IAAI,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;wBAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;4BACV,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,aAAa,CAAA;4BAEvC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gCAC5C,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;4BAC3B,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,MAAM,CAAC,CAAC;oBACN,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC;wBAC7B,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,aAAa,CAAA;wBAEvC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,KAAK,CAAC,EAAE,CAAC;4BACvD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;4BAIxB,eAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;4BAEpC,OAAM;wBACR,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,IAAI,EAAE,CAAC;4BACV,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;4BAErB,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;4BAEjC,OAAM;wBACR,CAAC;oBACH,CAAC;oBAGD,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACnC,CAAC;aACF,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "extra-react-hooks",
3
- "version": "0.8.3",
3
+ "version": "0.8.4",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "files": [
@@ -1,5 +1,6 @@
1
- import { useRef, useEffect } from 'react'
1
+ import { useRef } from 'react'
2
2
  import { setTimeout } from 'extra-timers'
3
+ import { useIIFE } from './use-iife.js'
3
4
 
4
5
  export function useDebounce<Args extends unknown[]>(
5
6
  fn: (...args: Args) => void
@@ -9,7 +10,7 @@ export function useDebounce<Args extends unknown[]>(
9
10
  const fnRef = useRef<(...args: Args) => void>(fn)
10
11
  const cancelTimeoutRef = useRef<() => void>(undefined)
11
12
 
12
- useEffect(() => {
13
+ useIIFE(() => {
13
14
  fnRef.current = fn
14
15
  }, deps)
15
16
 
@@ -1,6 +1,7 @@
1
- import { useMemo, useEffect } from 'react'
1
+ import { useMemo } from 'react'
2
2
  import { ObservableFiniteStateMachine, IFiniteStateMachineSchema } from 'extra-fsm'
3
3
  import { useForceUpdate } from './use-force-update.js'
4
+ import { useIIFE } from './use-iife.js'
4
5
 
5
6
  export type {
6
7
  ObservableFiniteStateMachine
@@ -20,7 +21,7 @@ export function useFiniteStateMachine<
20
21
  , [schema, initialState]
21
22
  )
22
23
 
23
- useEffect(() => {
24
+ useIIFE(() => {
24
25
  const observable = fsm.observeStateChanges()
25
26
  const subscription = observable.subscribe(() => forceUpdate())
26
27
 
package/src/use-iife.ts CHANGED
@@ -1,21 +1,33 @@
1
- import { useRef } from 'react'
2
- import { useIsFirstRender } from '@src/use-is-first-render.js'
1
+ import { useLayoutEffect, useRef } from 'react'
2
+ import { useIsFirstRender } from './use-is-first-render.js'
3
3
 
4
- export function useIIFE(iife: () => void, deps: React.DependencyList): void {
5
- const oldDeps = useRef<React.DependencyList>([])
4
+ export function useIIFE(
5
+ iife: (() => () => void)
6
+ | (() => void)
7
+ , deps?: React.DependencyList
8
+ ): void {
6
9
  const isFirstRender = useIsFirstRender()
10
+ const oldDeps = useRef<React.DependencyList>([])
11
+ const cleanup = useRef<(() => void) | void>(undefined)
7
12
 
8
- if (isFirstRender()) {
9
- iife()
10
- } else {
11
- if (deps.length === oldDeps.current.length) {
12
- if (deps.some((x, i) => x !== oldDeps.current[i])) {
13
- iife()
14
- }
15
- } else {
16
- iife()
13
+ useLayoutEffect(() => {
14
+ return () => {
15
+ cleanup.current?.()
16
+ cleanup.current = undefined
17
17
  }
18
- }
18
+ }, [])
19
19
 
20
- oldDeps.current = Array.from(deps)
20
+ if (
21
+ !deps ||
22
+ isFirstRender() ||
23
+ deps.length !== oldDeps.current.length ||
24
+ deps.some((x, i) => x !== oldDeps.current[i])
25
+ ) {
26
+ cleanup.current?.()
27
+ cleanup.current = iife()
28
+
29
+ oldDeps.current = deps
30
+ ? [...deps]
31
+ : []
32
+ }
21
33
  }
@@ -1,12 +1,11 @@
1
- import { useState, useMemo, useEffect } from 'react'
1
+ import { useState, useMemo } from 'react'
2
+ import { useIIFE } from './use-iife.js'
2
3
 
3
4
  export function useMediaQuery(query: string): boolean {
4
5
  const mediaQuery = useMemo(() => matchMedia(query), [query])
5
6
  const [matches, setMatches] = useState<boolean>(mediaQuery.matches)
6
7
 
7
- useEffect(() => {
8
- updateMatches()
9
-
8
+ useIIFE(() => {
10
9
  mediaQuery.addEventListener('change', updateMatches)
11
10
  return () => mediaQuery.removeEventListener('change', updateMatches)
12
11
 
@@ -1,4 +1,5 @@
1
- import { useMemo, useEffect } from 'react'
1
+ import { useMemo } from 'react'
2
+ import { useIIFE } from './use-iife.js'
2
3
 
3
4
  export function useMemoWithCleanup<T>(
4
5
  factory: () => T
@@ -11,7 +12,7 @@ export function useMemoWithCleanup<T>(
11
12
  , deps
12
13
  )
13
14
 
14
- useEffect(() => {
15
+ useIIFE(() => {
15
16
  return () => cleanup(value)
16
17
  }, deps)
17
18
 
@@ -1,5 +1,6 @@
1
- import { useEffect, useState } from 'react'
1
+ import { useState } from 'react'
2
2
  import { isntNaN } from 'extra-utils'
3
+ import { useIIFE } from './use-iife.js'
3
4
 
4
5
  export function useNumberInput({ value, lazy, onChange }: {
5
6
  value: number
@@ -16,22 +17,22 @@ export function useNumberInput({ value, lazy, onChange }: {
16
17
  } {
17
18
  const [displayValue, setDisplayValue] = useState<string>(() => value.toString())
18
19
 
19
- useEffect(() => {
20
+ useIIFE(() => {
20
21
  if (!lazy) {
21
22
  const oldValue = Number(displayValue)
22
23
 
23
24
  // 以传入的值为准, 但只有在实际代表的值不同时, 才更新.
24
25
  if (oldValue !== value) setDisplayValue(value.toString())
25
26
  }
26
- }, [value, displayValue])
27
+ }, [lazy, value, displayValue])
27
28
 
28
- useEffect(() => {
29
+ useIIFE(() => {
29
30
  if (lazy) {
30
31
  // 以传入的值为准.
31
32
  // 由于onChange是惰性调用, 不需要检查值的相等性.
32
33
  setDisplayValue(value.toString())
33
34
  }
34
- }, [value])
35
+ }, [lazy, value])
35
36
 
36
37
  return {
37
38
  getInputProps() {