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

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

@@ -1,7 +1,7 @@
 import type { Alignment, GridCellRangeRenderer } from 'react-virtualized';
 import type { ReactElement } from 'react';
 import type { GraphMarkerType, GraphZone, GraphZoneType } from '../../domain/graph/GraphConstants';
-import type { ColumnContentGenerator, GetExternalIcon, GraphMarkerColors, GraphMarkerRowIndices, OnGraphZoneResize, OnGraphZoneResizeEnd, OnGraphZoneResizeFromPropChange, OnScrollForZone, ProcessedGraphRow, RowRenderersByIds } from '../../domain/graph/GraphTypes';
+import type { ColumnContentGenerator, GetExternalIcon, GraphMarkerColors, GraphMarkerRowIndices, InteractiveScrollMarker, OnGraphZoneResize, OnGraphZoneResizeEnd, OnGraphZoneResizeFromPropChange, OnScrollForZone, OnScrollMarkerClicked, ProcessedGraphRow, RowRenderersByIds } from '../../domain/graph/GraphTypes';
 import type { TranslationFn } from '../../domain/language/LanguageTypes';
 import type { GetRealKeyForCellFunc } from '../../domain/reactvirtualized/ReactVirtualizedHelpers';
 import type { OnMouseEnter } from '../../domain/ui/UiTypes';
