@ethlete/cdk 4.63.1 → 4.64.0

package/index.d.ts

@@ -3803,21 +3803,6 @@ type NewBracketMatchParticipant<TRoundData, TMatchData> = NewBracketMatchPartici
     matches: BracketMap<BracketMatchId, NewBracketMatch<TRoundData, TMatchData>>;
 };
 
-declare const FIRST_ROUNDS_TYPE: {
-    readonly SINGLE: "single";
-    readonly DOUBLE: "double";
-};
-type FirstSingleRounds<TRoundData, TMatchData> = {
-    type: typeof FIRST_ROUNDS_TYPE.SINGLE;
-    first: NewBracketRound<TRoundData, TMatchData>;
-};
-type FirstDoubleRounds<TRoundData, TMatchData> = {
-    type: typeof FIRST_ROUNDS_TYPE.DOUBLE;
-    upper: NewBracketRound<TRoundData, TMatchData>;
-    lower: NewBracketRound<TRoundData, TMatchData>;
-};
-type FirstRounds<TRoundData, TMatchData> = FirstSingleRounds<TRoundData, TMatchData> | FirstDoubleRounds<TRoundData, TMatchData>;
-
 type BracketRoundSwissGroupId = string & {
     __brand: 'BracketRoundSwissGroupId';
 };
@@ -3846,6 +3831,12 @@ declare class NewBracketDefaultRoundHeaderComponent<TRoundData = unknown, TMatch
     static ɵcmp: i0.ɵɵComponentDeclaration<NewBracketDefaultRoundHeaderComponent<any, any>, "et-new-bracket-default-round-header", never, { "bracketRound": { "alias": "bracketRound"; "required": true; "isSignal": true; }; }, {}, never, never, true, never>;
 }
 
+type Dimensions = {
+    width: number;
+    height: number;
+    top: number;
+    left: number;
+};
 type BracketRoundHeaderComponent<TRoundData, TMatchData> = ComponentType<{
     bracketRound: InputSignal<NewBracketRound<TRoundData, TMatchData>>;
 }>;
@@ -3853,94 +3844,113 @@ type BracketMatchComponent<TRoundData, TMatchData> = ComponentType<{
     bracketRound: InputSignal<NewBracketRound<TRoundData, TMatchData>>;
     bracketMatch: InputSignal<NewBracketMatch<TRoundData, TMatchData>>;
 }>;
