draftjs_html 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb24dc172740e504b480688893e7501968871dc219e021b5d70885961b0fcde
-  data.tar.gz: ada9a89937ece511ff1c617e4e5e9754fd61be0980683b6eebe1b7a6afc64eb6
+  metadata.gz: 87efa57150dbbe1c730824cea917dbabaad3aec0512232102995863da4f0e30c
+  data.tar.gz: b634cbce19c5da38dbd36df706f9f4ba90a0391a1e487907bd355c2d4772eda0
 SHA512:
-  metadata.gz: ade3fb1e8447b4f275a8ba717d41f25c43f2e5f63051ca65abbb0e540a43363add8fe67baea81976d2d03ccc350e7e1b3da43fa978fb1a69e14c540c5b3872b2
-  data.tar.gz: 618448a98c1f9309d3a411aa180f95fc109fedc70e0f389b8c4673f06f8cfba43f19413528ebd1c6af291706974edaf4200debc52a0d6e7465169a7ac98343f4
+  metadata.gz: 80fc8946627d72d1d3add5c3e0e6e4a91656aa715cec1d20d4471273ad129abccbbe47c81077b2874c896733528537c8bdcce7a99d825f0d908b3e524f2efd48
+  data.tar.gz: dd460fa38fea6e915a442ba231993e231c009784618b0ed36f9d7f7e583cedef6246f20447ae16937c0ba98b09f9977390738771161a4a08571ff6ee8ab107e6

data/lib/draftjs_html/html_depth.rb

@@ -11,113 +11,133 @@ module DraftjsHtml
     def initialize(body)
       @current_depth = 0
       @body = body
-      @previous_parents = [body.parent]
-      @nesting_roots = [body.parent.name]
+      @previous_block = nil
     end
 
+    LIST_ROOTS = %w[ol ul]
+
     def apply(block)
-      return unless nesting_root_changed?(block) || depth_changed?(block)
-
-      if deepening?(block)
-        deepen(block, desired_depth_change: block.depth - @current_depth)
-      elsif rising?(block) && still_nested?(block)
-        rise(times: @current_depth - block.depth)
-      elsif rising?(block)
-        rise(times: @current_depth - block.depth)
-        pop_parent
-      elsif still_nested?(block)
+      if block.type == 'code-block'
         push_parent(block)
-      elsif nested?
-        pop_parent
+        store_previous(block)
+        return
       end
 
-      @current_depth = block.depth
-    end
-
-    private
+      # Nesting lists - extra content same level
+      if @current_depth > 0 && block.depth == @current_depth && block.type != @previous_block&.type
+        set_li_as_root
+        store_previous(block)
+        return
+      end
 
-    def deepen(block, desired_depth_change: 0)
-      if inside_valid_nesting_root?
-        set_previous_li_as_parent(block)
-      else
-        create_valid_nesting_root(block)
+      # Nesting lists - deepening inside a proper list
+      if block.depth == @current_depth + 1 && block.type == @previous_block&.type
+        set_li_as_root
+        push_parent(block)
+        store_previous(block)
+        return
       end
 
-      (desired_depth_change - 1).times do
-        create_valid_nesting_root(block)
+      # Nesting lists - deepening skipping level 0
+      if block.depth > @current_depth && !list_block?(@previous_block)
+        while @current_depth < block.depth
+          push_parent(block)
+          @body.parent = create_child('li')
+          @current_depth += 1
+        end
+        push_parent(block)
+        store_previous(block)
+        return
       end
 
-      push_parent(block)
-    end
+      # Nesting lists - deepening from inside skipping several levels
+      if block.depth > @current_depth && list_block?(@previous_block)
+        set_li_as_root
+        while block.depth > @current_depth + 1
+          push_parent(block)
+          @body.parent = create_child('li')
+          @current_depth += 1
+        end
+        push_parent(block)
+        store_previous(block)
+        return
+      end
 
-    def push_parent(block)
-      tagname = BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
-      node = create_child(tagname)
-      @previous_parents << @body.parent
-      @body.parent = node
-    end
+      # Nesting lists - rising
+      if block.depth < @current_depth
+        # pop_to_nearest_list_root, n times
+        (@current_depth - block.depth).times do
+          if @body.parent.name == 'li'
+            pop_parent
+            pop_parent
+            pop_parent
+          elsif LIST_ROOTS.include?(@body.parent.name)
+            pop_parent
+            pop_parent
+          else
+            pop_parent
+          end
+        end
+      end
 
-    def rise(times:)
-      times.times do
-        begin
-          pop_parent
-        end while @body.parent.name != @nesting_roots.last
-        @nesting_roots.pop
+      # Sibling list items
+      if block.depth == 0 && list_block?(block) && @previous_block&.type == block.type
+        store_previous(block)
+        return
       end
-    end
 
-    def pop_parent
-      @body.parent = @previous_parents.pop unless @previous_parents.empty?
-    end
+      # Any-old root list item
+      if block.depth == 0 && list_block?(block) && @previous_block&.depth.to_i == 0
+        push_parent(block)
+        store_previous(block)
+        return
+      end
 
-    def create_child(tagname)
-      @body.parent.add_child(@body.doc.create_element(tagname))
-    end
+      # Leaving the list
+      if block.depth == 0 && !list_block?(block) && (list_block?(@previous_block) || @previous_block&.depth.to_i > 0)
+        pop_to_document_root
+        store_previous(block)
+        return
+      end
 
-    def nested?
-      @body.parent.name != 'body'
+      store_previous(block)
     end
 
-    def still_nested?(block)
-      BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
-    end
+    private
 
-    def depth_changed?(block)
-      block.depth != @current_depth
+    def store_previous(block)
+      @current_depth = block.depth
+      @previous_block = block
     end
 
-    def nesting_root_changed?(block)
-      @body.parent.name != BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
+    def list_block?(block)
+      block&.type&.end_with?('list-item')
     end
 
-    def rising?(block)
-      @current_depth > block.depth
+    def pop_to_document_root
+      pop_parent until current_root_name == 'body'
     end
 
-    def deepening?(block)
-      @current_depth < block.depth
+    def current_root_name
+      @body.parent.name
     end
 
-    def create_valid_nesting_root(block)
-      parent_tagname = BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
-      node = create_child(parent_tagname)
-      @previous_parents << node
-      @nesting_roots << parent_tagname
+    def push_parent(block)
+      tagname = BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
+      node = create_child(tagname)
       @body.parent = node
+    end
 
-      list_item = create_child('li')
-      @body.parent = list_item
+    def pop_parent
+      @body.parent = @body.parent.parent
     end
 
-    def set_previous_li_as_parent(block)
-      tagname = BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
-      @previous_parents << @body.parent
-      @nesting_roots << tagname
-      @body.parent = @body.parent.last_element_child
+    def create_child(tagname)
+      @body.parent.add_child(@body.doc.create_element(tagname))
     end
 
-    def inside_valid_nesting_root?
-      BLOCK_TYPE_TO_HTML_WRAPPER.values.include?(@body.parent.name)
+    def set_li_as_root
+      @body.parent = @body.parent.last_element_child
     end
   end
 end

data/lib/draftjs_html/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DraftjsHtml
-  VERSION = "0.29.0"
+  VERSION = "0.30.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftjs_html
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - TJ Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri