@pdg/react-hook 1.0.7 → 1.0.9

package/dist/index.d.ts

@@ -2,3 +2,5 @@ export { default as useAutoUpdateState } from './useAutoUpdateState';
 export { default as useAutoUpdateLayoutState } from './useAutoUpdateLayoutState';
 export { default as useFirstSkipEffect } from './useFirstSkipEffect';
 export { default as useFirstSkipLayoutEffect } from './useFirstSkipLayoutEffect';
+export { default as useAutoUpdateRefState } from './useAutoUpdateRefState';
+export { default as useAutoUpdateLayoutRefState } from './useAutoUpdateLayoutRefState';

package/dist/index.esm.js

@@ -10,37 +10,15 @@ import {useRef,useEffect,useState,useCallback,useLayoutEffect}from'react';import
     }, deps);
 }function useAutoUpdateState(p1, p2) {
     var state = typeof p1 === 'function' ? undefined : p1;
-    var finalStateCallback = typeof p1 === 'function' ? p1 : p2;
-    var _a = useState(0), setUpdateKey = _a[1];
-    var _initState = useState(function () {
-        return finalStateCallback ? finalStateCallback(state) : state;
-    })[0];
-    var _state = useRef(_initState);
-    var forceUpdate = useCallback(function () {
-        setUpdateKey(function (updateKey) { return updateKey + 1; });
-    }, []);
+    var callback = typeof p1 === 'function' ? p1 : p2;
+    var _a = useState(function () { return (callback ? callback(state) : state); }), _value = _a[0], _setValue = _a[1];
     useFirstSkipEffect(function () {
-        var newState = finalStateCallback ? finalStateCallback(state) : state;
-        if (!equal(newState, _state.current)) {
-            _state.current = newState;
-            forceUpdate();
-        }
-    }, [state]);
-    useFirstSkipEffect(function () {
-        var newState = finalStateCallback ? finalStateCallback(_state.current) : _state.current;
-        if (!equal(newState, _state.current)) {
-            _state.current = newState;
-            forceUpdate();
-        }
-    }, [finalStateCallback]);
-    var setState = useCallback(function (newState) {
-        var finalNewState = typeof newState === 'function' ? newState(_state.current) : newState;
-        if (!equal(_state.current, finalNewState)) {
-            _state.current = finalNewState;
-            forceUpdate();
-        }
-    }, []);
-    return [_state.current, setState];
+        _setValue(callback ? callback(state) : state);
+    }, [state, callback]);
+    var setValue = useCallback(function (newValue) {
+        _setValue(callback ? callback(newValue) : newValue);
+    }, [callback]);
+    return [_value, setValue];
 }function useFirstSkipLayoutEffect(effect, deps) {
     var firstRef = useRef(true);
     useLayoutEffect(function () {
@@ -53,35 +31,49 @@ import {useRef,useEffect,useState,useCallback,useLayoutEffect}from'react';import
     }, deps);
 }function useAutoUpdateLayoutState(p1, p2) {
     var state = typeof p1 === 'function' ? undefined : p1;
-    var finalStateCallback = typeof p1 === 'function' ? p1 : p2;
-    var _a = useState(0), setUpdateKey = _a[1];
-    var _initState = useState(function () {
-        return finalStateCallback ? finalStateCallback(state, 0) : state;
-    })[0];
-    var _state = useRef(_initState);
-    var forceUpdate = useCallback(function () {
-        setUpdateKey(function (updateKey) { return updateKey + 1; });
-    }, []);
+    var callback = typeof p1 === 'function' ? p1 : p2;
+    var _a = useState(function () { return (callback ? callback(state) : state); }), _value = _a[0], _setValue = _a[1];
     useFirstSkipLayoutEffect(function () {
-        var newState = finalStateCallback ? finalStateCallback(state) : state;
-        if (!equal(newState, _state.current)) {
-            _state.current = newState;
-            forceUpdate();
+        _setValue(callback ? callback(state) : state);
+    }, [state, callback]);
+    var setValue = useCallback(function (newValue) {
+        _setValue(callback ? callback(newValue) : newValue);
+    }, [callback]);
+    return [_value, setValue];
+}function useAutoUpdateRefState(p1, p2) {
+    var state = typeof p1 === 'function' ? undefined : p1;
+    var callback = typeof p1 === 'function' ? p1 : p2;
+    var valueRef = useRef(callback ? callback(state) : state);
+    var _a = useState(function () { return (callback ? callback(state) : state); }), _value = _a[0], _setValue = _a[1];
+    useFirstSkipEffect(function () {
+        var newValue = callback ? callback(state) : state;
+        if (!equal(valueRef.current, newValue)) {
+            valueRef.current = newValue;
+            _setValue(newValue);
         }
-    }, [state]);
+    }, [state, callback]);
+    var setValue = useCallback(function (newValue) {
+        var finalNewValue = callback ? callback(newValue) : newValue;
+        valueRef.current = finalNewValue;
+        _setValue(finalNewValue);
+    }, [callback]);
+    return [valueRef, _value, setValue];
+}function useAutoUpdateLayoutRefState(p1, p2) {
+    var state = typeof p1 === 'function' ? undefined : p1;
+    var callback = typeof p1 === 'function' ? p1 : p2;
+    var valueRef = useRef(callback ? callback(state) : state);
+    var _a = useState(function () { return (callback ? callback(state) : state); }), _value = _a[0], _setValue = _a[1];
     useFirstSkipLayoutEffect(function () {
-        var newState = finalStateCallback ? finalStateCallback(_state.current) : _state.current;
-        if (!equal(newState, _state.current)) {
-            _state.current = newState;
-            forceUpdate();
-        }
-    }, [finalStateCallback]);
-    var setState = useCallback(function (newState) {
-        var finalNewState = typeof newState === 'function' ? newState(_state.current) : newState;
-        if (!equal(_state.current, finalNewState)) {
-            _state.current = finalNewState;
-            forceUpdate();
+        var newValue = callback ? callback(state) : state;
+        if (!equal(valueRef.current, newValue)) {
+            valueRef.current = newValue;
+            _setValue(newValue);
         }
-    }, []);
-    return [_state.current, setState];
-}export{useAutoUpdateLayoutState,useAutoUpdateState,useFirstSkipEffect,useFirstSkipLayoutEffect};
+    }, [state, callback]);
+    var setValue = useCallback(function (newValue) {
+        var finalNewValue = callback ? callback(newValue) : newValue;
+        valueRef.current = finalNewValue;
+        _setValue(finalNewValue);
+    }, [callback]);
+    return [valueRef, _value, setValue];
+}export{useAutoUpdateLayoutRefState,useAutoUpdateLayoutState,useAutoUpdateRefState,useAutoUpdateState,useFirstSkipEffect,useFirstSkipLayoutEffect};

