@tamagui/use-controllable-state 1.0.1-beta.97 → 1.0.1-beta.98
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/dist/cjs/useControllableState.js +3 -1
- package/dist/cjs/useControllableState.js.map +2 -2
- package/dist/esm/useControllableState.js +3 -1
- package/dist/esm/useControllableState.js.map +2 -2
- package/dist/jsx/useControllableState.js +3 -1
- package/dist/jsx/useControllableState.js.map +2 -2
- package/package.json +2 -2
- package/src/useControllableState.ts +3 -1
- package/types/useControllableState.d.ts.map +1 -1
|
@@ -34,7 +34,9 @@ function useControllableState({
|
|
|
34
34
|
const propWins = strategy === "prop-wins";
|
|
35
35
|
(0, import_react.useEffect)(() => {
|
|
36
36
|
currentProp.current = prop;
|
|
37
|
-
setVal((prev) =>
|
|
37
|
+
setVal((prev) => {
|
|
38
|
+
return getNextStateWithCallback(prev, prop, handleChange);
|
|
39
|
+
});
|
|
38
40
|
}, [handleChange, prop]);
|
|
39
41
|
return [
|
|
40
42
|
val,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useControllableState.ts"],
|
|
4
|
-
"sourcesContent": ["import { useCallbackRef } from '@radix-ui/react-use-callback-ref'\nimport React, { useCallback, useEffect, useRef, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to prop-wins\n\nexport function useControllableState<T>({\n prop,\n defaultProp,\n onChange,\n strategy = 'prop-wins',\n}: {\n prop?: T | undefined\n defaultProp: T\n onChange?: ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n strategy?: 'prop-wins' | 'most-recent-wins'\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n const currentProp = useRef(prop)\n const handleChange = useCallbackRef(onChange)\n const [val, setVal] = useState(prop ?? defaultProp)\n const propWins = strategy === 'prop-wins'\n\n useEffect(() => {\n currentProp.current = prop\n setVal((prev) => getNextStateWithCallback(prev, prop, handleChange))\n }, [handleChange, prop])\n\n return [\n val,\n useCallback(\n (next: unknown) => {\n if (propWins && currentProp.current !== undefined) {\n handleChange(next as T)\n return\n }\n setVal((prev) => {\n return getNextStateWithCallback(\n prev,\n typeof next === 'function' ? next(prev) : next,\n handleChange\n )\n })\n },\n [propWins, handleChange]\n ),\n ]\n}\n\nconst getNextStateWithCallback = (prev: any, next: any, handleChange: any) => {\n if (prev === next || next === undefined) {\n return prev\n }\n handleChange(next)\n return next\n}\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oCAA+B;AAC/B,mBAAgE;AAKzD,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,GAMoC;AAC/C,QAAM,cAAc,yBAAO,IAAI;AAC/B,QAAM,eAAe,kDAAe,QAAQ;AAC5C,QAAM,CAAC,KAAK,UAAU,2BAAS,QAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,8BAAU,MAAM;AACd,gBAAY,UAAU;AACtB,WAAO,CAAC,SAAS,yBAAyB,MAAM,MAAM,YAAY,CAAC;AAAA,
|
|
4
|
+
"sourcesContent": ["import { useCallbackRef } from '@radix-ui/react-use-callback-ref'\nimport React, { useCallback, useEffect, useRef, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to prop-wins\n\nexport function useControllableState<T>({\n prop,\n defaultProp,\n onChange,\n strategy = 'prop-wins',\n}: {\n prop?: T | undefined\n defaultProp: T\n onChange?: ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n strategy?: 'prop-wins' | 'most-recent-wins'\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n const currentProp = useRef(prop)\n const handleChange = useCallbackRef(onChange)\n const [val, setVal] = useState(prop ?? defaultProp)\n const propWins = strategy === 'prop-wins'\n\n useEffect(() => {\n currentProp.current = prop\n setVal((prev) => {\n return getNextStateWithCallback(prev, prop, handleChange)\n })\n }, [handleChange, prop])\n\n return [\n val,\n useCallback(\n (next: unknown) => {\n if (propWins && currentProp.current !== undefined) {\n handleChange(next as T)\n return\n }\n setVal((prev) => {\n return getNextStateWithCallback(\n prev,\n typeof next === 'function' ? next(prev) : next,\n handleChange\n )\n })\n },\n [propWins, handleChange]\n ),\n ]\n}\n\nconst getNextStateWithCallback = (prev: any, next: any, handleChange: any) => {\n if (prev === next || next === undefined) {\n return prev\n }\n handleChange(next)\n return next\n}\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oCAA+B;AAC/B,mBAAgE;AAKzD,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,GAMoC;AAC/C,QAAM,cAAc,yBAAO,IAAI;AAC/B,QAAM,eAAe,kDAAe,QAAQ;AAC5C,QAAM,CAAC,KAAK,UAAU,2BAAS,QAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,8BAAU,MAAM;AACd,gBAAY,UAAU;AACtB,WAAO,CAAC,SAAS;AACf,aAAO,yBAAyB,MAAM,MAAM,YAAY;AAAA,IAC1D,CAAC;AAAA,EACH,GAAG,CAAC,cAAc,IAAI,CAAC;AAEvB,SAAO;AAAA,IACL;AAAA,IACA,8BACE,CAAC,SAAkB;AACjB,UAAI,YAAY,YAAY,YAAY,QAAW;AACjD,qBAAa,IAAS;AACtB;AAAA,MACF;AACA,aAAO,CAAC,SAAS;AACf,eAAO,yBACL,MACA,OAAO,SAAS,aAAa,KAAK,IAAI,IAAI,MAC1C,YACF;AAAA,MACF,CAAC;AAAA,IACH,GACA,CAAC,UAAU,YAAY,CACzB;AAAA,EACF;AACF;AAEA,MAAM,2BAA2B,CAAC,MAAW,MAAW,iBAAsB;AAC5E,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,eAAa,IAAI;AACjB,SAAO;AACT;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -12,7 +12,9 @@ function useControllableState({
|
|
|
12
12
|
const propWins = strategy === "prop-wins";
|
|
13
13
|
useEffect(() => {
|
|
14
14
|
currentProp.current = prop;
|
|
15
|
-
setVal((prev) =>
|
|
15
|
+
setVal((prev) => {
|
|
16
|
+
return getNextStateWithCallback(prev, prop, handleChange);
|
|
17
|
+
});
|
|
16
18
|
}, [handleChange, prop]);
|
|
17
19
|
return [
|
|
18
20
|
val,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useControllableState.ts"],
|
|
4
|
-
"sourcesContent": ["import { useCallbackRef } from '@radix-ui/react-use-callback-ref'\nimport React, { useCallback, useEffect, useRef, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to prop-wins\n\nexport function useControllableState<T>({\n prop,\n defaultProp,\n onChange,\n strategy = 'prop-wins',\n}: {\n prop?: T | undefined\n defaultProp: T\n onChange?: ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n strategy?: 'prop-wins' | 'most-recent-wins'\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n const currentProp = useRef(prop)\n const handleChange = useCallbackRef(onChange)\n const [val, setVal] = useState(prop ?? defaultProp)\n const propWins = strategy === 'prop-wins'\n\n useEffect(() => {\n currentProp.current = prop\n setVal((prev) => getNextStateWithCallback(prev, prop, handleChange))\n }, [handleChange, prop])\n\n return [\n val,\n useCallback(\n (next: unknown) => {\n if (propWins && currentProp.current !== undefined) {\n handleChange(next as T)\n return\n }\n setVal((prev) => {\n return getNextStateWithCallback(\n prev,\n typeof next === 'function' ? next(prev) : next,\n handleChange\n )\n })\n },\n [propWins, handleChange]\n ),\n ]\n}\n\nconst getNextStateWithCallback = (prev: any, next: any, handleChange: any) => {\n if (prev === next || next === undefined) {\n return prev\n }\n handleChange(next)\n return next\n}\n"],
|
|
5
|
-
"mappings": "AAAA;AACA;AAKO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,GAMoC;AAC/C,QAAM,cAAc,OAAO,IAAI;AAC/B,QAAM,eAAe,eAAe,QAAQ;AAC5C,QAAM,CAAC,KAAK,UAAU,SAAS,QAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,YAAU,MAAM;AACd,gBAAY,UAAU;AACtB,WAAO,CAAC,SAAS,yBAAyB,MAAM,MAAM,YAAY,CAAC;AAAA,
|
|
4
|
+
"sourcesContent": ["import { useCallbackRef } from '@radix-ui/react-use-callback-ref'\nimport React, { useCallback, useEffect, useRef, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to prop-wins\n\nexport function useControllableState<T>({\n prop,\n defaultProp,\n onChange,\n strategy = 'prop-wins',\n}: {\n prop?: T | undefined\n defaultProp: T\n onChange?: ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n strategy?: 'prop-wins' | 'most-recent-wins'\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n const currentProp = useRef(prop)\n const handleChange = useCallbackRef(onChange)\n const [val, setVal] = useState(prop ?? defaultProp)\n const propWins = strategy === 'prop-wins'\n\n useEffect(() => {\n currentProp.current = prop\n setVal((prev) => {\n return getNextStateWithCallback(prev, prop, handleChange)\n })\n }, [handleChange, prop])\n\n return [\n val,\n useCallback(\n (next: unknown) => {\n if (propWins && currentProp.current !== undefined) {\n handleChange(next as T)\n return\n }\n setVal((prev) => {\n return getNextStateWithCallback(\n prev,\n typeof next === 'function' ? next(prev) : next,\n handleChange\n )\n })\n },\n [propWins, handleChange]\n ),\n ]\n}\n\nconst getNextStateWithCallback = (prev: any, next: any, handleChange: any) => {\n if (prev === next || next === undefined) {\n return prev\n }\n handleChange(next)\n return next\n}\n"],
|
|
5
|
+
"mappings": "AAAA;AACA;AAKO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,GAMoC;AAC/C,QAAM,cAAc,OAAO,IAAI;AAC/B,QAAM,eAAe,eAAe,QAAQ;AAC5C,QAAM,CAAC,KAAK,UAAU,SAAS,QAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,YAAU,MAAM;AACd,gBAAY,UAAU;AACtB,WAAO,CAAC,SAAS;AACf,aAAO,yBAAyB,MAAM,MAAM,YAAY;AAAA,IAC1D,CAAC;AAAA,EACH,GAAG,CAAC,cAAc,IAAI,CAAC;AAEvB,SAAO;AAAA,IACL;AAAA,IACA,YACE,CAAC,SAAkB;AACjB,UAAI,YAAY,YAAY,YAAY,QAAW;AACjD,qBAAa,IAAS;AACtB;AAAA,MACF;AACA,aAAO,CAAC,SAAS;AACf,eAAO,yBACL,MACA,OAAO,SAAS,aAAa,KAAK,IAAI,IAAI,MAC1C,YACF;AAAA,MACF,CAAC;AAAA,IACH,GACA,CAAC,UAAU,YAAY,CACzB;AAAA,EACF;AACF;AAEA,MAAM,2BAA2B,CAAC,MAAW,MAAW,iBAAsB;AAC5E,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,eAAa,IAAI;AACjB,SAAO;AACT;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -12,7 +12,9 @@ function useControllableState({
|
|
|
12
12
|
const propWins = strategy === "prop-wins";
|
|
13
13
|
useEffect(() => {
|
|
14
14
|
currentProp.current = prop;
|
|
15
|
-
setVal((prev) =>
|
|
15
|
+
setVal((prev) => {
|
|
16
|
+
return getNextStateWithCallback(prev, prop, handleChange);
|
|
17
|
+
});
|
|
16
18
|
}, [handleChange, prop]);
|
|
17
19
|
return [
|
|
18
20
|
val,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useControllableState.ts"],
|
|
4
|
-
"sourcesContent": ["import { useCallbackRef } from '@radix-ui/react-use-callback-ref'\nimport React, { useCallback, useEffect, useRef, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to prop-wins\n\nexport function useControllableState<T>({\n prop,\n defaultProp,\n onChange,\n strategy = 'prop-wins',\n}: {\n prop?: T | undefined\n defaultProp: T\n onChange?: ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n strategy?: 'prop-wins' | 'most-recent-wins'\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n const currentProp = useRef(prop)\n const handleChange = useCallbackRef(onChange)\n const [val, setVal] = useState(prop ?? defaultProp)\n const propWins = strategy === 'prop-wins'\n\n useEffect(() => {\n currentProp.current = prop\n setVal((prev) => getNextStateWithCallback(prev, prop, handleChange))\n }, [handleChange, prop])\n\n return [\n val,\n useCallback(\n (next: unknown) => {\n if (propWins && currentProp.current !== undefined) {\n handleChange(next as T)\n return\n }\n setVal((prev) => {\n return getNextStateWithCallback(\n prev,\n typeof next === 'function' ? next(prev) : next,\n handleChange\n )\n })\n },\n [propWins, handleChange]\n ),\n ]\n}\n\nconst getNextStateWithCallback = (prev: any, next: any, handleChange: any) => {\n if (prev === next || next === undefined) {\n return prev\n }\n handleChange(next)\n return next\n}\n"],
|
|
5
|
-
"mappings": "AAAA;AACA;AAKO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,GAMoC;AAC/C,QAAM,cAAc,OAAO,IAAI;AAC/B,QAAM,eAAe,eAAe,QAAQ;AAC5C,QAAM,CAAC,KAAK,UAAU,SAAS,sBAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,YAAU,MAAM;AACd,gBAAY,UAAU;AACtB,WAAO,CAAC,SAAS,yBAAyB,MAAM,MAAM,YAAY,CAAC;AAAA,
|
|
4
|
+
"sourcesContent": ["import { useCallbackRef } from '@radix-ui/react-use-callback-ref'\nimport React, { useCallback, useEffect, useRef, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to prop-wins\n\nexport function useControllableState<T>({\n prop,\n defaultProp,\n onChange,\n strategy = 'prop-wins',\n}: {\n prop?: T | undefined\n defaultProp: T\n onChange?: ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n strategy?: 'prop-wins' | 'most-recent-wins'\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n const currentProp = useRef(prop)\n const handleChange = useCallbackRef(onChange)\n const [val, setVal] = useState(prop ?? defaultProp)\n const propWins = strategy === 'prop-wins'\n\n useEffect(() => {\n currentProp.current = prop\n setVal((prev) => {\n return getNextStateWithCallback(prev, prop, handleChange)\n })\n }, [handleChange, prop])\n\n return [\n val,\n useCallback(\n (next: unknown) => {\n if (propWins && currentProp.current !== undefined) {\n handleChange(next as T)\n return\n }\n setVal((prev) => {\n return getNextStateWithCallback(\n prev,\n typeof next === 'function' ? next(prev) : next,\n handleChange\n )\n })\n },\n [propWins, handleChange]\n ),\n ]\n}\n\nconst getNextStateWithCallback = (prev: any, next: any, handleChange: any) => {\n if (prev === next || next === undefined) {\n return prev\n }\n handleChange(next)\n return next\n}\n"],
|
|
5
|
+
"mappings": "AAAA;AACA;AAKO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,GAMoC;AAC/C,QAAM,cAAc,OAAO,IAAI;AAC/B,QAAM,eAAe,eAAe,QAAQ;AAC5C,QAAM,CAAC,KAAK,UAAU,SAAS,sBAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,YAAU,MAAM;AACd,gBAAY,UAAU;AACtB,WAAO,CAAC,SAAS;AACf,aAAO,yBAAyB,MAAM,MAAM,YAAY;AAAA,IAC1D,CAAC;AAAA,EACH,GAAG,CAAC,cAAc,IAAI,CAAC;AAEvB,SAAO;AAAA,IACL;AAAA,IACA,YACE,CAAC,SAAkB;AACjB,UAAI,YAAY,YAAY,YAAY,QAAW;AACjD,qBAAa,IAAS;AACtB;AAAA,MACF;AACA,aAAO,CAAC,SAAS;AACf,eAAO,yBACL,MACA,OAAO,SAAS,aAAa,KAAK,IAAI,IAAI,MAC1C,YACF;AAAA,MACF,CAAC;AAAA,IACH,GACA,CAAC,UAAU,YAAY,CACzB;AAAA,EACF;AACF;AAEA,MAAM,2BAA2B,CAAC,MAAW,MAAW,iBAAsB;AAC5E,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,eAAa,IAAI;AACjB,SAAO;AACT;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/use-controllable-state",
|
|
3
|
-
"version": "1.0.1-beta.
|
|
3
|
+
"version": "1.0.1-beta.98",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"source": "src/index.ts",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"react-dom": "*"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@tamagui/build": "^1.0.1-beta.
|
|
29
|
+
"@tamagui/build": "^1.0.1-beta.98",
|
|
30
30
|
"react": "*",
|
|
31
31
|
"react-dom": "*"
|
|
32
32
|
},
|
|
@@ -22,7 +22,9 @@ export function useControllableState<T>({
|
|
|
22
22
|
|
|
23
23
|
useEffect(() => {
|
|
24
24
|
currentProp.current = prop
|
|
25
|
-
setVal((prev) =>
|
|
25
|
+
setVal((prev) => {
|
|
26
|
+
return getNextStateWithCallback(prev, prop, handleChange)
|
|
27
|
+
})
|
|
26
28
|
}, [handleChange, prop])
|
|
27
29
|
|
|
28
30
|
return [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useControllableState.d.ts","sourceRoot":"","sources":["../src/useControllableState.ts"],"names":[],"mappings":"AACA,OAAO,KAAmD,MAAM,OAAO,CAAA;AAKvE,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,EACtC,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAsB,GACvB,EAAE;IACD,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAA;IACpB,WAAW,EAAE,CAAC,CAAA;IACd,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;IACxE,QAAQ,CAAC,EAAE,WAAW,GAAG,kBAAkB,CAAA;CAC5C,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"useControllableState.d.ts","sourceRoot":"","sources":["../src/useControllableState.ts"],"names":[],"mappings":"AACA,OAAO,KAAmD,MAAM,OAAO,CAAA;AAKvE,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,EACtC,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAsB,GACvB,EAAE;IACD,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAA;IACpB,WAAW,EAAE,CAAC,CAAA;IACd,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;IACxE,QAAQ,CAAC,EAAE,WAAW,GAAG,kBAAkB,CAAA;CAC5C,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAgC/C"}
|