Skip to content

Commit ffb26b1

Browse files
committed
Merge branch 'main' into feat/migrate-helm-app-main
2 parents 128b7ff + efbd1c5 commit ffb26b1

File tree

13 files changed

+254
-250
lines changed

13 files changed

+254
-250
lines changed

package-lock.json

Lines changed: 4 additions & 77 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
"@codemirror/language": "6.10.8",
103103
"@codemirror/legacy-modes": "6.4.2",
104104
"@codemirror/lint": "6.8.4",
105+
"@codemirror/merge": "^6.10.0",
105106
"@codemirror/search": "6.5.8",
106107
"@lezer/highlight": "1.2.1",
107108
"@replit/codemirror-indentation-markers": "6.5.3",
@@ -119,7 +120,6 @@
119120
"marked": "^13.0.3",
120121
"nanoid": "^3.3.8",
121122
"react-canvas-confetti": "^2.0.7",
122-
"react-codemirror-merge": "4.23.6",
123123
"react-dates": "^21.8.0",
124124
"react-diff-viewer-continued": "^3.4.0",
125125
"react-draggable": "^4.4.5",

src/Common/CodeMirror/CodeEditor.constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const CLOSE_SEARCH_SHORTCUT_KEYS: SupportedKeyboardKeysType[] = ['Escape'
2929

3030
export const READ_ONLY_TOOLTIP_TIMEOUT = 2000
3131

32-
export const CODE_EDITOR_FONT_SIZE = 15
32+
export const CODE_EDITOR_FONT_SIZE = 14
3333

3434
export const CODE_EDITOR_LINE_HEIGHT = 1.4
3535

src/Common/CodeMirror/CodeEditor.tsx

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import {
2222
BasicSetupOptions,
2323
Compartment,
2424
keymap,
25+
EditorView,
26+
EditorState,
2527
} from '@uiw/react-codemirror'
2628
import { foldGutter } from '@codemirror/language'
2729
import { search } from '@codemirror/search'
@@ -159,7 +161,7 @@ const CodeEditor = <DiffView extends boolean = false>({
159161
setCodemirrorMergeKey(getUniqueId())
160162
},
161163
// Include any props that modify codemirror-merge extensions directly, as a workaround for the unresolved bug.
162-
[readOnly, tabSize, disableSearch, appTheme, mode],
164+
[readOnly, tabSize, disableSearch, appTheme, mode, isOriginalModifiable],
163165
)
164166

165167
// METHODS
@@ -224,11 +226,22 @@ const CodeEditor = <DiffView extends boolean = false>({
224226
readOnlyTooltip,
225227
]
226228

227-
const originalViewExtensions: Extension[] = [...getBaseExtensions(), readOnlyTooltip]
229+
const originalViewExtensions: Extension[] = [
230+
codeEditorTheme,
231+
...getBaseExtensions(),
232+
readOnlyTooltip,
233+
EditorState.readOnly.of(readOnly || !isOriginalModifiable),
234+
]
228235

229-
const modifiedViewExtensions: Extension[] = [...getBaseExtensions(), readOnlyTooltip]
236+
const modifiedViewExtensions: Extension[] = [
237+
codeEditorTheme,
238+
...getBaseExtensions(),
239+
readOnlyTooltip,
240+
EditorState.readOnly.of(readOnly),
241+
]
230242

231243
const diffMinimapExtensions: Extension[] = [
244+
codeEditorTheme,
232245
basicSetup({
233246
...basicSetupOptions,
234247
lineNumbers: false,
@@ -237,6 +250,8 @@ const CodeEditor = <DiffView extends boolean = false>({
237250
syntaxHighlighting: false,
238251
}),
239252
getLanguageExtension(mode, true),
253+
EditorView.editable.of(false),
254+
EditorState.readOnly.of(true),
240255
]
241256

242257
return (
@@ -255,7 +270,6 @@ const CodeEditor = <DiffView extends boolean = false>({
255270
placeholder={placeholder}
256271
handleOnChange={handleOnChange}
257272
handleLhsOnChange={handleLhsOnChange}
258-
isOriginalModifiable={isOriginalModifiable}
259273
onBlur={onBlur}
260274
onFocus={onFocus}
261275
autoFocus={autoFocus}

0 commit comments

Comments
 (0)