rename component and id

src/client/js/app.jsx

@@ -28,7 +28,7 @@ import BookmarkList from './components/PageList/BookmarkList';
 import SeenUserList from './components/User/SeenUserList';
 import LikerList from './components/User/LikerList';
 import TableOfContents from './components/TableOfContents';
-import TopOfTableContents from './components/TopOfTableContents';
+import PageAccessoriesModalControl from './components/PageAccessoriesModalControl';
 import UserInfo from './components/User/UserInfo';
 import Fab from './components/Fab';
 
@@ -105,7 +105,7 @@ if (pageContainer.state.pageId != null) {
     'page-comments-list': <PageComments />,
     'page-comment-write': <CommentEditorLazyRenderer />,
     'page-management': <PageManagement />,
-    'page-accessories': <TopOfTableContents isGuestUserMode={appContainer.currentUser == null} />,
+    'page-accessories': <PageAccessoriesModalControl isGuestUserMode={appContainer.currentUser == null} />,
     'revision-toc': <TableOfContents />,
     'seen-user-list': <SeenUserList />,
     'liker-list': <LikerList />,

src/client/js/components/TopOfTableContents.jsx → src/client/js/components/PageAccessoriesModalControl.jsx

@@ -16,7 +16,7 @@ import PageAccessoriesModal from './PageAccessoriesModal';
 
 import { withUnstatedContainers } from './UnstatedUtils';
 
-const TopOfTableContents = (props) => {
+const PageAccessoriesModalControl = (props) => {
   const { t, pageAccessoriesContainer, isGuestUserMode } = props;
 
   function renderModal() {
@@ -93,9 +93,9 @@ const TopOfTableContents = (props) => {
 /**
  * Wrapper component for using unstated
  */
-const TopOfTableContentsWrapper = withUnstatedContainers(TopOfTableContents, [PageAccessoriesContainer]);
+const PageAccessoriesModalControlWrapper = withUnstatedContainers(PageAccessoriesModalControl, [PageAccessoriesContainer]);
 
-TopOfTableContents.propTypes = {
+PageAccessoriesModalControl.propTypes = {
   t: PropTypes.func.isRequired, //  i18next
 
   pageAccessoriesContainer: PropTypes.instanceOf(PageAccessoriesContainer).isRequired,
@@ -103,4 +103,4 @@ TopOfTableContents.propTypes = {
   isGuestUserMode: PropTypes.bool.isRequired,
 };
 
-export default withTranslation()(TopOfTableContentsWrapper);
+export default withTranslation()(PageAccessoriesModalControlWrapper);

src/client/js/components/TableOfContents.jsx

@@ -8,7 +8,7 @@ import PageContainer from '../services/PageContainer';
 import NavigationContainer from '../services/NavigationContainer';
 
 import { withUnstatedContainers } from './UnstatedUtils';
-import TopOfTableContents from './TopOfTableContents';
+
 import StickyStretchableScroller from './StickyStretchableScroller';
 
 import RecentlyCreatedIcon from './Icons/RecentlyCreatedIcon';

src/client/styles/scss/_on-edit.scss

@@ -72,7 +72,7 @@ body.on-edit {
   }
 
   // hide unnecessary elements for growi layout
-  .revision-toc-container {
+  .side-contents-container {
     display: none !important;
   }
 

src/server/views/widget/page_content.html

@@ -54,10 +54,8 @@
   <div id="page-editor-navbar-bottom-container" class="d-none d-edit-block"></div>
 </div>
 
-<div class="d-none d-lg-block page-accessories-container ml-4">
+<div class="d-none d-lg-block side-contents-container ml-4">
   <div id="page-accessories" class="page-accessories"></div>
-</div>
-<div class="d-none d-lg-block revision-toc-container ml-4">
   <div id="revision-toc" class="revision-toc sps sps--abv" data-sps-offset="123">
     <div id="revision-toc-content" class="revision-toc-content"></div>
   </div>