From 63ac7ae18dbbbd57543e951af27d690eab6d6b14 Mon Sep 17 00:00:00 2001 From: autun12 Date: Sun, 14 Apr 2019 13:56:31 -0500 Subject: [PATCH] reverted changes to files that aren't apart of the #13 issue --- src/components/Button.jsx | 8 +------- src/components/SearchInput.jsx | 6 +++--- src/stories/index.js | 1 + src/theme/index.jsx | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/components/Button.jsx b/src/components/Button.jsx index 4049548..53297ff 100644 --- a/src/components/Button.jsx +++ b/src/components/Button.jsx @@ -57,13 +57,7 @@ class Button extends React.Component { onPress={onPress} accessibilityLabel={accessibilityLabel} > - + {title} diff --git a/src/components/SearchInput.jsx b/src/components/SearchInput.jsx index a7a6959..447a9fd 100644 --- a/src/components/SearchInput.jsx +++ b/src/components/SearchInput.jsx @@ -5,10 +5,11 @@ import { StyleSheet, Text, View, - TextInput, TouchableOpacity, } from 'react-native' +import TextInput from './TextInput' + // Theme import theme from '../theme' @@ -20,7 +21,6 @@ const styles = StyleSheet.create({ alignItems: 'center', flexWrap: 'wrap', justifyContent: 'center', - backgroundColor: colors.main.white.rgb, borderRadius: 8, marginVertical: 16, marginHorizontal: 16, @@ -37,7 +37,7 @@ const styles = StyleSheet.create({ }, }) -class SearchInput extends React.Component { +class SearchInput extends TextInput { render() { const { text } = this.props diff --git a/src/stories/index.js b/src/stories/index.js index 109a581..cfe0722 100644 --- a/src/stories/index.js +++ b/src/stories/index.js @@ -54,6 +54,7 @@ storiesOf('TextInput', module) label="Textarea label" multiLine={true} autoFocus={false} + placeholder={'Placeholder'} /> )) diff --git a/src/theme/index.jsx b/src/theme/index.jsx index 2031b24..6e13dbb 100644 --- a/src/theme/index.jsx +++ b/src/theme/index.jsx @@ -10,7 +10,7 @@ export default { tera: '32px', peta: '40px', exa: '48px', - zetta: '56px', + zetta: '56px' }, colors: {