From 1ec10f6d987ccbfb03b9eb5401aa96c86c96d5d8 Mon Sep 17 00:00:00 2001
From: Ross Keenan <rossk29@gmail.com>
Date: Fri, 13 Aug 2021 14:56:13 +0200
Subject: [PATCH] feat(List/Matrix View): :sparkles: Custom sorting of
 userHierachies

---
 src/Components/Lists.svelte  |  4 ++--
 src/Components/Matrix.svelte |  4 ++--
 src/MatrixView.ts            | 26 ++++++--------------------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/Components/Lists.svelte b/src/Components/Lists.svelte
index 2ffa11d8..9150992f 100644
--- a/src/Components/Lists.svelte
+++ b/src/Components/Lists.svelte
@@ -5,7 +5,7 @@
   import type BreadcrumbsSettings from "src/main";
   import type MatrixView from "src/MatrixView";
 
-  export let sortedSquaresArr: SquareProps[][];
+  export let filteredSquaresArr: SquareProps[][];
   export let currFile: TFile;
   export let settings: BreadcrumbsSettings;
   export let matrixView: MatrixView;
@@ -13,7 +13,7 @@
 </script>
 
 <div class="breadcrumbs-list">
-  {#each sortedSquaresArr as squares}
+  {#each filteredSquaresArr as squares}
     <details open>
       <summary class="hier-summary"
         >{squares.map((square) => square.fieldName).join(", ")}</summary
diff --git a/src/Components/Matrix.svelte b/src/Components/Matrix.svelte
index e5d305a8..bcba4566 100644
--- a/src/Components/Matrix.svelte
+++ b/src/Components/Matrix.svelte
@@ -5,7 +5,7 @@
   import type MatrixView from "src/MatrixView";
   import { hoverPreview, openOrSwitch } from "src/sharedFunctions";
 
-  export let sortedSquaresArr: SquareProps[][];
+  export let filteredSquaresArr: SquareProps[][];
   export let currFile: TFile;
   export let settings: BreadcrumbsSettings;
   export let matrixView: MatrixView;
@@ -13,7 +13,7 @@
 </script>
 
 <div class="breadcrumbs-matrix  markdown-preview-view">
-  {#each sortedSquaresArr as squares}
+  {#each filteredSquaresArr as squares}
     <div>
       {#each squares as square}
         {#if square.realItems.length > 0 || square.impliedItems.length > 0}
diff --git a/src/MatrixView.ts b/src/MatrixView.ts
index f6831e70..9784f209 100644
--- a/src/MatrixView.ts
+++ b/src/MatrixView.ts
@@ -345,50 +345,36 @@ export default class MatrixView extends ItemView {
       const upSquare: SquareProps = {
         realItems: rUp,
         impliedItems: iUp,
-        fieldName: hier.up.join(", "),
+        fieldName: hier.up[0] === "" ? "<Parents>" : hier.up.join(", "),
       };
 
       const sameSquare: SquareProps = {
         realItems: rSame,
         impliedItems: iSameArr,
-        fieldName: hier.same.join(", "),
+        fieldName: hier.same[0] === "" ? "<Siblings>" : hier.same.join(", "),
       };
 
       const downSquare: SquareProps = {
         realItems: rDown,
         impliedItems: iDown,
-        fieldName: hier.down.join(", "),
+        fieldName: hier.down[0] === "" ? "<Children>" : hier.down.join(", "),
       };
 
       return [upSquare, sameSquare, downSquare];
     });
 
     debug(settings, { hierSquares });
-    const filteredSquares = hierSquares.filter((squareArr) =>
+    const filteredSquaresArr = hierSquares.filter((squareArr) =>
       squareArr.some(
         (square) => square.realItems.length + square.impliedItems.length > 0
       )
     );
 
-    const sortedSquaresArr = filteredSquares.sort(
-      (a, b) =>
-        sum(
-          b.map(
-            (square) => square.realItems.length + square.impliedItems.length
-          )
-        ) -
-        sum(
-          a.map(
-            (square) => square.realItems.length + square.impliedItems.length
-          )
-        )
-    );
-
     if (this.matrixQ) {
       this.view = new Matrix({
         target: this.contentEl,
         props: {
-          sortedSquaresArr,
+          filteredSquaresArr,
           currFile,
           settings: settings,
           matrixView: this,
@@ -399,7 +385,7 @@ export default class MatrixView extends ItemView {
       this.view = new Lists({
         target: this.contentEl,
         props: {
-          sortedSquaresArr,
+          filteredSquaresArr,
           currFile,
           settings: settings,
           matrixView: this,