diff --git a/packages/codemirror-extension/schema/commands.json b/packages/codemirror-extension/schema/commands.json index 731b1f9306f6..bb20db156a8e 100644 --- a/packages/codemirror-extension/schema/commands.json +++ b/packages/codemirror-extension/schema/commands.json @@ -32,7 +32,7 @@ "type": "boolean", "title": "Style Selected Text", "description": "Value is boolean", - "default": false + "default": true }, "selectionPointer": { "type": ["boolean", "string"], diff --git a/packages/codemirror/src/editor.ts b/packages/codemirror/src/editor.ts index ed4944909224..b773d81a7d76 100644 --- a/packages/codemirror/src/editor.ts +++ b/packages/codemirror/src/editor.ts @@ -1244,7 +1244,7 @@ export namespace CodeMirrorEditor { lineWiseCopyCut: true, scrollPastEnd: false, styleActiveLine: false, - styleSelectedText: false, + styleSelectedText: true, selectionPointer: false, rulers: [], foldGutter: false diff --git a/packages/codemirror/style/index.css b/packages/codemirror/style/index.css index 89c4d235968f..deeaa0fad98b 100644 --- a/packages/codemirror/style/index.css +++ b/packages/codemirror/style/index.css @@ -107,6 +107,18 @@ pre.CodeMirror-line { margin-right: -5px; } +.CodeMirror-selectedtext.cm-searching { + background-color: var(--jp-search-selected-match-background-color) !important; + color: var(--jp-search-selected-match-color) !important; +} + +.cm-searching { + background-color: var( + --jp-search-unselected-match-background-color + ) !important; + color: var(--jp-search-unselected-match-color) !important; +} + .CodeMirror-focused .CodeMirror-selected { background-color: var(--jp-editor-selected-focused-background); } diff --git a/packages/theme-dark-extension/style/variables.css b/packages/theme-dark-extension/style/variables.css index 7185655e0a06..3c5d1a913f5d 100644 --- a/packages/theme-dark-extension/style/variables.css +++ b/packages/theme-dark-extension/style/variables.css @@ -375,6 +375,12 @@ all of MD as it is not optimized for dense, information rich UIs. --jp-search-toggle-off-opacity: 0.5; --jp-search-toggle-hover-opacity: 0.75; --jp-search-toggle-on-opacity: 1; + --jp-search-selected-match-background-color: rgb(255, 225, 0); + --jp-search-selected-match-color: black; + --jp-search-unselected-match-background-color: var( + --jp-inverse-layout-color0 + ); + --jp-search-unselected-match-color: var(--jp-ui-inverse-font-color0); /* scrollbar related styles. Supports every browser except Edge. */ diff --git a/packages/theme-light-extension/style/variables.css b/packages/theme-light-extension/style/variables.css index 43336c8657c4..f5ac130c4261 100644 --- a/packages/theme-light-extension/style/variables.css +++ b/packages/theme-light-extension/style/variables.css @@ -372,4 +372,10 @@ all of MD as it is not optimized for dense, information rich UIs. --jp-search-toggle-off-opacity: 0.4; --jp-search-toggle-hover-opacity: 0.65; --jp-search-toggle-on-opacity: 1; + --jp-search-selected-match-background-color: rgb(245, 200, 0); + --jp-search-selected-match-color: black; + --jp-search-unselected-match-background-color: var( + --jp-inverse-layout-color0 + ); + --jp-search-unselected-match-color: var(--jp-ui-inverse-font-color0); }