tamagui 1.74.14 → 1.74.15

package/dist/native.js

@@ -4396,7 +4396,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
         fontFamily && fontFamily[0] === "$" && (fontFamily = fontFamily.slice(1));
         let fontFamilyClassName = fontFamily ? `font_${fontFamily}` : "", style = avoidAnimationStyle ? splitStyles.style : animationStyles || splitStyles.style, className;
         viewProps.style = style;
-        let runtimePressStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.pressStyle), runtimeFocusStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.focusStyle), attachPress = !!(groupName || runtimePressStyle || onPress || onPressOut || onPressIn || onLongPress || onClick), runtimeHoverStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.hoverStyle), needsHoverState = runtimeHoverStyle || onHoverIn || onHoverOut, isHoverable = import_constants.isWeb && !!(groupName || needsHoverState || onMouseEnter || onMouseLeave), handlesPressEvents = !(import_constants.isWeb || asChild), shouldAttach = !!(attachPress || isHoverable || runtimePressStyle || runtimeHoverStyle || runtimeFocusStyle);
+        let runtimePressStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.pressStyle), runtimeFocusStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.focusStyle), attachFocus = !!(runtimePressStyle || onFocus || onBlur), attachPress = !!(groupName || runtimePressStyle || onPress || onPressOut || onPressIn || onLongPress || onClick), runtimeHoverStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.hoverStyle), needsHoverState = runtimeHoverStyle || onHoverIn || onHoverOut, isHoverable = import_constants.isWeb && !!(groupName || needsHoverState || onMouseEnter || onMouseLeave), handlesPressEvents = !(import_constants.isWeb || asChild), shouldAttach = !!(attachFocus || attachPress || isHoverable || runtimePressStyle || runtimeHoverStyle || runtimeFocusStyle);
         process.env.NODE_ENV === "development" && time && time`events-setup`;
         let events = shouldAttach && !isDisabled && !props.asChild ? {
           onPressOut: attachPress ? (e) => {
@@ -4425,6 +4425,18 @@ If you meant to do this, you can disable this warning - either change untilMeasu
             onLongPress: (e) => {
               unPress(), onLongPress == null || onLongPress(e);
             }
+          },
+          ...attachFocus && {
+            onFocus: (e) => {
+              setStateShallow({
+                focus: !0
+              }), onFocus == null || onFocus(e);
+            },
+            onBlur: (e) => {
+              setStateShallow({
+                focus: !1
+              }), onBlur == null || onBlur(e);
+            }
           }
         } : null;
         events && !asChild && Object.assign(events, {
@@ -7601,11 +7613,7 @@ var require_index_native15 = __commonJS({
         return viewProps;
       },
       useEvents(viewProps, events, { pseudos }, setStateShallow, staticConfig) {
-        if (pseudos != null && pseudos.focusStyle && (viewProps.onFocus = (0, import_web.composeEventHandlers)(viewProps.onFocus, () => {
-          setStateShallow({ focus: !0 });
-        }), viewProps.onBlur = (0, import_web.composeEventHandlers)(viewProps.onBlur, () => {
-          setStateShallow({ focus: !1 });
-        })), staticConfig.isInput) {
+        if (events != null && events.onFocus && (viewProps.onFocus = events.onFocus), events != null && events.onBlur && (viewProps.onBlur = events.onBlur), staticConfig.isInput) {
           if (events) {
             let { onPressIn, onPressOut, onPress } = events, inputEvents = {
               onPressIn,