diff --git a/app/client/src/components/designSystems/appsmith/Table.tsx b/app/client/src/components/designSystems/appsmith/Table.tsx index 903524a218..571c7fe530 100644 --- a/app/client/src/components/designSystems/appsmith/Table.tsx +++ b/app/client/src/components/designSystems/appsmith/Table.tsx @@ -111,6 +111,7 @@ export const Table = (props: TableProps) => { id={`table${props.widgetId}`} > void; serverSidePaginationEnabled: boolean; displayColumnActions: boolean; + width: number; } const TableHeader = (props: TableHeaderProps) => { return ( - + { )} {!props.serverSidePaginationEnabled && ( - {/**/} - {/* Showing {props.currentPageIndex + 1}-{props.pageCount} items*/} - {/**/} + + Showing {props.currentPageIndex + 1}-{props.pageCount} items + { diff --git a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx index d55cec0064..0c611eef5d 100644 --- a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx +++ b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx @@ -258,12 +258,19 @@ export const CellWrapper = styled.div<{ isHidden: boolean }>` } `; -export const TableHeaderWrapper = styled.div` +export const TableHeaderWrapper = styled.div<{ + serverSidePaginationEnabled: boolean; + width: number; +}>` display: flex; align-items: center; width: 100%; border-bottom: 1px solid ${Colors.GEYSER_LIGHT}; - overflow-y: scroll; + min-width: ${props => + props.serverSidePaginationEnabled ? 450 : props.width < 700 ? 525 : 700}px; + .show-page-items { + display: ${props => (props.width < 700 ? "none" : "flex")}; + } `; export const CommonFunctionsMenuWrapper = styled.div`