Sfoglia il codice sorgente

add hideSubControls props

Yuki Takei 2 anni fa
parent
commit
f913a1df3a
1 ha cambiato i file con 16 aggiunte e 26 eliminazioni
  1. 16 26
      apps/app/src/components/PageControls/PageControls.tsx

+ 16 - 26
apps/app/src/components/PageControls/PageControls.tsx

@@ -99,7 +99,13 @@ const WideViewMenuItem = (props: WideViewMenuItemProps): JSX.Element => {
 
 
 
 
 type CommonProps = {
 type CommonProps = {
+  pageId: string,
+  shareLinkId?: string | null,
+  revisionId?: string | null,
+  path?: string | null,
+  expandContentWidth?: boolean,
   disableSeenUserInfoPopover?: boolean,
   disableSeenUserInfoPopover?: boolean,
+  hideSubControls?: boolean,
   showPageControlDropdown?: boolean,
   showPageControlDropdown?: boolean,
   forceHideMenuItems?: ForceHideMenuItems,
   forceHideMenuItems?: ForceHideMenuItems,
   additionalMenuItemRenderer?: React.FunctionComponent<AdditionalMenuItemsRendererProps>,
   additionalMenuItemRenderer?: React.FunctionComponent<AdditionalMenuItemsRendererProps>,
@@ -110,12 +116,7 @@ type CommonProps = {
 }
 }
 
 
 type PageControlsSubstanceProps = CommonProps & {
 type PageControlsSubstanceProps = CommonProps & {
-  pageId: string,
-  shareLinkId?: string | null,
-  revisionId?: string | null,
-  path?: string | null,
   pageInfo: IPageInfoForOperation,
   pageInfo: IPageInfoForOperation,
-  expandContentWidth?: boolean,
   onClickEditTagsButton: () => void,
   onClickEditTagsButton: () => void,
 }
 }
 
 
@@ -123,7 +124,7 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element =
   const {
   const {
     pageInfo,
     pageInfo,
     pageId, revisionId, path, shareLinkId, expandContentWidth,
     pageId, revisionId, path, shareLinkId, expandContentWidth,
-    disableSeenUserInfoPopover, showPageControlDropdown, forceHideMenuItems, additionalMenuItemRenderer,
+    disableSeenUserInfoPopover, hideSubControls, showPageControlDropdown, forceHideMenuItems, additionalMenuItemRenderer,
     onClickEditTagsButton, onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem, onClickSwitchContentWidth,
     onClickEditTagsButton, onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem, onClickSwitchContentWidth,
   } = props;
   } = props;
 
 
@@ -280,13 +281,14 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element =
           onClickEditTagsButton={onClickEditTagsButton}
           onClickEditTagsButton={onClickEditTagsButton}
         />
         />
       )}
       )}
-      {revisionId != null && _isIPageInfoForOperation && (
+
+      {revisionId != null && _isIPageInfoForOperation && !hideSubControls && (
         <SubscribeButton
         <SubscribeButton
           status={pageInfo.subscriptionStatus}
           status={pageInfo.subscriptionStatus}
           onClick={subscribeClickhandler}
           onClick={subscribeClickhandler}
         />
         />
       )}
       )}
-      {revisionId != null && _isIPageInfoForOperation && (
+      {revisionId != null && _isIPageInfoForOperation && !hideSubControls && (
         <LikeButtons
         <LikeButtons
           onLikeClicked={likeClickhandler}
           onLikeClicked={likeClickhandler}
           sumOfLikers={sumOfLikers}
           sumOfLikers={sumOfLikers}
@@ -294,14 +296,14 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element =
           likers={likers}
           likers={likers}
         />
         />
       )}
       )}
-      {revisionId != null && _isIPageInfoForOperation && (
+      {revisionId != null && _isIPageInfoForOperation && !hideSubControls && (
         <BookmarkButtons
         <BookmarkButtons
           pageId={pageId}
           pageId={pageId}
           isBookmarked={pageInfo.isBookmarked}
           isBookmarked={pageInfo.isBookmarked}
           bookmarkCount={pageInfo.bookmarkCount}
           bookmarkCount={pageInfo.bookmarkCount}
         />
         />
       )}
       )}
-      {revisionId != null && (
+      {revisionId != null && !hideSubControls && (
         <SeenUserInfo
         <SeenUserInfo
           seenUsers={seenUsers}
           seenUsers={seenUsers}
           sumOfSeenUsers={sumOfSeenUsers}
           sumOfSeenUsers={sumOfSeenUsers}
@@ -326,18 +328,12 @@ const PageControlsSubstance = (props: PageControlsSubstanceProps): JSX.Element =
   );
   );
 };
 };
 
 
-type PageControlsProps = CommonProps & {
-  pageId: string,
-  shareLinkId?: string | null,
-  revisionId?: string | null,
-  path?: string | null,
-  expandContentWidth?: boolean,
-};
+type PageControlsProps = CommonProps;
 
 
 export const PageControls = memo((props: PageControlsProps): JSX.Element => {
 export const PageControls = memo((props: PageControlsProps): JSX.Element => {
   const {
   const {
-    pageId, revisionId, path, shareLinkId, expandContentWidth,
-    onClickDuplicateMenuItem, onClickRenameMenuItem, onClickDeleteMenuItem, onClickSwitchContentWidth,
+    pageId, revisionId, shareLinkId,
+    ...rest
   } = props;
   } = props;
 
 
   const { data: pageInfo, error } = useSWRxPageInfo(pageId ?? null, shareLinkId);
   const { data: pageInfo, error } = useSWRxPageInfo(pageId ?? null, shareLinkId);
@@ -361,17 +357,11 @@ export const PageControls = memo((props: PageControlsProps): JSX.Element => {
 
 
   return (
   return (
     <PageControlsSubstance
     <PageControlsSubstance
-      {...props}
       pageInfo={pageInfo}
       pageInfo={pageInfo}
       pageId={pageId}
       pageId={pageId}
       revisionId={revisionId}
       revisionId={revisionId}
-      path={path}
       onClickEditTagsButton={onClickEditTagsButton}
       onClickEditTagsButton={onClickEditTagsButton}
-      onClickDuplicateMenuItem={onClickDuplicateMenuItem}
-      onClickRenameMenuItem={onClickRenameMenuItem}
-      onClickDeleteMenuItem={onClickDeleteMenuItem}
-      onClickSwitchContentWidth={onClickSwitchContentWidth}
-      expandContentWidth={expandContentWidth}
+      {...rest}
     />
     />
   );
   );
 });
 });