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

fix: input label positioning regression #3728

Merged
merged 1 commit into from
Mar 6, 2023
Merged

fix: input label positioning regression #3728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions src/components/TextInput/Label/InputLabel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ const InputLabel = (props: InputLabelProps) => {
labelTranslationXOffset,
maxFontSizeMultiplier,
testID,
theme,
} = props;

const paddingOffset =
Expand Down Expand Up @@ -118,7 +117,6 @@ const InputLabel = (props: InputLabelProps) => {
labeled,
labelLayoutWidth,
labelStyle,
theme,
placeholderStyle,
baseLabelTranslateX,
topPosition,
Expand Down
20 changes: 2 additions & 18 deletions src/components/TextInput/Label/LabelBackground.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as React from 'react';
import { Animated, StyleSheet } from 'react-native';

import { useInternalTheme } from '../../../core/theming';
import AnimatedText from '../../Typography/AnimatedText';
import type { LabelBackgroundProps } from '../types';

Expand All @@ -16,15 +15,12 @@ const LabelBackground = ({
roundness,
labelStyle,
maxFontSizeMultiplier,
theme: themeOverrides,
}: LabelBackgroundProps) => {
const opacity = labeled.interpolate({
inputRange: [0, 0.6],
outputRange: [1, 0],
});

const { isV3 } = useInternalTheme(themeOverrides);

const labelTranslationX = {
translateX: labeled.interpolate({
inputRange: [0, 1],
Expand All @@ -41,14 +37,6 @@ const LabelBackground = ({

const labelTextTransform = [...labelStyle.transform, labelTextScaleY];

const labelTextWidth = isV3
? {
width: labelLayoutWidth - placeholderStyle.paddingHorizontal,
}
: {
maxWidth: labelLayoutWidth - 2 * placeholderStyle.paddingHorizontal,
};

const isRounded = roundness > 6;
const roundedEdgeCover = isRounded ? (
<Animated.View
Expand Down Expand Up @@ -76,14 +64,13 @@ const LabelBackground = ({
placeholderStyle,
labelStyle,
styles.outlinedLabel,
isV3 && styles.md3OutlinedLabel,
{
top: topPosition + 1,
width: labelLayoutWidth - placeholderStyle.paddingHorizontal,
backgroundColor,
opacity,
transform: labelTextTransform,
},
labelTextWidth,
]}
numberOfLines={1}
maxFontSizeMultiplier={maxFontSizeMultiplier}
Expand All @@ -105,11 +92,8 @@ const styles = StyleSheet.create({
// eslint-disable-next-line react-native/no-color-literals
outlinedLabel: {
position: 'absolute',
left: 18,
left: 8,
paddingHorizontal: 0,
color: 'transparent',
},
md3OutlinedLabel: {
left: 8,
},
});
1 change: 0 additions & 1 deletion src/components/TextInput/TextInputFlat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ const TextInputFlat = ({
maxFontSizeMultiplier: rest.maxFontSizeMultiplier,
testID,
contentStyle,
theme,
opacity:
parentState.value || parentState.focused
? parentState.labelLayout.measured
Expand Down
1 change: 0 additions & 1 deletion src/components/TextInput/TextInputOutlined.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ const TextInputOutlined = ({
maxFontSizeMultiplier: rest.maxFontSizeMultiplier,
testID,
contentStyle,
theme,
opacity:
parentState.value || parentState.focused
? parentState.labelLayout.measured
Expand Down