fix focusable field and pop-up style

This commit is contained in:
mathysPaul
2023-10-15 09:22:38 +02:00
parent f610de3045
commit b6e8b20168
4 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ const GlassmorphismCC = ({ children, style }: GlassmorphismCCProps) => {
return ( return (
<BlurView <BlurView
style={[{borderRadius: 12}, style]} style={[{borderRadius: 12}, style]}
intensity={70} intensity={80}
tint={colorScheme === 'light' ? 'light' : 'dark'} tint={colorScheme === 'light' ? 'light' : 'dark'}
> >
{children} {children}
+3
View File
@@ -7,6 +7,7 @@ interface InteractiveBaseProps {
onPress?: () => Promise<void>; onPress?: () => Promise<void>;
isDisabled?: boolean; isDisabled?: boolean;
isOutlined?: boolean; isOutlined?: boolean;
focusable?: boolean;
style?: StyleProp<ViewStyle>; style?: StyleProp<ViewStyle>;
styleAnimate: { styleAnimate: {
Default: { Default: {
@@ -47,6 +48,7 @@ const InteractiveBase: React.FC<InteractiveBaseProps> = ({
styleAnimate, styleAnimate,
isDisabled = false, isDisabled = false,
isOutlined = false, isOutlined = false,
focusable = true,
}) => { }) => {
const scaleAnimator = useRef(new Animated.Value(1)).current; const scaleAnimator = useRef(new Animated.Value(1)).current;
const scaleValue = scaleAnimator.interpolate({ const scaleValue = scaleAnimator.interpolate({
@@ -238,6 +240,7 @@ const InteractiveBase: React.FC<InteractiveBaseProps> = ({
return ( return (
<Animated.View style={[style, isDisabled ? disableStyle : animatedStyle]}> <Animated.View style={[style, isDisabled ? disableStyle : animatedStyle]}>
<Pressable <Pressable
focusable={focusable}
disabled={isDisabled} disabled={isDisabled}
onHoverIn={handleMouseEnter} onHoverIn={handleMouseEnter}
onPressIn={handlePressIn} onPressIn={handlePressIn}
+1 -1
View File
@@ -18,7 +18,7 @@ type PopupCCProps = {
const PopupCC = ({ title, description, children, isVisible, setIsVisible }: PopupCCProps) => { const PopupCC = ({ title, description, children, isVisible, setIsVisible }: PopupCCProps) => {
return ( return (
<Modal <Modal
backdropOpacity={0.3} backdropOpacity={0.75}
isVisible={isVisible} isVisible={isVisible}
style={{ style={{
display: 'flex', display: 'flex',
+1 -1
View File
@@ -100,7 +100,7 @@ const TextFieldBase: React.FC<TextFieldBaseProps> = ({
}); });
return ( return (
<InteractiveBase style={[style, { borderRadius: 12 }]} styleAnimate={styleAnimate}> <InteractiveBase style={[style, { borderRadius: 12 }]} styleAnimate={styleAnimate} focusable={false}>
<View style={styles.container}> <View style={styles.container}>
<View style={styles.iconContainerLeft}> <View style={styles.iconContainerLeft}>
{icon && ( {icon && (