@tamagui/use-controllable-state 1.0.0-beta.193 → 1.0.0-canary.204

package/dist/cjs/useControllableState.js

@@ -27,18 +27,20 @@ function useControllableState({
   prop,
   defaultProp,
   onChange,
-  strategy
+  strategy = "prop-wins"
 }) {
+  const currentProp = (0, import_react.useRef)(prop);
   const handleChange = (0, import_react_use_callback_ref.useCallbackRef)(onChange);
   const [val, setVal] = (0, import_react.useState)(prop ?? defaultProp);
   const propWins = strategy === "prop-wins";
   (0, import_react.useEffect)(() => {
+    currentProp.current = prop;
     setVal((prev) => getNextStateWithCallback(prev, prop, handleChange));
   }, [prop]);
   return [
     val,
     (0, import_react.useCallback)((next) => {
-      if (propWins && prop !== void 0) {
+      if (propWins && currentProp.current !== void 0) {
         return;
       }
       setVal((prev) => {

package/dist/cjs/useControllableState.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/useControllableState.ts"],
-  "sourcesContent": ["import { useCallbackRef } from '@radix-ui/react-use-callback-ref'\nimport { useCallback, useEffect, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to most-recent-wins\n\nexport function useControllableState<T>({\n  prop,\n  defaultProp,\n  onChange,\n  strategy,\n}: {\n  prop?: T | undefined\n  defaultProp: T\n  onChange?: (next: T) => void\n  strategy?: 'prop-wins' | 'most-recent-wins'\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n  const handleChange = useCallbackRef(onChange)\n  const [val, setVal] = useState(prop ?? defaultProp)\n  const propWins = strategy === 'prop-wins'\n\n  useEffect(() => {\n    setVal((prev) => getNextStateWithCallback(prev, prop, handleChange))\n  }, [prop])\n\n  return [\n    val,\n    useCallback(\n      (next: any) => {\n        if (propWins && prop !== undefined) {\n          return\n        }\n        setVal((prev) => {\n          return getNextStateWithCallback(\n            prev,\n            typeof next === 'function' ? next(prev) : next,\n            handleChange\n          )\n        })\n      },\n      [setVal, propWins]\n    ) as any,\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"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oCAA+B;AAC/B,mBAAiD;AAK1C,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,GAM+C;AAC/C,QAAM,eAAe,kDAAe,QAAQ;AAC5C,QAAM,CAAC,KAAK,UAAU,2BAAS,QAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,8BAAU,MAAM;AACd,WAAO,CAAC,SAAS,yBAAyB,MAAM,MAAM,YAAY,CAAC;AAAA,EACrE,GAAG,CAAC,IAAI,CAAC;AAET,SAAO;AAAA,IACL;AAAA,IACA,8BACE,CAAC,SAAc;AACb,UAAI,YAAY,SAAS,QAAW;AAClC;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,QAAQ,QAAQ,CACnB;AAAA,EACF;AACF;AArCgB;AAuChB,MAAM,2BAA2B,wBAAC,MAAW,MAAW,iBAAsB;AAC5E,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,eAAa,IAAI;AACjB,SAAO;AACT,GANiC;",
+  "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  }, [prop])\n\n  return [\n    val,\n    useCallback(\n      (next: any) => {\n        if (propWins && currentProp.current !== undefined) {\n          return\n        }\n        setVal((prev) => {\n          return getNextStateWithCallback(\n            prev,\n            typeof next === 'function' ? next(prev) : next,\n            handleChange\n          )\n        })\n      },\n      [setVal, propWins]\n    ) as any,\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"],
+  "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,EACrE,GAAG,CAAC,IAAI,CAAC;AAET,SAAO;AAAA,IACL;AAAA,IACA,8BACE,CAAC,SAAc;AACb,UAAI,YAAY,YAAY,YAAY,QAAW;AACjD;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,QAAQ,QAAQ,CACnB;AAAA,EACF;AACF;AAvCgB;AAyChB,MAAM,2BAA2B,wBAAC,MAAW,MAAW,iBAAsB;AAC5E,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,eAAa,IAAI;AACjB,SAAO;AACT,GANiC;",
   "names": []
 }

package/dist/esm/useControllableState.js

@@ -1,23 +1,25 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { useCallbackRef } from "@radix-ui/react-use-callback-ref";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 function useControllableState({
   prop,
   defaultProp,
   onChange,
-  strategy
+  strategy = "prop-wins"
 }) {
+  const currentProp = useRef(prop);
   const handleChange = useCallbackRef(onChange);
   const [val, setVal] = useState(prop != null ? prop : defaultProp);
   const propWins = strategy === "prop-wins";
   useEffect(() => {
+    currentProp.current = prop;
     setVal((prev) => getNextStateWithCallback(prev, prop, handleChange));
   }, [prop]);
   return [
     val,
     useCallback((next) => {
-      if (propWins && prop !== void 0) {
+      if (propWins && currentProp.current !== void 0) {
         return;
       }
       setVal((prev) => {

package/dist/esm/useControllableState.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/useControllableState.ts"],
-  "sourcesContent": ["import { useCallbackRef } from '@radix-ui/react-use-callback-ref'\nimport { useCallback, useEffect, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to most-recent-wins\n\nexport function useControllableState<T>({\n  prop,\n  defaultProp,\n  onChange,\n  strategy,\n}: {\n  prop?: T | undefined\n  defaultProp: T\n  onChange?: (next: T) => void\n  strategy?: 'prop-wins' | 'most-recent-wins'\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n  const handleChange = useCallbackRef(onChange)\n  const [val, setVal] = useState(prop ?? defaultProp)\n  const propWins = strategy === 'prop-wins'\n\n  useEffect(() => {\n    setVal((prev) => getNextStateWithCallback(prev, prop, handleChange))\n  }, [prop])\n\n  return [\n    val,\n    useCallback(\n      (next: any) => {\n        if (propWins && prop !== undefined) {\n          return\n        }\n        setVal((prev) => {\n          return getNextStateWithCallback(\n            prev,\n            typeof next === 'function' ? next(prev) : next,\n            handleChange\n          )\n        })\n      },\n      [setVal, propWins]\n    ) as any,\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"],
-  "mappings": ";;AAAA;AACA;AAKO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,GAM+C;AAC/C,QAAM,eAAe,eAAe,QAAQ;AAC5C,QAAM,CAAC,KAAK,UAAU,SAAS,sBAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,YAAU,MAAM;AACd,WAAO,CAAC,SAAS,yBAAyB,MAAM,MAAM,YAAY,CAAC;AAAA,EACrE,GAAG,CAAC,IAAI,CAAC;AAET,SAAO;AAAA,IACL;AAAA,IACA,YACE,CAAC,SAAc;AACb,UAAI,YAAY,SAAS,QAAW;AAClC;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,QAAQ,QAAQ,CACnB;AAAA,EACF;AACF;AArCgB;AAuChB,MAAM,2BAA2B,wBAAC,MAAW,MAAW,iBAAsB;AAC5E,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,eAAa,IAAI;AACjB,SAAO;AACT,GANiC;",
+  "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  }, [prop])\n\n  return [\n    val,\n    useCallback(\n      (next: any) => {\n        if (propWins && currentProp.current !== undefined) {\n          return\n        }\n        setVal((prev) => {\n          return getNextStateWithCallback(\n            prev,\n            typeof next === 'function' ? next(prev) : next,\n            handleChange\n          )\n        })\n      },\n      [setVal, propWins]\n    ) as any,\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"],
+  "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,EACrE,GAAG,CAAC,IAAI,CAAC;AAET,SAAO;AAAA,IACL;AAAA,IACA,YACE,CAAC,SAAc;AACb,UAAI,YAAY,YAAY,YAAY,QAAW;AACjD;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,QAAQ,QAAQ,CACnB;AAAA,EACF;AACF;AAvCgB;AAyChB,MAAM,2BAA2B,wBAAC,MAAW,MAAW,iBAAsB;AAC5E,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,eAAa,IAAI;AACjB,SAAO;AACT,GANiC;",
   "names": []
 }

package/dist/jsx/useControllableState.js

@@ -1,23 +1,25 @@
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { useCallbackRef } from "@radix-ui/react-use-callback-ref";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 function useControllableState({
   prop,
   defaultProp,
   onChange,
-  strategy
+  strategy = "prop-wins"
 }) {
+  const currentProp = useRef(prop);
   const handleChange = useCallbackRef(onChange);
   const [val, setVal] = useState(prop != null ? prop : defaultProp);
   const propWins = strategy === "prop-wins";
   useEffect(() => {
+    currentProp.current = prop;
     setVal((prev) => getNextStateWithCallback(prev, prop, handleChange));
   }, [prop]);
   return [
     val,
     useCallback((next) => {
-      if (propWins && prop !== void 0) {
+      if (propWins && currentProp.current !== void 0) {
         return;
       }
       setVal((prev) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/use-controllable-state",
-  "version": "1.0.0-beta.193+14c13acd",
+  "version": "1.0.0-canary.204+d95a5880",
   "sideEffects": false,
   "source": "src/index.ts",
   "typings": "types",
@@ -25,12 +25,12 @@
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.0-beta.193+14c13acd",
+    "@tamagui/build": "^1.0.0-canary.204+d95a5880",
     "react": "*",
     "react-dom": "*"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "14c13acd9143e76d975e7a6c311d4a5f3a00bced"
+  "gitHead": "d95a58804c0fc2d3530cba0a357b735a2ca02188"
 }

package/types/useControllableState.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from 'react';
 export declare function useControllableState<T>({ prop, defaultProp, onChange, strategy, }: {
     prop?: T | undefined;
     defaultProp: T;
-    onChange?: (next: T) => void;
+    onChange?: ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>;
     strategy?: 'prop-wins' | 'most-recent-wins';
 }): [T, React.Dispatch<React.SetStateAction<T>>];
 //# sourceMappingURL=useControllableState.d.ts.map

package/types/useControllableState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useControllableState.d.ts","sourceRoot":"","sources":["../src/useControllableState.ts"],"names":[],"mappings":";AAMA,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,EACtC,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAA;IACpB,WAAW,EAAE,CAAC,CAAA;IACd,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAA;IAC5B,QAAQ,CAAC,EAAE,WAAW,GAAG,kBAAkB,CAAA;CAC5C,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CA2B/C"}
+{"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,CA6B/C"}