pageflow 16.1.0 → 16.2.0

data/entry_types/paged/app/controllers/pageflow_paged/entries_controller.rb

@@ -17,7 +17,7 @@ module PageflowPaged
 
       @entry.share_target =
         if params[:page].present?
-          @entry.pages.find_by_perma_id(params[:page])
+          @entry.pages.find_by_perma_id(params[:page]) || @entry
         else
           @entry
         end

data/entry_types/paged/lib/pageflow_paged/engine.rb

@@ -5,19 +5,15 @@ module PageflowPaged
   class Engine < ::Rails::Engine
     isolate_namespace PageflowPaged
 
-    if Pageflow::RailsVersion.experimental?
-      lib = root.join('lib')
+    lib = root.join('lib')
 
-      config.autoload_paths << lib
-      config.eager_load_paths << lib
+    config.autoload_paths << lib
+    config.eager_load_paths << lib
 
-      initializer 'pageflow_paged.autoloading' do
-        Rails.autoloaders.main.ignore(
-          lib.join('tasks')
-        )
-      end
-    else
-      config.paths.add('lib', eager_load: true)
+    initializer 'pageflow_paged.autoloading' do
+      Rails.autoloaders.main.ignore(
+        lib.join('tasks')
+      )
     end
 
     config.i18n.load_path += Dir[config.root.join('config', 'locales', '**', '*.yml').to_s]

data/entry_types/scrolled/app/controllers/pageflow_scrolled/entries_controller.rb

@@ -13,10 +13,16 @@ module PageflowScrolled
     helper FaviconHelper
 
     def show
-      @entry = get_published_entry_from_env
-      @widget_scope = get_entry_mode_from_env
+      entry = get_published_entry_from_env
 
-      I18n.locale = @entry.locale
+      I18n.locale = entry.locale
+
+      render(
+        locals: {
+          entry: entry,
+          widget_scope: get_entry_mode_from_env
+        }
+      )
     end
   end
 end

data/entry_types/scrolled/app/helpers/pageflow_scrolled/editor/seed_html_helper.rb

