Merge branch 'hotfix-losingprops'

.eslintrc

@@ -27,6 +27,7 @@
  "react/jsx-no-bind": 2,
  "react/no-multi-comp": 0,
  "react/jsx-closing-tag-location": 0,
+ "react/jsx-one-expression-per-line": 0,
  "arrow-body-style": 0,
  "prefer-arrow-callback": 0,
  "semi": 1,

CHANGELOG.md

@@ -1,5 +1,16 @@
 ### [Versions](https://github.com/thundermiracle/next-mui-helper/releases/)
 
+## 1.1.1
+###### *Oct 26, 2018*
+
+#### Breaking Changes
+
+N/A
+
+#### Changes
+
+- Fix the bug of makeNextApp.js losing props in hoc
+
 ## 1.1.0
 ###### *Oct 24, 2018*
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "next-mui-helper",
- "version": "1.1.0",
+ "version": "1.1.1",
  "description": "hocs for making material-ui project with next.js(SSR)",
  "main": "./src/mui/withParts.js",
  "scripts": {

pages/_app.js

@@ -1,3 +1,16 @@
-import { DefaultNextApp } from '../src/nextjs/makeNextApp';
+import React from 'react';
 
-export default DefaultNextApp;
+import makeNextApp from '../src/nextjs/makeNextApp';
+
+const Layout = (props) => {
+ return (
+ <div>
+ [Layout]
+ <div>
+ {props.children}
+ </div>
+ </div>
+ );
+};
+
+export default makeNextApp(null, Layout);

pages/index.js

@@ -1,11 +1,14 @@
 import React from 'react';
 import Button from '@material-ui/core/Button';
-import { defaultParts } from '../src/mui/withParts';
+import Link from 'next/link';
 
-const Page1 = () => (
- <Button color="primary">
- Hello World
- </Button>
+const Index = () => (
+ <div>
+ <Button color="primary">Hello World</Button>
+ <Link href="/page1">
+ <Button>To Page1</Button>
+ </Link>
+ </div>
 );
 
-export default defaultParts(Page1);
+export default Index;

pages/page1.js

@@ -0,0 +1,14 @@
+import React from 'react';
+import Button from '@material-ui/core/Button';
+import Link from 'next/link';
+
+const Index = () => (
+ <div>
+ Page1 contentsssssssssssssss...
+ <Link href="/">
+ <Button>To Top</Button>
+ </Link>
+ </div>
+);
+
+export default Index;

src/nextjs/makeNextApp.js

@@ -3,10 +3,24 @@ import App, { Container } from 'next/app';
 import withParts from '../mui/withParts';
 
 const makeNextApp = (muiTheme, Layout, enableNProgress, enableDefaultCssBaseline) => {
+ const hocs = withParts(muiTheme, Layout, enableNProgress, enableDefaultCssBaseline);
  class NextApp extends App {
+ // inject props made by hoc
+ static async getInitialProps({ Component, ctx }) {
+ let pageProps = {};
+
+ const ComponentWithInitialProps = hocs(Component);
+
+ if (ComponentWithInitialProps.getInitialProps) {
+ pageProps = await ComponentWithInitialProps.getInitialProps(ctx);
+ }
+
+ return { pageProps };
+ }
+
  render() {
  const { Component, pageProps } = this.props;
- const NewComponent = withParts(muiTheme, Layout, enableNProgress, enableDefaultCssBaseline)(Component);
+ const NewComponent = hocs(Component);
 
  return (
  <Container>