draftjs_html 0.22.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ac3de7f21860685dbf39a24fb921227a1ccce6d97940acd279976daab15970
-  data.tar.gz: 2d3511eef3134a6cc01cd3da0147b3c347209c6c90ef4f5aaea90c681af979b1
+  metadata.gz: 7c2703fb050f796abd4f8af851d16b654a2ab84f03e5f8865c92b373b2acfefa
+  data.tar.gz: eced6f85cfefd34f4c50c7fc383526675f26dd7c212a4f7de145721d254b1a28
 SHA512:
-  metadata.gz: 2775eac524063149973d4908f9f30f5e9a4d6b734f35e44b459454a95cc6a415a25a1b36daf07af3b34b1bf08b2b96c2980e6be12a9b21ed23c162100688ad03
-  data.tar.gz: dd0c42f5271934a1a17452159e7dbad8b51bd4ad0637a9b87cf4c77b43c6ea690bdda838830d92b1fcd929e985d88958fa5bd5326af89dc3e9db76e7e84a5fe2
+  metadata.gz: 432d7b8900153f89f8ba506ded86208fe71a4b6b832911693059e0f57cb31b93412ef8fa5a40a8f7d857b370b65e8a523f29d0029dfa2ee8f917ebae2235827e
+  data.tar.gz: 69878d4330ef0d4947f1d95ed165720c0a59b8c0d54793d2e28aad8f5fea40754f95afacc1fc1a29c5b5b9f03e02399d9502924c7c580e7bc953b674f6292644

data/README.md

@@ -229,6 +229,15 @@ The callable should return a Hash with symbol keys. The supported values are:
 - `data` (optional, default `{}`)
   - an arbitrary data-bag (Hash) of entity data
 
+#### `:is_semantic_markup:`
+
+Defaults to `true`.
+
+By setting to `false`, the user is stating they want to treat `div` tags as semantic,
+block-level tags. In some markup (emails, for example), there are no semantic tags
+(read, no `p` tags), so the only indications of whitespace and structure come from
+`div` tags. This flag will flush content wrapped in a `div` as a DraftJS block. 
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run

data/lib/draftjs_html/from_html/char_list.rb

@@ -131,22 +131,6 @@ module DraftjsHtml
           end
         end
       end
-
-      private
-
-      def find_overlapping_styles(descriptors)
-        descriptors.select do |candidate_a|
-          candidate_range = candidate_a[:start]..candidate_a[:finish]
-          (descriptors - [candidate_a]).any? do |other|
-            other_range = other[:start]..other[:finish]
-            range_overlaps?(candidate_range, other_range)
-          end
-        end
-      end
-
-      def range_overlaps?(candidate_range, other_range)
-        other_range.begin == candidate_range.begin || candidate_range.cover?(other_range.begin) || other_range.cover?(candidate_range.begin)
-      end
     end
   end
 end

data/lib/draftjs_html/from_html/depth_stack.rb

@@ -1,15 +1,16 @@
 module DraftjsHtml
   class FromHtml < Nokogiri::XML::SAX::Document
     class DepthStack
-      def initialize
+      def initialize(is_semantic_markup: true)
         @stack = []
         @nodes = []
         @list_depth = -1
         @active_styles = []
+        @is_semantic_markup = is_semantic_markup
       end
 
       def push(tagname, attrs)
-        @stack << PendingBlock.from_tag(tagname, attrs, @nodes.dup, @list_depth)
+        @stack << PendingBlock.from_tag(tagname, attrs, @nodes.dup, @list_depth, is_semantic_markup: @is_semantic_markup)
         track_block_node(tagname)
       end
 

data/lib/draftjs_html/from_html/pending_block.rb

@@ -1,7 +1,7 @@
 module DraftjsHtml
   class FromHtml < Nokogiri::XML::SAX::Document
-    PendingBlock = Struct.new(:tagname, :attrs, :chars, :entities, :pending_entities, :parent_tagnames, :depth, keyword_init: true) do
-      def self.from_tag(name, attrs, parent_tagnames, depth)
+    PendingBlock = Struct.new(:tagname, :attrs, :chars, :entities, :pending_entities, :parent_tagnames, :depth, :is_semantic_markup, keyword_init: true) do
+      def self.from_tag(name, attrs, parent_tagnames, depth, is_semantic_markup: true)
         self.new(
           tagname: name,
           attrs: attrs,
@@ -10,6 +10,7 @@ module DraftjsHtml
           pending_entities: [],
           depth: depth,
           parent_tagnames: parent_tagnames,
+          is_semantic_markup: is_semantic_markup,
         )
       end
 
@@ -23,7 +24,8 @@ module DraftjsHtml
 
       def flushable?
         %w[OPENING ol ul li table].include?(parent_tagnames.last) ||
-          (parent_tagnames.last == 'div' && tagname != 'div')
+          (parent_tagnames.last == 'div' && tagname != 'div') ||
+          (!is_semantic_markup && tagname == 'div')
       end
 
       def consume(other_pending_block)

data/lib/draftjs_html/from_html.rb

@@ -11,7 +11,7 @@ module DraftjsHtml
     def initialize(options = {})
       @draftjs = Draftjs::RawBuilder.new
       @parser = Nokogiri::HTML4::SAX::Parser.new(self)
-      @depth_stack = DepthStack.new
+      @depth_stack = DepthStack.new(is_semantic_markup: options.fetch(:is_semantic_markup, true))
       @options = ensure_options!(options.dup)
     end
 

data/lib/draftjs_html/html_defaults.rb

@@ -43,7 +43,7 @@ module DraftjsHtml
 
     ENTITY_CONVERSION_MAP = {
       'LINK' => ->(entity, content, *) {
-        attributes = entity.data.slice('url', 'href', 'rel', 'target', 'title', 'className').each_with_object({}) do |(attr, value), h|
+        attributes = entity.data.slice('href', 'url', 'rel', 'target', 'title', 'className').each_with_object({}) do |(attr, value), h|
           h[ENTITY_ATTRIBUTE_NAME_MAP.fetch(attr, attr)] = value
         end
 

data/lib/draftjs_html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftjs_html
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.24.0
 platform: ruby
 authors:
 - TJ Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri