From afd8251e27e64527b1053f42709669a7daee4996 Mon Sep 17 00:00:00 2001 From: DmitrySychugov Date: Wed, 5 Jun 2024 13:19:52 +0500 Subject: [PATCH] Revert "Client: fixed row view for indexing" This reverts commit b7517458dfe38556df385d7d28694d868c89368a. # Conflicts: # packages/client/src/pages/Home/Section/Header/index.js --- .../src/pages/Home/Section/Header/index.js | 6 +----- .../Section/IndexHeader/StyledIndexHeader.js | 2 -- packages/shared/components/row/Row.tsx | 20 +++++++++++++++++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/packages/client/src/pages/Home/Section/Header/index.js b/packages/client/src/pages/Home/Section/Header/index.js index bcbeaa3e0d..43ff5c7aac 100644 --- a/packages/client/src/pages/Home/Section/Header/index.js +++ b/packages/client/src/pages/Home/Section/Header/index.js @@ -59,7 +59,6 @@ import FilesFilter from "@docspace/shared/api/files/filter"; import { DropDownItem } from "@docspace/shared/components/drop-down-item"; import { tablet, mobile, Consumer, getLogoUrl } from "@docspace/shared/utils"; -import { isMobile } from "react-device-detect"; import { toastr } from "@docspace/shared/components/toast"; import { TableGroupMenu } from "@docspace/shared/components/table"; @@ -952,12 +951,9 @@ const SectionHeaderContent = (props) => { {(context) => ( - {isMobile && isIndexEditingMode && ( - - )} {tableGroupMenuVisible ? ( - ) : isIndexEditingMode && !isMobile ? ( + ) : isIndexEditingMode ? ( ) : (
diff --git a/packages/client/src/pages/Home/Section/IndexHeader/StyledIndexHeader.js b/packages/client/src/pages/Home/Section/IndexHeader/StyledIndexHeader.js index 14467b9ed8..14046de658 100644 --- a/packages/client/src/pages/Home/Section/IndexHeader/StyledIndexHeader.js +++ b/packages/client/src/pages/Home/Section/IndexHeader/StyledIndexHeader.js @@ -57,8 +57,6 @@ const StyledTableIndexMenu = styled.div` height: 60px; } @media ${mobile} { - top: 0px; - position: fixed; height: 48px; padding: 0px 18px; } diff --git a/packages/shared/components/row/Row.tsx b/packages/shared/components/row/Row.tsx index 294809ec02..81018b2f7b 100644 --- a/packages/shared/components/row/Row.tsx +++ b/packages/shared/components/row/Row.tsx @@ -216,9 +216,25 @@ const Row = (props: RowProps) => { {renderContentElement && ( {contentElement} )} - {!isIndexEditingMode && ( + {isIndexEditingMode ? ( + <> + + + + ) : ( <> - {" "} {renderContext ? (