merge stream config into opts

SteffenDE · Jan 23, 2024 · d4bc58a · d4bc58a
1 parent ce4b303
commit d4bc58a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/phoenix_live_view.ex b/lib/phoenix_live_view.ex
@@ -1820,7 +1820,8 @@ defmodule Phoenix.LiveView do
         Enum.reduce(items, new_socket, fn item, acc -> stream_insert(acc, name, item, opts) end)
 
       %{} ->
-        config = get_in(streams, [:__configured__, name]) || opts
+        config = get_in(streams, [:__configured__, name]) || []
+        opts = Keyword.merge(opts, config)
 
         ref =
           if cid = socket.assigns[:myself] do
@@ -1829,7 +1830,7 @@ defmodule Phoenix.LiveView do
             to_string(streams.__ref__)
           end
 
-        stream = LiveStream.new(name, ref, items, config)
+        stream = LiveStream.new(name, ref, items, opts)
 
         socket
         |> Phoenix.Component.update(:streams, fn streams ->

diff --git a/test/support/live_views/streams.ex b/test/support/live_views/streams.ex
@@ -438,6 +438,8 @@ defmodule Phoenix.LiveViewTest.StreamLimitLive do
   # see https://github.com/phoenixframework/phoenix_live_view/issues/2686
 
   def mount(_params, _session, socket) do
+    socket = stream_configure(socket, :items, [])
+
     {:noreply, socket} = handle_event("configure", %{"at" => "-1", "limit" => "-5"}, socket)
     {:ok, socket}
   end