From 2a3a20faba951aa13604ada70c6b33506fa1907a Mon Sep 17 00:00:00 2001
From: woylie <13847569+woylie@users.noreply.github.com>
Date: Fri, 31 Jan 2025 22:04:07 +0900
Subject: [PATCH 1/3] remove show/hide attrs from col and action slots

---
 lib/flop_phoenix.ex        | 19 ---------
 lib/flop_phoenix/table.ex  |  8 ----
 test/flop_phoenix_test.exs | 82 +-------------------------------------
 3 files changed, 1 insertion(+), 108 deletions(-)

diff --git a/lib/flop_phoenix.ex b/lib/flop_phoenix.ex
index af022f9..bc48d0d 100644
--- a/lib/flop_phoenix.ex
+++ b/lib/flop_phoenix.ex
@@ -1063,18 +1063,6 @@ defmodule Flop.Phoenix do
       behavior for the column, i.e. `{:asc_nulls_last, :desc_nulls_first}`
       """
 
-    attr :show, :boolean,
-      doc: """
-      Boolean value to conditionally show the column. Defaults to `true`
-      Deprecated. Use `:if` instead.
-      """
-
-    attr :hide, :boolean,
-      doc: """
-      Boolean value to conditionally hide the column. Defaults to `false`.
-      Deprecated. Use `:if` instead.
-      """
-
     attr :col_style, :string,
       doc: """
       If set, a `<colgroup>` element is rendered and the value of the
@@ -1129,13 +1117,6 @@ defmodule Flop.Phoenix do
     """ do
     attr :label, :string, doc: "The content for the header column."
 
-    attr :show, :boolean,
-      doc: "Boolean value to conditionally show the column. Defaults to `true`."
-
-    attr :hide, :boolean,
-      doc:
-        "Boolean value to conditionally hide the column. Defaults to `false`."
-
     attr :col_style, :string,
       doc: """
       If set, a `<colgroup>` element is rendered and the value of the
diff --git a/lib/flop_phoenix/table.ex b/lib/flop_phoenix/table.ex
index 1e21d86..c9efe74 100644
--- a/lib/flop_phoenix/table.ex
+++ b/lib/flop_phoenix/table.ex
@@ -65,7 +65,6 @@ defmodule Flop.Phoenix.Table do
         <tr {@opts[:thead_tr_attrs]}>
           <.header_column
             :for={col <- @col}
-            :if={show_column?(col)}
             on_sort={@on_sort}
             event={@event}
             field={col[:field]}
@@ -88,7 +87,6 @@ defmodule Flop.Phoenix.Table do
           />
           <.header_column
             :for={action <- @action}
-            :if={show_column?(action)}
             event={@event}
             field={nil}
             label={action[:label]}
@@ -114,7 +112,6 @@ defmodule Flop.Phoenix.Table do
         >
           <td
             :for={col <- @col}
-            :if={show_column?(col)}
             {merge_td_attrs(@opts[:tbody_td_attrs], col, item)}
             phx-click={@row_click && @row_click.(item)}
           >
@@ -156,7 +153,6 @@ defmodule Flop.Phoenix.Table do
     <colgroup :if={Enum.any?(@col, &(&1[:col_style] || &1[:col_class]))}>
       <col
         :for={col <- @col}
-        :if={show_column?(col)}
         {reject_empty_values(style: col[:col_style], class: col[:col_class])}
       />
     </colgroup>
@@ -167,10 +163,6 @@ defmodule Flop.Phoenix.Table do
     Enum.reject(attrs, fn {_, v} -> v in ["", nil] end)
   end
 
-  defp show_column?(%{hide: true}), do: false
-  defp show_column?(%{show: false}), do: false
-  defp show_column?(_), do: true
-
   attr :meta, Flop.Meta, required: true
   attr :field, :atom, required: true
   attr :label, :any, required: true
diff --git a/test/flop_phoenix_test.exs b/test/flop_phoenix_test.exs
index b88b9fa..2ffbb45 100644
--- a/test/flop_phoenix_test.exs
+++ b/test/flop_phoenix_test.exs
@@ -24,8 +24,6 @@ defmodule Flop.PhoenixTest do
   attr :meta, Flop.Meta, default: %Flop.Meta{flop: %Flop{}}
   attr :opts, :list, default: []
   attr :target, :string, default: nil
-  attr :hide_age, :boolean, default: false
-  attr :show_age, :boolean, default: true
   attr :path, :any, default: {__MODULE__, :route_helper, @route_helper_opts}
 
   attr :items, :list,
@@ -48,9 +46,7 @@ defmodule Flop.PhoenixTest do
     >
       <:col :let={pet} label="Name" field={:name}>{pet.name}</:col>
       <:col :let={pet} label="Email" field={:email}>{pet.email}</:col>
-      <:col :let={pet} label="Age" hide={@hide_age} show={@show_age}>
-        {pet.age}
-      </:col>
+      <:col :let={pet} label="Age">{pet.age}</:col>
       <:col :let={pet} label="Species" field={:species}>{pet.species}</:col>
       <:col>column without label</:col>
     </Flop.Phoenix.table>
@@ -2101,82 +2097,6 @@ defmodule Flop.PhoenixTest do
       assert Floki.children(th, include_text: false) == []
     end
 
