@tamagui/core 1.74.8 → 1.74.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "1.74.8",
+  "version": "1.74.10",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -36,16 +36,16 @@
     "native-test.d.ts"
   ],
   "dependencies": {
-    "@tamagui/react-native-use-pressable": "1.74.8",
-    "@tamagui/react-native-use-responder-events": "1.74.8",
-    "@tamagui/use-event": "1.74.8",
-    "@tamagui/web": "1.74.8"
+    "@tamagui/react-native-use-pressable": "1.74.10",
+    "@tamagui/react-native-use-responder-events": "1.74.10",
+    "@tamagui/use-event": "1.74.10",
+    "@tamagui/web": "1.74.10"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.74.8",
+    "@tamagui/build": "1.74.10",
     "@testing-library/react": "^14.0.0",
     "csstype": "^3.0.10",
     "react": "^18.2.0",

package/src/getBaseViews.native.ts

@@ -4,5 +4,6 @@ export function getBaseViews() {
   return {
     View: native.View || native.default.View,
     Text: native.Text || native.default.Text,
+    Pressable: native.Pressable || native.default.Pressable,
   }
 }

package/src/{index.ts → index.tsx}

@@ -20,7 +20,7 @@ import { getBaseViews } from './getBaseViews'
 import { useElementLayout } from './hooks/useElementLayout'
 import { usePlatformMethods } from './hooks/usePlatformMethods'
 import { RNViewProps } from './reactNativeTypes'
-import { usePressability } from './vendor/Pressability'
+import { Pressability, usePressability } from './vendor/Pressability'
 
 // re-exports all of @tamagui/web just adds hooks
 export * from '@tamagui/web'
@@ -121,7 +121,7 @@ setupHooks({
     return viewProps
   },
 
-  useEvents(viewProps, events, { pseudos }, setStateShallow) {
+  useEvents(viewProps, events, { pseudos }, setStateShallow, staticConfig) {
     if (process.env.TAMAGUI_TARGET === 'native') {
       const attachFocus = !!pseudos?.focusStyle
       if (attachFocus) {
@@ -133,28 +133,59 @@ setupHooks({
         })
       }
 
-      // use Pressability to get smooth unPress when you press + hold + move out
-      // only ever create once, use .configure() to update later
-      if (events && viewProps.hitSlop) {
-        events.hitSlop = viewProps.hitSlop
-      }
+      if (staticConfig.isInput) {
+        if (events) {
+          const { onPressIn, onPressOut, onPress } = events
+          const inputEvents = {
+            onPressIn,
+            onPressOut: onPressOut || onPress,
+          }
+          if (onPressOut && onPress) {
+            // only supports onPressIn and onPressOut so combine them
+            inputEvents.onPressOut = composeEventHandlers(onPress, onPressOut)
+          }
+          Object.assign(viewProps, inputEvents)
+        }
+      } else {
+        // use Pressability to get smooth unPress when you press + hold + move out
+        // only ever create once, use .configure() to update later
+        if (events && viewProps.hitSlop) {
+          events.hitSlop = viewProps.hitSlop
+        }
 
-      const pressability = usePressability(events || null)
-
-      if (events) {
-        if (events.onPress) {
-          for (const key in pressability) {
-            const og = viewProps[key]
-            const val = pressability[key]
-            viewProps[key] =
-              og && !dontComposePressabilityKeys[key]
-                ? composeEventHandlers(og, val)
-                : val
+        const pressability = usePressability(events || null)
+
+        if (events) {
+          if (events.onPress) {
+            for (const key in pressability) {
+              const og = viewProps[key]
+              const val = pressability[key]
+              viewProps[key] =
+                og && !dontComposePressabilityKeys[key]
+                  ? composeEventHandlers(og, val)
+                  : val
+            }
           }
         }
       }
     }
   },
+
+  // attempt at properly fixing RN input, but <Pressable><TextInput /> just doesnt work on RN
+  // useChildren(children, viewProps, events, staticConfig) {
+  //   if (process.env.TAMAGUI_TARGET === 'native') {
+  //     if (staticConfig.isInput && !staticConfig.isHOC) {
+  //       const Pressable = getBaseViews().Pressable
+  //       console.log(
+  //         'wrapping in pressable',
+  //         events?.['onPressIn']?.toString(),
+  //         viewProps['onPressIn']
+  //       )
+  //       // we need to wrap it in a view?
+  //       return <Pressable {...events}>{children}</Pressable>
+  //     }
+  //   }
+  // },
 })
 
 const dontComposePressabilityKeys = {

package/types/getBaseViews.native.d.ts

@@ -1,5 +1,6 @@
 export declare function getBaseViews(): {
     View: any;
     Text: any;
+    Pressable: any;
 };
 //# sourceMappingURL=getBaseViews.native.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getBaseViews.native.d.ts","sourceRoot":"","sources":["../src/getBaseViews.native.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY;;;EAO3B"}
+{"version":3,"file":"getBaseViews.native.d.ts","sourceRoot":"","sources":["../src/getBaseViews.native.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY;;;;EAQ3B"}

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAGV,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAGnB,MAAM,cAAc,CAAA;AAYrB,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAIhD,cAAc,cAAc,CAAA;AAG5B,cAAc,oBAAoB,CAAA;AAIlC,eAAO,MAAM,KAAK;;;;iOAIjB,CAAA;AAED,eAAO,MAAM,IAAI;;;;y6BAIhB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";AACA,OAAO,KAAK,EAGV,gBAAgB,EAChB,cAAc,EACd,kBAAkB,EAGnB,MAAM,cAAc,CAAA;AAYrB,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAIhD,cAAc,cAAc,CAAA;AAG5B,cAAc,oBAAoB,CAAA;AAIlC,eAAO,MAAM,KAAK;;;;iOAIjB,CAAA;AAED,eAAO,MAAM,IAAI;;;;y6BAIhB,CAAA"}

package/dist/cjs/native.js

@@ -1,20 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from == "object" || typeof from == "function")
-    for (let key of __getOwnPropNames(from))
-      !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  return to;
-}, __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
-var native_exports = {};
-module.exports = __toCommonJS(native_exports);
-__reExport(native_exports, require("./index"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ...require("./index")
-});
-//# sourceMappingURL=native.js.map

package/dist/cjs/native.js.map

@@ -1,6 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/native.ts"],
-  "mappings": ";;;;;;;;;;;;AAAA;AAAA;AAAA,2BAAc,oBAAd;",
-  "names": []
-}