forked from extern/bruno
fix: fixed dark mode theme issue in single line editor
This commit is contained in:
parent
61caca59ee
commit
5a78dfa210
@ -3,6 +3,7 @@ import get from 'lodash/get';
|
|||||||
import cloneDeep from 'lodash/cloneDeep';
|
import cloneDeep from 'lodash/cloneDeep';
|
||||||
import { IconTrash } from '@tabler/icons';
|
import { IconTrash } from '@tabler/icons';
|
||||||
import { useDispatch } from 'react-redux';
|
import { useDispatch } from 'react-redux';
|
||||||
|
import { useTheme } from 'providers/Theme';
|
||||||
import { addFormUrlEncodedParam, updateFormUrlEncodedParam, deleteFormUrlEncodedParam } from 'providers/ReduxStore/slices/collections';
|
import { addFormUrlEncodedParam, updateFormUrlEncodedParam, deleteFormUrlEncodedParam } from 'providers/ReduxStore/slices/collections';
|
||||||
import SingleLineEditor from 'components/SingleLineEditor';
|
import SingleLineEditor from 'components/SingleLineEditor';
|
||||||
import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
|
import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
|
||||||
@ -10,6 +11,7 @@ import StyledWrapper from './StyledWrapper';
|
|||||||
|
|
||||||
const FormUrlEncodedParams = ({ item, collection }) => {
|
const FormUrlEncodedParams = ({ item, collection }) => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
const { storedTheme } = useTheme();
|
||||||
const params = item.draft ? get(item, 'draft.request.body.formUrlEncoded') : get(item, 'request.body.formUrlEncoded');
|
const params = item.draft ? get(item, 'draft.request.body.formUrlEncoded') : get(item, 'request.body.formUrlEncoded');
|
||||||
|
|
||||||
const addParam = () => {
|
const addParam = () => {
|
||||||
@ -88,6 +90,7 @@ const FormUrlEncodedParams = ({ item, collection }) => {
|
|||||||
<td>
|
<td>
|
||||||
<SingleLineEditor
|
<SingleLineEditor
|
||||||
value={param.value}
|
value={param.value}
|
||||||
|
theme={storedTheme}
|
||||||
onSave={onSave}
|
onSave={onSave}
|
||||||
onChange={(newValue) => handleParamChange({
|
onChange={(newValue) => handleParamChange({
|
||||||
target: {
|
target: {
|
||||||
|
@ -3,6 +3,7 @@ import get from 'lodash/get';
|
|||||||
import cloneDeep from 'lodash/cloneDeep';
|
import cloneDeep from 'lodash/cloneDeep';
|
||||||
import { IconTrash } from '@tabler/icons';
|
import { IconTrash } from '@tabler/icons';
|
||||||
import { useDispatch } from 'react-redux';
|
import { useDispatch } from 'react-redux';
|
||||||
|
import { useTheme } from 'providers/Theme';
|
||||||
import { addMultipartFormParam, updateMultipartFormParam, deleteMultipartFormParam } from 'providers/ReduxStore/slices/collections';
|
import { addMultipartFormParam, updateMultipartFormParam, deleteMultipartFormParam } from 'providers/ReduxStore/slices/collections';
|
||||||
import SingleLineEditor from 'components/SingleLineEditor';
|
import SingleLineEditor from 'components/SingleLineEditor';
|
||||||
import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
|
import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
|
||||||
@ -10,6 +11,7 @@ import StyledWrapper from './StyledWrapper';
|
|||||||
|
|
||||||
const MultipartFormParams = ({ item, collection }) => {
|
const MultipartFormParams = ({ item, collection }) => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
const { storedTheme } = useTheme();
|
||||||
const params = item.draft ? get(item, 'draft.request.body.multipartForm') : get(item, 'request.body.multipartForm');
|
const params = item.draft ? get(item, 'draft.request.body.multipartForm') : get(item, 'request.body.multipartForm');
|
||||||
|
|
||||||
const addParam = () => {
|
const addParam = () => {
|
||||||
@ -88,6 +90,7 @@ const MultipartFormParams = ({ item, collection }) => {
|
|||||||
<td>
|
<td>
|
||||||
<SingleLineEditor
|
<SingleLineEditor
|
||||||
onSave={onSave}
|
onSave={onSave}
|
||||||
|
theme={storedTheme}
|
||||||
value={param.value}
|
value={param.value}
|
||||||
onChange={(newValue) => handleParamChange({
|
onChange={(newValue) => handleParamChange({
|
||||||
target: {
|
target: {
|
||||||
|
@ -3,6 +3,7 @@ import get from 'lodash/get';
|
|||||||
import cloneDeep from 'lodash/cloneDeep';
|
import cloneDeep from 'lodash/cloneDeep';
|
||||||
import { IconTrash } from '@tabler/icons';
|
import { IconTrash } from '@tabler/icons';
|
||||||
import { useDispatch } from 'react-redux';
|
import { useDispatch } from 'react-redux';
|
||||||
|
import { useTheme } from 'providers/Theme';
|
||||||
import { addQueryParam, updateQueryParam, deleteQueryParam } from 'providers/ReduxStore/slices/collections';
|
import { addQueryParam, updateQueryParam, deleteQueryParam } from 'providers/ReduxStore/slices/collections';
|
||||||
import SingleLineEditor from 'components/SingleLineEditor';
|
import SingleLineEditor from 'components/SingleLineEditor';
|
||||||
import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
|
import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
|
||||||
@ -11,6 +12,7 @@ import StyledWrapper from './StyledWrapper';
|
|||||||
|
|
||||||
const QueryParams = ({ item, collection }) => {
|
const QueryParams = ({ item, collection }) => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
const { storedTheme } = useTheme();
|
||||||
const params = item.draft ? get(item, 'draft.request.params') : get(item, 'request.params');
|
const params = item.draft ? get(item, 'draft.request.params') : get(item, 'request.params');
|
||||||
|
|
||||||
const handleAddParam = () => {
|
const handleAddParam = () => {
|
||||||
@ -91,6 +93,7 @@ const QueryParams = ({ item, collection }) => {
|
|||||||
<td>
|
<td>
|
||||||
<SingleLineEditor
|
<SingleLineEditor
|
||||||
value={param.value}
|
value={param.value}
|
||||||
|
theme={storedTheme}
|
||||||
onSave={onSave}
|
onSave={onSave}
|
||||||
onChange={(newValue) => handleParamChange({
|
onChange={(newValue) => handleParamChange({
|
||||||
target: {
|
target: {
|
||||||
|
@ -10,7 +10,7 @@ import SingleLineEditor from 'components/SingleLineEditor';
|
|||||||
import StyledWrapper from './StyledWrapper';
|
import StyledWrapper from './StyledWrapper';
|
||||||
|
|
||||||
const QueryUrl = ({ item, collection, handleRun }) => {
|
const QueryUrl = ({ item, collection, handleRun }) => {
|
||||||
const { theme } = useTheme();
|
const { theme, storedTheme } = useTheme();
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const method = item.draft ? get(item, 'draft.request.method') : get(item, 'request.method');
|
const method = item.draft ? get(item, 'draft.request.method') : get(item, 'request.method');
|
||||||
const url = item.draft ? get(item, 'draft.request.url') : get(item, 'request.url');
|
const url = item.draft ? get(item, 'draft.request.url') : get(item, 'request.url');
|
||||||
@ -45,6 +45,7 @@ const QueryUrl = ({ item, collection, handleRun }) => {
|
|||||||
<SingleLineEditor
|
<SingleLineEditor
|
||||||
value={url}
|
value={url}
|
||||||
onSave={onSave}
|
onSave={onSave}
|
||||||
|
theme={storedTheme}
|
||||||
onChange={(newValue) => onUrlChange(newValue)}
|
onChange={(newValue) => onUrlChange(newValue)}
|
||||||
onRun={handleRun}
|
onRun={handleRun}
|
||||||
collection={collection}
|
collection={collection}
|
||||||
|
@ -3,6 +3,7 @@ import get from 'lodash/get';
|
|||||||
import cloneDeep from 'lodash/cloneDeep';
|
import cloneDeep from 'lodash/cloneDeep';
|
||||||
import { IconTrash } from '@tabler/icons';
|
import { IconTrash } from '@tabler/icons';
|
||||||
import { useDispatch } from 'react-redux';
|
import { useDispatch } from 'react-redux';
|
||||||
|
import { useTheme } from 'providers/Theme';
|
||||||
import { addRequestHeader, updateRequestHeader, deleteRequestHeader } from 'providers/ReduxStore/slices/collections';
|
import { addRequestHeader, updateRequestHeader, deleteRequestHeader } from 'providers/ReduxStore/slices/collections';
|
||||||
import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
|
import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
|
||||||
import SingleLineEditor from 'components/SingleLineEditor';
|
import SingleLineEditor from 'components/SingleLineEditor';
|
||||||
@ -10,6 +11,7 @@ import StyledWrapper from './StyledWrapper';
|
|||||||
|
|
||||||
const RequestHeaders = ({ item, collection }) => {
|
const RequestHeaders = ({ item, collection }) => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
const { storedTheme } = useTheme();
|
||||||
const headers = item.draft ? get(item, 'draft.request.headers') : get(item, 'request.headers');
|
const headers = item.draft ? get(item, 'draft.request.headers') : get(item, 'request.headers');
|
||||||
|
|
||||||
const addHeader = () => {
|
const addHeader = () => {
|
||||||
@ -88,6 +90,7 @@ const RequestHeaders = ({ item, collection }) => {
|
|||||||
<td>
|
<td>
|
||||||
<SingleLineEditor
|
<SingleLineEditor
|
||||||
value={header.value}
|
value={header.value}
|
||||||
|
theme={storedTheme}
|
||||||
onSave={onSave}
|
onSave={onSave}
|
||||||
onChange={(newValue) => handleHeaderValueChange({
|
onChange={(newValue) => handleHeaderValueChange({
|
||||||
target: {
|
target: {
|
||||||
|
@ -22,6 +22,7 @@ class SingleLineEditor extends Component {
|
|||||||
this.editor = CodeMirror(this.editorRef.current, {
|
this.editor = CodeMirror(this.editorRef.current, {
|
||||||
lineWrapping: false,
|
lineWrapping: false,
|
||||||
lineNumbers: false,
|
lineNumbers: false,
|
||||||
|
theme: this.props.theme === 'dark' ? 'monokai' : 'default',
|
||||||
mode: "brunovariables",
|
mode: "brunovariables",
|
||||||
brunoVarInfo: {
|
brunoVarInfo: {
|
||||||
variables: getEnvironmentVariables(this.props.collection),
|
variables: getEnvironmentVariables(this.props.collection),
|
||||||
@ -80,6 +81,9 @@ class SingleLineEditor extends Component {
|
|||||||
this.editor.options.brunoVarInfo.variables = variables;
|
this.editor.options.brunoVarInfo.variables = variables;
|
||||||
this.addOverlay();
|
this.addOverlay();
|
||||||
}
|
}
|
||||||
|
if (this.props.theme !== prevProps.theme && this.editor) {
|
||||||
|
this.editor.setOption('theme', this.props.theme === 'dark' ? 'monokai' : 'default');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
|
Loading…
Reference in New Issue
Block a user