@gitkraken/gitkraken-components 10.1.7 → 10.1.8

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

@@ -1,16 +1,16 @@
 import type { Alignment, GridCellRangeRenderer } from 'react-virtualized';
 import type { ReactElement } from 'react';
-import type { CssVariables } from '../../domain/generic/GenericTypes';
-import type { GraphZone, GraphZoneType } from '../../domain/graph/GraphConstants';
-import type { ColumnContentGenerator, GetExternalIcon, OnGraphZoneResize, OnGraphZoneResizeEnd, OnGraphZoneResizeFromPropChange, OnScrollForZone, RowRenderersByIds } from '../../domain/graph/GraphTypes';
+import type { GraphMarkerType, GraphZone, GraphZoneType } from '../../domain/graph/GraphConstants';
+import type { ColumnContentGenerator, GetExternalIcon, GraphMarkerColors, GraphMarkerRowIndices, OnGraphZoneResize, OnGraphZoneResizeEnd, OnGraphZoneResizeFromPropChange, OnScrollForZone, 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';
 type GraphColumnProps = {
+    branchUpstreamRowIndices: number[];
     rowCount: number;
-    cssVariables: CssVariables;
     columnIndex: number;
     enableResizer?: boolean;
+    enabledScrollMarkerTypes: GraphMarkerType[];
     getExternalIcon: GetExternalIcon;
     getKeyForCell: GetRealKeyForCellFunc;
     graphHeight: number;
@@ -18,7 +18,10 @@ type GraphColumnProps = {
     graphZoneType: GraphZoneType;
     graphZones: GraphZone[];
     hasMoreCommits: boolean;
+    horizontalScrollHeight: number;
     isLoadingRows: boolean;
+    markerColors: GraphMarkerColors;
+    markerRowIndices: GraphMarkerRowIndices;
     makeColumnContents?: ColumnContentGenerator;
     onResize?: OnGraphZoneResize;
     onResizeEnd?: OnGraphZoneResizeEnd;
@@ -33,6 +36,7 @@ type GraphColumnProps = {
     scrollTop: number;
     smartCellRangeRenderer: GridCellRangeRenderer;
     translate: TranslationFn;
+    verticalScrollWidth: number;
 };
-export declare function GraphColumn({ rowCount, cellRenderersByIds, columnIndex, cssVariables, enableResizer, getExternalIcon, getKeyForCell, graphHeight, graphWidth, graphZoneType, graphZones, hasMoreCommits, isLoadingRows, onResize, onResizeEnd, onResizeFromPropChange, onScroll, onScrollToRowCausedUpdate, onZoneEnter, scrollLeft, scrollToAlignment, scrollToIndex, scrollTop, smartCellRangeRenderer, translate, }: GraphColumnProps): ReactElement<any> | null;
+export declare function GraphColumn({ branchUpstreamRowIndices, rowCount, cellRenderersByIds, columnIndex, enabledScrollMarkerTypes, enableResizer, getExternalIcon, getKeyForCell, graphHeight, graphWidth, graphZoneType, graphZones, hasMoreCommits, horizontalScrollHeight, isLoadingRows, markerColors, markerRowIndices, onResize, onResizeEnd, onResizeFromPropChange, onScroll, onScrollToRowCausedUpdate, onZoneEnter, scrollLeft, scrollToAlignment, scrollToIndex, scrollTop, smartCellRangeRenderer, translate, verticalScrollWidth, }: GraphColumnProps): ReactElement<any> | null;
 export {};

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

@@ -233,9 +233,9 @@ declare class GraphContainer extends React.PureComponent<Props, ComponentState>
     selectSha(sha: Sha, isAutoOrKeyScroll?: boolean): void;
     updateWidthByZone(widthToAssignForZone: number, graphZoneType: GraphZoneType, updatePreferredWidth?: boolean): void;
     updateCommitZoneContentWidthFromChange(): void;
-    getCurrentWidthByZone(graphZoneType: GraphZoneType): number;
+    getCurrentWidthByZone(graphZoneType: GraphZoneType, withoutVerticalScrollWidth?: boolean): number;
     getCommitZoneContentWidth(): number;
-    getCommitZoneWidth(): number;
+    getCommitZoneWidth(withoutVerticalScrollWidth?: boolean): number;
     getSingleColumnModeFactor(): number;
     setScroll(graphZoneType: GraphZoneType, scroll: ScrollParams): void;
     getNonAdjustedScrollLeft(): number;
@@ -248,6 +248,8 @@ declare class GraphContainer extends React.PureComponent<Props, ComponentState>
     getScrollToIndex(): number;
     getScrollToAlignment(): Alignment;
     getMinNodeOffset(): number;
+    getHorizontalScrollHeight(graphZoneType: GraphZoneType, cssVariables: CssVariables, mergeDefaultCssVariables?: boolean): number;
+    getVerticalScrollWidth(graphZoneType: GraphZoneType, cssVariables: CssVariables, mergeDefaultCssVariables?: boolean): number;
     getMaxNodeOffset(): number;
     getAbsoluteNodeLeftByColumn(): AbsoluteNodeLeftByColumn;
     getNodeOffsetByColumn(): NodeOffsetByColumn;

package/dist/components/graph/changeszone/ChangesBar.d.ts

@@ -5,9 +5,9 @@ interface Props {
     getExternalIcon: GetExternalIcon;
     isLastColumn: boolean;
     isRowSelected: boolean;
-    scrollWidth: number;
     zoneWidth: number;
     stats: RowStats;
+    verticalScrollWidth: number;
 }
 export default function ChangesBar(props: Props): ReactElement<'div'>;
 export {};

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

@@ -30,7 +30,6 @@ type Props = {
     onClickCommit: OnClickCommit;
     onDoubleClickCommit: OnDoubleClickCommit;
     rowContext?: GraphItemContext | null;
-    scrollWidth: number;
     setAsCurrentlyHoveredGraphCommit: OnCurrentlyHoveredGraphCommit;
     sha: Sha;
     showColorStrip?: boolean;
@@ -41,6 +40,7 @@ type Props = {
     title?: string | null;
     translate: TranslationFn;
     type: CommitType;
+    verticalScrollWidth: number;
     workDirStats?: WorkDirStats;
     zoneWidth: number;
 };

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

@@ -0,0 +1,40 @@
+import type { ReactElement, ReactNode } from 'react';
+import React from 'react';
+export type ScrollParams = {
+    clientHeight: number;
+    clientWidth: number;
+    scrollHeight: number;
+    scrollLeft: number;
+    scrollTop: number;
+    scrollWidth: number;
+};
+export type Props = {
+    children: ReactNode;
+    contentHeight: number;
+    contentWidth: number;
+    displayHorizontalScrollbar?: boolean;
+    displayVerticalScrollbar?: boolean;
+    forceHorizontalScrollbar?: boolean;
+    forceVerticalScrollbar?: boolean;
+    height?: number;
+    onScroll?: ((params: ScrollParams) => any) | undefined;
+    scrollLeft?: number;
+    scrollTop?: number;
+    width?: number;
+};
+declare class ScrollbarContainer extends React.PureComponent<Props> {
+    horizontalScrollRef: React.RefObject<any>;
+    verticalScrollRef: React.RefObject<any>;
+    outerHorizontalScrollRef: React.RefObject<any>;
+    updateScrollbarValues(scrollLeft?: number, scrollTop?: number): void;
+    componentDidUpdate(prevProps: Props): void;
+    onHorizontalScroll(event: any): void;
+    onVerticalScroll(event: any): void;
+    componentDidMount(): void;
+    hasHorizontalScroll(): boolean;
+    hasVerticalScroll(): boolean;
+    getHorizontalScrollbarTickness(): number;
+    getAdjustedContentHeight(): number;
+    render(): ReactElement<any>;
+}
+export default ScrollbarContainer;

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

@@ -4,6 +4,7 @@ import type { GetRealKeyForCellFunc } from '../../../domain/reactvirtualized/Rea
 interface OwnProps {
     avatarUrlByEmail: AvatarUrlByEmail;
     graphZoneModeConstants: GraphZoneModeConstants;
+    height: number;
     onMissingAvatar: GetMissingAvatar;
     columnColorByColumn: ColumnColorByColumn;
     leftGutterBoxShadowAlpha: number;

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

@@ -1,23 +1,21 @@
 import type { ReactElement } from 'react';
 import React from 'react';
-import type { CssVariables, Style } from '../../../domain/generic/GenericTypes';
+import type { Style } from '../../../domain/generic/GenericTypes';
 import type { GraphZoneType } from '../../../domain/graph/GraphConstants';
 import type { GetExternalIcon } from '../../../domain/graph/GraphTypes';
 import type { TranslationFn } from '../../../domain/language/LanguageTypes';
 import EntireRowSpan from '../common/EntireRowSpan';
 type Props = {
-    cssVariables: CssVariables;
     currentCommits: number;
     getExternalIcon: GetExternalIcon;
     graphZoneType: GraphZoneType;
     hasMoreCommits: boolean;
     height: number;
+    horizontalScrollHeight: number;
     isLoadingRows: boolean;
     scrollTop: number;
     style: Style;
     translate: TranslationFn;
-    zoneContentWidth: number;
-    zoneWidth: number;
 };
 declare class CommitsInfoRow extends React.Component<Props> {
     render(): ReactElement<typeof EntireRowSpan>;

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

@@ -1,5 +1,4 @@
 export declare const DEFAULT_AVATAR_BACKGROUND_COLOR = "#199489";
-export declare const GRAPH_SCROLL_BAR_DEFAULT_WIDTH = 14;
 export declare const GRAPH_SCROLL_MARKER_LANES = 3;
 export declare const GRAPH_HEADER_ROW_HEIGHT = 26;
 export declare const GRAPH_ROW_HEIGHT = 28;

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

@@ -1,9 +1,10 @@
 import type { Alignment } from 'react-virtualized';
 import type { Sha } from '../commit/CommitTypes';
+import type { CssVariables } from '../generic/GenericTypes';
 import type { GetRealKeyForCellFunc } from '../reactvirtualized/ReactVirtualizedHelpers';
 import type { GraphRefType } from '../ref/RefTypes';
 import type { WorkDirStats } from '../workdir/WorkDirTypes';
-import type { GraphZone, GraphZoneType, TimelineEntriesByPeriod } from './GraphConstants';
+import type { GraphMarkerType, GraphZone, GraphZoneType, TimelineEntriesByPeriod } from './GraphConstants';
 import { GraphColumnMode } from './GraphConstants';
 import type { GetMissingRefMetadata, GraphColumnWidthConstraints, GraphItemContext, GraphRef, GraphRefGroup, GraphRow, GraphZoneModeConstants, HighlightedShas, IsSelectedBySha, ProcessedGraphRow, ProcessedGraphRowBySha, PullRequestMetadata, Ref, RefMetadata, RefMetadataById, RefMetadataType, RowStatsConstraints, UpstreamMetadata } from './GraphTypes';
 export type DebouncableFn = (...args: any) => void;
@@ -20,10 +21,19 @@ export declare function getRefIdByBaseRef(refType: GraphRefType, ref: Ref): stri
 export declare function getRefIdByGraphRef(ref: GraphRef): string;
 export declare function getLastShrinkableGraphZone(activeGraphZones: GraphZone[], stoppingIndex?: number): GraphZone | undefined;
 export declare function getFirstExpandableGraphZone(activeGraphZones: GraphZone[], startingIndex?: number): GraphZone | undefined;
+export declare function getScrollThickness(cssVariables: CssVariables, mergeDefaultCssVariables?: boolean): number;
 export declare function getZoneWidthsTotal(activeGraphZones: GraphZone[], zoneTypeToExclude?: GraphZoneType): number;
 export declare function getFollowingZoneMinWidthsTotal(activeGraphZones: GraphZone[], startingIndex?: number): number;
 export declare function getPrecedingZoneCurrentWidthsTotal(activeGraphZones: GraphZone[], endingIndex?: number): number;
 export declare const isLastColumn: (graphZoneType: GraphZoneType, activeGraphZones: GraphZone[]) => boolean;
+export declare function getMustShowMoreCommitsPanel(rowCount: number, hasMoreCommits: boolean, isLoadingRows: boolean): boolean;
+export declare function getAdjustedRowCount(rowCount: number, hasMoreCommits: boolean, isLoadingRows: boolean): number;
+export declare function getContentZoneHeight(rowCount: number, hasMoreCommits: boolean, isLoadingRows: boolean): number;
+export declare function getContentZoneWidth(activeGraphZone: GraphZone, rowCount: number): number;
+export declare function hasHorizontalScroll(activeGraphZone: GraphZone, rowCount: number): boolean;
+export declare function hasVerticalScroll(activeGraphZone: GraphZone, activeGraphZones: GraphZone[], hasMoreCommits: boolean, isLoadingRows: boolean, graphHeight: number, rowCount: number, isScrollMarkerEnabled: boolean): boolean;
+export declare function getHorizontalScrollHeight(graphZoneType: GraphZoneType, activeGraphZones: GraphZone[], graphRows: GraphRow[], cssVariables: CssVariables, mergeDefaultCssVariables?: boolean): number;
+export declare function getVerticalScrollWidth(graphZoneType: GraphZoneType, activeGraphZones: GraphZone[], hasMoreCommits: boolean, isLoadingRows: boolean, graphHeight: number, graphRows: GraphRow[], isScrollMarkerEnabled: boolean, cssVariables: CssVariables, mergeDefaultCssVariables?: boolean): number;
 export declare const isColumnFollowingGraphColumn: (graphZoneType: GraphZoneType, activeGraphZones: GraphZone[]) => boolean;
 export declare function getClampedZoneWidth(graphZone: GraphZone, activeGraphZones: GraphZone[], width: number): number;
 export declare function getGraphZoneFromGraphZones(graphZoneType: GraphZoneType, activeGraphZones: GraphZone[]): GraphZone | undefined;
@@ -31,7 +41,7 @@ export declare function getGraphZoneIndexFromGraphZones(graphZoneType: GraphZone
 export declare function getGraphZoneWidthConstraintsFromGraphZones(graphZoneType: GraphZoneType, activeGraphZones: GraphZone[], graphWidth: number): GraphColumnWidthConstraints;
 export declare function getGraphZoneModeConstants(graphZoneMode?: GraphColumnMode): GraphZoneModeConstants;
 export declare const makeGetKeyForCell: (rows: ProcessedGraphRow[]) => GetRealKeyForCellFunc;
-export declare function getZoneWidth(graphZoneType: GraphZoneType, activeGraphZones: GraphZone[]): number;
+export declare function getZoneWidthWithVerticalScrollbar(graphZoneType: GraphZoneType, activeGraphZones: GraphZone[]): number;
 export declare function rowContainsCurrentHeadRef(row?: ProcessedGraphRow | GraphRow): boolean;
 export declare function getHeadRefShaFromGraphRows(graphRows: GraphRow[]): Sha | undefined;
 export declare function workDirStatsHaveChanges(workDirStats?: WorkDirStats): boolean;
@@ -43,8 +53,13 @@ export declare function getGraphRefGroupsByName(refGroup: GraphRefGroup): GraphR
 export declare function getGraphZoneIconByType(zoneType: GraphZoneType): string;
 export interface GraphRowHelperProps {
     currentlyHoveredCommitSha?: Sha;
+    cssVariables: CssVariables;
     dimRowsOfSelectedCommit: boolean;
+    enabledScrollMarkerTypes: GraphMarkerType[];
+    height: number;
     graphZones: GraphZone[];
+    hasMoreCommits: boolean;
+    isLoadingRows: boolean;
     highlightedShas?: HighlightedShas;
     hoveredRefGroup?: GraphRefGroup;
     isSelectedBySha: IsSelectedBySha;
@@ -60,7 +75,7 @@ export declare class GraphRowHelper {
     getGraphRefGroupForRow(rowIndex: number): GraphRefGroup;
     getGraphRefGroupsByNameForRow(rowIndex: number): GraphRefGroup[];
     getRow(rowIndex: number): ProcessedGraphRow | undefined;
-    getZoneWidth(graphZoneType: GraphZoneType): number;
+    getZoneWidth(graphZoneType: GraphZoneType, withoutVerticalScrollWidth?: boolean): number;
     isDateTimeZoneActive(): boolean;
     isFirstRow(rowIndex: number): boolean;
     isColumnFollowingGraphColumn(graphZoneType: GraphZoneType): boolean;
@@ -68,6 +83,8 @@ export declare class GraphRowHelper {
     isHovering(rowIndex: number): boolean;
     isLastColumn(graphZoneType: GraphZoneType): boolean;
     getSelectedRefGroupByName(): GraphRefGroup[];
+    getHorizontalScrollHeight(graphZoneType: GraphZoneType): number;
+    getVerticalScrollWidth(graphZoneType: GraphZoneType): number;
     isMissingHoveredRefGroup(rowIndex: number): boolean;
     isSelected(rowIndex: number): boolean;
     isSingleSelected(rowIndex: number): boolean;

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

@@ -7,7 +7,7 @@ import type { HostingServiceType } from '../hostingservice/HostingServiceTypes';
 import type { TranslationFn } from '../language/LanguageTypes';
 import type { GraphRefType } from '../ref/RefTypes';
 import type { OnResizeFromPropChangeParams, OnResizeParams } from '../ui/UiTypes';
-import type { GraphZone, GraphZoneType, TimelineEntry, TimelineMsgRowRenderIdType } from './GraphConstants';
+import type { GraphMarkerType, GraphZone, GraphZoneType, TimelineEntry, TimelineMsgRowRenderIdType } from './GraphConstants';
 export type RowRenderType = GraphZoneType | TimelineMsgRowRenderIdType;
 export type RowRenderersByIds = {
     [id: string]: GridCellRenderer;
@@ -72,13 +72,17 @@ export type RowEdges = {
 };
 export interface CommonGraphRowProps {
     enabledRefMetadataTypes: RefMetadataType[];
+    enabledScrollMarkerTypes: GraphMarkerType[];
     avatarUrlByEmail: AvatarUrlByEmail;
     currentlyHoveredCommitSha?: Sha;
     cssVariables: CssVariables;
     dimMergeCommits: boolean;
     dimRowsOfSelectedCommit: boolean;
+    hasMoreCommits: boolean;
+    height: number;
     highlightRowsOnRefHover: boolean;
     isContainerWindowFocused: boolean;
+    isLoadingRows: boolean;
     isSelectedBySha: IsSelectedBySha;
     showGhostRefsOnRowHover: boolean;
     showRemoteNamesOnRefs: boolean;
@@ -94,7 +98,6 @@ export interface CommonGraphRowProps {
     translate: TranslationFn;
     useAuthorInitialsForAvatars: boolean;
     scrollTop: number;
-    scrollWidth: number;
 }
 export interface CommonGraphRowDispatchProps {
     onClickCommit: OnClickCommit;