#1361

Committed 05 Feb 2021 11:19PM CUT coverage: 83.28% (+0.07%) from 83.209%

Build # #1361

Build Type

push

Committed by

Commit Message

Merge pull request #328 from mac-s-g/bump-minor

quotesOnKeys bugfix

Run Details

283 of 348 branches covered (81.32%)

Branch coverage included in aggregate %.

504 of 597 relevant lines covered (84.42%)

45.44 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

69.41

/src/js/components/VariableEditor.js

import React from 'react';
import AutosizeTextarea from 'react-textarea-autosize';

import { toType } from './../helpers/util';
import dispatcher from './../helpers/dispatcher';
import parseInput from './../helpers/parseInput';
import stringifyVariable from './../helpers/stringifyVariable';
import CopyToClipboard from './CopyToClipboard';

//data type components
import {
    JsonBoolean,
    JsonDate,
    JsonFloat,
    JsonFunction,
    JsonInteger,
    JsonNan,
    JsonNull,
    JsonRegexp,
    JsonString,
    JsonUndefined
} from './DataTypes/DataTypes';

//clibboard icon
import { Edit, CheckCircle, RemoveCircle as Remove } from './icons';

//theme
import Theme from './../themes/getStyle';

class VariableEditor extends React.PureComponent {
    constructor(props) {
        super(props);
        this.state = {
            editMode: false,
            editValue: '',
            hovered: false,
            renameKey: false,
            parsedInput: {
                type: false,
                value: null
            }
        };
    }

    render() {
        const {
            variable,
            singleIndent,
            type,
            theme,
            namespace,
            indentWidth,
            enableClipboard,
            onEdit,
            onDelete,
            onSelect,
            displayArrayKey,
            quotesOnKeys
        } = this.props;
        const { editMode } = this.state;
        return (
            <div
                {...Theme(theme, 'objectKeyVal', {
                    paddingLeft: indentWidth * singleIndent
                })}
                onMouseEnter={() =>
                    this.setState({ ...this.state, hovered: true })
                }
                onMouseLeave={() =>
                    this.setState({ ...this.state, hovered: false })
                }
                class="variable-row"
                key={variable.name}
            >
                {type == 'array' ? (
                    displayArrayKey ? (
                        <span
                            {...Theme(theme, 'array-key')}
                            key={variable.name + '_' + namespace}
                        >
                            {variable.name}
                            <div {...Theme(theme, 'colon')}>:</div>
                        </span>
                    ) : null
                ) : (
                    <span>
                        <span
                            {...Theme(theme, 'object-name')}
                            class="object-key"
                            key={variable.name + '_' + namespace}
                        >
                            {!!quotesOnKeys && (
                                <span style={{ verticalAlign: 'top' }}>"</span>
                            )}
                            <span style={{ display: 'inline-block' }}>
                                {variable.name}
                            </span>
                            {!!quotesOnKeys && (
                                <span style={{ verticalAlign: 'top' }}>"</span>
                            )}
                        </span>
                        <span {...Theme(theme, 'colon')}>:</span>
                    </span>
                )}
                <div
                    class="variable-value"
                    onClick={
                        onSelect === false && onEdit === false
                            ? null
                            : e => {
                                  let location = [...namespace];
                                  if (
                                      (e.ctrlKey || e.metaKey) &&
                                      onEdit !== false
                                  ) {
                                      this.prepopInput(variable);
                                  } else if (onSelect !== false) {
                                      location.shift();
                                      onSelect({
                                          ...variable,
                                          namespace: location
                                      });
                                  }
                              }
                    }
                    {...Theme(theme, 'variableValue', {
                        cursor: onSelect === false ? 'default' : 'pointer'
                    })}
                >
                    {this.getValue(variable, editMode)}
                </div>
                {enableClipboard ? (
                    <CopyToClipboard
                        rowHovered={this.state.hovered}
                        hidden={editMode}
                        src={variable.value}
                        clickCallback={enableClipboard}
                        {...{ theme, namespace: [...namespace, variable.name] }}
                    />
                ) : null}
                {onEdit !== false && editMode == false
                    ? this.getEditIcon()
                    : null}
                {onDelete !== false && editMode == false
                    ? this.getRemoveIcon()
                    : null}
            </div>
        );
    }

