Sfoglia il codice sorgente

create UserPagePathNav

itizawa 5 anni fa
parent
commit
31b73d5c60
1 ha cambiato i file con 23 aggiunte e 22 eliminazioni
  1. 23 22
      src/client/js/components/Navbar/GrowiSubNavigation.jsx

+ 23 - 22
src/client/js/components/Navbar/GrowiSubNavigation.jsx

@@ -25,27 +25,8 @@ import DrawerToggler from './DrawerToggler';
 import UserPicture from '../User/UserPicture';
 
 
-const PagePathNav = ({
-  // eslint-disable-next-line react/prop-types
-  pageId, pagePath, isPageForbidden, isUserPage,
-}) => {
-
-  if (isUserPage) {
-    const linkedPagePath = new LinkedPagePath(pagePath);
-    const latterLink = <PagePathHierarchicalLink linkedPagePath={linkedPagePath} />;
-
-    return (
-      <div className="grw-page-path-nav">
-        <span className="d-flex align-items-center flex-wrap">
-          <h4 className="grw-user-page-path">{latterLink}</h4>
-          <RevisionPathControls
-            pageId={pageId}
-            pagePath={pagePath}
-          />
-        </span>
-      </div>
-    );
-  }
+// eslint-disable-next-line react/prop-types
+const PagePathNav = ({ pageId, pagePath, isPageForbidden }) => {
 
   const dPagePath = new DevidedPagePath(pagePath, false, true);
 
@@ -80,6 +61,24 @@ const PagePathNav = ({
   );
 };
 
+// eslint-disable-next-line react/prop-types
+const UserPagePathNav = ({ pageId, pagePath }) => {
+  const linkedPagePath = new LinkedPagePath(pagePath);
+  const latterLink = <PagePathHierarchicalLink linkedPagePath={linkedPagePath} />;
+
+  return (
+    <div className="grw-page-path-nav">
+      <span className="d-flex align-items-center flex-wrap">
+        <h4 className="grw-user-page-path">{latterLink}</h4>
+        <RevisionPathControls
+          pageId={pageId}
+          pagePath={pagePath}
+        />
+      </span>
+    </div>
+  );
+};
+
 /* eslint-disable react/prop-types */
 const UserInfo = ({ pageUser }) => {
   return (
@@ -165,7 +164,9 @@ const GrowiSubNavigation = (props) => {
               <TagLabels />
             </div>
           ) }
-          <PagePathNav pageId={pageId} pagePath={path} isPageForbidden={isPageForbidden} isUserPage={isUserPage} />
+
+          {isUserPage ? <PagePathNav pageId={pageId} pagePath={path} isPageForbidden={isPageForbidden} />
+          : <UserPagePathNav pageId={pageId} pagePath={path} />}
 
           {isUserPage && <UserInfo pageUser={pageUser} />}