Skip to content

Treat "initial" as black for border color #3313

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

Merged
juliaroldi merged 10 commits into from
Mar 24, 2026
Merged

Treat "initial" as black for border color #3313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad3ee65
merge model
juliaroldi Feb 6, 2026
a0b8343
Merge branch 'master' of https://github.com/microsoft/roosterjs
juliaroldi Feb 6, 2026
2ce49f6
fixes
juliaroldi Feb 11, 2026
8685a77
Merge branch 'master' of https://github.com/microsoft/roosterjs
juliaroldi Feb 19, 2026
953d639
Merge branch 'master' of https://github.com/microsoft/roosterjs
juliaroldi Feb 27, 2026
3ae5a9b
Merge branch 'master' of https://github.com/microsoft/roosterjs
juliaroldi Mar 6, 2026
3ed3db1
Merge branch 'master' of https://github.com/microsoft/roosterjs
juliaroldi Mar 11, 2026
5d8f081
Merge branch 'master' of https://github.com/microsoft/roosterjs
juliaroldi Mar 23, 2026
045ce33
borderColor
juliaroldi Mar 23, 2026
e611293
Merge branch 'master' into u/juliaroldi/table-initial-color
juliaroldi Mar 23, 2026
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
7 changes: 5 additions & 2 deletions packages/roosterjs-content-model-dom/lib/formatHandlers/common/borderColorFormatHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ const BorderStyleKeyMap: {
borderLeft: 'border-left-style',
};

const DEFAULT_COLOR = '#000000';

/**
* @internal
*/
Expand All @@ -40,7 +42,8 @@ export const borderColorFormatHandler: FormatHandler<BorderFormat> = {
BorderKeys.forEach(key => {
const width = element.style.getPropertyValue(BorderWidthKeyMap[key]);
const style = element.style.getPropertyValue(BorderStyleKeyMap[key]);
const borderColor = retrieveElementColor(element, key);
const color = retrieveElementColor(element, key);
const borderColor = color == 'initial' ? DEFAULT_COLOR : color;

if (borderColor) {
const lightModeColor = getLightModeColor(
Expand All @@ -67,6 +70,7 @@ export const borderColorFormatHandler: FormatHandler<BorderFormat> = {
const value = format[key];
if (value) {
const borderValues = extractBorderValues(value);
const borderColorProperty = BorderColorKeyMap[key];
if (borderValues.color) {
const transformedColor = adaptColor(
element,
Expand All @@ -76,7 +80,6 @@ export const borderColorFormatHandler: FormatHandler<BorderFormat> = {
context.darkColorHandler
);
if (transformedColor) {
const borderColorProperty = BorderColorKeyMap[key];
element.style.setProperty(borderColorProperty, transformedColor);
}
}
Expand Down
18 changes: 18 additions & 0 deletions ...es/roosterjs-content-model-dom/test/formatHandlers/common/borderColorFormatHandlerTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,24 @@ describe('borderColorFormatHandler.parse', () => {
);
expect(format.borderTop).toBe('1px solid red');
});

it('Parse border with initial color - should use default color', () => {
div.style.borderWidth = '1px';
div.style.borderStyle = 'solid';
div.style.borderTopColor = 'initial';

context.isDarkMode = false;
context.darkColorHandler = undefined;

spyOn(colorUtils, 'retrieveElementColor').and.returnValue('initial');
spyOn(colorUtils, 'getLightModeColor').and.returnValue('#000000');

borderColorFormatHandler.parse(format, div, context, {});

expect(colorUtils.retrieveElementColor).toHaveBeenCalledWith(div, 'borderTop');
expect(colorUtils.getLightModeColor).toHaveBeenCalledWith('#000000', false, undefined);
expect(format.borderTop).toBe('1px solid #000000');
});
Copy link

Copilot AI Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new "initial" parsing behavior is only covered in light mode. Adding a dark-mode test (with context.isDarkMode = true and a darkColorHandler present) would help catch regressions where the default black gets dropped/altered by getLightModeColor logic in dark mode.

Suggested change
});
});
it('Parse border with initial color in dark mode - should use default color', () => {
div.style.borderWidth = '1px';
div.style.borderStyle = 'solid';
div.style.borderTopColor = 'initial';
const mockDarkColorHandler = {
knownColors: {},
getDarkColor: jasmine.createSpy('getDarkColor').and.returnValue('#000000'),
updateKnownColor: jasmine.createSpy('updateKnownColor'),
generateColorKey: jasmine.createSpy('generateColorKey').and.returnValue('--colorKeyInitial'),
reset: jasmine.createSpy('reset'),
};
context.isDarkMode = true;
context.darkColorHandler = mockDarkColorHandler;
spyOn(colorUtils, 'retrieveElementColor').and.returnValue('initial');
spyOn(colorUtils, 'getLightModeColor').and.returnValue('#000000');
borderColorFormatHandler.parse(format, div, context, {});
expect(colorUtils.retrieveElementColor).toHaveBeenCalledWith(div, 'borderTop');
expect(colorUtils.getLightModeColor).toHaveBeenCalledWith(
'#000000',
true,
mockDarkColorHandler
);
expect(format.borderTop).toBe('1px solid #000000');
});

Copilot uses AI. Check for mistakes.
});

describe('borderColorFormatHandler.apply', () => {
Expand Down
Loading