extra-react-hooks 0.8.11 → 0.8.13

package/README.md

@@ -249,3 +249,11 @@ function useNumberInput(params: {
 ```ts
 function useMediaQuery(query: string): boolean
 ```
+
+### useDerivedState
+```ts
+function useDerivedState<T>(value: T): [
+  derivedState: T
+, setDerivedState: (newDerivedState: T) => void
+]
+```

package/lib/index.d.ts

@@ -26,3 +26,4 @@ export * from './use-isomorphic-layout-effect.js';
 export * from './use-debounce.js';
 export * from './use-number-input.js';
 export * from './use-media-query.js';
+export * from './use-derived-state.js';

package/lib/index.js

@@ -26,4 +26,5 @@ export * from './use-isomorphic-layout-effect.js';
 export * from './use-debounce.js';
 export * from './use-number-input.js';
 export * from './use-media-query.js';
+export * from './use-derived-state.js';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,uBAAuB,CAAA;AACrC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,wBAAwB,CAAA;AACtC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,2BAA2B,CAAA;AACzC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,eAAe,CAAA;AAC7B,cAAc,uBAAuB,CAAA;AACrC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,kBAAkB,CAAA;AAChC,cAAc,mCAAmC,CAAA;AACjD,cAAc,mBAAmB,CAAA;AACjC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,sBAAsB,CAAA;AACpC,cAAc,kBAAkB,CAAA;AAChC,cAAc,uBAAuB,CAAA;AACrC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,wBAAwB,CAAA;AACtC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,2BAA2B,CAAA;AACzC,cAAc,6BAA6B,CAAA;AAC3C,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,eAAe,CAAA;AAC7B,cAAc,uBAAuB,CAAA;AACrC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,kBAAkB,CAAA;AAChC,cAAc,mCAAmC,CAAA;AACjD,cAAc,mBAAmB,CAAA;AACjC,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA"}

package/lib/use-derived-state.d.ts

@@ -0,0 +1,4 @@
+export declare function useDerivedState<T>(value: T): [
+    derivedState: T,
+    setDerivedState: (newDerivedState: T) => void
+];

package/lib/use-derived-state.js

@@ -0,0 +1,20 @@
+import { useRef, useCallback } from 'react';
+import { useIIFE } from './use-iife.js';
+import { useForceUpdate } from './use-force-update.js';
+export function useDerivedState(value) {
+    const forceUpdate = useForceUpdate();
+    const stateRef = useRef(value);
+    useIIFE(() => {
+        stateRef.current = value;
+    }, [value]);
+    return [
+        stateRef.current,
+        useCallback(newState => {
+            if (stateRef.current !== newState) {
+                stateRef.current = newState;
+                forceUpdate();
+            }
+        }, [])
+    ];
+}
+//# sourceMappingURL=use-derived-state.js.map

package/lib/use-derived-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-derived-state.js","sourceRoot":"","sources":["../src/use-derived-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,UAAU,eAAe,CAAI,KAAQ;IAIzC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,QAAQ,GAAG,MAAM,CAAI,KAAK,CAAC,CAAA;IAEjC,OAAO,CAAC,GAAG,EAAE;QACX,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAA;IAC1B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAEX,OAAO;QACL,QAAQ,CAAC,OAAO;QAChB,WAAW,CAAC,QAAQ,CAAC,EAAE;YACrB,IAAI,QAAQ,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAClC,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAA;gBAE3B,WAAW,EAAE,CAAA;YACf,CAAC;QACH,CAAC,EAAE,EAAE,CAAC;KACP,CAAA;AACH,CAAC"}

package/lib/use-number-input.js

@@ -1,7 +1,5 @@
-import { useRef } from 'react';
 import { isntNaN } from 'extra-utils';
-import { useIIFE } from './use-iife.js';
-import { useForceUpdate } from './use-force-update.js';
+import { useDerivedState } from './use-derived-state.js';
 export function useNumberInput({ value, lazy, onChange }) {
     const [displayValue, setDisplayValue] = useDerivedState(value.toString());
     return {
@@ -27,35 +25,21 @@ export function useNumberInput({ value, lazy, onChange }) {
                     if (e.target.checkValidity()) {
                         const newValue = e.target.valueAsNumber;
                         if (isntNaN(newValue) && newValue !== value) {
-                            setDisplayValue(newValue.toString(), true);
+                            setDisplayValue(newValue.toString());
                             onChange(newValue, true);
                         }
                         else {
-                            setDisplayValue(value.toString(), true);
+                            setDisplayValue(value.toString());
+                            onChange(value, true);
                         }
                     }
                     else {
-                        setDisplayValue(value.toString(), true);
+                        setDisplayValue(value.toString());
+                        onChange(value, true);
                     }
                 }
             };
         }
     };
 }
-function useDerivedState(dep) {
-    const forceUpdate = useForceUpdate();
-    const stateRef = useRef(dep);
-    useIIFE(() => {
-        stateRef.current = dep;
-    }, [dep]);
-    return [
-        stateRef.current,
-        (newState, force = false) => {
-            if (force || stateRef.current !== newState) {
-                stateRef.current = newState;
-                forceUpdate();
-            }
-        }
-    ];
-}
 //# sourceMappingURL=use-number-input.js.map

