diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts index bcfeb71ec70a4..f8711db226e73 100644 --- a/cypress/e2e/14-mapping.cy.ts +++ b/cypress/e2e/14-mapping.cy.ts @@ -73,6 +73,7 @@ describe('Data mapping', () => { ndv.actions.mapToParameter('value'); ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}'); + ndv.getters.inlineExpressionEditorInput().type('{esc}'); ndv.getters.parameterExpressionPreview('value').should('include.text', '0'); ndv.getters.inputTbodyCell(1, 0).realHover(); diff --git a/packages/design-system/src/css/_primitives.scss b/packages/design-system/src/css/_primitives.scss index 77e3a4e30ca4f..fe02c267e3c2a 100644 --- a/packages/design-system/src/css/_primitives.scss +++ b/packages/design-system/src/css/_primitives.scss @@ -9,6 +9,7 @@ --prim-gray-820: hsl(var(--prim-gray-h), 1%, 18%); --prim-gray-800: hsl(var(--prim-gray-h), 1%, 20%); + --prim-gray-780: hsl(var(--prim-gray-h), 1%, 22%); --prim-gray-740: hsl(var(--prim-gray-h), 2%, 26%); --prim-gray-670: hsl(var(--prim-gray-h), 2%, 33%); --prim-gray-540: hsl(var(--prim-gray-h), 4%, 46%); @@ -20,8 +21,9 @@ --prim-gray-70: hsl(var(--prim-gray-h), 32%, 93%); --prim-gray-70-alpha-01: hsla(var(--prim-gray-h), 32%, 93%, 0.1); --prim-gray-40: hsl(var(--prim-gray-h), 40%, 96%); - --prim-gray-30: hsl(var(--prim-gray-h), 40%, 97%); - --prim-gray-10: hsl(var(--prim-gray-h), 47%, 99%); + --prim-gray-30: hsl(var(--prim-gray-h), 43%, 97%); + --prim-gray-25: hsl(var(--prim-gray-h), 50%, 97.5%); + --prim-gray-10: hsl(var(--prim-gray-h), 50%, 99%); --prim-gray-0-alpha-075: hsla(var(--prim-gray-h), 50%, 100%, 0.75); --prim-gray-0-alpha-025: hsla(var(--prim-gray-h), 50%, 100%, 0.25); --prim-gray-0: hsl(var(--prim-gray-h), 50%, 100%); diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss index 0c9b00b8d3e1f..3380015000585 100644 --- a/packages/design-system/src/css/_tokens.dark.scss +++ b/packages/design-system/src/css/_tokens.dark.scss @@ -72,7 +72,7 @@ --color-sticky-background-7: var(--prim-gray-740); --color-sticky-border-7: var(--prim-gray-670); - // Expressions and autocomplete + // Expressions, autocomplete, infobox --color-valid-resolvable-foreground: var(--prim-color-alt-a-tint-300); --color-valid-resolvable-background: var(--prim-color-alt-a-alpha-025); --color-invalid-resolvable-foreground: var(--prim-color-alt-c-tint-250); @@ -83,6 +83,8 @@ --color-expression-syntax-example: var(--prim-gray-670); --color-autocomplete-item-selected: var(--prim-color-secondary-tint-200); --color-autocomplete-section-header-border: var(--prim-gray-540); + --color-infobox-background: var(--prim-gray-780); + --color-infobox-examples-border-color: var(--prim-gray-670); // Code --color-code-tags-string: var(--prim-color-alt-f-tint-150); diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss index b6998894408b8..ab3797781d3c7 100644 --- a/packages/design-system/src/css/_tokens.scss +++ b/packages/design-system/src/css/_tokens.scss @@ -59,6 +59,7 @@ --color-background-dark: var(--prim-gray-820); --color-background-medium: var(--prim-gray-120); --color-background-base: var(--prim-gray-40); + --color-background-light-base: var(--prim-gray-25); --color-background-light: var(--prim-gray-10); --color-background-xlight: var(--prim-gray-0); @@ -105,7 +106,7 @@ --color-sticky-background-7: var(--prim-gray-10); --color-sticky-border-7: var(--prim-gray-120); - // Expressions and autocomplete + // Expressions, autocomplete, infobox --color-valid-resolvable-foreground: var(--prim-color-alt-a); --color-valid-resolvable-background: var(--prim-color-alt-a-tint-500); --color-invalid-resolvable-foreground: var(--prim-color-alt-c); @@ -116,6 +117,8 @@ --color-expression-syntax-example: var(--prim-gray-40); --color-autocomplete-item-selected: var(--color-secondary); --color-autocomplete-section-header-border: var(--color-foreground-light); + --color-infobox-background: var(--color-background-light-base); + --color-infobox-examples-border-color: var(--color-foreground-light); // Code --color-code-tags-string: var(--prim-color-alt-f); diff --git a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts index a495800f3d341..bb88695526ed4 100644 --- a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts +++ b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts @@ -15,7 +15,7 @@ const BASE_STYLING = { fontFamily: "Menlo, Consolas, 'DejaVu Sans Mono', monospace !important", maxHeight: '400px', tooltip: { - maxWidth: '300px', + maxWidth: '250px', lineHeight: '1.3em', }, diagnosticButton: { diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue index a8cbfb18f3f8d..9e0744025c26b 100644 --- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue +++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue @@ -131,7 +131,7 @@ watchDebounced(