fix(core): fix disabled not applying style + fix disabled not removin…

…g events
tamagui · Nov 5, 2022 · a4c82c8 · a4c82c8
1 parent af57854
commit a4c82c8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/packages/core/src/createComponent.tsx b/packages/core/src/createComponent.tsx
@@ -199,6 +199,8 @@ export function createComponent<
 
     const languageContext = isRSC ? null : useContext(FontLanguageContext)
 
+    const isDisabled = props.disabled ?? props.accessibilityState?.disabled
+
     const useAnimations = tamaguiConfig.animations?.useAnimations as UseAnimationHook | undefined
     const nextIsAnimated = !!(useAnimations && props.animation)
     // conditional but if ever true stays true
@@ -722,7 +724,7 @@ export function createComponent<
         )
 
     const events =
-      shouldAttach && !isRSC
+      shouldAttach && !isRSC && !isDisabled
         ? {
             onPressOut: attachPress
               ? (e) => {
@@ -793,7 +795,7 @@ export function createComponent<
             // replicating TouchableWithoutFeedback
             ...(!isWeb && {
               cancelable: !props.rejectResponderTermination,
-              disabled: props.disabled ?? props.accessibilityState?.disabled,
+              disabled: isDisabled,
               hitSlop: props.hitSlop,
               delayLongPress: props.delayLongPress,
               delayPressIn: props.delayPressIn,