Skip to content

fix(super-converter): fix table-cell shading export — strip # prefix and emit val="clear" (SD-3142) #3312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nazlo90 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(super-converter): fix table-cell shading export — strip # prefix and emit val="clear" (SD-3142) #3312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...itor/src/editors/v1/core/super-converter/v3/handlers/w/tc/helpers/translate-table-cell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { pixelsToTwips, inchesToTwips, twipsToPixels } from '@converter/helpers';
import { pixelsToTwips, inchesToTwips, twipsToPixels, normalizeHexColor, isValidHexColor } from '@converter/helpers';
import { translateChildNodes } from '@converter/v2/exporter/helpers/index';
import { translator as tcPrTranslator } from '../../tcPr';
import {
Expand Down Expand Up @@ -73,8 +73,11 @@ export function generateTableCellProperties(node) {

// Background
const { background = {} } = attrs;
if (background?.color && tableCellProperties.shading?.fill !== background?.color) {
tableCellProperties['shading'] = { fill: background.color };
if (background?.color) {
const fill = normalizeHexColor(background.color);
if (fill && isValidHexColor(fill) && tableCellProperties.shading?.fill?.toUpperCase() !== fill) {
tableCellProperties['shading'] = { fill, val: 'clear' };
}
} else if (!background?.color && tableCellProperties?.shading?.fill) {
delete tableCellProperties.shading;
}
Expand Down
20 changes: 18 additions & 2 deletions ...src/editors/v1/core/super-converter/v3/handlers/w/tc/helpers/translate-table-cell.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ describe('translate-table-cell helpers', () => {
// gridSpan
expect(byName['w:gridSpan'].attributes['w:val']).toBe('2');

// background
expect(byName['w:shd'].attributes['w:fill']).toBe('#FF00FF');
// background - OOXML requires bare 6-char hex (no #) and w:val="clear" for solid fills
expect(byName['w:shd'].attributes['w:fill']).toBe('FF00FF');
expect(byName['w:shd'].attributes['w:val']).toBe('clear');

// tcMar
const mar = byName['w:tcMar'];
Expand Down Expand Up @@ -348,6 +349,21 @@ describe('translate-table-cell helpers', () => {
// mocked child from translateChildNodes
expect(out.elements[1]).toMatchObject({ name: 'w:p' });
});

it('generateTableCellProperties strips # from background color and adds val:clear', () => {
const node = { attrs: { background: { color: '#A1B2C3' } } };
const tcPr = generateTableCellProperties(node);
const shd = tcPr.elements.find((e) => e.name === 'w:shd');
expect(shd.attributes['w:fill']).toBe('A1B2C3');
expect(shd.attributes['w:val']).toBe('clear');
});

it('generateTableCellProperties does not write w:shd for non-hex background (e.g. auto)', () => {
const node = { attrs: { colwidth: [100], widthUnit: 'px', background: { color: 'auto' } } };
const tcPr = generateTableCellProperties(node);
const shd = tcPr.elements.find((e) => e.name === 'w:shd');
expect(shd).toBeUndefined();
});
});

/** Helper: extract w:tcW element from a generateTableCellProperties result */
Expand Down
Loading