From 280917a6c8d6cf50e4b24d00d56a3c611011cd2e Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sat, 12 Aug 2017 23:29:49 -0500 Subject: [PATCH 1/2] Improve test event handlers --- stories/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stories/index.tsx b/stories/index.tsx index 20556ca5..dfb7e141 100644 --- a/stories/index.tsx +++ b/stories/index.tsx @@ -90,11 +90,11 @@ storiesOf('Griddle main', module) // don't do things this way - fine for example storybook const events = { - onFilter: () => console.log('onFilter'), - onSort: () => console.log('onSort'), + onFilter: filter => console.log('onFilter', filter), + onSort: sortProperties => console.log('onSort', sortProperties), onNext: () => console.log('onNext'), onPrevious: () => console.log('onPrevious'), - onGetPage: () => console.log('onGetPage') + onGetPage: pageNumber => console.log('onGetPage', pageNumber), } return ( From e47fd537253f283a61aef37d771e82d3f5a8ca49 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sat, 12 Aug 2017 23:31:11 -0500 Subject: [PATCH 2/2] Send full sortProperty to events.onSort --- src/components/TableHeadingCellEnhancer.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/TableHeadingCellEnhancer.js b/src/components/TableHeadingCellEnhancer.js index c7590770..3ee6c757 100644 --- a/src/components/TableHeadingCellEnhancer.js +++ b/src/components/TableHeadingCellEnhancer.js @@ -11,7 +11,10 @@ const EnhancedHeadingCell = OriginalComponent => compose( }), mapProps(({ events: { onSort }, ...props }) => ({ ...props, - onClick: combineHandlers([() => onSort && onSort({ id: props.columnId }), props.onClick]), + onClick: combineHandlers([ + () => onSort && onSort(props.sortProperty || { id: props.columnId }), + props.onClick, + ]), })) )(props => );