-    test "conditionally hides a column" do
-      html = render_table(%{})
-      assert find_one(html, "th:fl-contains('Age')")
-      assert find_one(html, "td:fl-contains('8')")
-
-      html = render_table(%{hide_age: false, show_age: true})
-      assert find_one(html, "th:fl-contains('Age')")
-      assert find_one(html, "td:fl-contains('8')")
-
-      html = render_table(%{hide_age: true, show_age: true})
-      assert [] = Floki.find(html, "th:fl-contains('Age')")
-      assert [] = Floki.find(html, "td:fl-contains('8')")
-
-      html = render_table(%{hide_age: false, show_age: false})
-      assert [] = Floki.find(html, "th:fl-contains('Age')")
-      assert [] = Floki.find(html, "td:fl-contains('8')")
-
-      html = render_table(%{hide_age: true, show_age: false})
-      assert [] = Floki.find(html, "th:fl-contains('Age')")
-      assert [] = Floki.find(html, "td:fl-contains('8')")
-    end
-
-    test "conditionally hides an action column" do
-      assigns = %{meta: %Flop.Meta{flop: %Flop{}}}
-
-      html =
-        parse_heex(~H"""
-        <Flop.Phoenix.table path="/pets" items={[%{}]} meta={@meta}>
-          <:col></:col>
-          <:action label="Buttons"><a href="#">Show Pet</a></:action>
-        </Flop.Phoenix.table>
-        """)
-
-      assert find_one(html, "th:fl-contains('Buttons')")
-
-      html =
-        parse_heex(~H"""
-        <Flop.Phoenix.table path="/pets" items={[%{}]} meta={@meta}>
-          <:col></:col>
-          <:action label="Buttons" show={true} hide={false}></:action>
-        </Flop.Phoenix.table>
-        """)
-
-      assert find_one(html, "th:fl-contains('Buttons')")
-
-      html =
-        parse_heex(~H"""
-        <Flop.Phoenix.table path="/pets" items={[%{}]} meta={@meta}>
-          <:col></:col>
-          <:action label="Buttons" show={true} hide={true}></:action>
-        </Flop.Phoenix.table>
-        """)
-
-      assert [] = Floki.find(html, "th:fl-contains('Buttons')")
-
-      html =
-        parse_heex(~H"""
-        <Flop.Phoenix.table path="/pets" items={[%{}]} meta={@meta}>
-          <:col></:col>
-          <:action label="Buttons" show={false} hide={true}></:action>
-        </Flop.Phoenix.table>
-        """)
-
-      assert [] = Floki.find(html, "th:fl-contains('Buttons')")
-
-      html =
-        parse_heex(~H"""
-        <Flop.Phoenix.table path="/pets" items={[%{}]} meta={@meta}>
-          <:col></:col>
-          <:action label="Buttons" show={false} hide={false}></:action>
-        </Flop.Phoenix.table>
-        """)
-
-      assert [] = Floki.find(html, "th:fl-contains('Buttons')")
-    end
-
     test "displays headers with sorting function" do
       html = render_table(%{})
 

From a230093bbaede4b2b56254a15ae0d5594eafed95 Mon Sep 17 00:00:00 2001
From: woylie <13847569+woylie@users.noreply.github.com>
Date: Fri, 31 Jan 2025 22:45:41 +0900
Subject: [PATCH 2/3] remove event attribute from table and pagination
 components

---
 lib/flop_phoenix.ex        |  69 ++----------
 lib/flop_phoenix/table.ex  |  16 +--
 test/flop_phoenix_test.exs | 215 +++++++++++++++++++++++--------------
 3 files changed, 145 insertions(+), 155 deletions(-)

diff --git a/lib/flop_phoenix.ex b/lib/flop_phoenix.ex
index bc48d0d..d32f059 100644
--- a/lib/flop_phoenix.ex
+++ b/lib/flop_phoenix.ex
@@ -124,8 +124,7 @@ defmodule Flop.Phoenix do
 
   You will need to handle the event in the `c:Phoenix.LiveView.handle_event/3`
   or `c:Phoenix.LiveComponent.handle_event/3` callback of your
-  LiveView or LiveComponent module. The event name will be the one you set with
-  the `:event` option.
+  LiveView or LiveComponent module.
 
       def handle_event("paginate-pets", %{"page" => page}, socket) do
         flop = Flop.set_page(socket.assigns.meta.flop, page)
@@ -380,7 +379,7 @@ defmodule Flop.Phoenix do
 
         <.pagination
           meta={@meta}
-          path={~"/pets"}
+          path={~p"/pets"}
           on_paginate={JS.dispatch("my_app:scroll_to", to: "#pet-table")}
         />
 
@@ -403,14 +402,6 @@ defmodule Flop.Phoenix do
     ```
     """
 
-  attr :event, :string,
-    default: nil,
-    doc: """
-    If set, `Flop.Phoenix` will render links with a `phx-click` attribute.
-    Alternatively, set `:path`, if you want the parameters to appear in the URL.
-    Deprecated in favor of `on_paginate`.
-    """
-
   attr :target, :string,
     default: nil,
     doc: """
@@ -428,7 +419,7 @@ defmodule Flop.Phoenix do
     described in the `Customization` section of the module documentation.
     """
 
-  def pagination(%{path: nil, on_paginate: nil, event: nil}) do
+  def pagination(%{path: nil, on_paginate: nil}) do
     raise Flop.Phoenix.PathOrJSError, component: :pagination
   end
 
@@ -452,7 +443,6 @@ defmodule Flop.Phoenix do
       <.pagination_link
         disabled={!@meta.has_previous_page?}
         disabled_class={@opts[:disabled_class]}
-        event={@event}
         target={@target}
         page={@meta.previous_page}
         path={@page_link_helper.(@meta.previous_page)}
@@ -464,7 +454,6 @@ defmodule Flop.Phoenix do
       <.pagination_link
         disabled={!@meta.has_next_page?}
         disabled_class={@opts[:disabled_class]}
-        event={@event}
         target={@target}
         page={@meta.next_page}
         path={@page_link_helper.(@meta.next_page)}
@@ -475,7 +464,6 @@ defmodule Flop.Phoenix do
       </.pagination_link>
       <.page_links
         :if={@opts[:page_links] != :hide}
-        event={@event}
         meta={@meta}
         on_paginate={@on_paginate}
         page_link_helper={@page_link_helper}
@@ -489,7 +477,6 @@ defmodule Flop.Phoenix do
   attr :meta, Flop.Meta, required: true
   attr :on_paginate, JS
   attr :page_link_helper, :any, required: true
-  attr :event, :string, required: true
   attr :target, :string, required: true
   attr :opts, :list, required: true
 
@@ -511,7 +498,6 @@ defmodule Flop.Phoenix do
     <ul {@opts[:pagination_list_attrs]}>
       <li :if={@first > 1} {@opts[:pagination_list_item_attrs]}>
         <.pagination_link
-          event={@event}
           target={@target}
           page={1}
           path={@page_link_helper.(1)}
@@ -528,7 +514,6 @@ defmodule Flop.Phoenix do
 
       <li :for={page <- @range} {@opts[:pagination_list_item_attrs]}>
         <.pagination_link
-          event={@event}
           target={@target}
           page={page}
           path={@page_link_helper.(page)}
@@ -545,7 +530,6 @@ defmodule Flop.Phoenix do
 
       <li :if={@last < @meta.total_pages} {@opts[:pagination_list_item_attrs]}>
         <.pagination_link
-          event={@event}
           target={@target}
           page={@meta.total_pages}
           path={@page_link_helper.(@meta.total_pages)}
@@ -561,7 +545,6 @@ defmodule Flop.Phoenix do
 
   attr :path, :string
   attr :on_paginate, JS
-  attr :event, :string, required: true
   attr :target, :string, required: true
   attr :page, :integer, required: true
   attr :disabled, :boolean, default: false
@@ -586,14 +569,6 @@ defmodule Flop.Phoenix do
     """
   end
 
-  defp pagination_link(%{event: event} = assigns) when is_binary(event) do
-    ~H"""
-    <.link phx-click={@event} phx-target={@target} phx-value-page={@page} {@rest}>
-      {render_slot(@inner_block)}
-    </.link>
-    """
-  end
-
   defp pagination_link(%{on_paginate: nil, path: path} = assigns)
        when is_binary(path) do
     ~H"""
@@ -728,7 +703,7 @@ defmodule Flop.Phoenix do
 
         <.cursor_pagination
           meta={@meta}
-          path={~"/pets"}
+          path={~p"/pets"}
           on_paginate={JS.dispatch("my_app:scroll_to", to: "#pet-table")}
         />
 
@@ -751,14 +726,6 @@ defmodule Flop.Phoenix do
     ```
     """
 
-  attr :event, :string,
-    default: nil,
-    doc: """
-    If set, `Flop.Phoenix` will render links with a `phx-click` attribute.
-    Alternatively, set `:path`, if you want the parameters to appear in the URL.
-    Deprecated. Use `on_paginate` instead.
-    """
-
   attr :target, :string,
     default: nil,
     doc: "Sets the `phx-target` attribute for the pagination links."
@@ -784,7 +751,7 @@ defmodule Flop.Phoenix do
     documentation.
     """
 
-  def cursor_pagination(%{path: nil, on_paginate: nil, event: nil}) do
+  def cursor_pagination(%{path: nil, on_paginate: nil}) do
     raise Flop.Phoenix.PathOrJSError, component: :cursor_pagination
   end
 
@@ -805,7 +772,6 @@ defmodule Flop.Phoenix do
         meta={@meta}
         path={@path}
         on_paginate={@on_paginate}
-        event={@event}
         target={@target}
         disabled={CursorPagination.disable?(@meta, :previous, @reverse)}
         disabled_class={@opts[:disabled_class]}
@@ -818,7 +784,6 @@ defmodule Flop.Phoenix do
         meta={@meta}
         path={@path}
         on_paginate={@on_paginate}
-        event={@event}
         target={@target}
         disabled={CursorPagination.disable?(@meta, :next, @reverse)}
         disabled_class={@opts[:disabled_class]}
@@ -834,7 +799,6 @@ defmodule Flop.Phoenix do
   attr :meta, Flop.Meta, required: true
   attr :path, :any, required: true
   attr :on_paginate, JS
-  attr :event, :string, required: true
   attr :target, :string, required: true
   attr :disabled, :boolean, default: false
   attr :disabled_class, :string, required: true
@@ -858,15 +822,6 @@ defmodule Flop.Phoenix do
     """
   end
 
-  defp cursor_pagination_link(%{event: event} = assigns)
-       when is_binary(event) do
-    ~H"""
-    <.link phx-click={@event} phx-target={@target} phx-value-to={@direction} {@rest}>
-      {render_slot(@inner_block)}
-    </.link>
-    """
-  end
-
   defp cursor_pagination_link(%{on_paginate: nil} = assigns) do
     ~H"""
     <.link
@@ -973,19 +928,11 @@ defmodule Flop.Phoenix do
 
         <.table
           meta={@meta}
-          path={~"/pets"}
+          path={~p"/pets"}
           on_sort={JS.dispatch("my_app:scroll_to", to: "#pet-table")}
         />
     """
 
-  attr :event, :string,
-    default: nil,
-    doc: """
-    If set, `Flop.Phoenix` will render links with a `phx-click` attribute.
-    Alternatively, set `:path`, if you want the parameters to appear in the URL.
-    Deprecated in favor of `on_sort`.
-    """
-
   attr :target, :string,
     default: nil,
     doc: "Sets the `phx-target` attribute for the header links."
@@ -1158,7 +1105,7 @@ defmodule Flop.Phoenix do
         </Flop.Phoenix.table>
     """
 
-  def table(%{path: nil, on_sort: nil, event: nil}) do
+  def table(%{path: nil, on_sort: nil}) do
     raise Flop.Phoenix.PathOrJSError, component: :table
   end
 
@@ -1179,7 +1126,6 @@ defmodule Flop.Phoenix do
             col={@col}
             foot={@foot}
             on_sort={@on_sort}
-            event={@event}
             id={@id}
             items={@items}
             meta={@meta}
@@ -1198,7 +1144,6 @@ defmodule Flop.Phoenix do
           col={@col}
           foot={@foot}
           on_sort={@on_sort}
-          event={@event}
           id={@id}
           items={@items}
           meta={@meta}
diff --git a/lib/flop_phoenix/table.ex b/lib/flop_phoenix/table.ex
index c9efe74..b2e32e5 100644
--- a/lib/flop_phoenix/table.ex
+++ b/lib/flop_phoenix/table.ex
@@ -39,7 +39,6 @@ defmodule Flop.Phoenix.Table do
   attr :meta, Flop.Meta, required: true
   attr :path, :any, required: true
   attr :on_sort, JS
-  attr :event, :string, required: true
   attr :target, :string, required: true
   attr :caption, :string, required: true
   attr :opts, :any, required: true
@@ -66,7 +65,6 @@ defmodule Flop.Phoenix.Table do
           <.header_column
             :for={col <- @col}
             on_sort={@on_sort}
-            event={@event}
             field={col[:field]}
             label={col[:label]}
             sortable={sortable?(col[:field], @meta.schema)}
@@ -87,7 +85,6 @@ defmodule Flop.Phoenix.Table do
           />
           <.header_column
             :for={action <- @action}
-            event={@event}
             field={nil}
             label={action[:label]}
             sortable={false}
@@ -96,7 +93,7 @@ defmodule Flop.Phoenix.Table do
               merge_attrs(@opts[:thead_th_attrs], action, :thead_th_attrs)
             }
             path={nil}
-            target={@event}
+            target={@target}
           />
         </tr>
       </thead>
@@ -168,7 +165,6 @@ defmodule Flop.Phoenix.Table do
   attr :label, :any, required: true
   attr :path, :any, required: true
   attr :on_sort, JS
-  attr :event, :string, required: true
   attr :target, :string, required: true
   attr :sortable, :boolean, required: true
   attr :thead_th_attrs, :list, required: true
@@ -204,7 +200,6 @@ defmodule Flop.Phoenix.Table do
         <.sort_link
           path={@sort_path}
           on_sort={@on_sort}
-          event={@event}
           field={@field}
           label={@label}
           target={@target}
@@ -263,17 +258,8 @@ defmodule Flop.Phoenix.Table do
   attr :label, :string, required: true
   attr :path, :string
   attr :on_sort, JS
-  attr :event, :string
   attr :target, :string
 
-  defp sort_link(%{event: event} = assigns) when is_binary(event) do
-    ~H"""
-    <.link phx-click={@event} phx-target={@target} phx-value-order={@field}>
-      {@label}
-    </.link>
-    """
-  end
-
   defp sort_link(%{on_sort: nil, path: path} = assigns)
        when is_binary(path) do
     ~H"""
diff --git a/test/flop_phoenix_test.exs b/test/flop_phoenix_test.exs
index 2ffbb45..9c082ae 100644
--- a/test/flop_phoenix_test.exs
+++ b/test/flop_phoenix_test.exs
@@ -19,7 +19,6 @@ defmodule Flop.PhoenixTest do
 
   attr :caption, :string, default: nil
   attr :on_sort, JS, default: nil
-  attr :event, :string, default: nil
   attr :id, :string, default: "some-table"
   attr :meta, Flop.Meta, default: %Flop.Meta{flop: %Flop{}}
   attr :opts, :list, default: []
@@ -36,7 +35,6 @@ defmodule Flop.PhoenixTest do
     <Flop.Phoenix.table
       caption={@caption}
       on_sort={@on_sort}
-      event={@event}
       id={@id}
       items={@items}
       meta={@meta}
@@ -69,7 +67,7 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} on_paginate={%JS{}} />
+        <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       nav = find_one(html, "nav:root")
@@ -83,7 +81,7 @@ defmodule Flop.PhoenixTest do
       assigns = %{meta: build(:meta_one_page)}
 
       assert parse_heex(~H"""
-             <Flop.Phoenix.pagination meta={@meta} on_paginate={%JS{}} />
+             <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
              """) == []
     end
 
@@ -91,7 +89,7 @@ defmodule Flop.PhoenixTest do
       assigns = %{meta: build(:meta_no_results)}
 
       assert parse_heex(~H"""
