From 043ce88434f50a55e83144ae3857e451b979358b Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Tue, 23 May 2023 13:28:31 +0200
Subject: [PATCH] Fix tinyMCE layout in safari [SCI-8426]

---
 app/assets/stylesheets/my_modules/protocol.scss      | 4 ++++
 app/assets/stylesheets/my_modules/results/index.scss | 7 +++++++
 app/javascript/vue/shared/tinymce.vue                | 2 +-
 app/views/result_texts/_edit.html.erb                | 2 +-
 app/views/result_texts/_new.html.erb                 | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/my_modules/protocol.scss b/app/assets/stylesheets/my_modules/protocol.scss
index 51c015d76..f8fdb25a0 100644
--- a/app/assets/stylesheets/my_modules/protocol.scss
+++ b/app/assets/stylesheets/my_modules/protocol.scss
@@ -84,6 +84,10 @@
   }
   .tinymce-wrapper {
     width: 100%;
+
+    .tox-tinymce {
+      flex-grow: 1;
+    }
   }
   .tinymce-container {
     display: flex;
diff --git a/app/assets/stylesheets/my_modules/results/index.scss b/app/assets/stylesheets/my_modules/results/index.scss
index 89ceeaef6..aa604d6f2 100644
--- a/app/assets/stylesheets/my_modules/results/index.scss
+++ b/app/assets/stylesheets/my_modules/results/index.scss
@@ -73,3 +73,10 @@
     width: 3em;
   }
 }
+
+.edit-text-result {
+  .form-group {
+    display: flex;
+    flex-direction: column;
+  }
+}
diff --git a/app/javascript/vue/shared/tinymce.vue b/app/javascript/vue/shared/tinymce.vue
index 7473aa0de..6d622b9ee 100644
--- a/app/javascript/vue/shared/tinymce.vue
+++ b/app/javascript/vue/shared/tinymce.vue
@@ -27,7 +27,7 @@
             :data-placeholder="placeholder"
             :data-tinymce-init="`tinymce-${objectType}-description-${objectId}`">
         </div>
-        <div class="form-group">
+        <div class="flex">
           <textarea :id="`${objectType}_textarea_${objectId}`"
                     class="form-control hidden"
                     autocomplete="off"
diff --git a/app/views/result_texts/_edit.html.erb b/app/views/result_texts/_edit.html.erb
index 2c080e1e8..03a37f84a 100644
--- a/app/views/result_texts/_edit.html.erb
+++ b/app/views/result_texts/_edit.html.erb
@@ -1,4 +1,4 @@
-<div class="well">
+<div class="well edit-text-result">
   <%= bootstrap_form_for(@result, url: result_text_path(format: :json),
                                   data: { 'name-max-length': Constants::NAME_MAX_LENGTH, 'rich-text-max-length': Constants::RICH_TEXT_MAX_LENGTH },
                                   remote: :true) do |f| %>
diff --git a/app/views/result_texts/_new.html.erb b/app/views/result_texts/_new.html.erb
index b65af3c08..010d9b732 100644
--- a/app/views/result_texts/_new.html.erb
+++ b/app/views/result_texts/_new.html.erb
@@ -1,4 +1,4 @@
-<div class="well">
+<div class="well edit-text-result">
   <%= bootstrap_form_for(@result, url: my_module_result_texts_path(format: :json, page: params[:page], order: params[:order]),
                                   data: { 'name-max-length': Constants::NAME_MAX_LENGTH, 'rich-text-max-length': Constants::RICH_TEXT_MAX_LENGTH },
                                   remote: true) do |f| %>