From f6fe827326ec24359062e4f67f66473b82074048 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 17 Jan 2023 13:40:30 +0100
Subject: [PATCH] Improve microinteractions in experiment table [SCI-7540]

---
 app/assets/javascripts/shared/inline_editing.js | 5 ++++-
 app/views/shared/_inline_editing.html.erb       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/shared/inline_editing.js b/app/assets/javascripts/shared/inline_editing.js
index 4c4a71f84..1ad371d8b 100644
--- a/app/assets/javascripts/shared/inline_editing.js
+++ b/app/assets/javascripts/shared/inline_editing.js
@@ -138,10 +138,13 @@ var inlineEditing = (function() {
     .off('click', `${editBlocks} .cancel-button`)
     .off('blur', `${editBlocks} textarea, ${editBlocks} input`)
     .on('keyup', `${editBlocks}`, function(e) {
+      var container = $(this);
       if (e.keyCode === 27) {
         $(`${editBlocks} .cancel-button`).click();
       } // Esc
-
+      if (e.keyCode === 13 && !container.find('.view-mode').hasClass('hidden')) {
+        $(editBlocks).click();
+      }
     })
     .on('click', editBlocks, function(e) {
     // 'A' mean that, if we click on <a></a> element we will not go in edit mode
diff --git a/app/views/shared/_inline_editing.html.erb b/app/views/shared/_inline_editing.html.erb
index dcb0b2098..fe0257f33 100644
--- a/app/views/shared/_inline_editing.html.erb
+++ b/app/views/shared/_inline_editing.html.erb
@@ -8,7 +8,7 @@
   data-label-after='<%= config[:label_after]&.html_safe %>'
   data-placeholder='<%= config[:placeholder] %>'
 >
-  <div class="view-mode" data-placeholder="<%= config[:placeholder] %>"><%= initial_value %></div>
+  <div class="view-mode" data-placeholder="<%= config[:placeholder] %>" tabindex=0><%= initial_value %></div>
   <input placeholder="<%= config[:placeholder] %>" class="hidden input-field" type="text" value="<%= initial_value %>" disabled/>
   <div class="button-container">
     <span class="save-button"><i class="fas fa-check"></i></span>