-             <Flop.Phoenix.pagination meta={@meta} on_paginate={%JS{}} />
+             <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
              """) == []
     end
 
@@ -100,7 +98,7 @@ defmodule Flop.PhoenixTest do
 
       assert_raise Flop.Phoenix.IncorrectPaginationTypeError, fn ->
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} on_paginate={%JS{}} />
+        <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
       end
     end
@@ -112,7 +110,7 @@ defmodule Flop.PhoenixTest do
         parse_heex(~H"""
         <Flop.Phoenix.pagination
           meta={@meta}
-          on_paginate={%JS{}}
+          on_paginate={JS.push("paginate")}
           opts={[wrapper_attrs: [class: "boo"]]}
         />
         """)
@@ -131,7 +129,7 @@ defmodule Flop.PhoenixTest do
         parse_heex(~H"""
         <Flop.Phoenix.pagination
           meta={@meta}
-          on_paginate={%JS{}}
+          on_paginate={JS.push("paginate")}
           opts={[wrapper_attrs: [title: "paginate"]]}
         />
         """)
@@ -244,18 +242,18 @@ defmodule Flop.PhoenixTest do
       assert attribute(a, "href") == "/pets?page_size=10"
     end
 
-    test "renders previous link when using click event handling" do
+    test "renders previous link when using on_paginate" do
       assigns = %{meta: build(:meta_on_second_page)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert a = find_one(html, "a:fl-contains('Previous')")
 
       assert attribute(a, "class") == "pagination-previous"
-      assert attribute(a, "phx-click") == "paginate"
+      assert attribute(a, "phx-click") == ~s|[["push",{"event":"paginate"}]]|
       assert attribute(a, "phx-value-page") == "1"
       assert attribute(a, "href") == "#"
     end
@@ -265,7 +263,11 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} event="paginate" target="here" />
+        <Flop.Phoenix.pagination
+          meta={@meta}
+          on_paginate={JS.push("paginate")}
+          target="here"
+        />
         """)
 
       assert a = find_one(html, "a:fl-contains('Previous')")
@@ -352,12 +354,12 @@ defmodule Flop.PhoenixTest do
                "pagination-previous disabled"
     end
 
