Merge pull request #2107 from basecamp/adjust-paragraph-spacing

Adjusting text content spacing between paragraphs

app/assets/stylesheets/rich-text-content.css

@@ -28,6 +28,10 @@
       }
     }
 
+    p:has(+ p) {
+      margin: 0;
+    }
+
     ol, ul {
       padding-inline-start: 3ch;
     }

app/models/account/seeder.rb

@@ -69,6 +69,7 @@ class Account::Seeder
           <li>Make another called "Working on"</li>
         </ol>
         <p>Go back to the Board view, click the little “+” to the right of the DONE column, name the column, pick a color, then do it again.</p>
+        <p><br></p>
         <p>After that, drag this card to “DONE” or select “DONE” in the sidebar.</p>
         <action-text-attachment url="https://videos.37signals.com/fizzy/assets/images/make-columns.gif" alt="Demo of adding columns" caption="Make two more columns" content-type="image/*" filename="make-columns.gif" presentation="gallery"></action-text-attachment>
       HTML

script/migrations/split-sibling-paragraphs-with-p-br.rb

@@ -0,0 +1,120 @@
+#!/usr/bin/env ruby
+
+BACKFILL_TIMESTAMP = Time.parse("2025-12-19 00:07:00 UTC")
+ACCOUNT_ID = nil # restrict to an account_id
+
+# Split sibling <p> tags with content by inserting <p><br</p> to replicaate previous view.
+# Run for the time range before paragraphs were not spaced
+# See https://app.fizzy.do/5986089/cards/3472
+# and https://github.com/basecamp/fizzy/pull/2107
+#
+# MUST BE RUN AFTER `decrypt!` when using ActiveRecord Encryption
+#
+# Run locally:
+#   bin/rails runner script/migrations/split-sibling-paragraphs-with-p-br.rb
+#
+# Run via Kamal:
+#   kamal app exec -d <stage> -p --reuse "bin/rails runner script/migrations/split-sibling-paragraphs-with-p-br.rb"
+#
+# Safe to re-run for a time range: won't re-detect unsplit paragraphs and updated_at will be outside time window
+class SeparateSiblingParagraphs
+  attr_reader :updated_at, :account_id
+
+  def initialize(updated_at, account_id: nil)
+    @updated_at = updated_at
+    @account_id = account_id
+  end
+
+  def run
+    puts "Separating non-blank sibling paragraphs"
+
+    puts "Updated at: #{updated_at}"
+    puts account_id ? "Only account id: #{account_id}" : "For **ALL ACCOUNTS**"
+
+    puts "\nPress ENTER to continue running or CTRL-C to bail..."
+    gets
+
+    puts "\nRunning..."
+
+    # Suppress SQL logs
+    Rails.event.debug_mode = false
+
+    seconds = Benchmark.realtime do
+      suppressing_turbo_broadcasts do
+        separate_nonblank_paragraphs
+      end
+    end
+
+    puts "\n\n"
+    puts "Finished splitting non-blank <p>s in %.2f seconds." % seconds
+  end
+
+  private
+    def suppressing_turbo_broadcasts
+      Board.suppressing_turbo_broadcasts do
+        Card.suppressing_turbo_broadcasts do
+          yield
+        end
+      end
+    end
+
+    def separate_nonblank_paragraphs
+      scanned = 0
+      fixed = 0
+      insertions = 0
+
+      action_texts_scope.find_each(**batch_options) do |rich_text|
+        next if account_id && rich_text.record.account.external_account_id != account_id
+
+        scanned += 1
+        edited = false
+
+        rich_text.body&.fragment.tap do |fragment|
+          next unless fragment
+
+          fragment.find_all("p + p").each do |node|
+            unless empty_node?(node) || empty_node?(node.previous_sibling)
+              node.add_previous_sibling empty_node_markup
+              edited = true
+              insertions += 1
+            end
+          end
+
+          if edited
+            puts " - modifying #{rich_text.record.class.name} #{rich_text.record.to_param} (account: #{rich_text.record.account.external_account_id})" unless demo_card?(rich_text.record)
+            # allow implicit touching to invalidate caches
+            rich_text.update! body: fragment.to_html
+            fixed +=1
+          end
+        end
+      end
+
+      puts "\n\Separation complete!"
+      puts "  Rich texts examined: #{scanned}"
+      puts "  Rich texts modified: #{fixed}"
+      puts "  Paragraphs inserted: #{insertions}"
+      fixed
+    end
+
+    def action_texts_scope
+      ActionText::RichText.where(updated_at: updated_at)
+    end
+
+    def batch_options
+      { batch_size: 20, order: :desc }
+    end
+
+    def empty_node?(node)
+      node.to_html == empty_node_markup
+    end
+
+    def empty_node_markup
+      "<p><br></p>"
+    end
+
+    def demo_card?(record)
+      record.is_a?(Card) && record.number <= 8
+    end
+end
+
+SeparateSiblingParagraphs.new(..BACKFILL_TIMESTAMP, account_id: ACCOUNT_ID).run