Split off commenting CSS

tf · tf · commit cd0466691cba · 2026-04-07T11:39:31.000+02:00
diff --git a/entry_types/scrolled/app/helpers/pageflow_scrolled/packs_helper.rb b/entry_types/scrolled/app/helpers/pageflow_scrolled/packs_helper.rb
@@ -8,16 +8,17 @@ def scrolled_frontend_javascript_packs_tag(entry, options)
       )
     end
 
-    def scrolled_frontend_stylesheet_packs_tag(entry, options)
+    def scrolled_frontend_stylesheet_packs_tag(entry, **options)
       stylesheet_pack_tag(
         *scrolled_frontend_stylesheet_packs(entry, **options),
         media: 'all'
       )
     end
 
-    def scrolled_frontend_stylesheet_packs(entry, entry_mode:)
+    def scrolled_frontend_stylesheet_packs(entry, entry_mode:, seed_options: {})
       packs = scrolled_frontend_packs(entry, entry_mode: entry_mode)
-      packs += ['pageflow-scrolled-frontend-inlineEditing'] if entry_mode == :editor
+      packs += ['pageflow-scrolled-frontend-inlineEditing'] if seed_options[:load_inline_editing]
+      packs += ['pageflow-scrolled-frontend-commenting'] if seed_options[:load_commenting]
       packs
     end
 
diff --git a/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb b/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb
@@ -16,7 +16,7 @@
       <%= scrolled_favicons_for_entry(entry, entry_mode: entry_mode) %>
 
       <%= javascript_include_tag 'pageflow_scrolled/legacy' %>
-      <%= scrolled_frontend_stylesheet_packs_tag(entry, entry_mode: entry_mode) %>
+      <%= scrolled_frontend_stylesheet_packs_tag(entry, entry_mode: entry_mode, seed_options: seed_options) %>
 
       <%= scrolled_theme_properties_style_tag(entry.theme) %>
       <%= scrolled_theme_stylesheet_pack_tags(entry.theme) %>
@@ -35,7 +35,7 @@
         </script>
       <% end %>
 
-      <% ssr_html = local_assigns[:skip_ssr] ? '' : render_scrolled_entry(entry, local_assigns[:seed_options] || {}) %>
+      <% ssr_html = local_assigns[:skip_ssr] ? '' : render_scrolled_entry(entry, seed_options) %>
 
     </head>
     <body>
@@ -53,7 +53,7 @@
       <%= scrolled_webpack_public_path_script_tag %>
       <%= scrolled_frontend_javascript_packs_tag(entry, entry_mode: entry_mode) %>
 
-      <%= scrolled_entry_json_seed_script_tag(entry, local_assigns[:seed_options] || {}) %>
+      <%= scrolled_entry_json_seed_script_tag(entry, seed_options) %>
     </body>
   <% end %>
 <% end %>
diff --git a/entry_types/scrolled/package/config/webpack.js b/entry_types/scrolled/package/config/webpack.js
@@ -81,6 +81,9 @@ module.exports = {
     },
     'pageflow-scrolled-frontend-inlineEditing': {
       import: ['pageflow-scrolled/frontend/inlineEditing.css']
+    },
+    'pageflow-scrolled-frontend-commenting': {
+      import: ['pageflow-scrolled/frontend/commenting.css']
     }
   }
 };
diff --git a/entry_types/scrolled/spec/controllers/pageflow_scrolled/entries_controller_spec.rb b/entry_types/scrolled/spec/controllers/pageflow_scrolled/entries_controller_spec.rb
@@ -214,6 +214,40 @@ module PageflowScrolled
 
         expect(response.body).not_to include('"loadCommenting"')
       end
+
+      it 'does not include inline editing stylesheet pack' do
+        entry = create(:entry, :published, type_name: 'scrolled')
+
+        get_with_entry_env(:show, entry:)
+
+        expect(response.body).not_to have_selector(
+          'link[href*="pageflow-scrolled-frontend-inlineEditing"]',
+          visible: false
+        )
+      end
+
+      it 'includes commenting stylesheet pack in preview mode when feature is enabled' do
+        entry = create(:entry, :published, type_name: 'scrolled',
+                                           with_feature: 'commenting')
+
+        get_with_entry_env(:show, entry:, mode: :preview)
+
+        expect(response.body).to have_selector(
+          'link[href*="pageflow-scrolled-frontend-commenting"]',
+          visible: false
+        )
+      end
+
+      it 'does not include commenting stylesheet pack when feature is disabled' do
+        entry = create(:entry, :published, type_name: 'scrolled')
+
+        get_with_entry_env(:show, entry:, mode: :preview)
+
+        expect(response.body).not_to have_selector(
+          'link[href*="pageflow-scrolled-frontend-commenting"]',
+          visible: false
+        )
+      end
     end
   end
 end
