@gitkraken/gitkraken-components 13.0.0-vnext.28 → 13.0.0-vnext.29

package/README.md

@@ -16,4 +16,8 @@ This is a shared module between the GitKraken app and GitLens to share React com
   }
 ```
 
+## Guides
+
+- [Multi-WIP rows](./docs/multi-wip-rows.md) — rendering secondary (per-worktree) WIP rows, deferred stats loading, and stale-while-revalidate invalidation.
+
 [CHANGELOG](./CHANGELOG.md)

package/dist/components/graph/GraphContainer.d.ts

@@ -5,12 +5,12 @@ import type { Sha } from '../../domain/commit/CommitTypes';
 import type { CssVariables } from '../../domain/generic/GenericTypes';
 import type { GraphCommitDescDisplayMode, GraphMarkerType, GraphSearchMode, GraphZone, GraphZoneType, ShiftSelectMode } from '../../domain/graph/GraphConstants';
 import type { ThrottledFn } from '../../domain/graph/GraphHelpers';
-import type { AbsoluteNodeLeftByColumn, AvatarUrlByEmail, AvatarUrlRequestedByEmail, ChildrenBySha, ColumnColorByColumn, DownstreamsByUpstream, EdgeByColumn, ExcludeByType, ExcludeRefsById, ExcludeRemotesByName, FormatCommitMessage, FormatRefShorthand, GetExternalIcon, GetMissingAvatar, GetMissingRefMetadata, GraphColumnSetting, GraphColumnsSettings, GraphContexts, GraphMarkerColors, GraphMarkerRowIndices, GraphPlatform, GraphRefGroup, GraphRow, GraphZoneModeConstants, GraphZonesByType, Head, HighlightedShas, IncludeOnlyRefsById, IncludeOnlyRemotesByName, IsRefShorthandValid, IsSelectedBySha, NodeOffsetByColumn, NodeOpacityByColumn, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnClickGraphRef, OnClickGraphRow, OnClickRef, OnColumnsCalculated, OnCommitContextMenu, OnCommitMessageChange, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, OnDoubleClickGraphRef, OnDoubleClickGraphRow, OnDoubleClickRef, OnEmailsMissingAvatarUrls, OnFilterColumnClick, OnFormatCommitDateTime, OnGraphColumnReOrdered, OnGraphColumnResized, OnGraphColumnsReOrdered, OnGraphMouseEnter, OnGraphMouseLeave, OnGraphRefNodeHovered, OnGraphRefNodeUnhovered, OnGraphResized, OnGraphRowHovered, OnGraphRowUnhovered, OnGraphScrollForZone, OnGraphVisibleRowsChanged, OnGraphZoneResize, OnGraphZoneResizeEnd, OnLoadSelectedGraphRow, OnPopupGraphHeaderContextMenu, OnRefBeginDrag, OnRefCanDrag, OnRefCanDrop, OnRefContextMenu, OnRefCreate, OnRefCreateCancel, OnRefCreateContextMenu, OnRefDragEnter, OnRefDragLeave, OnRefDrop, OnRefEndDrag, OnRefNodeHovered, OnRefNodeUnhovered, OnRefShorthandChange, OnRefsMissingMetadata, OnRefZoneContextMenu, OnRefZoneHovered, OnRefZoneUnhovered, OnRowContextMenu, OnScrollForZone, OnSelectGraphRows, OnSettingsClick, OnShowMoreCommits, OnToggleRefNodesShown, OnToggleRefsVisibilityClick, OnWipMessageBlur, OnWipMessageFocus, ProcessedGraphRow, ProcessedGraphRowBySha, ReadonlyGraphRow, RefMetadataById, RefMetadataRequestedById, RefMetadataType, RefsMissingMetadata, Remote, ReserverInfoBySha, RowEdges, RowStats, RowStatsConstraints, ShaByRefId, Tag, TopAndBottomVisibleRowIndex } from '../../domain/graph/GraphTypes';
+import type { AbsoluteNodeLeftByColumn, AvatarUrlByEmail, AvatarUrlRequestedByEmail, ChildrenBySha, ColumnColorByColumn, DownstreamsByUpstream, ExcludeByType, ExcludeRefsById, ExcludeRemotesByName, FormatCommitMessage, FormatRefShorthand, GetExternalIcon, GetMissingAvatar, GetMissingRefMetadata, GraphColumnSetting, GraphColumnsSettings, GraphContexts, GraphMarkerColors, GraphMarkerRowIndices, GraphPlatform, GraphRefGroup, GraphRow, GraphScope, GraphZoneModeConstants, GraphZonesByType, Head, HighlightedShas, IncludeOnlyRefsById, IncludeOnlyRemotesByName, IsRefShorthandValid, IsSelectedBySha, NodeOffsetByColumn, NodeOpacityByColumn, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnClickGraphRef, OnClickGraphRow, OnClickRef, OnColumnsCalculated, OnCommitContextMenu, OnCommitMessageChange, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, OnDoubleClickGraphRef, OnDoubleClickGraphRow, OnDoubleClickRef, OnEmailsMissingAvatarUrls, OnFilterColumnClick, OnFormatCommitDateTime, OnGraphColumnReOrdered, OnGraphColumnResized, OnGraphColumnsReOrdered, OnGraphMouseEnter, OnGraphMouseLeave, OnGraphRefNodeHovered, OnGraphRefNodeUnhovered, OnGraphResized, OnGraphRowHovered, OnGraphRowUnhovered, OnGraphScrollForZone, OnGraphVisibleRowsChanged, OnGraphZoneResize, OnGraphZoneResizeEnd, OnLoadSelectedGraphRow, OnPopupGraphHeaderContextMenu, OnRefBeginDrag, OnRefCanDrag, OnRefCanDrop, OnRefContextMenu, OnRefCreate, OnRefCreateCancel, OnRefCreateContextMenu, OnRefDragEnter, OnRefDragLeave, OnRefDrop, OnRefEndDrag, OnRefNodeHovered, OnRefNodeUnhovered, OnRefShorthandChange, OnRefsMissingMetadata, OnRefZoneContextMenu, OnRefZoneHovered, OnRefZoneUnhovered, OnRowContextMenu, OnScrollForZone, OnSelectGraphRows, OnSettingsClick, OnShowMoreCommits, OnToggleRefNodesShown, OnToggleRefsVisibilityClick, OnWipMessageBlur, OnWipMessageFocus, ProcessedGraphRow, ProcessedGraphRowBySha, ReadonlyGraphRow, RefMetadataById, RefMetadataRequestedById, RefMetadataType, RefsMissingMetadata, Remote, ReserverInfoBySha, RowStats, RowStatsConstraints, ShaByRefId, Tag, TopAndBottomVisibleRowIndex } from '../../domain/graph/GraphTypes';
 import type { RowAdornmentProvider } from '../../domain/graph/rowAdornment/RowAdornmentTypes';
 import type { TranslationFn } from '../../domain/language/LanguageTypes';
 import type { CreateRefFormData, RefIconsPosition } from '../../domain/ref/RefTypes';
 import type { OnKeyDown, OnKeyUp, OnMouseDown, OnResizeParams } from '../../domain/ui/UiTypes';
-import type { WorkDirStats } from '../../domain/workdir/WorkDirTypes';
+import type { OnVisibleWipShasChanged, OnWipShasMissingStats, VisibleWipShas, WipNodeMetadataBySha, WipShasMissingStats, WorkDirStats } from '../../domain/workdir/WorkDirTypes';
 import type { IGraphContainer } from './IGraphContainer';
 type ClearScrollToIndex = () => void;
 type OnZoneEnter = (e: React.MouseEvent<any>, zoneType: GraphZoneType, hoveredRefGroup?: GraphRefGroup, hoveredSha?: Sha) => void;
@@ -47,6 +47,12 @@ export interface StateProps {
     isRefShorthandValid?: IsRefShorthandValid;
     showGhostRefsOnRowHover?: boolean;
     showRemoteNamesOnRefs?: boolean;
+    /**
+     * Whether stash rows can keep otherwise-unreferenced parent commits visible.
+     * Defaults to true for backwards compatibility. When false, a stash is shown
+     * only if its parent commit would already be visible for some other reason.
+     */
+    stashesAnchorCommits?: boolean;
     enabledRefMetadataTypes?: RefMetadataType[];
     enabledScrollMarkerTypes?: GraphMarkerType[];
     scrollRowPadding?: number;
@@ -71,6 +77,19 @@ export interface StateProps {
      * If null or undefined, no branch is pinned.
      */
     pinnedBranchFullName?: string | null;
+    /**
+     * Narrow the graph to commits reachable from a specific branch, its upstream (if any), and
+     * a merge-target tip commit. Anchors (tips + merge target) show all their refs and never
+     * propagate child refs to their parents. When an anchor's real parents are hidden, a
+     * synthetic wavy dashed edge is drawn to its nearest visible ancestor.
+     */
+    scope?: GraphScope;
+    /**
+     * Fired when the helper determined that an anchor cannot reach a visible ancestor within the
+     * loaded graphRows (merge base not loaded). Consumer should fetch more data and re-render.
+     * Called once per processing pass, only when the set actually changes.
+     */
+    onScopeAnchorsUnreachable?: (unreachableAnchors: Set<Sha>) => void;
     shiftSelectMode?: ShiftSelectMode;
     suppressNonRefRowTooltips?: boolean;
     refMetadataById?: RefMetadataById | null;
@@ -83,8 +102,23 @@ export interface StateProps {
     useAuthorInitialsForAvatars: boolean;
     rowsStats?: Record<string, RowStats>;
     rowsStatsLoading?: boolean;
+    /**
+     * Controls when the WIP row is inserted into the graph.
+     * - 'auto' (default): shown only when there are pending working-tree changes.
+     * - 'always': shown even with a clean working tree, anchored at HEAD.
+     */
+    wipVisibility?: 'always' | 'auto';
     wipMessageEditable?: boolean;
     workDirStats?: WorkDirStats;
+    wipNodeMetadataBySha?: WipNodeMetadataBySha;
+    /**
+     * Settle delay (ms) for the internal scroll-settle debounce that drives both
+     * `onVisibleWipShasChanged` and `onWipShasMissingStats`. Each scroll/visible-range change
+     * resets the timer; the callbacks fire once activity stops for this long. Raise it (e.g. 350)
+     * to avoid firing stats requests for rows that are only momentarily visible during fast scrolls.
+     * Defaults to 100.
+     */
+    wipShasSettleDelayMs?: number;
     /**
      * Provider for row adornments.
      * Graph subscribes to invalidate events and calls provide/resolve as needed.
@@ -138,6 +172,8 @@ export interface DispatchProps {
     onGraphMouseLeave?: OnGraphMouseLeave;
     onEmailsMissingAvatarUrls?: OnEmailsMissingAvatarUrls;
     onRefsMissingMetadata?: OnRefsMissingMetadata;
+    onWipShasMissingStats?: OnWipShasMissingStats;
+    onVisibleWipShasChanged?: OnVisibleWipShasChanged;
 }
 interface Props extends OwnProps, StateProps, DispatchProps {
 }
@@ -223,6 +259,9 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     reserverInfoBySha: ReserverInfoBySha;
     columnsUsed: ColumnsUsed;
     private pinnedBranchShas;
+    private scopeVisibility;
+    private syntheticEdgeChildShas;
+    private _lastReportedUnreachable;
     rowsStats?: Record<string, RowStats>;
     workDirStats: WorkDirStats;
     private _markerColorsCache;
@@ -248,6 +287,9 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     pendingMissingRefsMetadata: RefsMissingMetadata;
     requestedMissingRefsMetadata: RefMetadataRequestedById;
     previousRefMetadataById: RefMetadataById | null;
+    requestedMissingWipStats: WipShasMissingStats;
+    visibleWipShasTimer?: ReturnType<typeof setTimeout>;
+    lastFiredVisibleWipShas: VisibleWipShas | undefined;
     branchUpstreamRowIndices: number[];
     downstreamsByUpstream: DownstreamsByUpstream;
     timelinesInterval?: ReturnType<typeof setInterval>;
@@ -462,12 +504,8 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     initializeGraphZones(zoneSettings: GraphColumnsSettings | undefined, zoneOrdering: GraphZoneType[], width: number): GraphZone[];
     maybeSortGraphZoneOrderingFromSettings(zoneSettings?: GraphColumnsSettings): void;
     updateZonesFromSettings(zoneSettings?: GraphColumnsSettings): void;
-    getEdgeColumnMaxes(sha: Sha): number;
-    getEndingAndPassThroughEdgesByColumnFromPrevRow(graphRow: ProcessedGraphRow, prevRowEdges: RowEdges): RowEdges;
-    getFinalEdgeStateForGraphAndRow(graphRow: ProcessedGraphRow, prevRowEdges: RowEdges): RowEdges;
     loadEdgesBySha(): void;
     processRows(graphRows?: GraphRow[], pinnedBranchFullName?: string | null): void;
-    getStartingEdgesByColumn(currentRow: ProcessedGraphRow): EdgeByColumn;
     formatCommitDateTimeCallback: OnFormatCommitDateTime;
     formatCommitMessageCallback: FormatCommitMessage;
     formatRefShorthandCallback: FormatRefShorthand;
@@ -476,6 +514,7 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     getIconCallback: GetExternalIcon;
     onMissingAvatar: GetMissingAvatar;
     onMissingRefMetadata: GetMissingRefMetadata;
+    scheduleVisibleWipShasUpdate: () => void;
     selectNext(shiftKey?: boolean, topological?: boolean, shiftSelectMode?: ShiftSelectMode): void;
     selectPrevious(shiftKey?: boolean, topological?: boolean, shiftSelectMode?: ShiftSelectMode): void;
     /**
@@ -530,10 +569,17 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     selectLast(shiftKey?: boolean, shiftSelectMode?: ShiftSelectMode): void;
     selectPageUp(shiftKey?: boolean, shiftSelectMode?: ShiftSelectMode): void;
     selectPageDown(shiftKey?: boolean, shiftSelectMode?: ShiftSelectMode): void;
-    getColumns(graphRow: GraphRow): number;
+    /**
+     * Computes the column for a row.
+     *
+     * `parentsOverride` lets callers supply a different parent list than `graphRow.parents` —
+     * used by the scoped-graph feature to reserve lanes against synthetic ancestors when a
+     * row's real parents are hidden by scope filtering. Avoids mutating row.parents.
+     */
+    getColumns(graphRow: GraphRow, parentsOverride?: Sha[]): number;
     getFilteredHeadsForGraphRow(row: GraphRow, hasIncludes: boolean): Head[];
     getFilteredRemotesForGraphRow(row: GraphRow, hasIncludes: boolean): Remote[];
-    getFilteredTagsForGraphRow(row: GraphRow, hasIncludes: boolean, rowHasVisibleChild: boolean): Tag[];
+    getBaseFilteredTagsForGraphRow(row: GraphRow, hasIncludesWithTags: boolean): Tag[];
     loadRowsbySha(graphRows: GraphRow[], pinnedBranchFullName?: string | null): void;
     updateRowStatsConstraints(): void;
     updateTimelines(): void;

package/dist/components/graph/commitzone/CommitZone.d.ts

@@ -2,7 +2,7 @@ import type { ReactElement } from 'react';
 import * as React from 'react';
 import type { CommitType, Sha } from '../../../domain/commit/CommitTypes';
 import type { CssVariables, Style } from '../../../domain/generic/GenericTypes';
-import type { ColumnColorByColumn, GetExternalIcon, GraphItemContext, GraphZoneModeConstants, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnCommitContextMenu, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, RowEdges } from '../../../domain/graph/GraphTypes';
+import type { ColumnColorByColumn, GetExternalIcon, GraphItemContext, GraphZoneModeConstants, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnCommitContextMenu, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, RowEdges, ScopeBoundaryKind } from '../../../domain/graph/GraphTypes';
 import type { TranslationFn } from '../../../domain/language/LanguageTypes';
 type Props = {
     authorEmail: string;
@@ -38,6 +38,7 @@ type Props = {
     rightGutterBoxShadowAlpha: number;
     rightGutterWidth: number;
     rowContext?: GraphItemContext;
+    scopeBoundaryKind?: ScopeBoundaryKind;
     scrollLeft: number;
     setAsCurrentlyHoveredGraphCommit: OnCurrentlyHoveredGraphCommit;
     sha: Sha;

package/dist/components/graph/commitzone/edges/Arc.d.ts

@@ -1,4 +1,4 @@
-import type { CommitType } from '../../../../domain/commit/CommitTypes';
+import type { EdgeCommitType } from '../../../../domain/commit/CommitTypes';
 import type { ArcEndpointAngle, ColumnColor, SvgElement } from '../../../../domain/graph/GraphTypes';
-declare function getArc(color: ColumnColor, endAngle: ArcEndpointAngle, startAngle: ArcEndpointAngle, type: CommitType, x: number, y: number, strokeWidth: number, isCompact?: boolean): SvgElement;
+declare function getArc(color: ColumnColor, endAngle: ArcEndpointAngle, startAngle: ArcEndpointAngle, type: EdgeCommitType, x: number, y: number, strokeWidth: number, isCompact?: boolean): SvgElement;
 export default getArc;

package/dist/components/graph/commitzone/edges/EndingEdge.d.ts

@@ -1,4 +1,4 @@
-import type { CommitType } from '../../../../domain/commit/CommitTypes';
+import type { EdgeCommitType } from '../../../../domain/commit/CommitTypes';
 import type { ColumnColorByColumn, SvgElement } from '../../../../domain/graph/GraphTypes';
 export declare function clearEndingEdgeCacheCache(): void;
-export declare function getEndingEdge(edgeColumn: number, nodeColumn: number, type: CommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;
+export declare function getEndingEdge(edgeColumn: number, nodeColumn: number, type: EdgeCommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;

package/dist/components/graph/commitzone/edges/PassThroughEdge.d.ts

@@ -1,4 +1,4 @@
-import type { CommitType } from '../../../../domain/commit/CommitTypes';
+import type { EdgeCommitType } from '../../../../domain/commit/CommitTypes';
 import type { ColumnColorByColumn, SvgElement } from '../../../../domain/graph/GraphTypes';
 export declare function clearPassThroughEdgeCache(): void;
-export declare function getPassThroughEdge(column: number, type: CommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;
+export declare function getPassThroughEdge(column: number, type: EdgeCommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;

package/dist/components/graph/commitzone/edges/StartingEdge.d.ts

@@ -1,4 +1,4 @@
-import type { CommitType } from '../../../../domain/commit/CommitTypes';
+import type { EdgeCommitType } from '../../../../domain/commit/CommitTypes';
 import type { ColumnColorByColumn, SvgElement } from '../../../../domain/graph/GraphTypes';
 export declare function clearStartingEdgeCache(): void;
-export declare function getStartingEdge(edgeColumn: number, nodeColumn: number, type: CommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;
+export declare function getStartingEdge(edgeColumn: number, nodeColumn: number, type: EdgeCommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;

package/dist/components/graph/common/GenericGraphZone.d.ts

@@ -3,7 +3,7 @@ import * as React from 'react';
 import type { CommitType, Sha } from '../../../domain/commit/CommitTypes';
 import type { Style } from '../../../domain/generic/GenericTypes';
 import type { GraphZoneType } from '../../../domain/graph/GraphConstants';
-import type { GetExternalIcon, GraphItemContext, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnCommitContextMenu, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit } from '../../../domain/graph/GraphTypes';
+import type { GetExternalIcon, GraphItemContext, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnCommitContextMenu, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, ScopeBoundaryKind } from '../../../domain/graph/GraphTypes';
 import type { ChildrenElements } from '../../../domain/ui/UiTypes';
 type Props = {
     clearCurrentlyHoveredGraphCommit: OnClearCurrentlyHoveredGraphCommit;
@@ -15,6 +15,7 @@ type Props = {
     dimRowsOfSelectedCommit?: boolean;
     getExternalIcon: GetExternalIcon;
     graphZoneType: GraphZoneType;
+    hasActive?: boolean;
     hasAvatars?: boolean;
     highlightRowsOnRefHover: boolean;
     isDimmedMergeCommitRow: boolean;
@@ -29,6 +30,7 @@ type Props = {
     onClickCommit: OnClickCommit;
     onDoubleClickCommit: OnDoubleClickCommit;
     rowContext?: GraphItemContext | null;
+    scopeBoundaryKind?: ScopeBoundaryKind;
     setAsCurrentlyHoveredGraphCommit: OnCurrentlyHoveredGraphCommit;
     sha: Sha;
     showColorStrip?: boolean;

package/dist/components/graph/refzone/RefZone.d.ts

@@ -2,7 +2,7 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import type { CommitType, Sha } from '../../../domain/commit/CommitTypes';
 import type { Style } from '../../../domain/generic/GenericTypes';
-import type { GetExternalIcon, GetMissingRefMetadata, GraphItemContext, GraphRefGroup, IncludeOnlyRefsById, IncludeOnlyRemotesByName, OnClearCurrentlyHoveredGraphCommit, OnClickRef, OnDoubleClickRef, OnRefBeginDrag, OnRefCanDrag, OnRefCanDrop, OnRefDragEnter, OnRefDragLeave, OnRefDrop, OnRefEndDrag, OnRefNodeHovered, OnRefNodeUnhovered, OnRefZoneContextMenu, OnRefZoneHovered, OnRefZoneUnhovered, OnToggleRefNodesShown, RefGroupContexts, RefMetadataById, RefMetadataType } from '../../../domain/graph/GraphTypes';
+import type { GetExternalIcon, GetMissingRefMetadata, GraphItemContext, GraphRefGroup, IncludeOnlyRefsById, IncludeOnlyRemotesByName, OnClearCurrentlyHoveredGraphCommit, OnClickRef, OnDoubleClickRef, OnRefBeginDrag, OnRefCanDrag, OnRefCanDrop, OnRefDragEnter, OnRefDragLeave, OnRefDrop, OnRefEndDrag, OnRefNodeHovered, OnRefNodeUnhovered, OnRefZoneContextMenu, OnRefZoneHovered, OnRefZoneUnhovered, OnToggleRefNodesShown, RefGroupContexts, RefMetadataById, RefMetadataType, ScopeBoundaryKind } from '../../../domain/graph/GraphTypes';
 import type { TranslationFn } from '../../../domain/language/LanguageTypes';
 import type { RefIconsPosition } from '../../../domain/ref/RefTypes';
 type RefZoneDefaultProps = {
@@ -12,6 +12,7 @@ type RefZoneProps = {
     column: number;
     columnForColoring?: number;
     context: GraphItemContext | null;
+    scopeBoundaryKind?: ScopeBoundaryKind;
     enableShowHideRefsOptions: boolean;
     showGhostRefsOnRowHover: boolean;
     getExternalIcon: GetExternalIcon;

package/dist/components/graph/rowRenderers/CommitMessageZoneRow.d.ts

@@ -2,12 +2,13 @@ import type { GridCellRenderer } from 'react-virtualized';
 import type { GraphCommitDescDisplayMode } from '../../../domain/graph/GraphConstants';
 import type { CommonGraphRowDispatchProps, CommonGraphRowProps, OnCommitMessageChange, OnWipMessageBlur, OnWipMessageFocus } from '../../../domain/graph/GraphTypes';
 import type { GetRealKeyForCellFunc } from '../../../domain/reactvirtualized/ReactVirtualizedHelpers';
-import type { WorkDirStats } from '../../../domain/workdir/WorkDirTypes';
+import type { WipNodeMetadataBySha, WorkDirStats } from '../../../domain/workdir/WorkDirTypes';
 interface StateProps {
     graphCommitDescDisplayMode: GraphCommitDescDisplayMode;
     isCommitting: boolean;
     pendingCommitMessageSummary: string;
     workDirStats?: WorkDirStats;
+    wipNodeMetadataBySha?: WipNodeMetadataBySha;
     wipMessageEditable: boolean;
 }
 interface DispatchProps {

package/dist/components/graph/rowRenderers/CommitZoneRow.d.ts

@@ -1,9 +1,11 @@
 import type { GridCellRenderer } from 'react-virtualized';
 import type { AvatarUrlByEmail, ColumnColorByColumn, CommonGraphRowDispatchProps, CommonGraphRowProps, GetMissingAvatar, GraphZoneModeConstants, NodeOffsetByColumn, NodeOpacityByColumn } from '../../../domain/graph/GraphTypes';
 import type { GetRealKeyForCellFunc } from '../../../domain/reactvirtualized/ReactVirtualizedHelpers';
+import type { WipNodeMetadataBySha } from '../../../domain/workdir/WorkDirTypes';
 interface OwnProps {
     avatarUrlByEmail: AvatarUrlByEmail;
     graphZoneModeConstants: GraphZoneModeConstants;
+    wipNodeMetadataBySha?: WipNodeMetadataBySha;
     height: number;
     onMissingAvatar: GetMissingAvatar;
     columnColorByColumn: ColumnColorByColumn;

package/dist/domain/commit/CommitHelpers.d.ts

@@ -1,5 +1,5 @@
-import type { Author, CommitType, Sha, ShortSha } from './CommitTypes';
-export declare const hasPendingChanges: (type: CommitType) => boolean;
+import type { Author, EdgeCommitType, Sha, ShortSha } from './CommitTypes';
+export declare const hasPendingChanges: (type: EdgeCommitType) => boolean;
 export declare const getShortSha: (sha?: Sha | null, shaLength?: number) => ShortSha;
 export declare function getCommitMessageDescription(commitMessage: string, lineEnding?: string): string;
 export declare function getCommitMessageCoauthors(commitMessageDescription: string): Author[];

package/dist/domain/commit/CommitTypes.d.ts

@@ -3,6 +3,7 @@ export type Sha = string;
 export type ShortSha = string;
 export type WorkDirType = typeof mergeConflictNodeType | typeof unsupportedRebaseWarningNodeType | typeof workDirType;
 export type CommitType = typeof commitNodeType | typeof mergeNodeType | typeof stashNodeType | WorkDirType;
+export type EdgeCommitType = CommitType | 'synthetic-edge';
 export type Author = {
     name: string;
     email: string;

package/dist/domain/edge/EdgeHelpers.d.ts

@@ -1,10 +1,10 @@
-import type { CommitType } from '../commit/CommitTypes';
+import type { EdgeCommitType } from '../commit/CommitTypes';
 import type { ColumnColor, LineSvgProps, RowEdges, SvgElement, SvgElementName, SvgProps, SvgStyles } from '../graph/GraphTypes';
 export declare function getXValueAtColumn(column: number, columnWidth: number, gutterWidth: number, isCompact?: boolean): number;
 export declare function clearXValueAtColumnCache(): void;
 export declare function getSvgElement(element: SvgElementName, props: SvgProps): SvgElement;
 export declare function getLineElement(props: LineSvgProps): SvgElement;
-export declare function getSvgStyles(type: CommitType, color: ColumnColor, strokeWidth: number, isCompact?: boolean): SvgStyles;
-export declare function buildStartingOrEndingEdgeHash(edgeColumn: number, nodeColumn: number, type: CommitType | undefined, isCompact?: boolean): string;
-export declare function buildPassThroughEdgeHash(column: number, type: CommitType | undefined, isCompact?: boolean): string;
+export declare function getSvgStyles(type: EdgeCommitType, color: ColumnColor, strokeWidth: number, isCompact?: boolean): SvgStyles;
+export declare function buildStartingOrEndingEdgeHash(edgeColumn: number, nodeColumn: number, type: EdgeCommitType | undefined, isCompact?: boolean): string;
+export declare function buildPassThroughEdgeHash(column: number, type: EdgeCommitType | undefined, isCompact?: boolean): string;
 export declare function buildEdgeHash(edges: RowEdges, edgeColumnMax: number, nodeColumn: number, isCompact?: boolean): string;

package/dist/domain/graph/GraphConstants.d.ts

@@ -91,7 +91,7 @@ export declare enum GraphColumnMode {
     Rich = "rich",
     Text = "text"
 }
-export type GraphMarkerType = 'head' | 'highlights' | 'localBranches' | 'pullRequests' | 'remoteBranches' | 'selection' | 'stashes' | 'tags' | 'upstream';
+export type GraphMarkerType = 'head' | 'highlights' | 'localBranches' | 'pullRequests' | 'remoteBranches' | 'selection' | 'stashes' | 'tags' | 'upstream' | 'wip';
 export declare enum GraphMarkerShape {
     Block = "block",
     FullLine = "fullLine",

package/dist/domain/graph/GraphEdgeHelpers.d.ts

@@ -0,0 +1,34 @@
+import type { Sha } from '../commit/CommitTypes';
+import type { EdgeByColumn, ProcessedGraphRow, RowEdges } from './GraphTypes';
+/**
+ * Derives the ending/passThrough edges that the current row inherits from the previous row's
+ * edge state. For each column the previous row occupied, the inherited edge is either:
+ *  - an ending, if its parentSha matches the current row's sha
+ *  - a passThrough, otherwise
+ *
+ * Between a concurrent passThrough and starting in the same column (which can happen when a
+ * chain above passes through a row that also starts a new edge in the same lane), we prefer
+ * the non-pending (real commit/merge) edge so that a WIP/synthetic edge doesn't shadow a
+ * real commit chain mid-flight. The bare fallback still carries pending edges forward when
+ * that's the only thing available.
+ */
+export declare function getEndingAndPassThroughEdgesByColumnFromPrevRow(currentSha: Sha, prevRowEdges: RowEdges): RowEdges;
+/**
+ * Builds the set of starting edges for a row — one per parent it points to. Edges for rows
+ * in `syntheticEdgeChildShas` are tagged `synthetic-edge` so the renderer draws them wavy.
+ *
+ * `columnBySha` maps already-processed shas to their assigned column. This is used for the
+ * non-first parents of a row (which reserve lanes beside the row's own column). The first
+ * parent lives on the current row's own column.
+ */
+export declare function getStartingEdgesByColumn(currentRow: ProcessedGraphRow, columnBySha: (sha: Sha) => number | undefined, syntheticEdgeChildShas: Set<Sha>): EdgeByColumn;
+/**
+ * Composes the full edge state for a row: inherited ending/passThrough edges from the prev
+ * row merged with this row's own starting edges.
+ */
+export declare function getFinalEdgeStateForGraphAndRow(currentRow: ProcessedGraphRow, prevRowEdges: RowEdges, columnBySha: (sha: Sha) => number | undefined, syntheticEdgeChildShas: Set<Sha>): RowEdges;
+/**
+ * Returns the highest column index present in an edges map. Edges render from column 0 up
+ * to (inclusive) this value, so the caller uses it as a loop bound when emitting SVG.
+ */
+export declare function getEdgeColumnMax(edges: RowEdges | undefined | null): number;

package/dist/domain/graph/GraphHelpers.d.ts

@@ -9,6 +9,11 @@ import { GraphColumnMode } from './GraphConstants';
 import type { BaseMetadata, ExternalIconKeys, GetMissingRefMetadata, GraphColumnWidthConstraints, GraphItemContext, GraphRef, GraphRefGroup, GraphRow, GraphZoneModeConstants, Head, HighlightedShas, ProcessedGraphRow, ProcessedGraphRowBySha, Ref, RefMetadata, RefMetadataById, RefMetadataType, RowStatsConstraints } from './GraphTypes';
 export type DebouncableFn = (...args: any) => void;
 export type DebouncedFn = (...args: any) => void;
+export type CachedRowVisibilityState = {
+    hasBaseFilteredTags: boolean;
+    hasFilteredBranches: boolean;
+};
+export declare function getVisibleRowShasWithoutStashAnchoring(graphRows: GraphRow[], cachedRowVisibilityByIndex: CachedRowVisibilityState[], tagsRequireBranchOrVisibleChild: boolean): Set<Sha>;
 export declare const debounceFrame: (func: DebouncableFn) => DebouncedFn;
 export type ThrottleableFn = (...args: any) => void;
 export type ThrottledFn = (...args: any) => void;
@@ -65,6 +70,7 @@ export declare function getHeadRefShaFromGraphRows(graphRows: GraphRow[]): Sha |
 export declare function isWorkDirNodeType(nodeType: CommitType): boolean;
 export declare function isCommitNodeType(nodeType: CommitType): boolean;
 export declare function workDirStatsHaveChanges(workDirStats?: WorkDirStats): boolean;
+export declare function shouldShowWorkDirRow(workDirStats: WorkDirStats | undefined, wipVisibility: 'always' | 'auto' | undefined): boolean;
 export declare function hasSingleSelectedSha(selectedShas: Set<Sha>): boolean;
 export declare function isSingleSelected(selectedShas: Set<Sha>, sha: Sha): boolean;
 export declare function getScrollToAlignment(rowHeight: number, clientHeight: number, scrollTop: number, scrollToIndex: number): Alignment;

package/dist/domain/graph/GraphTypes.d.ts

@@ -1,7 +1,7 @@
 import type { GridCellRenderer, ScrollParams } from 'react-virtualized';
 import type { ReactElement, ReactNode } from 'react';
 import type { CommitDateTimeSources } from '../commit/CommitConstants';
-import type { CommitType, Sha } from '../commit/CommitTypes';
+import type { CommitType, EdgeCommitType, Sha } from '../commit/CommitTypes';
 import type { CssVariables } from '../generic/GenericTypes';
 import type { HostingServiceType, IssueTrackerType } from '../hostingservice/HostingServiceTypes';
 import type { TranslationFn } from '../language/LanguageTypes';
@@ -38,6 +38,7 @@ export type EdgeCache = {
 export type ArcEndpointAngle = 0 | 90 | 180 | 270;
 export interface SvgStyles {
     fill: string;
+    filter?: string;
     shapeRendering: string;
     strokeLinejoin: string;
     strokeWidth: number;
@@ -57,7 +58,7 @@ export type SvgProps = ArcSvgProps | LineSvgProps;
 export type AnySvgProps = ArcSvgProps & LineSvgProps;
 export type Edge = {
     parentSha: Sha;
-    type: CommitType;
+    type: EdgeCommitType;
 };
 export type EdgeByColumn = {
     [column: number]: Edge;
@@ -136,6 +137,45 @@ export type IsSelectedBySha = {
 export type HighlightedShas = {
     [sha: Sha]: boolean;
 };
+export type SyntheticParentsBySha = Map<Sha, Sha[]>;
+export interface GraphScope {
+    /** Full ref id of the specific branch to scope to (e.g. 'refs/heads/feature/x'). NOT necessarily HEAD. */
+    branchRef: string;
+    /** Full ref id of the branch's upstream (e.g. 'refs/remotes/origin/feature/x'). */
+    upstreamRef?: string;
+    /** SHA of the merge-target tip commit. Its ancestors are NOT walked — the tip is kept as a marker. */
+    mergeTargetTipSha?: Sha;
+    /**
+     * Additional ref ids to include in the scope. Each tip becomes an anchor (same treatment as
+     * branchRef — shows all refs, acts as visibility floor) and its ancestors contribute to
+     * visibleShas subject to the mergeTarget exclusion.
+     *
+     * Primary use case: branches stacked on top of the focal branch (e.g. F2, F3 stacked on F1).
+     * The helper makes no stackedness check — any refs are valid (siblings, comparisons, etc.).
+     */
+    additionalBranchRefs?: string[];
+    /** How to render gaps when an anchor's real parents are hidden. Defaults to 'syntheticEdge'. */
+    collapseStyle?: 'syntheticEdge' | 'gap';
+}
+export interface ScopeVisibility {
+    visibleShas: Set<Sha>;
+    anchorShas: Set<Sha>;
+    /** Fork points (merge bases) where an anchor's ancestor walk terminated. Visual boundary "below" the focus group. */
+    forkPointShas: Set<Sha>;
+    /** The merge-target tip sha, when scope.mergeTargetTipSha was provided. Visual boundary "above" the focus group. */
+    mergeTargetShas: Set<Sha>;
+    syntheticParentsBySha: SyntheticParentsBySha;
+    /** Anchors whose synthetic walk failed — merge base not in loaded rows. Consumer should fetch more data. */
+    unreachableAnchors: Set<Sha>;
+    /**
+     * True when scope walks terminated at identified boundaries — at least one fork point was
+     * found AND no anchor was left unreachable. When false, the scope may be incomplete due to
+     * missing data (merge base not loaded, foreign ref not yet surfaced, partial history). Callers
+     * should NOT suppress commit autoloading while this is false — more data could establish the
+     * missing boundary.
+     */
+    isBounded: boolean;
+}
 export type IsExcludedBySha = {
     [id: Sha]: boolean;
 };
@@ -325,6 +365,8 @@ export interface ReadonlyGraphRow extends ReadonlyDeep<GraphRow> {
     /** Whether the row is hidden from the graph (filtered out by type or other filters). Output only */
     readonly hidden: boolean;
 }
+/** Which scope-boundary role this row plays, when an active scope identifies it as one. */
+export type ScopeBoundaryKind = 'forkPoint' | 'mergeTarget';
 export interface ProcessedGraphRow extends GraphRow {
     rowIndex?: number;
     column: number;
@@ -341,6 +383,7 @@ export interface ProcessedGraphRow extends GraphRow {
     timeLineEntry?: TimelineEntry;
     childRefs?: ChildRefsByType;
     refsData?: GraphRefsData;
+    scopeBoundaryKind?: ScopeBoundaryKind;
 }
 export type TopAndBottomVisibleRowIndex = {
     top: number;

package/dist/domain/graph/ScopedGraphHelpers.d.ts

@@ -0,0 +1,15 @@
+import type { GraphRow, GraphScope, ScopeVisibility } from './GraphTypes';
+export declare function computeScopeVisibility(rows: GraphRow[], scope: GraphScope): ScopeVisibility;
+/**
+ * Returns true when a WIP row should be hidden under an active scope.
+ *
+ * Secondary (per-worktree) WIP rows are kept only when their parent is a branch anchor of the
+ * scope — i.e. the tip of `branchRef`, `upstreamRef`, or one of `additionalBranchRefs` (so a
+ * worktree checked out on a scoped branch still surfaces its WIP, even when empty). The merge
+ * target tip is excluded: it's a boundary, not a focused branch.
+ *
+ * The primary WIP row, merge-conflict node, and unsupported-rebase warning node are tied to
+ * the primary repo's HEAD. They are kept whenever at least one of their parents is in the
+ * scope's visible set; otherwise they would render as floating nodes with no anchoring topology.
+ */
+export declare function shouldHideWipRowForScope(row: GraphRow, scopeVisibility: ScopeVisibility | null): boolean;

package/dist/domain/graph/row/ProcessedGraphRowObj.d.ts

@@ -2,7 +2,7 @@ import type { ReactNode } from 'react';
 import type { IGraphContainer } from '../../../components/graph/IGraphContainer';
 import type { CommitType, Sha } from '../../commit/CommitTypes';
 import type { TimelineEntry } from '../GraphConstants';
-import type { ChildRefsByType, GraphRefsData, GraphRow, Head, ProcessedGraphRow, Remote, RowContexts, RowEdges, Tag } from '../GraphTypes';
+import type { ChildRefsByType, GraphRefsData, GraphRow, Head, ProcessedGraphRow, Remote, RowContexts, RowEdges, ScopeBoundaryKind, Tag } from '../GraphTypes';
 export declare class ProcessedGraphRowObj implements ProcessedGraphRow {
     private _graph;
     private _message;
@@ -27,6 +27,7 @@ export declare class ProcessedGraphRowObj implements ProcessedGraphRow {
     edges: RowEdges;
     childRefs: ChildRefsByType;
     timeLineEntry?: TimelineEntry;
+    scopeBoundaryKind?: ScopeBoundaryKind;
     summary: string;
     body?: string;
     displaySummary: string | ReactNode;

package/dist/domain/graph/rowAdornment/RowAdornmentHelpers.d.ts

@@ -0,0 +1,14 @@
+import type { Sha } from '../../commit/CommitTypes';
+/**
+ * Builds the CSS `<dashed-ident>` used to tie a graph row's `anchor-name`
+ * to the overlay's `position-anchor`. Shas are arbitrary caller-provided
+ * strings (e.g. `worktree-wip::/some/path` for multi-WIP rows) and may
+ * contain characters that aren't valid inside a CSS <custom-ident>, so
+ * each unsafe character is prefixed with `\` — a single-character CSS
+ * escape that preserves readability in DevTools while keeping the
+ * identifier parseable by the browser.
+ *
+ * Letters, digits, hyphen, underscore, and non-ASCII code points are
+ * already legal inside a CSS ident and pass through unchanged.
+ */
+export declare function getRowAnchorName(sha: Sha): string;

package/dist/domain/workdir/WorkDirHelpers.d.ts

@@ -0,0 +1,50 @@
+import type { ReactElement } from 'react';
+import type { Sha } from '../commit/CommitTypes';
+import type { VisibleWipShas, WipNodeMetadataBySha, WipShasMissingStats, WorkDirStats } from './WorkDirTypes';
+/** Translation key for the WIP row's label, selected based on stats state. */
+export type WipRowMessageKey = 'Graph-WorkInProgress' | 'Graph-WorkInProgress-Changes' | 'Graph-WorkInProgress-Clean';
+/**
+ * Picks the translation key for a WIP row's label based on the stats it has (or doesn't have):
+ * - `Graph-WorkInProgress-Changes` when stats show any added/modified/deleted activity
+ * - `Graph-WorkInProgress-Clean` when stats are present but all zero (queried, clean)
+ * - `Graph-WorkInProgress` when stats are not yet known (neutral fallback)
+ */
+export declare function getWipRowMessageKey(workDirStats: WorkDirStats | undefined): WipRowMessageKey;
+export type ResolvedWipState = {
+    isPrimaryWip: boolean;
+    effectiveWorkDirStats: WorkDirStats | undefined;
+    hasWorkDirChanges: boolean;
+    isWipEditable: boolean;
+    customWipContent: ReactElement<any> | null;
+    needsWipStatsRequest: boolean;
+};
+/**
+ * Resolves the effective WIP state for a given row.
+ *
+ * For the primary WIP row (sha === workDirType), uses the global workDirStats.
+ * For secondary WIP rows, uses the per-row metadata from wipNodeMetadataBySha. There is
+ * NO fallback to the global workDirStats — secondary rows belong to other worktrees, and
+ * painting the primary repo's counts on them would be wrong. Until per-row stats arrive,
+ * the pill renders nothing and `needsWipStatsRequest` triggers a deferred fetch.
+ */
+export declare function resolveWipState(sha: Sha, type: string, workDirStats: WorkDirStats | undefined, wipNodeMetadataBySha: WipNodeMetadataBySha | undefined, wipMessageEditable: boolean): ResolvedWipState;
+/** Predicate for secondary-WIP rows (per-worktree WIPs), excluding the primary WIP row. */
+export declare function isSecondaryWipRow(row: {
+    sha: Sha;
+    type?: string;
+}): boolean;
+/** Key-set equality for `VisibleWipShas` / `WipShasMissingStats`-shaped records (values are always `true`). */
+export declare function areVisibleWipShasEqual(a: VisibleWipShas, b: VisibleWipShas): boolean;
+/**
+ * Given the set of currently-visible secondary-WIP shas, the prior dedup map of shas already
+ * requested, and the per-sha metadata, compute (a) the pruned dedup map that only retains entries
+ * for shas still visible, and (b) the set of shas whose stats should be requested this tick.
+ *
+ * Shas that have left the viewport are dropped from the dedup so they can be re-asked on re-entry.
+ * Shas with `customContent` override or with non-stale `workDirStats` already populated are not
+ * added to `missing`.
+ */
+export declare function computeWipMissingShasUpdate(current: VisibleWipShas, priorRequestedDedup: WipShasMissingStats, metadataBySha: WipNodeMetadataBySha | undefined): {
+    missing: WipShasMissingStats;
+    prunedRequestedDedup: WipShasMissingStats;
+};

package/dist/domain/workdir/WorkDirTypes.d.ts

@@ -1,3 +1,5 @@
+import type { ReactElement } from 'react';
+import type { Sha } from '../commit/CommitTypes';
 import type { GraphItemContext } from '../graph/GraphTypes';
 export type WorkDirStats = {
     added: number;
@@ -6,3 +8,52 @@ export type WorkDirStats = {
     context?: GraphItemContext;
     renamed?: number;
 };
+/**
+ * Per-row decoration for a secondary (worktree) WIP graph row. Looked up by the row's `sha`.
+ *
+ * Not applied to the primary WIP row (`sha === workDirType`); use the `workDirStats` prop for that one.
+ *
+ * @see docs/multi-wip-rows.md
+ */
+export type WipNodeMetadata = {
+    /**
+     * Stats for this secondary WIP row's worktree. Omit to have the library request them via
+     * `onWipShasMissingStats`. Until per-row stats arrive, the pill renders nothing — the library does
+     * NOT fall back to the global `workDirStats` (which belongs to the primary repo).
+     */
+    workDirStats?: WorkDirStats;
+    /** When true, the library requests fresh stats while continuing to render `workDirStats` (stale-while-revalidate). */
+    workDirStatsStale?: boolean;
+    /** If provided, renders this element in place of the default WIP stats pill. Suppresses any stats request. */
+    customContent?: ReactElement<any>;
+    /** If provided, renders this avatar URL inside the graph node circle instead of the default WIP dot. */
+    nodeAvatarUrl?: string;
+};
+/**
+ * Decoration map for secondary WIP rows, keyed by the row's `sha`. The library does not create rows from
+ * this map — provide the row in `graphRows` and this map augments it.
+ */
+export type WipNodeMetadataBySha = Record<Sha, WipNodeMetadata>;
+/**
+ * Batched set of secondary-WIP shas for which the library is requesting stats. Delivered to the
+ * `onWipShasMissingStats` callback after a 100ms debounce with dedup.
+ */
+export type WipShasMissingStats = Record<Sha, true>;
+/**
+ * Caller-supplied handler invoked when one or more secondary WIP rows need stats fetched.
+ * Handler should async-fetch and push back an updated `wipNodeMetadataBySha` reference with
+ * `workDirStats` populated for each requested sha.
+ */
+export type OnWipShasMissingStats = (shas: WipShasMissingStats) => void;
+/**
+ * Batched set of secondary-WIP shas currently rendered in the viewport. Delivered to the
+ * `onVisibleWipShasChanged` callback after a 100ms debounce when the set changes.
+ */
+export type VisibleWipShas = Record<Sha, true>;
+/**
+ * Caller-supplied handler invoked when the set of secondary WIP rows visible in the viewport changes.
+ * Use this to acquire/release per-worktree resources (filesystem watchers, subscriptions, etc.) as
+ * rows scroll in and out of view. Consumers diff the provided set against their own tracking to
+ * decide what to hook/unhook.
+ */
+export type OnVisibleWipShasChanged = (shas: VisibleWipShas) => void;