package/lib/use-number-input.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-number-input.js","sourceRoot":"","sources":["../src/use-number-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,UAAU,cAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAKrD;IASC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,eAAe,CAAS,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;IAEjF,OAAO;QACL,aAAa;YACX,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,YAAY;gBAGnB,QAAQ,CAAC,CAAC;oBACR,IAAI,IAAI,EAAE,CAAC;wBACT,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,CAAA;wBAEzB,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBACjC,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;4BAC9B,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,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;4BAC5C,eAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAA;4BAE1C,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;wBAC1B,CAAC;6BAAM,CAAC;4BACN,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAA;wBACzC,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAA;oBACzC,CAAC;gBACH,CAAC;aACF,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC;AAED,SAAS,eAAe,CAAI,GAAM;IAIhC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IACpC,MAAM,QAAQ,GAAG,MAAM,CAAI,GAAG,CAAC,CAAA;IAE/B,OAAO,CAAC,GAAG,EAAE;QACX,QAAQ,CAAC,OAAO,GAAG,GAAG,CAAA;IACxB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IAET,OAAO;QACL,QAAQ,CAAC,OAAO;QAChB,CAAC,QAAQ,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;YAC1B,IAAI,KAAK,IAAI,QAAQ,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC3C,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAA;gBAE3B,WAAW,EAAE,CAAA;YACf,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"use-number-input.js","sourceRoot":"","sources":["../src/use-number-input.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExD,MAAM,UAAU,cAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAQrD;IASC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,eAAe,CAAS,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;IAEjF,OAAO;QACL,aAAa;YACX,OAAO;gBACL,IAAI,EAAE,QAAQ;gBAId,KAAK,EAAE,YAAY;gBAGnB,QAAQ,CAAC,CAAC;oBACR,IAAI,IAAI,EAAE,CAAC;wBACT,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,CAAA;wBAEzB,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBACjC,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC;4BAC9B,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,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;4BAC5C,eAAe,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;4BAEpC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;wBAC1B,CAAC;6BAAM,CAAC;4BACN,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;4BAEjC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;wBACvB,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAA;wBAEjC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;oBACvB,CAAC;gBACH,CAAC;aACF,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-react-hooks",
-  "version": "0.8.11",
+  "version": "0.8.13",
   "description": "",
   "keywords": [],
   "files": [

package/src/index.ts

@@ -26,3 +26,4 @@ export * from './use-isomorphic-layout-effect.js'
 export * from './use-debounce.js'
 export * from './use-number-input.js'
 export * from './use-media-query.js'
+export * from './use-derived-state.js'

package/src/use-derived-state.ts

@@ -0,0 +1,26 @@
+import { useRef, useCallback } from 'react'
+import { useIIFE } from './use-iife.js'
+import { useForceUpdate } from './use-force-update.js'
+
+export function useDerivedState<T>(value: T): [
+  derivedState: T
+, setDerivedState: (newDerivedState: T) => void
+] {
+  const forceUpdate = useForceUpdate()
+  const stateRef = useRef<T>(value)
+
+  useIIFE(() => {
+    stateRef.current = value
+  }, [value])
+
+  return [
+    stateRef.current
+  , useCallback(newState => {
+      if (stateRef.current !== newState) {
+        stateRef.current = newState
+
+        forceUpdate()
+      }
+    }, [])
+  ]
+}

package/src/use-number-input.ts

@@ -1,12 +1,13 @@
-import { useRef } from 'react'
 import { isntNaN } from 'extra-utils'
-import { useIIFE } from './use-iife.js'
-import { useForceUpdate } from './use-force-update.js'
+import { useDerivedState } from './use-derived-state.js'
 
 export function useNumberInput({ value, lazy, onChange }: {
   value: number
   lazy?: boolean
 
+  /**
+   * @param isEnd 表示输入结束, 每次输入结束一定会产生一个`isEnd = true`的调用.
+   */
   onChange(value: number, isEnd: boolean): void
 }): {
   getInputProps(): Required<Pick<
@@ -23,8 +24,11 @@ export function useNumberInput({ value, lazy, onChange }: {
     getInputProps() {
       return {
         type: 'number'
+        // `input[type='number']`的特异行为:
+        // 如果设置的value与元素内部的值在数字上相同, 则界面不会发生更新.
+        // 要解决这个问题需要对DOM快速更新两次: 清空, 然后重新设置值, 不适用于React的受控组件模型.
       , value: displayValue
-        // `input[type='number']`有一些特异行为:
+        // `input[type='number']`的特异行为:
         // 如果只是在数字后面输入点`.`, 不会触发change事件.
       , onChange(e) {
           if (lazy) {
@@ -46,40 +50,21 @@ export function useNumberInput({ value, lazy, onChange }: {
             const newValue = e.target.valueAsNumber
 
             if (isntNaN(newValue) && newValue !== value) {
-              setDisplayValue(newValue.toString(), true)
+              setDisplayValue(newValue.toString())
 
               onChange(newValue, true)
             } else {
-              setDisplayValue(value.toString(), true)
+              setDisplayValue(value.toString())
+
+              onChange(value, true)
             }
           } else {
-            setDisplayValue(value.toString(), true)
+            setDisplayValue(value.toString())
+
+            onChange(value, true)
           }
         }
       }
     }
   }
 }
-
-function useDerivedState<T>(dep: T): [
-  state: T
-, setState: (newState: T, force?: boolean) => void
-] {
-  const forceUpdate = useForceUpdate()
-  const stateRef = useRef<T>(dep)
-
-  useIIFE(() => {
-    stateRef.current = dep
-  }, [dep])
-
-  return [
-    stateRef.current
-  , (newState, force = false) => {
-      if (force || stateRef.current !== newState) {
-        stateRef.current = newState
-
-        forceUpdate()
-      }
-    }
-  ]
-}