-type BracketGridRoundItem<TRoundData, TMatchData> = {
-    id: BracketRoundId;
-    layoutId: `${BracketRoundId}-layout`;
-    columnStart: number;
-    columnEnd: number;
-    columnDefinitions: string;
-    rowStart: number;
-    rowEnd: number;
-    rowDefinitions: string;
-    roundRelation: BracketRoundRelation<TRoundData, TMatchData>;
-    items: Map<BracketRoundId | BracketMatchId, BracketGridItem<TRoundData, TMatchData>>;
+
+/**
+ * A row is a part of an element.
+ */
+type BracketElementPart = {
+    dimensions: Dimensions;
 };
-type BracketGridRoundHeaderItem<TRoundData, TMatchData> = {
-    type: 'round';
-    id: BracketRoundId;
-    layoutId: `${BracketRoundId}-layout`;
-    rowStart: number;
-    rowEnd: number;
-    className: string;
+
+/**
+ * An element is a slice of a section.
+ * It can be a match, a header, a gap, etc.
+ */
+type BracketElementBase = {
+    area: string;
+    /** The dimensions of the actual element */
+    dimensions: Dimensions;
+    /** The dimensions of the container that holds the element */
+    containerDimensions: Dimensions;
+    parts: ReadonlyArray<BracketElementPart>;
+    span?: BracketElementSpanCoordinates;
+    isHidden?: boolean;
+};
+type HeaderBracketElement<TRoundData, TMatchData> = BracketElementBase & HeaderBracketElementDetails<TRoundData, TMatchData>;
+type MatchBracketElement<TRoundData, TMatchData> = BracketElementBase & MatchBracketElementDetails<TRoundData, TMatchData>;
+type GapBracketElement = BracketElementBase & GapBracketElementDetails;
+type BracketElement<TRoundData, TMatchData> = HeaderBracketElement<TRoundData, TMatchData> | MatchBracketElement<TRoundData, TMatchData> | GapBracketElement;
+type BracketElementSpanCoordinates = {
+    masterColumnStart: number;
+    masterColumnEnd: number;
+    sectionStart: number;
+    sectionEnd: number;
+    subColumnStart: number;
+    subColumnEnd: number;
+};
+type HeaderBracketElementDetails<TRoundData, TMatchData> = {
+    type: 'header';
     component: BracketRoundHeaderComponent<TRoundData, TMatchData>;
-    roundRelation: BracketRoundRelation<TRoundData, TMatchData>;
-    data: {
-        bracketRound: NewBracketRound<TRoundData, TMatchData>;
-    };
+    round: NewBracketRound<TRoundData, TMatchData>;
 };
-type BracketGridMatchItem<TRoundData, TMatchData> = {
+type MatchBracketElementDetails<TRoundData, TMatchData> = {
     type: 'match';
-    id: BracketMatchId;
-    layoutId: `${BracketMatchId}-layout`;
-    rowStart: number;
-    rowEnd: number;
-    className: string;
     component: BracketMatchComponent<TRoundData, TMatchData>;
-    matchRelation: BracketMatchRelation<TRoundData, TMatchData>;
-    roundRelation: BracketRoundRelation<TRoundData, TMatchData>;
-    data: {
-        bracketRound: NewBracketRound<TRoundData, TMatchData>;
-        bracketMatch: NewBracketMatch<TRoundData, TMatchData>;
-    };
+    match: NewBracketMatch<TRoundData, TMatchData>;
+    round: NewBracketRound<TRoundData, TMatchData>;
+};
+type GapBracketElementDetails = {
+    type: 'matchGap' | 'roundHeaderGap' | 'roundGap' | 'colGap';
 };
-type BracketGridItem<TRoundData, TMatchData> = BracketGridRoundHeaderItem<TRoundData, TMatchData> | BracketGridMatchItem<TRoundData, TMatchData>;
 
-type BracketGridDefinitions = {
-    columnCount: number;
-    rowCount: number;
+type BracketSubColumn<TRoundData, TMatchData> = {
+    dimensions: Dimensions;
+    elements: ReadonlyArray<BracketElement<TRoundData, TMatchData>>;
+    span: BracketSubColumnSpan;
+};
+type BracketSubColumnSpan = {
+    isStart: boolean;
+    isEnd: boolean;
 };
 
-type DrawManDebugData = {
-    position: BracketPosition;
-    staticMeasurements: StaticMeasurements;
+type BracketMasterColumnSectionType = 'round' | 'gap';
+type BracketMasterColumnSection<TRoundData, TMatchData> = {
+    subColumns: ReadonlyArray<BracketSubColumn<TRoundData, TMatchData>>;
+    dimensions: Dimensions;
+    type: BracketMasterColumnSectionType;
 };
 
-type StaticMeasurements = {
-    /** Width of one column */
-    columnWidth: number;
-    /** Height of one match */
-    matchHeight: number;
-    /** Gap between rows */
-    rowGap: number;
-    /** Gap between columns */
-    columnGap: number;
-    /**
-     * Offset from the top.
-     * Will be 0 if e.g. there is no round header and we are displaying a single elimination bracket.
-     * Will be some value if there is a round header or if we want to display the lower bracket of a double elimination bracket.
-     */
-    baseOffsetY: number;
-    /**
-     * The number of matches in the first round.
-     * For double elimination brackets, this is the number of matches in the upper bracket or the lower bracket.
-     * For double elimination matches after the upper and lower bracket have been merged, this is the sum of matches in the first round of the upper and lower bracket.
-     */
-    baseRoundMatchCount: number;
-    /** Gap between the upper and lower bracket in a double elimination bracket */
-    upperLowerGap: number;
-    includeUpperLowerGap: boolean;
+type BracketMasterColumn<TRoundData, TMatchData> = {
+    sections: ReadonlyArray<BracketMasterColumnSection<TRoundData, TMatchData>>;
+    dimensions: Dimensions;
 };
-type BracketPosition = {
-    inline: {
-        start: number;
-        end: number;
-        center: number;
-    };
-    block: {
-        start: number;
-        end: number;
-        center: number;
-    };
+
+type BracketGrid<TRoundData, TMatchData> = {
+    masterColumns: ReadonlyArray<BracketMasterColumn<TRoundData, TMatchData>>;
+    dimensions: Dimensions;
+};
+type MutableBracketGrid<TRoundData, TMatchData> = {
+    grid: BracketGrid<TRoundData, TMatchData>;
+    pushMasterColumn: (...masterColumns: BracketMasterColumn<TRoundData, TMatchData>[]) => void;
+    calculateDimensions: () => void;
+    setupElementSpans: () => void;
+};
+
+type FinalizedBracketColumn<TRoundData = unknown, TMatchData = unknown> = {
+    dimensions: Dimensions;
+    elements: FinalizedBracketElement<TRoundData, TMatchData>[];
+};
+type FinalizedHeaderBracketElement<TRoundData, TMatchData> = {
+    type: 'header';
+    dimensions: Dimensions;
+    component: BracketRoundHeaderComponent<TRoundData, TMatchData>;
+    round: NewBracketRound<TRoundData, TMatchData>;
+};
+type FinalizedMatchBracketElement<TRoundData, TMatchData> = {
+    type: 'match';
+    dimensions: Dimensions;
+    component: BracketMatchComponent<TRoundData, TMatchData>;
+    match: NewBracketMatch<TRoundData, TMatchData>;
+    round: NewBracketRound<TRoundData, TMatchData>;
+    classes: string;
+};
+type FinalizedBracketElement<TRoundData = unknown, TMatchData = unknown> = FinalizedHeaderBracketElement<TRoundData, TMatchData> | FinalizedMatchBracketElement<TRoundData, TMatchData>;
+type FinalizedBracketMatchElementMap<TRoundData, TMatchData> = BracketMap<string, FinalizedMatchBracketElement<TRoundData, TMatchData>>;
+
+type ComputedBracketGrid<TRoundData, TMatchData> = {
+    raw: MutableBracketGrid<TRoundData, TMatchData>;
+    columns: FinalizedBracketColumn<TRoundData, TMatchData>[];
+    matchElementMap: FinalizedBracketMatchElementMap<TRoundData, TMatchData>;
 };
 
 declare class NewBracketComponent<TRoundData = unknown, TMatchData = unknown> {
@@ -3969,13 +3979,8 @@ declare class NewBracketComponent<TRoundData = unknown, TMatchData = unknown> {
     finalMatchComponent: i0.InputSignal<BracketMatchComponent<TRoundData, TMatchData> | undefined>;
     bracketData: i0.Signal<NewBracket<TRoundData, TMatchData>>;
     swissGroups: i0.Signal<BracketRoundMapWithSwissData<TRoundData, TMatchData> | null>;
-    items: i0.Signal<Map<BracketRoundId, BracketGridRoundItem<TRoundData, TMatchData>>>;
-    definitions: i0.Signal<BracketGridDefinitions>;
-    firstRounds: i0.Signal<FirstRounds<TRoundData, TMatchData>>;
-    drawManData: i0.Signal<{
-        svg: string;
-        debugMap: Record<BracketMatchId, DrawManDebugData>;
-    }>;
+    bracketGrid: i0.Signal<ComputedBracketGrid<TRoundData, TMatchData> | null>;
+    drawManData: i0.Signal<string>;
     svgContent: i0.Signal<_angular_platform_browser.SafeHtml>;
     journeyHighlight: i0.Signal<string | null>;
     constructor();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethlete/cdk",
-  "version": "4.63.1",
+  "version": "4.64.0",
   "license": "MIT",
   "sideEffects": false,
   "exports": {