@tamagui/use-controllable-state 1.124.3 → 1.124.5

package/dist/cjs/useControllableState.cjs

@@ -38,25 +38,26 @@ var import_use_event = require("@tamagui/use-event"),
   React = __toESM(require("react")),
   import_start_transition = require("@tamagui/start-transition");
 const emptyCallbackFn = _ => _();
-function useControllableState({
-  prop,
-  defaultProp,
-  onChange,
-  strategy = "prop-wins",
-  preventUpdate,
-  transition
-}) {
-  const [state, setState] = React.useState(prop ?? defaultProp),
+function useControllableState(props) {
+  const {
+      prop,
+      defaultProp,
+      onChange,
+      strategy = "prop-wins",
+      preventUpdate,
+      transition
+    } = props,
+    [state, setState] = React.useState(prop ?? defaultProp),
     previous = React.useRef(state),
     propWins = strategy === "prop-wins" && prop !== void 0,
     value = propWins ? prop : state,
     onChangeCb = (0, import_use_event.useEvent)(onChange || idFn),
     transitionFn = transition ? import_start_transition.startTransition : emptyCallbackFn;
-  React.useEffect(() => {
-    prop !== void 0 && (previous.current = prop, transitionFn(() => {
-      setState(prop);
-    }));
-  }, [prop]), React.useEffect(() => {
+  "prop" in props && prop !== state && transitionFn(() => {
+    setState(prev => {
+      if (prev !== prop) return previous.current = prop, prop;
+    });
+  }), React.useEffect(() => {
     propWins || state !== previous.current && (previous.current = state, onChangeCb(state));
   }, [onChangeCb, state, propWins]);
   const setter = (0, import_use_event.useEvent)(next => {

package/dist/cjs/useControllableState.js

@@ -27,20 +27,21 @@ __export(useControllableState_exports, {
 module.exports = __toCommonJS(useControllableState_exports);
 var import_use_event = require("@tamagui/use-event"), React = __toESM(require("react")), import_start_transition = require("@tamagui/start-transition");
 const emptyCallbackFn = (_) => _();
-function useControllableState({
-  prop,
-  defaultProp,
-  onChange,
-  strategy = "prop-wins",
-  preventUpdate,
-  transition
-}) {
-  const [state, setState] = React.useState(prop ?? defaultProp), previous = React.useRef(state), propWins = strategy === "prop-wins" && prop !== void 0, value = propWins ? prop : state, onChangeCb = (0, import_use_event.useEvent)(onChange || idFn), transitionFn = transition ? import_start_transition.startTransition : emptyCallbackFn;
-  React.useEffect(() => {
-    prop !== void 0 && (previous.current = prop, transitionFn(() => {
-      setState(prop);
-    }));
-  }, [prop]), React.useEffect(() => {
+function useControllableState(props) {
+  const {
+    prop,
+    defaultProp,
+    onChange,
+    strategy = "prop-wins",
+    preventUpdate,
+    transition
+  } = props, [state, setState] = React.useState(prop ?? defaultProp), previous = React.useRef(state), propWins = strategy === "prop-wins" && prop !== void 0, value = propWins ? prop : state, onChangeCb = (0, import_use_event.useEvent)(onChange || idFn), transitionFn = transition ? import_start_transition.startTransition : emptyCallbackFn;
+  "prop" in props && prop !== state && transitionFn(() => {
+    setState((prev) => {
+      if (prev !== prop)
+        return previous.current = prop, prop;
+    });
+  }), React.useEffect(() => {
     propWins || state !== previous.current && (previous.current = state, onChangeCb(state));
   }, [onChangeCb, state, propWins]);
   const setter = (0, import_use_event.useEvent)((next) => {

package/dist/cjs/useControllableState.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useControllableState.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAyB,+BACzB,QAAuB,2BACvB,0BAAgC;AAOhC,MAAM,kBAAkB,CAAC,MAAM,EAAE;AAE1B,SAAS,qBAAwB;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,EACA;AACF,GAOiD;AAC/C,QAAM,CAAC,OAAO,QAAQ,IAAI,MAAM,SAAS,QAAQ,WAAW,GACtD,WAAW,MAAM,OAAY,KAAK,GAClC,WAAW,aAAa,eAAe,SAAS,QAChD,QAAQ,WAAW,OAAO,OAC1B,iBAAa,2BAAS,YAAY,IAAI,GAEtC,eAAe,aAAa,0CAAkB;AAEpD,QAAM,UAAU,MAAM;AACpB,IAAI,SAAS,WACb,SAAS,UAAU,MACnB,aAAa,MAAM;AACjB,eAAS,IAAI;AAAA,IACf,CAAC;AAAA,EACH,GAAG,CAAC,IAAI,CAAC,GAET,MAAM,UAAU,MAAM;AACpB,IAAI,YACA,UAAU,SAAS,YACrB,SAAS,UAAU,OACnB,WAAW,KAAK;AAAA,EAEpB,GAAG,CAAC,YAAY,OAAO,QAAQ,CAAC;AAEhC,QAAM,aAAS,2BAAS,CAAC,SAAS;AAChC,QAAI;AACJ,UAAI,UAAU;AACZ,cAAM,YAAY,OAAO,QAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,mBAAW,SAAS;AAAA,MACtB;AACE,qBAAa,MAAM;AACjB,mBAAS,IAAI;AAAA,QACf,CAAC;AAAA,EAEL,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAyB,+BACzB,QAAuB,2BACvB,0BAAgC;AAOhC,MAAM,kBAAkB,CAAC,MAAM,EAAE;AAE1B,SAAS,qBAAwB,OAOS;AAC/C,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW;AAAA,IACX;AAAA,IACA;AAAA,EACF,IAAI,OACE,CAAC,OAAO,QAAQ,IAAI,MAAM,SAAS,QAAQ,WAAW,GACtD,WAAW,MAAM,OAAY,KAAK,GAClC,WAAW,aAAa,eAAe,SAAS,QAChD,QAAQ,WAAW,OAAO,OAC1B,iBAAa,2BAAS,YAAY,IAAI,GAEtC,eAAe,aAAa,0CAAkB;AAEpD,EAAI,UAAU,SACR,SAAS,SACX,aAAa,MAAM;AAEjB,aAAS,CAAC,SAAS;AACjB,UAAI,SAAS;AACX,wBAAS,UAAU,MACZ;AAAA,IAEX,CAAC;AAAA,EACH,CAAC,GAIL,MAAM,UAAU,MAAM;AACpB,IAAI,YACA,UAAU,SAAS,YACrB,SAAS,UAAU,OACnB,WAAW,KAAK;AAAA,EAEpB,GAAG,CAAC,YAAY,OAAO,QAAQ,CAAC;AAEhC,QAAM,aAAS,2BAAS,CAAC,SAAS;AAChC,QAAI;AACJ,UAAI,UAAU;AACZ,cAAM,YAAY,OAAO,QAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,mBAAW,SAAS;AAAA,MACtB;AACE,qBAAa,MAAM;AACjB,mBAAS,IAAI;AAAA,QACf,CAAC;AAAA,EAEL,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
   "names": []
 }

package/dist/cjs/useControllableState.native.js

@@ -29,15 +29,14 @@ module.exports = __toCommonJS(useControllableState_exports);
 var import_use_event = require("@tamagui/use-event"), React = __toESM(require("react")), import_start_transition = require("@tamagui/start-transition"), emptyCallbackFn = function(_) {
   return _();
 };
-function useControllableState(param) {
-  var { prop, defaultProp, onChange, strategy = "prop-wins", preventUpdate, transition } = param, [state, setState] = React.useState(prop ?? defaultProp), previous = React.useRef(state), propWins = strategy === "prop-wins" && prop !== void 0, value = propWins ? prop : state, onChangeCb = (0, import_use_event.useEvent)(onChange || idFn), transitionFn = transition ? import_start_transition.startTransition : emptyCallbackFn;
-  React.useEffect(function() {
-    prop !== void 0 && (previous.current = prop, transitionFn(function() {
-      setState(prop);
-    }));
-  }, [
-    prop
-  ]), React.useEffect(function() {
+function useControllableState(props) {
+  var { prop, defaultProp, onChange, strategy = "prop-wins", preventUpdate, transition } = props, [state, setState] = React.useState(prop ?? defaultProp), previous = React.useRef(state), propWins = strategy === "prop-wins" && prop !== void 0, value = propWins ? prop : state, onChangeCb = (0, import_use_event.useEvent)(onChange || idFn), transitionFn = transition ? import_start_transition.startTransition : emptyCallbackFn;
+  "prop" in props && prop !== state && transitionFn(function() {
+    setState(function(prev) {
+      if (prev !== prop)
+        return previous.current = prop, prop;
+    });
+  }), React.useEffect(function() {
     propWins || state !== previous.current && (previous.current = state, onChangeCb(state));
   }, [
     onChangeCb,

package/dist/cjs/useControllableState.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/core/use-controllable-state/src/useControllableState.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAAyB,+BACzB,QAAuB,2BACvB,0BAAgC,sCAO1BA,kBAAkB,SAACC,GAAAA;SAAMA,EAAAA;;AAExB,SAASC,qBAAwB,OAcvC;MAduC,EACtCC,MACAC,aACAC,UACAC,WAAW,aACXC,eACAC,WAAU,IAN4B,OAehC,CAACC,OAAOC,QAAAA,IAAYC,MAAMC,SAAST,QAAQC,WAAAA,GAC3CS,WAAWF,MAAMG,OAAYL,KAAAA,GAC7BM,WAAWT,aAAa,eAAeH,SAASa,QAChDC,QAAQF,WAAWZ,OAAOM,OAC1BS,iBAAaC,2BAASd,YAAYe,IAAAA,GAElCC,eAAeb,aAAac,0CAAkBtB;AAEpDW,QAAMY,UAAU,WAAA;AACd,IAAIpB,SAASa,WACbH,SAASW,UAAUrB,MACnBkB,aAAa,WAAA;AACXX,eAASP,IAAAA;IACX,CAAA;EACF,GAAG;IAACA;GAAK,GAETQ,MAAMY,UAAU,WAAA;AACd,IAAIR,YACAN,UAAUI,SAASW,YACrBX,SAASW,UAAUf,OACnBS,WAAWT,KAAAA;EAEf,GAAG;IAACS;IAAYT;IAAOM;GAAS;AAEhC,MAAMU,aAASN,2BAAS,SAACO,MAAAA;AACvB,QAAInB;AACJ,UAAIQ,UAAU;AACZ,YAAMY,YAAY,OAAOD,QAAS,aAAaA,KAAKb,SAASW,OAAO,IAAIE;AACxER,mBAAWS,SAAAA;MACb;AACEN,qBAAa,WAAA;AACXX,mBAASgB,IAAAA;QACX,CAAA;EAEJ,CAAA;AAEA,SAAO;IAACT;IAAYQ;;AACtB;AAEA,IAAML,OAAO,WAAA;AAAO;",
-  "names": ["emptyCallbackFn", "_", "useControllableState", "prop", "defaultProp", "onChange", "strategy", "preventUpdate", "transition", "state", "setState", "React", "useState", "previous", "useRef", "propWins", "undefined", "value", "onChangeCb", "useEvent", "idFn", "transitionFn", "startTransition", "useEffect", "current", "setter", "next", "nextValue"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAAyB,+BACzB,QAAuB,2BACvB,0BAAgC,sCAO1BA,kBAAkB,SAACC,GAAAA;SAAMA,EAAAA;;AAExB,SAASC,qBAAwBC,OAOvC;AACC,MAAM,EACJC,MACAC,aACAC,UACAC,WAAW,aACXC,eACAC,WAAU,IACRN,OACE,CAACO,OAAOC,QAAAA,IAAYC,MAAMC,SAAST,QAAQC,WAAAA,GAC3CS,WAAWF,MAAMG,OAAYL,KAAAA,GAC7BM,WAAWT,aAAa,eAAeH,SAASa,QAChDC,QAAQF,WAAWZ,OAAOM,OAC1BS,iBAAaC,2BAASd,YAAYe,IAAAA,GAElCC,eAAeb,aAAac,0CAAkBvB;AAEpD,EAAI,UAAUG,SACRC,SAASM,SACXY,aAAa,WAAA;AAEXX,aAAS,SAACa,MAAAA;AACR,UAAIA,SAASpB;AACXU,wBAASW,UAAUrB,MACZA;IAEX,CAAA;EACF,CAAA,GAIJQ,MAAMc,UAAU,WAAA;AACd,IAAIV,YACAN,UAAUI,SAASW,YACrBX,SAASW,UAAUf,OACnBS,WAAWT,KAAAA;EAEf,GAAG;IAACS;IAAYT;IAAOM;GAAS;AAEhC,MAAMW,aAASP,2BAAS,SAACQ,MAAAA;AACvB,QAAIpB;AACJ,UAAIQ,UAAU;AACZ,YAAMa,YAAY,OAAOD,QAAS,aAAaA,KAAKd,SAASW,OAAO,IAAIG;AACxET,mBAAWU,SAAAA;MACb;AACEP,qBAAa,WAAA;AACXX,mBAASiB,IAAAA;QACX,CAAA;EAEJ,CAAA;AAEA,SAAO;IAACV;IAAYS;;AACtB;AAEA,IAAMN,OAAO,WAAA;AAAO;",
+  "names": ["emptyCallbackFn", "_", "useControllableState", "props", "prop", "defaultProp", "onChange", "strategy", "preventUpdate", "transition", "state", "setState", "React", "useState", "previous", "useRef", "propWins", "undefined", "value", "onChangeCb", "useEvent", "idFn", "transitionFn", "startTransition", "prev", "current", "useEffect", "setter", "next", "nextValue"]
 }

package/dist/esm/useControllableState.js

@@ -2,20 +2,21 @@ import { useEvent } from "@tamagui/use-event";
 import * as React from "react";
 import { startTransition } from "@tamagui/start-transition";
 const emptyCallbackFn = (_) => _();
-function useControllableState({
-  prop,
-  defaultProp,
-  onChange,
-  strategy = "prop-wins",
-  preventUpdate,
-  transition
-}) {
-  const [state, setState] = React.useState(prop ?? defaultProp), previous = React.useRef(state), propWins = strategy === "prop-wins" && prop !== void 0, value = propWins ? prop : state, onChangeCb = useEvent(onChange || idFn), transitionFn = transition ? startTransition : emptyCallbackFn;
-  React.useEffect(() => {
-    prop !== void 0 && (previous.current = prop, transitionFn(() => {
-      setState(prop);
-    }));
-  }, [prop]), React.useEffect(() => {
+function useControllableState(props) {
+  const {
+    prop,
+    defaultProp,
+    onChange,
+    strategy = "prop-wins",
+    preventUpdate,
+    transition
+  } = props, [state, setState] = React.useState(prop ?? defaultProp), previous = React.useRef(state), propWins = strategy === "prop-wins" && prop !== void 0, value = propWins ? prop : state, onChangeCb = useEvent(onChange || idFn), transitionFn = transition ? startTransition : emptyCallbackFn;
+  "prop" in props && prop !== state && transitionFn(() => {
+    setState((prev) => {
+      if (prev !== prop)
+        return previous.current = prop, prop;
+    });
+  }), React.useEffect(() => {
     propWins || state !== previous.current && (previous.current = state, onChangeCb(state));
   }, [onChangeCb, state, propWins]);
   const setter = useEvent((next) => {

package/dist/esm/useControllableState.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/useControllableState.ts"],
-  "mappings": "AAAA,SAAS,gBAAgB;AACzB,YAAY,WAAW;AACvB,SAAS,uBAAuB;AAOhC,MAAM,kBAAkB,CAAC,MAAM,EAAE;AAE1B,SAAS,qBAAwB;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,EACA;AACF,GAOiD;AAC/C,QAAM,CAAC,OAAO,QAAQ,IAAI,MAAM,SAAS,QAAQ,WAAW,GACtD,WAAW,MAAM,OAAY,KAAK,GAClC,WAAW,aAAa,eAAe,SAAS,QAChD,QAAQ,WAAW,OAAO,OAC1B,aAAa,SAAS,YAAY,IAAI,GAEtC,eAAe,aAAa,kBAAkB;AAEpD,QAAM,UAAU,MAAM;AACpB,IAAI,SAAS,WACb,SAAS,UAAU,MACnB,aAAa,MAAM;AACjB,eAAS,IAAI;AAAA,IACf,CAAC;AAAA,EACH,GAAG,CAAC,IAAI,CAAC,GAET,MAAM,UAAU,MAAM;AACpB,IAAI,YACA,UAAU,SAAS,YACrB,SAAS,UAAU,OACnB,WAAW,KAAK;AAAA,EAEpB,GAAG,CAAC,YAAY,OAAO,QAAQ,CAAC;AAEhC,QAAM,SAAS,SAAS,CAAC,SAAS;AAChC,QAAI;AACJ,UAAI,UAAU;AACZ,cAAM,YAAY,OAAO,QAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,mBAAW,SAAS;AAAA,MACtB;AACE,qBAAa,MAAM;AACjB,mBAAS,IAAI;AAAA,QACf,CAAC;AAAA,EAEL,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
+  "mappings": "AAAA,SAAS,gBAAgB;AACzB,YAAY,WAAW;AACvB,SAAS,uBAAuB;AAOhC,MAAM,kBAAkB,CAAC,MAAM,EAAE;AAE1B,SAAS,qBAAwB,OAOS;AAC/C,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW;AAAA,IACX;AAAA,IACA;AAAA,EACF,IAAI,OACE,CAAC,OAAO,QAAQ,IAAI,MAAM,SAAS,QAAQ,WAAW,GACtD,WAAW,MAAM,OAAY,KAAK,GAClC,WAAW,aAAa,eAAe,SAAS,QAChD,QAAQ,WAAW,OAAO,OAC1B,aAAa,SAAS,YAAY,IAAI,GAEtC,eAAe,aAAa,kBAAkB;AAEpD,EAAI,UAAU,SACR,SAAS,SACX,aAAa,MAAM;AAEjB,aAAS,CAAC,SAAS;AACjB,UAAI,SAAS;AACX,wBAAS,UAAU,MACZ;AAAA,IAEX,CAAC;AAAA,EACH,CAAC,GAIL,MAAM,UAAU,MAAM;AACpB,IAAI,YACA,UAAU,SAAS,YACrB,SAAS,UAAU,OACnB,WAAW,KAAK;AAAA,EAEpB,GAAG,CAAC,YAAY,OAAO,QAAQ,CAAC;AAEhC,QAAM,SAAS,SAAS,CAAC,SAAS;AAChC,QAAI;AACJ,UAAI,UAAU;AACZ,cAAM,YAAY,OAAO,QAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,mBAAW,SAAS;AAAA,MACtB;AACE,qBAAa,MAAM;AACjB,mBAAS,IAAI;AAAA,QACf,CAAC;AAAA,EAEL,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
   "names": []
 }

package/dist/esm/useControllableState.mjs

@@ -2,25 +2,26 @@ import { useEvent } from "@tamagui/use-event";
 import * as React from "react";
 import { startTransition } from "@tamagui/start-transition";
 const emptyCallbackFn = _ => _();
-function useControllableState({
-  prop,
-  defaultProp,
-  onChange,
-  strategy = "prop-wins",
-  preventUpdate,
-  transition
-}) {
-  const [state, setState] = React.useState(prop ?? defaultProp),
+function useControllableState(props) {
+  const {
+      prop,
+      defaultProp,
+      onChange,
+      strategy = "prop-wins",
+      preventUpdate,
+      transition
+    } = props,
+    [state, setState] = React.useState(prop ?? defaultProp),
     previous = React.useRef(state),
     propWins = strategy === "prop-wins" && prop !== void 0,
     value = propWins ? prop : state,
     onChangeCb = useEvent(onChange || idFn),
     transitionFn = transition ? startTransition : emptyCallbackFn;
-  React.useEffect(() => {
-    prop !== void 0 && (previous.current = prop, transitionFn(() => {
-      setState(prop);
-    }));
-  }, [prop]), React.useEffect(() => {
+  "prop" in props && prop !== state && transitionFn(() => {
+    setState(prev => {
+      if (prev !== prop) return previous.current = prop, prop;
+    });
+  }), React.useEffect(() => {
     propWins || state !== previous.current && (previous.current = state, onChangeCb(state));
   }, [onChangeCb, state, propWins]);
   const setter = useEvent(next => {

package/dist/esm/useControllableState.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useEvent","React","startTransition","emptyCallbackFn","_","useControllableState","prop","defaultProp","onChange","strategy","preventUpdate","transition","state","setState","useState","previous","useRef","propWins","value","onChangeCb","idFn","transitionFn","useEffect","current","setter","next","nextValue"],"sources":["../../src/useControllableState.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,QAAgB;AACzB,YAAYC,KAAA,MAAW;AACvB,SAASC,eAAA,QAAuB;AAOhC,MAAMC,eAAA,GAAmBC,CAAA,IAAMA,CAAA,CAAE;AAE1B,SAASC,qBAAwB;EACtCC,IAAA;EACAC,WAAA;EACAC,QAAA;EACAC,QAAA,GAAW;EACXC,aAAA;EACAC;AACF,GAOiD;EAC/C,MAAM,CAACC,KAAA,EAAOC,QAAQ,IAAIZ,KAAA,CAAMa,QAAA,CAASR,IAAA,IAAQC,WAAW;IACtDQ,QAAA,GAAWd,KAAA,CAAMe,MAAA,CAAYJ,KAAK;IAClCK,QAAA,GAAWR,QAAA,KAAa,eAAeH,IAAA,KAAS;IAChDY,KAAA,GAAQD,QAAA,GAAWX,IAAA,GAAOM,KAAA;IAC1BO,UAAA,GAAanB,QAAA,CAASQ,QAAA,IAAYY,IAAI;IAEtCC,YAAA,GAAeV,UAAA,GAAaT,eAAA,GAAkBC,eAAA;EAEpDF,KAAA,CAAMqB,SAAA,CAAU,MAAM;IAChBhB,IAAA,KAAS,WACbS,QAAA,CAASQ,OAAA,GAAUjB,IAAA,EACnBe,YAAA,CAAa,MAAM;MACjBR,QAAA,CAASP,IAAI;IACf,CAAC;EACH,GAAG,CAACA,IAAI,CAAC,GAETL,KAAA,CAAMqB,SAAA,CAAU,MAAM;IAChBL,QAAA,IACAL,KAAA,KAAUG,QAAA,CAASQ,OAAA,KACrBR,QAAA,CAASQ,OAAA,GAAUX,KAAA,EACnBO,UAAA,CAAWP,KAAK;EAEpB,GAAG,CAACO,UAAA,EAAYP,KAAA,EAAOK,QAAQ,CAAC;EAEhC,MAAMO,MAAA,GAASxB,QAAA,CAAUyB,IAAA,IAAS;IAChC,IAAI,CAAAf,aAAA,EACJ,IAAIO,QAAA,EAAU;MACZ,MAAMS,SAAA,GAAY,OAAOD,IAAA,IAAS,aAAaA,IAAA,CAAKV,QAAA,CAASQ,OAAO,IAAIE,IAAA;MACxEN,UAAA,CAAWO,SAAS;IACtB,OACEL,YAAA,CAAa,MAAM;MACjBR,QAAA,CAASY,IAAI;IACf,CAAC;EAEL,CAAC;EAED,OAAO,CAACP,KAAA,EAAYM,MAAM;AAC5B;AAEA,MAAMJ,IAAA,GAAOA,CAAA,KAAM,CAAC","ignoreList":[]}
+{"version":3,"names":["useEvent","React","startTransition","emptyCallbackFn","_","useControllableState","props","prop","defaultProp","onChange","strategy","preventUpdate","transition","state","setState","useState","previous","useRef","propWins","value","onChangeCb","idFn","transitionFn","prev","current","useEffect","setter","next","nextValue"],"sources":["../../src/useControllableState.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,QAAgB;AACzB,YAAYC,KAAA,MAAW;AACvB,SAASC,eAAA,QAAuB;AAOhC,MAAMC,eAAA,GAAmBC,CAAA,IAAMA,CAAA,CAAE;AAE1B,SAASC,qBAAwBC,KAAA,EAOS;EAC/C,MAAM;MACJC,IAAA;MACAC,WAAA;MACAC,QAAA;MACAC,QAAA,GAAW;MACXC,aAAA;MACAC;IACF,IAAIN,KAAA;IACE,CAACO,KAAA,EAAOC,QAAQ,IAAIb,KAAA,CAAMc,QAAA,CAASR,IAAA,IAAQC,WAAW;IACtDQ,QAAA,GAAWf,KAAA,CAAMgB,MAAA,CAAYJ,KAAK;IAClCK,QAAA,GAAWR,QAAA,KAAa,eAAeH,IAAA,KAAS;IAChDY,KAAA,GAAQD,QAAA,GAAWX,IAAA,GAAOM,KAAA;IAC1BO,UAAA,GAAapB,QAAA,CAASS,QAAA,IAAYY,IAAI;IAEtCC,YAAA,GAAeV,UAAA,GAAaV,eAAA,GAAkBC,eAAA;EAEhD,UAAUG,KAAA,IACRC,IAAA,KAASM,KAAA,IACXS,YAAA,CAAa,MAAM;IAEjBR,QAAA,CAAUS,IAAA,IAAS;MACjB,IAAIA,IAAA,KAAShB,IAAA,EACX,OAAAS,QAAA,CAASQ,OAAA,GAAUjB,IAAA,EACZA,IAAA;IAEX,CAAC;EACH,CAAC,GAILN,KAAA,CAAMwB,SAAA,CAAU,MAAM;IAChBP,QAAA,IACAL,KAAA,KAAUG,QAAA,CAASQ,OAAA,KACrBR,QAAA,CAASQ,OAAA,GAAUX,KAAA,EACnBO,UAAA,CAAWP,KAAK;EAEpB,GAAG,CAACO,UAAA,EAAYP,KAAA,EAAOK,QAAQ,CAAC;EAEhC,MAAMQ,MAAA,GAAS1B,QAAA,CAAU2B,IAAA,IAAS;IAChC,IAAI,CAAAhB,aAAA,EACJ,IAAIO,QAAA,EAAU;MACZ,MAAMU,SAAA,GAAY,OAAOD,IAAA,IAAS,aAAaA,IAAA,CAAKX,QAAA,CAASQ,OAAO,IAAIG,IAAA;MACxEP,UAAA,CAAWQ,SAAS;IACtB,OACEN,YAAA,CAAa,MAAM;MACjBR,QAAA,CAASa,IAAI;IACf,CAAC;EAEL,CAAC;EAED,OAAO,CAACR,KAAA,EAAYO,MAAM;AAC5B;AAEA,MAAML,IAAA,GAAOA,CAAA,KAAM,CAAC","ignoreList":[]}

package/dist/esm/useControllableState.native.js

@@ -4,15 +4,14 @@ import { startTransition } from "@tamagui/start-transition";
 var emptyCallbackFn = function(_) {
   return _();
 };
-function useControllableState(param) {
-  var { prop, defaultProp, onChange, strategy = "prop-wins", preventUpdate, transition } = param, [state, setState] = React.useState(prop ?? defaultProp), previous = React.useRef(state), propWins = strategy === "prop-wins" && prop !== void 0, value = propWins ? prop : state, onChangeCb = useEvent(onChange || idFn), transitionFn = transition ? startTransition : emptyCallbackFn;
-  React.useEffect(function() {
-    prop !== void 0 && (previous.current = prop, transitionFn(function() {
-      setState(prop);
-    }));
-  }, [
-    prop
-  ]), React.useEffect(function() {
+function useControllableState(props) {
+  var { prop, defaultProp, onChange, strategy = "prop-wins", preventUpdate, transition } = props, [state, setState] = React.useState(prop ?? defaultProp), previous = React.useRef(state), propWins = strategy === "prop-wins" && prop !== void 0, value = propWins ? prop : state, onChangeCb = useEvent(onChange || idFn), transitionFn = transition ? startTransition : emptyCallbackFn;
+  "prop" in props && prop !== state && transitionFn(function() {
+    setState(function(prev) {
+      if (prev !== prop)
+        return previous.current = prop, prop;
+    });
+  }), React.useEffect(function() {
     propWins || state !== previous.current && (previous.current = state, onChangeCb(state));
   }, [
     onChangeCb,

package/dist/esm/useControllableState.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/core/use-controllable-state/src/useControllableState.ts"],
-  "mappings": "AAAA,SAASA,gBAAgB;AACzB,YAAYC,WAAW;AACvB,SAASC,uBAAuB;AAOhC,IAAMC,kBAAkB,SAACC,GAAAA;SAAMA,EAAAA;;AAExB,SAASC,qBAAwB,OAcvC;MAduC,EACtCC,MACAC,aACAC,UACAC,WAAW,aACXC,eACAC,WAAU,IAN4B,OAehC,CAACC,OAAOC,QAAAA,IAAYZ,MAAMa,SAASR,QAAQC,WAAAA,GAC3CQ,WAAWd,MAAMe,OAAYJ,KAAAA,GAC7BK,WAAWR,aAAa,eAAeH,SAASY,QAChDC,QAAQF,WAAWX,OAAOM,OAC1BQ,aAAapB,SAASQ,YAAYa,IAAAA,GAElCC,eAAeX,aAAaT,kBAAkBC;AAEpDF,QAAMsB,UAAU,WAAA;AACd,IAAIjB,SAASY,WACbH,SAASS,UAAUlB,MACnBgB,aAAa,WAAA;AACXT,eAASP,IAAAA;IACX,CAAA;EACF,GAAG;IAACA;GAAK,GAETL,MAAMsB,UAAU,WAAA;AACd,IAAIN,YACAL,UAAUG,SAASS,YACrBT,SAASS,UAAUZ,OACnBQ,WAAWR,KAAAA;EAEf,GAAG;IAACQ;IAAYR;IAAOK;GAAS;AAEhC,MAAMQ,SAASzB,SAAS,SAAC0B,MAAAA;AACvB,QAAIhB;AACJ,UAAIO,UAAU;AACZ,YAAMU,YAAY,OAAOD,QAAS,aAAaA,KAAKX,SAASS,OAAO,IAAIE;AACxEN,mBAAWO,SAAAA;MACb;AACEL,qBAAa,WAAA;AACXT,mBAASa,IAAAA;QACX,CAAA;EAEJ,CAAA;AAEA,SAAO;IAACP;IAAYM;;AACtB;AAEA,IAAMJ,OAAO,WAAA;AAAO;",
-  "names": ["useEvent", "React", "startTransition", "emptyCallbackFn", "_", "useControllableState", "prop", "defaultProp", "onChange", "strategy", "preventUpdate", "transition", "state", "setState", "useState", "previous", "useRef", "propWins", "undefined", "value", "onChangeCb", "idFn", "transitionFn", "useEffect", "current", "setter", "next", "nextValue"]
+  "mappings": "AAAA,SAASA,gBAAgB;AACzB,YAAYC,WAAW;AACvB,SAASC,uBAAuB;AAOhC,IAAMC,kBAAkB,SAACC,GAAAA;SAAMA,EAAAA;;AAExB,SAASC,qBAAwBC,OAOvC;AACC,MAAM,EACJC,MACAC,aACAC,UACAC,WAAW,aACXC,eACAC,WAAU,IACRN,OACE,CAACO,OAAOC,QAAAA,IAAYb,MAAMc,SAASR,QAAQC,WAAAA,GAC3CQ,WAAWf,MAAMgB,OAAYJ,KAAAA,GAC7BK,WAAWR,aAAa,eAAeH,SAASY,QAChDC,QAAQF,WAAWX,OAAOM,OAC1BQ,aAAarB,SAASS,YAAYa,IAAAA,GAElCC,eAAeX,aAAaV,kBAAkBC;AAEpD,EAAI,UAAUG,SACRC,SAASM,SACXU,aAAa,WAAA;AAEXT,aAAS,SAACU,MAAAA;AACR,UAAIA,SAASjB;AACXS,wBAASS,UAAUlB,MACZA;IAEX,CAAA;EACF,CAAA,GAIJN,MAAMyB,UAAU,WAAA;AACd,IAAIR,YACAL,UAAUG,SAASS,YACrBT,SAASS,UAAUZ,OACnBQ,WAAWR,KAAAA;EAEf,GAAG;IAACQ;IAAYR;IAAOK;GAAS;AAEhC,MAAMS,SAAS3B,SAAS,SAAC4B,MAAAA;AACvB,QAAIjB;AACJ,UAAIO,UAAU;AACZ,YAAMW,YAAY,OAAOD,QAAS,aAAaA,KAAKZ,SAASS,OAAO,IAAIG;AACxEP,mBAAWQ,SAAAA;MACb;AACEN,qBAAa,WAAA;AACXT,mBAASc,IAAAA;QACX,CAAA;EAEJ,CAAA;AAEA,SAAO;IAACR;IAAYO;;AACtB;AAEA,IAAML,OAAO,WAAA;AAAO;",
+  "names": ["useEvent", "React", "startTransition", "emptyCallbackFn", "_", "useControllableState", "props", "prop", "defaultProp", "onChange", "strategy", "preventUpdate", "transition", "state", "setState", "useState", "previous", "useRef", "propWins", "undefined", "value", "onChangeCb", "idFn", "transitionFn", "prev", "current", "useEffect", "setter", "next", "nextValue"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/use-controllable-state",
-  "version": "1.124.3",
+  "version": "1.124.5",
   "sideEffects": false,
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
@@ -33,11 +33,11 @@
     }
   },
   "dependencies": {
-    "@tamagui/start-transition": "1.124.3",
-    "@tamagui/use-event": "1.124.3"
+    "@tamagui/start-transition": "1.124.5",
+    "@tamagui/use-event": "1.124.5"
   },
   "devDependencies": {
-    "@tamagui/build": "1.124.3",
+    "@tamagui/build": "1.124.5",
     "react": "*"
   },
   "publishConfig": {

package/src/useControllableState.ts

@@ -9,14 +9,7 @@ type ChangeCb<T> = ((next: T) => void) | React.Dispatch<React.SetStateAction<T>>
 
 const emptyCallbackFn = (_) => _()
 
-export function useControllableState<T>({
-  prop,
-  defaultProp,
-  onChange,
-  strategy = 'prop-wins',
-  preventUpdate,
-  transition,
-}: {
+export function useControllableState<T>(props: {
   prop?: T | undefined
   defaultProp: T
   onChange?: ChangeCb<T>
@@ -24,6 +17,14 @@ export function useControllableState<T>({
   preventUpdate?: boolean
   transition?: boolean
 }): [T, React.Dispatch<React.SetStateAction<T>>] {
+  const {
+    prop,
+    defaultProp,
+    onChange,
+    strategy = 'prop-wins',
+    preventUpdate,
+    transition,
+  } = props
   const [state, setState] = React.useState(prop ?? defaultProp)
   const previous = React.useRef<any>(state)
   const propWins = strategy === 'prop-wins' && prop !== undefined
@@ -32,13 +33,19 @@ export function useControllableState<T>({
 
   const transitionFn = transition ? startTransition : emptyCallbackFn
 
-  React.useEffect(() => {
-    if (prop === undefined) return
-    previous.current = prop
-    transitionFn(() => {
-      setState(prop)
-    })
-  }, [prop])
+  if ('prop' in props) {
+    if (prop !== state) {
+      transitionFn(() => {
+        // @ts-expect-error if user passes undefined thats on them
+        setState((prev) => {
+          if (prev !== prop) {
+            previous.current = prop
+            return prop
+          }
+        })
+      })
+    }
+  }
 
   React.useEffect(() => {
     if (propWins) return

package/types/useControllableState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useControllableState.d.ts","sourceRoot":"","sources":["../src/useControllableState.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,KAAK,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;AAIhF,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,EACtC,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAsB,EACtB,aAAa,EACb,UAAU,GACX,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;IACvB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAsC/C"}
+{"version":3,"file":"useControllableState.d.ts","sourceRoot":"","sources":["../src/useControllableState.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,KAAK,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;AAIhF,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,EACtC,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAsB,EACtB,aAAa,EACb,UAAU,GACX,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;IACvB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CA0C/C"}