Skip to content

Commit b524086

Browse files
committed
not sure about ux for rename ke
1 parent 3588e3f commit b524086

File tree

4 files changed

+33
-6
lines changed

4 files changed

+33
-6
lines changed

src/js/components/DataTypes/Object.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from "react";
22

33
import {toType} from './../../helpers/util';
4+
import signalEditKey from './../../helpers/signalEditKey';
45

56
//data type components
67
import {JsonObject} from './DataTypes';
@@ -241,7 +242,10 @@ class rjvObject extends React.Component {
241242
} else {
242243
return (
243244
<span {...Theme(theme, 'object-name')} key={namespace}>
244-
<span class="object-key">
245+
<span class="object-key"
246+
onDoubleClick={() => {
247+
if (this.props.onEdit) {signalEditKey()}
248+
}}>
245249
<span style={{verticalAlign:'top'}}>"</span>
246250
<span>{display_name}</span>
247251
<span style={{verticalAlign:'top'}}>"</span>

src/js/components/VariableEditor.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import React from 'react';
22
import AutosizeTextarea from 'react-textarea-autosize';
33

4-
import EditKeyRequest from './ObjectKeyModal/EditKeyRequest';
54
import {toType} from './../helpers/util';
65
import dispatcher from './../helpers/dispatcher';
76
import parseInput from './../helpers/parseInput';
87
import stringifyVariable from './../helpers/stringifyVariable';
8+
import signalEditKey from './../helpers/signalEditKey';
99

1010
//data type components
1111
import {
@@ -38,18 +38,17 @@ class VariableEditor extends React.Component {
3838

3939
render() {
4040
const {
41-
variable, singleIndent, type, theme,
41+
variable, singleIndent, type, theme, rjvId,
4242
namespace, indentWidth, onEdit, onDelete
4343
} = this.props;
44-
const {editMode, renameKey} = this.state;
44+
const {editMode} = this.state;
4545

4646
return (
4747
<div {...Theme(
4848
theme, 'objectKeyVal', indentWidth * singleIndent
4949
)}
5050
class="variable-row"
5151
key={variable.name}>
52-
{renameKey ? <EditKeyRequest /> : null}
5352
{
5453
type == 'array'
5554
? (
@@ -64,7 +63,12 @@ class VariableEditor extends React.Component {
6463
<span {...Theme(theme, 'object-name')}
6564
class="object-key"
6665
onDoubleClick={()=>{
67-
this.setState({renameKey: true})
66+
if (onEdit) {
67+
signalEditKey(
68+
rjvId,
69+
70+
)
71+
}
6872
}}
6973
key={variable.name + '_' + namespace}>
7074
<span style={{verticalAlign:'top'}}>"</span>

src/js/helpers/signalEditKey.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import dispatcher from './dispatcher';
2+
3+
const signalEditKey = () => {
4+
// dispatcher.dispatch({
5+
// name: 'EDIT_VARIABLE_KEY_REQUEST',
6+
// rjvId: rjvId,
7+
// data: {
8+
// name: depth > 0 ? name : null,
9+
// namespace: namespace.splice(
10+
// 0, (namespace.length-1)
11+
// ),
12+
// existing_value: src,
13+
// variable_removed: false,
14+
// key_name: null
15+
// },
16+
// });
17+
}
18+
export default signalEditKey

src/js/stores/ObjectAttributes.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class ObjectAttributes extends EventEmitter {
7070
case 'EDIT_VARIABLE_KEY_REQUEST':
7171
this.set(rjvId, 'action', 'edit-key-request', data);
7272
this.emit('edit-key-request-' + rjvId);
73+
break;
7374
}
7475
}
7576

0 commit comments

Comments
 (0)