Merge pull request #1745 from...

Merge pull request #1745 from ProjectMirador/1727-divide-windowtopbarbuttons-into-component-and-container

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

__tests__/src/components/WindowTopBarButtons.test.js

 import React from 'react';
 import { shallow } from 'enzyme';
 import createStore from '../../../src/state/createStore';
-import { WindowTopBarButtons } from '../../../src/components/WindowTopBarButtons';
+import WindowTopBarButtons from '../../../src/components/WindowTopBarButtons';
 
 describe('WindowTopBarButtons', () => {
   let wrapper;

src/components/WindowTopBar.js

@@ -5,7 +5,7 @@ import Typography from '@material-ui/core/Typography';
 import Button from '@material-ui/core/Button';
 import Toolbar from '@material-ui/core/Toolbar';
 import classNames from 'classnames';
-import ConnectedWindowTopBarButtons from './WindowTopBarButtons';
+import WindowTopBarButtons from '../containers/WindowTopBarButtons';
 import ns from '../config/css-ns';
 
 /**
@@ -36,7 +36,7 @@ class WindowTopBar extends Component {
         <Typography variant="h3" noWrap color="inherit" className={classes.typographyBody}>
           {this.titleContent()}
         </Typography>
-        <ConnectedWindowTopBarButtons windowId={windowId} />
+        <WindowTopBarButtons windowId={windowId} />
         <Button color="inherit" className={ns('window-close')} aria-label="Close Window" onClick={removeWindow}>&times;</Button>
       </Toolbar>
     );

src/components/WindowTopBarButtons.js

 import React, { Component } from 'react';
-import miradorWithPlugins from '../lib/miradorWithPlugins';
 
 /**
  *
  */
-export class WindowTopBarButtons extends Component {
+class WindowTopBarButtons extends Component {
   /**
    * render
    *
@@ -15,4 +14,4 @@ export class WindowTopBarButtons extends Component {
   }
 }
 
-export default miradorWithPlugins(WindowTopBarButtons);
+export default WindowTopBarButtons;

src/containers/WindowTopBarButtons.js

+import miradorWithPlugins from '../lib/miradorWithPlugins';
+import WindowTopBarButtons from '../components/WindowTopBarButtons';
+
+export default miradorWithPlugins(WindowTopBarButtons);