fix: pass flattened styles to adjustPadding (callstack#1132)

pdcprod · Jun 26, 2019 · fcf3ec9 · fcf3ec9
1 parent cbfa181
commit fcf3ec9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/components/TextInput/TextInputFlat.js b/src/components/TextInput/TextInputFlat.js
@@ -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,

diff --git a/src/components/TextInput/TextInputOutlined.js b/src/components/TextInput/TextInputOutlined.js
@@ -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 =