Skip to content

Commit

Permalink
SUPPORT-1257: Added pagination button to drag-and-drop-table
Browse files Browse the repository at this point in the history
  • Loading branch information
tuj committed Oct 9, 2023
1 parent 09bcae1 commit 0f5b7c1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

- Fixed missing pagination button in drag-and-drop-table.

## [1.4.0] - 2023-09-14

- [#210](https://github.com/os2display/display-admin-client/pull/210)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import ColumnProptypes from "../../proptypes/column-proptypes";
import PaginationButton from "../forms/multiselect-dropdown/pagination-button";
import "./drag-and-drop-table.scss";

// Drag and drop component (react-beautiful-dnd) is replaced with hello-pangea/dnd,
// because the drag and drop component does not work with react 18
// https://github.com/atlassian/react-beautiful-dnd/issues/2350
// If it some day works with react, we should consider changing it back
/**
* @param {object} props The props.
* @param {Array} props.columns The columns for the table.
Expand Down Expand Up @@ -126,7 +122,7 @@ function DragAndDropTable({
{data.map((item, index) => (
<Draggable
key={item["@id"]}
draggableId={item.title}
draggableId={item["@id"]}
index={index}
>
{(providedDraggable, providedSnapshot) => (
Expand Down Expand Up @@ -164,7 +160,7 @@ function DragAndDropTable({
<Row>
<Col>
{totalItems > data.length && (
<PaginationButton label={label} callback={callback} />
<PaginationButton label={label} callback={callback} showButton />
)}
</Col>
</Row>
Expand All @@ -184,4 +180,5 @@ DragAndDropTable.propTypes = {
callback: PropTypes.func.isRequired,
totalItems: PropTypes.number.isRequired,
};

export default DragAndDropTable;

0 comments on commit 0f5b7c1

Please sign in to comment.