remove explicit widths from tinymce tables; wrap & scroll tinymce tables

datadryad · Jul 8, 2024 · 62e5a69 · 62e5a69
1 parent d71945a
commit 62e5a69
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/app/assets/stylesheets/scss/_columns.scss b/app/assets/stylesheets/scss/_columns.scss
@@ -25,6 +25,7 @@
 
 .c-columns__content, #page-content {
   padding-left: 2px;
+  overflow: auto;
   overflow-wrap: anywhere;
 
   @include bp(screen3) {

diff --git a/app/javascript/react/components/MetadataEntry/Description.jsx b/app/javascript/react/components/MetadataEntry/Description.jsx
@@ -113,6 +113,12 @@ export default function Description({
           table_toolbar: 'tableprops tabledelete | tableinsertrowbefore tableinsertrowafter tabledeleterow | '
                   + 'tableinsertcolbefore tableinsertcolafter tabledeletecol',
           content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px }',
+          invalid_styles: {
+            table: 'width height',
+            tr: 'width height',
+            th: 'width height',
+            td: 'width height',
+          },
           branding: false,
           paste_block_drop: true,
           paste_preprocess,

diff --git a/app/models/stash_datacite/description.rb b/app/models/stash_datacite/description.rb
@@ -76,6 +76,13 @@ def update_search_words
       resource&.identifier&.update_search_words! if description_type == 'abstract' && saved_change_to_description?
     end
 
+    def display_desc
+      fragment = Nokogiri::HTML5.fragment(description)
+      tables = fragment.css('table')
+      tables.wrap('<div class="table-wrapper"></div>')
+      fragment.to_html
+    end
+
     after_save :update_search_words
   end
 end
diff --git a/app/views/stash_datacite/descriptions/_show.html.erb b/app/views/stash_datacite/descriptions/_show.html.erb
@@ -5,7 +5,7 @@
     <h3 class="o-heading__level2">Abstract</h3>
   <% end %>
   <div class="t-landing__text-wall <%= 'highlight' if highlight_fields.include?('abstract') %>">
-    <%= raw(abstract.description) %>
+    <%= raw(abstract.display_desc) %>
   </div>
 <% end %>
 
@@ -16,7 +16,7 @@
     <h3 class="o-heading__level2">Methods</h3>
   <% end %>
   <div class="t-landing__text-wall <%= 'highlight' if highlight_fields.include?('methods') %>">
-    <%= raw(methods.description) %>
+    <%= raw(methods.display_desc) %>
   </div>
 <% end %>
 
@@ -27,6 +27,6 @@
     <h3 class="o-heading__level2">Usage notes</h3>
   <% end %>
   <div class="t-landing__text-wall <%= 'highlight' if highlight_fields.include?('usage_notes') %>">
-    <%= raw(other.description) %>
+    <%= raw(other.display_desc) %>
   </div>
 <% end %>