Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request woocommerce/woocommerce-admin#2139 from woocommerce/add/table-default-order 

add defaultOrder field to tablecard header
This commit is contained in:
Ron Rennick 2019-05-08 08:41:48 -03:00 committed by GitHub
parent ed1d7c5f62 8744a8d6c9
commit d4f1e6bbd8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/woocommerce-admin/packages/components/CHANGELOG.md
View File

@ -1,6 +1,7 @@
# 3.0.0 (unreleased) # 3.0.0 (unreleased)
- <DateInput> and <DatePicker> got a `disabled` prop. - <DateInput> and <DatePicker> got a `disabled` prop.
- TableCard component: new `onPageChange` prop. - TableCard component: new `onPageChange` prop.
- TableCard now has a `defaultOrder` parameter to specify default sort column sort order.
- Pagination no longer considers `0` a valid input and triggers `onPageChange` on the input blur event. - Pagination no longer considers `0` a valid input and triggers `onPageChange` on the input blur event.
- Tweaks to SummaryListPlaceholder height in order to better match SummaryNumber. - Tweaks to SummaryListPlaceholder height in order to better match SummaryNumber.
- EllipsisMenu component (breaking change): Remove `children` prop in favor of a render prop `renderContent` so that function arguments `isOpen`, `onToggle`, and `onClose` can be passed down. - EllipsisMenu component (breaking change): Remove `children` prop in favor of a render prop `renderContent` so that function arguments `isOpen`, `onToggle`, and `onClose` can be passed down.

8
plugins/woocommerce-admin/packages/components/src/table/table.js
View File

@ -83,7 +83,7 @@ class Table extends Component {
return () => { return () => {
const currentKey = const currentKey =
query.orderby || get( find( headers, { defaultSort: true } ), 'key', false ); query.orderby || get( find( headers, { defaultSort: true } ), 'key', false );
const currentDir = query.order || DESC; const currentDir = query.order || get( find( headers, { key: currentKey } ), 'defaultOrder', DESC );
let dir = DESC; let dir = DESC;
if ( key === currentKey ) { if ( key === currentKey ) {
dir = DESC === currentDir ? ASC : DESC; dir = DESC === currentDir ? ASC : DESC;
@ -116,7 +116,7 @@ class Table extends Component {
'is-scrollable': isScrollable, 'is-scrollable': isScrollable,
} ); } );
const sortedBy = query.orderby || get( find( headers, { defaultSort: true } ), 'key', false ); const sortedBy = query.orderby || get( find( headers, { defaultSort: true } ), 'key', false );
const sortDir = query.order || DESC; const sortDir = query.order || get( find( headers, { key: sortedBy } ), 'defaultOrder', DESC );
return ( return (
<div <div
@ -248,6 +248,10 @@ Table.propTypes = {
* Boolean, true if this column is the default for sorting. Only one column should have this set. * Boolean, true if this column is the default for sorting. Only one column should have this set.
*/ */
defaultSort: PropTypes.bool, defaultSort: PropTypes.bool,
/**
* String, asc|desc if this column is the default for sorting. Only one column should have this set.
*/
defaultOrder: PropTypes.string,
/** /**
* Boolean, true if this column should be aligned to the left. * Boolean, true if this column should be aligned to the left.
*/ */