@rowsncolumns/utils 9.6.2 → 9.6.3

package/dist/esm/table-styles.d.ts

@@ -45,7 +45,30 @@ export type BandingProperties = {
 export type BandedDefinition = {
     rowProperties?: Maybe<BandingProperties>;
     columnProperties?: Maybe<BandingProperties>;
+    /**
+     * The table style element by element (Excel's `<tableStyleElement>`s), set for the built-in
+     * styles. When present the grid paints from it with Excel's element precedence and the
+     * table's show-flags (`resolveTableStyleCell`); `rowProperties` / `columnProperties` remain
+     * as the coarse summary older readers (the custom-style editor, the exporter) understand.
+     */
+    tableStyleElements?: Maybe<TableStyleElements>;
+};
+/** Excel's table style element types (ECMA-376 §18.18.83 ST_TableStyleType), table subset. */
+export type TableStyleElementType = "wholeTable" | "headerRow" | "totalRow" | "firstColumn" | "lastColumn" | "firstRowStripe" | "secondRowStripe" | "firstColumnStripe" | "secondColumnStripe";
+/**
+ * One element's differential format. `top` / `bottom` / `left` / `right` rule the element's
+ * outer edges; `horizontal` / `vertical` rule the edges between its cells.
+ */
+export type TableStyleElementFormat = {
+    fill?: Maybe<Color>;
+    color?: Maybe<Color>;
+    bold?: Maybe<boolean>;
+    borders?: Maybe<Borders & {
+        horizontal?: Maybe<Border>;
+        vertical?: Maybe<Border>;
+    }>;
 };
+export type TableStyleElements = Partial<Record<TableStyleElementType, TableStyleElementFormat>>;
 export type TableTheme = "None" | "TableStyleLight1" | "TableStyleLight2" | "TableStyleLight3" | "TableStyleLight4" | "TableStyleLight5" | "TableStyleLight6" | "TableStyleLight7" | "TableStyleLight8" | "TableStyleLight9" | "TableStyleLight10" | "TableStyleLight11" | "TableStyleLight12" | "TableStyleLight13" | "TableStyleLight14" | "TableStyleLight15" | "TableStyleLight16" | "TableStyleLight17" | "TableStyleLight18" | "TableStyleLight19" | "TableStyleLight20" | "TableStyleLight21" | "TableStyleMedium1" | "TableStyleMedium2" | "TableStyleMedium3" | "TableStyleMedium4" | "TableStyleMedium5" | "TableStyleMedium6" | "TableStyleMedium7" | "TableStyleMedium8" | "TableStyleMedium9" | "TableStyleMedium10" | "TableStyleMedium11" | "TableStyleMedium12" | "TableStyleMedium13" | "TableStyleMedium14" | "TableStyleMedium15" | "TableStyleMedium16" | "TableStyleMedium17" | "TableStyleMedium18" | "TableStyleMedium19" | "TableStyleMedium20" | "TableStyleMedium21" | "TableStyleMedium22" | "TableStyleMedium23" | "TableStyleMedium24" | "TableStyleMedium25" | "TableStyleMedium26" | "TableStyleMedium27" | "TableStyleMedium28" | "TableStyleDark1" | "TableStyleDark2" | "TableStyleDark3" | "TableStyleDark4" | "TableStyleDark5" | "TableStyleDark6" | "TableStyleDark7" | "TableStyleDark8" | "TableStyleDark9" | "TableStyleDark10" | "TableStyleDark11";
 type TableStyleEntry = [
     theme: TableTheme,
@@ -54,12 +77,40 @@ type TableStyleEntry = [
     bandDefinition: BandedDefinition | undefined
 ];
 /**
- * Get table border styles map with all table themes and their banded definitions
+ * Excel's 60 built-in table styles by gallery group (Light 1–21, Medium 1–28, Dark 1–11; "None"
+ * leads the Light group), each with its banded definition for the given stripe toggles.
+ * Element formats come from ECMA-376 `presetTableStyles.xml` (`./table-style-presets`).
  */
 export declare const getTableBorderStyles: (showRowStripes: boolean | undefined, showColumnStripes: boolean | undefined) => Map<string, TableStyleEntry[]>;
 /**
  * Find the banded definition for a given table theme
  */
 export declare const findMatchingBandProperty: (tableTheme: TableTheme, showRowStripes: boolean | undefined, showColumnStripes: boolean | undefined) => BandedDefinition | undefined;
+/** Where a cell sits in a table, counted over its visible rows and columns. */
+export type TableStyleCellPosition = {
+    rowIndex: number;
+    columnIndex: number;
+    rowCount: number;
+    columnCount: number;
+    headerRow: boolean;
+    totalRow: boolean;
+    showFirstColumn: boolean;
+    showLastColumn: boolean;
+};
+export type ResolvedTableStyleCell = {
+    fill?: Color;
+    color?: Color;
+    bold?: boolean;
+    borders?: Borders;
+};
+/**
+ * A table cell's format from its style elements, the way Excel layers them: whole table, then
+ * column stripes, row stripes, last column, first column, header row and total row — a later
+ * element overrides the earlier ones on each property it sets. Stripes cover the body rows
+ * only; the header / total rows and first / last columns apply per the table's show-flags.
+ * An element's outer borders rule its region's edges and `horizontal` / `vertical` its inner
+ * edges.
+ */
+export declare const resolveTableStyleCell: (elements: TableStyleElements, position: TableStyleCellPosition) => ResolvedTableStyleCell;
 export {};
 //# sourceMappingURL=table-styles.d.ts.map

package/dist/esm/table-styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-styles.d.ts","sourceRoot":"","sources":["../../table-styles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table-styles.d.ts","sourceRoot":"","sources":["../../table-styles.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAI7D,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;AAG5C,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,UAAU,CAAC;AAExC,MAAM,MAAM,WAAW,GACnB,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,MAAM,GACN,cAAc,GACd,aAAa,GACb,QAAQ,CAAC;AAGb,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,WAAW,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrB,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,WAAW,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,cAAc,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9B,eAAe,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC/B,YAAY,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,YAAY,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,eAAe,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACjC,gBAAgB,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,aAAa,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,cAAc,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAChC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAChC,eAAe,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC/B,6DAA6D;IAC7D,YAAY,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACzC,gBAAgB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC5C;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;CAChD,CAAC;AAEF,8FAA8F;AAC9F,MAAM,MAAM,qBAAqB,GAC7B,YAAY,GACZ,WAAW,GACX,UAAU,GACV,aAAa,GACb,YAAY,GACZ,gBAAgB,GAChB,iBAAiB,GACjB,mBAAmB,GACnB,oBAAoB,CAAC;AAEzB;;;GAGG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACrB,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACtB,OAAO,CAAC,EAAE,KAAK,CAAC,OAAO,GAAG;QAAE,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC,CAAC;CACrF,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,OAAO,CACtC,MAAM,CAAC,qBAAqB,EAAE,uBAAuB,CAAC,CACvD,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,MAAM,GACN,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,mBAAmB,GACnB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,kBAAkB,GAClB,kBAAkB,CAAC;AAEvB,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,UAAU;IACjB,mBAAmB,EAAE,MAAM,GAAG,SAAS;IACvC,cAAc,EAAE,MAAM,GAAG,SAAS;IAClC,cAAc,EAAE,gBAAgB,GAAG,SAAS;CAC7C,CAAC;AAmEF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC/B,gBAAgB,OAAO,GAAG,SAAS,EACnC,mBAAmB,OAAO,GAAG,SAAS,KACrC,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAqB/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,GACnC,YAAY,UAAU,EACtB,gBAAgB,OAAO,GAAG,SAAS,EACnC,mBAAmB,OAAO,GAAG,SAAS,KACrC,gBAAgB,GAAG,SAUrB,CAAC;AAEF,+EAA+E;AAC/E,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,GAChC,UAAU,kBAAkB,EAC5B,UAAU,sBAAsB,KAC/B,sBAgEF,CAAC"}

package/dist/esm/table-styles.js

@@ -2,380 +2,91 @@
  * Table styles and banded range utilities
  * Shared between toolkit (import) and app (rendering)
  */
-const stripeTint = 0.8;
-const colorIndexes = [1, 4, 5, 6, 7, 8, 9];
+import { TABLE_STYLE_PRESETS } from "./table-style-presets";
+const ROW_STRIPES = ["firstRowStripe", "secondRowStripe"];
+const COLUMN_STRIPES = [
+    "firstColumnStripe",
+    "secondColumnStripe",
+];
+const outerEdges = (borders) => {
+    const { top, bottom, left, right } = borders ?? {};
+    const edges = {};
+    if (top)
+        edges.top = top;
+    if (bottom)
+        edges.bottom = bottom;
+    if (left)
+        edges.left = left;
+    if (right)
+        edges.right = right;
+    return Object.keys(edges).length ? edges : undefined;
+};
+const compact = (value) => {
+    for (const key of Object.keys(value)) {
+        if (value[key] == null)
+            delete value[key];
+    }
+    return Object.keys(value).length ? value : undefined;
+};
+/**
+ * A built-in style's banded definition for the table's stripe toggles: its elements (stripe
+ * elements dropped when the stripes are off) plus the coarse row / column summary.
+ */
+const presetBandedDefinition = (preset, showRowStripes, showColumnStripes) => {
+    // A fresh copy per call: callers store and may mutate the result; the presets stay shared.
+    const elements = JSON.parse(JSON.stringify(preset));
+    if (!showRowStripes)
+        for (const type of ROW_STRIPES)
+            delete elements[type];
+    if (!showColumnStripes)
+        for (const type of COLUMN_STRIPES)
+            delete elements[type];
+    const { headerRow, totalRow, firstColumn, lastColumn } = elements;
+    const rowProperties = compact({
+        headerColor: headerRow?.fill,
+        headerBorder: outerEdges(headerRow?.borders),
+        firstBandColor: elements.firstRowStripe?.fill,
+        secondBandColor: elements.secondRowStripe?.fill,
+        totalRowColor: totalRow?.fill,
+        totalRowBorder: outerEdges(totalRow?.borders),
+        totalRowBold: totalRow?.bold,
+        firstColumnColor: firstColumn?.fill,
+        lastColumnColor: lastColumn?.fill,
+    });
+    const columnProperties = compact({
+        firstBandColor: elements.firstColumnStripe?.fill,
+        secondBandColor: elements.secondColumnStripe?.fill,
+    });
+    return compact({
+        rowProperties,
+        columnProperties,
+        tableStyleElements: elements,
+    });
+};
+const FAMILIES = [
+    ["Light", 21],
+    ["Medium", 28],
+    ["Dark", 11],
+];
 /**
- * Get table border styles map with all table themes and their banded definitions
+ * Excel's 60 built-in table styles by gallery group (Light 1–21, Medium 1–28, Dark 1–11; "None"
+ * leads the Light group), each with its banded definition for the given stripe toggles.
+ * Element formats come from ECMA-376 `presetTableStyles.xml` (`./table-style-presets`).
  */
 export const getTableBorderStyles = (showRowStripes, showColumnStripes) => {
-    let runningLightIndex = 1;
-    let runningMediumIndex = 1;
-    let runningDarkIndex = 1;
-    const styles = new Map([
-        [
-            "Light",
-            [
-                ["None", 0, 0, undefined],
-                ...colorIndexes.map((value) => {
-                    return [
-                        ("TableStyleLight" + runningLightIndex++),
-                        stripeTint,
-                        1,
-                        {
-                            rowProperties: {
-                                firstBandColor: {
-                                    theme: value,
-                                    tint: showRowStripes ? stripeTint : 1,
-                                },
-                                secondBandColor: showRowStripes
-                                    ? {
-                                        theme: 0,
-                                    }
-                                    : undefined,
-                                headerBorder: {
-                                    top: {
-                                        width: 1,
-                                        style: "solid",
-                                        color: { theme: value },
-                                    },
-                                    bottom: {
-                                        width: 1,
-                                        style: "solid",
-                                        color: { theme: value },
-                                    },
-                                },
-                                footerBorder: {
-                                    bottom: {
-                                        width: 1,
-                                        style: "solid",
-                                        color: { theme: value },
-                                    },
-                                },
-                            },
-                            columnProperties: showColumnStripes
-                                ? {
-                                    firstBandColor: {
-                                        theme: value,
-                                        tint: showColumnStripes ? stripeTint : 1,
-                                    },
-                                }
-                                : undefined,
-                        },
-                    ];
-                }),
-                ...colorIndexes.map((value) => {
-                    return [
-                        ("TableStyleLight" + runningLightIndex++),
-                        undefined,
-                        undefined,
-                        {
-                            rowProperties: {
-                                headerColor: { theme: value },
-                            },
-                        },
-                    ];
-                }),
-                ...colorIndexes.map((value) => {
-                    const border = {
-                        width: 1,
-                        style: "solid",
-                        color: { theme: value },
-                    };
-                    return [
-                        ("TableStyleLight" + runningLightIndex++),
-                        stripeTint,
-                        1,
-                        {
-                            rowProperties: {
-                                firstBandColor: {
-                                    theme: value,
-                                    tint: showRowStripes ? stripeTint : 1,
-                                },
-                                secondBandColor: showRowStripes
-                                    ? {
-                                        theme: 0,
-                                    }
-                                    : undefined,
-                                firstBandBorder: {
-                                    top: border,
-                                    left: border,
-                                    right: border,
-                                    bottom: border,
-                                },
-                                headerBorder: {
-                                    top: border,
-                                    left: border,
-                                    right: border,
-                                    bottom: border,
-                                },
-                            },
-                            columnProperties: showColumnStripes
-                                ? {
-                                    firstBandColor: {
-                                        theme: value,
-                                        tint: showColumnStripes ? stripeTint : 1,
-                                    },
-                                }
-                                : undefined,
-                        },
-                    ];
-                }),
-            ],
-        ],
-        [
-            "Medium",
-            [
-                ...colorIndexes.map((value) => {
-                    return [
-                        ("TableStyleMedium" + runningMediumIndex++),
-                        stripeTint,
-                        1,
-                        {
-                            rowProperties: {
-                                headerColor: { theme: value },
-                                firstBandColor: {
-                                    theme: value,
-                                    tint: showRowStripes ? stripeTint : 1,
-                                },
-                                secondBandColor: showRowStripes
-                                    ? {
-                                        theme: 0,
-                                    }
-                                    : undefined,
-                                firstBandBorder: {
-                                    bottom: {
-                                        width: 1,
-                                        style: "solid",
-                                        color: { theme: value },
-                                    },
-                                },
-                            },
-                            columnProperties: showColumnStripes
-                                ? {
-                                    firstBandColor: {
-                                        theme: value,
-                                        tint: showColumnStripes ? stripeTint : 1,
-                                    },
-                                }
-                                : undefined,
-                        },
-                    ];
-                }),
-                ...colorIndexes.map((value) => {
-                    return [
-                        ("TableStyleMedium" + runningMediumIndex++),
-                        0.6,
-                        0.8,
-                        {
-                            rowProperties: {
-                                headerColor: { theme: value },
-                                firstBandColor: {
-                                    theme: value,
-                                    tint: showRowStripes ? 0.6 : 0.8,
-                                },
-                                secondBandColor: {
-                                    theme: value,
-                                    tint: 0.8,
-                                },
-                            },
-                            columnProperties: showColumnStripes
-                                ? {
-                                    firstBandColor: {
-                                        theme: value,
-                                        tint: showColumnStripes ? 0.6 : 0.8,
-                                    },
-                                }
-                                : undefined,
-                        },
-                    ];
-                }),
-                ...colorIndexes.map((value) => {
-                    const border = {
-                        width: 2,
-                        style: "solid",
-                        color: { theme: 1 },
-                    };
-                    return [
-                        ("TableStyleMedium" + runningMediumIndex++),
-                        -0.15,
-                        1,
-                        {
-                            rowProperties: {
-                                headerColor: { theme: value },
-                                firstBandColor: {
-                                    theme: 0,
-                                    tint: showRowStripes ? -0.15 : 1,
-                                },
-                                secondBandColor: showRowStripes
-                                    ? {
-                                        theme: 0,
-                                    }
-                                    : undefined,
-                                headerBorder: {
-                                    top: border,
-                                },
-                                footerBorder: {
-                                    bottom: border,
-                                },
-                            },
-                            columnProperties: showColumnStripes
-                                ? {
-                                    firstBandColor: {
-                                        theme: 0,
-                                        tint: showColumnStripes ? -0.15 : 1,
-                                    },
-                                }
-                                : undefined,
-                        },
-                    ];
-                }),
-                ...colorIndexes.map((value) => {
-                    const border = {
-                        width: 1,
-                        style: "solid",
-                        color: { theme: value },
-                    };
-                    return [
-                        ("TableStyleMedium" + runningMediumIndex++),
-                        stripeTint,
-                        0.9,
-                        {
-                            rowProperties: {
-                                headerColor: {
-                                    theme: value,
-                                    tint: 0.9,
-                                },
-                                firstBandColor: {
-                                    theme: value,
-                                    tint: showRowStripes ? stripeTint : 0.9,
-                                },
-                                secondBandColor: {
-                                    theme: value,
-                                    tint: 0.9,
-                                },
-                                firstBandBorder: {
-                                    top: border,
-                                    left: border,
-                                    right: border,
-                                    bottom: border,
-                                },
-                                headerBorder: {
-                                    top: border,
-                                    left: border,
-                                    right: border,
-                                    bottom: border,
-                                },
-                            },
-                            columnProperties: showColumnStripes
-                                ? {
-                                    firstBandColor: {
-                                        theme: value,
-                                        tint: showColumnStripes ? stripeTint : 0.9,
-                                    },
-                                }
-                                : undefined,
-                        },
-                    ];
-                }),
-            ],
-        ],
-        [
-            "Dark",
-            [
-                ...colorIndexes.map((value) => {
-                    const firstTint = value - 1 === 0 ? 0.25 : -0.25;
-                    const secondTint = value - 1 === 0 ? 0.5 : 0;
-                    const edgeColumnColor = {
-                        theme: value,
-                        tint: value - 1 === 0 ? 0.15 : -0.5,
-                    };
-                    return [
-                        ("TableStyleDark" + runningDarkIndex++),
-                        firstTint,
-                        secondTint,
-                        {
-                            rowProperties: {
-                                headerColor: { theme: 1 },
-                                firstBandColor: {
-                                    theme: value,
-                                    tint: showRowStripes ? firstTint : secondTint,
-                                },
-                                secondBandColor: {
-                                    theme: value,
-                                    tint: secondTint,
-                                },
-                                firstColumnColor: edgeColumnColor,
-                                lastColumnColor: edgeColumnColor,
-                            },
-                            columnProperties: showColumnStripes
-                                ? {
-                                    firstBandColor: {
-                                        theme: value,
-                                        tint: showColumnStripes ? firstTint : secondTint,
-                                    },
-                                }
-                                : undefined,
-                        },
-                    ];
-                }),
-                ...[1, 5, 7, 9].map((value) => {
-                    const firstTint = value - 1 === 0 ? -0.35 : 0.6;
-                    const secondTint = value - 1 === 0 ? -0.15 : 0.8;
-                    const edgeColumnColor = {
-                        theme: value - 1,
-                        tint: value - 1 === 0 ? -0.5 : 0.4,
-                    };
-                    return [
-                        ("TableStyleDark" + runningDarkIndex++),
-                        firstTint,
-                        secondTint,
-                        {
-                            rowProperties: {
-                                headerColor: { theme: value },
-                                firstBandColor: {
-                                    theme: value - 1,
-                                    tint: showRowStripes ? firstTint : secondTint,
-                                },
-                                secondBandColor: {
-                                    theme: value - 1,
-                                    tint: secondTint,
-                                },
-                                firstColumnColor: edgeColumnColor,
-                                lastColumnColor: edgeColumnColor,
-                            },
-                            columnProperties: showColumnStripes
-                                ? {
-                                    firstBandColor: {
-                                        theme: value - 1,
-                                        tint: showColumnStripes ? firstTint : secondTint,
-                                    },
-                                }
-                                : undefined,
-                        },
-                    ];
-                }),
-            ],
-        ],
-    ]);
-    // Excel's built-in table styles bold the totals row and rule it with a double top border in
-    // the style's accent colour — the header border's colour, else the header fill's, else the
-    // stripe border's.
-    for (const entries of styles.values()) {
-        for (const [, , , bandDefinition] of entries) {
-            const rows = bandDefinition?.rowProperties;
-            if (!rows)
-                continue;
-            rows.totalRowBold = true;
-            const accent = rows.headerBorder?.top?.color ??
-                rows.headerBorder?.bottom?.color ??
-                rows.headerColor ??
-                rows.firstBandBorder?.bottom?.color;
-            if (accent && !rows.totalRowBorder) {
-                rows.totalRowBorder = {
-                    top: { width: 1, style: "double", color: accent },
-                };
-            }
+    const styles = new Map();
+    for (const [family, count] of FAMILIES) {
+        const entries = family === "Light" ? [["None", 0, 0, undefined]] : [];
+        for (let n = 1; n <= count; n++) {
+            const name = `TableStyle${family}${n}`;
+            entries.push([
+                name,
+                undefined,
+                undefined,
+                presetBandedDefinition(TABLE_STYLE_PRESETS[name], showRowStripes, showColumnStripes),
+            ]);
         }
+        styles.set(family, entries);
     }
     return styles;
 };
@@ -383,18 +94,73 @@ export const getTableBorderStyles = (showRowStripes, showColumnStripes) => {
  * Find the banded definition for a given table theme
  */
 export const findMatchingBandProperty = (tableTheme, showRowStripes, showColumnStripes) => {
-    const bandProperties = getTableBorderStyles(showRowStripes, showColumnStripes);
-    let result;
-    bandProperties.forEach((tableStyles) => {
-        if (result)
+    const preset = Object.prototype.hasOwnProperty.call(TABLE_STYLE_PRESETS, tableTheme)
+        ? TABLE_STYLE_PRESETS[tableTheme]
+        : undefined;
+    return preset
+        ? presetBandedDefinition(preset, showRowStripes, showColumnStripes)
+        : undefined;
+};
+/**
+ * A table cell's format from its style elements, the way Excel layers them: whole table, then
+ * column stripes, row stripes, last column, first column, header row and total row — a later
+ * element overrides the earlier ones on each property it sets. Stripes cover the body rows
+ * only; the header / total rows and first / last columns apply per the table's show-flags.
+ * An element's outer borders rule its region's edges and `horizontal` / `vertical` its inner
+ * edges.
+ */
+export const resolveTableStyleCell = (elements, position) => {
+    const { rowIndex: r, columnIndex: c, rowCount, columnCount } = position;
+    const lastRow = rowCount - 1;
+    const lastColumn = columnCount - 1;
+    const bodyStart = position.headerRow ? 1 : 0;
+    const bodyEnd = position.totalRow ? lastRow - 1 : lastRow;
+    const isBody = r >= bodyStart && r <= bodyEnd;
+    const out = {};
+    const borders = {};
+    const apply = (format, r0, r1, c0, c1) => {
+        if (!format)
             return;
-        for (let i = 0; i < tableStyles.length; i++) {
-            const [themeName, , , bandDefinition] = tableStyles[i];
-            if (themeName === tableTheme) {
-                result = bandDefinition ? { ...bandDefinition } : undefined;
-                return;
-            }
-        }
-    });
-    return result;
+        if (format.fill)
+            out.fill = format.fill;
+        if (format.color)
+            out.color = format.color;
+        if (format.bold)
+            out.bold = true;
+        const b = format.borders;
+        if (!b)
+            return;
+        const top = r === r0 ? b.top : b.horizontal;
+        const bottom = r === r1 ? b.bottom : b.horizontal;
+        const left = c === c0 ? b.left : b.vertical;
+        const right = c === c1 ? b.right : b.vertical;
+        if (top)
+            borders.top = top;
+        if (bottom)
+            borders.bottom = bottom;
+        if (left)
+            borders.left = left;
+        if (right)
+            borders.right = right;
+    };
+    apply(elements.wholeTable, 0, lastRow, 0, lastColumn);
+    if (isBody) {
+        apply(elements[c % 2 === 0 ? "firstColumnStripe" : "secondColumnStripe"], bodyStart, bodyEnd, c, c);
+        apply(elements[(r - bodyStart) % 2 === 0 ? "firstRowStripe" : "secondRowStripe"], r, r, 0, lastColumn);
+    }
+    if (position.showLastColumn && c === lastColumn) {
+        apply(elements.lastColumn, 0, lastRow, c, c);
+    }
+    if (position.showFirstColumn && c === 0) {
+        apply(elements.firstColumn, 0, lastRow, c, c);
+    }
+    if (position.headerRow && r === 0) {
+        apply(elements.headerRow, r, r, 0, lastColumn);
+    }
+    if (position.totalRow && r === lastRow) {
+        apply(elements.totalRow, r, r, 0, lastColumn);
+    }
+    if (Object.keys(borders).length)
+        out.borders = borders;
+    return out;
 };

package/dist/esm/tsconfig.esm.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../array.ts","../../cell-data-helpers.ts","../../cjk-number-format.ts","../../clipboard-html-sanitize.ts","../../color.ts","../../colors.ts","../../condition-operand.ts","../../conditional-format.ts","../../content-hash.ts","../../data-validation.ts","../../date.ts","../../dom.ts","../../excel-number-format.ts","../../formatter.ts","../../formula-locale.ts","../../formula-refs.ts","../../formula.ts","../../index.ts","../../keyboard.ts","../../locale.ts","../../log.ts","../../memoize.ts","../../numbers.ts","../../rich-text-html.ts","../../rich-text-links.ts","../../selection.ts","../../shared-string-canonical.ts","../../sheet-names.ts","../../sheet-protection.ts","../../sheet-span.ts","../../sort.ts","../../sparkline-groups.ts","../../string.ts","../../table-names.ts","../../table-styles.ts","../../table-totals.ts","../../typeguards.ts","../../uuid.ts","../../vitest.config.ts","../../formula-locale/formula-locale-data.generated.ts"],"version":"5.8.3"}
+{"root":["../../array.ts","../../autocorrect.ts","../../cell-data-helpers.ts","../../cjk-number-format.ts","../../clipboard-html-sanitize.ts","../../color.ts","../../colors.ts","../../condition-operand.ts","../../conditional-format.ts","../../content-hash.ts","../../data-validation.ts","../../date.ts","../../dom.ts","../../excel-number-format.ts","../../formatter.ts","../../formula-locale.ts","../../formula-refs.ts","../../formula.ts","../../index.ts","../../insert-date-time.ts","../../keyboard.ts","../../locale.ts","../../log.ts","../../memoize.ts","../../numbers.ts","../../rich-text-html.ts","../../rich-text-links.ts","../../selection.ts","../../shared-string-canonical.ts","../../sheet-names.ts","../../sheet-protection.ts","../../sheet-span.ts","../../sort.ts","../../sparkline-groups.ts","../../string.ts","../../table-names.ts","../../table-style-presets.ts","../../table-styles.ts","../../table-totals.ts","../../typeguards.ts","../../uuid.ts","../../vitest.config.ts","../../formula-locale/formula-locale-data.generated.ts"],"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/utils",
-  "version": "9.6.2",
+  "version": "9.6.3",
   "author": "Vinay M",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "./dist/cjs/index.js",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "numfmt": "^3.2.2",
-    "@rowsncolumns/common-types": ">=5.3.5"
+    "@rowsncolumns/common-types": ">=5.3.6"
   },
   "devDependencies": {},
   "peerDependencies": {}