diff --git a/packages/client/src/components/Section/index.tsx b/packages/client/src/components/Section/index.tsx index 1a38085f2b..ad73d7affa 100644 --- a/packages/client/src/components/Section/index.tsx +++ b/packages/client/src/components/Section/index.tsx @@ -41,10 +41,12 @@ export default inject( settingsStore, dialogsStore, infoPanelStore, + indexingStore, }: { settingsStore: any; dialogsStore: any; infoPanelStore: any; + indexingStore: any; }) => { const { isDesktopClient: isDesktop, @@ -59,6 +61,8 @@ export default inject( const { isVisible, isMobileHidden, setIsVisible, getCanDisplay } = infoPanelStore; + const { isIndexEditingMode } = indexingStore; + const { createRoomDialogVisible, invitePanelOptions } = dialogsStore; const canDisplay = getCanDisplay(); @@ -71,7 +75,7 @@ export default inject( return { isDesktop, currentDeviceType, - isInfoPanelVisible: isVisible, + isInfoPanelVisible: isVisible && !isIndexEditingMode, isMobileHidden, setIsInfoPanelVisible: setIsVisible, canDisplay, diff --git a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js index 30db62c21c..8474181a28 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js @@ -80,6 +80,14 @@ const StyledTableRow = styled(TableRow)` border-right: 0; //for Safari } + ${(props) => + props.isIndexEditingMode && + css` + .table-container_element { + display: flex !important; + } + `} + .table-container_cell:not(.table-container_element-wrapper) { height: auto; max-height: 48; diff --git a/packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js b/packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js index 3b138f9f01..14e28f9bc0 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js @@ -136,6 +136,7 @@ const Table = ({ filterTotal, isRooms, isTrashFolder, + isIndexEditingMode, withPaging, columnStorageName, columnInfoPanelStorageName, @@ -203,6 +204,7 @@ const Table = ({ item={item} itemIndex={index} index={index} + isIndexEditingMode={isIndexEditingMode} setFirsElemChecked={setFirsElemChecked} setHeaderBorder={setHeaderBorder} theme={theme} @@ -226,6 +228,7 @@ const Table = ({ highlightFile.id, highlightFile.isExst, isTrashFolder, + isIndexEditingMode, ]); return ( @@ -266,6 +269,8 @@ export default inject( tableStore, userStore, settingsStore, + + indexingStore, }) => { const { isVisible: infoPanelVisible } = infoPanelStore; @@ -287,6 +292,8 @@ export default inject( highlightFile, } = filesStore; + const { isIndexEditingMode } = indexingStore; + const { withPaging, theme, currentDeviceType } = settingsStore; return { @@ -303,6 +310,7 @@ export default inject( filterTotal: isRooms ? roomsFilterTotal : filterTotal, isRooms, isTrashFolder, + isIndexEditingMode, withPaging, columnStorageName, columnInfoPanelStorageName, diff --git a/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js b/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js index 0b00b54524..a838807bcd 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js @@ -65,6 +65,7 @@ const FilesTableRow = (props) => { id, isRooms, isTrashFolder, + isIndexEditingMode, isHighlight, hideColumns, onDragOver, @@ -140,6 +141,13 @@ const FilesTableRow = (props) => { ? `${item.id}_${item.fileExst}` : item.id ?? ""; + const contextOptionProps = isIndexEditingMode + ? {} + : { + contextOptions: item.contextOptions, + getContextModel, + }; + return ( { selectionProp={selectionProp} key={item.id} fileContextClick={fileContextClick} - onClick={onMouseClick} + onClick={isIndexEditingMode ? () => {} : onMouseClick} isActive={isActive} + isIndexEditingMode={isIndexEditingMode} inProgress={inProgress} isFolder={item.isFolder} onHideContextMenu={onHideContextMenu} isThirdPartyFolder={item.isThirdPartyFolder} onDoubleClick={onDoubleClick} checked={checkedProps} - contextOptions={item.contextOptions} - getContextModel={getContextModel} showHotkeyBorder={showHotkeyBorder} title={ item.isFolder @@ -184,6 +191,7 @@ const FilesTableRow = (props) => { hideColumns={hideColumns} badgeUrl={badgeUrl} canDrag={canDrag} + {...contextOptionProps} > {isRooms ? ( { const { title, viewAccessibility } = item; @@ -65,12 +66,14 @@ const FileNameCell = ({ >
{element}
- + {!isIndexEditingMode && ( + + )}
)}