Merge branch 'develop' into feature/backpex-installer

Author: phyr97

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: erlef/setup-beam@5304e04ea2b355f03681464e683d92e3b2f18451 # v1.18.2
+      - uses: erlef/setup-beam@8aa8a857c6be0daae6e97272bb299d5b942675a4 # v1.19.0
         with:
           otp-version: ${{ matrix.erlang }}
           elixir-version: ${{ matrix.elixir }}
@@ -109,7 +109,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: erlef/setup-beam@5304e04ea2b355f03681464e683d92e3b2f18451 # v1.18.2
+      - uses: erlef/setup-beam@8aa8a857c6be0daae6e97272bb299d5b942675a4 # v1.19.0
         id: beam
         with:
           version-file: .tool-versions
@@ -148,7 +148,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup beam
-        uses: erlef/setup-beam@5304e04ea2b355f03681464e683d92e3b2f18451 # v1.18.2
+        uses: erlef/setup-beam@8aa8a857c6be0daae6e97272bb299d5b942675a4 # v1.19.0
         id: beam
         with:
           version-file: .tool-versions
@@ -269,7 +269,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_RUNTIME }}
 
       - name: Build container
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           push: ${{ env.PUSH_IMAGE }}
           tags: ${{ steps.meta.outputs.tags }}

demo/config/config.exs

@@ -43,7 +43,7 @@ config :demo, DemoWeb.Endpoint,
 config :demo, Demo.Repo, migration_primary_key: [name: :id, type: :binary_id]
 
 config :esbuild,
-  version: "0.25.4",
+  version: "0.25.5",
   default: [
     args:
       ~w(assets/js/app.js --bundle --target=es2017 --outdir=priv/static/assets --external:/fonts/* --external:/images/* --alias:backpex=/opt/app),

demo/mix.lock

@@ -503,9 +503,9 @@ cssesc@^3.0.0:
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
 daisyui@^5.0.3:
-  version "5.0.35"
-  resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-5.0.35.tgz#2d73139b455b21b89960eb9ae019a3de78f388de"
-  integrity sha512-AWi11n/x5++mps55jcwrBf0Lmip1euWY0FYcH/05SFGmoqrU7S7/aIUWaiaeqlJ5EcmEZ/7zEY73aOxMv6hcIg==
+  version "5.0.38"
+  resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-5.0.38.tgz#52124b798011cfefff736fd3eebc5c8e569baf34"
+  integrity sha512-RsLsdePT/4ZU0N+vWivR/zJyAL9U9EeRtbis3K3VDvewrqY0NOFYBh6ib3n9GfN3Wb+FHwP80ae1qOA6ONWvyw==
 
 data-view-buffer@^1.0.2:
   version "1.0.2"

demo/yarn.lock

@@ -161,20 +161,23 @@ defmodule Backpex.Fields.HasMany do
                 {@prompt}
               </p>
 
-              <div :for={{label, value} <- @selected} class="badge badge-sm badge-primary pointer-events-auto pr-0">
+              <div
+                :for={{label, value} <- @selected}
+                class="badge badge-sm badge-soft badge-primary pointer-events-auto pr-0"
+              >
                 <span>{label}</span>
                 <label
                   class="flex cursor-pointer items-center pr-2"
                   role="button"
                   for={"has-many-#{@name}-checkbox-value-#{value}"}
                   aria-label={Backpex.__({"Unselect %{label}", %{label: label}}, @live_resource)}
                 >
-                  <Backpex.HTML.CoreComponents.icon name="hero-x-mark" class="text-primary-content size-4" />
+                  <Backpex.HTML.CoreComponents.icon name="hero-x-mark" class="size-4 scale-105 hover:scale-110" />
                 </label>
               </div>
             </div>
           </label>
-          <Form.error :for={msg <- @errors}>{msg}</Form.error>
+          <Form.error :for={msg <- @errors} class="mt-1">{msg}</Form.error>
           <div tabindex="0" class="dropdown-content z-[1] menu bg-base-100 rounded-box w-full overflow-y-auto shadow">
             <div class="max-h-72 p-2">
               <input

lib/backpex/fields/has_many.ex

@@ -128,16 +128,10 @@ defmodule Backpex.Fields.MultiSelect do
     ~H"""
     <div class={[@live_action in [:index, :resource_action] && "truncate"]}>
       {if @selected_labels == [], do: raw("&mdash;")}
-
-      <div class={["flex", @live_action == :show && "flex-wrap"]}>
-        <.intersperse :let={item} enum={@selected_labels}>
-          <:separator>
-            ,&nbsp;
-          </:separator>
-          <p>
-            {HTML.pretty_value(item)}
-          </p>
-        </.intersperse>
+      <div class="space-x-1">
+        <div :for={item <- @selected_labels} class="badge badge-sm badge-soft badge-primary">
+          <span>{HTML.pretty_value(item)}</span>
+        </div>
       </div>
     </div>
     """

lib/backpex/fields/multi_select.ex

@@ -282,7 +282,7 @@ defmodule Backpex.HTML.Form do
             {@prompt}
           </p>
 
-          <div :for={{label, value} <- @selected} class="badge badge-sm badge-primary pointer-events-auto pr-0">
+          <div :for={{label, value} <- @selected} class="badge badge-sm badge-soft badge-primary pointer-events-auto pr-0">
             {label}
             <div
               class="flex cursor-pointer items-center pr-2"
@@ -292,7 +292,7 @@ defmodule Backpex.HTML.Form do
               phx-target={@event_target}
               aria-label={Backpex.__({"Unselect %{label}", %{label: label}}, @live_resource)}
             >
-              <Backpex.HTML.CoreComponents.icon name="hero-x-mark" class="text-primary-content size-4 scale-110" />
+              <Backpex.HTML.CoreComponents.icon name="hero-x-mark" class="size-4 scale-105 hover:scale-110" />
             </div>
           </div>
         </div>