self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-02 12:47:41 +02:00
Code Issues Releases Activity

Desktop: Custom CSS: Add cm-listItem class to lines with list items, don't add region start/end markers for items that are always single-line (#11291)

Browse Source
This commit is contained in:
Henry Heino 2024-10-30 14:09:23 -07:00 committed by GitHub
parent f1e5ab8255
commit f7f4a50d35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/editor/CodeMirror/markdown/decoratorExtension.ts
View File

@ -84,6 +84,18 @@ const tableDelimiterDecoration = Decoration.line({
attributes: { class: 'cm-tableDelimiter' }, attributes: { class: 'cm-tableDelimiter' },
}); });
const orderedListDecoration = Decoration.line({
attributes: { class: 'cm-orderedList' },
});
const unorderedListDecoration = Decoration.line({
attributes: { class: 'cm-unorderedList' },
});
const listItemDecoration = Decoration.line({
attributes: { class: 'cm-listItem' },
});
const horizontalRuleDecoration = Decoration.mark({ const horizontalRuleDecoration = Decoration.mark({
attributes: { class: 'cm-hr' }, attributes: { class: 'cm-hr' },
}); });
@ -97,6 +109,10 @@ const nodeNameToLineDecoration: Record<string, Decoration> = {
'CodeBlock': codeBlockDecoration, 'CodeBlock': codeBlockDecoration,
'BlockMath': mathBlockDecoration, 'BlockMath': mathBlockDecoration,
'Blockquote': blockQuoteDecoration, 'Blockquote': blockQuoteDecoration,
'OrderedList': orderedListDecoration,
'BulletList': unorderedListDecoration,
'ListItem': listItemDecoration,
'SetextHeading1': header1LineDecoration, 'SetextHeading1': header1LineDecoration,
'ATXHeading1': header1LineDecoration, 'ATXHeading1': header1LineDecoration,
@ -122,6 +138,14 @@ const nodeNameToMarkDecoration: Record<string, Decoration> = {
'TaskMarker': taskMarkerDecoration, 'TaskMarker': taskMarkerDecoration,
}; };
const multilineNodes = {
'FencedCode': true,
'CodeBlock': true,
'BlockMath': true,
'Blockquote': true,
'OrderedList': true,
'BulletList': true,
};
type DecorationDescription = { pos: number; length: number; decoration: Decoration }; type DecorationDescription = { pos: number; length: number; decoration: Decoration };
@ -179,8 +203,8 @@ const computeDecorations = (view: EditorView) => {
addDecorationToRange(viewFrom, viewTo, decoration); addDecorationToRange(viewFrom, viewTo, decoration);
} }
// Only block decorations will have differing first and last lines // Only certain block decorations will have differing first and last lines
if (blockDecorated) { if (blockDecorated && multilineNodes.hasOwnProperty(node.name)) {
// Allow different styles for the first, last lines in a block. // Allow different styles for the first, last lines in a block.
if (viewFrom === node.from) { if (viewFrom === node.from) {
addDecorationToLines(viewFrom, viewFrom, regionStartDecoration); addDecorationToLines(viewFrom, viewFrom, regionStartDecoration);