    getEditIcon = () => {
        const { variable, theme } = this.props;

        return (
            <div
                class="click-to-edit"
                style={{
                    verticalAlign: 'top',
                    display: this.state.hovered ? 'inline-block' : 'none'
                }}
            >
                <Edit
                    class="click-to-edit-icon"
                    {...Theme(theme, 'editVarIcon')}
                    onClick={() => {
                        this.prepopInput(variable);
                    }}
                />
            </div>
        );
    };

    prepopInput = variable => {
        if (this.props.onEdit !== false) {
            const stringifiedValue = stringifyVariable(variable.value);
            const detected = parseInput(stringifiedValue);
            this.setState({
                editMode: true,
                editValue: stringifiedValue,
                parsedInput: {
                    type: detected.type,
                    value: detected.value
                }
            });
        }
    };

    getRemoveIcon = () => {
        const { variable, namespace, theme, rjvId } = this.props;

        return (
            <div
                class="click-to-remove"
                style={{
                    verticalAlign: 'top',
                    display: this.state.hovered ? 'inline-block' : 'none'
                }}
            >
                <Remove
                    class="click-to-remove-icon"
                    {...Theme(theme, 'removeVarIcon')}
                    onClick={() => {
                        dispatcher.dispatch({
                            name: 'VARIABLE_REMOVED',
                            rjvId: rjvId,
                            data: {
                                name: variable.name,
                                namespace: namespace,
                                existing_value: variable.value,
                                variable_removed: true
                            }
                        });
                    }}
                />
            </div>
        );
    };

    getValue = (variable, editMode) => {
        const type = editMode ? false : variable.type;
        const { props } = this;
        switch (type) {
            case false:
                return this.getEditInput();
            case 'string':
                return <JsonString value={variable.value} {...props} />;
            case 'integer':
                return <JsonInteger value={variable.value} {...props} />;
            case 'float':
                return <JsonFloat value={variable.value} {...props} />;
            case 'boolean':
                return <JsonBoolean value={variable.value} {...props} />;
            case 'function':
                return <JsonFunction value={variable.value} {...props} />;
            case 'null':
                return <JsonNull {...props} />;
            case 'nan':
                return <JsonNan {...props} />;
            case 'undefined':
                return <JsonUndefined {...props} />;
            case 'date':
                return <JsonDate value={variable.value} {...props} />;
            case 'regexp':
                return <JsonRegexp value={variable.value} {...props} />;
            default:
                // catch-all for types that weren't anticipated
                return (
                    <div class="object-value">
                        {JSON.stringify(variable.value)}
                    </div>
                );
        }
    };

    getEditInput = () => {
        const { theme } = this.props;
        const { editValue } = this.state;

        return (
            <div>
                <AutosizeTextarea
                    type="text"
                    inputRef={input => input && input.focus()}
                    value={editValue}
                    class="variable-editor"
                    onChange={event => {
                        const value = event.target.value;
                        const detected = parseInput(value);
                        this.setState({
                            editValue: value,
                            parsedInput: {
                                type: detected.type,
                                value: detected.value
                            }
                        });
                    }}
                    onKeyDown={e => {
                        switch (e.key) {
                            case 'Escape': {
                                this.setState({
                                    editMode: false,
                                    editValue: ''
                                });
                                break;
                            }
                            case 'Enter': {
                                if (e.ctrlKey || e.metaKey) {
                                    this.submitEdit(true);
                                }
                                break;
                            }
                        }
                        e.stopPropagation();
                    }}
                    placeholder="update this value"
                    {...Theme(theme, 'edit-input')}
                />
                <div {...Theme(theme, 'edit-icon-container')}>
                    <Remove
                        class="edit-cancel"
                        {...Theme(theme, 'cancel-icon')}
                        onClick={() => {
                            this.setState({ editMode: false, editValue: '' });
                        }}
                    />
                    <CheckCircle
                        class="edit-check string-value"
                        {...Theme(theme, 'check-icon')}
                        onClick={() => {
                            this.submitEdit();
                        }}
                    />
                    <div>{this.showDetected()}</div>
                </div>
            </div>
        );
    };

