fix(List/Matrix View): 🐛 Show aria-label on opposite side that leaf i…

…s open (fix #225)
SkepticMystic · Dec 29, 2021 · 76bbda8 · 76bbda8
1 parent e367d60
commit 76bbda8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 42 deletions.
diff --git a/src/Components/Lists.svelte b/src/Components/Lists.svelte
@@ -63,7 +63,7 @@
                       on:mouseover={(e) =>
                         hoverPreview(e, matrixView, impliedItem.to)}
                       aria-label={impliedItem.parent ?? ""}
-                      aria-label-position="left"
+                      aria-label-position={settings.rlLeaf ? "left" : "right"}
                     >
                       {impliedItem.alt ??
                         dropPathNDendron(impliedItem.to, settings)}

diff --git a/src/Components/Matrix.svelte b/src/Components/Matrix.svelte
@@ -69,7 +69,7 @@
                       aria-label={impliedItem.parent
                         ? "↑ " + impliedItem.parent
                         : ""}
-                      aria-label-position="left"
+                      aria-label-position={settings.rlLeaf ? "left" : "right"}
                     >
                       {impliedItem.alt ??
                         dropPathNDendron(impliedItem.to, settings)}

diff --git a/src/MatrixView.ts b/src/MatrixView.ts
@@ -179,11 +179,13 @@ export default class MatrixView extends ItemView {
 
       // !SECTION
 
-      iu = this.removeDuplicateImplied(ru, iu);
-      is = this.removeDuplicateImplied(rs, is);
-      id = this.removeDuplicateImplied(rd, id);
-      iN = this.removeDuplicateImplied(rn, iN);
-      ip = this.removeDuplicateImplied(rp, ip);
+      [iu, is, id, iN, ip] = [
+        this.removeDuplicateImplied(ru, iu),
+        this.removeDuplicateImplied(rs, is),
+        this.removeDuplicateImplied(rd, id),
+        this.removeDuplicateImplied(rn, iN),
+        this.removeDuplicateImplied(rp, ip),
+      ];
 
       const iSameNoDup: internalLinkObj[] = [];
       is.forEach((impSib) => {

diff --git a/src/main.ts b/src/main.ts
@@ -1089,41 +1089,6 @@ export default class BCPlugin extends Plugin {
         );
       });
     }
-    // frontms.forEach((frontm) => {
-    //   const { file } = frontm;
-    //   const basename = getDVBasename(file);
-    //   // It could have the node from another means already, but that doesn't mean it should return...
-    //   // if (mainG.hasNode(basename)) return;
-
-    //   const splits = basename.split(dendronNoteDelimiter);
-    //   if (splits.length < 2) return;
-
-    //   const reversed = splits.reverse();
-    //   reversed.forEach((split, i) => {
-    //     const currSlice = reversed
-    //       .slice(i)
-    //       .reverse()
-    //       .join(dendronNoteDelimiter);
-    //     const nextSlice = reversed
-    //       .slice(i + 1)
-    //       .reverse()
-    //       .join(dendronNoteDelimiter);
-    //     if (!nextSlice) return;
-
-    //     const sourceOrder = this.getSourceOrder(frontm);
-    //     const targetOrder = this.getTargetOrder(frontms, nextSlice);
-
-    //     this.populateMain(
-    //       mainG,
-    //       currSlice,
-    //       dendronNoteField,
-    //       nextSlice,
-    //       sourceOrder,
-    //       targetOrder,
-    //       true
-    //     );
-    //   });
-    // });
   }
 
   getTargetOrder = (frontms: dvFrontmatterCache[], target: string) =>