-    test "disables previous link if on first page when using click handlers" do
+    test "disables previous link if on first page when using on_paginate" do
       assigns = %{meta: build(:meta_on_first_page)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert previous_link = find_one(html, "span:fl-contains('Previous')")
@@ -405,18 +407,21 @@ defmodule Flop.PhoenixTest do
       assert_urls_match(href, "/pets?page=3&page_size=10")
     end
 
-    test "renders next link when using click event handling" do
+    test "renders next link when using on_paginate" do
       assigns = %{meta: build(:meta_on_second_page)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert link = find_one(html, "a:fl-contains('Next')")
 
       assert attribute(link, "class") == "pagination-next"
-      assert attribute(link, "phx-click") == "paginate"
+
+      assert attribute(link, "phx-click") ==
+               ~s|[[\"push\",{\"event\":\"paginate\"}]]|
+
       assert attribute(link, "phx-value-page") == "3"
       assert attribute(link, "href") == "#"
     end
@@ -426,7 +431,11 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} event="paginate" target="here" />
+        <Flop.Phoenix.pagination
+          meta={@meta}
+          on_paginate={JS.push("paginate")}
+          target="here"
+        />
         """)
 
       assert link = find_one(html, "a:fl-contains('Next')")
@@ -471,12 +480,12 @@ defmodule Flop.PhoenixTest do
       assert attribute(next, "href") == nil
     end
 
-    test "renders next link on last page when using click event handling" do
+    test "renders next link on last page when using on_paginate" do
       assigns = %{meta: build(:meta_on_last_page)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert next = find_one(html, "span:fl-contains('Next')")
@@ -538,17 +547,17 @@ defmodule Flop.PhoenixTest do
       assert text(link) == "3"
     end
 
-    test "renders page links when using click event handling" do
+    test "renders page links when using on_paginate" do
       assigns = %{meta: build(:meta_on_second_page)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert link = find_one(html, "li a[aria-label='Go to page 1']")
       assert attribute(link, "href") == "#"
-      assert attribute(link, "phx-click") == "paginate"
+      assert attribute(link, "phx-click") == ~s|[["push",{"event":"paginate"}]]|
       assert attribute(link, "phx-value-page") == "1"
       assert text(link) =~ "1"
     end
@@ -558,7 +567,11 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} event="paginate" target="here" />
+        <Flop.Phoenix.pagination
+          meta={@meta}
+          on_paginate={JS.push("paginate")}
+          target="here"
+        />
         """)
 
       assert link = find_one(html, "li a[aria-label='Go to page 1']")
@@ -576,14 +589,14 @@ defmodule Flop.PhoenixTest do
       assert Floki.find(html, ".pagination-links") == []
     end
 
-    test "doesn't render pagination links if set to hide when passing event" do
+    test "doesn't render pagination links if set to hide with on_paginate" do
       assigns = %{meta: build(:meta_on_second_page)}
 
       html =
         parse_heex(~H"""
         <Flop.Phoenix.pagination
           meta={@meta}
-          event="paginate"
+          on_paginate={JS.push("paginate")}
           opts={[page_links: :hide]}
         />
         """)
@@ -784,22 +797,22 @@ defmodule Flop.PhoenixTest do
       refute href =~ "order_directions[]="
     end
 
-    test "does not require path when passing event" do
+    test "does not require path when passing on_paginate" do
       assigns = %{meta: build(:meta_on_second_page)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert link = find_one(html, "a:fl-contains('Previous')")
       assert attribute(link, "class") == "pagination-previous"
-      assert attribute(link, "phx-click") == "paginate"
+      assert attribute(link, "phx-click") == ~s|[["push",{"event":"paginate"}]]|
       assert attribute(link, "phx-value-page") == "1"
       assert attribute(link, "href") == "#"
     end
 
-    test "raises if neither path nor event nor on_paginate are passed" do
+    test "raises if neither path nor on_paginate are passed" do
       assigns = %{meta: build(:meta_on_second_page)}
 
       assert_raise Flop.Phoenix.PathOrJSError,
@@ -1150,7 +1163,7 @@ defmodule Flop.PhoenixTest do
 
       assert_raise Flop.Phoenix.IncorrectPaginationTypeError, fn ->
         parse_heex(~H"""
-        <Flop.Phoenix.cursor_pagination meta={@meta} on_paginate={%JS{}} />
+        <Flop.Phoenix.cursor_pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
       end
     end
@@ -1291,17 +1304,17 @@ defmodule Flop.PhoenixTest do
       assert_urls_match(href, "/pets?before=B&last=10")
     end
 
-    test "renders previous link when using click event handling" do
+    test "renders previous link when using on_paginate" do
       assigns = %{meta: build(:meta_with_cursors)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.cursor_pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.cursor_pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert link = find_one(html, "a:fl-contains('Previous')")
       assert attribute(link, "class") == "pagination-previous"
-      assert attribute(link, "phx-click") == "paginate"
+      assert attribute(link, "phx-click") == ~s|[["push",{"event":"paginate"}]]|
       assert attribute(link, "phx-value-to") == "previous"
       assert attribute(link, "href") == "#"
     end
@@ -1311,7 +1324,11 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.cursor_pagination meta={@meta} event="paginate" target="here" />
+        <Flop.Phoenix.cursor_pagination
+          meta={@meta}
+          on_paginate={JS.push("paginate")}
+          target="here"
+        />
         """)
 
       assert link = find_one(html, "a:fl-contains('Previous')")
@@ -1409,12 +1426,12 @@ defmodule Flop.PhoenixTest do
                "pagination-previous disabled"
     end
 
-    test "disables previous link if on first page when using click handlers" do
+    test "disables previous link if on first page when using on_paginate" do
       assigns = %{meta: build(:meta_with_cursors, has_previous_page?: false)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.cursor_pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.cursor_pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert previous_link = find_one(html, "span:fl-contains('Previous')")
@@ -1430,7 +1447,7 @@ defmodule Flop.PhoenixTest do
         parse_heex(~H"""
         <Flop.Phoenix.cursor_pagination
           meta={@meta}
-          event="paginate"
+          on_paginate={JS.push("paginate")}
           opts={[
             previous_link_attrs: [class: "prev", title: "no"],
             previous_link_content: "Prev"
@@ -1460,17 +1477,18 @@ defmodule Flop.PhoenixTest do
       assert_urls_match(href, "/pets?first=10&after=C")
     end
 
-    test "renders next link when using click event handling" do
+    test "renders next link when using on_paginate" do
       assigns = %{meta: build(:meta_with_cursors)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.cursor_pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.cursor_pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert link = find_one(html, "a:fl-contains('Next')")
       assert attribute(link, "class") == "pagination-next"
-      assert attribute(link, "phx-click") == "paginate"
+
+      assert attribute(link, "phx-click") == ~s|[["push",{"event":"paginate"}]]|
       assert attribute(link, "phx-value-to") == "next"
       assert attribute(link, "href") == "#"
     end
@@ -1480,7 +1498,11 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.cursor_pagination meta={@meta} event="paginate" target="here" />
+        <Flop.Phoenix.cursor_pagination
+          meta={@meta}
+          on_paginate={JS.push("paginate")}
+          target="here"
+        />
         """)
 
       assert link = find_one(html, "a:fl-contains('Next')")
@@ -1526,12 +1548,12 @@ defmodule Flop.PhoenixTest do
       assert attribute(next, "href") == nil
     end
 
-    test "renders next link on last page when using click event handling" do
+    test "renders next link on last page when using on_paginate" do
       assigns = %{meta: build(:meta_with_cursors, has_next_page?: false)}
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.cursor_pagination meta={@meta} event="paginate" />
+        <Flop.Phoenix.cursor_pagination meta={@meta} on_paginate={JS.push("paginate")} />
         """)
 
       assert next = find_one(html, "span:fl-contains('Next')")
@@ -1546,7 +1568,7 @@ defmodule Flop.PhoenixTest do
         parse_heex(~H"""
         <Flop.Phoenix.cursor_pagination
           meta={@meta}
-          event="paginate"
+          on_paginate={JS.push("paginate")}
           opts={[
             next_link_attrs: [class: "next", title: "no"],
             next_link_content: "N-n-next"
@@ -1648,13 +1670,12 @@ defmodule Flop.PhoenixTest do
     test "sets default ID based on schema module" do
       assigns = %{
         meta: %Flop.Meta{flop: %Flop{}, schema: MyApp.Pet},
-        event: "sort-table",
         items: ["George"]
       }
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} event="sort">
+        <Flop.Phoenix.table items={@items} meta={@meta} on_sort={JS.push("sort")}>
           <:col></:col>
         </Flop.Phoenix.table>
         """)
@@ -1672,7 +1693,7 @@ defmodule Flop.PhoenixTest do
           items={["George"]}
           meta={%Flop.Meta{flop: %Flop{}}}
           opts={[container: true]}
-          event="sort"
+          on_sort={JS.push("sort")}
         >
           <:col></:col>
         </Flop.Phoenix.table>
@@ -1686,13 +1707,12 @@ defmodule Flop.PhoenixTest do
     test "does not set row ID if items are not a stream" do
       assigns = %{
         meta: %Flop.Meta{flop: %Flop{}, schema: MyApp.Pet},
-        event: "sort-table",
         items: ["George"]
       }
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} event="sort">
+        <Flop.Phoenix.table items={@items} meta={@meta} on_sort={JS.push("sort")}>
           <:col></:col>
         </Flop.Phoenix.table>
         """)
@@ -1704,14 +1724,18 @@ defmodule Flop.PhoenixTest do
     test "allows to set row ID function" do
       assigns = %{
         meta: %Flop.Meta{flop: %Flop{}, schema: MyApp.Pet},
-        event: "sort-table",
         items: [%Pet{id: 1, name: "George"}, %Pet{id: 2, name: "Mary"}],
         row_id: &"pets-#{&1.name}"
       }
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} row_id={@row_id} event="sort">
+        <Flop.Phoenix.table
+          items={@items}
+          meta={@meta}
+          row_id={@row_id}
+          on_sort={JS.push("sort")}
+        >
           <:col></:col>
         </Flop.Phoenix.table>
         """)
@@ -1729,7 +1753,7 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@stream} meta={@meta} event="sort">
+        <Flop.Phoenix.table items={@stream} meta={@meta} on_sort={JS.push("sort")}>
           <:col></:col>
         </Flop.Phoenix.table>
         """)
@@ -1752,7 +1776,7 @@ defmodule Flop.PhoenixTest do
           items={@items}
           meta={@meta}
           row_item={@row_item}
-          event="sort"
+          on_sort={JS.push("sort")}
         >
           <:col :let={p}>{p.name}</:col>
         </Flop.Phoenix.table>
@@ -1851,7 +1875,7 @@ defmodule Flop.PhoenixTest do
             %{name: "Bart Harley-Jarvis", age: 1}
           ]}
           meta={%Flop.Meta{flop: %Flop{}}}