    submitEdit = submit_detected => {
        const { variable, namespace, rjvId } = this.props;
        const { editValue, parsedInput } = this.state;
        let new_value = editValue;
        if (submit_detected && parsedInput.type) {
            new_value = parsedInput.value;
        }
        this.setState({
            editMode: false
        });
        dispatcher.dispatch({
            name: 'VARIABLE_UPDATED',
            rjvId: rjvId,
            data: {
                name: variable.name,
                namespace: namespace,
                existing_value: variable.value,
                new_value: new_value,
                variable_removed: false
            }
        });
    };

    showDetected = () => {
        const { theme, variable, namespace, rjvId } = this.props;
        const { type, value } = this.state.parsedInput;
        const detected = this.getDetectedInput();
        if (detected) {
            return (
                <div>
                    <div {...Theme(theme, 'detected-row')}>
                        {detected}
                        <CheckCircle
                            class="edit-check detected"
                            style={{
                                verticalAlign: 'top',
                                paddingLeft: '3px',
                                ...Theme(theme, 'check-icon').style
                            }}
                            onClick={() => {
                                this.submitEdit(true);
                            }}
                        />
                    </div>
                </div>
            );
        }
    };

    getDetectedInput = () => {
        const { parsedInput } = this.state;
        const { type, value } = parsedInput;
        const { props } = this;
        const { theme } = props;

        if (type !== false) {
            switch (type.toLowerCase()) {
                case 'object':
                    return (
                        <span>
                            <span
                                style={{
                                    ...Theme(theme, 'brace').style,
                                    cursor: 'default'
                                }}
                            >
                                {'{'}
                            </span>
                            <span
                                style={{
                                    ...Theme(theme, 'ellipsis').style,
                                    cursor: 'default'
                                }}
                            >
                                ...
                            </span>
                            <span
                                style={{
                                    ...Theme(theme, 'brace').style,
                                    cursor: 'default'
                                }}
                            >
                                {'}'}
                            </span>
                        </span>
                    );
                case 'array':
                    return (
                        <span>
                            <span
                                style={{
                                    ...Theme(theme, 'brace').style,
                                    cursor: 'default'
                                }}
                            >
                                {'['}
                            </span>
                            <span
                                style={{
                                    ...Theme(theme, 'ellipsis').style,
                                    cursor: 'default'
                                }}
                            >
                                ...
                            </span>
                            <span
                                style={{
                                    ...Theme(theme, 'brace').style,
                                    cursor: 'default'
                                }}
                            >
                                {']'}
                            </span>
                        </span>
                    );
                case 'string':
                    return <JsonString value={value} {...props} />;
                case 'integer':
                    return <JsonInteger value={value} {...props} />;
                case 'float':
                    return <JsonFloat value={value} {...props} />;
                case 'boolean':
                    return <JsonBoolean value={value} {...props} />;
                case 'function':
                    return <JsonFunction value={value} {...props} />;
                case 'null':
                    return <JsonNull {...props} />;
                case 'nan':
                    return <JsonNan {...props} />;
                case 'undefined':
                    return <JsonUndefined {...props} />;
                case 'date':
                    return <JsonDate value={new Date(value)} {...props} />;
            }
        }
    };
}

//export component
export default VariableEditor;

