Merge pull request #2733 from estanglerbm/stylecontext_autopush_faste…

…r_override Speed up StyleContextStack.autopush() for large tables
bpampuch · Jul 30, 2024 · c7caabb · c7caabb
2 parents 225f6d8 + d0f6560
commit c7caabb
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 50 deletions.
diff --git a/src/styleContextStack.js b/src/styleContextStack.js
@@ -84,50 +84,9 @@ StyleContextStack.prototype.autopush = function (item) {
 		this.push(styleNames[i]);
 	}
 
-	var styleProperties = [
-		'font',
-		'fontSize',
-		'fontFeatures',
-		'bold',
-		'italics',
-		'alignment',
-		'color',
-		'columnGap',
-		'fillColor',
-		'fillOpacity',
-		'decoration',
-		'decorationStyle',
-		'decorationColor',
-		'background',
-		'lineHeight',
-		'characterSpacing',
-		'noWrap',
-		'markerColor',
-		'leadingIndent',
-		'sup',
-		'sub'
-		//'tableCellPadding'
-		// 'cellBorder',
-		// 'headerCellBorder',
-		// 'oddRowCellBorder',
-		// 'evenRowCellBorder',
-		// 'tableBorder'
-	];
-	var styleOverrideObject = {};
-	var pushStyleOverrideObject = false;
-
-	styleProperties.forEach(function (key) {
-		if (!isUndefined(item[key]) && !isNull(item[key])) {
-			styleOverrideObject[key] = item[key];
-			pushStyleOverrideObject = true;
-		}
-	});
-
-	if (pushStyleOverrideObject) {
-		this.push(styleOverrideObject);
-	}
-
-	return styleNames.length + (pushStyleOverrideObject ? 1 : 0);
+	// rather than spend significant time making a styleOverrideObject, just add item
+	this.push(item);
+	return styleNames.length + 1;
 };
 
 /**

diff --git a/tests/styleContextStack.js b/tests/styleContextStack.js
@@ -21,6 +21,36 @@ describe('StyleContextStack', function () {
 
 	var defaultStyle = { fontSize: 12, bold: false, font: 'Helvetica' };
 
+	var styleProperties = [
+		'font',
+		'fontSize',
+		'fontFeatures',
+		'bold',
+		'italics',
+		'alignment',
+		'color',
+		'columnGap',
+		'fillColor',
+		'fillOpacity',
+		'decoration',
+		'decorationStyle',
+		'decorationColor',
+		'background',
+		'lineHeight',
+		'characterSpacing',
+		'noWrap',
+		'markerColor',
+		'leadingIndent',
+		'sup',
+		'sub'
+		//'tableCellPadding'
+		// 'cellBorder',
+		// 'headerCellBorder',
+		// 'oddRowCellBorder',
+		// 'evenRowCellBorder',
+		// 'tableBorder'
+	];
+
 	var stackWithDefaultStyle;
 	var fullStack;
 
@@ -113,21 +143,25 @@ describe('StyleContextStack', function () {
 	});
 
 	describe('autopush', function () {
-		it('should not push anything if no style nor style-property is defined', function () {
-			assert.equal(fullStack.autopush({ anotherProperty: 'test' }), 0);
+		it('should not push any style if no style nor style-property is defined', function () {
+			assert.equal(fullStack.autopush({ anotherProperty: 'test' }), 1);
+			assert.equal(fullStack.styleOverrides.length, 1);
+			styleProperties.forEach(function(key) {
+				assert.equal(fullStack.styleOverrides[0][key], undefined);
+			});
 		});
 
 		it('should push style name if object specifies it in the style property', function () {
 			assert.equal(fullStack.styleOverrides.length, 0);
-			assert.equal(fullStack.autopush({ anotherProperty: 'test', style: 'header' }), 1);
-			assert.equal(fullStack.styleOverrides.length, 1);
+			assert.equal(fullStack.autopush({ anotherProperty: 'test', style: 'header' }), 2);
+			assert.equal(fullStack.styleOverrides.length, 2);
 			assert.equal(fullStack.styleOverrides[0], 'header');
 		});
 
 		it('should push all style names if object specifies them as an array in the style property', function () {
 			assert.equal(fullStack.styleOverrides.length, 0);
-			assert.equal(fullStack.autopush({ anotherProperty: 'test', style: ['header', 'small'] }), 2);
-			assert.equal(fullStack.styleOverrides.length, 2);
+			assert.equal(fullStack.autopush({ anotherProperty: 'test', style: ['header', 'small'] }), 3);
+			assert.equal(fullStack.styleOverrides.length, 3);
 			assert.equal(fullStack.styleOverrides[0], 'header');
 			assert.equal(fullStack.styleOverrides[1], 'small');
 		});