kylefang/react-native-paper
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-paper.git synced 2026-06-10 07:19:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: pass flattened styles to adjustPadding (#1132)

Browse Source
This commit is contained in:
Julian Hundeloh
2019-06-26 13:48:27 +02:00
committed by Dawid
parent cbfa18194c
commit fcf3ec9f87
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/TextInput/TextInputFlat.js
View File

@@ -155,11 +155,15 @@ class TextInputFlat extends React.Component<ChildTextInputProps, {}> {
label,
scale: fontScale,
isAndroid: Platform.OS === 'android',
styles: dense ? styles.inputFlatDense : styles.inputFlat,
styles: StyleSheet.flatten(
dense ? styles.inputFlatDense : styles.inputFlat
),
};
// $FlowFixMe
const pad = calculatePadding(paddingSettings);
// $FlowFixMe
const paddingFlat = adjustPaddingFlat({
...paddingSettings,
pad,

6
src/components/TextInput/TextInputOutlined.js
View File

@@ -138,11 +138,15 @@ class TextInputOutlined extends React.Component<ChildTextInputProps, {}> {
label,
scale: fontScale,
isAndroid: Platform.OS === 'android',
styles: dense ? styles.inputOutlinedDense : styles.inputOutlined,
styles: StyleSheet.flatten(
dense ? styles.inputOutlinedDense : styles.inputOutlined
),
};
// $FlowFixMe
const pad = calculatePadding(paddingSettings);
// $FlowFixMe
const paddingOut = adjustPaddingOut({ ...paddingSettings, pad });
const baseLabelTranslateY =