Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Release blocker: focus ring issue in code mirror #39022

Merged
merged 4 commits into from
Feb 5, 2025
Merged

fix: Release blocker: focus ring issue in code mirror #39022

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff8329c
fix: Release blocker: focus ring issue in code mirror
albinAppsmith Feb 5, 2025
0cd9387
fix: focus ring for js editor
albinAppsmith Feb 5, 2025
ad1abb4
Merge branch 'release' of github.com:appsmithorg/appsmith into releas…
albinAppsmith Feb 5, 2025
f9140c9
fix: snapshot update
albinAppsmith Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions app/client/src/components/editorComponents/CodeEditor/styledComponents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export const EditorWrapper = styled.div<{
.CodeMirror-focused {
outline: var(--ads-v2-border-width-outline) solid
var(--ads-v2-color-outline) !important;
outline-offset: var(--ads-v2-offset-outline) !important;
outline-offset: -1px !important;
z-index: 1 !important;
}
`}
Expand All @@ -106,13 +106,14 @@ export const EditorWrapper = styled.div<{
.cm-s-duotone-light.CodeMirror {
border-radius: var(--ads-v2-border-radius);
/* ${(props) =>
props.showFocusVisible &&
props.isFocused &&
`outline: ${
props?.removeHoverAndFocusStyle
? "none"
: "var(--ads-v2-border-width-outline) solid var(--ads-v2-color-outline)"
};
outline-offset: var(--ads-v2-offset-outline);
outline-offset: -1px;
clip-path: unset !important;
`} */
${(props) => props.isFocused && `clip-path: unset !important;`}
Expand Down Expand Up @@ -402,13 +403,17 @@ export const EditorWrapper = styled.div<{
}
}

&:focus-visible {
.CodeMirror.cm-s-duotone-light {
outline: var(--ads-v2-border-width-outline) solid
var(--ads-v2-color-outline);
outline-offset: var(--ads-v2-offset-outline);
${(props) =>
props.showFocusVisible &&
`
&:focus-visible {
.CodeMirror.cm-s-duotone-light {
outline: var(--ads-v2-border-width-outline) solid
var(--ads-v2-color-outline);
outline-offset: -1px;
}
}
}
`}

${(props) =>
props.size === EditorSize.COMPACT ||
Expand Down
Loading