fix(drupal-page): stop render when loading data

Author: Ian Wensink

src/components/DrupalPage.js

@@ -113,9 +113,9 @@ class DrupalPage extends Component {
     // Mark this component as not-ready. This unmounts the Layout and old ContentType.
     // Only render if the component is ready.
     if (
-      this.entity &&
       !this.props.renderWhileLoadingData &&
-      !this.entity.isReady()
+      this.entity &&
+      !(this.entity.isReady() && !this.state.loadingData)
     ) {
       return null;
     }

src/components/EntityMapper.js

@@ -77,8 +77,8 @@ class EntityMapper extends Component {
 
     this.state = {
       entityProps: props.entityProps,
-      ready: false,
       mapper: EntityMapper.getMapperFromProps(props),
+      ready: false,
       uuid: props.uuid,
     };
   }
@@ -173,10 +173,10 @@ class EntityMapper extends Component {
 
     const newState = {
       ...this.state,
-      uuid,
-      ready: true,
       entityProps,
       mapper,
+      ready: true,
+      uuid,
     };
 
     this.setState(newState);