fix(Text/web,Modal/web): default text whitespace, passthrough modal c…

…lassname (#189)
treebohotels · Mar 18, 2019 · f7c6474 · f7c6474
1 parent 2773d9b
commit f7c6474
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Modal/web/ModalContent.js b/src/Modal/web/ModalContent.js
@@ -4,8 +4,11 @@ import Space from '../../Space/web';
 import Flex from '../../Flex/web';
 import View from '../../View/web';
 
-const ModalContent = ({ children }) => (
-  <Space padding={[3, 5]}>
+const ModalContent = ({
+  className,
+  children,
+}) => (
+  <Space className={className} padding={[3, 5]}>
     <Flex flex="auto">
       <View style={{ overflow: 'auto' }}>
         {children}
@@ -15,6 +18,7 @@ const ModalContent = ({ children }) => (
 );
 
 ModalContent.propTypes = {
+  className: PropTypes.string,
   children: PropTypes.node,
 };
 

diff --git a/src/Text/web/Text.js b/src/Text/web/Text.js
@@ -23,7 +23,7 @@ const Text = styled(
   line-height: ${(props) => props.component === 'p' ? '1.5' : ''};
   text-align: ${(props) => props.align || ''};
   overflow: ${(props) => props.truncate ? 'hidden' : ''};
-  white-space: ${(props) => props.truncate ? 'nowrap' : 'pre-line'};
+  white-space: ${(props) => props.truncate ? 'nowrap' : ''};
   text-overflow: ${(props) => props.truncate ? 'ellipsis' : ''};
   padding: 0;
   margin: 0;