Fixed: Rotating mobile device when modal is open won't reset modal

2025-12-28 19:22:57 +01:00 · 2021-01-03 16:24:37 -06:00 · 2021-01-03 16:24:37 -06:00 · 762a085f9a
commit 762a085f9a
parent 8d63da1cfb
36 changed files with 113 additions and 122 deletions
--- a/frontend/src/Activity/Blacklist/Blacklist.js
+++ b/frontend/src/Activity/Blacklist/Blacklist.js
@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -61,7 +61,7 @@ class Blacklist extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isAnyFetching && !isAllPopulated &&
              <LoadingIndicator />
@ -108,7 +108,7 @@ class Blacklist extends Component {
                />
              </div>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Activity/History/History.js
+++ b/frontend/src/Activity/History/History.js
@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -98,7 +98,7 @@ class History extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isFetchingAny && !isAllPopulated &&
              <LoadingIndicator />
@ -149,7 +149,7 @@ class History extends Component {
                />
              </div>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Activity/Queue/Queue.js
+++ b/frontend/src/Activity/Queue/Queue.js
@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -200,7 +200,7 @@ class Queue extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isRefreshing && !isAllPopulated &&
              <LoadingIndicator />
@ -257,7 +257,7 @@ class Queue extends Component {
                />
              </div>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>

        <RemoveQueueItemsModal
          isOpen={isConfirmRemoveModalOpen}
--- a/frontend/src/Author/Details/AuthorDetails.js
+++ b/frontend/src/Author/Details/AuthorDetails.js
@ -16,7 +16,7 @@ import Link from 'Components/Link/Link';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -295,7 +295,7 @@ class AuthorDetails extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector innerClassName={styles.innerContentBody}>
+        <PageContentBody innerClassName={styles.innerContentBody}>
          <div className={styles.header}>
            <div
              className={styles.backdrop}
@ -686,7 +686,7 @@ class AuthorDetails extends Component {
            showImportMode={false}
            onModalClose={this.onInteractiveImportModalClose}
          />
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Author/Details/AuthorDetailsPageConnector.js
+++ b/frontend/src/Author/Details/AuthorDetailsPageConnector.js
@ -7,7 +7,7 @@ import { createSelector } from 'reselect';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import NotFound from 'Components/NotFound';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import AuthorDetailsConnector from './AuthorDetailsConnector';
 import styles from './AuthorDetails.css';
@ -74,9 +74,9 @@ class AuthorDetailsPageConnector extends Component {
    if (isFetching && !isPopulated) {
      return (
        <PageContent title='loading'>
-          <PageContentBodyConnector>
+          <PageContentBody>
            <LoadingIndicator />
-          </PageContentBodyConnector>
+          </PageContentBody>
        </PageContent>
      );
    }
--- a/frontend/src/Author/Editor/AuthorEditor.js
+++ b/frontend/src/Author/Editor/AuthorEditor.js
@ -4,7 +4,7 @@ import NoAuthor from 'Author/NoAuthor';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import Table from 'Components/Table/Table';
@ -196,7 +196,7 @@ class AuthorEditor extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isFetching && !isPopulated &&
              <LoadingIndicator />
@ -243,7 +243,7 @@ class AuthorEditor extends Component {
            !error && isPopulated && !items.length &&
              <NoAuthor totalItems={totalItems} />
          }
-        </PageContentBodyConnector>
+        </PageContentBody>

        <AuthorEditorFooter
          authorIds={selectedAuthorIds}
--- a/frontend/src/Author/Index/AuthorIndex.js
+++ b/frontend/src/Author/Index/AuthorIndex.js
@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import NoAuthor from 'Author/NoAuthor';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageJumpBar from 'Components/Page/PageJumpBar';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
@ -308,7 +308,7 @@ class AuthorIndex extends Component {
        </PageToolbar>

        <div className={styles.pageContentBodyWrapper}>
-          <PageContentBodyConnector
+          <PageContentBody
            registerScroller={this.setScrollerRef}
            className={styles.contentBody}
            innerClassName={styles[`${view}InnerContentBody`]}
@ -347,7 +347,7 @@ class AuthorIndex extends Component {
              !error && isPopulated && !items.length &&
                <NoAuthor totalItems={totalItems} />
            }
-          </PageContentBodyConnector>
+          </PageContentBody>

          {
            isLoaded && !!jumpBarItems.order.length &&
--- a/frontend/src/Book/Details/BookDetails.js
+++ b/frontend/src/Book/Details/BookDetails.js
@ -17,7 +17,7 @@ import IconButton from 'Components/Link/IconButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import MonitorToggleButton from 'Components/MonitorToggleButton';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -197,7 +197,7 @@ class BookDetails extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector innerClassName={styles.innerContentBody}>
+        <PageContentBody innerClassName={styles.innerContentBody}>
          <div className={styles.header}>
            <div
              className={styles.backdrop}
@ -467,7 +467,7 @@ class BookDetails extends Component {
            onModalClose={this.onDeleteBookModalClose}
          />

-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Book/Details/BookDetailsPageConnector.js
+++ b/frontend/src/Book/Details/BookDetailsPageConnector.js
@ -7,7 +7,7 @@ import { createSelector } from 'reselect';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import NotFound from 'Components/NotFound';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import { clearBooks, fetchBooks } from 'Store/Actions/bookActions';
 import BookDetailsConnector from './BookDetailsConnector';

@ -103,9 +103,9 @@ class BookDetailsPageConnector extends Component {
        (!isFetching && !isPopulated)) {
      return (
        <PageContent title='loading'>
-          <PageContentBodyConnector>
+          <PageContentBody>
            <LoadingIndicator />
-          </PageContentBodyConnector>
+          </PageContentBody>
        </PageContent>
      );
    }
--- a/frontend/src/Bookshelf/Bookshelf.js
+++ b/frontend/src/Bookshelf/Bookshelf.js
@ -6,7 +6,7 @@ import NoAuthor from 'Author/NoAuthor';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageJumpBar from 'Components/Page/PageJumpBar';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -363,7 +363,7 @@ class Bookshelf extends Component {
        </PageToolbar>

        <div className={styles.pageContentBodyWrapper}>
-          <PageContentBodyConnector
+          <PageContentBody
            registerScroller={this.setScrollerRef}
            className={styles.contentBody}
            innerClassName={styles.innerContentBody}
@ -414,7 +414,7 @@ class Bookshelf extends Component {
              !error && isPopulated && !items.length &&
                <NoAuthor totalItems={totalItems} />
            }
-          </PageContentBodyConnector>
+          </PageContentBody>

          {
            isPopulated && !!jumpBarItems.order.length &&
--- a/frontend/src/Calendar/CalendarPage.js
+++ b/frontend/src/Calendar/CalendarPage.js
@ -5,7 +5,7 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Measure from 'Components/Measure';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -130,7 +130,7 @@ class CalendarPage extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector
+        <PageContentBody
          className={styles.calendarPageBody}
          innerClassName={styles.calendarInnerPageBody}
        >
@ -171,7 +171,7 @@ class CalendarPage extends Component {
            hasAuthor && !!authorError &&
              <LegendConnector />
          }
-        </PageContentBodyConnector>
+        </PageContentBody>

        <CalendarLinkModal
          isOpen={isCalendarLinkModalOpen}
--- a/frontend/src/Components/Page/PageContentBody.js
+++ b/frontend/src/Components/Page/PageContentBody.js
@ -3,11 +3,21 @@ import React, { Component } from 'react';
 import OverlayScroller from 'Components/Scroller/OverlayScroller';
 import Scroller from 'Components/Scroller/Scroller';
 import { scrollDirections } from 'Helpers/Props';
+import { isMobile as isMobileUtil } from 'Utilities/mobile';
 import { isLocked } from 'Utilities/scrollLock';
 import styles from './PageContentBody.css';

 class PageContentBody extends Component {

+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this._isMobile = isMobileUtil();
+  }
+
  //
  // Listeners

@ -26,13 +36,12 @@ class PageContentBody extends Component {
    const {
      className,
      innerClassName,
-      isSmallScreen,
      children,
      dispatch,
      ...otherProps
    } = this.props;

-    const ScrollerComponent = isSmallScreen ? Scroller : OverlayScroller;
+    const ScrollerComponent = this._isMobile ? Scroller : OverlayScroller;

    return (
      <ScrollerComponent
@ -52,7 +61,6 @@ class PageContentBody extends Component {
 PageContentBody.propTypes = {
  className: PropTypes.string,
  innerClassName: PropTypes.string,
-  isSmallScreen: PropTypes.bool.isRequired,
  children: PropTypes.node.isRequired,
  onScroll: PropTypes.func,
  dispatch: PropTypes.func
--- a/frontend/src/Components/Page/PageContentBodyConnector.js
+++ b/frontend/src/Components/Page/PageContentBodyConnector.js
@ -1,17 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
-import PageContentBody from './PageContentBody';
-
-function createMapStateToProps() {
-  return createSelector(
-    createDimensionsSelector(),
-    (dimensions) => {
-      return {
-        isSmallScreen: dimensions.isSmallScreen
-      };
-    }
-  );
-}
-
-export default connect(createMapStateToProps, null, null, { forwardRef: true })(PageContentBody);
--- a/frontend/src/Components/Page/PageContentError.js
+++ b/frontend/src/Components/Page/PageContentError.js
@ -1,17 +1,17 @@
 import React from 'react';
 import ErrorBoundaryError from 'Components/Error/ErrorBoundaryError';
-import PageContentBodyConnector from './PageContentBodyConnector';
+import PageContentBody from './PageContentBody';
 import styles from './PageContentError.css';

 function PageContentError(props) {
  return (
    <div className={styles.content}>
-      <PageContentBodyConnector>
+      <PageContentBody>
        <ErrorBoundaryError
          {...props}
          message='There was an error loading this page'
        />
-      </PageContentBodyConnector>
+      </PageContentBody>
    </div>
  );
 }
--- a/frontend/src/Search/AddNewItem.js
+++ b/frontend/src/Search/AddNewItem.js
@ -6,7 +6,7 @@ import Button from 'Components/Link/Button';
 import Link from 'Components/Link/Link';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import { icons } from 'Helpers/Props';
 import AddNewAuthorSearchResultConnector from './Author/AddNewAuthorSearchResultConnector';
 import AddNewBookSearchResultConnector from './Book/AddNewBookSearchResultConnector';
@ -87,7 +87,7 @@ class AddNewItem extends Component {

    return (
      <PageContent title="Add New Item">
-        <PageContentBodyConnector>
+        <PageContentBody>
          <div className={styles.searchContainer}>
            <div className={styles.searchIconContainer}>
              <Icon
@ -182,7 +182,7 @@ class AddNewItem extends Component {
          }

          <div />
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Settings/DownloadClients/DownloadClientSettings.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClientSettings.js
@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component, Fragment } from 'react';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import { icons } from 'Helpers/Props';
@ -77,7 +77,7 @@ class DownloadClientSettings extends Component {
          onSavePress={this.onSavePress}
        />

-        <PageContentBodyConnector>
+        <PageContentBody>
          <DownloadClientsConnector />

          <DownloadClientOptionsConnector
@ -86,7 +86,7 @@ class DownloadClientSettings extends Component {
          />

          <RemotePathMappingsConnector />
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Settings/General/GeneralSettings.js
+++ b/frontend/src/Settings/General/GeneralSettings.js
@ -5,7 +5,7 @@ import Form from 'Components/Form/Form';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import { kinds } from 'Helpers/Props';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
 import AnalyticSettings from './AnalyticSettings';
@ -113,7 +113,7 @@ class GeneralSettings extends Component {
          {...otherProps}
        />

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isFetching && !isPopulated &&
              <LoadingIndicator />
@ -176,7 +176,7 @@ class GeneralSettings extends Component {
                />
              </Form>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>

        <ConfirmModal
          isOpen={this.state.isRestartRequiredModalOpen}
--- a/frontend/src/Settings/ImportLists/ImportListSettings.js
+++ b/frontend/src/Settings/ImportLists/ImportListSettings.js
@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component, Fragment } from 'react';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import { icons } from 'Helpers/Props';
@ -73,10 +73,10 @@ class ImportListSettings extends Component {
          onSavePress={this.onSavePress}
        />

-        <PageContentBodyConnector>
+        <PageContentBody>
          <ImportListsConnector />
          <ImportListsExclusionsConnector />
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Settings/Indexers/IndexerSettings.js
+++ b/frontend/src/Settings/Indexers/IndexerSettings.js
@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component, Fragment } from 'react';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import { icons } from 'Helpers/Props';
@ -76,14 +76,14 @@ class IndexerSettings extends Component {
          onSavePress={this.onSavePress}
        />

-        <PageContentBodyConnector>
+        <PageContentBody>
          <IndexersConnector />

          <IndexerOptionsConnector
            onChildMounted={this.onChildMounted}
            onChildStateChange={this.onChildStateChange}
          />
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Settings/MediaManagement/MediaManagement.js
+++ b/frontend/src/Settings/MediaManagement/MediaManagement.js
@ -7,7 +7,7 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import { inputTypes, sizes } from 'Helpers/Props';
 import RemotePathMappingsConnector from 'Settings/DownloadClients/RemotePathMappings/RemotePathMappingsConnector';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
@ -63,7 +63,7 @@ class MediaManagement extends Component {
          onSavePress={onSavePress}
        />

-        <PageContentBodyConnector>
+        <PageContentBody>
          <RootFoldersConnector />
          <RemotePathMappingsConnector />
          <NamingConnector />
@ -445,7 +445,7 @@ class MediaManagement extends Component {
                }
              </Form>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Settings/Metadata/MetadataSettings.js
+++ b/frontend/src/Settings/Metadata/MetadataSettings.js
@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
 import MetadatasConnector from './Metadata/MetadatasConnector';
 import MetadataProviderConnector from './MetadataProvider/MetadataProviderConnector';
@ -54,13 +54,13 @@ class MetadataSettings extends Component {
          onSavePress={this.onSavePress}
        />

-        <PageContentBodyConnector>
+        <PageContentBody>
          <MetadataProviderConnector
            onChildMounted={this.onChildMounted}
            onChildStateChange={this.onChildStateChange}
          />
          <MetadatasConnector />
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Settings/Notifications/NotificationSettings.js
+++ b/frontend/src/Settings/Notifications/NotificationSettings.js
@ -1,6 +1,6 @@
 import React from 'react';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
 import NotificationsConnector from './Notifications/NotificationsConnector';

@ -11,9 +11,9 @@ function NotificationSettings() {
        showSave={false}
      />

-      <PageContentBodyConnector>
+      <PageContentBody>
        <NotificationsConnector />
-      </PageContentBodyConnector>
+      </PageContentBody>
    </PageContent>
  );
 }
--- a/frontend/src/Settings/Profiles/Profiles.js
+++ b/frontend/src/Settings/Profiles/Profiles.js
@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
 import DelayProfilesConnector from './Delay/DelayProfilesConnector';
 import MetadataProfilesConnector from './Metadata/MetadataProfilesConnector';
@ -24,14 +24,14 @@ class Profiles extends Component {
          showSave={false}
        />

-        <PageContentBodyConnector>
+        <PageContentBody>
          <DndProvider backend={HTML5Backend}>
            <QualityProfilesConnector />
            <MetadataProfilesConnector />
            <DelayProfilesConnector />
            <ReleaseProfilesConnector />
          </DndProvider>
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Settings/Quality/Quality.js
+++ b/frontend/src/Settings/Quality/Quality.js
@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
 import QualityDefinitionsConnector from './Definition/QualityDefinitionsConnector';

@ -54,12 +54,12 @@ class Quality extends Component {
          onSavePress={this.onSavePress}
        />

-        <PageContentBodyConnector>
+        <PageContentBody>
          <QualityDefinitionsConnector
            onChildMounted={this.onChildMounted}
            onChildStateChange={this.onChildStateChange}
          />
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Settings/Settings.js
+++ b/frontend/src/Settings/Settings.js
@ -1,7 +1,7 @@
 import React from 'react';
 import Link from 'Components/Link/Link';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import SettingsToolbarConnector from './SettingsToolbarConnector';
 import styles from './Settings.css';

@ -12,7 +12,7 @@ function Settings() {
        hasPendingChanges={false}
      />

-      <PageContentBodyConnector>
+      <PageContentBody>
        <Link
          className={styles.link}
          to="/settings/mediamanagement"
@ -133,7 +133,7 @@ function Settings() {
        <div className={styles.summary}>
          Calendar, date and color impaired options
        </div>
-      </PageContentBodyConnector>
+      </PageContentBody>
    </PageContent>
  );
 }
--- a/frontend/src/Settings/Tags/TagSettings.js
+++ b/frontend/src/Settings/Tags/TagSettings.js
@ -1,6 +1,6 @@
 import React from 'react';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
 import TagsConnector from './TagsConnector';

@ -11,9 +11,9 @@ function TagSettings() {
        showSave={false}
      />

-      <PageContentBodyConnector>
+      <PageContentBody>
        <TagsConnector />
-      </PageContentBodyConnector>
+      </PageContentBody>
    </PageContent>
  );
 }
--- a/frontend/src/Settings/UI/UISettings.js
+++ b/frontend/src/Settings/UI/UISettings.js
@ -7,7 +7,7 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import { inputTypes } from 'Helpers/Props';
 import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';

@ -65,7 +65,7 @@ class UISettings extends Component {
          onSavePress={onSavePress}
        />

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isFetching &&
              <LoadingIndicator />
@ -176,7 +176,7 @@ class UISettings extends Component {
                </FieldSet>
              </Form>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/System/Backup/Backups.js
+++ b/frontend/src/System/Backup/Backups.js
@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -93,7 +93,7 @@ class Backups extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isFetching && !isPopulated &&
              <LoadingIndicator />
@ -141,7 +141,7 @@ class Backups extends Component {
                </TableBody>
              </Table>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>

        <RestoreBackupModalConnector
          isOpen={this.state.isRestoreModalOpen}
--- a/frontend/src/System/Events/LogsTable.js
+++ b/frontend/src/System/Events/LogsTable.js
@ -3,7 +3,7 @@ import React from 'react';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -73,7 +73,7 @@ function LogsTable(props) {
        </PageToolbarSection>
      </PageToolbar>

-      <PageContentBodyConnector>
+      <PageContentBody>
        {
          isFetching && !isPopulated &&
            <LoadingIndicator />
@ -116,7 +116,7 @@ function LogsTable(props) {
              />
            </div>
        }
-      </PageContentBodyConnector>
+      </PageContentBody>
    </PageContent>
  );
 }
--- a/frontend/src/System/Logs/Files/LogFiles.js
+++ b/frontend/src/System/Logs/Files/LogFiles.js
@ -4,7 +4,7 @@ import Alert from 'Components/Alert';
 import Link from 'Components/Link/Link';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -73,7 +73,7 @@ class LogFiles extends Component {
            />
          </PageToolbarSection>
        </PageToolbar>
-        <PageContentBodyConnector>
+        <PageContentBody>
          <Alert>
            <div>
              Log files are located in: {location}
@ -119,7 +119,7 @@ class LogFiles extends Component {
            !isFetching && !items.length &&
              <div>No log files</div>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/System/Status/Status.js
+++ b/frontend/src/System/Status/Status.js
@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import AboutConnector from './About/AboutConnector';
 import DiskSpaceConnector from './DiskSpace/DiskSpaceConnector';
 import HealthConnector from './Health/HealthConnector';
@ -14,12 +14,12 @@ class Status extends Component {
  render() {
    return (
      <PageContent title="Status">
-        <PageContentBodyConnector>
+        <PageContentBody>
          <HealthConnector />
          <DiskSpaceConnector />
          <AboutConnector />
          <MoreInfo />
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/System/Tasks/Tasks.js
+++ b/frontend/src/System/Tasks/Tasks.js
@ -1,16 +1,16 @@
 import React from 'react';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import QueuedTasksConnector from './Queued/QueuedTasksConnector';
 import ScheduledTasksConnector from './Scheduled/ScheduledTasksConnector';

 function Tasks() {
  return (
    <PageContent title="Tasks">
-      <PageContentBodyConnector>
+      <PageContentBody>
        <ScheduledTasksConnector />
        <QueuedTasksConnector />
-      </PageContentBodyConnector>
+      </PageContentBody>
    </PageContent>
  );
 }
--- a/frontend/src/System/Updates/Updates.js
+++ b/frontend/src/System/Updates/Updates.js
@ -7,7 +7,7 @@ import SpinnerButton from 'Components/Link/SpinnerButton';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import InlineMarkdown from 'Components/Markdown/InlineMarkdown';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import { icons, kinds } from 'Helpers/Props';
 import formatDate from 'Utilities/Date/formatDate';
 import UpdateChanges from './UpdateChanges';
@ -49,7 +49,7 @@ class Updates extends Component {

    return (
      <PageContent title="Updates">
-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            !isPopulated && !hasError &&
              <LoadingIndicator />
@ -198,7 +198,7 @@ class Updates extends Component {
                Failed to update settings
              </div>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/UnmappedFiles/UnmappedFilesTable.js
+++ b/frontend/src/UnmappedFiles/UnmappedFilesTable.js
@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -106,7 +106,7 @@ class UnmappedFilesTable extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector
+        <PageContentBody
          registerScroller={this.setScrollerRef}
        >
          {
@ -143,7 +143,7 @@ class UnmappedFilesTable extends Component {
                sortDirection={sortDirection}
              />
          }
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Wanted/CutoffUnmet/CutoffUnmet.js
+++ b/frontend/src/Wanted/CutoffUnmet/CutoffUnmet.js
@ -4,7 +4,7 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -181,7 +181,7 @@ class CutoffUnmet extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isAnyFetching && !isAllPopulated &&
              <LoadingIndicator />
@ -255,7 +255,7 @@ class CutoffUnmet extends Component {
                />
              </div>
          }
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }
--- a/frontend/src/Wanted/Missing/Missing.js
+++ b/frontend/src/Wanted/Missing/Missing.js
@ -4,7 +4,7 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import FilterMenu from 'Components/Menu/FilterMenu';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import PageContent from 'Components/Page/PageContent';
-import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
+import PageContentBody from 'Components/Page/PageContentBody';
 import PageToolbar from 'Components/Page/Toolbar/PageToolbar';
 import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
@ -198,7 +198,7 @@ class Missing extends Component {
          </PageToolbarSection>
        </PageToolbar>

-        <PageContentBodyConnector>
+        <PageContentBody>
          {
            isAnyFetching && !isAllPopulated &&
              <LoadingIndicator />
@ -278,7 +278,7 @@ class Missing extends Component {
            onModalClose={this.onInteractiveImportModalClose}
            showReplaceExistingFiles={true}
          />
-        </PageContentBodyConnector>
+        </PageContentBody>
      </PageContent>
    );
  }