From 51e498207091d45735760e99b4f24de77529284d Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Thu, 4 Jun 2020 15:47:07 -0700
Subject: [PATCH 1/2] Added the Sort Direction to Header Click dispatch Added
 `sortCurrentData` to control whether or not the curent table data is sorted
 or not

---
 src/components/DataTable/DataTable.svelte | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/DataTable/DataTable.svelte b/src/components/DataTable/DataTable.svelte
index fe8cda3d..9c8be9e9 100644
--- a/src/components/DataTable/DataTable.svelte
+++ b/src/components/DataTable/DataTable.svelte
@@ -10,6 +10,7 @@
   export let size = undefined;
   export let sortable = false;
   export let style = undefined;
+  export let sortCurrentData = true;
 
   import { createEventDispatcher, setContext } from 'svelte';
   import { writable, derived } from 'svelte/store';
@@ -48,7 +49,7 @@
   $: ascending = $sortHeader.sortDirection === 'ascending';
   $: sortKey = $sortHeader.key;
   $: sorting = sortable && sortKey != null;
-  $: if (sorting) {
+  $: if (sorting && sortCurrentData) {
     if ($sortHeader.sortDirection === 'none') {
       sortedRows = rows;
     } else {
@@ -79,10 +80,10 @@
             <TableHeader
               on:click={() => {
                 dispatch('click', { header });
-                dispatch('click:header', header);
                 let active = header.key === $sortHeader.key;
                 let currentSortDirection = active ? $sortHeader.sortDirection : 'none';
                 let sortDirection = sortDirectionMap[currentSortDirection];
+                dispatch('click:header', {header, sortDirection});
                 sortHeader.set({
                   id: sortDirection === 'none' ? null : $thKeys[header.key],
                   key: header.key,

From ed5295641c381e6b4aba8c88400758fb5fb7efc9 Mon Sep 17 00:00:00 2001
From: Matthew Bentley <mabentley85@gmail.com>
Date: Thu, 4 Jun 2020 17:26:58 -0700
Subject: [PATCH 2/2] Remove the disable table sorting

---
 src/components/DataTable/DataTable.svelte | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/DataTable/DataTable.svelte b/src/components/DataTable/DataTable.svelte
index 9c8be9e9..857e6044 100644
--- a/src/components/DataTable/DataTable.svelte
+++ b/src/components/DataTable/DataTable.svelte
@@ -10,7 +10,6 @@
   export let size = undefined;
   export let sortable = false;
   export let style = undefined;
-  export let sortCurrentData = true;
 
   import { createEventDispatcher, setContext } from 'svelte';
   import { writable, derived } from 'svelte/store';
@@ -49,7 +48,7 @@
   $: ascending = $sortHeader.sortDirection === 'ascending';
   $: sortKey = $sortHeader.key;
   $: sorting = sortable && sortKey != null;
-  $: if (sorting && sortCurrentData) {
+  $: if (sorting) {
     if ($sortHeader.sortDirection === 'none') {
       sortedRows = rows;
     } else {