Upgrade modules and fix

react-backoffice · Apr 12, 2020 · 50c8673 · 50c8673
1 parent f30776c
commit 50c8673
Show file tree

Hide file tree

Showing 9 changed files with 3,669 additions and 3,757 deletions.
diff --git a/src/AppContainer/createContext.js b/src/AppContainer/createContext.js
diff --git a/src/AppContainer/withRoot.jsx b/src/AppContainer/withRoot.jsx
@@ -1,11 +1,8 @@
 import React, { Component } from 'react'
-import JssProvider from 'react-jss/lib/JssProvider'
 import wrapDisplayName from 'recompose/wrapDisplayName'
 
 import { withStyles, MuiThemeProvider } from '@material-ui/core/styles'
 
-import createContext from './createContext'
-
 // Apply some reset
 const styles = theme => ({
   '@global': {
@@ -24,28 +21,15 @@ let AppWrapper = props => props.children
 
 AppWrapper = withStyles(styles)(AppWrapper)
 
-const context = createContext()
-
 const withRoot = (BaseComponent, props) => {
   class WithRoot extends Component {
-    componentDidMount() {
-      // Remove the server-side injected CSS.
-      const jssStyles = document.querySelector('#jss-server-side')
-
-      if (jssStyles && jssStyles.parentNode) {
-        jssStyles.parentNode.removeChild(jssStyles)
-      }
-    }
-
     render() {
       return (
-        <JssProvider registry={context.sheetsRegistry} jss={context.jss}>
-          <MuiThemeProvider theme={props.theme}>
-            <AppWrapper>
-              <BaseComponent {...this.props} />
-            </AppWrapper>
-          </MuiThemeProvider>
-        </JssProvider>
+        <MuiThemeProvider theme={props.theme}>
+          <AppWrapper>
+            <BaseComponent {...this.props} />
+          </AppWrapper>
+        </MuiThemeProvider>
       )
     }
   }

diff --git a/src/Base/Base.jsx b/src/Base/Base.jsx
@@ -44,7 +44,7 @@ const withBase = Component => class extends React.Component {
     this.onClick = this.onClick.bind(this)
   }
 
-  componentWillMount() {
+  componentDidMount() {
     const { hasCookieInfo, menuOpen } = this.props
 
     this.setState({

diff --git a/src/Confirm/Confirm.jsx b/src/Confirm/Confirm.jsx
@@ -35,7 +35,7 @@ const withConfirm = Component => class extends React.Component {
     this.handleConfirm = this.handleConfirm.bind(this)
   }
 
-  componentWillMount() {
+  componentDidMount() {
     this.setState({
       isOpen: this.props.isOpen,
     })

diff --git a/src/Form/Form.jsx b/src/Form/Form.jsx
@@ -35,7 +35,7 @@ const withForm = Component => class Form extends React.Component {
     this.updateFieldData = this.updateFieldData.bind(this)
   }
 
-  componentWillMount() {
+  componentDidMount() {
     const { form, data } = this.props
     this.generateFields(form, data)
     this.generateMissingData(data)

diff --git a/src/Listing/Listing.jsx b/src/Listing/Listing.jsx
@@ -121,7 +121,7 @@ const withListing = Component => class Listing extends React.Component {
     this.handleFilter = this.handleFilter.bind(this)
   }
 
-  componentWillMount() {
+  componentDidMount() {
     const {
       id,
       data,

diff --git a/src/Tabs/Tabs.jsx b/src/Tabs/Tabs.jsx
@@ -51,7 +51,7 @@ class Tabs extends React.Component {
     value: 0,
   }
 
-  componentWillMount() {
+  componentDidMount() {
     const { data } = this.props
     const hash = window.location.hash.replace('#/', '')
     let value = 0

diff --git a/src/tests/Page.jsx b/src/tests/Page.jsx
@@ -50,7 +50,7 @@ class Page extends React.Component {
     additionalValue: null,
   }
 
-  componentWillMount() {
+  componentDidMount() {
     const { formData: newFormData, additionalValue } = this.state
 
     newFormData[0].data[0].getAdditionalValue = value => (
-Original file line number
+Diff line change
@@ Expand Up @@
         this.handleFilter = this.handleFilter.bind(this)
       }
-      componentWillMount() {
+      componentDidMount() {
         const {
           id,
           data,
@@ Expand Down @@