@gperezmz/bb-plugin-thread-glance 0.2.2 → 0.2.4

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

@@ -20,7 +20,7 @@ import {
 } from "./groups";
 import { addCounters, countFamilies, EMPTY_COUNTERS, type Counters } from "./counters";
 import { comparePinned, effectiveSortField, makeComparator, type SortKey } from "./sort";
-import { inAttention } from "./attention";
+import { inAttention, isAttended, type SectionFamily } from "./attention";
 import { mostUrgent, type Flag } from "./state";
 import type { Targets } from "./expansion";
 import type { RowNote } from "./notes";
@@ -50,9 +50,12 @@ export interface ThreadRow {
   /** Title of the thread this one attaches to, for tooltips and labels. */
   parentTitle: string | null;
   chip: Chip | null;
+  /** The title is bold: the thread is unread and its family is not attended. */
+  bold: boolean;
   /**
    * The line under the title. In Needs attention, a row that itself needs
-   * attention says why; any other row says why it waits on you or failed.
+   * attention says why, and an attended family's rows have none; any other
+   * row says why it waits on you or failed.
    */
   note: RowNote | null;
   /** The title, and the chip with it, step back: see `isDimmed`. */
@@ -122,7 +125,7 @@ export const ATTENTION_GROUP_ID = "attention";
 
 /** The Needs attention section: every family with a thread that needs attention, or held there while one of its threads is open. */
 export interface AttentionView {
-  /** How many families the section holds, for its header. */
+  /** How many families the section holds, attended ones left out, for its header. */
   familyCount: number;
   rows: Row[];
   /** The home group of each thread drawn here, by thread id: a drop on its row acts there. */
@@ -149,12 +152,13 @@ export interface ViewInputs {
   sections: readonly PluginSidebarSection[];
   prefs: Preferences;
   activeThreadId: string | null;
-  /** The root of the family Needs attention keeps while one of its threads is open. */
-  heldRootId: string | null;
+  /** The family Needs attention keeps while one of its threads is open, as it was when opened: the section orders it by this. */
+  held: SectionFamily | null;
   targets: Targets;
 }
 
 interface Context extends ViewInputs {
+  heldRootId: string | null;
   compare: (a: SortKey, b: SortKey) => number;
   expandedChildren: ReadonlySet<string>;
   expandedOlder: ReadonlySet<string>;
@@ -168,6 +172,8 @@ interface Context extends ViewInputs {
   sectionNames: ReadonlyMap<string, string>;
   /** The rows are drawn in Needs attention. */
   drawnInAttention: boolean;
+  /** The rows are an attended family's: they draw as in its home group, with no bold title or why line. */
+  attended: boolean;
 }
 
 function titleOf(context: Context, id: string | null): string | null {
@@ -219,7 +225,8 @@ function threadRow(
     nested: options.nested,
     parentTitle: titleOf(context, info.parentId),
     chip: options.chip,
-    note: context.drawnInAttention && needsAttention ? info.attentionNote : info.note,
+    bold: info.unread && !context.attended,
+    note: context.attended ? null : context.drawnInAttention && needsAttention ? info.attentionNote : info.note,
     dimmed: isDimmed(context, info, options.chip),
     hiddenBadge: info.thread.isHidden,
     crossGroupLabel: crossGroupLabel(context, info, root),
@@ -421,7 +428,7 @@ function familyUnit(context: Context, family: Family): Unit {
 }
 
 /** Waiting on you, then failed, then offline, then unread, then the rest. */
-export function urgency(family: Family): number {
+export function urgency(family: Pick<Family, "attentionFlags">): number {
   const flags = family.attentionFlags;
   if (flags.has("waits-on-you")) return 0;
   if (flags.has("unread-failed") || flags.has("queue-failed")) return 1;
@@ -437,7 +444,11 @@ export function urgency(family: Family): number {
  * with the root's chip, it draws as in its home group and keeps the path.
  */
 function attentionFamilyRows(groupContext: Context, family: Family, homeGroupLabel: string): Row[] {
-  const context: Context = { ...groupContext, drawnInAttention: true };
+  const context: Context = {
+    ...groupContext,
+    drawnInAttention: true,
+    attended: isAttended(family, groupContext.heldRootId),
+  };
   const root = family.root;
   const onPath = new Set<string>([root.thread.id]);
   for (const info of family.descendants) {
@@ -475,20 +486,26 @@ function buildAttention(
 ): AttentionView | null {
   if (families.length === 0) return null;
   // Most urgent first, then the chosen field in its natural direction: the
-  // sort direction orders the groups only.
+  // sort direction orders the groups only. The held family sorts as it was
+  // when opened, so nothing inside it moves it.
   const compare = makeComparator({
     field: context.prefs.chronologicalSort,
     direction: "default",
     workingFirst: context.prefs.workingFirst,
   });
-  const sorted = [...families].sort(
-    (a, b) =>
+  const slotOf = (family: Family): SectionFamily =>
+    context.held !== null && family.root.thread.id === context.heldRootId ? context.held : family;
+  const sorted = [...families].sort((familyA, familyB) => {
+    const a = slotOf(familyA);
+    const b = slotOf(familyB);
+    return (
       urgency(a) - urgency(b) ||
       compare(
         { thread: a.root.thread, familyAttention: a.latestAttentionAt },
         { thread: b.root.thread, familyAttention: b.latestAttentionAt },
-      ),
-  );
+      )
+    );
+  });
   const homeGroupIds: Record<string, string> = {};
   const rows = sorted.flatMap((family) => {
     const home = homeGroupOf(family);
@@ -497,7 +514,7 @@ function buildAttention(
     return familyRows;
   });
   return {
-    familyCount: sorted.length,
+    familyCount: sorted.filter((family) => !isAttended(family, context.heldRootId)).length,
     rows,
     homeGroupIds,
   };
@@ -601,6 +618,7 @@ export function buildListView(inputs: ViewInputs): ListView {
   }
   const context: Context = {
     ...inputs,
+    heldRootId: inputs.held?.root.thread.id ?? null,
     compare: makeComparator({
       field: prefs.chronologicalSort,
       direction: prefs.sortDirection,
@@ -615,6 +633,7 @@ export function buildListView(inputs: ViewInputs): ListView {
     projectNames: new Map(inputs.projects.map((project) => [project.id, project.name])),
     sectionNames: new Map(inputs.sections.map((section) => [section.id, section.name])),
     drawnInAttention: false,
+    attended: false,
   };
 
   const byGroup = new Map<string, Family[]>();
@@ -630,7 +649,7 @@ export function buildListView(inputs: ViewInputs): ListView {
     list.push(family);
     byGroup.set(id, list);
     homeOf.set(family, id);
-    if (inAttention(family, inputs.heldRootId, openRootId)) section.push(family);
+    if (inAttention(family, context.heldRootId, openRootId)) section.push(family);
   }
   const inSection = new Set(section);
 

package/features/thread-list/testing/fixtures.ts

@@ -8,6 +8,7 @@ import { defaultPreferences, type Preferences } from "@/shared/preferences";
 import { buildForest, type Forest } from "../model/families";
 import { buildListView, type ListView, type Row } from "../model/view";
 import type { Targets } from "../model/expansion";
+import type { SectionFamily } from "../model/attention";
 
 export const T0 = 1_780_000_000_000;
 
@@ -108,7 +109,10 @@ export interface Scenario {
   sections?: PluginSidebarSection[];
   prefs?: Partial<Preferences>;
   activeThreadId?: string | null;
+  /** The root of the held family, held as it stands now. */
   heldRootId?: string | null;
+  /** The held family as it was when opened; wins over `heldRootId`. */
+  held?: SectionFamily | null;
   targets?: Targets;
   finishedAt?: Record<string, number>;
   seenAt?: Record<string, number>;
@@ -141,7 +145,7 @@ export function viewOf(scenario: Scenario): ListView {
     sections: scenario.sections ?? [],
     prefs: { ...defaultPreferences(), ...scenario.prefs },
     activeThreadId: scenario.activeThreadId ?? null,
-    heldRootId: scenario.heldRootId ?? null,
+    held: scenario.held ?? (scenario.heldRootId == null ? null : (forest.familyOf.get(scenario.heldRootId) ?? null)),
     targets: scenario.targets ?? new Map(),
   });
 }

package/package.json

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