-
Notifications
You must be signed in to change notification settings - Fork 247
feat: Implement dark mode for create index modal in early journey variant CLOUDP-313986 #6972
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6bdb5bc
Add dark mode styles for covered queries
waltertan12 28fbde8
Add light mode style to code editor
waltertan12 dcbf132
Add light mode styles for skeleton loader
waltertan12 b5b278c
Fix subtitle color
waltertan12 f0c1b87
Fix border styling
waltertan12 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ import { | |
| cx, | ||
| useFocusRing, | ||
| ParagraphSkeleton, | ||
| useDarkMode, | ||
| } from '@mongodb-js/compass-components'; | ||
| import type { Document } from 'mongodb'; | ||
| import React, { useMemo, useCallback } from 'react'; | ||
|
|
@@ -62,7 +63,6 @@ const codeEditorContainerStyles = css({ | |
| const codeEditorStyles = css({ | ||
| borderRadius: editorContainerRadius, | ||
| '& .cm-editor': { | ||
| background: `${palette.white} !important`, | ||
| borderRadius: editorContainerRadius, | ||
| }, | ||
| '& .cm-content': { | ||
|
|
@@ -71,12 +71,21 @@ const codeEditorStyles = css({ | |
| }, | ||
| }); | ||
|
|
||
| const lightModeCodeEditorStyles = css({ | ||
| '& .cm-editor': { | ||
| background: `${palette.white} !important`, | ||
| }, | ||
| }); | ||
|
|
||
| const indexSuggestionsLoaderStyles = css({ | ||
| marginBottom: spacing[600], | ||
| padding: spacing[600], | ||
| borderRadius: editorContainerRadius, | ||
| }); | ||
|
|
||
| const indexSuggestionsLoaderLightStyles = css({ | ||
| background: palette.gray.light3, | ||
| border: `1px solid ${palette.gray.light2}`, | ||
| borderRadius: editorContainerRadius, | ||
| }); | ||
|
|
||
| const insightStyles = css({ | ||
|
|
@@ -111,6 +120,7 @@ const QueryFlowSection = ({ | |
| initialQuery: Document | null; | ||
| }) => { | ||
| const track = useTelemetry(); | ||
| const darkMode = useDarkMode(); | ||
| const [inputQuery, setInputQuery] = React.useState( | ||
| initialQuery ? JSON.stringify(initialQuery, null, 2) : '' | ||
| ); | ||
|
|
@@ -205,7 +215,10 @@ const QueryFlowSection = ({ | |
| onChangeText={(text) => handleQueryInputChange(text)} | ||
| placeholder="Type a query: { field: 'value' }" | ||
| completer={completer} | ||
| className={codeEditorStyles} | ||
| className={cx( | ||
| codeEditorStyles, | ||
| !darkMode && lightModeCodeEditorStyles | ||
| )} | ||
| /> | ||
| </div> | ||
|
|
||
|
|
@@ -230,7 +243,10 @@ const QueryFlowSection = ({ | |
| {isFetchingIndexSuggestions ? ( | ||
| <ParagraphSkeleton | ||
| data-testid="query-flow-section-code-loader" | ||
| className={indexSuggestionsLoaderStyles} | ||
| className={cx( | ||
| indexSuggestionsLoaderStyles, | ||
| !darkMode && indexSuggestionsLoaderLightStyles | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same here |
||
| )} | ||
| /> | ||
| ) : ( | ||
| indexSuggestions && ( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in this case, i found it easier to default to the component's existing dark mode styles rather than apply new dark mode styling