@tamagui/focusable 1.125.19 → 1.125.21

package/dist/cjs/focusableInputHOC.cjs

@@ -51,24 +51,27 @@ function useFocusable({
     } = props,
     inputValue = import_react.default.useRef(value || defaultValue || ""),
     unregisterFocusable = import_react.default.useRef(),
-    inputRef = import_react.default.useCallback(input => {
-      id && input && (unregisterFocusable.current?.(), unregisterFocusable.current = (0, import_registerFocusable.registerFocusable)(id, {
+    focusAndSelect = import_react.default.useCallback(input => {
+      input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+    }, []),
+    registerFocusableHandler = import_react.default.useCallback(input => {
+      !id || !input || (unregisterFocusable.current?.(), unregisterFocusable.current = (0, import_registerFocusable.registerFocusable)(id, {
         focus: input.focus,
         ...(isInput && {
-          // react-native doesn't support programmatic .select()
-          focusAndSelect() {
-            input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
-          }
+          focusAndSelect: () => focusAndSelect(input)
         })
       }));
-    }, [isInput, id]),
-    combinedRefs = (0, import_compose_refs.composeRefs)(ref, inputRef);
+    }, [id, isInput, focusAndSelect]),
+    inputRef = import_react.default.useCallback(input => {
+      input && registerFocusableHandler(input);
+    }, [registerFocusableHandler]),
+    handleChangeText = (0, import_web.useEvent)(value2 => {
+      inputValue.current = value2, onChangeText?.(value2);
+    });
   return import_react.default.useEffect(() => () => {
     unregisterFocusable.current?.();
   }, []), {
-    ref: combinedRefs,
-    onChangeText: (0, import_web.useEvent)(value2 => {
-      inputValue.current = value2, onChangeText?.(value2);
-    })
+    ref: import_react.default.useMemo(() => (0, import_compose_refs.composeRefs)(ref, inputRef), [ref, inputRef]),
+    onChangeText: handleChangeText
   };
 }

package/dist/cjs/focusableInputHOC.js

@@ -31,27 +31,31 @@ function useFocusable({
   props,
   ref
 }) {
-  const { id, onChangeText, value, defaultValue } = props, inputValue = import_react.default.useRef(value || defaultValue || ""), unregisterFocusable = import_react.default.useRef(), inputRef = import_react.default.useCallback(
+  const { id, onChangeText, value, defaultValue } = props, inputValue = import_react.default.useRef(value || defaultValue || ""), unregisterFocusable = import_react.default.useRef(), focusAndSelect = import_react.default.useCallback((input) => {
+    input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+  }, []), registerFocusableHandler = import_react.default.useCallback(
     (input) => {
-      id && input && (unregisterFocusable.current?.(), unregisterFocusable.current = (0, import_registerFocusable.registerFocusable)(id, {
+      !id || !input || (unregisterFocusable.current?.(), unregisterFocusable.current = (0, import_registerFocusable.registerFocusable)(id, {
         focus: input.focus,
         ...isInput && {
-          // react-native doesn't support programmatic .select()
-          focusAndSelect() {
-            input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
-          }
+          focusAndSelect: () => focusAndSelect(input)
         }
       }));
     },
-    [isInput, id]
-  ), combinedRefs = (0, import_compose_refs.composeRefs)(ref, inputRef);
+    [id, isInput, focusAndSelect]
+  ), inputRef = import_react.default.useCallback(
+    (input) => {
+      input && registerFocusableHandler(input);
+    },
+    [registerFocusableHandler]
+  ), handleChangeText = (0, import_web.useEvent)((value2) => {
+    inputValue.current = value2, onChangeText?.(value2);
+  });
   return import_react.default.useEffect(() => () => {
     unregisterFocusable.current?.();
   }, []), {
-    ref: combinedRefs,
-    onChangeText: (0, import_web.useEvent)((value2) => {
-      inputValue.current = value2, onChangeText?.(value2);
-    })
+    ref: import_react.default.useMemo(() => (0, import_compose_refs.composeRefs)(ref, inputRef), [ref, inputRef]),
+    onChangeText: handleChangeText
   };
 }
 //# sourceMappingURL=focusableInputHOC.js.map

package/dist/cjs/focusableInputHOC.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/focusableInputHOC.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAA4B,kCAC5B,aAAyB,yBAEzB,eAAkB,2BAElB,2BAAkC;AAS3B,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAA8E;AAC5E,QAAM,EAAE,IAAI,cAAc,OAAO,aAAa,IAAI,OAC5C,aAAa,aAAAA,QAAM,OAAO,SAAS,gBAAgB,EAAE,GACrD,sBAAsB,aAAAA,QAAM,OAA+B,GAE3D,WAAW,aAAAA,QAAM;AAAA,IACrB,CAAC,UAAU;AACT,MAAK,MACA,UACL,oBAAoB,UAAU,GAC9B,oBAAoB,cAAU,4CAAkB,IAAI;AAAA,QAClD,OAAO,MAAM;AAAA,QAEb,GAAI,WAAW;AAAA;AAAA,UAEb,iBAAiB;AACf,kBAAM,MAAM,GACR,MAAM,gBAAgB,OAAO,WAAW,WAAY,YACtD,MAAM,aAAa,GAAG,WAAW,QAAQ,MAAM;AAAA,UAEnD;AAAA,QACF;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA,CAAC,SAAS,EAAE;AAAA,EACd,GAEM,mBAAe,iCAAY,KAAK,QAAQ;AAE9C,sBAAAA,QAAM,UAAU,MACP,MAAM;AACX,wBAAoB,UAAU;AAAA,EAChC,GACC,CAAC,CAAC,GAEE;AAAA,IACL,KAAK;AAAA,IACL,kBAAc,qBAAS,CAACC,WAAU;AAChC,iBAAW,UAAUA,QACrB,eAAeA,MAAK;AAAA,IACtB,CAAC;AAAA,EACH;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAA4B,kCAC5B,aAAyB,yBAEzB,eAAkB,2BAElB,2BAAkC;AAS3B,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,QAAM,EAAE,IAAI,cAAc,OAAO,aAAa,IAAI,OAC5C,aAAa,aAAAA,QAAM,OAAO,SAAS,gBAAgB,EAAE,GACrD,sBAAsB,aAAAA,QAAM,OAA+B,GAE3D,iBAAiB,aAAAA,QAAM,YAAY,CAAC,UAAe;AACvD,UAAM,MAAM,GACR,MAAM,gBAAgB,OAAO,WAAW,WAAY,YACtD,MAAM,aAAa,GAAG,WAAW,QAAQ,MAAM;AAAA,EAEnD,GAAG,CAAC,CAAC,GAEC,2BAA2B,aAAAA,QAAM;AAAA,IACrC,CAAC,UAAe;AACd,MAAI,CAAC,MAAM,CAAC,UAEZ,oBAAoB,UAAU,GAC9B,oBAAoB,cAAU,4CAAkB,IAAI;AAAA,QAClD,OAAO,MAAM;AAAA,QACb,GAAI,WAAW;AAAA,UACb,gBAAgB,MAAM,eAAe,KAAK;AAAA,QAC5C;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA,CAAC,IAAI,SAAS,cAAc;AAAA,EAC9B,GAEM,WAAW,aAAAA,QAAM;AAAA,IACrB,CAAC,UAAe;AACd,MAAI,SACF,yBAAyB,KAAK;AAAA,IAElC;AAAA,IACA,CAAC,wBAAwB;AAAA,EAC3B,GAEM,uBAAmB,qBAAS,CAACC,WAAkB;AACnD,eAAW,UAAUA,QACrB,eAAeA,MAAK;AAAA,EACtB,CAAC;AAED,sBAAAD,QAAM,UAAU,MACP,MAAM;AACX,wBAAoB,UAAU;AAAA,EAChC,GACC,CAAC,CAAC,GAEE;AAAA,IACL,KAAK,aAAAA,QAAM,QAAQ,UAAM,iCAAY,KAAK,QAAQ,GAAG,CAAC,KAAK,QAAQ,CAAC;AAAA,IACpE,cAAc;AAAA,EAChB;AACF;",
   "names": ["React", "value"]
 }

package/dist/cjs/focusableInputHOC.native.js

@@ -28,31 +28,42 @@ __export(focusableInputHOC_exports, {
 module.exports = __toCommonJS(focusableInputHOC_exports);
 var import_compose_refs = require("@tamagui/compose-refs"), import_web = require("@tamagui/web"), import_react = __toESM(require("react")), import_registerFocusable = require("./registerFocusable");
 function useFocusable(param) {
-  var { isInput, props, ref } = param, { id, onChangeText, value, defaultValue } = props, inputValue = import_react.default.useRef(value || defaultValue || ""), unregisterFocusable = import_react.default.useRef(), inputRef = import_react.default.useCallback(function(input) {
+  var { isInput, props, ref } = param, { id, onChangeText, value, defaultValue } = props, inputValue = import_react.default.useRef(value || defaultValue || ""), unregisterFocusable = import_react.default.useRef(), focusAndSelect = import_react.default.useCallback(function(input) {
+    input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+  }, []), registerFocusableHandler = import_react.default.useCallback(function(input) {
     var _unregisterFocusable_current;
-    id && input && ((_unregisterFocusable_current = unregisterFocusable.current) === null || _unregisterFocusable_current === void 0 || _unregisterFocusable_current.call(unregisterFocusable), unregisterFocusable.current = (0, import_registerFocusable.registerFocusable)(id, {
+    !id || !input || ((_unregisterFocusable_current = unregisterFocusable.current) === null || _unregisterFocusable_current === void 0 || _unregisterFocusable_current.call(unregisterFocusable), unregisterFocusable.current = (0, import_registerFocusable.registerFocusable)(id, {
       focus: input.focus,
       ...isInput && {
-        // react-native doesn't support programmatic .select()
-        focusAndSelect() {
-          input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+        focusAndSelect: function() {
+          return focusAndSelect(input);
         }
       }
     }));
   }, [
+    id,
     isInput,
-    id
-  ]), combinedRefs = (0, import_compose_refs.composeRefs)(ref, inputRef);
+    focusAndSelect
+  ]), inputRef = import_react.default.useCallback(function(input) {
+    input && registerFocusableHandler(input);
+  }, [
+    registerFocusableHandler
+  ]), handleChangeText = (0, import_web.useEvent)(function(value2) {
+    inputValue.current = value2, onChangeText == null || onChangeText(value2);
+  });
   return import_react.default.useEffect(function() {
     return function() {
       var _unregisterFocusable_current;
       (_unregisterFocusable_current = unregisterFocusable.current) === null || _unregisterFocusable_current === void 0 || _unregisterFocusable_current.call(unregisterFocusable);
     };
   }, []), {
-    ref: combinedRefs,
-    onChangeText: (0, import_web.useEvent)(function(value2) {
-      inputValue.current = value2, onChangeText == null || onChangeText(value2);
-    })
+    ref: import_react.default.useMemo(function() {
+      return (0, import_compose_refs.composeRefs)(ref, inputRef);
+    }, [
+      ref,
+      inputRef
+    ]),
+    onChangeText: handleChangeText
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/focusable/src/focusableInputHOC.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;0BAA4B,kCAC5B,aAAyB,yBAEzB,eAAkB,2BAElB,2BAAkC;AAS3B,SAASA,aAAa,OAI+C;MAJ/C,EAC3BC,SACAC,OACAC,IAAG,IAHwB,OAKrB,EAAEC,IAAIC,cAAcC,OAAOC,aAAY,IAAKL,OAC5CM,aAAaC,aAAAA,QAAMC,OAAOJ,SAASC,gBAAgB,EAAA,GACnDI,sBAAsBF,aAAAA,QAAMC,OAAM,GAElCE,WAAWH,aAAAA,QAAMI,YACrB,SAACC,OAAAA;QAGCH;AAFA,IAAKP,MACAU,WACLH,+BAAAA,oBAAoBI,aAAO,QAA3BJ,iCAAAA,UAAAA,6BAAAA,KAAAA,mBAAAA,GACAA,oBAAoBI,cAAUC,4CAAkBZ,IAAI;MAClDa,OAAOH,MAAMG;MAEb,GAAIhB,WAAW;;QAEbiB,iBAAAA;AACEJ,gBAAMG,MAAK,GACPH,MAAMK,gBAAgB,OAAOX,WAAWO,WAAY,YACtDD,MAAMK,aAAa,GAAGX,WAAWO,QAAQK,MAAM;QAEnD;MACF;IACF,CAAA;EACF,GACA;IAACnB;IAASG;GAAG,GAGTiB,mBAAeC,iCAAYnB,KAAKS,QAAAA;AAEtCH,sBAAAA,QAAMc,UAAU,WAAA;AACd,WAAO,WAAA;UACLZ;OAAAA,+BAAAA,oBAAoBI,aAAO,QAA3BJ,iCAAAA,UAAAA,6BAAAA,KAAAA,mBAAAA;IACF;EACF,GAAG,CAAA,CAAE,GAEE;IACLR,KAAKkB;IACLhB,kBAAcmB,qBAAS,SAAClB,QAAAA;AACtBE,iBAAWO,UAAUT,QACrBD,gBAAAA,QAAAA,aAAeC,MAAAA;IACjB,CAAA;EACF;AACF;",
-  "names": ["useFocusable", "isInput", "props", "ref", "id", "onChangeText", "value", "defaultValue", "inputValue", "React", "useRef", "unregisterFocusable", "inputRef", "useCallback", "input", "current", "registerFocusable", "focus", "focusAndSelect", "setSelection", "length", "combinedRefs", "composeRefs", "useEffect", "useEvent"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;0BAA4B,kCAC5B,aAAyB,yBAEzB,eAAkB,2BAElB,2BAAkC;AAS3B,SAASA,aAAa,OAQ5B;MAR4B,EAC3BC,SACAC,OACAC,IAAG,IAHwB,OASrB,EAAEC,IAAIC,cAAcC,OAAOC,aAAY,IAAKL,OAC5CM,aAAaC,aAAAA,QAAMC,OAAOJ,SAASC,gBAAgB,EAAA,GACnDI,sBAAsBF,aAAAA,QAAMC,OAAM,GAElCE,iBAAiBH,aAAAA,QAAMI,YAAY,SAACC,OAAAA;AACxCA,UAAMC,MAAK,GACPD,MAAME,gBAAgB,OAAOR,WAAWS,WAAY,YACtDH,MAAME,aAAa,GAAGR,WAAWS,QAAQC,MAAM;EAEnD,GAAG,CAAA,CAAE,GAECC,2BAA2BV,aAAAA,QAAMI,YACrC,SAACC,OAAAA;QAGCH;AAFA,IAAI,CAACP,MAAM,CAACU,WAEZH,+BAAAA,oBAAoBM,aAAO,QAA3BN,iCAAAA,UAAAA,6BAAAA,KAAAA,mBAAAA,GACAA,oBAAoBM,cAAUG,4CAAkBhB,IAAI;MAClDW,OAAOD,MAAMC;MACb,GAAId,WAAW;QACbW,gBAAgB,WAAA;iBAAMA,eAAeE,KAAAA;;MACvC;IACF,CAAA;EACF,GACA;IAACV;IAAIH;IAASW;GAAe,GAGzBS,WAAWZ,aAAAA,QAAMI,YACrB,SAACC,OAAAA;AACC,IAAIA,SACFK,yBAAyBL,KAAAA;EAE7B,GACA;IAACK;GAAyB,GAGtBG,uBAAmBC,qBAAS,SAACjB,QAAAA;AACjCE,eAAWS,UAAUX,QACrBD,gBAAAA,QAAAA,aAAeC,MAAAA;EACjB,CAAA;AAEAG,sBAAAA,QAAMe,UAAU,WAAA;AACd,WAAO,WAAA;UACLb;OAAAA,+BAAAA,oBAAoBM,aAAO,QAA3BN,iCAAAA,UAAAA,6BAAAA,KAAAA,mBAAAA;IACF;EACF,GAAG,CAAA,CAAE,GAEE;IACLR,KAAKM,aAAAA,QAAMgB,QAAQ,WAAA;iBAAMC,iCAAYvB,KAAKkB,QAAAA;OAAW;MAAClB;MAAKkB;KAAS;IACpEhB,cAAciB;EAChB;AACF;",
+  "names": ["useFocusable", "isInput", "props", "ref", "id", "onChangeText", "value", "defaultValue", "inputValue", "React", "useRef", "unregisterFocusable", "focusAndSelect", "useCallback", "input", "focus", "setSelection", "current", "length", "registerFocusableHandler", "registerFocusable", "inputRef", "handleChangeText", "useEvent", "useEffect", "useMemo", "composeRefs"]
 }

package/dist/esm/focusableInputHOC.js

@@ -7,27 +7,31 @@ function useFocusable({
   props,
   ref
 }) {
-  const { id, onChangeText, value, defaultValue } = props, inputValue = React.useRef(value || defaultValue || ""), unregisterFocusable = React.useRef(), inputRef = React.useCallback(
+  const { id, onChangeText, value, defaultValue } = props, inputValue = React.useRef(value || defaultValue || ""), unregisterFocusable = React.useRef(), focusAndSelect = React.useCallback((input) => {
+    input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+  }, []), registerFocusableHandler = React.useCallback(
     (input) => {
-      id && input && (unregisterFocusable.current?.(), unregisterFocusable.current = registerFocusable(id, {
+      !id || !input || (unregisterFocusable.current?.(), unregisterFocusable.current = registerFocusable(id, {
         focus: input.focus,
         ...isInput && {
-          // react-native doesn't support programmatic .select()
-          focusAndSelect() {
-            input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
-          }
+          focusAndSelect: () => focusAndSelect(input)
         }
       }));
     },
-    [isInput, id]
-  ), combinedRefs = composeRefs(ref, inputRef);
+    [id, isInput, focusAndSelect]
+  ), inputRef = React.useCallback(
+    (input) => {
+      input && registerFocusableHandler(input);
+    },
+    [registerFocusableHandler]
+  ), handleChangeText = useEvent((value2) => {
+    inputValue.current = value2, onChangeText?.(value2);
+  });
   return React.useEffect(() => () => {
     unregisterFocusable.current?.();
   }, []), {
-    ref: combinedRefs,
-    onChangeText: useEvent((value2) => {
-      inputValue.current = value2, onChangeText?.(value2);
-    })
+    ref: React.useMemo(() => composeRefs(ref, inputRef), [ref, inputRef]),
+    onChangeText: handleChangeText
   };
 }
 export {

package/dist/esm/focusableInputHOC.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/focusableInputHOC.tsx"],
-  "mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,gBAAgB;AAEzB,OAAO,WAAW;AAElB,SAAS,yBAAyB;AAS3B,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAA8E;AAC5E,QAAM,EAAE,IAAI,cAAc,OAAO,aAAa,IAAI,OAC5C,aAAa,MAAM,OAAO,SAAS,gBAAgB,EAAE,GACrD,sBAAsB,MAAM,OAA+B,GAE3D,WAAW,MAAM;AAAA,IACrB,CAAC,UAAU;AACT,MAAK,MACA,UACL,oBAAoB,UAAU,GAC9B,oBAAoB,UAAU,kBAAkB,IAAI;AAAA,QAClD,OAAO,MAAM;AAAA,QAEb,GAAI,WAAW;AAAA;AAAA,UAEb,iBAAiB;AACf,kBAAM,MAAM,GACR,MAAM,gBAAgB,OAAO,WAAW,WAAY,YACtD,MAAM,aAAa,GAAG,WAAW,QAAQ,MAAM;AAAA,UAEnD;AAAA,QACF;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA,CAAC,SAAS,EAAE;AAAA,EACd,GAEM,eAAe,YAAY,KAAK,QAAQ;AAE9C,eAAM,UAAU,MACP,MAAM;AACX,wBAAoB,UAAU;AAAA,EAChC,GACC,CAAC,CAAC,GAEE;AAAA,IACL,KAAK;AAAA,IACL,cAAc,SAAS,CAACA,WAAU;AAChC,iBAAW,UAAUA,QACrB,eAAeA,MAAK;AAAA,IACtB,CAAC;AAAA,EACH;AACF;",
+  "mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,gBAAgB;AAEzB,OAAO,WAAW;AAElB,SAAS,yBAAyB;AAS3B,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,QAAM,EAAE,IAAI,cAAc,OAAO,aAAa,IAAI,OAC5C,aAAa,MAAM,OAAO,SAAS,gBAAgB,EAAE,GACrD,sBAAsB,MAAM,OAA+B,GAE3D,iBAAiB,MAAM,YAAY,CAAC,UAAe;AACvD,UAAM,MAAM,GACR,MAAM,gBAAgB,OAAO,WAAW,WAAY,YACtD,MAAM,aAAa,GAAG,WAAW,QAAQ,MAAM;AAAA,EAEnD,GAAG,CAAC,CAAC,GAEC,2BAA2B,MAAM;AAAA,IACrC,CAAC,UAAe;AACd,MAAI,CAAC,MAAM,CAAC,UAEZ,oBAAoB,UAAU,GAC9B,oBAAoB,UAAU,kBAAkB,IAAI;AAAA,QAClD,OAAO,MAAM;AAAA,QACb,GAAI,WAAW;AAAA,UACb,gBAAgB,MAAM,eAAe,KAAK;AAAA,QAC5C;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA,CAAC,IAAI,SAAS,cAAc;AAAA,EAC9B,GAEM,WAAW,MAAM;AAAA,IACrB,CAAC,UAAe;AACd,MAAI,SACF,yBAAyB,KAAK;AAAA,IAElC;AAAA,IACA,CAAC,wBAAwB;AAAA,EAC3B,GAEM,mBAAmB,SAAS,CAACA,WAAkB;AACnD,eAAW,UAAUA,QACrB,eAAeA,MAAK;AAAA,EACtB,CAAC;AAED,eAAM,UAAU,MACP,MAAM;AACX,wBAAoB,UAAU;AAAA,EAChC,GACC,CAAC,CAAC,GAEE;AAAA,IACL,KAAK,MAAM,QAAQ,MAAM,YAAY,KAAK,QAAQ,GAAG,CAAC,KAAK,QAAQ,CAAC;AAAA,IACpE,cAAc;AAAA,EAChB;AACF;",
   "names": ["value"]
 }

package/dist/esm/focusableInputHOC.mjs

@@ -15,25 +15,28 @@ function useFocusable({
     } = props,
     inputValue = React.useRef(value || defaultValue || ""),
     unregisterFocusable = React.useRef(),
-    inputRef = React.useCallback(input => {
-      id && input && (unregisterFocusable.current?.(), unregisterFocusable.current = registerFocusable(id, {
+    focusAndSelect = React.useCallback(input => {
+      input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+    }, []),
+    registerFocusableHandler = React.useCallback(input => {
+      !id || !input || (unregisterFocusable.current?.(), unregisterFocusable.current = registerFocusable(id, {
         focus: input.focus,
         ...(isInput && {
-          // react-native doesn't support programmatic .select()
-          focusAndSelect() {
-            input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
-          }
+          focusAndSelect: () => focusAndSelect(input)
         })
       }));
-    }, [isInput, id]),
-    combinedRefs = composeRefs(ref, inputRef);
+    }, [id, isInput, focusAndSelect]),
+    inputRef = React.useCallback(input => {
+      input && registerFocusableHandler(input);
+    }, [registerFocusableHandler]),
+    handleChangeText = useEvent(value2 => {
+      inputValue.current = value2, onChangeText?.(value2);
+    });
   return React.useEffect(() => () => {
     unregisterFocusable.current?.();
   }, []), {
-    ref: combinedRefs,
-    onChangeText: useEvent(value2 => {
-      inputValue.current = value2, onChangeText?.(value2);
-    })
+    ref: React.useMemo(() => composeRefs(ref, inputRef), [ref, inputRef]),
+    onChangeText: handleChangeText
   };
 }
 export { useFocusable };

package/dist/esm/focusableInputHOC.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["composeRefs","useEvent","React","registerFocusable","useFocusable","isInput","props","ref","id","onChangeText","value","defaultValue","inputValue","useRef","unregisterFocusable","inputRef","useCallback","input","current","focus","focusAndSelect","setSelection","length","combinedRefs","useEffect","value2"],"sources":["../../src/focusableInputHOC.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,QAAA,QAAgB;AAEzB,OAAOC,KAAA,MAAW;AAElB,SAASC,iBAAA,QAAyB;AAS3B,SAASC,aAAa;EAC3BC,OAAA;EACAC,KAAA;EACAC;AACF,GAA8E;EAC5E,MAAM;MAAEC,EAAA;MAAIC,YAAA;MAAcC,KAAA;MAAOC;IAAa,IAAIL,KAAA;IAC5CM,UAAA,GAAaV,KAAA,CAAMW,MAAA,CAAOH,KAAA,IAASC,YAAA,IAAgB,EAAE;IACrDG,mBAAA,GAAsBZ,KAAA,CAAMW,MAAA,CAA+B;IAE3DE,QAAA,GAAWb,KAAA,CAAMc,WAAA,CACpBC,KAAA,IAAU;MACJT,EAAA,IACAS,KAAA,KACLH,mBAAA,CAAoBI,OAAA,GAAU,GAC9BJ,mBAAA,CAAoBI,OAAA,GAAUf,iBAAA,CAAkBK,EAAA,EAAI;QAClDW,KAAA,EAAOF,KAAA,CAAME,KAAA;QAEb,IAAId,OAAA,IAAW;UAAA;UAEbe,eAAA,EAAiB;YACfH,KAAA,CAAME,KAAA,CAAM,GACRF,KAAA,CAAMI,YAAA,IAAgB,OAAOT,UAAA,CAAWM,OAAA,IAAY,YACtDD,KAAA,CAAMI,YAAA,CAAa,GAAGT,UAAA,CAAWM,OAAA,CAAQI,MAAM;UAEnD;QACF;MACF,CAAC;IACH,GACA,CAACjB,OAAA,EAASG,EAAE,CACd;IAEMe,YAAA,GAAevB,WAAA,CAAYO,GAAA,EAAKQ,QAAQ;EAE9C,OAAAb,KAAA,CAAMsB,SAAA,CAAU,MACP,MAAM;IACXV,mBAAA,CAAoBI,OAAA,GAAU;EAChC,GACC,EAAE,GAEE;IACLX,GAAA,EAAKgB,YAAA;IACLd,YAAA,EAAcR,QAAA,CAAUwB,MAAA,IAAU;MAChCb,UAAA,CAAWM,OAAA,GAAUO,MAAA,EACrBhB,YAAA,GAAegB,MAAK;IACtB,CAAC;EACH;AACF","ignoreList":[]}
+{"version":3,"names":["composeRefs","useEvent","React","registerFocusable","useFocusable","isInput","props","ref","id","onChangeText","value","defaultValue","inputValue","useRef","unregisterFocusable","focusAndSelect","useCallback","input","focus","setSelection","current","length","registerFocusableHandler","inputRef","handleChangeText","value2","useEffect","useMemo"],"sources":["../../src/focusableInputHOC.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,QAAA,QAAgB;AAEzB,OAAOC,KAAA,MAAW;AAElB,SAASC,iBAAA,QAAyB;AAS3B,SAASC,aAAa;EAC3BC,OAAA;EACAC,KAAA;EACAC;AACF,GAIG;EACD,MAAM;MAAEC,EAAA;MAAIC,YAAA;MAAcC,KAAA;MAAOC;IAAa,IAAIL,KAAA;IAC5CM,UAAA,GAAaV,KAAA,CAAMW,MAAA,CAAOH,KAAA,IAASC,YAAA,IAAgB,EAAE;IACrDG,mBAAA,GAAsBZ,KAAA,CAAMW,MAAA,CAA+B;IAE3DE,cAAA,GAAiBb,KAAA,CAAMc,WAAA,CAAaC,KAAA,IAAe;MACvDA,KAAA,CAAMC,KAAA,CAAM,GACRD,KAAA,CAAME,YAAA,IAAgB,OAAOP,UAAA,CAAWQ,OAAA,IAAY,YACtDH,KAAA,CAAME,YAAA,CAAa,GAAGP,UAAA,CAAWQ,OAAA,CAAQC,MAAM;IAEnD,GAAG,EAAE;IAECC,wBAAA,GAA2BpB,KAAA,CAAMc,WAAA,CACpCC,KAAA,IAAe;MACV,CAACT,EAAA,IAAM,CAACS,KAAA,KAEZH,mBAAA,CAAoBM,OAAA,GAAU,GAC9BN,mBAAA,CAAoBM,OAAA,GAAUjB,iBAAA,CAAkBK,EAAA,EAAI;QAClDU,KAAA,EAAOD,KAAA,CAAMC,KAAA;QACb,IAAIb,OAAA,IAAW;UACbU,cAAA,EAAgBA,CAAA,KAAMA,cAAA,CAAeE,KAAK;QAC5C;MACF,CAAC;IACH,GACA,CAACT,EAAA,EAAIH,OAAA,EAASU,cAAc,CAC9B;IAEMQ,QAAA,GAAWrB,KAAA,CAAMc,WAAA,CACpBC,KAAA,IAAe;MACVA,KAAA,IACFK,wBAAA,CAAyBL,KAAK;IAElC,GACA,CAACK,wBAAwB,CAC3B;IAEME,gBAAA,GAAmBvB,QAAA,CAAUwB,MAAA,IAAkB;MACnDb,UAAA,CAAWQ,OAAA,GAAUK,MAAA,EACrBhB,YAAA,GAAegB,MAAK;IACtB,CAAC;EAED,OAAAvB,KAAA,CAAMwB,SAAA,CAAU,MACP,MAAM;IACXZ,mBAAA,CAAoBM,OAAA,GAAU;EAChC,GACC,EAAE,GAEE;IACLb,GAAA,EAAKL,KAAA,CAAMyB,OAAA,CAAQ,MAAM3B,WAAA,CAAYO,GAAA,EAAKgB,QAAQ,GAAG,CAAChB,GAAA,EAAKgB,QAAQ,CAAC;IACpEd,YAAA,EAAce;EAChB;AACF","ignoreList":[]}

package/dist/esm/focusableInputHOC.native.js

@@ -16,29 +16,36 @@ function useFocusable(param) {
     } = props,
     inputValue = React.useRef(value || defaultValue || ""),
     unregisterFocusable = React.useRef(),
-    inputRef = React.useCallback(function (input) {
+    focusAndSelect = React.useCallback(function (input) {
+      input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+    }, []),
+    registerFocusableHandler = React.useCallback(function (input) {
       var _unregisterFocusable_current;
-      id && input && ((_unregisterFocusable_current = unregisterFocusable.current) === null || _unregisterFocusable_current === void 0 || _unregisterFocusable_current.call(unregisterFocusable), unregisterFocusable.current = registerFocusable(id, {
+      !id || !input || ((_unregisterFocusable_current = unregisterFocusable.current) === null || _unregisterFocusable_current === void 0 || _unregisterFocusable_current.call(unregisterFocusable), unregisterFocusable.current = registerFocusable(id, {
         focus: input.focus,
         ...(isInput && {
-          // react-native doesn't support programmatic .select()
-          focusAndSelect() {
-            input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+          focusAndSelect: function () {
+            return focusAndSelect(input);
           }
         })
       }));
-    }, [isInput, id]),
-    combinedRefs = composeRefs(ref, inputRef);
+    }, [id, isInput, focusAndSelect]),
+    inputRef = React.useCallback(function (input) {
+      input && registerFocusableHandler(input);
+    }, [registerFocusableHandler]),
+    handleChangeText = useEvent(function (value2) {
+      inputValue.current = value2, onChangeText?.(value2);
+    });
   return React.useEffect(function () {
     return function () {
       var _unregisterFocusable_current;
       (_unregisterFocusable_current = unregisterFocusable.current) === null || _unregisterFocusable_current === void 0 || _unregisterFocusable_current.call(unregisterFocusable);
     };
   }, []), {
-    ref: combinedRefs,
-    onChangeText: useEvent(function (value2) {
-      inputValue.current = value2, onChangeText?.(value2);
-    })
+    ref: React.useMemo(function () {
+      return composeRefs(ref, inputRef);
+    }, [ref, inputRef]),
+    onChangeText: handleChangeText
   };
 }
 export { useFocusable };

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

@@ -1 +1 @@
-{"version":3,"names":["composeRefs","useEvent","React","registerFocusable","useFocusable","param","isInput","props","ref","id","onChangeText","value","defaultValue","inputValue","useRef","unregisterFocusable","inputRef","useCallback","input","_unregisterFocusable_current","current","call","focus","focusAndSelect","setSelection","length","combinedRefs","useEffect","value2"],"sources":["../../src/focusableInputHOC.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,QAAA,QAAgB;AAEzB,OAAOC,KAAA,MAAW;AAElB,SAASC,iBAAA,QAAyB;AAS3B,SAASC,aAAaC,KAAA;EAC3B;MAAAC,OAAA;MAAAC,KAAA;MAAAC;IAAA,IAAAH,KAAA;IAAA;MAAAI,EAAA;MAAAC,YAAA;MAAAC,KAAA;MAAAC;IAAA,IAAAL,KAAA;IAAAM,UAAA,GAAAX,KAAA,CAAAY,MAAA,CAAAH,KAAA,IAAAC,YAAA;IAAAG,mBAAA,GAAAb,KAAA,CAAAY,MAAA;IAAAE,QAAA,GAAAd,KAAA,CAAAe,WAAA,WAAAC,KAAA;MACA,IAAAC,4BAAA;MACAV,EAAA,IAAAS,KAAA,MAAAC,4BAAA,GAAAJ,mBAAA,CAAAK,OAAA,cAAAD,4BAAA,eAAAA,4BAAA,CAAAE,IAAA,CAAAN,mBAAA,GAAAA,mBAAA,CAAAK,OAAA,GAAAjB,iBAAA,CAAAM,EAAA;QAC4Ea,KAAA,EAAAJ,KAAA,CAAAI,KAAA;QAC5E,IAAMhB,OAAM;UAKT;UACMiB,cAELA,CAAA;YAEEL,KAAO,CAAAI,KAAM,IAAAJ,KAAA,CAAAM,YAAA,WAAAX,UAAA,CAAAO,OAAA,gBAAAF,KAAA,CAAAM,YAAA,IAAAX,UAAA,CAAAO,OAAA,CAAAK,MAAA;UAEb;QAAe;MAAA;IAGX,IAEiDnB,OAEnD,EAAAG,EAAA,CACF;IACFiB,YAAC,GAAA1B,WAAA,CAAAQ,GAAA,EAAAQ,QAAA;EAAA,OACHd,KAAA,CAAAyB,SAAA;IACA,OAAC,YAAW;MAGR,IAAAR,4BAAgC;MAEtC,CAAAA,4BACS,GAAMJ,mBAAA,CAAAK,OAAA,cAAAD,4BAAA,eAAAA,4BAAA,CAAAE,IAAA,CAAAN,mBAAA;IACX;EACF,GACC,EAAE,GAEE;IACLP,GAAA,EAAKkB,YAAA;IACLhB,YAAA,EAAcT,QAAA,CAAS,UAAC2B,MAAU;MAChCf,UAAA,CAAWO,OAAA,GAAUQ,MAAA,EACrBlB,YAAA,GAAekB,MAAK;IACtB,CAAC;EACH;AACF","ignoreList":[]}
+{"version":3,"names":["composeRefs","useEvent","React","registerFocusable","useFocusable","param","isInput","props","ref","id","onChangeText","value","defaultValue","inputValue","useRef","unregisterFocusable","focusAndSelect","useCallback","input","focus","setSelection","current","length","registerFocusableHandler","_unregisterFocusable_current","call","inputRef","handleChangeText","value2","useEffect","useMemo"],"sources":["../../src/focusableInputHOC.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,QAAA,QAAgB;AAEzB,OAAOC,KAAA,MAAW;AAElB,SAASC,iBAAA,QAAyB;AAS3B,SAASC,aAAaC,KAAA;EAC3B;MAAAC,OAAA;MAAAC,KAAA;MAAAC;IAAA,IAAAH,KAAA;IAAA;MAAAI,EAAA;MAAAC,YAAA;MAAAC,KAAA;MAAAC;IAAA,IAAAL,KAAA;IAAAM,UAAA,GAAAX,KAAA,CAAAY,MAAA,CAAAH,KAAA,IAAAC,YAAA;IAAAG,mBAAA,GAAAb,KAAA,CAAAY,MAAA;IAAAE,cAAA,GAAAd,KAAA,CAAAe,WAAA,WAAAC,KAAA;MACAA,KAAA,CAAAC,KAAA,IAAAD,KAAA,CAAAE,YAAA,WAAAP,UAAA,CAAAQ,OAAA,gBAAAH,KAAA,CAAAE,YAAA,IAAAP,UAAA,CAAAQ,OAAA,CAAAC,MAAA;IACA;IAAAC,wBAAA,GAAArB,KAAA,CAAAe,WAAA,WAAAC,KAAA;MAKC,IAAAM,4BAAA;MACD,CAAAf,EAAA,IAAQ,CAAAS,KAAI,MAAAM,4BAAkC,GAAIT,mBAC/B,CAAAM,OAAM,MAAO,QAASG,4BACnC,eAAsBA,4BAEtB,CAAAC,IAAiB,CAAAV,mBAAmB,GAAAA,mBAAe,CAAAM,OAAA,GAAAlB,iBAAA,CAAAM,EAAA;QACvDU,KAAM,EAAAD,KAAM,CACRC,KAAA;QAGF,IAACb,OAEC;UACHU,cAAe,WAAAA,CAAA;YACT,OAAOA,cAEZ,CAAAE,KAAA;UAEE;QAAa;MACE;IAC6B,IAC5CT,EACF,EACFH,OAAA,EACAU,cAAc,CAChB;IAEMU,QAAA,GAAWxB,KAAM,CAAAe,WAAA,WAAAC,KAAA;MACrBA,KAAC,IAAAK,wBAAe,CAAAL,KAAA;IACd,IAGFK,wBAAA,EACA;IAACI,gBAAA,GAAA1B,QAAwB,WAAA2B,MAAA;MAC3Bf,UAEM,CAAAQ,OAAA,GAAmBO,MAAA,EAASlB,YAAmB,GAAAkB,MAAA;IACnD;EAEF,OAAC1B,KAAA,CAAA2B,SAAA;IAED,mBAAM;MAEF,IAAAL,4BAA8B;MAE9B,CAACA,4BAEE,GAAAT,mBAAA,CAAAM,OAAA,cAAAG,4BAAA,eAAAA,4BAAA,CAAAC,IAAA,CAAAV,mBAAA;IACL;EAAoE,GACpE;IACFP,GAAA,EAAAN,KAAA,CAAA4B,OAAA;MACF,OAAA9B,WAAA,CAAAQ,GAAA,EAAAkB,QAAA","ignoreList":[]}

package/dist/jsx/focusableInputHOC.js

@@ -7,27 +7,31 @@ function useFocusable({
   props,
   ref
 }) {
-  const { id, onChangeText, value, defaultValue } = props, inputValue = React.useRef(value || defaultValue || ""), unregisterFocusable = React.useRef(), inputRef = React.useCallback(
+  const { id, onChangeText, value, defaultValue } = props, inputValue = React.useRef(value || defaultValue || ""), unregisterFocusable = React.useRef(), focusAndSelect = React.useCallback((input) => {
+    input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+  }, []), registerFocusableHandler = React.useCallback(
     (input) => {
-      id && input && (unregisterFocusable.current?.(), unregisterFocusable.current = registerFocusable(id, {
+      !id || !input || (unregisterFocusable.current?.(), unregisterFocusable.current = registerFocusable(id, {
         focus: input.focus,
         ...isInput && {
-          // react-native doesn't support programmatic .select()
-          focusAndSelect() {
-            input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
-          }
+          focusAndSelect: () => focusAndSelect(input)
         }
       }));
     },
-    [isInput, id]
-  ), combinedRefs = composeRefs(ref, inputRef);
+    [id, isInput, focusAndSelect]
+  ), inputRef = React.useCallback(
+    (input) => {
+      input && registerFocusableHandler(input);
+    },
+    [registerFocusableHandler]
+  ), handleChangeText = useEvent((value2) => {
+    inputValue.current = value2, onChangeText?.(value2);
+  });
   return React.useEffect(() => () => {
     unregisterFocusable.current?.();
   }, []), {
-    ref: combinedRefs,
-    onChangeText: useEvent((value2) => {
-      inputValue.current = value2, onChangeText?.(value2);
-    })
+    ref: React.useMemo(() => composeRefs(ref, inputRef), [ref, inputRef]),
+    onChangeText: handleChangeText
   };
 }
 export {

package/dist/jsx/focusableInputHOC.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/focusableInputHOC.tsx"],
-  "mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,gBAAgB;AAEzB,OAAO,WAAW;AAElB,SAAS,yBAAyB;AAS3B,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAA8E;AAC5E,QAAM,EAAE,IAAI,cAAc,OAAO,aAAa,IAAI,OAC5C,aAAa,MAAM,OAAO,SAAS,gBAAgB,EAAE,GACrD,sBAAsB,MAAM,OAA+B,GAE3D,WAAW,MAAM;AAAA,IACrB,CAAC,UAAU;AACT,MAAK,MACA,UACL,oBAAoB,UAAU,GAC9B,oBAAoB,UAAU,kBAAkB,IAAI;AAAA,QAClD,OAAO,MAAM;AAAA,QAEb,GAAI,WAAW;AAAA;AAAA,UAEb,iBAAiB;AACf,kBAAM,MAAM,GACR,MAAM,gBAAgB,OAAO,WAAW,WAAY,YACtD,MAAM,aAAa,GAAG,WAAW,QAAQ,MAAM;AAAA,UAEnD;AAAA,QACF;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA,CAAC,SAAS,EAAE;AAAA,EACd,GAEM,eAAe,YAAY,KAAK,QAAQ;AAE9C,eAAM,UAAU,MACP,MAAM;AACX,wBAAoB,UAAU;AAAA,EAChC,GACC,CAAC,CAAC,GAEE;AAAA,IACL,KAAK;AAAA,IACL,cAAc,SAAS,CAACA,WAAU;AAChC,iBAAW,UAAUA,QACrB,eAAeA,MAAK;AAAA,IACtB,CAAC;AAAA,EACH;AACF;",
+  "mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,gBAAgB;AAEzB,OAAO,WAAW;AAElB,SAAS,yBAAyB;AAS3B,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,QAAM,EAAE,IAAI,cAAc,OAAO,aAAa,IAAI,OAC5C,aAAa,MAAM,OAAO,SAAS,gBAAgB,EAAE,GACrD,sBAAsB,MAAM,OAA+B,GAE3D,iBAAiB,MAAM,YAAY,CAAC,UAAe;AACvD,UAAM,MAAM,GACR,MAAM,gBAAgB,OAAO,WAAW,WAAY,YACtD,MAAM,aAAa,GAAG,WAAW,QAAQ,MAAM;AAAA,EAEnD,GAAG,CAAC,CAAC,GAEC,2BAA2B,MAAM;AAAA,IACrC,CAAC,UAAe;AACd,MAAI,CAAC,MAAM,CAAC,UAEZ,oBAAoB,UAAU,GAC9B,oBAAoB,UAAU,kBAAkB,IAAI;AAAA,QAClD,OAAO,MAAM;AAAA,QACb,GAAI,WAAW;AAAA,UACb,gBAAgB,MAAM,eAAe,KAAK;AAAA,QAC5C;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IACA,CAAC,IAAI,SAAS,cAAc;AAAA,EAC9B,GAEM,WAAW,MAAM;AAAA,IACrB,CAAC,UAAe;AACd,MAAI,SACF,yBAAyB,KAAK;AAAA,IAElC;AAAA,IACA,CAAC,wBAAwB;AAAA,EAC3B,GAEM,mBAAmB,SAAS,CAACA,WAAkB;AACnD,eAAW,UAAUA,QACrB,eAAeA,MAAK;AAAA,EACtB,CAAC;AAED,eAAM,UAAU,MACP,MAAM;AACX,wBAAoB,UAAU;AAAA,EAChC,GACC,CAAC,CAAC,GAEE;AAAA,IACL,KAAK,MAAM,QAAQ,MAAM,YAAY,KAAK,QAAQ,GAAG,CAAC,KAAK,QAAQ,CAAC;AAAA,IACpE,cAAc;AAAA,EAChB;AACF;",
   "names": ["value"]
 }

package/dist/jsx/focusableInputHOC.mjs

@@ -15,25 +15,28 @@ function useFocusable({
     } = props,
     inputValue = React.useRef(value || defaultValue || ""),
     unregisterFocusable = React.useRef(),
-    inputRef = React.useCallback(input => {
-      id && input && (unregisterFocusable.current?.(), unregisterFocusable.current = registerFocusable(id, {
+    focusAndSelect = React.useCallback(input => {
+      input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+    }, []),
+    registerFocusableHandler = React.useCallback(input => {
+      !id || !input || (unregisterFocusable.current?.(), unregisterFocusable.current = registerFocusable(id, {
         focus: input.focus,
         ...(isInput && {
-          // react-native doesn't support programmatic .select()
-          focusAndSelect() {
-            input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
-          }
+          focusAndSelect: () => focusAndSelect(input)
         })
       }));
-    }, [isInput, id]),
-    combinedRefs = composeRefs(ref, inputRef);
+    }, [id, isInput, focusAndSelect]),
+    inputRef = React.useCallback(input => {
+      input && registerFocusableHandler(input);
+    }, [registerFocusableHandler]),
+    handleChangeText = useEvent(value2 => {
+      inputValue.current = value2, onChangeText?.(value2);
+    });
   return React.useEffect(() => () => {
     unregisterFocusable.current?.();
   }, []), {
-    ref: combinedRefs,
-    onChangeText: useEvent(value2 => {
-      inputValue.current = value2, onChangeText?.(value2);
-    })
+    ref: React.useMemo(() => composeRefs(ref, inputRef), [ref, inputRef]),
+    onChangeText: handleChangeText
   };
 }
 export { useFocusable };

package/dist/jsx/focusableInputHOC.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["composeRefs","useEvent","React","registerFocusable","useFocusable","isInput","props","ref","id","onChangeText","value","defaultValue","inputValue","useRef","unregisterFocusable","inputRef","useCallback","input","current","focus","focusAndSelect","setSelection","length","combinedRefs","useEffect","value2"],"sources":["../../src/focusableInputHOC.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,QAAA,QAAgB;AAEzB,OAAOC,KAAA,MAAW;AAElB,SAASC,iBAAA,QAAyB;AAS3B,SAASC,aAAa;EAC3BC,OAAA;EACAC,KAAA;EACAC;AACF,GAA8E;EAC5E,MAAM;MAAEC,EAAA;MAAIC,YAAA;MAAcC,KAAA;MAAOC;IAAa,IAAIL,KAAA;IAC5CM,UAAA,GAAaV,KAAA,CAAMW,MAAA,CAAOH,KAAA,IAASC,YAAA,IAAgB,EAAE;IACrDG,mBAAA,GAAsBZ,KAAA,CAAMW,MAAA,CAA+B;IAE3DE,QAAA,GAAWb,KAAA,CAAMc,WAAA,CACpBC,KAAA,IAAU;MACJT,EAAA,IACAS,KAAA,KACLH,mBAAA,CAAoBI,OAAA,GAAU,GAC9BJ,mBAAA,CAAoBI,OAAA,GAAUf,iBAAA,CAAkBK,EAAA,EAAI;QAClDW,KAAA,EAAOF,KAAA,CAAME,KAAA;QAEb,IAAId,OAAA,IAAW;UAAA;UAEbe,eAAA,EAAiB;YACfH,KAAA,CAAME,KAAA,CAAM,GACRF,KAAA,CAAMI,YAAA,IAAgB,OAAOT,UAAA,CAAWM,OAAA,IAAY,YACtDD,KAAA,CAAMI,YAAA,CAAa,GAAGT,UAAA,CAAWM,OAAA,CAAQI,MAAM;UAEnD;QACF;MACF,CAAC;IACH,GACA,CAACjB,OAAA,EAASG,EAAE,CACd;IAEMe,YAAA,GAAevB,WAAA,CAAYO,GAAA,EAAKQ,QAAQ;EAE9C,OAAAb,KAAA,CAAMsB,SAAA,CAAU,MACP,MAAM;IACXV,mBAAA,CAAoBI,OAAA,GAAU;EAChC,GACC,EAAE,GAEE;IACLX,GAAA,EAAKgB,YAAA;IACLd,YAAA,EAAcR,QAAA,CAAUwB,MAAA,IAAU;MAChCb,UAAA,CAAWM,OAAA,GAAUO,MAAA,EACrBhB,YAAA,GAAegB,MAAK;IACtB,CAAC;EACH;AACF","ignoreList":[]}
+{"version":3,"names":["composeRefs","useEvent","React","registerFocusable","useFocusable","isInput","props","ref","id","onChangeText","value","defaultValue","inputValue","useRef","unregisterFocusable","focusAndSelect","useCallback","input","focus","setSelection","current","length","registerFocusableHandler","inputRef","handleChangeText","value2","useEffect","useMemo"],"sources":["../../src/focusableInputHOC.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAC5B,SAASC,QAAA,QAAgB;AAEzB,OAAOC,KAAA,MAAW;AAElB,SAASC,iBAAA,QAAyB;AAS3B,SAASC,aAAa;EAC3BC,OAAA;EACAC,KAAA;EACAC;AACF,GAIG;EACD,MAAM;MAAEC,EAAA;MAAIC,YAAA;MAAcC,KAAA;MAAOC;IAAa,IAAIL,KAAA;IAC5CM,UAAA,GAAaV,KAAA,CAAMW,MAAA,CAAOH,KAAA,IAASC,YAAA,IAAgB,EAAE;IACrDG,mBAAA,GAAsBZ,KAAA,CAAMW,MAAA,CAA+B;IAE3DE,cAAA,GAAiBb,KAAA,CAAMc,WAAA,CAAaC,KAAA,IAAe;MACvDA,KAAA,CAAMC,KAAA,CAAM,GACRD,KAAA,CAAME,YAAA,IAAgB,OAAOP,UAAA,CAAWQ,OAAA,IAAY,YACtDH,KAAA,CAAME,YAAA,CAAa,GAAGP,UAAA,CAAWQ,OAAA,CAAQC,MAAM;IAEnD,GAAG,EAAE;IAECC,wBAAA,GAA2BpB,KAAA,CAAMc,WAAA,CACpCC,KAAA,IAAe;MACV,CAACT,EAAA,IAAM,CAACS,KAAA,KAEZH,mBAAA,CAAoBM,OAAA,GAAU,GAC9BN,mBAAA,CAAoBM,OAAA,GAAUjB,iBAAA,CAAkBK,EAAA,EAAI;QAClDU,KAAA,EAAOD,KAAA,CAAMC,KAAA;QACb,IAAIb,OAAA,IAAW;UACbU,cAAA,EAAgBA,CAAA,KAAMA,cAAA,CAAeE,KAAK;QAC5C;MACF,CAAC;IACH,GACA,CAACT,EAAA,EAAIH,OAAA,EAASU,cAAc,CAC9B;IAEMQ,QAAA,GAAWrB,KAAA,CAAMc,WAAA,CACpBC,KAAA,IAAe;MACVA,KAAA,IACFK,wBAAA,CAAyBL,KAAK;IAElC,GACA,CAACK,wBAAwB,CAC3B;IAEME,gBAAA,GAAmBvB,QAAA,CAAUwB,MAAA,IAAkB;MACnDb,UAAA,CAAWQ,OAAA,GAAUK,MAAA,EACrBhB,YAAA,GAAegB,MAAK;IACtB,CAAC;EAED,OAAAvB,KAAA,CAAMwB,SAAA,CAAU,MACP,MAAM;IACXZ,mBAAA,CAAoBM,OAAA,GAAU;EAChC,GACC,EAAE,GAEE;IACLb,GAAA,EAAKL,KAAA,CAAMyB,OAAA,CAAQ,MAAM3B,WAAA,CAAYO,GAAA,EAAKgB,QAAQ,GAAG,CAAChB,GAAA,EAAKgB,QAAQ,CAAC;IACpEd,YAAA,EAAce;EAChB;AACF","ignoreList":[]}

package/dist/jsx/focusableInputHOC.native.js

@@ -3,31 +3,42 @@ import { useEvent } from "@tamagui/web";
 import React from "react";
 import { registerFocusable } from "./registerFocusable";
 function useFocusable(param) {
-  var { isInput, props, ref } = param, { id, onChangeText, value, defaultValue } = props, inputValue = React.useRef(value || defaultValue || ""), unregisterFocusable = React.useRef(), inputRef = React.useCallback(function(input) {
+  var { isInput, props, ref } = param, { id, onChangeText, value, defaultValue } = props, inputValue = React.useRef(value || defaultValue || ""), unregisterFocusable = React.useRef(), focusAndSelect = React.useCallback(function(input) {
+    input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+  }, []), registerFocusableHandler = React.useCallback(function(input) {
     var _unregisterFocusable_current;
-    id && input && ((_unregisterFocusable_current = unregisterFocusable.current) === null || _unregisterFocusable_current === void 0 || _unregisterFocusable_current.call(unregisterFocusable), unregisterFocusable.current = registerFocusable(id, {
+    !id || !input || ((_unregisterFocusable_current = unregisterFocusable.current) === null || _unregisterFocusable_current === void 0 || _unregisterFocusable_current.call(unregisterFocusable), unregisterFocusable.current = registerFocusable(id, {
       focus: input.focus,
       ...isInput && {
-        // react-native doesn't support programmatic .select()
-        focusAndSelect() {
-          input.focus(), input.setSelection && typeof inputValue.current == "string" && input.setSelection(0, inputValue.current.length);
+        focusAndSelect: function() {
+          return focusAndSelect(input);
         }
       }
     }));
   }, [
+    id,
     isInput,
-    id
-  ]), combinedRefs = composeRefs(ref, inputRef);
+    focusAndSelect
+  ]), inputRef = React.useCallback(function(input) {
+    input && registerFocusableHandler(input);
+  }, [
+    registerFocusableHandler
+  ]), handleChangeText = useEvent(function(value2) {
+    inputValue.current = value2, onChangeText == null || onChangeText(value2);
+  });
   return React.useEffect(function() {
     return function() {
       var _unregisterFocusable_current;
       (_unregisterFocusable_current = unregisterFocusable.current) === null || _unregisterFocusable_current === void 0 || _unregisterFocusable_current.call(unregisterFocusable);
     };
   }, []), {
-    ref: combinedRefs,
-    onChangeText: useEvent(function(value2) {
-      inputValue.current = value2, onChangeText == null || onChangeText(value2);
-    })
+    ref: React.useMemo(function() {
+      return composeRefs(ref, inputRef);
+    }, [
+      ref,
+      inputRef
+    ]),
+    onChangeText: handleChangeText
   };
 }
 export {

package/dist/jsx/focusableInputHOC.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Users/n8/tamagui/code/ui/focusable/src/focusableInputHOC.tsx"],
-  "mappings": "AAAA,SAASA,mBAAmB;AAC5B,SAASC,gBAAgB;AAEzB,OAAOC,WAAW;AAElB,SAASC,yBAAyB;AAS3B,SAASC,aAAa,OAI+C;MAJ/C,EAC3BC,SACAC,OACAC,IAAG,IAHwB,OAKrB,EAAEC,IAAIC,cAAcC,OAAOC,aAAY,IAAKL,OAC5CM,aAAaV,MAAMW,OAAOH,SAASC,gBAAgB,EAAA,GACnDG,sBAAsBZ,MAAMW,OAAM,GAElCE,WAAWb,MAAMc,YACrB,SAACC,OAAAA;QAGCH;AAFA,IAAKN,MACAS,WACLH,+BAAAA,oBAAoBI,aAAO,QAA3BJ,iCAAAA,UAAAA,6BAAAA,KAAAA,mBAAAA,GACAA,oBAAoBI,UAAUf,kBAAkBK,IAAI;MAClDW,OAAOF,MAAME;MAEb,GAAId,WAAW;;QAEbe,iBAAAA;AACEH,gBAAME,MAAK,GACPF,MAAMI,gBAAgB,OAAOT,WAAWM,WAAY,YACtDD,MAAMI,aAAa,GAAGT,WAAWM,QAAQI,MAAM;QAEnD;MACF;IACF,CAAA;EACF,GACA;IAACjB;IAASG;GAAG,GAGTe,eAAevB,YAAYO,KAAKQ,QAAAA;AAEtCb,eAAMsB,UAAU,WAAA;AACd,WAAO,WAAA;UACLV;OAAAA,+BAAAA,oBAAoBI,aAAO,QAA3BJ,iCAAAA,UAAAA,6BAAAA,KAAAA,mBAAAA;IACF;EACF,GAAG,CAAA,CAAE,GAEE;IACLP,KAAKgB;IACLd,cAAcR,SAAS,SAACS,QAAAA;AACtBE,iBAAWM,UAAUR,QACrBD,gBAAAA,QAAAA,aAAeC,MAAAA;IACjB,CAAA;EACF;AACF;",
-  "names": ["composeRefs", "useEvent", "React", "registerFocusable", "useFocusable", "isInput", "props", "ref", "id", "onChangeText", "value", "defaultValue", "inputValue", "useRef", "unregisterFocusable", "inputRef", "useCallback", "input", "current", "focus", "focusAndSelect", "setSelection", "length", "combinedRefs", "useEffect"]
+  "mappings": "AAAA,SAASA,mBAAmB;AAC5B,SAASC,gBAAgB;AAEzB,OAAOC,WAAW;AAElB,SAASC,yBAAyB;AAS3B,SAASC,aAAa,OAQ5B;MAR4B,EAC3BC,SACAC,OACAC,IAAG,IAHwB,OASrB,EAAEC,IAAIC,cAAcC,OAAOC,aAAY,IAAKL,OAC5CM,aAAaV,MAAMW,OAAOH,SAASC,gBAAgB,EAAA,GACnDG,sBAAsBZ,MAAMW,OAAM,GAElCE,iBAAiBb,MAAMc,YAAY,SAACC,OAAAA;AACxCA,UAAMC,MAAK,GACPD,MAAME,gBAAgB,OAAOP,WAAWQ,WAAY,YACtDH,MAAME,aAAa,GAAGP,WAAWQ,QAAQC,MAAM;EAEnD,GAAG,CAAA,CAAE,GAECC,2BAA2BpB,MAAMc,YACrC,SAACC,OAAAA;QAGCH;AAFA,IAAI,CAACN,MAAM,CAACS,WAEZH,+BAAAA,oBAAoBM,aAAO,QAA3BN,iCAAAA,UAAAA,6BAAAA,KAAAA,mBAAAA,GACAA,oBAAoBM,UAAUjB,kBAAkBK,IAAI;MAClDU,OAAOD,MAAMC;MACb,GAAIb,WAAW;QACbU,gBAAgB,WAAA;iBAAMA,eAAeE,KAAAA;;MACvC;IACF,CAAA;EACF,GACA;IAACT;IAAIH;IAASU;GAAe,GAGzBQ,WAAWrB,MAAMc,YACrB,SAACC,OAAAA;AACC,IAAIA,SACFK,yBAAyBL,KAAAA;EAE7B,GACA;IAACK;GAAyB,GAGtBE,mBAAmBvB,SAAS,SAACS,QAAAA;AACjCE,eAAWQ,UAAUV,QACrBD,gBAAAA,QAAAA,aAAeC,MAAAA;EACjB,CAAA;AAEAR,eAAMuB,UAAU,WAAA;AACd,WAAO,WAAA;UACLX;OAAAA,+BAAAA,oBAAoBM,aAAO,QAA3BN,iCAAAA,UAAAA,6BAAAA,KAAAA,mBAAAA;IACF;EACF,GAAG,CAAA,CAAE,GAEE;IACLP,KAAKL,MAAMwB,QAAQ,WAAA;aAAM1B,YAAYO,KAAKgB,QAAAA;OAAW;MAAChB;MAAKgB;KAAS;IACpEd,cAAce;EAChB;AACF;",
+  "names": ["composeRefs", "useEvent", "React", "registerFocusable", "useFocusable", "isInput", "props", "ref", "id", "onChangeText", "value", "defaultValue", "inputValue", "useRef", "unregisterFocusable", "focusAndSelect", "useCallback", "input", "focus", "setSelection", "current", "length", "registerFocusableHandler", "inputRef", "handleChangeText", "useEffect", "useMemo"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/focusable",
-  "version": "1.125.19",
+  "version": "1.125.21",
   "sideEffects": false,
   "source": "src/index.ts",
   "types": "./types/index.d.ts",
@@ -35,11 +35,11 @@
     }
   },
   "dependencies": {
-    "@tamagui/compose-refs": "1.125.19",
-    "@tamagui/web": "1.125.19"
+    "@tamagui/compose-refs": "1.125.21",
+    "@tamagui/web": "1.125.21"
   },
   "devDependencies": {
-    "@tamagui/build": "1.125.19",
+    "@tamagui/build": "1.125.21",
     "react": "*"
   },
   "publishConfig": {

package/src/focusableInputHOC.tsx

@@ -16,34 +16,50 @@ export function useFocusable({
   isInput,
   props,
   ref,
-}: { isInput?: boolean; props: FocusableProps; ref?: MutableRefObject<any> }) {
+}: {
+  isInput?: boolean
+  props: FocusableProps
+  ref?: MutableRefObject<any>
+}) {
   const { id, onChangeText, value, defaultValue } = props
   const inputValue = React.useRef(value || defaultValue || '')
   const unregisterFocusable = React.useRef<() => void | undefined>()
 
-  const inputRef = React.useCallback(
-    (input) => {
-      if (!id) return
-      if (!input) return
+  const focusAndSelect = React.useCallback((input: any) => {
+    input.focus()
+    if (input.setSelection && typeof inputValue.current === 'string') {
+      input.setSelection(0, inputValue.current.length)
+    }
+  }, [])
+
+  const registerFocusableHandler = React.useCallback(
+    (input: any) => {
+      if (!id || !input) return
+
       unregisterFocusable.current?.()
       unregisterFocusable.current = registerFocusable(id, {
         focus: input.focus,
-
         ...(isInput && {
-          // react-native doesn't support programmatic .select()
-          focusAndSelect() {
-            input.focus()
-            if (input.setSelection && typeof inputValue.current === 'string') {
-              input.setSelection(0, inputValue.current.length)
-            }
-          },
+          focusAndSelect: () => focusAndSelect(input),
         }),
       })
     },
-    [isInput, id]
+    [id, isInput, focusAndSelect]
+  )
+
+  const inputRef = React.useCallback(
+    (input: any) => {
+      if (input) {
+        registerFocusableHandler(input)
+      }
+    },
+    [registerFocusableHandler]
   )
 
-  const combinedRefs = composeRefs(ref, inputRef)
+  const handleChangeText = useEvent((value: string) => {
+    inputValue.current = value
+    onChangeText?.(value)
+  })
 
   React.useEffect(() => {
     return () => {
@@ -52,10 +68,7 @@ export function useFocusable({
   }, [])
 
   return {
-    ref: combinedRefs,
-    onChangeText: useEvent((value) => {
-      inputValue.current = value
-      onChangeText?.(value)
-    }),
+    ref: React.useMemo(() => composeRefs(ref, inputRef), [ref, inputRef]),
+    onChangeText: handleChangeText,
   }
 }

package/types/focusableInputHOC.d.ts

@@ -11,7 +11,7 @@ export declare function useFocusable({ isInput, props, ref, }: {
     ref?: MutableRefObject<any>;
 }): {
     ref: (node: any) => void;
-    onChangeText: (value: any) => void;
+    onChangeText: (value: string) => void;
 };
 export {};
 //# sourceMappingURL=focusableInputHOC.d.ts.map

package/types/focusable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"focusable.d.ts","sourceRoot":"","sources":["../src/focusable.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG;IAAE,KAAK,EAAE,QAAQ,CAAC;IAAC,cAAc,CAAC,EAAE,QAAQ,CAAA;CAAE,CAAA"}

package/types/focusableInputHOC.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"focusableInputHOC.d.ts","sourceRoot":"","sources":["../src/focusableInputHOC.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAK7C,KAAK,cAAc,GAAG;IACpB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACpC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,wBAAgB,YAAY,CAAC,EAC3B,OAAO,EACP,KAAK,EACL,GAAG,GACJ,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,cAAc,CAAC;IAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAA;CAAE;;;EA0C3E"}

package/types/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,aAAa,CAAA"}

package/types/registerFocusable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"registerFocusable.d.ts","sourceRoot":"","sources":["../src/registerFocusable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,eAAO,MAAM,iBAAiB,OAAQ,MAAM,SAAS,SAAS,eAE7D,CAAA;AAED,eAAO,MAAM,mBAAmB,OAAQ,MAAM,SAE7C,CAAA;AAED,eAAO,MAAM,cAAc,OAAQ,MAAM,SAExC,CAAA"}

package/types/registerFocusable.native.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"registerFocusable.native.d.ts","sourceRoot":"","sources":["../src/registerFocusable.native.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAI5C,eAAO,MAAM,iBAAiB,OAAQ,MAAM,SAAS,SAAS,eAU7D,CAAA;AAED,eAAO,MAAM,mBAAmB,OAAQ,MAAM,SAE7C,CAAA;AAED,eAAO,MAAM,cAAc,OAAQ,MAAM,2BAaxC,CAAA"}