From 8a1fc6dde65ae533568ed44e69343b80ae1b76e5 Mon Sep 17 00:00:00 2001 From: Nikita Dudin Date: Tue, 6 Feb 2024 18:19:46 +0300 Subject: [PATCH] Fix crashes with RNGH@2.15.0 on iOS --- package.json | 2 +- src/components/Panels/Panel1.tsx | 4 ++-- src/components/Panels/Panel2.tsx | 4 ++-- src/components/Panels/Panel3/Panel3.tsx | 4 ++-- src/components/Panels/Panel4.tsx | 4 ++-- src/components/Sliders/HSB/BrightnessSlider.tsx | 4 ++-- src/components/Sliders/HSB/SaturationSlider.tsx | 4 ++-- src/components/Sliders/HSL/HSLSaturationSlider.tsx | 4 ++-- src/components/Sliders/HSL/LuminanceCircular.tsx | 4 ++-- src/components/Sliders/HSL/LuminanceSlider.tsx | 4 ++-- src/components/Sliders/Hue/HueCircular.tsx | 4 ++-- src/components/Sliders/Hue/HueSlider.tsx | 4 ++-- src/components/Sliders/OpacitySlider.tsx | 4 ++-- src/components/Sliders/RGB/BlueSlider.tsx | 4 ++-- src/components/Sliders/RGB/GreenSlider.tsx | 4 ++-- src/components/Sliders/RGB/RedSlider.tsx | 4 ++-- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 2328054e..e51ac680 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reanimated-color-picker", - "version": "3.0.1", + "version": "3.0.2", "description": "A Pure JavaScript Color Picker for React Native", "main": "lib/commonjs/index", "module": "lib/module/index", diff --git a/src/components/Panels/Panel1.tsx b/src/components/Panels/Panel1.tsx index b4941002..3191e1c3 100644 --- a/src/components/Panels/Panel1.tsx +++ b/src/components/Panels/Panel1.tsx @@ -89,8 +89,8 @@ export function Panel1({ gestures = [], style = {}, ...props }: PanelProps) { }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = useCallback(({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Panels/Panel2.tsx b/src/components/Panels/Panel2.tsx index 00fb4200..294346d9 100644 --- a/src/components/Panels/Panel2.tsx +++ b/src/components/Panels/Panel2.tsx @@ -141,8 +141,8 @@ export function Panel2({ }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = useCallback(({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Panels/Panel3/Panel3.tsx b/src/components/Panels/Panel3/Panel3.tsx index 7e6eae3f..f3da2a2e 100644 --- a/src/components/Panels/Panel3/Panel3.tsx +++ b/src/components/Panels/Panel3/Panel3.tsx @@ -169,8 +169,8 @@ export function Panel3({ }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = useCallback(({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Panels/Panel4.tsx b/src/components/Panels/Panel4.tsx index b5756755..f5d058bf 100644 --- a/src/components/Panels/Panel4.tsx +++ b/src/components/Panels/Panel4.tsx @@ -108,8 +108,8 @@ export function Panel4({ }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = useCallback(({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/HSB/BrightnessSlider.tsx b/src/components/Sliders/HSB/BrightnessSlider.tsx index 586a034e..df3b28fd 100644 --- a/src/components/Sliders/HSB/BrightnessSlider.tsx +++ b/src/components/Sliders/HSB/BrightnessSlider.tsx @@ -91,8 +91,8 @@ export function BrightnessSlider({ gestures = [], style = {}, vertical = false, }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/HSB/SaturationSlider.tsx b/src/components/Sliders/HSB/SaturationSlider.tsx index 0814e099..f6b24211 100644 --- a/src/components/Sliders/HSB/SaturationSlider.tsx +++ b/src/components/Sliders/HSB/SaturationSlider.tsx @@ -97,8 +97,8 @@ export function SaturationSlider({ gestures = [], style = {}, vertical = false, }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/HSL/HSLSaturationSlider.tsx b/src/components/Sliders/HSL/HSLSaturationSlider.tsx index 7ed51ca1..f6a32aaf 100644 --- a/src/components/Sliders/HSL/HSLSaturationSlider.tsx +++ b/src/components/Sliders/HSL/HSLSaturationSlider.tsx @@ -116,8 +116,8 @@ export function HSLSaturationSlider({ gestures = [], style = {}, vertical = fals }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/HSL/LuminanceCircular.tsx b/src/components/Sliders/HSL/LuminanceCircular.tsx index f67c54cf..494e5b3c 100644 --- a/src/components/Sliders/HSL/LuminanceCircular.tsx +++ b/src/components/Sliders/HSL/LuminanceCircular.tsx @@ -145,8 +145,8 @@ export function LuminanceCircular({ }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = useCallback(({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/HSL/LuminanceSlider.tsx b/src/components/Sliders/HSL/LuminanceSlider.tsx index 99bc2afc..c073346e 100644 --- a/src/components/Sliders/HSL/LuminanceSlider.tsx +++ b/src/components/Sliders/HSL/LuminanceSlider.tsx @@ -108,8 +108,8 @@ export function LuminanceSlider({ gestures = [], style = {}, vertical = false, r }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/Hue/HueCircular.tsx b/src/components/Sliders/Hue/HueCircular.tsx index 9589fe4d..c1571105 100644 --- a/src/components/Sliders/Hue/HueCircular.tsx +++ b/src/components/Sliders/Hue/HueCircular.tsx @@ -127,8 +127,8 @@ export function HueCircular({ }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = useCallback(({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/Hue/HueSlider.tsx b/src/components/Sliders/Hue/HueSlider.tsx index e40be5c6..148e29eb 100644 --- a/src/components/Sliders/Hue/HueSlider.tsx +++ b/src/components/Sliders/Hue/HueSlider.tsx @@ -100,8 +100,8 @@ export function HueSlider({ gestures = [], style = {}, vertical = false, reverse }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/OpacitySlider.tsx b/src/components/Sliders/OpacitySlider.tsx index a463d48a..de105a4b 100644 --- a/src/components/Sliders/OpacitySlider.tsx +++ b/src/components/Sliders/OpacitySlider.tsx @@ -108,8 +108,8 @@ export function OpacitySlider({ gestures = [], style = {}, vertical = false, rev }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/RGB/BlueSlider.tsx b/src/components/Sliders/RGB/BlueSlider.tsx index 8e3a51c6..7be8c064 100644 --- a/src/components/Sliders/RGB/BlueSlider.tsx +++ b/src/components/Sliders/RGB/BlueSlider.tsx @@ -110,8 +110,8 @@ export function BlueSlider({ gestures = [], style = {}, vertical = false, revers }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/RGB/GreenSlider.tsx b/src/components/Sliders/RGB/GreenSlider.tsx index b6243b5a..d37f0158 100644 --- a/src/components/Sliders/RGB/GreenSlider.tsx +++ b/src/components/Sliders/RGB/GreenSlider.tsx @@ -110,8 +110,8 @@ export function GreenSlider({ gestures = [], style = {}, vertical = false, rever }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => { diff --git a/src/components/Sliders/RGB/RedSlider.tsx b/src/components/Sliders/RGB/RedSlider.tsx index 16300290..0b0a12e2 100644 --- a/src/components/Sliders/RGB/RedSlider.tsx +++ b/src/components/Sliders/RGB/RedSlider.tsx @@ -110,8 +110,8 @@ export function RedSlider({ gestures = [], style = {}, vertical = false, reverse }; const pan = Gesture.Pan().onBegin(onGestureBegin).onUpdate(onGestureUpdate).onEnd(onGestureFinish); - const tap = Gesture.Tap().onTouchesUp(onGestureFinish); - const longPress = Gesture.LongPress().onTouchesUp(onGestureFinish); + const tap = Gesture.Tap().onEnd(onGestureFinish); + const longPress = Gesture.LongPress().onEnd(onGestureFinish); const composed = Gesture.Simultaneous(Gesture.Exclusive(pan, tap, longPress), ...gestures); const onLayout = ({ nativeEvent: { layout } }: LayoutChangeEvent) => {