package/dist/index.js

@@ -10,37 +10,15 @@
     }, deps);
 }function useAutoUpdateState(p1, p2) {
     var state = typeof p1 === 'function' ? undefined : p1;
-    var finalStateCallback = typeof p1 === 'function' ? p1 : p2;
-    var _a = react.useState(0), setUpdateKey = _a[1];
-    var _initState = react.useState(function () {
-        return finalStateCallback ? finalStateCallback(state) : state;
-    })[0];
-    var _state = react.useRef(_initState);
-    var forceUpdate = react.useCallback(function () {
-        setUpdateKey(function (updateKey) { return updateKey + 1; });
-    }, []);
+    var callback = typeof p1 === 'function' ? p1 : p2;
+    var _a = react.useState(function () { return (callback ? callback(state) : state); }), _value = _a[0], _setValue = _a[1];
     useFirstSkipEffect(function () {
-        var newState = finalStateCallback ? finalStateCallback(state) : state;
-        if (!util.equal(newState, _state.current)) {
-            _state.current = newState;
-            forceUpdate();
-        }
-    }, [state]);
-    useFirstSkipEffect(function () {
-        var newState = finalStateCallback ? finalStateCallback(_state.current) : _state.current;
-        if (!util.equal(newState, _state.current)) {
-            _state.current = newState;
-            forceUpdate();
-        }
-    }, [finalStateCallback]);
-    var setState = react.useCallback(function (newState) {
-        var finalNewState = typeof newState === 'function' ? newState(_state.current) : newState;
-        if (!util.equal(_state.current, finalNewState)) {
-            _state.current = finalNewState;
-            forceUpdate();
-        }
-    }, []);
-    return [_state.current, setState];
+        _setValue(callback ? callback(state) : state);
+    }, [state, callback]);
+    var setValue = react.useCallback(function (newValue) {
+        _setValue(callback ? callback(newValue) : newValue);
+    }, [callback]);
+    return [_value, setValue];
 }function useFirstSkipLayoutEffect(effect, deps) {
     var firstRef = react.useRef(true);
     react.useLayoutEffect(function () {
@@ -53,35 +31,49 @@
     }, deps);
 }function useAutoUpdateLayoutState(p1, p2) {
     var state = typeof p1 === 'function' ? undefined : p1;
-    var finalStateCallback = typeof p1 === 'function' ? p1 : p2;
-    var _a = react.useState(0), setUpdateKey = _a[1];
-    var _initState = react.useState(function () {
-        return finalStateCallback ? finalStateCallback(state, 0) : state;
-    })[0];
-    var _state = react.useRef(_initState);
-    var forceUpdate = react.useCallback(function () {
-        setUpdateKey(function (updateKey) { return updateKey + 1; });
-    }, []);
+    var callback = typeof p1 === 'function' ? p1 : p2;
+    var _a = react.useState(function () { return (callback ? callback(state) : state); }), _value = _a[0], _setValue = _a[1];
     useFirstSkipLayoutEffect(function () {
-        var newState = finalStateCallback ? finalStateCallback(state) : state;
-        if (!util.equal(newState, _state.current)) {
-            _state.current = newState;
-            forceUpdate();
+        _setValue(callback ? callback(state) : state);
+    }, [state, callback]);
+    var setValue = react.useCallback(function (newValue) {
+        _setValue(callback ? callback(newValue) : newValue);
+    }, [callback]);
+    return [_value, setValue];
+}function useAutoUpdateRefState(p1, p2) {
+    var state = typeof p1 === 'function' ? undefined : p1;
+    var callback = typeof p1 === 'function' ? p1 : p2;
+    var valueRef = react.useRef(callback ? callback(state) : state);
+    var _a = react.useState(function () { return (callback ? callback(state) : state); }), _value = _a[0], _setValue = _a[1];
+    useFirstSkipEffect(function () {
+        var newValue = callback ? callback(state) : state;
+        if (!util.equal(valueRef.current, newValue)) {
+            valueRef.current = newValue;
+            _setValue(newValue);
         }
-    }, [state]);
+    }, [state, callback]);
+    var setValue = react.useCallback(function (newValue) {
+        var finalNewValue = callback ? callback(newValue) : newValue;
+        valueRef.current = finalNewValue;
+        _setValue(finalNewValue);
+    }, [callback]);
+    return [valueRef, _value, setValue];
+}function useAutoUpdateLayoutRefState(p1, p2) {
+    var state = typeof p1 === 'function' ? undefined : p1;
+    var callback = typeof p1 === 'function' ? p1 : p2;
+    var valueRef = react.useRef(callback ? callback(state) : state);
+    var _a = react.useState(function () { return (callback ? callback(state) : state); }), _value = _a[0], _setValue = _a[1];
     useFirstSkipLayoutEffect(function () {
-        var newState = finalStateCallback ? finalStateCallback(_state.current) : _state.current;
-        if (!util.equal(newState, _state.current)) {
-            _state.current = newState;
-            forceUpdate();
-        }
-    }, [finalStateCallback]);
-    var setState = react.useCallback(function (newState) {
-        var finalNewState = typeof newState === 'function' ? newState(_state.current) : newState;
-        if (!util.equal(_state.current, finalNewState)) {
-            _state.current = finalNewState;
-            forceUpdate();
+        var newValue = callback ? callback(state) : state;
+        if (!util.equal(valueRef.current, newValue)) {
+            valueRef.current = newValue;
+            _setValue(newValue);
         }
-    }, []);
-    return [_state.current, setState];
-}exports.useAutoUpdateLayoutState=useAutoUpdateLayoutState;exports.useAutoUpdateState=useAutoUpdateState;exports.useFirstSkipEffect=useFirstSkipEffect;exports.useFirstSkipLayoutEffect=useFirstSkipLayoutEffect;
+    }, [state, callback]);
+    var setValue = react.useCallback(function (newValue) {
+        var finalNewValue = callback ? callback(newValue) : newValue;
+        valueRef.current = finalNewValue;
+        _setValue(finalNewValue);
+    }, [callback]);
+    return [valueRef, _value, setValue];
+}exports.useAutoUpdateLayoutRefState=useAutoUpdateLayoutRefState;exports.useAutoUpdateLayoutState=useAutoUpdateLayoutState;exports.useAutoUpdateRefState=useAutoUpdateRefState;exports.useAutoUpdateState=useAutoUpdateState;exports.useFirstSkipEffect=useFirstSkipEffect;exports.useFirstSkipLayoutEffect=useFirstSkipLayoutEffect;

