Merge pull request #1753 from...

Merge pull request #1753 from ProjectMirador/1727-divide-windowmiddlecontent-into-component-and-container

Divide <WindowMiddleContent/> into component and container (part of #1727)

__tests__/src/components/Window.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import Window from '../../../src/components/Window';
 import WindowTopBar from '../../../src/containers/WindowTopBar';
-import ConnectedWindowMiddleContent from '../../../src/components/WindowMiddleContent';
+import WindowMiddleContent from '../../../src/containers/WindowMiddleContent';
 
 describe('Window', () => {
   let wrapper;
@@ -19,7 +19,7 @@ describe('Window', () => {
   });
   it('should render <ConnectedWindowMiddleContent>', () => {
     wrapper = shallow(<Window window={window} />);
-    expect(wrapper.find(ConnectedWindowMiddleContent)).toHaveLength(1);
+    expect(wrapper.find(WindowMiddleContent)).toHaveLength(1);
   });
   it('should render bottom companions window areas', () => {
     wrapper = shallow(<Window window={window} />);

__tests__/src/components/WindowMiddleContent.test.js

 import React from 'react';
 import { shallow } from 'enzyme';
-import { WindowMiddleContent } from '../../../src/components/WindowMiddleContent';
+import WindowMiddleContent from '../../../src/components/WindowMiddleContent';
 import ConnectedCompanionWindow from '../../../src/components/CompanionWindow';
 import ConnectedWindowSideBar from '../../../src/components/WindowSideBar';
 import ConnectedWindowViewer from '../../../src/components/WindowViewer';

src/components/Window.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ns from '../config/css-ns';
 import WindowTopBar from '../containers/WindowTopBar';
-import ConnectedWindowMiddleContent from './WindowMiddleContent';
+import WindowMiddleContent from '../containers/WindowMiddleContent';
 import ConnectedThumbnailNavigation from './ThumbnailNavigation';
 
 /**
@@ -29,7 +29,7 @@ class Window extends Component {
           windowId={window.id}
           manifest={manifest}
         />
-        <ConnectedWindowMiddleContent
+        <WindowMiddleContent
           window={window}
           manifest={manifest}
           sideBarOpen={window.sideBarOpen}

src/components/WindowMiddleContent.js

 import React, { Component } from 'react';
-import { compose } from 'redux';
-import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ConnectedWindowSideBar from './WindowSideBar';
 import ConnectedCompanionWindow from './CompanionWindow';
 import ConnectedWindowViewer from './WindowViewer';
-import miradorWithPlugins from '../lib/miradorWithPlugins';
 import ns from '../config/css-ns';
 
 /**
  * WindowMiddleContent - component that renders the "middle" area of the
  * Mirador Window
  */
-export class WindowMiddleContent extends Component {
+class WindowMiddleContent extends Component {
   /**
    * renderViewer
    *
@@ -66,11 +63,4 @@ WindowMiddleContent.defaultProps = {
   manifest: null,
 };
 
-
-const enhance = compose(
-  connect(null, null),
-  miradorWithPlugins,
-  // further HOC go here
-);
-
-export default enhance(WindowMiddleContent);
+export default WindowMiddleContent;

src/containers/WindowMiddleContent.js

+import { compose } from 'redux';
+import { connect } from 'react-redux';
+import miradorWithPlugins from '../lib/miradorWithPlugins';
+import WindowMiddleContent from '../components/WindowMiddleContent';
+
+const enhance = compose(
+  connect(null, null),
+  miradorWithPlugins,
+  // further HOC go here
+);
+
+export default enhance(WindowMiddleContent);