v7.0.0-alpha.6

V7 adds the option to remove a sort option, so it goes from asc -> desc
-> unset, then repeats.  V6 just went from asc -> desc then repeated.

Personally I much preferred this, I think that there's a case to be made
that this is the more expected behavior.

I'm not sure if this is really the best way to fix this since it adds
yet another api option and I completely understand that that is less
than desirable, but I also would rather add an option than have to
duplicate the whole useSortBy hook.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-table",
-  "version": "7.0.0-alpha.4",
+  "version": "7.0.0-alpha.6",
   "description": "A fast, lightweight, opinionated table and datagrid built on React",
   "license": "MIT",
   "homepage": "https://github.com/tannerlinsley/react-table#readme",

src/hooks/useSortBy.js

@@ -22,14 +22,15 @@ const propTypes = {
   columns: PropTypes.arrayOf(
     PropTypes.shape({
       sortByFn: PropTypes.func,
-      efaultSortDesc: PropTypes.bool
+      defaultSortDesc: PropTypes.bool
     })
   ),
   sortByFn: PropTypes.func,
   manualSorting: PropTypes.bool,
   disableSorting: PropTypes.bool,
   defaultSortDesc: PropTypes.bool,
-  disableMultiSort: PropTypes.bool
+  disableMultiSort: PropTypes.bool,
+  disableSortRemove: PropTypes.bool
 }
 
 export const useSortBy = props => {
@@ -44,6 +45,7 @@ export const useSortBy = props => {
     manualSorting,
     disableSorting,
     defaultSortDesc,
+    disableSortRemove,
     hooks,
     state: [{ sortBy }, setState]
   } = props
@@ -82,8 +84,9 @@ export const useSortBy = props => {
 
       if (!multi) {
         if (sortBy.length <= 1 && existingSortBy) {
-          if (existingSortBy.desc) {
-            action = 'remove'
+          if ((existingSortBy.desc && !resolvedDefaultSortDesc) ||
+            (!existingSortBy.desc && resolvedDefaultSortDesc)) {
+            action = disableSortRemove? 'toggle' : 'remove'
           } else {
             action = 'toggle'
           }

src/hooks/useTable.js

@@ -150,7 +150,7 @@ export const useTable = (props, ...plugins) => {
     row.getRowProps = props =>
       mergeProps(
         { key: ['row', ...path].join('_') },
-        applyHooks(api.hooks.getRowProps, row, api),
+        applyPropHooks(api.hooks.getRowProps, row, api),
         props
       )