-          on_sort={%JS{}}
+          on_sort={JS.push("sort")}
         >
           <:col :let={u} label="Name">{u.name}</:col>
           <:action label="Buttons" tbody_td_attrs={@attrs_fun}>some action</:action>
@@ -1944,7 +1968,12 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} on_sort={%JS{}} opts={@opts}>
+        <Flop.Phoenix.table
+          items={@items}
+          meta={@meta}
+          on_sort={JS.push("sort")}
+          opts={@opts}
+        >
           <:col :let={i} thead_th_attrs={[class: "name-th-class"]}>{i.name}</:col>
           <:col :let={i}>{i.age}</:col>
         </Flop.Phoenix.table>
@@ -1966,7 +1995,12 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} on_sort={%JS{}} opts={@opts}>
+        <Flop.Phoenix.table
+          items={@items}
+          meta={@meta}
+          on_sort={JS.push("sort")}
+          opts={@opts}
+        >
           <:col :let={i} field={:name}>{i.name}</:col>
           <:col :let={i}>{i.age}</:col>
         </Flop.Phoenix.table>
@@ -1985,7 +2019,12 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} on_sort={%JS{}} opts={@opts}>
+        <Flop.Phoenix.table
+          items={@items}
+          meta={@meta}
+          on_sort={JS.push("sort")}
+          opts={@opts}
+        >
           <:col
             :let={i}
             field={:name}
@@ -2013,7 +2052,12 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} on_sort={%JS{}} opts={@opts}>
+        <Flop.Phoenix.table
+          items={@items}
+          meta={@meta}
+          on_sort={JS.push("sort")}
+          opts={@opts}
+        >
           <:col :let={i} tbody_td_attrs={[class: "name-td-class"]}>{i.name}</:col>
           <:col :let={i}>{i.age}</:col>
         </Flop.Phoenix.table>
@@ -2035,7 +2079,12 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} on_sort={%JS{}} opts={@opts}>
+        <Flop.Phoenix.table
+          items={@items}
+          meta={@meta}
+          on_sort={JS.push("sort")}
+          opts={@opts}
+        >
           <:col :let={i}>{i.name}</:col>
           <:action thead_th_attrs={[class: "action-1-th-class"]}>action 1</:action>
           <:action>action 2</:action>
@@ -2058,7 +2107,12 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} on_sort={%JS{}} opts={@opts}>
+        <Flop.Phoenix.table
+          items={@items}
+          meta={@meta}
+          on_sort={JS.push("sort")}
+          opts={@opts}
+        >
           <:col :let={i}>{i.name}</:col>
           <:action tbody_td_attrs={[class: "action-1-td-class"]}>action 1</:action>
           <:action>action 2</:action>
