Skip to content

Commit a089b9c

Browse files
authored
Merge pull request #39042 from appsmithorg/hotfix/focus-ring
fix: [cherry pick] Release blocker: focus ring issue in code mirror
2 parents b2c44ee + 92d1b0a commit a089b9c

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed
-76 Bytes
Loading

app/client/src/components/editorComponents/CodeEditor/styledComponents.ts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export const EditorWrapper = styled.div<{
9090
.CodeMirror-focused {
9191
outline: var(--ads-v2-border-width-outline) solid
9292
var(--ads-v2-color-outline) !important;
93-
outline-offset: var(--ads-v2-offset-outline) !important;
93+
outline-offset: -1px !important;
9494
z-index: 1 !important;
9595
}
9696
`}
@@ -106,13 +106,14 @@ export const EditorWrapper = styled.div<{
106106
.cm-s-duotone-light.CodeMirror {
107107
border-radius: var(--ads-v2-border-radius);
108108
/* ${(props) =>
109+
props.showFocusVisible &&
109110
props.isFocused &&
110111
`outline: ${
111112
props?.removeHoverAndFocusStyle
112113
? "none"
113114
: "var(--ads-v2-border-width-outline) solid var(--ads-v2-color-outline)"
114115
};
115-
outline-offset: var(--ads-v2-offset-outline);
116+
outline-offset: -1px;
116117
clip-path: unset !important;
117118
`} */
118119
${(props) => props.isFocused && `clip-path: unset !important;`}
@@ -402,13 +403,17 @@ export const EditorWrapper = styled.div<{
402403
}
403404
}
404405
405-
&:focus-visible {
406-
.CodeMirror.cm-s-duotone-light {
407-
outline: var(--ads-v2-border-width-outline) solid
408-
var(--ads-v2-color-outline);
409-
outline-offset: var(--ads-v2-offset-outline);
406+
${(props) =>
407+
props.showFocusVisible &&
408+
`
409+
&:focus-visible {
410+
.CodeMirror.cm-s-duotone-light {
411+
outline: var(--ads-v2-border-width-outline) solid
412+
var(--ads-v2-color-outline);
413+
outline-offset: -1px;
414+
}
410415
}
411-
}
416+
`}
412417
413418
${(props) =>
414419
props.size === EditorSize.COMPACT ||

0 commit comments

Comments
 (0)