Skip to content
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

Jump to bottom

Fix/button component after ts migration #31906

Merged
merged 2 commits into from
Nov 27, 2023
Merged

Fix/button component after ts migration #31906

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e0c168
fix: add again useIsFocused hook to Button component
kubabutkiewicz Nov 27, 2023
7d5f796
fix: remove log
kubabutkiewicz Nov 27, 2023
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
4 changes: 2 additions & 2 deletions src/components/Button/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {useIsFocused} from '@react-navigation/native';
import React, {ForwardedRef, useCallback} from 'react';
import {ActivityIndicator, GestureResponderEvent, StyleProp, TextStyle, View, ViewStyle} from 'react-native';
import {SvgProps} from 'react-native-svg';
Expand Down Expand Up @@ -110,7 +111,6 @@ type ButtonProps = (ButtonWithText | ChildrenProps) & {

/** Accessibility label for the component */
accessibilityLabel?: string;
isFocused: boolean;
};

function Button(
Expand Down Expand Up @@ -149,7 +149,6 @@ function Button(
shouldRemoveRightBorderRadius = false,
shouldRemoveLeftBorderRadius = false,
shouldEnableHapticFeedback = false,
isFocused,

id = '',
accessibilityLabel = '',
Expand All @@ -159,6 +158,7 @@ function Button(
) {
const theme = useTheme();
const styles = useThemeStyles();
const isFocused = useIsFocused();

const keyboardShortcutCallback = useCallback(
(event?: GestureResponderEvent | KeyboardEvent) => {
Expand Down
Loading