Skip to content

Commit

Permalink
3.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonbengtsson
simonbengtsson committed Aug 24, 2023
1 parent 6879859 commit 90a2c87
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 36 deletions.
4 changes: 2 additions & 2 deletions dist/index.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export interface Settings {
tableLineWidth: number;
tableLineColor: Color;
horizontalPageBreak?: boolean;
horizontalPageBreakRepeat?: string | number | null;
horizontalPageBreakRepeat?: string | number | string[] | number[] | null;
}
export interface StylesProps {
styles: Partial<Styles>;
Expand Down Expand Up @@ -257,7 +257,7 @@ export interface UserOptions {
html?: string | HTMLTableElement;
columns?: ColumnInput[];
horizontalPageBreak?: boolean;
horizontalPageBreakRepeat?: string | number;
horizontalPageBreakRepeat?: string[] | number[] | string | number;
styles?: Partial<Styles>;
bodyStyles?: Partial<Styles>;
headStyles?: Partial<Styles>;
Expand Down
48 changes: 33 additions & 15 deletions dist/jspdf.plugin.autotable.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
*
* jsPDF AutoTable plugin v3.5.31
* jsPDF AutoTable plugin v3.6.0
*
* Copyright (c) 2023 Simon Bengtsson, https://github.com/simonbengtsson/jsPDF-AutoTable
* Licensed under the MIT License.
Expand Down Expand Up @@ -1983,19 +1983,40 @@ var getPageAvailableWidth = function (doc, table) {
};
// get columns can be fit into page
var getColumnsCanFitInPage = function (doc, table, config) {
var _a;
if (config === void 0) { config = {}; }
// get page width
// Get page width
var availablePageWidth = getPageAvailableWidth(doc, table);
var remainingWidth = availablePageWidth;
// get column data key to repeat
var horizontalPageBreakRepeat = table.settings.horizontalPageBreakRepeat;
// Get column data key to repeat
var repeatColumnsMap = new Map();
var repeatColumn = null;
var cols = [];
var columns = [];
var len = table.columns.length;
var i = config && config.start ? config.start : 0;
// code to repeat the given column in split pages
if (horizontalPageBreakRepeat != null) {
var i = (_a = config === null || config === void 0 ? void 0 : config.start) !== null && _a !== void 0 ? _a : 0;
var horizontalPageBreakRepeat = table.settings.horizontalPageBreakRepeat;
// Code to repeat the given column in split pages
if (horizontalPageBreakRepeat !== null && horizontalPageBreakRepeat !== undefined && Array.isArray(horizontalPageBreakRepeat)) {
var _loop_1 = function (field) {
var col = table.columns.find(function (item) {
return item.dataKey === field ||
item.index === field;
});
if (col) {
repeatColumnsMap.set(col.index, col);
cols.push(col.index);
columns.push(table.columns[col.index]);
remainingWidth = remainingWidth - col.wrappedWidth;
}
};
for (var _i = 0, horizontalPageBreakRepeat_1 = horizontalPageBreakRepeat; _i < horizontalPageBreakRepeat_1.length; _i++) {
var field = horizontalPageBreakRepeat_1[_i];
_loop_1(field);
}
// It can be a single value of type string or number (even number: 0)
}
else if (horizontalPageBreakRepeat !== null && horizontalPageBreakRepeat !== undefined) {
repeatColumn = table.columns.find(function (item) {
return item.dataKey === horizontalPageBreakRepeat ||
item.index === horizontalPageBreakRepeat;
Expand All @@ -2007,26 +2028,23 @@ var getColumnsCanFitInPage = function (doc, table, config) {
}
}
while (i < len) {
if ((repeatColumn === null || repeatColumn === void 0 ? void 0 : repeatColumn.index) === i) {
i++; // prevent columnDataKeyToRepeat to be pushed twice in a page
// Prevent columnDataKeyToRepeat from being pushed twice on a page
if ((Array.isArray(horizontalPageBreakRepeat) && repeatColumnsMap.get(i))
|| (repeatColumn === null || repeatColumn === void 0 ? void 0 : repeatColumn.index) === i) {
i++;
continue;
}
var colWidth = table.columns[i].wrappedWidth;
if (remainingWidth < colWidth) {
// check if it's first column in the sequence then add it into result
if (i === 0 || i === config.start) {
// this cell width is more than page width set it available pagewidth
/* table.columns[i].wrappedWidth = availablePageWidth
table.columns[i].minWidth = availablePageWidth */
cols.push(i);
columns.push(table.columns[i]);
}
// can't print more columns in same page
break;
}
cols.push(i);
columns.push(table.columns[i]);
remainingWidth = remainingWidth - colWidth;
remainingWidth -= colWidth;
i++;
}
return { colIndexes: cols, columns: columns, lastIndex: i };
Expand Down
4 changes: 2 additions & 2 deletions dist/jspdf.plugin.autotable.min.js
View file

Large diffs are not rendered by default.

46 changes: 32 additions & 14 deletions dist/jspdf.plugin.autotable.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1180,19 +1180,40 @@ var getPageAvailableWidth = function (doc, table) {
};
// get columns can be fit into page
var getColumnsCanFitInPage = function (doc, table, config) {
var _a;
if (config === void 0) { config = {}; }
// get page width
// Get page width
var availablePageWidth = getPageAvailableWidth(doc, table);
var remainingWidth = availablePageWidth;
// get column data key to repeat
var horizontalPageBreakRepeat = table.settings.horizontalPageBreakRepeat;
// Get column data key to repeat
var repeatColumnsMap = new Map();
var repeatColumn = null;
var cols = [];
var columns = [];
var len = table.columns.length;
var i = config && config.start ? config.start : 0;
// code to repeat the given column in split pages
if (horizontalPageBreakRepeat != null) {
var i = (_a = config === null || config === void 0 ? void 0 : config.start) !== null && _a !== void 0 ? _a : 0;
var horizontalPageBreakRepeat = table.settings.horizontalPageBreakRepeat;
// Code to repeat the given column in split pages
if (horizontalPageBreakRepeat !== null && horizontalPageBreakRepeat !== undefined && Array.isArray(horizontalPageBreakRepeat)) {
var _loop_1 = function (field) {
var col = table.columns.find(function (item) {
return item.dataKey === field ||
item.index === field;
});
if (col) {
repeatColumnsMap.set(col.index, col);
cols.push(col.index);
columns.push(table.columns[col.index]);
remainingWidth = remainingWidth - col.wrappedWidth;
}
};
for (var _i = 0, horizontalPageBreakRepeat_1 = horizontalPageBreakRepeat; _i < horizontalPageBreakRepeat_1.length; _i++) {
var field = horizontalPageBreakRepeat_1[_i];
_loop_1(field);
}
// It can be a single value of type string or number (even number: 0)
}
else if (horizontalPageBreakRepeat !== null && horizontalPageBreakRepeat !== undefined) {
repeatColumn = table.columns.find(function (item) {
return item.dataKey === horizontalPageBreakRepeat ||
item.index === horizontalPageBreakRepeat;
Expand All @@ -1204,26 +1225,23 @@ var getColumnsCanFitInPage = function (doc, table, config) {
}
}
while (i < len) {
if ((repeatColumn === null || repeatColumn === void 0 ? void 0 : repeatColumn.index) === i) {
i++; // prevent columnDataKeyToRepeat to be pushed twice in a page
// Prevent columnDataKeyToRepeat from being pushed twice on a page
if ((Array.isArray(horizontalPageBreakRepeat) && repeatColumnsMap.get(i))
|| (repeatColumn === null || repeatColumn === void 0 ? void 0 : repeatColumn.index) === i) {
i++;
continue;
}
var colWidth = table.columns[i].wrappedWidth;
if (remainingWidth < colWidth) {
// check if it's first column in the sequence then add it into result
if (i === 0 || i === config.start) {
// this cell width is more than page width set it available pagewidth
/* table.columns[i].wrappedWidth = availablePageWidth
table.columns[i].minWidth = availablePageWidth */
cols.push(i);
columns.push(table.columns[i]);
}
// can't print more columns in same page
break;
}
cols.push(i);
columns.push(table.columns[i]);
remainingWidth = remainingWidth - colWidth;
remainingWidth -= colWidth;
i++;
}
return { colIndexes: cols, columns: columns, lastIndex: i };
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jspdf-autotable",
"version": "3.5.31",
"version": "3.6.0",
"description": "Generate pdf tables with javascript (jsPDF plugin)",
"main": "dist/jspdf.plugin.autotable.js",
"exports": {
Expand Down

0 comments on commit 90a2c87

Please sign in to comment.