@tamagui/use-controllable-state 1.0.1-beta.120 → 1.0.1-beta.123

package/dist/cjs/useControllableState.js

@@ -30,34 +30,31 @@ function useControllableState({
   strategy = "prop-wins",
   preventUpdate
 }) {
-  const [val, setVal] = (0, import_react.useState)(prop ?? defaultProp);
+  const [state, setState] = (0, import_react.useState)(prop ?? defaultProp);
+  const previous = (0, import_react.useRef)(state);
+  const value = strategy === "prop-wins" ? prop : state;
   const propWins = strategy === "prop-wins";
+  const onChangeCb = (0, import_use_event.useEvent)(onChange || idFn);
   (0, import_react.useEffect)(() => {
-    const next = getNextStateWithCallback(val, prop);
-    if (next !== void 0 && next !== val) {
-      setVal(next);
+    if (state !== previous.current) {
+      previous.current = state;
+      onChangeCb(state);
     }
-  }, [prop]);
+  }, [onChangeCb, state]);
   return [
-    val,
-    (0, import_use_event.useEvent)((next) => {
+    value,
+    (0, import_react.useCallback)((next) => {
       if (preventUpdate)
         return;
-      if (propWins && prop !== void 0) {
-        return;
+      if (propWins) {
+        onChangeCb(next);
+      } else {
+        setState(next);
       }
-      setVal((prev) => {
-        return getNextStateWithCallback(prev, typeof next === "function" ? next(prev) : next, onChange);
-      });
-    })
+    }, [preventUpdate, propWins, onChangeCb])
   ];
 }
