Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

CodeMirror editor small fixes and dark mode updates (#64791)

Romeo Van Snick935fe5a0e571
diff --git a/e2e/test/scenarios/filters/filter.cy.spec.js b/e2e/test/scenarios/filters/filter.cy.spec.js
index 4502b43cc00..2ad8113c76c 100644
--- a/e2e/test/scenarios/filters/filter.cy.spec.js
+++ b/e2e/test/scenarios/filters/filter.cy.spec.js
@@ -713,7 +713,7 @@ describe("scenarios > question > filter", () => {
// Esc closes the suggestion popover
cy.realPress("Escape");
- H.CustomExpressionEditor.completions().should("be.visible");
+ H.CustomExpressionEditor.completions().should("not.be.visible");
});
it("should work on twice summarized questions and preserve both summaries (metabase#15620)", () => {
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonEditor/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonEditor/utils.ts
index 89064502b18..6a60e09ec0c 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonEditor/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonEditor/utils.ts
@@ -661,7 +661,6 @@ function genericPandasCompletions(context: CompletionContext) {
}));
return {
- filter: false,
from: word.from + text.length - partial.length,
options,
};
diff --git a/frontend/src/metabase/common/components/CodeMirror/CodeMirror.module.css b/frontend/src/metabase/common/components/CodeMirror/CodeMirror.module.css
index 1a869ebbf18..686a92e1fe1 100644
--- a/frontend/src/metabase/common/components/CodeMirror/CodeMirror.module.css
+++ b/frontend/src/metabase/common/components/CodeMirror/CodeMirror.module.css
@@ -59,6 +59,7 @@
.cm-cursor {
border-left-width: 1.6px;
+ border-left-color: var(--mb-color-text-secondary);
}
.cm-tooltip:not(.cm-tooltip-autocomplete) {
@@ -76,5 +77,87 @@
font-style: italic;
background: none;
}
+
+ .cm-completionMatchedText {
+ text-decoration: none;
+ font-weight: bold;
+ color: var(--mb-color-focus);
+ }
+
+ .cm-completionDetail {
+ color: var(--mb-color-text-light);
+ font-style: normal;
+ text-align: right;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ .cm-completionIcon {
+ display: none;
+ }
+
+ .cm-completionLabel {
+ display: block;
+ max-width: 18rem;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ font-weight: bold;
+ }
+
+ .cm-tooltip-autocomplete {
+ box-shadow: 0 5px 14px rgba(0, 0, 0, 0.08);
+ border-radius: 4px;
+ background-color: var(--mb-color-bg-white);
+ color: var(--mb-color-text-dark);
+ border: 1px solid var(--mb-color-border);
+ max-width: 520px;
+
+ ul li {
+ color: inherit;
+ padding: 0 8px !important;
+ display: flex;
+ justify-content: space-between;
+
+ &:first-child {
+ margin-top: 4px;
+ }
+
+ &:last-child {
+ margin-bottom: 4px;
+ }
+
+ &:hover,
+ &[aria-selected="true"] {
+ background-color: var(--mb-color-bg-hover);
+ }
+ }
+
+ @supports (grid-template-columns: subgrid) {
+ ul:has(.cm-completionLabel) {
+ display: grid;
+ gap: 0 1rem;
+ grid-template-columns: 1fr;
+ grid-auto-rows: max-content;
+
+ &:has(.cm-completionDetail) {
+ grid-template-columns: max-content 1fr;
+ }
+
+ li {
+ display: grid;
+ grid-column: 1 / span 2;
+ grid-template-columns: subgrid;
+ }
+
+ .cm-completionLabel {
+ grid-column: 1;
+ }
+
+ .cm-completionDetail {
+ grid-column: 2;
+ }
+ }
+ }
+ }
}
}
diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css b/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css
index 998023b4fb2..0c28c0ba96e 100644
--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css
+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/CodeMirrorEditor/CodeMirrorEditor.module.css
@@ -6,95 +6,6 @@
height: 100%;
color: var(--mb-color-text-dark);
background-color: var(--mb-color-bg-light);
-
- :global {
- .cm-cursor {
- border-left-color: var(--mb-color-text-secondary);
- }
-
- .cm-tooltip-autocomplete {
- box-shadow: 0 5px 14px rgba(0, 0, 0, 0.08);
- border-radius: 4px;
- background-color: white;
- color: var(--mb-color-text-dark);
- border: 1px solid var(--mb-color-border);
- max-width: 520px;
-
- ul li {
- color: inherit;
- padding: 0 8px !important;
- display: flex;
- justify-content: space-between;
-
- &:first-child {
- margin-top: 4px;
- }
-
- &:last-child {
- margin-bottom: 4px;
- }
-
- &:hover,
- &[aria-selected="true"] {
- color: inherit;
- background-color: var(--mb-color-focus);
- }
- }
-
- @supports (grid-template-columns: subgrid) {
- ul:has(.cm-completionLabel) {
- display: grid;
- gap: 0 1rem;
- grid-template-columns: 1fr;
- grid-auto-rows: max-content;
-
- &:has(.cm-completionDetail) {
- grid-template-columns: max-content 1fr;
- }
-
- li {
- display: grid;
- grid-column: 1 / span 2;
- grid-template-columns: subgrid;
- }
-
- .cm-completionLabel {
- grid-column: 1;
- }
-
- .cm-completionDetail {
- grid-column: 2;
- }
- }
- }
-
- .cm-completionIcon {
- display: none;
- }
-
- .cm-completionMatchedText {
- text-decoration: none;
- font-weight: bold;
- color: var(--mb-color-brand);
- }
-
- .cm-completionLabel {
- display: block;
- max-width: 18rem;
- overflow: hidden;
- text-overflow: ellipsis;
- font-weight: bold;
- }
-
- .cm-completionDetail {
- color: var(--mb-color-text-light);
- font-style: normal;
- text-align: right;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- }
- }
}
.tag {
diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.css b/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.css
index e611eb6fb69..cae16b212f0 100644
--- a/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.css
+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/Editor.module.css
@@ -36,10 +36,6 @@
.cm-gutters {
border-top-left-radius: var(--mantine-radius-sm);
}
-
- .cm-tooltip-autocomplete {
- display: none;
- }
}
}
diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.css b/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.css
index 022f907baf6..f202e3abb52 100644
--- a/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.css
+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/HelpText/HelpText.module.css
@@ -1,7 +1,7 @@
.usage {
padding: 0.25rem 0;
padding-left: 0.5rem;
- background-color: white;
+ background-color: var(--mb-color-white);
color: var(--mb-color-text-secondary);
cursor: pointer;
font-family: var(--mb-default-monospace-font-family);
diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.css b/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.css
index 25669f2337a..f583990430e 100644
--- a/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.css
+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/Listbox/Listbox.module.css
@@ -1,9 +1,12 @@
.listbox {
- border-top: 1px solid var(--mb-color-border);
overflow-y: auto;
font-size: 14px;
flex-shrink: 1;
height: 100%;
+
+ &:not(:first-child) {
+ border-top: 1px solid var(--mb-color-border);
+ }
}
.item {
diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.css b/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.css
index 369044d163f..30dabecf49d 100644
--- a/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.css
+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/Tooltip/Tooltip.module.css
@@ -1,6 +1,10 @@
.dropdown {
display: flex;
flex-direction: row;
+
+ &:has(.tooltip:empty) {
+ border: none;
+ }
}
.target {
diff --git a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.css b/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.css
index b9434268d4a..56df4282cf9 100644
--- a/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.css
+++ b/frontend/src/metabase/query_builder/components/expressions/FunctionBrowser/FunctionBrowser.module.css
@@ -2,6 +2,8 @@
background-color: var(--mb-color-bg-light);
border-left: 1px solid var(--mb-color-border);
height: 100%;
+ border-top-right-radius: var(--mantine-radius-md);
+ border-bottom-right-radius: var(--mantine-radius-md);
}
.results {