Merge pull request #279 from woylie/fix/missing-li

fix/missing li
woylie · Oct 19, 2023 · 827ad51 · 827ad51
2 parents 797d9a6 + 65458e0
commit 827ad51
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## [0.22.2] - 2023-10-19
+
+### Fixed
+
+- Numbered pagination links were not wrapped in `li` elements.
+
 ## [0.22.1] - 2023-09-28
 
 ### Changed

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ application.
 ```elixir
 def deps do
   [
-    {:flop_phoenix, "~> 0.22.1"}
+    {:flop_phoenix, "~> 0.22.2"}
   ]
 end
 ```

diff --git a/lib/flop_phoenix.ex b/lib/flop_phoenix.ex
@@ -503,17 +503,18 @@ defmodule Flop.Phoenix do
         <span {@opts[:ellipsis_attrs]}><%= @opts[:ellipsis_content] %></span>
       </li>
 
-      <.pagination_link
-        :for={page <- @range}
-        event={@event}
-        target={@target}
-        page={page}
-        path={@page_link_helper.(page)}
-        on_paginate={@on_paginate}
-        {Pagination.attrs_for_page_link(page, @meta, @opts)}
-      >
-        <%= page %>
-      </.pagination_link>
+      <li :for={page <- @range}>
+        <.pagination_link
+          event={@event}
+          target={@target}
+          page={page}
+          path={@page_link_helper.(page)}
+          on_paginate={@on_paginate}
+          {Pagination.attrs_for_page_link(page, @meta, @opts)}
+        >
+          <%= page %>
+        </.pagination_link>
+      </li>
 
       <li :if={@last < @meta.total_pages - 1}>
         <span {@opts[:ellipsis_attrs]}><%= @opts[:ellipsis_content] %></span>

diff --git a/mix.exs b/mix.exs
@@ -2,7 +2,7 @@ defmodule FlopPhoenix.MixProject do
   use Mix.Project
 
   @source_url "https://github.com/woylie/flop_phoenix"
-  @version "0.22.1"
+  @version "0.22.2"
 
   def project do
     [

diff --git a/test/flop_phoenix_test.exs b/test/flop_phoenix_test.exs
@@ -512,22 +512,22 @@ defmodule Flop.PhoenixTest do
 
       assert [_] = Floki.find(html, "ul[class='pagination-links']")
 
-      assert [link] = Floki.find(html, "a[aria-label='Go to page 1']")
+      assert [link] = Floki.find(html, "li a[aria-label='Go to page 1']")
       assert Floki.attribute(link, "class") == ["pagination-link"]
       assert Floki.attribute(link, "data-phx-link") == ["patch"]
       assert Floki.attribute(link, "data-phx-link-state") == ["push"]
       assert Floki.attribute(link, "href") == ["/pets?page_size=10"]
       assert String.trim(Floki.text(link)) == "1"
 
-      assert [link] = Floki.find(html, "a[aria-label='Go to page 2']")
+      assert [link] = Floki.find(html, "li a[aria-label='Go to page 2']")
       assert Floki.attribute(link, "class") == ["pagination-link is-current"]
       assert Floki.attribute(link, "data-phx-link") == ["patch"]
       assert Floki.attribute(link, "data-phx-link-state") == ["push"]
       assert [href] = Floki.attribute(link, "href")
       assert_urls_match(href, "/pets?page=2&page_size=10")
       assert String.trim(Floki.text(link)) == "2"
 
-      assert [link] = Floki.find(html, "a[aria-label='Go to page 3']")
+      assert [link] = Floki.find(html, "li a[aria-label='Go to page 3']")
       assert Floki.attribute(link, "class") == ["pagination-link"]
       assert Floki.attribute(link, "data-phx-link") == ["patch"]
       assert Floki.attribute(link, "data-phx-link-state") == ["push"]