-const getNextStateWithCallback = (prev, next, handleChange) => {
-  if (prev === next || next === void 0) {
-    return prev;
-  }
-  handleChange == null ? void 0 : handleChange(next);
-  return next;
+const idFn = () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/useControllableState.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/useControllableState.ts"],
-  "sourcesContent": ["import { useEvent } from '@tamagui/use-event'\nimport React, { useEffect, useRef, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to prop-wins\n\ntype ChangeCb<T> = ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n\nexport function useControllableState<T>({\n  prop,\n  defaultProp,\n  onChange,\n  strategy = 'prop-wins',\n  preventUpdate,\n}: {\n  prop?: T | undefined\n  defaultProp: T\n  onChange?: ChangeCb<T>\n  strategy?: 'prop-wins' | 'most-recent-wins'\n  preventUpdate?: boolean\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n  const [val, setVal] = useState(prop ?? defaultProp)\n  const propWins = strategy === 'prop-wins'\n\n  useEffect(() => {\n    const next = getNextStateWithCallback(val, prop)\n    if (next !== undefined && next !== val) {\n      setVal(next)\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [prop])\n\n  return [\n    val,\n    useEvent((next: unknown) => {\n      if (preventUpdate) return\n      if (propWins && prop !== undefined) {\n        return\n      }\n      setVal((prev) => {\n        return getNextStateWithCallback(\n          prev,\n          typeof next === 'function' ? next(prev) : next,\n          onChange\n        )\n      })\n    }),\n  ]\n}\n\nconst getNextStateWithCallback = (prev: any, next: any, handleChange?: ChangeCb<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,uBAAyB;AACzB,mBAAmD;AAO5C,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAO+C;AAC/C,QAAM,CAAC,KAAK,UAAU,2BAAS,QAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,8BAAU,MAAM;AACd,UAAM,OAAO,yBAAyB,KAAK,IAAI;AAC/C,QAAI,SAAS,UAAa,SAAS,KAAK;AACtC,aAAO,IAAI;AAAA,IACb;AAAA,EAEF,GAAG,CAAC,IAAI,CAAC;AAET,SAAO;AAAA,IACL;AAAA,IACA,+BAAS,CAAC,SAAkB;AAC1B,UAAI;AAAe;AACnB,UAAI,YAAY,SAAS,QAAW;AAClC;AAAA,MACF;AACA,aAAO,CAAC,SAAS;AACf,eAAO,yBACL,MACA,OAAO,SAAS,aAAa,KAAK,IAAI,IAAI,MAC1C,QACF;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AACF;AAEA,MAAM,2BAA2B,CAAC,MAAW,MAAW,iBAAiC;AACvF,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,+CAAe;AACf,SAAO;AACT;",
+  "sourcesContent": ["import { useEvent } from '@tamagui/use-event'\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\ntype ChangeCb<T> = ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n\nexport function useControllableState<T>({\n  prop,\n  defaultProp,\n  onChange,\n  strategy = 'prop-wins',\n  preventUpdate,\n}: {\n  prop?: T | undefined\n  defaultProp: T\n  onChange?: ChangeCb<T>\n  strategy?: 'prop-wins' | 'most-recent-wins'\n  preventUpdate?: boolean\n}): [T, (next: T) => void] {\n  const [state, setState] = useState(prop ?? defaultProp)\n  const previous = useRef<any>(state)\n  const value = strategy === 'prop-wins' ? prop : state\n  const propWins = strategy === 'prop-wins'\n  const onChangeCb = useEvent(onChange || idFn)\n\n  useEffect(() => {\n    if (state !== previous.current) {\n      previous.current = state\n      onChangeCb(state)\n    }\n  }, [onChangeCb, state])\n\n  return [\n    value as T,\n    useCallback(\n      (next: T) => {\n        if (preventUpdate) return\n        if (propWins) {\n          onChangeCb(next)\n        } else {\n          setState(next)\n        }\n      },\n      [preventUpdate, propWins, onChangeCb]\n    ),\n  ]\n}\n\nconst idFn = () => {}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAyB;AACzB,mBAAgE;AAOzD,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAOyB;AACzB,QAAM,CAAC,OAAO,YAAY,2BAAS,QAAQ,WAAW;AACtD,QAAM,WAAW,yBAAY,KAAK;AAClC,QAAM,QAAQ,aAAa,cAAc,OAAO;AAChD,QAAM,WAAW,aAAa;AAC9B,QAAM,aAAa,+BAAS,YAAY,IAAI;AAE5C,8BAAU,MAAM;AACd,QAAI,UAAU,SAAS,SAAS;AAC9B,eAAS,UAAU;AACnB,iBAAW,KAAK;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,YAAY,KAAK,CAAC;AAEtB,SAAO;AAAA,IACL;AAAA,IACA,8BACE,CAAC,SAAY;AACX,UAAI;AAAe;AACnB,UAAI,UAAU;AACZ,mBAAW,IAAI;AAAA,MACjB,OAAO;AACL,iBAAS,IAAI;AAAA,MACf;AAAA,IACF,GACA,CAAC,eAAe,UAAU,UAAU,CACtC;AAAA,EACF;AACF;AAEA,MAAM,OAAO,MAAM;AAAC;",
   "names": []
 }

package/dist/esm/useControllableState.js

@@ -1,5 +1,5 @@
 import { useEvent } from "@tamagui/use-event";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 function useControllableState({
   prop,
   defaultProp,
@@ -7,34 +7,31 @@ function useControllableState({
   strategy = "prop-wins",
   preventUpdate
 }) {
-  const [val, setVal] = useState(prop ?? defaultProp);
+  const [state, setState] = useState(prop ?? defaultProp);
+  const previous = useRef(state);
+  const value = strategy === "prop-wins" ? prop : state;
   const propWins = strategy === "prop-wins";
+  const onChangeCb = useEvent(onChange || idFn);
   useEffect(() => {
-    const next = getNextStateWithCallback(val, prop);
-    if (next !== void 0 && next !== val) {
-      setVal(next);
+    if (state !== previous.current) {
+      previous.current = state;
+      onChangeCb(state);
     }
-  }, [prop]);
+  }, [onChangeCb, state]);
   return [
-    val,
-    useEvent((next) => {
+    value,
+    useCallback((next) => {
       if (preventUpdate)
         return;
-      if (propWins && prop !== void 0) {
-        return;
+      if (propWins) {
+        onChangeCb(next);
+      } else {
+        setState(next);
       }
-      setVal((prev) => {
-        return getNextStateWithCallback(prev, typeof next === "function" ? next(prev) : next, onChange);
-      });
-    })
+    }, [preventUpdate, propWins, onChangeCb])
   ];
 }
-const getNextStateWithCallback = (prev, next, handleChange) => {
-  if (prev === next || next === void 0) {
-    return prev;
-  }
-  handleChange == null ? void 0 : handleChange(next);
-  return next;
+const idFn = () => {
 };
 export {
   useControllableState

package/dist/esm/useControllableState.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/useControllableState.ts"],
-  "sourcesContent": ["import { useEvent } from '@tamagui/use-event'\nimport React, { useEffect, useRef, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to prop-wins\n\ntype ChangeCb<T> = ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n\nexport function useControllableState<T>({\n  prop,\n  defaultProp,\n  onChange,\n  strategy = 'prop-wins',\n  preventUpdate,\n}: {\n  prop?: T | undefined\n  defaultProp: T\n  onChange?: ChangeCb<T>\n  strategy?: 'prop-wins' | 'most-recent-wins'\n  preventUpdate?: boolean\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n  const [val, setVal] = useState(prop ?? defaultProp)\n  const propWins = strategy === 'prop-wins'\n\n  useEffect(() => {\n    const next = getNextStateWithCallback(val, prop)\n    if (next !== undefined && next !== val) {\n      setVal(next)\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [prop])\n\n  return [\n    val,\n    useEvent((next: unknown) => {\n      if (preventUpdate) return\n      if (propWins && prop !== undefined) {\n        return\n      }\n      setVal((prev) => {\n        return getNextStateWithCallback(\n          prev,\n          typeof next === 'function' ? next(prev) : next,\n          onChange\n        )\n      })\n    }),\n  ]\n}\n\nconst getNextStateWithCallback = (prev: any, next: any, handleChange?: ChangeCb<any>) => {\n  if (prev === next || next === undefined) {\n    return prev\n  }\n  handleChange?.(next)\n  return next\n}\n"],
-  "mappings": "AAAA;AACA;AAOO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAO+C;AAC/C,QAAM,CAAC,KAAK,UAAU,SAAS,QAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,YAAU,MAAM;AACd,UAAM,OAAO,yBAAyB,KAAK,IAAI;AAC/C,QAAI,SAAS,UAAa,SAAS,KAAK;AACtC,aAAO,IAAI;AAAA,IACb;AAAA,EAEF,GAAG,CAAC,IAAI,CAAC;AAET,SAAO;AAAA,IACL;AAAA,IACA,SAAS,CAAC,SAAkB;AAC1B,UAAI;AAAe;AACnB,UAAI,YAAY,SAAS,QAAW;AAClC;AAAA,MACF;AACA,aAAO,CAAC,SAAS;AACf,eAAO,yBACL,MACA,OAAO,SAAS,aAAa,KAAK,IAAI,IAAI,MAC1C,QACF;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AACF;AAEA,MAAM,2BAA2B,CAAC,MAAW,MAAW,iBAAiC;AACvF,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,+CAAe;AACf,SAAO;AACT;",
+  "sourcesContent": ["import { useEvent } from '@tamagui/use-event'\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\ntype ChangeCb<T> = ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n\nexport function useControllableState<T>({\n  prop,\n  defaultProp,\n  onChange,\n  strategy = 'prop-wins',\n  preventUpdate,\n}: {\n  prop?: T | undefined\n  defaultProp: T\n  onChange?: ChangeCb<T>\n  strategy?: 'prop-wins' | 'most-recent-wins'\n  preventUpdate?: boolean\n}): [T, (next: T) => void] {\n  const [state, setState] = useState(prop ?? defaultProp)\n  const previous = useRef<any>(state)\n  const value = strategy === 'prop-wins' ? prop : state\n  const propWins = strategy === 'prop-wins'\n  const onChangeCb = useEvent(onChange || idFn)\n\n  useEffect(() => {\n    if (state !== previous.current) {\n      previous.current = state\n      onChangeCb(state)\n    }\n  }, [onChangeCb, state])\n\n  return [\n    value as T,\n    useCallback(\n      (next: T) => {\n        if (preventUpdate) return\n        if (propWins) {\n          onChangeCb(next)\n        } else {\n          setState(next)\n        }\n      },\n      [preventUpdate, propWins, onChangeCb]\n    ),\n  ]\n}\n\nconst idFn = () => {}\n"],
+  "mappings": "AAAA;AACA;AAOO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAOyB;AACzB,QAAM,CAAC,OAAO,YAAY,SAAS,QAAQ,WAAW;AACtD,QAAM,WAAW,OAAY,KAAK;AAClC,QAAM,QAAQ,aAAa,cAAc,OAAO;AAChD,QAAM,WAAW,aAAa;AAC9B,QAAM,aAAa,SAAS,YAAY,IAAI;AAE5C,YAAU,MAAM;AACd,QAAI,UAAU,SAAS,SAAS;AAC9B,eAAS,UAAU;AACnB,iBAAW,KAAK;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,YAAY,KAAK,CAAC;AAEtB,SAAO;AAAA,IACL;AAAA,IACA,YACE,CAAC,SAAY;AACX,UAAI;AAAe;AACnB,UAAI,UAAU;AACZ,mBAAW,IAAI;AAAA,MACjB,OAAO;AACL,iBAAS,IAAI;AAAA,MACf;AAAA,IACF,GACA,CAAC,eAAe,UAAU,UAAU,CACtC;AAAA,EACF;AACF;AAEA,MAAM,OAAO,MAAM;AAAC;",
   "names": []
 }

package/dist/jsx/useControllableState.js

@@ -1,5 +1,5 @@
 import { useEvent } from "@tamagui/use-event";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 function useControllableState({
   prop,
   defaultProp,
@@ -7,34 +7,31 @@ function useControllableState({
   strategy = "prop-wins",
   preventUpdate
 }) {
-  const [val, setVal] = useState(prop != null ? prop : defaultProp);
+  const [state, setState] = useState(prop != null ? prop : defaultProp);
+  const previous = useRef(state);
+  const value = strategy === "prop-wins" ? prop : state;
   const propWins = strategy === "prop-wins";
+  const onChangeCb = useEvent(onChange || idFn);
   useEffect(() => {
-    const next = getNextStateWithCallback(val, prop);
-    if (next !== void 0 && next !== val) {
-      setVal(next);
+    if (state !== previous.current) {
+      previous.current = state;
+      onChangeCb(state);
     }
-  }, [prop]);
+  }, [onChangeCb, state]);
   return [
-    val,
-    useEvent((next) => {
+    value,
+    useCallback((next) => {
       if (preventUpdate)
         return;
-      if (propWins && prop !== void 0) {
-        return;
+      if (propWins) {
+        onChangeCb(next);
+      } else {
+        setState(next);
       }
-      setVal((prev) => {
-        return getNextStateWithCallback(prev, typeof next === "function" ? next(prev) : next, onChange);
-      });
-    })
+    }, [preventUpdate, propWins, onChangeCb])
   ];
 }
-const getNextStateWithCallback = (prev, next, handleChange) => {
-  if (prev === next || next === void 0) {
-    return prev;
-  }
-  handleChange == null ? void 0 : handleChange(next);
-  return next;
+const idFn = () => {
 };
 export {
   useControllableState

package/dist/jsx/useControllableState.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/useControllableState.ts"],
-  "sourcesContent": ["import { useEvent } from '@tamagui/use-event'\nimport React, { useEffect, useRef, useState } from 'react'\n\n// can configure to allow most-recent-wins or prop-wins\n// defaults to prop-wins\n\ntype ChangeCb<T> = ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n\nexport function useControllableState<T>({\n  prop,\n  defaultProp,\n  onChange,\n  strategy = 'prop-wins',\n  preventUpdate,\n}: {\n  prop?: T | undefined\n  defaultProp: T\n  onChange?: ChangeCb<T>\n  strategy?: 'prop-wins' | 'most-recent-wins'\n  preventUpdate?: boolean\n}): [T, React.Dispatch<React.SetStateAction<T>>] {\n  const [val, setVal] = useState(prop ?? defaultProp)\n  const propWins = strategy === 'prop-wins'\n\n  useEffect(() => {\n    const next = getNextStateWithCallback(val, prop)\n    if (next !== undefined && next !== val) {\n      setVal(next)\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [prop])\n\n  return [\n    val,\n    useEvent((next: unknown) => {\n      if (preventUpdate) return\n      if (propWins && prop !== undefined) {\n        return\n      }\n      setVal((prev) => {\n        return getNextStateWithCallback(\n          prev,\n          typeof next === 'function' ? next(prev) : next,\n          onChange\n        )\n      })\n    }),\n  ]\n}\n\nconst getNextStateWithCallback = (prev: any, next: any, handleChange?: ChangeCb<any>) => {\n  if (prev === next || next === undefined) {\n    return prev\n  }\n  handleChange?.(next)\n  return next\n}\n"],
-  "mappings": "AAAA;AACA;AAOO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAO+C;AAC/C,QAAM,CAAC,KAAK,UAAU,SAAS,sBAAQ,WAAW;AAClD,QAAM,WAAW,aAAa;AAE9B,YAAU,MAAM;AACd,UAAM,OAAO,yBAAyB,KAAK,IAAI;AAC/C,QAAI,SAAS,UAAa,SAAS,KAAK;AACtC,aAAO,IAAI;AAAA,IACb;AAAA,EAEF,GAAG,CAAC,IAAI,CAAC;AAET,SAAO;AAAA,IACL;AAAA,IACA,SAAS,CAAC,SAAkB;AAC1B,UAAI;AAAe;AACnB,UAAI,YAAY,SAAS,QAAW;AAClC;AAAA,MACF;AACA,aAAO,CAAC,SAAS;AACf,eAAO,yBACL,MACA,OAAO,SAAS,aAAa,KAAK,IAAI,IAAI,MAC1C,QACF;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AACF;AAEA,MAAM,2BAA2B,CAAC,MAAW,MAAW,iBAAiC;AACvF,MAAI,SAAS,QAAQ,SAAS,QAAW;AACvC,WAAO;AAAA,EACT;AACA,+CAAe;AACf,SAAO;AACT;",
+  "sourcesContent": ["import { useEvent } from '@tamagui/use-event'\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\ntype ChangeCb<T> = ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>\n\nexport function useControllableState<T>({\n  prop,\n  defaultProp,\n  onChange,\n  strategy = 'prop-wins',\n  preventUpdate,\n}: {\n  prop?: T | undefined\n  defaultProp: T\n  onChange?: ChangeCb<T>\n  strategy?: 'prop-wins' | 'most-recent-wins'\n  preventUpdate?: boolean\n}): [T, (next: T) => void] {\n  const [state, setState] = useState(prop ?? defaultProp)\n  const previous = useRef<any>(state)\n  const value = strategy === 'prop-wins' ? prop : state\n  const propWins = strategy === 'prop-wins'\n  const onChangeCb = useEvent(onChange || idFn)\n\n  useEffect(() => {\n    if (state !== previous.current) {\n      previous.current = state\n      onChangeCb(state)\n    }\n  }, [onChangeCb, state])\n\n  return [\n    value as T,\n    useCallback(\n      (next: T) => {\n        if (preventUpdate) return\n        if (propWins) {\n          onChangeCb(next)\n        } else {\n          setState(next)\n        }\n      },\n      [preventUpdate, propWins, onChangeCb]\n    ),\n  ]\n}\n\nconst idFn = () => {}\n"],
+  "mappings": "AAAA;AACA;AAOO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAOyB;AACzB,QAAM,CAAC,OAAO,YAAY,SAAS,sBAAQ,WAAW;AACtD,QAAM,WAAW,OAAY,KAAK;AAClC,QAAM,QAAQ,aAAa,cAAc,OAAO;AAChD,QAAM,WAAW,aAAa;AAC9B,QAAM,aAAa,SAAS,YAAY,IAAI;AAE5C,YAAU,MAAM;AACd,QAAI,UAAU,SAAS,SAAS;AAC9B,eAAS,UAAU;AACnB,iBAAW,KAAK;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,YAAY,KAAK,CAAC;AAEtB,SAAO;AAAA,IACL;AAAA,IACA,YACE,CAAC,SAAY;AACX,UAAI;AAAe;AACnB,UAAI,UAAU;AACZ,mBAAW,IAAI;AAAA,MACjB,OAAO;AACL,iBAAS,IAAI;AAAA,MACf;AAAA,IACF,GACA,CAAC,eAAe,UAAU,UAAU,CACtC;AAAA,EACF;AACF;AAEA,MAAM,OAAO,MAAM;AAAC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/use-controllable-state",
-  "version": "1.0.1-beta.120",
+  "version": "1.0.1-beta.123",
   "sideEffects": false,
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
@@ -19,14 +19,14 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/use-event": "^1.0.1-beta.120"
+    "@tamagui/use-event": "^1.0.1-beta.123"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.120",
+    "@tamagui/build": "^1.0.1-beta.123",
     "react": "*",
     "react-dom": "*"
   },

package/src/useControllableState.ts

@@ -1,5 +1,5 @@
 import { useEvent } from '@tamagui/use-event'
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
 
 // can configure to allow most-recent-wins or prop-wins
 // defaults to prop-wins
@@ -18,40 +18,34 @@ export function useControllableState<T>({
   onChange?: ChangeCb<T>
   strategy?: 'prop-wins' | 'most-recent-wins'
   preventUpdate?: boolean
-}): [T, React.Dispatch<React.SetStateAction<T>>] {
-  const [val, setVal] = useState(prop ?? defaultProp)
+}): [T, (next: T) => void] {
+  const [state, setState] = useState(prop ?? defaultProp)
+  const previous = useRef<any>(state)
+  const value = strategy === 'prop-wins' ? prop : state
   const propWins = strategy === 'prop-wins'
+  const onChangeCb = useEvent(onChange || idFn)
 
   useEffect(() => {
-    const next = getNextStateWithCallback(val, prop)
-    if (next !== undefined && next !== val) {
-      setVal(next)
+    if (state !== previous.current) {
+      previous.current = state
+      onChangeCb(state)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [prop])
+  }, [onChangeCb, state])
 
   return [
-    val,
-    useEvent((next: unknown) => {
-      if (preventUpdate) return
-      if (propWins && prop !== undefined) {
-        return
-      }
-      setVal((prev) => {
-        return getNextStateWithCallback(
-          prev,
-          typeof next === 'function' ? next(prev) : next,
-          onChange
-        )
-      })
-    }),
+    value as T,
+    useCallback(
+      (next: T) => {
+        if (preventUpdate) return
+        if (propWins) {
+          onChangeCb(next)
+        } else {
+          setState(next)
+        }
+      },
+      [preventUpdate, propWins, onChangeCb]
+    ),
   ]
 }
 
-const getNextStateWithCallback = (prev: any, next: any, handleChange?: ChangeCb<any>) => {
-  if (prev === next || next === undefined) {
-    return prev
-  }
-  handleChange?.(next)
-  return next
-}
+const idFn = () => {}

package/types/useControllableState.d.ts

@@ -6,6 +6,6 @@ export declare function useControllableState<T>({ prop, defaultProp, onChange, s
     onChange?: ChangeCb<T>;
     strategy?: 'prop-wins' | 'most-recent-wins';
     preventUpdate?: boolean;
-}): [T, React.Dispatch<React.SetStateAction<T>>];
+}): [T, (next: T) => void];
 export {};
 //# 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":"AACA,OAAO,KAAsC,MAAM,OAAO,CAAA;AAK1D,aAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;AAEhF,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,EACtC,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAsB,EACtB,aAAa,GACd,EAAE;IACD,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAA;IACpB,WAAW,EAAE,CAAC,CAAA;IACd,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;IACtB,QAAQ,CAAC,EAAE,WAAW,GAAG,kBAAkB,CAAA;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CA4B/C"}
+{"version":3,"file":"useControllableState.d.ts","sourceRoot":"","sources":["../src/useControllableState.ts"],"names":[],"mappings":"AACA,OAAO,KAAmD,MAAM,OAAO,CAAA;AAKvE,aAAK,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;AAEhF,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,EACtC,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAsB,EACtB,aAAa,GACd,EAAE;IACD,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,CAAA;IACpB,WAAW,EAAE,CAAC,CAAA;IACd,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;IACtB,QAAQ,CAAC,EAAE,WAAW,GAAG,kBAAkB,CAAA;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC,CA4BzB"}