Просмотр исходного кода

125587 apply style only to Bookmark

soumaeda 2 лет назад
Родитель
Сommit
c8973c4e80

+ 1 - 1
apps/app/src/components/Bookmarks/BookmarkItem.tsx

@@ -136,7 +136,7 @@ export const BookmarkItem = (props: Props): JSX.Element => {
             onPressEnter={pressEnterForRenameHandler}
             validationTarget={ValidationTarget.PAGE}
           />
-        ) : <PageListItemS page={bookmarkedPage} pageTitle={pageTitle}/>}
+        ) : <PageListItemS page={bookmarkedPage} pageTitle={pageTitle} isBookmarkItem={true}/>}
 
         <div className='grw-foldertree-control'>
           <PageItemControl

+ 23 - 10
apps/app/src/components/PageList/PageListItemS.tsx

@@ -8,34 +8,47 @@ import { IPageHasId } from '~/interfaces/page';
 
 import styles from './PageList.module.scss';
 
-
 type PageListItemSProps = {
   page: IPageHasId,
   noLink?: boolean,
   pageTitle?: string
+  isBookmarkItem?: boolean,
 }
 
 export const PageListItemS = (props: PageListItemSProps): JSX.Element => {
 
-  const { page, noLink = false, pageTitle } = props;
+  const {
+    page,
+    noLink = false,
+    pageTitle,
+    isBookmarkItem = false,
+  } = props;
 
   const path = pageTitle != null ? pageTitle : page.path;
+  const additionalClassNames: string[] = [];
+
+  additionalClassNames.push(isBookmarkItem ? 'mx-0' : 'mx-2');
+
+  let pagePathElement = <PagePathLabel path={path} additionalClassNames={additionalClassNames}/>;
 
-  let pagePathElement = <PagePathLabel path={path} additionalClassNames={['mx-0']} />;
   if (!noLink) {
     pagePathElement = <a className="text-break" href={page.path}>{pagePathElement}</a>;
   }
 
-  return (
-    <>
-      <UserPicture user={page.lastUpdateUser} noLink={noLink} />
+  if (isBookmarkItem) {
+    pagePathElement = (
       <div className={`${styles['page-list']}`}>
-        <div
-          className="mx-2 path-element"
-        >
-          {pagePathElement}
+        <div className="mx-2 path-element">
+          <a className="text-break" href={page.path}>{pagePathElement}</a>
         </div>
       </div>
+    );
+  }
+
+  return (
+    <>
+      <UserPicture user={page.lastUpdateUser} noLink={noLink} />
+      {pagePathElement}
       <span className="ml-2">
         <PageListMeta page={page} />
       </span>

+ 1 - 0
packages/ui/src/styles/molecules/_page_list.scss

@@ -98,4 +98,5 @@
     overflow: hidden;
     line-height: 1.2;
   }
+
 }