Merge pull request #73 from OrigenStudio/develop

v0.1.0-rc.8
OrigenStudio · Jan 7, 2019 · 4105b0c · 4105b0c
2 parents 189ed08 + ebba135
commit 4105b0c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "material-ui-layout",
-  "version": "0.1.0-rc.7",
+  "version": "0.1.0-rc.8",
   "description": "Layout components for material-ui",
   "main": "./lib/index.js",
   "scripts": {

diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx
@@ -11,11 +11,16 @@ import styles from './styles';
 type Props = {
   classes: Classes,
   children: React.Element<any>,
-  color: string,
-  className: string,
+  color?: 'inherit' | 'default' | 'primary' | 'secondary',
+  className?: string,
 };
 
 class Footer extends React.PureComponent<Props> {
+  static defaultProps = {
+    classes: {},
+    color: 'inherit',
+    className: '',
+  };
   render() {
     const {
       classes, color, className: classNameProp, children,

diff --git a/src/components/Layout/Layout.jsx b/src/components/Layout/Layout.jsx
@@ -140,6 +140,11 @@ class Layout extends React.PureComponent<Props> {
       [`${classes.mainLeftRightShift}`]: mainLeftShift && mainRightShift,
     });
 
+    const footerClassnames: string = classNames(
+      classes.footer,
+      footerProps ? footerProps.className : '',
+    );
+
     const appBarLeftShift =
       !smallScreen &&
       (!leftDrawerUnder &&
@@ -235,7 +240,11 @@ class Layout extends React.PureComponent<Props> {
         >
           <main className={mainClassnames}>{children}</main>
         </LayoutActions.Provider>
-        {footerContent ? <Footer {...footerProps}>{footerContent}</Footer> : null}
+        {footerContent ? (
+          <Footer {...footerProps} className={footerClassnames}>
+            {footerContent}
+          </Footer>
+        ) : null}
       </div>
     );
   }

diff --git a/src/components/Layout/styles.js b/src/components/Layout/styles.js
@@ -113,6 +113,7 @@ const styles = (theme: Object): Object => ({
   drawerPaperUnder: {
     zIndex: '1000',
   },
+  footer: {},
 });
 
 export default styles;