Merge branch 'bump/primer-upstream-ref' into bump/primer-upstream

Author: HDinger

.changeset/odd-planes-stop.md

@@ -0,0 +1,5 @@
+---
+'@openproject/primer-view-components': minor
+---
+
+Create IncludeFragment component. Allow ConditionalWrapper to render components other than BaseComponent

.changeset/pink-items-stand.md

@@ -0,0 +1,5 @@
+---
+'@openproject/primer-view-components': patch
+---
+
+Create IncludeFragment linter to migrate <include-fragment> uses

Gemfile

@@ -28,7 +28,7 @@ end
 # rubocop:enable Bundler/DuplicatedGem
 
 # Use Puma as the app server
-gem "puma", "~> 6.4.2"
+gem "puma", "~> 6.6.0"
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", require: false
@@ -64,7 +64,7 @@ group :development do
   gem "rubocop-performance"
   gem "rubocop-rails"
   gem "rubocop-rails-accessibility", "~> 1.0"
-  gem "selenium-webdriver", "~> 4.18"
+  gem "selenium-webdriver", "~> 4.31"
   gem "simplecov", "~> 0.22.0"
   gem "simplecov-console", "~> 0.9.1"
   gem "sprockets"

Gemfile.lock

@@ -57,7 +57,7 @@ GEM
       parser (>= 2.4)
       smart_properties
     bigdecimal (3.1.9)
-    bootsnap (1.18.3)
+    bootsnap (1.18.4)
       msgpack (~> 1.2)
     builder (3.3.0)
     capybara (3.40.0)
@@ -77,7 +77,7 @@ GEM
     crass (1.0.6)
     css_parser (1.21.1)
       addressable
-    cssbundling-rails (1.4.1)
+    cssbundling-rails (1.4.3)
       railties (>= 6.0.0)
     cuprite (0.15)
       capybara (~> 3.0)
@@ -145,9 +145,9 @@ GEM
     minitest (5.25.5)
     mocha (2.3.0)
       ruby2_keywords (>= 0.0.5)
-    msgpack (1.7.2)
+    msgpack (1.8.0)
     mutex_m (0.3.0)
-    nio4r (2.7.3)
+    nio4r (2.7.4)
     nokogiri (1.18.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -165,10 +165,10 @@ GEM
       date
       stringio
     public_suffix (5.0.5)
-    puma (6.4.2)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.12)
+    rack (3.1.13)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-proxy (0.7.7)
@@ -206,7 +206,7 @@ GEM
     regexp_parser (2.9.2)
     reline (0.6.1)
       io-console (~> 0.5)
-    rexml (3.3.7)
+    rexml (3.4.1)
     rouge (4.5.1)
     rubocop (1.66.1)
       json (~> 2.3)
