Add support for grid output max height (#2846)

lib/livebook/runtime.ex

@@ -265,6 +265,7 @@ defprotocol Livebook.Runtime do
           outputs: list(t()),
           columns: pos_integer() | tuple(),
           gap: non_neg_integer(),
+          max_height: pos_integer() | nil,
           boxed: boolean()
         }
 

lib/livebook/session.ex

@@ -3100,16 +3100,21 @@ defmodule Livebook.Session do
 
   # Traverse composite outputs
 
-  # defp normalize_runtime_output(output) when output.type in [:frame, :tabs, :grid] do
+  defp normalize_runtime_output(%{type: :grid} = grid) do
-  #   outputs = Enum.map(output.outputs, &normalize_runtime_output/1)
+    grid
-  #   %{output | outputs: outputs}
+    |> Map.update!(:outputs, fn outputs -> Enum.map(outputs, &normalize_runtime_output/1) end)
-  # end
+    |> Map.put_new(:max_height, nil)
+  end
 
-  # defp normalize_runtime_output(%{type: :frame_update} = output) do
+  defp normalize_runtime_output(%{type: type} = output) when type in [:frame, :tabs] do
-  #   {update_type, new_outputs} = output.update
+    Map.update!(output, :outputs, fn outputs -> Enum.map(outputs, &normalize_runtime_output/1) end)
-  #   new_outputs = Enum.map(new_outputs, &normalize_runtime_output/1)
+  end
-  #   %{output | update: {update_type, new_outputs}}
+
-  # end
+  defp normalize_runtime_output(%{type: :frame_update} = output) do
+    {update_type, new_outputs} = output.update
+    new_outputs = Enum.map(new_outputs, &normalize_runtime_output/1)
+    %{output | update: {update_type, new_outputs}}
+  end
 
   defp normalize_runtime_output(output) when is_map(output), do: output
 
@@ -3191,7 +3196,8 @@ defmodule Livebook.Session do
       outputs: Enum.map(outputs, &normalize_runtime_output/1),
       columns: Map.get(info, :columns, 1),
       gap: Map.get(info, :gap, 8),
-      boxed: Map.get(info, :boxed, false)
+      boxed: Map.get(info, :boxed, false),
+      max_height: Map.get(info, :max_height)
     }
     |> normalize_runtime_output()
   end

lib/livebook_web/live/output.ex

@@ -174,6 +174,7 @@ defmodule LivebookWeb.Output do
       id: id,
       columns: grid.columns,
       gap: grid.gap,
+      max_height: grid.max_height,
       outputs: grid.outputs,
       session_id: session_id,
       session_pid: session_pid,
@@ -189,6 +190,7 @@ defmodule LivebookWeb.Output do
       outputs={@outputs}
       columns={@columns}
       gap={@gap}
+      max_height={@max_height}
       session_id={@session_id}
       session_pid={@session_pid}
       input_views={@input_views}

lib/livebook_web/live/output/grid_component.ex

@@ -26,11 +26,16 @@ defmodule LivebookWeb.Output.GridComponent do
   @impl true
   def render(assigns) do
     ~H"""
-    <div id={@id} class="overflow-auto tiny-scrollbar">
+    <div
+      id={@id}
+      phx-hook="ScrollOnUpdate"
+      class="overflow-auto tiny-scrollbar pr-1.5 -mr-1.5"
+      style={max_height_style(@max_height)}
+    >
       <div
         id={"#{@id}-grid"}
         class="grid grid-cols-2 w-full"
-        style={"grid-template-columns: #{make_template(@columns)}; gap: #{@gap}px"}
+        style={join_styles([columns_style(@columns), gap_style(@gap)])}
         phx-update="stream"
       >
         <div :for={{dom_id, output} <- @streams.outputs} id={dom_id}>
@@ -49,17 +54,36 @@ defmodule LivebookWeb.Output.GridComponent do
     """
   end
 
-  defp make_template(columns) when is_tuple(columns) do
+  defp columns_style(columns) when is_tuple(columns) do
     columns = Tuple.to_list(columns)
 
     if Enum.all?(columns, &is_integer/1) do
-      Enum.map_join(columns, " ", fn n -> "minmax(0, #{n}fr)" end)
+      template = Enum.map_join(columns, " ", fn n -> "minmax(0, #{n}fr)" end)
-    else
+      "grid-template-columns: #{template}"
-      ""
     end
   end
 
-  defp make_template(columns) when is_integer(columns), do: "repeat(#{columns}, minmax(0, 1fr))"
+  defp columns_style(columns) when is_integer(columns) do
+    "grid-template-columns: repeat(#{columns}, minmax(0, 1fr))"
+  end
 
-  defp make_template(_columns), do: ""
+  defp columns_style(_columns), do: nil
+
+  defp gap_style(gap) when is_integer(gap) do
+    "#{gap}px"
+  end
+
+  defp gap_style(_other), do: nil
+
+  defp max_height_style(max_height) when is_integer(max_height) do
+    "max-height: #{max_height}px"
+  end
+
+  defp max_height_style(_other), do: nil
+
+  defp join_styles(styles) do
+    styles
+    |> Enum.reject(&is_nil/1)
+    |> Enum.join("; ")
+  end
 end