feat(editor): improve html content color mapping (#15516)
Some checks failed
Build & Test / Build AFFiNE native (x86_64-unknown-linux-gnu) (push) Has been cancelled
Build & Test / Analyze (javascript, affine) (push) Has been cancelled
Build & Test / Analyze (javascript, blocksuite) (push) Has been cancelled
Build & Test / Analyze (typescript, affine) (push) Has been cancelled
Build & Test / Analyze (typescript, blocksuite) (push) Has been cancelled
Build & Test / Lint (push) Has been cancelled
Build & Test / Typecheck (push) Has been cancelled
Build & Test / Mobile native build filter (push) Has been cancelled
Build & Test / Rust test filter (push) Has been cancelled
Build & Test / Build AFFiNE native (aarch64-apple-darwin) (push) Has been cancelled
Build & Test / Check yarn binary (push) Has been cancelled
Build & Test / E2E BlockSuite Test (1) (push) Has been cancelled
Build & Test / E2E BlockSuite Test (2) (push) Has been cancelled
Build & Test / Build AFFiNE native (x86_64-apple-darwin) (push) Has been cancelled
Build & Test / E2E BlockSuite Test (3) (push) Has been cancelled
Build & Test / E2E BlockSuite Test (4) (push) Has been cancelled
Build & Test / E2E BlockSuite Test (5) (push) Has been cancelled
Build & Test / E2E BlockSuite Cross Browser Test (push) Has been cancelled
Build & Test / E2E Test (1) (push) Has been cancelled
Build & Test / E2E Test (2) (push) Has been cancelled
Build & Test / E2E Test (3) (push) Has been cancelled
Build & Test / E2E Test (4) (push) Has been cancelled
Build & Test / E2E Test (5) (push) Has been cancelled
Build & Test / E2E Mobile Test (1) (push) Has been cancelled
Build & Test / E2E Mobile Test (2) (push) Has been cancelled
Build & Test / Build AFFiNE native (aarch64-pc-windows-msvc) (push) Has been cancelled
Build & Test / Build AFFiNE native (x86_64-pc-windows-msvc) (push) Has been cancelled
Build & Test / Build Server native (push) Has been cancelled
Build & Test / Build @affine/electron renderer (push) Has been cancelled
Build & Test / Copilot test filter (push) Has been cancelled
Build & Test / Build Android app (push) Has been cancelled
Build & Test / Test Android app (push) Has been cancelled
Build & Test / Build iOS app (push) Has been cancelled
Build & Test / Lint Rust (push) Has been cancelled
Build & Test / Check Git Status (push) Has been cancelled
Build & Test / Desktop Test (ubuntu-latest, linux, x64, x86_64-unknown-linux-gnu, true) (push) Has been cancelled
Build & Test / Desktop Test (windows-latest, windows, x64, x86_64-pc-windows-msvc, true) (push) Has been cancelled
Build & Test / Unit Test (1) (push) Has been cancelled
Build & Test / Unit Test (2) (push) Has been cancelled
Build & Test / Unit Test (3) (push) Has been cancelled
Build & Test / Unit Test (4) (push) Has been cancelled
Build & Test / Unit Test (5) (push) Has been cancelled
Build & Test / Native Unit Test (push) Has been cancelled
Build & Test / Server Test (0, 4) (push) Has been cancelled
Build & Test / Server Test (1, 4) (push) Has been cancelled
Build & Test / Server Test (2, 4) (push) Has been cancelled
Build & Test / Server Test (3, 4) (push) Has been cancelled
Build & Test / Server Test with Elasticsearch (push) Has been cancelled
Build & Test / Server Test with Embedded Search (push) Has been cancelled
Build & Test / Server Test with Manticore Search (push) Has been cancelled
Build & Test / Server E2E Test (push) Has been cancelled
Build & Test / Run native tests (push) Has been cancelled
Build & Test / Server Copilot Api Test (push) Has been cancelled
Build & Test / Frontend Copilot E2E Test (1, 5) (push) Has been cancelled
Build & Test / Frontend Copilot E2E Test (2, 5) (push) Has been cancelled
Build & Test / Frontend Copilot E2E Test (3, 5) (push) Has been cancelled
Build & Test / Frontend Copilot E2E Test (4, 5) (push) Has been cancelled
Build & Test / Frontend Copilot E2E Test (5, 5) (push) Has been cancelled
Build & Test / Cloud Desktop E2E Test (push) Has been cancelled
Build & Test / Cloud E2E Test 1/2 (push) Has been cancelled
Build & Test / Cloud E2E Test 2/2 (push) Has been cancelled
Build & Test / Desktop Test (macos-latest, macos, arm64, aarch64-apple-darwin, true) (push) Has been cancelled
Build & Test / Desktop Test (macos-latest, macos, x64, x86_64-apple-darwin, false) (push) Has been cancelled
Build & Test / 3, 2, 1 Launch (push) Has been cancelled
Copilot Test Automatically / Setup Test (push) Has been cancelled
Release / Prepare (push) Has been cancelled
Release / Canary Gate (push) Has been cancelled
Release / Release Cloud (push) Has been cancelled
Release / Release Docker Image (push) Has been cancelled
Release / Release Desktop (push) Has been cancelled
Release / Release Mobile (push) Has been cancelled

fix #15514

#### PR Dependency Tree


* **PR #15516** 👈

This tree was auto-generated by
[Charcoal](https://github.com/danerwilliams/charcoal)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Bug Fixes**
  * Improved color handling when importing HTML content.
* Added support for hex, RGB/RGBA, percentage, alpha, transparent,
named, and HSL color values.
  * Correctly maps supported colors to the app’s color themes.
* Prevents invalid, translucent, or unsuitable colors from being
applied.
  * Preserves style values containing additional colons during import.
* Improved imported text formatting for supported and unsupported
colors.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
DarkSky
2026-08-24 10:52:02 +08:00
committed by GitHub
parent cd6593c659
commit 8e8a781ed1
4 changed files with 125 additions and 105 deletions

View File

@@ -3929,48 +3929,40 @@ describe('markdown to snapshot', () => {
});
});
test('html inline color span imports to nearest supported text color', async () => {
const markdown = `<span style="color: #00afde;">Hello</span>`;
const blockSnapshot: BlockSnapshot = {
type: 'block',
id: 'matchesReplaceMap[0]',
flavour: 'affine:note',
props: {
xywh: '[0,0,800,95]',
background: DefaultTheme.noteBackgrounColor,
index: 'a0',
hidden: false,
displayMode: NoteDisplayMode.DocAndEdgeless,
},
children: [
{
type: 'block',
id: 'matchesReplaceMap[1]',
flavour: 'affine:paragraph',
props: {
type: 'text',
text: {
'$blocksuite:internal:text$': true,
delta: [
{
insert: 'Hello',
attributes: {
color: 'var(--affine-v2-text-highlight-fg-blue)',
},
},
],
},
},
children: [],
},
],
};
test.each([
['#00afde', 'blue'],
['rgb(0 175 222 / 100%)', 'blue'],
['#c83030', 'red'],
['red', 'red'],
['hsl(0, 100%, 50%)', 'red'],
['#db7123', 'orange'],
['#ac7400', 'yellow'],
['#04b745', 'green'],
['#0e4841', 'teal'],
['#7c3aed', 'purple'],
['#7a7a7a', 'grey'],
['rgb(26, 26, 26)', null],
['#333', null],
['#fff', null],
['rgba(0, 175, 222, 0.5)', null],
])('maps supported HTML color %s conservatively', async (color, mapped) => {
const mdAdapter = new MarkdownAdapter(createJob(), provider);
const rawBlockSnapshot = await mdAdapter.toBlockSnapshot({
file: markdown,
file: `<span style="color: ${color};">Hello</span>`,
});
expect(rawBlockSnapshot.children[0]?.props.text).toEqual({
'$blocksuite:internal:text$': true,
delta: [
mapped
? {
insert: 'Hello',
attributes: {
color: `var(--affine-v2-text-highlight-fg-${mapped})`,
},
}
: { insert: 'Hello' },
],
});
expect(nanoidReplacement(rawBlockSnapshot)).toEqual(blockSnapshot);
});
test('paragraph', async () => {