@@ -236,10 +236,11 @@ GEM
       rubocop (>= 1.0.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     securerandom (0.4.1)
-    selenium-webdriver (4.20.1)
+    selenium-webdriver (4.31.0)
       base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -290,7 +291,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
-    websocket (1.2.10)
+    websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -323,7 +324,7 @@ DEPENDENCIES
   matrix (~> 0.4.2)
   mocha
   openproject-primer_view_components!
-  puma (~> 6.4.2)
+  puma (~> 6.6.0)
   rack-cors
   railties (= 8.0.2)
   rake (~> 13.2)
@@ -332,7 +333,7 @@ DEPENDENCIES
   rubocop-performance
   rubocop-rails
   rubocop-rails-accessibility (~> 1.0)
-  selenium-webdriver (~> 4.18)
+  selenium-webdriver (~> 4.31)
   simplecov (~> 0.22.0)
   simplecov-console (~> 0.9.1)
   sourcemap (~> 0.1)

app/components/primer/alpha/action_menu.html.erb

@@ -3,7 +3,7 @@
     <%= render(@overlay) do |overlay| %>
       <% overlay.with_body(padding: :none) do %>
         <% if @src.present? %>
-          <include-fragment src="<%= @src %>" loading="<%= preload? ? "eager" : "lazy" %>" data-target="action-menu.includeFragment">
+          <%= render(Primer::Alpha::IncludeFragment.new(src: @src, loading: preload? ? :eager : :lazy, "data-target": "action-menu.includeFragment")) do %>
             <%= render(Primer::Alpha::ActionMenu::List.new(id: "#{@menu_id}-list", menu_id: @menu_id)) do |list| %>
               <% list.with_item(
                 aria: { disabled: true },
@@ -18,7 +18,7 @@
                 <%= render Primer::Beta::Spinner.new(aria: { label: "Loading content..." }) %>
               <% end %>
             <% end %>
-          </include-fragment>
+          <% end %>
         <% else %>
           <%= render(@list) %>
         <% end %>

app/components/primer/alpha/include_fragment.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Primer
+  module Alpha
+    # Use `IncludeFragment` to load HTML elements from the server.
+    # Add additional usage considerations or best practices that may aid the user to use the component correctly.
+    # @accessibility Add any accessibility considerations
+    class IncludeFragment < Primer::Component
+      status :alpha
+
+      # @param src [String] The URL  from which to retrieve an HTML element fragment.
+      # @param loading [Symbol] <%= one_of([:lazy, :eager]) %>
+      # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
+      def initialize(src: nil, loading: :eager, **system_arguments)
+        @system_arguments = system_arguments
+        @system_arguments[:tag] = "include-fragment"
+        @system_arguments[:loading] = loading
+        @system_arguments[:src] = src
+      end
+
+      def call
+        render(Primer::BaseComponent.new(**@system_arguments)) { content }
+      end
+    end
+  end
+end

app/components/primer/alpha/select_panel.html.erb

@@ -62,7 +62,7 @@
           )) do %>
             <div id="<%= @body_id %>">
               <% if @src.present? %>
-                <%= render(Primer::ConditionalWrapper.new(condition: @fetch_strategy == :eventually_local, tag: "include-fragment", data: { target: "select-panel.includeFragment" }, src: @src, loading: preload? ? "eager" : "lazy", accept: "text/fragment+html")) do %>
+                <%= render(Primer::ConditionalWrapper.new(condition: @fetch_strategy == :eventually_local, component: Primer::Alpha::IncludeFragment, data: { target: "select-panel.includeFragment" }, src: @src, loading: preload? ? "eager" : "lazy", accept: "text/fragment+html")) do %>
                   <%= render(Primer::BaseComponent.new(
                     tag: :div,
                     id: "#{@panel_id}-list",

app/components/primer/conditional_wrapper.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 module Primer
-  # Conditionally renders a `Primer::BaseComponent` around the given content. If the given condition
-  # is true, a `Primer::BaseComponent` will render around the content. If the condition is false, only
+  # Conditionally renders a component around the given content. If the given condition
+  # is true, the component will render around the content. If the condition is false, only
   # the content is rendered.
   class ConditionalWrapper < Primer::Component
-    # @param condition [Boolean] Whether or not to wrap the content in a `Primer::BaseComponent`.
-    # @param base_component_arguments [Hash] The arguments to pass to `Primer::BaseComponent`.
-    def initialize(condition:, **base_component_arguments)
+    # @param condition [Boolean] Whether or not to wrap the content in a component.
+    # @param component [Class] The component class to use as a wrapper, defaults to `Primer::BaseComponent`
+    # @param base_component_arguments [Hash] The arguments to pass to the component.
+    def initialize(condition:, component: Primer::BaseComponent, **base_component_arguments)
       @condition = condition
+      @component = component
       @base_component_arguments = base_component_arguments
       @trim = !!@base_component_arguments.delete(:trim)
     end
@@ -18,7 +20,7 @@ def call
         return @trim ? trimmed_content : content
       end
 
-      BaseComponent.new(trim: @trim, **@base_component_arguments).render_in(self) { content }
+      @component.new(trim: @trim, **@base_component_arguments).render_in(self) { content }
     end
   end
 end

demo/app/controllers/include_fragment_controller.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# :nodoc:
+class IncludeFragmentController < ApplicationController
+  layout false
+
+  def landing; end
+
+  def deferred
+    render "include_fragment/deferred"
+  end
+end

demo/app/views/include_fragment/deferred.html.erb

@@ -0,0 +1,3 @@
+<div>
+  Hello world!
+</div>