@tamagui/use-controllable-state 1.0.1-beta.128 → 1.0.1-beta.129

package/dist/cjs/useControllableState.js

@@ -36,15 +36,17 @@ function useControllableState({
   const value = propWins ? prop : state;
   const onChangeCb = (0, import_use_event.useEvent)(onChange || idFn);
   (0, import_react.useEffect)(() => {
-    if (state !== previous.current) {
+    if (!propWins && state !== previous.current) {
       previous.current = state;
       onChangeCb(state);
     }
-  }, [onChangeCb, state]);
+    if (prop !== void 0 && prop !== previous.current) {
+      setState(prop);
+    }
+  }, [onChangeCb, state, prop, propWins]);
   const setter = (0, import_use_event.useEvent)((next) => {
     if (preventUpdate)
       return;
-    console.log("setting", propWins, prop, next);
     if (propWins) {
       const nextValue = typeof next === "function" ? next(previous.current) : next;
       onChangeCb(nextValue);

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, { 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, React.Dispatch<React.SetStateAction<T>>] {\n  const [state, setState] = useState(prop ?? defaultProp)\n  const previous = useRef<any>(state)\n  const propWins = strategy === 'prop-wins' && prop !== undefined\n  const value = propWins ? prop : state\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  const setter = useEvent((next) => {\n    if (preventUpdate) return\n    console.log('setting', propWins, prop, next)\n    if (propWins) {\n      const nextValue = typeof next === 'function' ? next(previous.current) : next\n      onChangeCb(nextValue)\n    } else {\n      setState(next)\n    }\n  })\n\n  return [value as T, setter]\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,GAO+C;AAC/C,QAAM,CAAC,OAAO,YAAY,2BAAS,QAAQ,WAAW;AACtD,QAAM,WAAW,yBAAY,KAAK;AAClC,QAAM,WAAW,aAAa,eAAe,SAAS;AACtD,QAAM,QAAQ,WAAW,OAAO;AAChC,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,QAAM,SAAS,+BAAS,CAAC,SAAS;AAChC,QAAI;AAAe;AACnB,YAAQ,IAAI,WAAW,UAAU,MAAM,IAAI;AAC3C,QAAI,UAAU;AACZ,YAAM,YAAY,OAAO,SAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,iBAAW,SAAS;AAAA,IACtB,OAAO;AACL,eAAS,IAAI;AAAA,IACf;AAAA,EACF,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
+  "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, React.Dispatch<React.SetStateAction<T>>] {\n  const [state, setState] = useState(prop ?? defaultProp)\n  const previous = useRef<any>(state)\n  const propWins = strategy === 'prop-wins' && prop !== undefined\n  const value = propWins ? prop : state\n  const onChangeCb = useEvent(onChange || idFn)\n\n  useEffect(() => {\n    if (!propWins && state !== previous.current) {\n      previous.current = state\n      onChangeCb(state)\n    }\n    if (prop !== undefined && prop !== previous.current) {\n      setState(prop)\n    }\n  }, [onChangeCb, state, prop, propWins])\n\n  const setter = useEvent((next) => {\n    if (preventUpdate) return\n    if (propWins) {\n      const nextValue = typeof next === 'function' ? next(previous.current) : next\n      onChangeCb(nextValue)\n    } else {\n      setState(next)\n    }\n  })\n\n  return [value as T, setter]\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,GAO+C;AAC/C,QAAM,CAAC,OAAO,YAAY,2BAAS,QAAQ,WAAW;AACtD,QAAM,WAAW,yBAAY,KAAK;AAClC,QAAM,WAAW,aAAa,eAAe,SAAS;AACtD,QAAM,QAAQ,WAAW,OAAO;AAChC,QAAM,aAAa,+BAAS,YAAY,IAAI;AAE5C,8BAAU,MAAM;AACd,QAAI,CAAC,YAAY,UAAU,SAAS,SAAS;AAC3C,eAAS,UAAU;AACnB,iBAAW,KAAK;AAAA,IAClB;AACA,QAAI,SAAS,UAAa,SAAS,SAAS,SAAS;AACnD,eAAS,IAAI;AAAA,IACf;AAAA,EACF,GAAG,CAAC,YAAY,OAAO,MAAM,QAAQ,CAAC;AAEtC,QAAM,SAAS,+BAAS,CAAC,SAAS;AAChC,QAAI;AAAe;AACnB,QAAI,UAAU;AACZ,YAAM,YAAY,OAAO,SAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,iBAAW,SAAS;AAAA,IACtB,OAAO;AACL,eAAS,IAAI;AAAA,IACf;AAAA,EACF,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
   "names": []
 }

package/dist/esm/useControllableState.js

@@ -13,15 +13,17 @@ function useControllableState({
   const value = propWins ? prop : state;
   const onChangeCb = useEvent(onChange || idFn);
   useEffect(() => {
-    if (state !== previous.current) {
+    if (!propWins && state !== previous.current) {
       previous.current = state;
       onChangeCb(state);
     }
-  }, [onChangeCb, state]);
+    if (prop !== void 0 && prop !== previous.current) {
+      setState(prop);
+    }
+  }, [onChangeCb, state, prop, propWins]);
   const setter = useEvent((next) => {
     if (preventUpdate)
       return;
-    console.log("setting", propWins, prop, next);
     if (propWins) {
       const nextValue = typeof next === "function" ? next(previous.current) : next;
       onChangeCb(nextValue);

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, { 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, React.Dispatch<React.SetStateAction<T>>] {\n  const [state, setState] = useState(prop ?? defaultProp)\n  const previous = useRef<any>(state)\n  const propWins = strategy === 'prop-wins' && prop !== undefined\n  const value = propWins ? prop : state\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  const setter = useEvent((next) => {\n    if (preventUpdate) return\n    console.log('setting', propWins, prop, next)\n    if (propWins) {\n      const nextValue = typeof next === 'function' ? next(previous.current) : next\n      onChangeCb(nextValue)\n    } else {\n      setState(next)\n    }\n  })\n\n  return [value as T, setter]\n}\n\nconst idFn = () => {}\n"],
-  "mappings": "AAAA;AACA;AAOO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAO+C;AAC/C,QAAM,CAAC,OAAO,YAAY,SAAS,QAAQ,WAAW;AACtD,QAAM,WAAW,OAAY,KAAK;AAClC,QAAM,WAAW,aAAa,eAAe,SAAS;AACtD,QAAM,QAAQ,WAAW,OAAO;AAChC,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,QAAM,SAAS,SAAS,CAAC,SAAS;AAChC,QAAI;AAAe;AACnB,YAAQ,IAAI,WAAW,UAAU,MAAM,IAAI;AAC3C,QAAI,UAAU;AACZ,YAAM,YAAY,OAAO,SAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,iBAAW,SAAS;AAAA,IACtB,OAAO;AACL,eAAS,IAAI;AAAA,IACf;AAAA,EACF,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
+  "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, React.Dispatch<React.SetStateAction<T>>] {\n  const [state, setState] = useState(prop ?? defaultProp)\n  const previous = useRef<any>(state)\n  const propWins = strategy === 'prop-wins' && prop !== undefined\n  const value = propWins ? prop : state\n  const onChangeCb = useEvent(onChange || idFn)\n\n  useEffect(() => {\n    if (!propWins && state !== previous.current) {\n      previous.current = state\n      onChangeCb(state)\n    }\n    if (prop !== undefined && prop !== previous.current) {\n      setState(prop)\n    }\n  }, [onChangeCb, state, prop, propWins])\n\n  const setter = useEvent((next) => {\n    if (preventUpdate) return\n    if (propWins) {\n      const nextValue = typeof next === 'function' ? next(previous.current) : next\n      onChangeCb(nextValue)\n    } else {\n      setState(next)\n    }\n  })\n\n  return [value as T, setter]\n}\n\nconst idFn = () => {}\n"],
+  "mappings": "AAAA;AACA;AAOO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAO+C;AAC/C,QAAM,CAAC,OAAO,YAAY,SAAS,QAAQ,WAAW;AACtD,QAAM,WAAW,OAAY,KAAK;AAClC,QAAM,WAAW,aAAa,eAAe,SAAS;AACtD,QAAM,QAAQ,WAAW,OAAO;AAChC,QAAM,aAAa,SAAS,YAAY,IAAI;AAE5C,YAAU,MAAM;AACd,QAAI,CAAC,YAAY,UAAU,SAAS,SAAS;AAC3C,eAAS,UAAU;AACnB,iBAAW,KAAK;AAAA,IAClB;AACA,QAAI,SAAS,UAAa,SAAS,SAAS,SAAS;AACnD,eAAS,IAAI;AAAA,IACf;AAAA,EACF,GAAG,CAAC,YAAY,OAAO,MAAM,QAAQ,CAAC;AAEtC,QAAM,SAAS,SAAS,CAAC,SAAS;AAChC,QAAI;AAAe;AACnB,QAAI,UAAU;AACZ,YAAM,YAAY,OAAO,SAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,iBAAW,SAAS;AAAA,IACtB,OAAO;AACL,eAAS,IAAI;AAAA,IACf;AAAA,EACF,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
   "names": []
 }

package/dist/jsx/useControllableState.js

@@ -13,15 +13,17 @@ function useControllableState({
   const value = propWins ? prop : state;
   const onChangeCb = useEvent(onChange || idFn);
   useEffect(() => {
-    if (state !== previous.current) {
+    if (!propWins && state !== previous.current) {
       previous.current = state;
       onChangeCb(state);
     }
-  }, [onChangeCb, state]);
+    if (prop !== void 0 && prop !== previous.current) {
+      setState(prop);
+    }
+  }, [onChangeCb, state, prop, propWins]);
   const setter = useEvent((next) => {
     if (preventUpdate)
       return;
-    console.log("setting", propWins, prop, next);
     if (propWins) {
       const nextValue = typeof next === "function" ? next(previous.current) : next;
       onChangeCb(nextValue);

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, { 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, React.Dispatch<React.SetStateAction<T>>] {\n  const [state, setState] = useState(prop ?? defaultProp)\n  const previous = useRef<any>(state)\n  const propWins = strategy === 'prop-wins' && prop !== undefined\n  const value = propWins ? prop : state\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  const setter = useEvent((next) => {\n    if (preventUpdate) return\n    console.log('setting', propWins, prop, next)\n    if (propWins) {\n      const nextValue = typeof next === 'function' ? next(previous.current) : next\n      onChangeCb(nextValue)\n    } else {\n      setState(next)\n    }\n  })\n\n  return [value as T, setter]\n}\n\nconst idFn = () => {}\n"],
-  "mappings": "AAAA;AACA;AAOO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAO+C;AAC/C,QAAM,CAAC,OAAO,YAAY,SAAS,sBAAQ,WAAW;AACtD,QAAM,WAAW,OAAY,KAAK;AAClC,QAAM,WAAW,aAAa,eAAe,SAAS;AACtD,QAAM,QAAQ,WAAW,OAAO;AAChC,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,QAAM,SAAS,SAAS,CAAC,SAAS;AAChC,QAAI;AAAe;AACnB,YAAQ,IAAI,WAAW,UAAU,MAAM,IAAI;AAC3C,QAAI,UAAU;AACZ,YAAM,YAAY,OAAO,SAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,iBAAW,SAAS;AAAA,IACtB,OAAO;AACL,eAAS,IAAI;AAAA,IACf;AAAA,EACF,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
+  "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, React.Dispatch<React.SetStateAction<T>>] {\n  const [state, setState] = useState(prop ?? defaultProp)\n  const previous = useRef<any>(state)\n  const propWins = strategy === 'prop-wins' && prop !== undefined\n  const value = propWins ? prop : state\n  const onChangeCb = useEvent(onChange || idFn)\n\n  useEffect(() => {\n    if (!propWins && state !== previous.current) {\n      previous.current = state\n      onChangeCb(state)\n    }\n    if (prop !== undefined && prop !== previous.current) {\n      setState(prop)\n    }\n  }, [onChangeCb, state, prop, propWins])\n\n  const setter = useEvent((next) => {\n    if (preventUpdate) return\n    if (propWins) {\n      const nextValue = typeof next === 'function' ? next(previous.current) : next\n      onChangeCb(nextValue)\n    } else {\n      setState(next)\n    }\n  })\n\n  return [value as T, setter]\n}\n\nconst idFn = () => {}\n"],
+  "mappings": "AAAA;AACA;AAOO,8BAAiC;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAW;AAAA,EACX;AAAA,GAO+C;AAC/C,QAAM,CAAC,OAAO,YAAY,SAAS,sBAAQ,WAAW;AACtD,QAAM,WAAW,OAAY,KAAK;AAClC,QAAM,WAAW,aAAa,eAAe,SAAS;AACtD,QAAM,QAAQ,WAAW,OAAO;AAChC,QAAM,aAAa,SAAS,YAAY,IAAI;AAE5C,YAAU,MAAM;AACd,QAAI,CAAC,YAAY,UAAU,SAAS,SAAS;AAC3C,eAAS,UAAU;AACnB,iBAAW,KAAK;AAAA,IAClB;AACA,QAAI,SAAS,UAAa,SAAS,SAAS,SAAS;AACnD,eAAS,IAAI;AAAA,IACf;AAAA,EACF,GAAG,CAAC,YAAY,OAAO,MAAM,QAAQ,CAAC;AAEtC,QAAM,SAAS,SAAS,CAAC,SAAS;AAChC,QAAI;AAAe;AACnB,QAAI,UAAU;AACZ,YAAM,YAAY,OAAO,SAAS,aAAa,KAAK,SAAS,OAAO,IAAI;AACxE,iBAAW,SAAS;AAAA,IACtB,OAAO;AACL,eAAS,IAAI;AAAA,IACf;AAAA,EACF,CAAC;AAED,SAAO,CAAC,OAAY,MAAM;AAC5B;AAEA,MAAM,OAAO,MAAM;AAAC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/use-controllable-state",
-  "version": "1.0.1-beta.128",
+  "version": "1.0.1-beta.129",
   "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.128"
+    "@tamagui/use-event": "^1.0.1-beta.129"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.128",
+    "@tamagui/build": "^1.0.1-beta.129",
     "react": "*",
     "react-dom": "*"
   },

package/src/useControllableState.ts

@@ -26,15 +26,17 @@ export function useControllableState<T>({
   const onChangeCb = useEvent(onChange || idFn)
 
   useEffect(() => {
-    if (state !== previous.current) {
+    if (!propWins && state !== previous.current) {
       previous.current = state
       onChangeCb(state)
     }
-  }, [onChangeCb, state])
+    if (prop !== undefined && prop !== previous.current) {
+      setState(prop)
+    }
+  }, [onChangeCb, state, prop, propWins])
 
   const setter = useEvent((next) => {
     if (preventUpdate) return
-    console.log('setting', propWins, prop, next)
     if (propWins) {
       const nextValue = typeof next === 'function' ? next(previous.current) : next
       onChangeCb(nextValue)