From 1b005cba447de6cd41159461dda2e0fbb0a58cc5 Mon Sep 17 00:00:00 2001
From: Jake Wagoner <jakewagoneredu@gmail.com>
Date: Tue, 6 Feb 2024 16:42:12 -0700
Subject: [PATCH 1/2] Fix sort (ascending vs descending) flip

---
 packages/app/src/atoms/config/upsetConfigAtoms.ts   | 2 +-
 packages/core/src/sort.ts                           | 4 ++--
 packages/upset/src/atoms/config/upsetConfigAtoms.ts | 2 +-
 packages/upset/src/components/Sidebar.tsx           | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/app/src/atoms/config/upsetConfigAtoms.ts b/packages/app/src/atoms/config/upsetConfigAtoms.ts
index 7e980734..3fd58c7a 100644
--- a/packages/app/src/atoms/config/upsetConfigAtoms.ts
+++ b/packages/app/src/atoms/config/upsetConfigAtoms.ts
@@ -13,7 +13,7 @@ export const defaultConfig: UpsetConfig = {
   secondOverlapDegree: 2,
   sortVisibleBy: 'Alphabetical',
   sortBy: 'Size',
-  sortByOrder: 'Ascending',
+  sortByOrder: 'Descending',
   filters: {
     maxVisible: 3,
     minVisible: 0,
diff --git a/packages/core/src/sort.ts b/packages/core/src/sort.ts
index 7a07db51..dd8c7fcd 100644
--- a/packages/core/src/sort.ts
+++ b/packages/core/src/sort.ts
@@ -17,7 +17,7 @@ function sortBySize(rows: Intersections, sortOrder?: string) {
   const newOrder = [...order].sort((b, a) => {
     const valA = values[a].size;
     const valB = values[b].size;
-    return (sortOrder === 'Ascending') ? valA - valB : valB - valA;
+    return (sortOrder === 'Descending') ? valA - valB : valB - valA;
   });
 
   return { values, order: newOrder };
@@ -71,7 +71,7 @@ function sortByDeviation(rows: Intersections, sortByOrder?: SortByOrder) {
     (a, b) => {
       const devA = values[a].deviation;
       const devB = values[b].deviation;
-      return (sortByOrder === 'Ascending') ? devA - devB : devB - devA;
+      return (sortByOrder === 'Descending') ? devA - devB : devB - devA;
     },
   );
 
diff --git a/packages/upset/src/atoms/config/upsetConfigAtoms.ts b/packages/upset/src/atoms/config/upsetConfigAtoms.ts
index c295cefe..f652346e 100644
--- a/packages/upset/src/atoms/config/upsetConfigAtoms.ts
+++ b/packages/upset/src/atoms/config/upsetConfigAtoms.ts
@@ -14,7 +14,7 @@ export const defaultConfig: UpsetConfig = {
   secondOverlapDegree: 2,
   sortVisibleBy: 'Alphabetical',
   sortBy: 'Size',
-  sortByOrder: 'Ascending',
+  sortByOrder: 'Descending',
   filters: {
     maxVisible: 3,
     minVisible: 0,
diff --git a/packages/upset/src/components/Sidebar.tsx b/packages/upset/src/components/Sidebar.tsx
index 08dee348..b78055be 100644
--- a/packages/upset/src/components/Sidebar.tsx
+++ b/packages/upset/src/components/Sidebar.tsx
@@ -18,7 +18,7 @@ import {
   Typography,
 } from '@mui/material';
 import {
-  AggregateBy, aggregateByList, SortBy, sortByList,
+  AggregateBy, aggregateByList, SortBy,
 } from '@visdesignlab/upset2-core';
 import {
   Fragment, useContext, useEffect, useState,
@@ -106,7 +106,7 @@ export const Sidebar = () => {
             <RadioGroup
               value={sortBy}
               onChange={(ev) => {
-                actions.sortBy(ev.target.value as SortBy, 'Ascending');
+                actions.sortBy(ev.target.value as SortBy, 'Descending');
               }}
             >
               <Box
@@ -115,7 +115,7 @@ export const Sidebar = () => {
                 aria-label={`${helpText.sorting['Degree']} - ${sortByOrder}`}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter') {
-                    actions.sortBy('Degree', 'Ascending');
+                    actions.sortBy('Degree', 'Descending');
                   }
                 }}
               >
@@ -151,7 +151,7 @@ export const Sidebar = () => {
                 aria-label={`${helpText.sorting['Degree']} - ${sortByOrder}`}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter') {
-                    actions.sortBy('Size', 'Ascending');
+                    actions.sortBy('Size', 'Descending');
                   }
                 }}
               >

From b36cfdf914062688302137962d7ba9e4b097647f Mon Sep 17 00:00:00 2001
From: Jake Wagoner <jakewagoneredu@gmail.com>
Date: Tue, 6 Feb 2024 17:06:14 -0700
Subject: [PATCH 2/2] update deviation order

---
 packages/core/src/sort.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/sort.ts b/packages/core/src/sort.ts
index dd8c7fcd..3d570476 100644
--- a/packages/core/src/sort.ts
+++ b/packages/core/src/sort.ts
@@ -71,7 +71,7 @@ function sortByDeviation(rows: Intersections, sortByOrder?: SortByOrder) {
     (a, b) => {
       const devA = values[a].deviation;
       const devB = values[b].deviation;
-      return (sortByOrder === 'Descending') ? devA - devB : devB - devA;
+      return (sortByOrder === 'Ascending') ? devA - devB : devB - devA;
     },
   );