Rename project to sim and enable sim-adding

2 files changed, 15 insertions, 4 deletions

diff --git a/src/components/modals/Modal.js b/src/components/modals/Modal.js
index c4f10b29..0b3301af 100644
--- a/src/components/modals/Modal.js
+++ b/src/components/modals/Modal.js
@@ -10,8 +10,10 @@ class Modal extends React.Component {
     };
     static idCounter = 0;
 
-    // Local, up-to-date copy of modal visibility for time between close and props update (to prevent duplicate close
-    // triggers)
+    /**
+     * Local, up-to-date copy of modal visibility for time between close event and a props update (to prevent duplicate
+     * close triggers).
+     */
     visible = false;
 
     constructor() {
@@ -23,6 +25,11 @@ class Modal extends React.Component {
         this.visible = this.props.show;
         this.openOrCloseModal();
 
+        // Trigger auto-focus
+        window["$"]("#" + this.id).on("shown.bs.modal", function () {
+            window["$"](this).find("input").first().focus();
+        });
+
         window["$"]("#" + this.id).on("hide.bs.modal", () => {
             if (this.visible) {
                 this.props.onCancel();
diff --git a/src/components/modals/TextInputModal.js b/src/components/modals/TextInputModal.js
index 4acf25b3..90a5db12 100644
--- a/src/components/modals/TextInputModal.js
+++ b/src/components/modals/TextInputModal.js
@@ -27,10 +27,14 @@ class TextInputModal extends React.Component {
                    show={this.props.show}
                    onSubmit={this.onSubmit.bind(this)}
                    onCancel={this.onCancel.bind(this)}>
-                <form>
+                <form onSubmit={e => {
+                    e.preventDefault();
+                    this.onSubmit();
+                }}>
                     <div className="form-group">
                         <label className="form-control-label">{this.props.label}:</label>
-                        <input type="text" className="form-control" ref="textInput" value={this.props.initialValue}/>
+                        <input type="text" className="form-control" ref="textInput" value={this.props.initialValue}
+                               autoFocus/>
                     </div>
                 </form>
             </Modal>