1	import React from 'react';
2	import AutosizeTextarea from 'react-textarea-autosize';
3
4	import { toType } from './../helpers/util';
5	import dispatcher from './../helpers/dispatcher';
6	import parseInput from './../helpers/parseInput';
7	import stringifyVariable from './../helpers/stringifyVariable';
8	import CopyToClipboard from './CopyToClipboard';
9
10	//data type components
11	import {
12	JsonBoolean,
13	JsonDate,
14	JsonFloat,
15	JsonFunction,
16	JsonInteger,
17	JsonNan,
18	JsonNull,
19	JsonRegexp,
20	JsonString,
21	JsonUndefined
22	} from './DataTypes/DataTypes';
23
24	//clibboard icon
25	import { Edit, CheckCircle, RemoveCircle as Remove } from './icons';
26
27	//theme
28	import Theme from './../themes/getStyle';
29
30	class VariableEditor extends React.PureComponent {
31	constructor(props) {
32	super(props);	82✔
33	this.state = {	82✔
34	editMode: false,
35	editValue: '',
36	hovered: false,
37	renameKey: false,
38	parsedInput: {
39	type: false,
40	value: null
41	}
42	};
43	}
44
45	render() {
46	const {
47	variable,
48	singleIndent,
49	type,
50	theme,
51	namespace,
52	indentWidth,
53	enableClipboard,
54	onEdit,
55	onDelete,
56	onSelect,
57	displayArrayKey,
58	quotesOnKeys
59	} = this.props;	117✔
60	const { editMode } = this.state;	117✔
61	return (	117✔
62	<div
63	{...Theme(theme, 'objectKeyVal', {
64	paddingLeft: indentWidth * singleIndent
65	})}
66	onMouseEnter={() =>
67	this.setState({ ...this.state, hovered: true })	×
68	}
69	onMouseLeave={() =>
70	this.setState({ ...this.state, hovered: false })	×
71	}
72	class="variable-row"
73	key={variable.name}
74	>
75	{type == 'array' ? (	117✔
76	displayArrayKey ? (	26✔
77	<span
78	{...Theme(theme, 'array-key')}
79	key={variable.name + '_' + namespace}
80	>
81	{variable.name}
82	<div {...Theme(theme, 'colon')}>:</div>
83	</span>
84	) : null
85	) : (
86	<span>
87	<span
88	{...Theme(theme, 'object-name')}
89	class="object-key"
90	key={variable.name + '_' + namespace}
91	>
92	{!!quotesOnKeys && (	139✔
93	<span style={{ verticalAlign: 'top' }}>"</span>
94	)}
95	<span style={{ display: 'inline-block' }}>
96	{variable.name}
97	</span>
98	{!!quotesOnKeys && (	139✔
99	<span style={{ verticalAlign: 'top' }}>"</span>
100	)}
101	</span>
102	<span {...Theme(theme, 'colon')}>:</span>
103	</span>
104	)}
105	<div
106	class="variable-value"
107	onClick={
108	onSelect === false && onEdit === false	290✔
109	? null
110	: e => {
111	let location = [...namespace];	×
112	if (	×
113	(e.ctrlKey \|\| e.metaKey) &&	×
114	onEdit !== false
115	) {
116	this.prepopInput(variable);	×
117	} else if (onSelect !== false) {	×
118	location.shift();	×
119	onSelect({	×
120	...variable,
121	namespace: location
122	});
123	}
124	}
125	}
126	{...Theme(theme, 'variableValue', {
127	cursor: onSelect === false ? 'default' : 'pointer'	117✔
128	})}
129	>
130	{this.getValue(variable, editMode)}
131	</div>
132	{enableClipboard ? (	117✔
133	<CopyToClipboard
134	rowHovered={this.state.hovered}
135	hidden={editMode}
136	src={variable.value}
137	clickCallback={enableClipboard}
138	{...{ theme, namespace: [...namespace, variable.name] }}
139	/>
140	) : null}
141	{onEdit !== false && editMode == false	294✔
142	? this.getEditIcon()
143	: null}
144	{onDelete !== false && editMode == false	295✔
145	? this.getRemoveIcon()
146	: null}
147	</div>
148	);
149	}
150
151	getEditIcon = () => {	82✔
152	const { variable, theme } = this.props;	44✔
153
154	return (	44✔
155	<div
156	class="click-to-edit"
157	style={{
158	verticalAlign: 'top',
159	display: this.state.hovered ? 'inline-block' : 'none'	44!
160	}}
161	>
162	<Edit
163	class="click-to-edit-icon"
164	{...Theme(theme, 'editVarIcon')}
165	onClick={() => {
166	this.prepopInput(variable);	13✔
167	}}
168	/>
169	</div>
170	);
171	};
172
173	prepopInput = variable => {	82✔
174	if (this.props.onEdit !== false) {	13!
175	const stringifiedValue = stringifyVariable(variable.value);	13✔
176	const detected = parseInput(stringifiedValue);	13✔
177	this.setState({	13✔
178	editMode: true,
179	editValue: stringifiedValue,
180	parsedInput: {
181	type: detected.type,
182	value: detected.value
183	}
184	});
185	}
186	};
187
188	getRemoveIcon = () => {	82✔
189	const { variable, namespace, theme, rjvId } = this.props;	45✔
190
191	return (	45✔
192	<div
193	class="click-to-remove"
194	style={{
195	verticalAlign: 'top',
196	display: this.state.hovered ? 'inline-block' : 'none'	45!
197	}}
198	>
199	<Remove
200	class="click-to-remove-icon"
201	{...Theme(theme, 'removeVarIcon')}
202	onClick={() => {
203	dispatcher.dispatch({	×
204	name: 'VARIABLE_REMOVED',
205	rjvId: rjvId,
206	data: {
207	name: variable.name,
208	namespace: namespace,
209	existing_value: variable.value,
210	variable_removed: true
211	}
212	});
213	}}
214	/>
215	</div>
216	);
217	};
218
219	getValue = (variable, editMode) => {	82✔
220	const type = editMode ? false : variable.type;	117✔
221	const { props } = this;	117✔
222	switch (type) {	117!
223	case false:
224	return this.getEditInput();	16✔
225	case 'string':
226	return <JsonString value={variable.value} {...props} />;	39✔
227	case 'integer':
228	return <JsonInteger value={variable.value} {...props} />;	23✔
229	case 'float':
230	return <JsonFloat value={variable.value} {...props} />;	2✔
231	case 'boolean':
232	return <JsonBoolean value={variable.value} {...props} />;	9✔
233	case 'function':
234	return <JsonFunction value={variable.value} {...props} />;	5✔
235	case 'null':
236	return <JsonNull {...props} />;	5✔
237	case 'nan':
238	return <JsonNan {...props} />;	5✔
239	case 'undefined':
240	return <JsonUndefined {...props} />;	2✔
241	case 'date':
242	return <JsonDate value={variable.value} {...props} />;	×
243	case 'regexp':
244	return <JsonRegexp value={variable.value} {...props} />;	4✔
245	default:
246	// catch-all for types that weren't anticipated
247	return (	7✔
248	<div class="object-value">
249	{JSON.stringify(variable.value)}
250	</div>
251	);
252	}
253	};
254
255	getEditInput = () => {	82✔
256	const { theme } = this.props;	16✔
257	const { editValue } = this.state;	16✔
258
259	return (	16✔
260	<div>
261	<AutosizeTextarea
262	type="text"
263	inputRef={input => input && input.focus()}	×
264	value={editValue}
265	class="variable-editor"
266	onChange={event => {
267	const value = event.target.value;	×
268	const detected = parseInput(value);	×
269	this.setState({	×
270	editValue: value,
271	parsedInput: {
272	type: detected.type,
273	value: detected.value
274	}
275	});
276	}}
277	onKeyDown={e => {
278	switch (e.key) {	×
279	case 'Escape': {
280	this.setState({	×
281	editMode: false,
282	editValue: ''
283	});
284	break;	×
285	}
286	case 'Enter': {
287	if (e.ctrlKey \|\| e.metaKey) {	×
288	this.submitEdit(true);	×
289	}
290	break;	×
291	}
292	}
293	e.stopPropagation();	×
294	}}
295	placeholder="update this value"
296	{...Theme(theme, 'edit-input')}
297	/>
298	<div {...Theme(theme, 'edit-icon-container')}>
299	<Remove
300	class="edit-cancel"
301	{...Theme(theme, 'cancel-icon')}
302	onClick={() => {
303	this.setState({ editMode: false, editValue: '' });	2✔
304	}}
305	/>
306	<CheckCircle
307	class="edit-check string-value"
308	{...Theme(theme, 'check-icon')}
309	onClick={() => {
310	this.submitEdit();	1✔
311	}}
312	/>
313	<div>{this.showDetected()}</div>
314	</div>
315	</div>
316	);
317	};
318
319	submitEdit = submit_detected => {	82✔
320	const { variable, namespace, rjvId } = this.props;	1✔
321	const { editValue, parsedInput } = this.state;	1✔
322	let new_value = editValue;	1✔
323	if (submit_detected && parsedInput.type) {	1!
324	new_value = parsedInput.value;	×
325	}
326	this.setState({	1✔
327	editMode: false
328	});
329	dispatcher.dispatch({	1✔
330	name: 'VARIABLE_UPDATED',
331	rjvId: rjvId,
332	data: {
333	name: variable.name,
334	namespace: namespace,
335	existing_value: variable.value,
336	new_value: new_value,
337	variable_removed: false
338	}
339	});
340	};
341
342	showDetected = () => {	82✔
343	const { theme, variable, namespace, rjvId } = this.props;	16✔
344	const { type, value } = this.state.parsedInput;	16✔
345	const detected = this.getDetectedInput();	16✔
346	if (detected) {	16✔
347	return (	8✔
348	<div>
349	<div {...Theme(theme, 'detected-row')}>
350	{detected}
351	<CheckCircle
352	class="edit-check detected"
353	style={{
354	verticalAlign: 'top',
355	paddingLeft: '3px',
356	...Theme(theme, 'check-icon').style
357	}}
358	onClick={() => {
359	this.submitEdit(true);	×
360	}}
361	/>
362	</div>
363	</div>
364	);
365	}
366	};
367
368	getDetectedInput = () => {	82✔
369	const { parsedInput } = this.state;	16✔
370	const { type, value } = parsedInput;	16✔
371	const { props } = this;	16✔
372	const { theme } = props;	16✔
373
374	if (type !== false) {	16✔
375	switch (type.toLowerCase()) {	8!
376	case 'object':
377	return (	1✔
378	<span>
379	<span
380	style={{
381	...Theme(theme, 'brace').style,
382	cursor: 'default'
383	}}
384	>
385	{'{'}
386	</span>
387	<span
388	style={{
389	...Theme(theme, 'ellipsis').style,
390	cursor: 'default'
391	}}
392	>
393	...
394	</span>
395	<span
396	style={{
397	...Theme(theme, 'brace').style,
398	cursor: 'default'
399	}}
400	>
401	{'}'}
402	</span>
403	</span>
404	);
405	case 'array':
406	return (	1✔
407	<span>
408	<span
409	style={{
410	...Theme(theme, 'brace').style,
411	cursor: 'default'
412	}}
413	>
414	{'['}
415	</span>
416	<span
417	style={{
418	...Theme(theme, 'ellipsis').style,
419	cursor: 'default'
420	}}
421	>
422	...
423	</span>
424	<span
425	style={{
426	...Theme(theme, 'brace').style,
427	cursor: 'default'
428	}}
429	>
430	{']'}
431	</span>
432	</span>
433	);
434	case 'string':
435	return <JsonString value={value} {...props} />;	×
436	case 'integer':
437	return <JsonInteger value={value} {...props} />;	2✔
438	case 'float':
439	return <JsonFloat value={value} {...props} />;	1✔
440	case 'boolean':
441	return <JsonBoolean value={value} {...props} />;	×
442	case 'function':
443	return <JsonFunction value={value} {...props} />;	×
444	case 'null':
445	return <JsonNull {...props} />;	1✔
446	case 'nan':
447	return <JsonNan {...props} />;	1✔
448	case 'undefined':
449	return <JsonUndefined {...props} />;	1✔
450	case 'date':
451	return <JsonDate value={new Date(value)} {...props} />;	×
452	}
453	}
454	};
455	}
456
457	//export component
458	export default VariableEditor;

mac-s-g / react-json-view / #1361

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous