@gperezmz/bb-plugin-thread-glance 0.2.0 → 0.2.1

package/dist/server.meta.json

@@ -3,7 +3,7 @@
   "sdkVersion": "0.5.9",
   "artifactFormatVersion": 1,
   "pluginId": "thread-glance",
-  "pluginVersion": "0.2.0",
+  "pluginVersion": "0.2.1",
   "builtWith": {
     "bbVersion": "0.43.4",
     "pluginSdkVersion": "0.5.9"

package/features/thread-list/data/useNeedsYouHold.ts

@@ -1,11 +1,11 @@
-// Which family Needs you holds while one of its threads is open. Diffed
+// Which family Needs you holds, and which family is open, while one of its threads is open. Diffed
 // render to render, as auto-expansion is; nothing here is persisted.
 import { useRef } from "react";
 import type { Forest } from "../model/families";
-import { holdNeedsYou } from "../model/needs-you";
+import { holdNeedsYou, NO_HOLD, type NeedsYouHold } from "../model/needs-you";
 
 export function useNeedsYouHold(forest: Forest | null, activeThreadId: string | null): string | null {
-  const held = useRef<string | null>(null);
+  const held = useRef<NeedsYouHold>(NO_HOLD);
   const lastForest = useRef<Forest | null>(null);
   const lastActive = useRef<string | null | undefined>(undefined);
   // Derived during render, so the family never leaves for a frame. Idempotent:
@@ -15,5 +15,5 @@ export function useNeedsYouHold(forest: Forest | null, activeThreadId: string |
     lastForest.current = forest;
     lastActive.current = activeThreadId;
   }
-  return held.current;
+  return held.current.heldRootId;
 }

package/features/thread-list/model/families.ts

@@ -249,7 +249,9 @@ export function buildForest(inputs: ForestInputs): Forest {
         if (info.needsYou.size > 0) quiet = quietIgnoringOpen = false;
       } else {
         if (!info.quiet) quiet = false;
-        if (!isQuietThread(info.state, info.unread, false)) quietIgnoringOpen = false;
+        // A child reads as its own fold does, so with `blocked` an unread child
+        // does not keep an old family out of the group's fold.
+        if (!info.quietIgnoringOpen) quietIgnoringOpen = false;
       }
     }
     const flags = new Set<Flag>(descendantFlags);

package/features/thread-list/model/needs-you.ts

@@ -92,21 +92,42 @@ export function revealsOn(needsYou: ReadonlySet<Flag>, isRoot: boolean): boolean
 /** What the section reads of a family. */
 type SectionFamily = Pick<Family, "root" | "needsYouFlags">;
 
+/** What Needs you remembers between renders: the family it holds, and the family that was open. */
+export interface NeedsYouHold {
+  /** The root of the family held in the section, if any. */
+  heldRootId: string | null;
+  /** The root of the family the open thread belonged to at the last render, if any. */
+  openRootId: string | null;
+}
+
+export const NO_HOLD: NeedsYouHold = { heldRootId: null, openRootId: null };
+
 /**
- * Whether a family is in the Needs you section: one of its threads needs
- * you, or it is the family the section holds while one of its threads is open.
+ * Whether a family is in the Needs you section: it is the held family, or one
+ * of its threads needs you and none of them is open. Nothing moves while you
+ * are inside a family, so the open family only enters by being judged when
+ * opened (see `holdNeedsYou`).
  */
-export function inNeedsYou(family: SectionFamily, heldRootId: string | null): boolean {
-  return family.needsYouFlags.size > 0 || family.root.thread.id === heldRootId;
+export function inNeedsYou(family: SectionFamily, heldRootId: string | null, openRootId: string | null): boolean {
+  const rootId = family.root.thread.id;
+  if (rootId === heldRootId) return true;
+  return family.needsYouFlags.size > 0 && rootId !== openRootId;
 }
 
 /**
- * The family Needs you holds after a render, by its root's id: the open
- * thread's family, when it needs you now or was already held. Held, it stays
- * in the section after nothing in it needs you, until a thread outside it is
- * opened; a family that never needed you is not pulled in by opening it.
+ * The hold after a render. A family is judged when a thread in it is opened
+ * from outside it: it is held if something in it needs you then, and it stays
+ * held while one of its threads is open, after nothing in it needs you any
+ * more, until a thread outside it is opened. A family that does not need you
+ * when opened is not pulled in later, whatever happens in it; nor is one
+ * that never needed you. Opening another thread of the open family judges
+ * nothing again.
  */
-export function holdNeedsYou(previous: string | null, openFamily: SectionFamily | undefined): string | null {
-  if (openFamily === undefined) return null;
-  return inNeedsYou(openFamily, previous) ? openFamily.root.thread.id : null;
+export function holdNeedsYou(previous: NeedsYouHold, openFamily: SectionFamily | undefined): NeedsYouHold {
+  if (openFamily === undefined) return NO_HOLD;
+  const openRootId = openFamily.root.thread.id;
+  if (openRootId === previous.openRootId) {
+    return { heldRootId: previous.heldRootId === openRootId ? openRootId : null, openRootId };
+  }
+  return { heldRootId: openFamily.needsYouFlags.size > 0 ? openRootId : null, openRootId };
 }

package/features/thread-list/model/view.ts

@@ -599,6 +599,7 @@ export function buildListView(inputs: ViewInputs): ListView {
   const byGroup = new Map<string, Family[]>();
   const homeOf = new Map<Family, string>();
   const section: Family[] = [];
+  const openRootId = inputs.activeThreadId === null ? null : (forest.familyOf.get(inputs.activeThreadId)?.root.thread.id ?? null);
   for (const family of forest.families) {
     const id = groupIdForRoot(family.root.thread, {
       mode: prefs.organizationMode,
@@ -608,7 +609,7 @@ export function buildListView(inputs: ViewInputs): ListView {
     list.push(family);
     byGroup.set(id, list);
     homeOf.set(family, id);
-    if (inNeedsYou(family, inputs.heldRootId)) section.push(family);
+    if (inNeedsYou(family, inputs.heldRootId, openRootId)) section.push(family);
   }
   const inSection = new Set(section);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gperezmz/bb-plugin-thread-glance",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "engines": {
     "bb": ">=0.43",