diff --git a/entry_types/scrolled/spec/helpers/pageflow_scrolled/editor/seed_html_helper_spec.rb b/entry_types/scrolled/spec/helpers/pageflow_scrolled/editor/seed_html_helper_spec.rb
@@ -155,6 +155,18 @@ module Editor
                                               visible: false)
         end
 
+        it 'includes inline editing stylesheet pack' do
+          entry = create(:published_entry, type_name: 'scrolled')
+
+          result = helper.scrolled_editor_iframe_seed_html_script_tag(entry)
+
+          expect(result).to have_selector(
+            'script',
+            text: 'pageflow-scrolled-frontend-inlineEditing',
+            visible: false
+          )
+        end
+
         it 'renders additional seed data of unused content elements' do
           pageflow_configure do |config|
             config.for_entry_type(PageflowScrolled.entry_type) do |entry_type_conig|
diff --git a/entry_types/scrolled/spec/helpers/pageflow_scrolled/packs_helper_spec.rb b/entry_types/scrolled/spec/helpers/pageflow_scrolled/packs_helper_spec.rb
@@ -248,25 +248,42 @@ module PageflowScrolled
         entry = create(:published_entry, type_name: 'scrolled')
 
         result = helper.scrolled_frontend_stylesheet_packs(entry,
-                                                           entry_mode: :published)
+                                                           entry_mode: :published,
+                                                           seed_options: {})
 
         expect(result).to include('pageflow-scrolled-frontend')
       end
 
-      it 'includes inline editing stylesheet pack only in editor mode' do
+      it 'includes inline editing stylesheet pack when load_inline_editing seed option is set' do
         entry = create(:published_entry, type_name: 'scrolled')
 
         expect(
-          helper.scrolled_frontend_stylesheet_packs(entry, entry_mode: :editor)
+          helper.scrolled_frontend_stylesheet_packs(entry,
+                                                    entry_mode: :editor,
+                                                    seed_options: {load_inline_editing: true})
         ).to include('pageflow-scrolled-frontend-inlineEditing')
 
         expect(
-          helper.scrolled_frontend_stylesheet_packs(entry, entry_mode: :preview)
+          helper.scrolled_frontend_stylesheet_packs(entry,
+                                                    entry_mode: :editor,
+                                                    seed_options: {})
         ).not_to include('pageflow-scrolled-frontend-inlineEditing')
+      end
+
+      it 'includes commenting stylesheet pack when load_commenting seed option is set' do
+        entry = create(:published_entry, type_name: 'scrolled')
 
         expect(
-          helper.scrolled_frontend_stylesheet_packs(entry, entry_mode: :published)
-        ).not_to include('pageflow-scrolled-frontend-inlineEditing')
+          helper.scrolled_frontend_stylesheet_packs(entry,
+                                                    entry_mode: :preview,
+                                                    seed_options: {load_commenting: true})
+        ).to include('pageflow-scrolled-frontend-commenting')
+
+        expect(
+          helper.scrolled_frontend_stylesheet_packs(entry,
+                                                    entry_mode: :preview,
+                                                    seed_options: {})
+        ).not_to include('pageflow-scrolled-frontend-commenting')
       end
     end
 
diff --git a/rollup.config.js b/rollup.config.js
@@ -276,7 +276,8 @@ const pageflowScrolled = [
     plugins: plugins({
       extractCss: true,
       splitCss: {
-        '**/inlineEditing/**': pageflowScrolledPackageRoot + '/frontend/inlineEditing.css'
+        '**/inlineEditing/**': pageflowScrolledPackageRoot + '/frontend/inlineEditing.css',
+        '**/commenting/**': pageflowScrolledPackageRoot + '/frontend/commenting.css'
       }
     }),
     ...ignoreJSXWarning

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,9 @@ module.exports = {`
`81`	`81`	`},`
`82`	`82`	`'pageflow-scrolled-frontend-inlineEditing': {`
`83`	`83`	`import: ['pageflow-scrolled/frontend/inlineEditing.css']`
	`84`	`+ },`
	`85`	`+ 'pageflow-scrolled-frontend-commenting': {`
	`86`	`+ import: ['pageflow-scrolled/frontend/commenting.css']`
`84`	`87`	`}`
`85`	`88`	`}`
`86`	`89`	`};`