Merge pull request monome#164 from synthetiv/feature/file-rename-modal

File rename modal polish

web/src/modal-get-name.js

@@ -26,6 +26,7 @@ class ModalGetName extends Component {
     this.state = {
       showError: false,
       errorMessage: '',
+      newName: this.props.initialName,
     };
 
     this.siblingNames = props.getSiblingNames(this.props.selectedResource);
@@ -56,32 +57,40 @@ class ModalGetName extends Component {
   };
 
   handleOnChange = () => {
-    if (this.siblingNames.has(this.textArea.value)) {
+    const newName = this.textArea.value;
+    if (newName !== this.props.initialName && this.siblingNames.has(newName)) {
       this.setState({
         errorMessage: 'name already in use',
+        newName,
       });
     } else if (this.textArea.value.startsWith(".")) {
       this.setState({
-        errorMessage: 'name cannot start with "."'
+        errorMessage: 'name cannot start with "."',
+        newName,
       });
     } else {
       this.setState({
         errorMessage: '',
+        newName,
       });
     }
   };
 
-  isValidName = name => !this.siblingNames.has(name) && !name.startsWith(".");
+  isValidName = name => (name === this.props.initialName || !this.siblingNames.has(name)) && !name.startsWith(".");
 
   complete = choice => {
-    const name = this.textArea.value;
+    const name = this.state.newName;
     if (choice === 'ok' && !this.isValidName(name)) {
       // prevent completion if name is bad
       return;
     }
-    this.props.buttonAction(choice, this.textArea.value);
+    this.props.buttonAction(choice, this.state.newName);
   };
 
+  componentDidMount() {
+    this.textArea.select();
+  }
+
   render() {
     return (
       <div className="modal-content">
@@ -92,7 +101,7 @@ class ModalGetName extends Component {
         <textarea
           className="get-name-modal-text-area"
           ref={e => (this.textArea = e)}
-          placeholder={this.props.initialName || ''}
+          value={this.state.newName || ''}
           rows="1"
           maxLength="128"
           wrap="false"

web/src/model/edit-reducers.js

@@ -248,6 +248,7 @@ const handleResourceRenameSuccess = (action, state) => {
     activeBuffer,
     rootNodes,
     buffers,
+    activeNode: newResource,
   };
 };