@@ -24,6 +24,8 @@ type GraphColumnProps = {
     isLoadingRows: boolean;
     markerColors: GraphMarkerColors;
     markerRowIndices: GraphMarkerRowIndices;
+    interactiveScrollMarkers?: readonly InteractiveScrollMarker[];
+    onScrollMarkerClicked?: OnScrollMarkerClicked;
     makeColumnContents?: ColumnContentGenerator;
     onResize?: OnGraphZoneResize;
     onResizeEnd?: OnGraphZoneResizeEnd;
@@ -42,5 +44,5 @@ type GraphColumnProps = {
     translate: TranslationFn;
     verticalScrollWidth: number;
 };
-export declare function GraphColumn({ branchUpstreamRowIndices, rowCount, cellRenderersByIds, columnIndex, customFooterRow, enabledScrollMarkerTypes, enableResizer, getExternalIcon, getKeyForCell, graphHeight, graphWidth, graphZoneType, graphZones, hasMoreCommits, horizontalScrollHeight, isFilteredSearch, isLoadingRows, markerColors, markerRowIndices, onResize, onResizeEnd, onResizeFromPropChange, onScroll, onScrollToRowCausedUpdate, onZoneEnter, processedRows, scrollLeft, scrollToAlignment, scrollToIndex, scrollTop, smartCellRangeRenderer, stickyTimeline, translate, verticalScrollWidth, }: GraphColumnProps): ReactElement<any> | null;
+export declare function GraphColumn({ branchUpstreamRowIndices, rowCount, cellRenderersByIds, columnIndex, customFooterRow, enabledScrollMarkerTypes, enableResizer, getExternalIcon, getKeyForCell, graphHeight, graphWidth, graphZoneType, graphZones, hasMoreCommits, horizontalScrollHeight, isFilteredSearch, isLoadingRows, markerColors, markerRowIndices, interactiveScrollMarkers, onScrollMarkerClicked, onResize, onResizeEnd, onResizeFromPropChange, onScroll, onScrollToRowCausedUpdate, onZoneEnter, processedRows, scrollLeft, scrollToAlignment, scrollToIndex, scrollTop, smartCellRangeRenderer, stickyTimeline, translate, verticalScrollWidth, }: GraphColumnProps): ReactElement<any> | null;
 export {};

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

@@ -5,7 +5,7 @@ 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, 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 { 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, InteractiveScrollMarker, 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';
@@ -203,6 +203,7 @@ type ComponentState = {
     isLoadingRows: boolean;
     numGraphColumns: number;
     markerRowIndices: GraphMarkerRowIndices;
+    interactiveScrollMarkers: InteractiveScrollMarker[];
     pendingCommitMessageSummary: string;
     processedRows: ProcessedGraphRow[];
     refIconsPosition: RefIconsPosition;
@@ -291,6 +292,7 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     visibleWipShasTimer?: ReturnType<typeof setTimeout>;
     lastFiredVisibleWipShas: VisibleWipShas | undefined;
     branchUpstreamRowIndices: number[];
+    private interactiveScrollMarkersFromRows;
     downstreamsByUpstream: DownstreamsByUpstream;
     timelinesInterval?: ReturnType<typeof setInterval>;
     constructor(props: Props);
@@ -500,6 +502,10 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     getLeftGutterBoxShadowAlpha(themeOpacityFactor: number): number;
     getRightGutterBoxShadowAlpha(themeOpacityFactor: number): number;
     updateMarkerRowIndices(types: GraphMarkerType[], nextProps?: GraphContainerProps): void;
+    private computeInteractiveScrollMarkers;
+    private onScrollMarkerClicked;
+    private getHeadPillDirection;
+    private onHeadPillClick;
     getMarkerColors(): GraphMarkerColors;
     initializeGraphZones(zoneSettings: GraphColumnsSettings | undefined, zoneOrdering: GraphZoneType[], width: number): GraphZone[];
     maybeSortGraphZoneOrderingFromSettings(zoneSettings?: GraphColumnsSettings): void;

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

@@ -1,7 +1,7 @@
 import type { ReactElement } from 'react';
 import * as React from 'react';
 import type { GraphMarkerType } from '../../domain/graph/GraphConstants';
-import type { GraphMarkerColors, GraphMarkerRowIndices } from '../../domain/graph/GraphTypes';
+import type { GetExternalIcon, GraphMarkerColors, GraphMarkerRowIndices, InteractiveScrollMarker, OnScrollMarkerClicked } from '../../domain/graph/GraphTypes';
 interface Props {
     branchUpstreamRowIndices: number[];
     enabledScrollMarkerTypes: GraphMarkerType[];
@@ -9,14 +9,35 @@ interface Props {
     viewportHeight: number;
     markerRowIndices: GraphMarkerRowIndices;
     markerColors: GraphMarkerColors;
+    scrollTop: number;
     scrollWidth?: number;
     totalRows: number;
+    interactiveMarkers?: readonly InteractiveScrollMarker[];
+    onMarkerClick?: OnScrollMarkerClicked;
+    getExternalIcon?: GetExternalIcon;
 }
-export default class ScrollMarker extends React.PureComponent<Props> {
+interface HoveredRow {
+    rowIndex: number;
+    markers: InteractiveScrollMarker[];
+    tooltipTop: number;
+    color: string;
+}
+interface State {
+    hovered: HoveredRow | null;
+}
+export default class ScrollMarker extends React.PureComponent<Props, State> {
     canvas: HTMLCanvasElement | null;
+    state: State;
+    private memoMarkersByRow;
     componentDidMount(): void;
-    componentDidUpdate(nextProps: Props): void;
+    componentDidUpdate(prevProps: Props): void;
     updateCanvas(nextProps?: Props): void;
-    render(): ReactElement<'canvas'>;
+    private setHoveredRow;
+    private pickRowColor;
+    private clearHoveredIfRow;
+    private onRowHitMove;
+    private onRowHitClick;
+    private getMarkersByRowMemo;
+    render(): ReactElement<'div'>;
 }
 export {};

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

@@ -66,6 +66,7 @@ export declare function getGraphZoneModeConstants(graphZoneMode?: GraphColumnMod
 export declare const makeGetKeyForCell: (rows: ProcessedGraphRow[]) => GetRealKeyForCellFunc;
 export declare function getZoneWidthWithVerticalScrollbar(graphZoneType: GraphZoneType, activeGraphZones: GraphZone[]): number;
 export declare function rowContainsCurrentHeadRef(row?: ProcessedGraphRow | GraphRow): boolean;
+export declare function rowIsActiveHead(row?: ProcessedGraphRow | GraphRow): boolean;
 export declare function getHeadRefShaFromGraphRows(graphRows: GraphRow[]): Sha | undefined;
 export declare function isWorkDirNodeType(nodeType: CommitType): boolean;
 export declare function isCommitNodeType(nodeType: CommitType): boolean;
@@ -117,6 +118,7 @@ export declare class GraphRowHelper {
     isSingleSelected(rowIndex: number): boolean;
     hasTimeline(rowIndex: number): boolean;
     rowContainsCurrentHeadRef(row?: ProcessedGraphRow): boolean;
+    rowIsActiveHead(row?: ProcessedGraphRow): boolean;
 }
 export declare function first<T>(source: Iterable<T> | IterableIterator<T>): T | undefined;
 export declare function last<T>(source: Iterable<T>): T | undefined;

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

@@ -145,6 +145,17 @@ export interface GraphScope {
     upstreamRef?: string;
     /** SHA of the merge-target tip commit. Its ancestors are NOT walked — the tip is kept as a marker. */
     mergeTargetTipSha?: Sha;
+    /**
+     * Merge base between branchRef and mergeTargetTipSha (or the fork point of branchRef from
+     * its parent line, when mergeTargetTipSha is omitted). When provided, `sha` is the
+     * authoritative boundary — no first-parent inference is performed. The branch ancestor walk
+     * terminates at this sha and the sha is added to forkPointShas (when loaded) or branchTip is
+     * added to unreachableAnchors (when not loaded). Object-typed (rather than a bare Sha) so the
+     * host can attach additional metadata in the future without breaking the type.
+     */
+    mergeBase?: {
+        sha: 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
@@ -442,6 +453,13 @@ export type GraphMarkerColors = {
 export type GraphMarkerRowIndices = {
     [marker: string]: number[];
 };
+export interface InteractiveScrollMarker {
+    type: GraphMarkerType;
+    rowIndex: number;
+    sha: Sha;
+    label: string;
+}
+export type OnScrollMarkerClicked = (sha: Sha, rowIndex: number, type: GraphMarkerType) => void;
 export type AvatarUrlByEmail = {
     [email: string]: string;
 };