@@ -2217,7 +2271,7 @@ defmodule Flop.PhoenixTest do
       html =
         parse_heex(~H"""
         <Flop.Phoenix.table
-          event="sort"
+          on_sort={JS.push("sort")}
           id="user-table"
           items={[%{name: "George"}]}
           meta={%Flop.Meta{flop: %Flop{}}}
@@ -2242,7 +2296,7 @@ defmodule Flop.PhoenixTest do
         parse_heex(~H"""
         <Flop.Phoenix.table
           id="user-table"
-          event="sort"
+          on_sort={JS.push("sort")}
           items={[%{name: "George"}]}
           meta={%Flop.Meta{flop: %Flop{}}}
         >
@@ -2303,26 +2357,26 @@ defmodule Flop.PhoenixTest do
       assert attribute(th_species, "aria-sort") == nil
     end
 
-    test "renders links with click handler" do
-      html = render_table(%{event: "sort", path: nil})
+    test "renders links with on_sort" do
+      html = render_table(%{on_sort: JS.push("sort"), path: nil})
 
       assert a = find_one(html, "th a:fl-contains('Name')")
       assert attribute(a, "href") == "#"
-      assert attribute(a, "phx-click") == "sort"
+      assert attribute(a, "phx-click") == ~s|[["push",{"event":"sort"}]]|
       assert attribute(a, "phx-value-order") == "name"
 
       assert a = find_one(html, "th a:fl-contains('Email')")
       assert attribute(a, "href") == "#"
-      assert attribute(a, "phx-click") == "sort"
+      assert attribute(a, "phx-click") == ~s|[["push",{"event":"sort"}]]|
       assert attribute(a, "phx-value-order") == "email"
     end
 
     test "adds phx-target to header links" do
-      html = render_table(%{event: "sort", path: nil, target: "here"})
+      html =
+        render_table(%{on_sort: JS.push("sort"), path: nil, target: "here"})
 
       assert a = find_one(html, "th a:fl-contains('Name')")
       assert attribute(a, "href") == "#"
-      assert attribute(a, "phx-click") == "sort"
       assert attribute(a, "phx-target") == "here"
       assert attribute(a, "phx-value-order") == "name"
     end
@@ -2506,7 +2560,7 @@ defmodule Flop.PhoenixTest do
       html =
         parse_heex(~H"""
         <Flop.Phoenix.table
-          event="sort"
+          on_sort={JS.push("sort")}
           id="user-table"
           items={[%{name: "George", id: 1}]}
           meta={%Flop.Meta{flop: %Flop{}}}
@@ -2591,7 +2645,7 @@ defmodule Flop.PhoenixTest do
       html =
         parse_heex(~H"""
         <Flop.Phoenix.table
-          event="sort"
+          on_sort={JS.push("sort")}
           id="user-table"
           items={[%{name: "George"}]}
           meta={%Flop.Meta{flop: %Flop{}}}
@@ -2621,7 +2675,7 @@ defmodule Flop.PhoenixTest do
       html =
         parse_heex(~H"""
         <Flop.Phoenix.table
-          event="sort"
+          on_sort={JS.push("sort")}
           id="user-table"
           items={[%{name: "George", surname: "Floyd", age: 8}]}
           meta={%Flop.Meta{flop: %Flop{}}}
@@ -2683,7 +2737,7 @@ defmodule Flop.PhoenixTest do
       html =
         parse_heex(~H"""
         <Flop.Phoenix.table
-          event="sort"
+          on_sort={JS.push("sort")}
           id="user-table"
           items={[%{name: "George", id: 1}]}
           meta={%Flop.Meta{flop: %Flop{}}}
@@ -2753,15 +2807,15 @@ defmodule Flop.PhoenixTest do
              ] = html
     end
 
-    test "does not require path when passing event" do
-      html = render_table(%{event: "sort-table", path: nil})
+    test "does not require path when passing on_sort" do
+      html = render_table(%{on_sort: JS.push("sort"), path: nil})
 
       assert link = find_one(html, "a:fl-contains('Name')")
-      assert attribute(link, "phx-click") == "sort-table"
+      assert attribute(link, "phx-click") == ~s|[["push",{"event":"sort"}]]|
       assert attribute(link, "href") == "#"
     end
 
-    test "raises if neither path nor event are passed" do
+    test "raises if neither path nor on_sort are passed" do
       assert_raise Flop.Phoenix.PathOrJSError,
                    fn ->
                      render_component(&table/1,
@@ -2967,7 +3021,12 @@ defmodule Flop.PhoenixTest do
 
       html =
         parse_heex(~H"""
-        <Flop.Phoenix.table items={@items} meta={@meta} on_sort={%JS{}} opts={@opts}>
+        <Flop.Phoenix.table
+          items={@items}
+          meta={@meta}
+          on_sort={JS.push("sort")}
+          opts={@opts}
+        >
           <:col :let={i} label={@thead_label_component.(%{})}>
             {i.name}
           </:col>

From 7b237720d8e781991c17707edd9059c3aa8c6278 Mon Sep 17 00:00:00 2001
From: woylie <13847569+woylie@users.noreply.github.com>
Date: Fri, 31 Jan 2025 22:49:23 +0900
Subject: [PATCH 3/3] update changelog

---
 CHANGELOG.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b576400..ab230ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,16 @@
 - Removed `input_type/3` from the `Phoenix.HTML.FormData` protocol
   implementation for `Flop.Meta`, as the function has been removed from the
   protocol.
+- Removed the previously deprecated `:event` attribute from the
+  `Flop.Phoenix.pagination/1`, `Flop.Phoenix.cursor_pagination`, and
+  `Flop.Phoenix.table/1` components. Use `:on_paginate` and `:on_sort` instead.
+- Removed the previously deprecated `:hide` and `:show` attributes from the
+  `:col` and `:action` slots of the `Flop.Phoenix.table/1` component. Use the
+  `:if` attribute instead.
+
+### Fixed
+
+- Fixed a warning about ranges in Elixir 1.18.
 
 ## [0.23.1] - 2024-10-17
 
@@ -128,7 +138,7 @@
   component to `tbody_td_attrs` in order to match the naming of the global
   table options.
 
-### Upgrade guide
+### How to upgrade
 
 Rename the `attrs` attribute to `tbody_td_attrs` in both the `col` slot and the
 `action` slot: