Merge branch 'main' into playwright-config

visdesignlab · Feb 7, 2024 · 9f3821f · 9f3821f
2 parents a4aeb5d + 926e3ae
commit 9f3821f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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 };

diff --git 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
@@ -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');
                   }
                 }}
               >