From 62c96c7463ed7ac845b98cd397d4ac3f0f5dc007 Mon Sep 17 00:00:00 2001
From: Kenji Garland <kenjigarland@gmail.com>
Date: Wed, 18 Sep 2019 16:49:59 -0400
Subject: [PATCH 1/3] Populate file rename field with current name by default
 (fixes #113)

---
 web/src/modal-get-name.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/web/src/modal-get-name.js b/web/src/modal-get-name.js
index 46e6885..a9e5ed6 100644
--- a/web/src/modal-get-name.js
+++ b/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,17 +57,21 @@ class ModalGetName extends Component {
   };
 
   handleOnChange = () => {
+    const newName = this.textArea.value;
     if (this.siblingNames.has(this.textArea.value)) {
       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,
       });
     }
   };
@@ -74,14 +79,18 @@ class ModalGetName extends Component {
   isValidName = name => !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"

From 035e4e3acebaa76b1ea5592f05e3ac0c6a9e684d Mon Sep 17 00:00:00 2001
From: Kenji Garland <kenjigarland@gmail.com>
Date: Wed, 18 Sep 2019 18:32:05 -0400
Subject: [PATCH 2/3] Let users 'rename' a file to its current name

Obviously doing this achieves nothing, but allowing it seems less
confusing than not allowing it.
---
 web/src/modal-get-name.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/modal-get-name.js b/web/src/modal-get-name.js
index a9e5ed6..924a729 100644
--- a/web/src/modal-get-name.js
+++ b/web/src/modal-get-name.js
@@ -58,7 +58,7 @@ class ModalGetName extends Component {
 
   handleOnChange = () => {
     const newName = this.textArea.value;
-    if (this.siblingNames.has(this.textArea.value)) {
+    if (newName !== this.props.initialName && this.siblingNames.has(newName)) {
       this.setState({
         errorMessage: 'name already in use',
         newName,
@@ -76,7 +76,7 @@ class ModalGetName extends Component {
     }
   };
 
-  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.state.newName;

From 39c2940f2fe1d91792a0e210909803a06ba42134 Mon Sep 17 00:00:00 2001
From: Kenji Garland <kenjigarland@gmail.com>
Date: Wed, 18 Sep 2019 19:27:22 -0400
Subject: [PATCH 3/3] After a file is renamed, keep it 'active' in the explorer

This way the user can rename it again immediately if they made a mistake
(previously they would need to select a different file, then re-select
the renamed file)
---
 web/src/model/edit-reducers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/model/edit-reducers.js b/web/src/model/edit-reducers.js
index 779738d..87872d4 100644
--- a/web/src/model/edit-reducers.js
+++ b/web/src/model/edit-reducers.js
@@ -248,6 +248,7 @@ const handleResourceRenameSuccess = (action, state) => {
     activeBuffer,
     rootNodes,
     buffers,
+    activeNode: newResource,
   };
 };