Reuse DOM elements when replacing frame outputs (#881)

* Reuse DOM elements when replacing frame outputs

* Keep less persistent indices
This commit is contained in:
Jonatan Kłosko 2022-01-18 15:13:50 +01:00 committed by GitHub
parent 6e570ed05b
commit 89ca95be10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 8 deletions

View file

@ -9,7 +9,7 @@ defmodule LivebookWeb.Output do
def outputs(assigns) do
~H"""
<%= for {idx, output} <- Enum.reverse(@outputs) do %>
<div class="max-w-full" id={"output-wrapper-#{idx}"}
<div class="max-w-full" id={"output-wrapper-#{@dom_id_map[idx] || idx}"}
data-element="output"
data-border={border?(output)}
data-wrapper={wrapper?(output)}>

View file

@ -3,7 +3,7 @@ defmodule LivebookWeb.Output.FrameComponent do
@impl true
def mount(socket) do
{:ok, assign(socket, counter: 0, empty: true)}
{:ok, assign(socket, counter: 0, output_count: 0, persistent_idx_map: %{})}
end
@impl true
@ -15,7 +15,11 @@ defmodule LivebookWeb.Output.FrameComponent do
socket =
if socket.assigns.counter == 0 do
assign(socket, empty: outputs == [], counter: 1)
assign(socket,
counter: 1,
output_count: length(outputs),
persistent_idx_map: idx_map(outputs)
)
else
socket
end
@ -26,24 +30,50 @@ defmodule LivebookWeb.Output.FrameComponent do
assign(socket, outputs: outputs)
:replace ->
socket
|> assign(outputs: outputs, empty: outputs == [])
|> update(:counter, &(&1 + 1))
prev_output_count = socket.assigns.output_count
prev_persistent_idx_map = socket.assigns.persistent_idx_map
output_count = length(outputs)
persistent_idx_map = idx_map(outputs)
socket =
assign(socket,
outputs: outputs,
output_count: output_count,
persistent_idx_map: persistent_idx_map
)
less_outputs? = prev_output_count > output_count
appended_outputs? = prev_output_count > map_size(prev_persistent_idx_map)
# If there are outputs that we need to remove, increase the counter.
# Otherwise we reuse DOM element ids via persistent_idx_map
if less_outputs? or appended_outputs? do
update(socket, :counter, &(&1 + 1))
else
socket
end
:append ->
socket
|> assign(empty: false)
|> update(:outputs, &(outputs ++ &1))
|> update(:output_count, &(length(outputs) + &1))
end
{:ok, socket}
end
defp idx_map(outputs) do
outputs
|> Enum.with_index()
|> Map.new(fn {{output_idx, _}, idx} -> {output_idx, idx} end)
end
@impl true
def render(assigns) do
~H"""
<div id={"frame-output-#{@id}"}>
<%= if @empty do %>
<%= if @output_count == 0 do %>
<div class="text-gray-300 p-4 rounded-lg border border-gray-200">
Empty output frame
</div>
@ -51,6 +81,7 @@ defmodule LivebookWeb.Output.FrameComponent do
<div id={"frame-outputs-#{@id}-#{@counter}"} phx-update="append">
<LivebookWeb.Output.outputs
outputs={@outputs}
dom_id_map={@persistent_idx_map}
socket={@socket}
session_id={@session_id}
input_values={@input_values}

View file

@ -142,6 +142,7 @@ defmodule LivebookWeb.SessionLive.CellComponent do
phx-update="append">
<LivebookWeb.Output.outputs
outputs={@cell_view.outputs}
dom_id_map={%{}}
socket={@socket}
session_id={@session_id}
runtime={@runtime}