Skip to content

[iOS] Fix activeOpacity in BorderlessButton #3433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 17, 2025
Merged

[iOS] Fix activeOpacity in BorderlessButton #3433

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a9f732
Fix buttons opacity
m-bert Mar 5, 2025
0d5aa0a
Remove omit
m-bert Mar 5, 2025
1766af4
Merge branch 'main' into @mbert/fix-opacity-ios
m-bert Mar 6, 2025
f8d7629
Change type
m-bert Mar 6, 2025
6d420a3
Merge branch 'main' into @mbert/fix-opacity-ios
m-bert Mar 10, 2025
b22b0fc
Remove last any
m-bert Mar 12, 2025
934e221
Merge branch 'main' into @mbert/fix-opacity-ios
m-bert Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/components/GestureButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class InnerBaseButton extends React.Component<BaseButtonWithRefProps> {
private longPressTimeout: ReturnType<typeof setTimeout> | undefined;
private longPressDetected: boolean;

constructor(props: BaseButtonProps) {
constructor(props: BaseButtonWithRefProps) {
super(props);
this.lastActive = false;
this.longPressDetected = false;
Expand Down Expand Up @@ -146,12 +146,18 @@ class InnerBaseButton extends React.Component<BaseButtonWithRefProps> {
}
}

const AnimatedInnerBaseButton =
Animated.createAnimatedComponent<typeof InnerBaseButton>(InnerBaseButton);

export const BaseButton = React.forwardRef<
any,
React.ComponentType,
Omit<BaseButtonProps, 'innerRef'>
>((props, ref) => <InnerBaseButton innerRef={ref} {...props} />);

const AnimatedBaseButton = Animated.createAnimatedComponent(BaseButton);
const AnimatedBaseButton = React.forwardRef<
React.ComponentType,
BaseButtonWithRefProps
>((props, ref) => <AnimatedInnerBaseButton innerRef={ref} {...props} />);

const btnStyles = StyleSheet.create({
underlay: {
Expand All @@ -171,7 +177,7 @@ class InnerRectButton extends React.Component<RectButtonWithRefProps> {

private opacity: Animated.Value;

constructor(props: RectButtonProps) {
constructor(props: RectButtonWithRefProps) {
super(props);
this.opacity = new Animated.Value(0);
}
Expand Down Expand Up @@ -216,7 +222,7 @@ class InnerRectButton extends React.Component<RectButtonWithRefProps> {
}

export const RectButton = React.forwardRef<
any,
React.ComponentType,
Omit<RectButtonProps, 'innerRef'>
>((props, ref) => <InnerRectButton innerRef={ref} {...props} />);

Expand All @@ -228,7 +234,7 @@ class InnerBorderlessButton extends React.Component<BorderlessButtonWithRefProps

private opacity: Animated.Value;

constructor(props: BorderlessButtonProps) {
constructor(props: BorderlessButtonWithRefProps) {
super(props);
this.opacity = new Animated.Value(1);
}
Expand All @@ -247,8 +253,6 @@ class InnerBorderlessButton extends React.Component<BorderlessButtonWithRefProps
return (
<AnimatedBaseButton
{...rest}
// @ts-ignore We don't want `innerRef` to be accessible from public API.
// However in this case we need to set it indirectly on `BaseButton`, hence we use ts-ignore
innerRef={innerRef}
onActiveStateChange={this.onActiveStateChange}
style={[style, Platform.OS === 'ios' && { opacity: this.opacity }]}>
Expand All @@ -259,7 +263,7 @@ class InnerBorderlessButton extends React.Component<BorderlessButtonWithRefProps
}

export const BorderlessButton = React.forwardRef<
any,
React.ComponentType,
Omit<BorderlessButtonProps, 'innerRef'>
>((props, ref) => <InnerBorderlessButton innerRef={ref} {...props} />);

Expand Down
Loading