Yuki Takei 2 лет назад
Родитель
Сommit
ef9cfaa246
1 измененных файлов с 23 добавлено и 9 удалено
  1. 23 9
      apps/app/src/components/Common/PagePathNav/PagePathNav.tsx

+ 23 - 9
apps/app/src/components/Common/PagePathNav/PagePathNav.tsx

@@ -21,13 +21,20 @@ type Props = {
   pageId?: string | null,
   pageId?: string | null,
   isSingleLineMode?: boolean,
   isSingleLineMode?: boolean,
   isCollapseParents?: boolean,
   isCollapseParents?: boolean,
+  formerLinkClassName?: string,
+  latterLinkClassName?: string,
 }
 }
 
 
 const CopyDropdown = dynamic(() => import('../CopyDropdown').then(mod => mod.CopyDropdown), { ssr: false });
 const CopyDropdown = dynamic(() => import('../CopyDropdown').then(mod => mod.CopyDropdown), { ssr: false });
 
 
+const Separator = (): JSX.Element => {
+  return <span className={styles['grw-mr-02em']}>/</span>;
+};
+
 export const PagePathNav: FC<Props> = (props: Props) => {
 export const PagePathNav: FC<Props> = (props: Props) => {
   const {
   const {
     pageId, pagePath, isSingleLineMode, isCollapseParents,
     pageId, pagePath, isSingleLineMode, isCollapseParents,
+    formerLinkClassName, latterLinkClassName,
   } = props;
   } = props;
   const dPagePath = new DevidedPagePath(pagePath, false, true);
   const dPagePath = new DevidedPagePath(pagePath, false, true);
 
 
@@ -36,7 +43,6 @@ export const PagePathNav: FC<Props> = (props: Props) => {
   const isInTrash = isTrashPage(pagePath);
   const isInTrash = isTrashPage(pagePath);
 
 
   let formerLink;
   let formerLink;
-  let collapsedParent;
   let latterLink;
   let latterLink;
 
 
   // one line
   // one line
@@ -48,15 +54,25 @@ export const PagePathNav: FC<Props> = (props: Props) => {
   else if (isCollapseParents) {
   else if (isCollapseParents) {
     const linkedPagePathFormer = new LinkedPagePath(dPagePath.former);
     const linkedPagePathFormer = new LinkedPagePath(dPagePath.former);
     const linkedPagePathLatter = new LinkedPagePath(dPagePath.latter);
     const linkedPagePathLatter = new LinkedPagePath(dPagePath.latter);
-    collapsedParent = <CollapsedParentsDropdown linkedPagePath={linkedPagePathFormer} />;
-    latterLink = <PagePathHierarchicalLink linkedPagePath={linkedPagePathLatter} basePath={dPagePath.former} isInTrash={isInTrash} />;
+    latterLink = (
+      <>
+        <CollapsedParentsDropdown linkedPagePath={linkedPagePathFormer} />
+        <Separator />
+        <PagePathHierarchicalLink linkedPagePath={linkedPagePathLatter} basePath={dPagePath.former} isInTrash={isInTrash} />
+      </>
+    );
   }
   }
   // two line
   // two line
   else {
   else {
     const linkedPagePathFormer = new LinkedPagePath(dPagePath.former);
     const linkedPagePathFormer = new LinkedPagePath(dPagePath.former);
     const linkedPagePathLatter = new LinkedPagePath(dPagePath.latter);
     const linkedPagePathLatter = new LinkedPagePath(dPagePath.latter);
     formerLink = <PagePathHierarchicalLink linkedPagePath={linkedPagePathFormer} isInTrash={isInTrash} />;
     formerLink = <PagePathHierarchicalLink linkedPagePath={linkedPagePathFormer} isInTrash={isInTrash} />;
-    latterLink = <PagePathHierarchicalLink linkedPagePath={linkedPagePathLatter} basePath={dPagePath.former} isInTrash={isInTrash} />;
+    latterLink = (
+      <>
+        <Separator />
+        <PagePathHierarchicalLink linkedPagePath={linkedPagePathLatter} basePath={dPagePath.former} isInTrash={isInTrash} />
+      </>
+    );
   }
   }
 
 
   const copyDropdownId = `copydropdown-${pageId}`;
   const copyDropdownId = `copydropdown-${pageId}`;
@@ -64,11 +80,9 @@ export const PagePathNav: FC<Props> = (props: Props) => {
 
 
   return (
   return (
     <div>
     <div>
-      {formerLink}
+      <span className={formerLinkClassName}>{formerLink}</span>
       <div className="d-flex align-items-center">
       <div className="d-flex align-items-center">
-        <h1 className="m-0 fs-2 text-truncate">
-          {collapsedParent}
-          <span className={styles['grw-mr-02em']}>/</span>
+        <h1 className={`m-0 text-truncate ${latterLinkClassName}`}>
           {latterLink}
           {latterLink}
         </h1>
         </h1>
         { pageId != null && !isNotFound && (
         { pageId != null && !isNotFound && (
@@ -98,7 +112,7 @@ export const PagePathNavSticky = (props: PagePathNavStickyProps): JSX.Element =>
           //  2. enable pointer-events with 'pe-auto' only against the children
           //  2. enable pointer-events with 'pe-auto' only against the children
           //      which width is minimized by 'd-inline-block'
           //      which width is minimized by 'd-inline-block'
           <div className="d-inline-block pe-auto">
           <div className="d-inline-block pe-auto">
-            <PagePathNav {...props} isCollapseParents={isCollapseParents} />
+            <PagePathNav {...props} isCollapseParents={isCollapseParents} latterLinkClassName={isCollapseParents ? 'fs-3' : 'fs-2'} />
           </div>
           </div>
         );
         );
       }}
       }}