Skip to content
This repository has been archived by the owner on Jun 5, 2023. It is now read-only.

Commit

Permalink
fix(Table): Change sort.property to sort.column
Browse files Browse the repository at this point in the history
  • Loading branch information
diondiondion committed Feb 7, 2020
1 parent 4d129ef commit b702af4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/Table/ClickableHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function ClickableHeader({
// be ordered by changes. Otherwise use the
// column's `defaultOrder` prop
onRequestSort({
property: name,
column: name,
order: isActive ? reverseOrder[order] : defaultOrder,
});
};
Expand Down
4 changes: 2 additions & 2 deletions src/Table/README.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ You can also define your columns as an array of objects, if you prefer:
<Playground>
<div style={{border: '1px solid grey', borderRadius: 10}}>
<DemoTableState data={dummyData.slice(4, 8)}>
{({data, sort: {property, order}, handleSort}) => (
{({data, sort: {column, order}, handleSort}) => (
<Table
shadedHeader
data={data}
itemKey="name"
rowHeader="Name"
sort={{
property,
column,
order,
}}
onRequestSort={handleSort}
Expand Down
8 changes: 4 additions & 4 deletions src/Table/demo/DemoTableState.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ function sortBy(property, order = 'asc') {

function DemoTableState({data, children}) {
const [order, setOrder] = useState('asc');
const [orderProp, setOrderProp] = useState('Name');
const [sortedColumn, setSortedColumn] = useState('Name');

function handleSort(newOrder) {
setOrder(newOrder.order);
setOrderProp(newOrder.property);
setSortedColumn(newOrder.column);
}

const orderedData = data.sort(sortBy(orderProp, order));
const orderedData = data.sort(sortBy(sortedColumn, order));

return children({
data: orderedData,
sort: {
order,
property: orderProp,
column: sortedColumn,
},
handleSort,
});
Expand Down
8 changes: 4 additions & 4 deletions src/Table/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ function Table(props) {
} = column;

const isColumnOrderedBy =
sort && name === sort.property;
sort && name === sort.column;

return (
<Cell
Expand Down Expand Up @@ -420,12 +420,12 @@ Table.propTypes = {
onRequestSort: PropTypes.func,
/**
* Object describing the order of the table's data.
* 'by': Name of the column to be sorted by
* 'dir': Direction of sorting, either 'asc' (ascending)
* 'column': Name of the column to be sorted by
* 'order': Direction of sorting, either 'asc' (ascending)
* or 'desc' (descending)
*/
sort: PropTypes.shape({
property: PropTypes.string.isRequired,
column: PropTypes.string.isRequired,
order: PropTypes.oneOf(['asc', 'desc']),
}),
/**
Expand Down

0 comments on commit b702af4

Please sign in to comment.