Skip to content

Commit 0f5dd45

Browse files
fix(theme): fix some styling for the editor (#100)
1 parent 039f871 commit 0f5dd45

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

packages/components/react/src/CodeMirrorEditor/cm-theme.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@ export const editorTheme = EditorView.theme({
128128
'.cm-tooltip': {
129129
background: 'var(--cm-tooltip-backgroundColor)',
130130
borderColor: 'var(--cm-tooltip-borderColor)',
131+
color: 'var(--cm-tooltip-textColor)',
131132
},
132133
'.cm-tooltip.cm-tooltip-autocomplete ul li[aria-selected]': {
133134
background: 'var(--cm-tooltip-backgroundColorSelected)',
135+
color: 'var(--cm-tooltip-textColorSelected)',
134136
},
135137
});
136138

packages/components/react/src/styles/cm.css

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616

1717
/* Cursor */
1818
--cm-cursor-width: 2px;
19-
--cm-cursor-backgroundColor: var(--tk-elements-editor-cursor-textColor, var(--tk-text-primary));
19+
--cm-cursor-backgroundColor: var(--tk-elements-editor-cursorColor, var(--tk-text-primary));
2020

2121
/* Matching Brackets */
2222
--cm-matching-bracket: var(--tk-elements-editor-matchingBracketBackgroundColor, rgb(50 140 130 / 0.3));
2323

2424
/* Selection */
25-
--cm-selection-backgroundColorFocused: var(--tk-elements-editor-selection-backgroundColorFocused, #42b4ff);
26-
--cm-selection-backgroundOpacityFocused: var(--tk-elements-editor-selection-backgroundOpacityFocused, 0.3);
27-
--cm-selection-backgroundColorBlured: var(--tk-elements-editor-selection-backgroundColorBlured, #c9e9ff);
28-
--cm-selection-backgroundOpacityBlured: var(--tk-elements-editor-selection-backgroundOpacityBlured, 0.3);
25+
--cm-selection-backgroundColorFocused: var(--tk-elements-editor-selection-backgroundColor, #42b4ff);
26+
--cm-selection-backgroundOpacityFocused: var(--tk-elements-editor-selection-backgroundOpacity, 0.3);
27+
--cm-selection-backgroundColorBlured: var(--tk-elements-editor-selection-inactiveBackgroundColor, #c9e9ff);
28+
--cm-selection-backgroundOpacityBlured: var(--tk-elements-editor-selection-inactiveBackgroundOpacity, 0.3);
2929

3030
/* Panels */
3131
--cm-panels-borderColor: var(--tk-elements-editor-panels-borderColor, var(--tk-elements-app-borderColor));
@@ -77,10 +77,12 @@
7777
--tk-elements-editor-tooltip-backgroundColor,
7878
var(--tk-elements-app-backgroundColor)
7979
);
80+
--cm-tooltip-textColor: var(--tk-elements-editor-tooltip-textColor, var(--tk-text-primary));
8081
--cm-tooltip-backgroundColorSelected: var(
8182
--tk-elements-editor-tooltip-backgroundColorSelected,
8283
var(--tk-background-accent)
8384
);
85+
--cm-tooltip-textColorSelected: var(--tk-elements-editor-tooltip-textColorSelected, var(--tk-text-primary));
8486
--cm-tooltip-borderColor: var(--tk-elements-editor-tooltip-borderColor, var(--tk-elements-app-borderColor));
8587
}
8688

0 commit comments

Comments
 (0)