@@ -15,12 +15,12 @@ module PageflowScrolled
       def scrolled_editor_iframe_seed_html_script_tag(entry)
         html = render(template: 'pageflow_scrolled/entries/show',
                       locals: {
-                        :@entry => entry,
-                        :@widget_scope => :editor,
-                        :@skip_ssr => true,
-                        :@skip_structured_data => true,
-                        :@skip_feed_link_tags => true,
-                        :@seed_options => {
+                        entry: entry,
+                        widget_scope: :editor,
+                        skip_ssr: true,
+                        skip_structured_data: true,
+                        skip_feed_link_tags: true,
+                        seed_options: {
                           skip_collections: true,
                           include_unused_additional_seed_data: true,
                           translations: {include_inline_editing: true}

data/entry_types/scrolled/app/helpers/pageflow_scrolled/packs_helper.rb

@@ -2,61 +2,41 @@ module PageflowScrolled
   # @api private
   module PacksHelper
     def scrolled_frontend_javascript_packs_tag(entry, options)
-      if defined?(Shakapacker)
-        javascript_pack_tag(
-          *scrolled_frontend_packs(entry, **options),
-          defer: false
-        )
-      else
-        javascript_packs_with_chunks_tag(
-          *scrolled_frontend_packs(entry, **options)
-        )
-      end
+      javascript_pack_tag(
+        *scrolled_frontend_packs(entry, **options),
+        defer: false
+      )
     end
 
     def scrolled_frontend_stylesheet_packs_tag(entry, options)
-      if defined?(Shakapacker)
-        stylesheet_pack_tag(
-          *scrolled_frontend_packs(entry, **options),
-          media: 'all'
-        )
-      else
-        stylesheet_packs_with_chunks_tag(
-          *scrolled_frontend_packs(entry, **options),
-          media: 'all'
-        )
-      end
+      stylesheet_pack_tag(
+        *scrolled_frontend_packs(entry, **options),
+        media: 'all'
+      )
     end
 
     def scrolled_editor_javascript_packs_tag(entry)
-      if defined?(Shakapacker)
-        javascript_pack_tag(
-          *scrolled_editor_packs(entry),
-          defer: false
-        )
-      else
-        javascript_packs_with_chunks_tag(
-          *scrolled_editor_packs(entry)
-        )
-      end
+      javascript_pack_tag(
+        *scrolled_editor_packs(entry),
+        defer: false
+      )
     end
 
     def scrolled_frontend_packs(entry, widget_scope:)
-      widget_types = scrolled_frontend_pack_widget_types(entry, widget_scope)
-
       ['pageflow-scrolled-frontend'] +
-        scrolled_frontend_content_element_packs(entry, widget_scope) +
-        widget_types.map(&:pack)
+        scrolled_additional_frontend_packs(entry, widget_scope) +
+        scrolled_frontend_widget_type_packs(entry, widget_scope)
     end
 
     def scrolled_editor_packs(entry)
       ['pageflow-scrolled-editor'] +
-        Pageflow.config_for(entry).additional_editor_packs.paths
+        Pageflow.config_for(entry).additional_editor_packs.paths +
+        scrolled_frontend_widget_type_packs(entry, :editor)
     end
 
     private
 
-    def scrolled_frontend_content_element_packs(entry, widget_scope)
+    def scrolled_additional_frontend_packs(entry, widget_scope)
       additional_packs = Pageflow.config_for(entry).additional_frontend_packs
       return additional_packs.paths if widget_scope == :editor
 
@@ -68,6 +48,10 @@ module PageflowScrolled
       )
     end
 
+    def scrolled_frontend_widget_type_packs(entry, widget_scope)
+      scrolled_frontend_pack_widget_types(entry, widget_scope).map(&:pack)
+    end
+
     def scrolled_frontend_pack_widget_types(entry, widget_scope)
       if widget_scope == :editor
         ReactWidgetType.all_for(entry)

data/entry_types/scrolled/app/helpers/pageflow_scrolled/themes_helper.rb

@@ -6,11 +6,9 @@ module PageflowScrolled
                                   theme_file_role: nil,
                                   theme_file_style: :resized,
                                   relative_url: false)
-      prefix = defined?(Shakapacker) ? 'static' : 'media'
-
       path =
         theme.files.dig(theme_file_role, theme_file_style) ||
-        asset_pack_path("#{prefix}/pageflow-scrolled/themes/#{theme.name}/#{path}")
+        asset_pack_path("static/pageflow-scrolled/themes/#{theme.name}/#{path}")
 
       if relative_url
         URI.parse(path).path

data/entry_types/scrolled/app/views/pageflow_scrolled/editor/entries/_head.html.erb

@@ -1,10 +1,5 @@
 <%= stylesheet_link_tag 'pageflow_paged/editor', media: 'all' %>
-
-<% if defined?(Shakapacker)  %>
-  <%= stylesheet_pack_tag 'pageflow-scrolled-frontend' %>
-<% else %>
-  <%= stylesheet_packs_with_chunks_tag 'pageflow-scrolled-frontend' %>
-<% end %>
+<%= stylesheet_pack_tag 'pageflow-scrolled-frontend' %>
 
 <%= scrolled_theme_properties_style_tag(entry.theme) %>
 <%= scrolled_theme_stylesheet_pack_tags(entry.theme) %>

data/entry_types/scrolled/app/views/pageflow_scrolled/entries/show.html.erb

@@ -1,26 +1,26 @@
-<%= cache_scrolled_entry(entry: @entry, widget_scope: @widget_scope) do %>
+<%= cache_scrolled_entry(entry: entry, widget_scope: widget_scope) do %>
   <!DOCTYPE html>
-  <%= content_tag(:html, lang: @entry.locale, dir: text_direction(@entry.locale)) do %>
+  <%= content_tag(:html, lang: entry.locale, dir: text_direction(entry.locale)) do %>
     <head>
-      <title><%= pretty_entry_title(@entry) %></title>
+      <title><%= pretty_entry_title(entry) %></title>
 
       <meta charset="utf-8" />
       <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
 
-      <%= social_share_meta_tags_for(@entry) %>
-      <%= meta_tags_for_entry(@entry) %>
-      <%= feed_link_tags_for_entry(@entry) unless @skip_feed_link_tags%>
+      <%= social_share_meta_tags_for(entry) %>
+      <%= meta_tags_for_entry(entry) %>
+      <%= feed_link_tags_for_entry(entry) unless local_assigns[:skip_feed_link_tags] %>
 
-      <%= scrolled_favicons_for_entry(@entry, entry_mode: @widget_scope) %>
+      <%= scrolled_favicons_for_entry(entry, entry_mode: widget_scope) %>
 
       <%= javascript_include_tag 'pageflow_scrolled/legacy' %>
-      <%= scrolled_frontend_stylesheet_packs_tag(@entry, widget_scope: @widget_scope) %>
+      <%= scrolled_frontend_stylesheet_packs_tag(entry, widget_scope: widget_scope) %>
 
-      <%= scrolled_theme_properties_style_tag(@entry.theme) %>
-      <%= scrolled_theme_stylesheet_pack_tags(@entry.theme) %>
+      <%= scrolled_theme_properties_style_tag(entry.theme) %>
+      <%= scrolled_theme_stylesheet_pack_tags(entry.theme) %>
 
-      <%= render_widget_head_fragments(@entry, scope: @widget_scope) %>
+      <%= render_widget_head_fragments(entry, scope: widget_scope) %>
 
       <% if Rails.env.development? %>
         <script>
@@ -34,14 +34,14 @@
         </script>
       <% end %>
 
-      <% ssr_html = @skip_ssr ? '' : render_scrolled_entry(@entry) %>
+      <% ssr_html = local_assigns[:skip_ssr] ? '' : render_scrolled_entry(entry) %>
 
-      <% if !@skip_ssr && (params[:frontend] == 'v2' || @entry.feature_state('frontend_v2')) %>
+      <% if !local_assigns[:skip_ssr] && (params[:frontend] == 'v2' || entry.feature_state('frontend_v2')) %>
         <%= generated_media_queries_tags_for(ssr_html) %>
       <% end %>
     </head>
     <body>
-      <%= structured_data_for_entry(@entry) unless @skip_structured_data %>
+      <%= structured_data_for_entry(entry) unless local_assigns[:skip_structured_data] %>
 
       <%= render 'pageflow_scrolled/entries/global_notices' %>
 
@@ -49,13 +49,13 @@
       <div id="root"><%= ssr_html %></div>
 
       <div id='template-widget-container'>
-        <%= render_widgets(@entry, scope: @widget_scope, insert_point: :bottom_of_entry) %>
+        <%= render_widgets(entry, scope: widget_scope, insert_point: :bottom_of_entry) %>
       </div>
 
       <%= scrolled_webpack_public_path_script_tag %>
-      <%= scrolled_frontend_javascript_packs_tag(@entry, widget_scope: @widget_scope) %>
+      <%= scrolled_frontend_javascript_packs_tag(entry, widget_scope: widget_scope) %>
 
-      <%= scrolled_entry_json_seed_script_tag(@entry, @seed_options || {}) %>
+      <%= scrolled_entry_json_seed_script_tag(entry, local_assigns[:seed_options] || {}) %>
     </body>
   <% end %>
 <% end %>

data/entry_types/scrolled/app/views/pageflow_scrolled/entry_json_seed/_entry.json.jbuilder

@@ -42,6 +42,10 @@ json.config do
 
   json.partial! 'pageflow_scrolled/entry_json_seed/consent_vendors',
                 entry: entry, entry_config: entry_config
+
+  json.file_licenses(
+    I18n.t('pageflow.file_licenses', default: {}).slice(*entry_config.available_file_licenses)
+  )
 end
 
 unless options[:skip_i18n]

data/entry_types/scrolled/config/locales/de.yml

@@ -41,17 +41,26 @@ de:
       feature_name: Frontend v2
     hls_instead_of_dash:
       feature_name: HLS statt DASH für Videos verwenden
+    iconInlineFileRights:
+      widget_type_name: Copyright-Icons
     iframe_embed_content_element:
       feature_name: iframe-Embed Inhaltselement
     scrolled_entry_fragment_caching:
       feature_name: Pageflow-Next-Fragment-Caching
+    textInlineFileRights:
+      widget_type_name: Text am Element
     ui:
       configuration_editor:
         tabs:
           defaultNavigation: Standard Navigation
+    widgets:
+      roles:
+        inlineFileRights: Inline-Datei-Rechte
   pageflow_scrolled:
     editor:
       backdrop_effects:
+        autoZoom:
+          label: Auto-Zoom
         blur:
           label: Unschärfe
         brightness:
@@ -62,6 +71,8 @@ de:
           label: Graustufen
         saturate:
           label: Sättigung
+        scrollParallax:
+          label: Scroll-Parallax
         sepia:
           label: Sepia
       blank_entry:
@@ -87,23 +98,36 @@ de:
         position:
           inline_help: |-
             Mit dieser Einstellung kannst du die Position des Elements
-            im Zusammenspiel mit Fließtext steuern: Das Element kann
-            im Text verankert werden ("Im Textfluss") oder beim
-            Scrollen begleitend neben dem Text stehenbleiben
-            ("Sticky"). Sticky-Elemente bleiben statisch in der Mitte
-            des Viewports neben dem Text stehen, bis entweder der
-            Abschnitt aus dem Viewport gescrollt wird oder sie vom
-            nächsten Sticky-Element des Abschnitts verdrängt
-            werden. In Mobil-Darstellung werden Sticky Elemente
-            automatisch im Text verankert. Sticky-Elemente
-            funktionieren besonders gut bei Desktop-Darstellung in
-            Kombination mit langen Textpassagen.
+            im Zusammenspiel mit Fließtext steuern.
+          item_inline_help_texts:
+            inline: |-
+              Im Text verankern und zusammen mit dem übrigen Inhalt
+              des Abschnitts scrollen.
+            left: |-
+              Element links einrücken und vom Text des Abschnitts
+              umfließen lassen.
+            right: |-
+              Element rechts einrücken und vom Text des Abschnitts
+              umfließen lassen.
+            standAlone: |-
+              Beim Scrollen kurz in der Mitte des Viewports
+              stehenbleiben. Dies gibt dem Leser eine stabile
+              Position, um das Element vollständig betrachten zu
+              können. Kleineren Elementen kann so mehr Gewicht
+              verliehen werden.
+            sticky: |-
+              Beim Scrollen begleitend neben dem Text
+              stehenbleiben. In der Mobil-Darstellung werden Sticky
+              Elemente automatisch im Text verankert. Sticky-Elemente
+              funktionieren besonders gut bei Desktop-Darstellung in
+              Kombination mit langen Textpassagen.
           label: Position
           values:
             full: Volle Breite
             inline: Im Textfluss
             left: Links eingerückt
             right: Rechts eingerückt
+            standAlone: Stand-Alone
             sticky: Sticky
             wide: Breit
         typographyVariant:
@@ -232,6 +256,14 @@ de:
               label: Text
             color:
               label: Farbe
+            entranceAnimation:
+              inline_help: Lege die Animation fest, mit der die Überschrift eingeblendet werden soll, wenn sie die Mitte des Viewports erreicht.
+              label: Eingangsanimation
+              values:
+                fadeIn: Einblenden
+                fadeInFast: Einblenden (Schnell)
+                fadeInSlow: Einblenden (Langsam)
+                none: "(Keine)"
             hyphens:
               inline_help: |
                 Bei manueller Silbentrennung werden Worte nur an
@@ -683,6 +715,8 @@ de:
       entry_outline:
         add_chapter: Neues Kapitel
         header: Gliederung
+      inline_file_rights_menu_item:
+        label: Rechteangabe an dieser Stelle ausblenden
       insert_content_element:
         cancel: Abbrechen
         header: Element einfügen
@@ -1021,6 +1055,8 @@ de:
       type_heading: Überschrift
       type_question: Fragetext eingeben
       type_quote: Zitat eingeben
+      type_subtitle: Untertitel eingeben
+      type_tagline: Tagline eingeben
       type_text: Text eingeben
       type_title: Titel
       url_placeholder: URL eingeben oder einfügen

data/entry_types/scrolled/config/locales/en.yml

@@ -41,17 +41,26 @@ en:
       feature_name: Frontend v2
     hls_instead_of_dash:
       feature_name: Use HLS instead of DASH for videos
+    iconInlineFileRights:
+      widget_type_name: Copyright icons
     iframe_embed_content_element:
       feature_name: iframe embed content element
     scrolled_entry_fragment_caching:
       feature_name: Pageflow Next Fragment Caching
+    textInlineFileRights:
+      widget_type_name: Text at element
     ui:
       configuration_editor:
         tabs:
           defaultNavigation: Default navigation
+    widgets:
+      roles:
+        inlineFileRights: Inline file rights
   pageflow_scrolled:
     editor:
       backdrop_effects:
+        autoZoom:
+          label: Auto Zoom
         blur:
           label: Blur
         brightness:
@@ -62,6 +71,8 @@ en:
           label: Grayscale
         saturate:
           label: Saturate
+        scrollParallax:
+          label: Scroll Parallax
         sepia:
           label: Sepia
       blank_entry:
@@ -86,22 +97,31 @@ en:
           blank: "(Auto)"
         position:
           inline_help: |-
-            This setting allows you to control the position of the
-            element in relation to surrounding text blocks: it can be
-            anchored within the text ("Inline") or positioned adjacent
-            to the text ("Sticky"). Sticky elements remain static in
-            the middle of the viewport alongside the text until either
-            the section is scrolled out of the viewport or they get
-            pushed upwards by the next sticky element of the
-            section. On mobile devices sticky elements automatically
-            get positioned inline. Sticky elements work particularly
-            well on desktop devices in combination with long texts.
+            Control the position of the element in relation to
+            surrounding text blocks.
+          item_inline_help_texts:
+            inline: |-
+              Anchor in the text and scroll along with the rest of the
+              section's content.
+            left: Indent element on the left and let it be surrounded by the section's text.
+            right: Indent element on the right and let it be surrounded by the section's text.
+            standAlone: |-
+              Briefly stay in the middle of the viewport while
+              scrolling. This gives the reader a stable position to
+              fully view the element. Smaller elements can be given
+              more weight that way.
+            sticky: |-
+              Place beside the text while scrolling. In mobile view,
+              sticky elements are automatically turned into inline
+              elements. Sticky elements work particularly well in
+              desktop view in combination with long text passages.
           label: Position
           values:
             full: Full Width
             inline: Inline
             left: Floated left
             right: Floated right
+            standAlone: Stand alone
             sticky: Sticky
             wide: Wide
         typographyVariant:
@@ -230,6 +250,14 @@ en:
               label: Text
             color:
               label: Color
+            entranceAnimation:
+              inline_help: Determine how the heading becomes visible once it reaches the center of the viewport
+              label: Entrance Animation
+              values:
+                fadeIn: Fade in
+                fadeInFast: Fade in (Fast)
+                fadeInSlow: Fade in (Slow)
+                none: "(None)"
             hyphens:
               inline_help: |
                 With manual hyphenation, words are only ever separated
@@ -678,6 +706,8 @@ en:
       entry_outline:
         add_chapter: New chapter
         header: Outline
+      inline_file_rights_menu_item:
+        label: Hide rights information here
       insert_content_element:
         cancel: Cancel
         header: Insert element
@@ -863,6 +893,8 @@ en:
       type_heading: Heading
       type_question: Type question text
       type_quote: Type quote text
+      type_subtitle: Type subtitle
+      type_tagline: Type tagline
       type_text: Type some text
       type_title: Title
       url_placeholder: Type or paste URL

data/entry_types/scrolled/lib/generators/pageflow_scrolled/install/install_generator.rb

@@ -30,20 +30,14 @@ module PageflowScrolled
       end
 
       def install_packages
-        if defined?(Shakapacker)
-          run 'yarn add css-loader style-loader' \
-              ' mini-css-extract-plugin css-minimizer-webpack-plugin' \
-              ' postcss postcss-preset-env postcss-loader' \
-              ' postcss-import postcss-url postcss-flexbugs-fixes' \
-              ' @fontsource/source-sans-pro'
-        else
-          run 'yarn add postcss-url@^8.0.0 @fontsource/source-sans-pro'
-        end
+        run 'yarn add css-loader style-loader' \
+            ' mini-css-extract-plugin css-minimizer-webpack-plugin' \
+            ' postcss postcss-preset-env postcss-loader' \
+            ' postcss-import postcss-url postcss-flexbugs-fixes' \
+            ' @fontsource/source-sans-pro'
       end
 
       def webpack_config
-        return unless defined?(Shakapacker)
-
         gsub_file(
           'config/webpack/webpack.config.js',
           "const { generateWebpackConfig } = require('shakapacker')",
@@ -92,65 +86,23 @@ module PageflowScrolled
         )
       end
 
-      def webpack_environment
-        return if defined?(Shakapacker)
-
-        inject_into_file('config/webpack/environment.js',
-                         before: "module.exports = environment\n") do
-          "environment.config.merge(require('pageflow/config/webpack'))\n" \
-          "environment.config.merge(require('pageflow-scrolled/config/webpack'))\n\n" \
-          "// Allow loading only chunks of used widgets. runtimeChunk 'single'\n" \
-          "// ensures that modules are only evaluated once which is important\n" \
-          "// for modules with side effects.\n" \
-          "environment.splitChunks((config) =>\n" \
-          "  Object.assign({}, config, { optimization: { runtimeChunk: 'single' }})\n" \
-          ")\n\n" \
-          "// Opt into future default behavior of Webpacker [1] to work around\n" \
-          "// problems with Video.js DASH service worker.\n" \
-          "//\n" \
-          "// [1] https://github.com/rails/webpacker/pull/2624\n" \
-          "environment.loaders.delete('nodeModules')\n\n"
-        end
-      end
-
-      def webpacker_yml
-        return if defined?(Shakapacker)
-
-        gsub_file('config/webpacker.yml',
-                  'extract_css: false',
-                  'extract_css: true')
-
-        inject_into_file('config/webpacker.yml',
-                         after: "- .woff2\n") do
-          "    - .mp3\n    - .webmanifest\n    - .xml\n"
-        end
-      end
-
       def postcss_config
-        if defined?(Shakapacker)
-          create_file 'postcss.config.js', <<~JS
-            module.exports = {
-              plugins: [
-                require('postcss-import'),
-                // Make relative urls in fontsource packages work
-                require('postcss-url')({url: 'rebase'}),
-                require('postcss-flexbugs-fixes'),
-                require('postcss-preset-env')({
-                  autoprefixer: {
-                    flexbox: 'no-2009'
-                  },
-                  stage: 3
-                })
-              ]
-            }
-          JS
-        else
-          inject_into_file('postcss.config.js',
-                           after: "require('postcss-import'),\n") do
-            "    // Make relative urls in fontsource packages work\n" \
-            "    require('postcss-url')({url: 'rebase'}),\n"
-          end
-        end
+        create_file 'postcss.config.js', <<~JS
+          module.exports = {
+            plugins: [
+              require('postcss-import'),
+              // Make relative urls in fontsource packages work
+              require('postcss-url')({url: 'rebase'}),
+              require('postcss-flexbugs-fixes'),
+              require('postcss-preset-env')({
+                autoprefixer: {
+                  flexbox: 'no-2009'
+                },
+                stage: 3
+              })
+            ]
+          }
+        JS
       end
 
       def editor_pack
@@ -177,26 +129,7 @@ module PageflowScrolled
         create_file 'app/javascript/packs/pageflow-scrolled-server.js', <<-JS
           import 'pageflow-scrolled/frontend-server';
           import 'pageflow-scrolled/contentElements-frontend';
-          import 'pageflow-scrolled/widgets/defaultNavigation';
-          import 'pageflow-scrolled/widgets/consentBar';
-        JS
-      end
-
-      def default_navigation_widget_packs
-        widget_dir = 'app/javascript/packs/pageflow-scrolled/widgets'
-
-        create_file File.join(widget_dir, 'defaultNavigation.js'), <<-JS
-          import 'pageflow-scrolled/widgets/defaultNavigation';
-          import 'pageflow-scrolled/widgets/defaultNavigation.css';
-        JS
-      end
-
-      def consent_bar_widget_packs
-        widget_dir = 'app/javascript/packs/pageflow-scrolled/widgets'
-
-        create_file File.join(widget_dir, 'consentBar.js'), <<-JS
-          import 'pageflow-scrolled/widgets/consentBar';
-          import 'pageflow-scrolled/widgets/consentBar.css';
+          import 'pageflow-scrolled/widgets-server';
         JS
       end
 

data/entry_types/scrolled/lib/pageflow_scrolled/additional_packs.rb

@@ -27,7 +27,8 @@ module PageflowScrolled
     # @api private
     def paths_for_content_element_types(type_names)
       @packs.reject { |pack|
-        (pack.content_element_type_names & type_names).empty?
+        pack.content_element_type_names.present? &&
+          (pack.content_element_type_names & type_names).empty?
       }.map(&:path)
     end