Skip to content

Commit

Permalink
fix: limit all codemirror css rules to .graphiql-container (#3147)
Browse files Browse the repository at this point in the history
Co-authored-by: Dimitri POSTOLOV <dmytropostolov@gmail.com>
  • Loading branch information
Yahkob and dimaMachina authored May 23, 2023
1 parent 9b333a0 commit 2b21294
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 18 deletions.
5 changes: 5 additions & 0 deletions .changeset/fifty-roses-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphiql/react': patch
---

limit code-mirror css scope to .graphiql-container
36 changes: 18 additions & 18 deletions packages/graphiql-react/src/editor/style/codemirror.css
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
@import url('codemirror/lib/codemirror.css');

/* Make the editors fill up their container and make them scrollable */
.CodeMirror {
.graphiql-container .CodeMirror {
height: 100%;
position: absolute;
width: 100%;
}

/* Override font settings */
.CodeMirror {
.graphiql-container .CodeMirror {
font-family: var(--font-family-mono);
}

/* Set default background color */
.CodeMirror,
.CodeMirror-gutters {
.graphiql-container .CodeMirror,
.graphiql-container .CodeMirror-gutters {
background: none;
background-color: var(--editor-background, hsl(var(--color-base)));
}

/* No padding around line number */
.CodeMirror-linenumber {
/* No padding around line numbers */
.graphiql-container .CodeMirror-linenumber {
padding: 0;
}

/* No border between gutter and editor */
.CodeMirror-gutters {
.graphiql-container .CodeMirror-gutters {
border: none;
}

Expand Down Expand Up @@ -114,19 +114,19 @@
}

/* Matching bracket colors */
div.CodeMirror span.CodeMirror-matchingbracket,
div.CodeMirror span.CodeMirror-nonmatchingbracket {
.graphiql-container div.CodeMirror span.CodeMirror-matchingbracket,
.graphiql-container div.CodeMirror span.CodeMirror-nonmatchingbracket {
color: hsl(var(--color-warning));
}

/* Selected text blocks */
.CodeMirror-selected,
.CodeMirror-focused .CodeMirror-selected {
.graphiql-container .CodeMirror-selected,
.graphiql-container .CodeMirror-focused .CodeMirror-selected {
background: hsla(var(--color-neutral), var(--alpha-background-heavy));
}

/* Position the search dialog */
.CodeMirror-dialog {
.graphiql-container .CodeMirror-dialog {
background: inherit;
color: inherit;
left: 0;
Expand All @@ -136,36 +136,36 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
position: absolute;
z-index: 6;
}
.CodeMirror-dialog-top {
.graphiql-container .CodeMirror-dialog-top {
border-bottom: 1px solid
hsla(var(--color-neutral), var(--alpha-background-heavy));
padding-bottom: var(--px-12);
top: 0;
}
.CodeMirror-dialog-bottom {
.graphiql-container .CodeMirror-dialog-bottom {
border-top: 1px solid
hsla(var(--color-neutral), var(--alpha-background-heavy));
bottom: 0;
padding-top: var(--px-12);
}

/* Hide the search hint */
.CodeMirror-search-hint {
.graphiql-container .CodeMirror-search-hint {
display: none;
}

/* Style the input field for searching */
.CodeMirror-dialog input {
.graphiql-container .CodeMirror-dialog input {
border: 1px solid hsla(var(--color-neutral), var(--alpha-background-heavy));
border-radius: var(--border-radius-4);
padding: var(--px-4);
}
.CodeMirror-dialog input:focus {
.graphiql-container .CodeMirror-dialog input:focus {
outline: hsl(var(--color-primary)) solid 2px;
}

/* Set the highlight color for search results */
.cm-searching {
.graphiql-container .cm-searching {
background-color: hsla(var(--color-warning), var(--alpha-background-light));
/**
* When cycling through search results, CodeMirror overlays the current
Expand Down

0 comments on commit 2b21294

Please sign in to comment.