From dd7d240ef730ecfef8f3423e4ae2187c6bc964de Mon Sep 17 00:00:00 2001 From: Zach Daniel Date: Wed, 18 Jan 2023 20:23:09 -0500 Subject: [PATCH] fix: `function.html` -> `function.text_html` --- lib/ash_hq_web/components/doc_sidebar.ex | 32 ++++++++++----------- lib/ash_hq_web/components/docs/functions.ex | 2 +- lib/ash_hq_web/pages/docs.ex | 16 +++++++---- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/lib/ash_hq_web/components/doc_sidebar.ex b/lib/ash_hq_web/components/doc_sidebar.ex index 1ec5909..21b06ff 100644 --- a/lib/ash_hq_web/components/doc_sidebar.ex +++ b/lib/ash_hq_web/components/doc_sidebar.ex @@ -7,23 +7,23 @@ defmodule AshHqWeb.Components.DocSidebar do alias AshHqWeb.DocRoutes alias Phoenix.LiveView.JS - prop class, :css_class, default: "" - prop libraries, :list, required: true - prop extension, :any, default: nil - prop guide, :any, default: nil - prop library, :any, default: nil - prop library_version, :any, default: nil - prop selected_versions, :map, default: %{} - prop id, :string, required: true - prop dsl, :any, required: true - prop module, :any, required: true - prop mix_task, :any, required: true - prop remove_version, :event, required: true + prop(class, :css_class, default: "") + prop(libraries, :list, required: true) + prop(extension, :any, default: nil) + prop(guide, :any, default: nil) + prop(library, :any, default: nil) + prop(library_version, :any, default: nil) + prop(selected_versions, :map, default: %{}) + prop(id, :string, required: true) + prop(dsl, :any, required: true) + prop(module, :any, required: true) + prop(mix_task, :any, required: true) + prop(remove_version, :event, required: true) - data guides_by_category_and_library, :any - data extensions, :any - data modules_by_category, :any - data mix_tasks_by_category, :any + data(guides_by_category_and_library, :any) + data(extensions, :any) + data(modules_by_category, :any) + data(mix_tasks_by_category, :any) @spec render(any) :: Phoenix.LiveView.Rendered.t() def render(assigns) do diff --git a/lib/ash_hq_web/components/docs/functions.ex b/lib/ash_hq_web/components/docs/functions.ex index 7e44da7..2d18d11 100644 --- a/lib/ash_hq_web/components/docs/functions.ex +++ b/lib/ash_hq_web/components/docs/functions.ex @@ -31,7 +31,7 @@ defmodule AshHqWeb.Components.Docs.Functions do
- {raw(rendered(function.html))} + {raw(rendered(function.text_html))}
diff --git a/lib/ash_hq_web/pages/docs.ex b/lib/ash_hq_web/pages/docs.ex index e2a3360..4b824f9 100644 --- a/lib/ash_hq_web/pages/docs.ex +++ b/lib/ash_hq_web/pages/docs.ex @@ -110,9 +110,7 @@ defmodule AshHqWeb.Pages.Docs do library_version={@library_version} /> {/if} -
- {raw(@docs)} -
+ <.docs doc_path={@doc_path} docs={@docs} /> {#if @extension && !@dsl && !@guide} {#case Enum.count_until(Stream.filter(@extension.dsls, &(&1.type == :section)), 2)} {#match 0} @@ -239,7 +237,7 @@ defmodule AshHqWeb.Pages.Docs do {Map.get(@dsl.arg_defaults || %{}, option.name)} {/if} - {raw(option.html)} + {raw(option.doc_html)} {/for} @@ -275,7 +273,7 @@ defmodule AshHqWeb.Pages.Docs do {if option.default == "nil", do: nil, else: option.default} - {raw(option.html)} + {raw(option.doc_html)} {/for} @@ -307,6 +305,14 @@ defmodule AshHqWeb.Pages.Docs do """ end + def docs(assigns) do + ~F""" +
+ {raw(@docs)} +
+ """ + end + def update(assigns, socket) do if socket.assigns[:loaded_once?] && assigns[:selected_versions] == socket.assigns[:selected_versions] do