draftjs_html 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e459d7be8ecac2000e78f00451ca17bf8004999bc552386b61b50b6425a211
-  data.tar.gz: 0c9703d28c9209c817ee895952021296428bc96af013ebb09c38edc9ac5803ee
+  metadata.gz: 51c56851fb84b6e413463210677f5e98a15e9ae40a361f73c889d601a6f3e52f
+  data.tar.gz: 45583f01646408735b320847452df1469bfe605efeca9c6ee801f3b9c30a4f6e
 SHA512:
-  metadata.gz: a7bb25d1069b54594c8c4746528e867cee782d87e4df0957220bc93fd24423ccb778f33c3ebd6910deaae38ac6c66c605147aa8eca91c10ebc2f7d8b00a0a1eb
-  data.tar.gz: c9627eea02a1de4de1b044de3b56f439072da198d3a64e7a288fc97f5ae989e2445e8fb73570f0987ee6b339d75ffa516efb310710b2c04fdfa5b6061c8a6871
+  metadata.gz: 4751bb0add2faf14ed3d14bfbcb6080ee2f53bc879fb0db91a0a79b0de0d5605870573f34a00d991633c556efc9191c78e30451bc641fca225bbd0d570ee770d
+  data.tar.gz: 4cb9501eac617513071c070a0d666a26f1eb146b1c3b775d0a16b3a4e48751e8057a645bef30b9a1989b322f90d78a60e0e442bdce523c54537b84e6d8dc461c

data/lib/draftjs_html/from_html/depth_stack.rb

@@ -34,12 +34,13 @@ module DraftjsHtml
 
       def pop(draftjs)
         return if @stack.empty?
+        return merge_current_into_parent! if current_is_block_content_inside_list_item?
         return if inside_parent?
 
         if @nodes.last == current.tagname && current.flushable?
           flush_to(draftjs)
-        elsif @stack[-2]
-          @stack[-2].consume(current)
+        elsif parent
+          parent.consume(current)
         end
 
         @stack.pop
@@ -98,13 +99,34 @@ module DraftjsHtml
         @nodes << name
       end
 
+      def merge_current_into_parent!
+        parent.consume(current)
+        @stack.pop
+      end
+
+      def current_is_block_content_inside_list_item?
+        block_content? && inside_parent? && inside_list_item?
+      end
+
       def inside_parent?
         (FromHtml::LIST_PARENT_ELEMENTS & @nodes).any?
       end
 
+      def inside_list_item?
+        (FromHtml::LIST_ITEM_ELEMENTS & @nodes).any?
+      end
+
+      def block_content?
+        BLOCK_CONTENT_ELEMENTS.include?(current.tagname)
+      end
+
       def current
         @stack.last
       end
+
+      def parent
+        @stack[-2]
+      end
     end
   end
 end

data/lib/draftjs_html/from_html/elements.rb

@@ -2,6 +2,7 @@ module DraftjsHtml
   class FromHtml < Nokogiri::XML::SAX::Document
     INLINE_STYLE_ELEMENTS = HtmlDefaults::HTML_STYLE_TAGS_TO_STYLE.keys.freeze
     LIST_PARENT_ELEMENTS = %w[ol ul].freeze
+    LIST_ITEM_ELEMENTS = %w[li].freeze
     INLINE_NON_STYLE_ELEMENTS = %w[a abbr cite font img output q samp span table thead tbody td time var].freeze
     BLOCK_CONTENT_ELEMENTS = %w[p dl h1 h2 h3 h4 h5 h6].freeze
     FLUSH_BOUNDARIES = %w[OPENING div ol ul li tr].freeze

data/lib/draftjs_html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftjs_html
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - TJ Taylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2025-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: A tool for converting DraftJS JSON to HTML (and back again)