refactor(editor): remove middle parse_block macro layer

Author: mydearxym

lib/helper/converter/editor_to_html/class.ex

@@ -25,12 +25,15 @@ defmodule Helper.Converter.EditorToHTML.Class do
       "list" => %{
         "wrapper" => "list-wrapper",
         "item" => "list-item",
-        "checklist_item" => "list-checklist__item",
         "label" => "list-label",
         "label__default" => "list-label__default",
         "label__red" => "list-label__red",
         "label__green" => "list-label__green",
         "label__warn" => "list-label__warn",
+        "checklist_item" => "list-checklist__item",
+        "checklist_checkbox" => "checklist__item-checkbox",
+        "checklist_checkbox_checked" => "checklist__item-check-sign-active",
+        "checklist_checksign" => "checklist__item-check-sign",
         "text" => "list-item-text",
         "checklist_text" => "list-checklist__item-text"
       }

lib/helper/converter/editor_to_html/frags/list.ex

@@ -5,6 +5,7 @@ defmodule Helper.Converter.EditorToHTML.Frags.List do
   see https://editorjs.io/
   """
   alias Helper.Converter.EditorToHTML.Class
+  alias Helper.Types, as: T
 
   @class get_in(Class.article(), ["list"])
 
@@ -39,12 +40,16 @@ defmodule Helper.Converter.EditorToHTML.Frags.List do
       </div>)
   end
 
-  @spec frag(:checkbox, Boolean.t()) :: String.t()
-  def frag(:checkbox, _checked) do
+  @spec frag(:checkbox, Boolean.t()) :: T.html()
+  def frag(:checkbox, checked) do
     checked_svg = svg(:checked)
 
-    ~s(<div class="checklist__item-checkbox checklist__item-check-sign-active">
-        <div class="checklist__item-check-sign">
+    checkbox_class = @class["checklist_checkbox"]
+    checkbox_checked_class = if checked, do: @class["checklist_checkbox_checked"], else: ""
+    checkbox_checksign_class = @class["checklist_checksign"]
+
+    ~s(<div class="#{checkbox_class} #{checkbox_checked_class}">
+        <div class="#{checkbox_checksign_class}">
         #{checked_svg}
         </div>
       </div>)

lib/helper/converter/editor_to_html/header.ex

@@ -12,17 +12,16 @@ defmodule Helper.Converter.EditorToHTML do
   see https://editorjs.io/
   """
 
-  use Helper.Converter.EditorToHTML.{Header, Paragraph, List}
   alias Helper.Types, as: T
-
   alias Helper.Utils
+
   alias Helper.Converter.{EditorToHTML, HtmlSanitizer}
-  alias EditorToHTML.{Class, Validator}
+  alias EditorToHTML.{Class, Frags, Validator}
 
   # alias EditorToHTML.Assets.{DelimiterIcons}
   @root_class Class.article()
 
-  @spec to_html(String.t()) :: T.ok_html()
+  @spec to_html(String.t()) :: {:ok, T.html()}
   def to_html(string) when is_binary(string) do
     with {:ok, parsed} = string_to_json(string),
          {:ok, _} <- Validator.is_valid(parsed) do
@@ -49,6 +48,18 @@ defmodule Helper.Converter.EditorToHTML do
     {:ok, ~s(<div class="#{viewer_class}">#{content}</div>)}
   end
 
+  defp parse_block(%{"type" => "paragraph", "data" => %{"text" => text}}), do: "<p>#{text}</p>"
+
+  defp parse_block(%{"type" => "header", "data" => data}), do: Frags.Header.get(data)
+
+  defp parse_block(%{"type" => "list", "data" => data}) do
+    %{"items" => items, "mode" => mode} = data
+
+    Enum.reduce(items, "", fn item, acc ->
+      acc <> Frags.List.get_item(mode |> String.to_atom(), item)
+    end)
+  end
+
   # defp parse_block(%{"type" => "image", "data" => data}) do
   #   url = get_in(data, ["file", "url"])
 

lib/helper/converter/editor_to_html/index.ex

@@ -42,5 +42,4 @@ defmodule Helper.Types do
   html fragment
   """
   @type html :: String.t()
-  @type ok_html :: {:ok, String.t()}
 end

lib/helper/converter/editor_to_html/list.ex

@@ -4,53 +4,50 @@ defmodule GroupherServer.Test.Helper.Converter.EditorToHTML.List do
   use GroupherServerWeb.ConnCase, async: true
 
   alias Helper.Converter.EditorToHTML, as: Parser
-  alias Helper.Converter.EditorToHTML.{Class, Frags}
+  alias Helper.Converter.EditorToHTML.Class
 
   @root_class Class.article()
-  # @class get_in(@root_class, ["list"])
+  @class get_in(@root_class, ["list"])
 
   describe "[list block unit]" do
+    @items [
+      %{
+        "checked" => true,
+        "hideLabel" => false,
+        "indent" => 0,
+        "label" => "label",
+        "labelType" => "default",
+        "text" => "list item"
+      },
+      %{
+        "checked" => false,
+        "hideLabel" => false,
+        "indent" => 0,
+        "label" => "label",
+        "labelType" => "default",
+        "text" => "list item"
+      }
+    ]
     @editor_json %{
       "time" => 1_567_250_876_713,
       "blocks" => [
         %{
           "type" => "list",
           "data" => %{
             "mode" => "checklist",
-            "items" => [
-              %{
-                "checked" => true,
-                "hideLabel" => false,
-                "indent" => 0,
-                "label" => "label",
-                "labelType" => "default",
-                "text" => "list item"
-              }
-            ]
+            "items" => @items
           }
         }
       ],
       "version" => "2.15.0"
     }
-    @tag :wip
+    @tag :wip2
     test "valid list parse should work" do
       {:ok, editor_string} = Jason.encode(@editor_json)
-      # assert {:ok, converted} = Parser.to_html(editor_string)
       {:ok, converted} = Parser.to_html(editor_string)
 
-      real =
-        Frags.List.get_item(:checklist, %{
-          "checked" => true,
-          "hideLabel" => false,
-          "indent" => 0,
-          "label" => "label",
-          "labelType" => "default",
-          "text" => "list item"
-        })
-
-      viewer_class = @root_class["viewer"]
-      bb = ~s(<div class="#{viewer_class}">#{real}</div>)
-      assert converted == bb |> String.replace(" viewbox=\"", " viewBox=\"")
+      checked_class = @class["checklist_checkbox_checked"]
+      assert converted |> String.split(checked_class) |> length() == 2
     end
 
     @editor_json %{