package/dist/useAutoUpdateLayoutRefState.d.ts

@@ -0,0 +1,4 @@
+import { Dispatch, MutableRefObject, SetStateAction } from 'react';
+export default function useAutoUpdateLayoutRefState<T>(state: T): [MutableRefObject<T>, T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateLayoutRefState<T>(state: T, callback: (state: T) => T): [MutableRefObject<T>, T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateLayoutRefState<T>(callback: () => T): [MutableRefObject<T>, T, Dispatch<SetStateAction<T>>];

package/dist/useAutoUpdateLayoutState.d.ts

@@ -1,4 +1,4 @@
 import { Dispatch, SetStateAction } from 'react';
-export declare function AA<T>(a: T): T;
-export default function useAutoUpdateLayoutState<T>(state: T, finalStateCallback?: (state: T) => T): [T, Dispatch<SetStateAction<T>>];
-export default function useAutoUpdateLayoutState<T>(finalStateCallback: (State: T) => T): [T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateLayoutState<T>(state: T): [T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateLayoutState<T>(state: T, callback: (state: T) => T): [T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateLayoutState<T>(callback: () => T): [T, Dispatch<SetStateAction<T>>];

package/dist/useAutoUpdateRefState.d.ts

@@ -0,0 +1,5 @@
+import { Dispatch, MutableRefObject, SetStateAction } from 'react';
+export default function useAutoUpdateRefState<T>(state: T): [MutableRefObject<T>, T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateRefState<T>(state: T): [MutableRefObject<T>, T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateRefState<T>(state: T, callback: (state: T) => T): [MutableRefObject<T>, T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateRefState<T>(callback: () => T): [MutableRefObject<T>, T, Dispatch<SetStateAction<T>>];

package/dist/useAutoUpdateState.d.ts

@@ -1,3 +1,4 @@
 import { Dispatch, SetStateAction } from 'react';
-export default function useAutoUpdateState<T>(state: T, finalStateCallback?: (state: T) => T): [T, Dispatch<SetStateAction<T>>];
-export default function useAutoUpdateState<T>(finalStateCallback: (State: T) => T): [T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateState<T>(state: T): [T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateState<T>(state: T, callback: (state: T) => T): [T, Dispatch<SetStateAction<T>>];
+export default function useAutoUpdateState<T>(callback: () => T): [T, Dispatch<SetStateAction<T>>];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pdg/react-hook",
   "title": "React Hook",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "React Hook",
   "type": "module",
   "types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
     "dev": "cd examples && npm run dev",
     "dev-prd-lib": "cd examples && npm run dev-prd-lib",
     "build": "rollup -c --bundleConfigAsCjs",
-    "publish": "npm publish --access=public",
+    "pub": "npm i && npm run build && npm publish --access=public && rm ./.git/hooks/pre-commit",
     "lint": "eslint './src/**/*.{ts,tsx}'",
     "reinstall-module": "rm -rf node_modules && rm -f package-lock.json && npm i"
   },
@@ -38,7 +38,7 @@
     "javascript"
   ],
   "peerDependencies": {
-    "@pdg/util": "^1.0.13",
+    "@pdg/util": "^1.0.19",
     "@types/react": "^17.0.0 || ^18.0.0",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"