feat(List/Matrix View): ✨ Hook closedG into m/l view (new relation ty…

…pes!). The new types are added as a class to the `li`
SkepticMystic · Jan 16, 2022 · 4572689 · 4572689
1 parent 5e7d46a
commit 4572689
Show file tree

Hide file tree

Showing 7 changed files with 2,331 additions and 2,339 deletions.
diff --git a/main.js b/main.js
diff --git a/src/Components/Lists.svelte b/src/Components/Lists.svelte
@@ -41,7 +41,7 @@
 
               <ol>
                 {#each square.realItems as realItem}
-                  <li>
+                  <li class={realItem.implied ?? ""}>
                     <div
                       class={realItem.cls}
                       on:click={async (e) => openOrSwitch(app, realItem.to, e)}
@@ -66,7 +66,7 @@
                     class="BC-Implied {treatCurrNodeAsImpliedSibling &&
                     impliedItem.to === currFile.basename
                       ? 'BC-active-note'
-                      : ''}"
+                      : ''} {impliedItem.implied ?? ''}"
                   >
                     <div
                       class={impliedItem.cls}

diff --git a/src/Components/Matrix.svelte b/src/Components/Matrix.svelte
@@ -41,7 +41,7 @@
             {#if square.realItems.length}
               <ol>
                 {#each square.realItems as realItem}
-                  <li>
+                  <li class={realItem.implied ?? ""}>
                     <div
                       class={realItem.cls}
                       on:click={async (e) => openOrSwitch(app, realItem.to, e)}
@@ -70,7 +70,7 @@
                     class="BC-Implied {treatCurrNodeAsImpliedSibling &&
                     impliedItem.to === currFile.basename
                       ? 'BC-active-note'
-                      : ''}"
+                      : ''} {impliedItem.implied ?? ''}"
                   >
                     <div
                       class={impliedItem.cls}

diff --git a/src/Views/MatrixView.ts b/src/Views/MatrixView.ts
@@ -85,14 +85,16 @@ export default class MatrixView extends ItemView {
   toInternalLinkObj = (
     to: string,
     realQ = true,
-    parent?: string
+    parent: string | null,
+    implied?: string
   ): internalLinkObj => {
     return {
       to,
       cls: linkClass(this.app, to, realQ),
       alt: this.getAlt(to),
       order: this.getOrder(to),
       parent,
+      implied,
     };
   };
 
@@ -149,11 +151,15 @@ export default class MatrixView extends ItemView {
 
         filteredRealNImplied[dir].reals = reals
           .filter((real) => resultsFilter(real, dir, oppDir, arrow))
-          .map((item) => this.toInternalLinkObj(item.to, true));
+          .map((item) =>
+            this.toInternalLinkObj(item.to, true, null, item.implied)
+          );
 
         filteredRealNImplied[dir].implieds = implieds
           .filter((implied) => resultsFilter(implied, dir, oppDir, arrow))
-          .map((item) => this.toInternalLinkObj(item.to, false));
+          .map((item) =>
+            this.toInternalLinkObj(item.to, false, null, item.implied)
+          );
       }
 
       let {
@@ -164,23 +170,6 @@ export default class MatrixView extends ItemView {
         prev: { reals: rp, implieds: ip },
       } = filteredRealNImplied;
 
-      // SECTION Implied Siblings
-      /// Notes with the same parents
-      const closedUp = getSubInDirs(plugin.closedG, "up");
-
-      const iSamesII: internalLinkObj[] = [];
-      if (closedUp.hasNode(basename)) {
-        closedUp.forEachOutEdge(basename, (k, a, s, par) => {
-          if (hier.up.includes(a.field)) {
-            closedUp.forEachInEdge(par, (k, a, s, t) => {
-              if (s === basename && !treatCurrNodeAsImpliedSibling) return;
-              iSamesII.push(this.toInternalLinkObj(s, false, t));
-            });
-          }
-        });
-      }
-      is.push(...iSamesII);
-
       // !SECTION
 
       [iu, is, id, iN, ip] = [

diff --git a/src/constants.ts b/src/constants.ts
@@ -125,10 +125,10 @@ export const blankRealNImplied = () => {
 };
 
 export const [BC_I_AUNT, BC_I_COUSIN, BC_I_SIBLING_1, BC_I_SIBLING_2] = [
-  "Aunt/Uncle",
-  "Cousin",
-  "Sibling 1",
-  "Sibling 2",
+  "BC-Aunt",
+  "BC-Cousin",
+  "BC-Sibling-1",
+  "BC-Sibling-2",
 ];
 
 export const [

diff --git a/src/interfaces.ts b/src/interfaces.ts
@@ -185,6 +185,7 @@ export interface internalLinkObj {
   alt: string | null;
   order: number;
   parent?: string;
+  implied: string;
 }
 
 export interface SquareProps {
@@ -270,6 +271,7 @@ export type SquareItem = {
   to: string;
   real: boolean;
   field: string;
+  implied?: string;
 };
 
 export interface MetaeditApi {

diff --git a/src/sharedFunctions.ts b/src/sharedFunctions.ts
@@ -264,12 +264,16 @@ export function getRealnImplied(
   dir: Directions = null
 ): RealNImplied {
   const realsnImplieds: RealNImplied = blankRealNImplied();
-  const { userHiers } = plugin.settings;
-  const { mainG } = plugin;
-
-  if (!mainG.hasNode(currNode)) return realsnImplieds;
-  mainG.forEachEdge(currNode, (k, a, s, t) => {
-    const { field, dir: edgeDir } = a as { field: string; dir: Directions };
+  const { settings, closedG } = plugin;
+  const { userHiers } = settings;
+
+  if (!closedG.hasNode(currNode)) return realsnImplieds;
+  closedG.forEachEdge(currNode, (k, a, s, t) => {
+    const {
+      field,
+      dir: edgeDir,
+      implied,
+    } = a as { field: string; dir: Directions; implied?: string };
     const oppField =
       getOppFields(userHiers, field)[0] ?? fallbackOppField(field, edgeDir);
 
@@ -279,7 +283,7 @@ export function getRealnImplied(
       if (s === currNode && (edgeDir === currDir || edgeDir === oppDir)) {
         const arr = realsnImplieds[edgeDir].reals;
         if (arr.findIndex((item) => item.to === t) === -1) {
-          arr.push({ to: t, real: true, field });
+          arr.push({ to: t, real: true, field, implied });
         }
       }
       // Implieds
@@ -291,6 +295,7 @@ export function getRealnImplied(
             to: s,
             real: false,
             field: oppField,
+            implied,
           });
         }
       }