draftjs_html 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 570a70e02425c105494fa4abd36c9b51e1e667c4022446dbf83fa7c83b1e4d3d
-  data.tar.gz: b6be5723042425ce04408ec2b996f94b30ab289354829b78eafd3fbde7d17ed1
+  metadata.gz: 80c53506fa59d06daa51517049055d61a21740a9cb6f68d7cc04a22fc40d116c
+  data.tar.gz: 9e678df882452e6917e88250884619e242ea38a28bd61a33c1bbdfb9c2ffc6f8
 SHA512:
-  metadata.gz: 3a1f74891f8942d709dda34cc9d3f2893cba092d09ca797a02c796a75aa314b7966856d5f80564304dd9d45b75e0a0ce649d792e82399af8d8429b6362f3e343
-  data.tar.gz: 1ee7fe5a0df0073220a29acd055cf64ddfa988755c1ad53dd6f58822cad3ec7ffcff368fa8f89f3c972419b10a8b7a4e4a723466a9e5d37ca9bd7eecfe040e9e
+  metadata.gz: b866a4dc37c5c776c174fafb0cd87f110d386a692e97d39147bbb74669ce0a5ed9b50c8bf250cc6bf58bc7e5db05291d156053131c15e96f2be95c5ca2e31af9
+  data.tar.gz: c53aa1b233e2a4ad68a9ecdc70fe4531565c418cdaa603512e3df8ff986fcbfe0d1f1adb6590b433c285fbddcf7c18370875e17cf0d5a550b56780e0dc85d8c4

data/lib/draftjs_html/draftjs/block.rb

@@ -2,12 +2,13 @@
 
 module DraftjsHtml
   module Draftjs
-    Block = Struct.new(:key, :text, :type, :inline_style_ranges, :raw_entity_ranges, keyword_init: true) do
+    Block = Struct.new(:key, :text, :type, :depth, :inline_style_ranges, :raw_entity_ranges, keyword_init: true) do
       def self.parse(raw)
         new(
           key: raw['key'],
           text: raw['text'],
           type: raw['type'],
+          depth: raw['depth'],
           inline_style_ranges: Array(raw['inlineStyleRanges']),
           raw_entity_ranges: Array(raw['entityRanges']),
         )

data/lib/draftjs_html/html_defaults.rb

@@ -0,0 +1,50 @@
+module DraftjsHtml
+  module HtmlDefaults
+    BLOCK_TYPE_TO_HTML = {
+      'unstyled' => 'p',
+      'paragraph' => 'p',
+      'header-one' => 'h1',
+      'header-two' => 'h2',
+      'header-three' => 'h3',
+      'header-four' => 'h4',
+      'header-five' => 'h5',
+      'header-six' => 'h6',
+      'blockquote' => 'blockquote',
+      'code-block' => 'code',
+      'ordered-list-item' => 'li',
+      'unordered-list-item' => 'li',
+      'atomic' => 'figure',
+    }.freeze
+
+    STYLE_MAP = {
+      'BOLD' => 'b',
+      'ITALIC' => 'i',
+      'STRIKETHROUGH' => 'del',
+      'UNDERLINE' => 'u',
+    }.freeze
+
+    ENTITY_ATTRIBUTE_NAME_MAP = {
+      'className' => 'class',
+      'url' => 'href',
+    }.freeze
+
+    DEFAULT_ENTITY_STYLE_FN = ->(_entity, chars, _doc) { chars }
+
+    ENTITY_CONVERSION_MAP = {
+      'LINK' => ->(entity, content, *) {
+        attributes = entity.data.slice('url', 'rel', 'target', 'title', 'className').each_with_object({}) do |(attr, value), h|
+          h[ENTITY_ATTRIBUTE_NAME_MAP.fetch(attr, attr)] = value
+        end
+
+        DraftjsHtml::Node.new('a', attributes, content)
+      },
+      'IMAGE' => ->(entity, *) {
+        attributes = entity.data.slice('src', 'alt', 'className', 'width', 'height').each_with_object({}) do |(attr, value), h|
+          h[ENTITY_ATTRIBUTE_NAME_MAP.fetch(attr, attr)] = value
+        end
+
+        DraftjsHtml::Node.new('img', attributes)
+      }
+    }.freeze
+  end
+end

data/lib/draftjs_html/html_depth.rb

@@ -0,0 +1,65 @@
+module DraftjsHtml
+  # This class manages the depth and nesting of the myriad HTML tags generated by DraftjsHtml::ToHtml.
+  # It is intended to be a private implementation detail.
+  class HtmlDepth # :nodoc:
+    BLOCK_TYPE_TO_HTML_WRAPPER = {
+      'code-block' => 'pre',
+      'ordered-list-item' => 'ol',
+      'unordered-list-item' => 'ul',
+    }.freeze
+
+    attr_reader :body
+
+    def initialize(body)
+      @current_depth = 0
+      @body = body
+      @previous_parents = [body.parent]
+    end
+
+    def apply(block)
+      new_wrapper_tag = BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
+      if body.parent.name != new_wrapper_tag || block.depth != @current_depth
+        if @current_depth < block.depth
+          push_depth(body, new_wrapper_tag)
+        elsif @current_depth > block.depth
+          pop_depth(body, times: @current_depth - block.depth)
+          pop_nesting(body) unless new_wrapper_tag
+        elsif new_wrapper_tag
+          push_nesting(body, new_wrapper_tag)
+        elsif @previous_parents.size > 1
+          pop_nesting(body)
+        end
+        @current_depth = block.depth
+      end
+    end
+
+    private
+
+    def push_depth(builder, tagname)
+      @previous_parents << builder.parent
+      builder.parent = builder.parent.last_element_child
+      push_nesting(builder, tagname)
+    end
+
+    def push_nesting(builder, tagname)
+      node = create_child(builder, tagname)
+      @previous_parents << builder.parent
+      builder.parent = node
+    end
+
+    def pop_depth(builder, times:)
+      times.times do
+        pop_nesting(builder)
+        pop_nesting(builder)
+      end
+    end
+
+    def pop_nesting(builder)
+      builder.parent = @previous_parents.pop
+    end
+
+    def create_child(builder, tagname)
+      builder.parent.add_child(builder.doc.create_element(tagname))
+    end
+  end
+end

data/lib/draftjs_html/node.rb

@@ -18,7 +18,7 @@ module DraftjsHtml
       lines = raw.lines
       text_nodes = lines.flat_map.with_index do |text, i|
         nodes = [Nokogiri::XML::Text.new(text.chomp, document)]
-        nodes << Nokogiri::XML::Node.new('br', document) if i < lines.size - 1
+        nodes << Nokogiri::XML::Node.new('br', document) if text.end_with?("\n")
         nodes
       end
 

data/lib/draftjs_html/overrideable_map.rb

@@ -0,0 +1,25 @@
+module DraftjsHtml
+  class OverrideableMap
+    def initialize(defaults = {})
+      @map = defaults.dup.transform_keys(&:to_s)
+    end
+
+    def with_overrides(overrides)
+      @map.merge!((overrides || {}).transform_keys(&:to_s))
+      self
+    end
+
+    def with_default(default)
+      @default = default
+      self
+    end
+
+    def value_of!(key)
+      @map.fetch(key.to_s)
+    end
+
+    def value_of(key)
+      @map.fetch(key.to_s, @default)
+    end
+  end
+end

data/lib/draftjs_html/to_html.rb

@@ -1,59 +1,15 @@
 require_relative 'node'
+require_relative 'html_depth'
+require_relative 'html_defaults'
+require_relative 'overrideable_map'
+require_relative 'unicode_rtl_detector'
 
 module DraftjsHtml
   class ToHtml
-    BLOCK_TYPE_TO_HTML = {
-      'unstyled' => 'p',
-      'paragraph' => 'p',
-      'header-one' => 'h1',
-      'header-two' => 'h2',
-      'header-three' => 'h3',
-      'header-four' => 'h4',
-      'header-five' => 'h5',
-      'header-six' => 'h6',
-      'blockquote' => 'blockquote',
-      'code-block' => 'code',
-      'ordered-list-item' => 'li',
-      'unordered-list-item' => 'li',
-      'atomic' => 'figure',
-    }.freeze
-    BLOCK_TYPE_TO_HTML_WRAPPER = {
-      'code-block' => 'pre',
-      'ordered-list-item' => 'ol',
-      'unordered-list-item' => 'ul',
-    }.freeze
-    STYLE_MAP = {
-      'BOLD' => 'b',
-      'ITALIC' => 'i',
-      'STRIKETHROUGH' => 'del',
-      'UNDERLINE' => 'u',
-    }.freeze
-
-    DEFAULT_ENTITY_STYLE_FN = ->(_entity, chars, _doc) { chars }
-    ENTITY_ATTRIBUTE_NAME_MAP = {
-      'className' => 'class',
-      'url' => 'href',
-    }.freeze
-    ENTITY_CONVERSION_MAP = {
-      'LINK' => ->(entity, content, *) {
-        attributes = entity.data.slice('url', 'rel', 'target', 'title', 'className').each_with_object({}) do |(attr, value), h|
-          h[ENTITY_ATTRIBUTE_NAME_MAP.fetch(attr, attr)] = value
-        end
-
-        DraftjsHtml::Node.new('a', attributes, content)
-      },
-      'IMAGE' => ->(entity, *) {
-        attributes = entity.data.slice('src', 'alt', 'className', 'width', 'height').each_with_object({}) do |(attr, value), h|
-          h[ENTITY_ATTRIBUTE_NAME_MAP.fetch(attr, attr)] = value
-        end
-
-        DraftjsHtml::Node.new('img', attributes)
-      }
-    }.freeze
-
     def initialize(options)
       @options = ensure_options!(options)
       @document = Nokogiri::HTML::Builder.new(encoding: @options.fetch(:encoding, 'UTF-8'))
+      @html_depth = HtmlDepth.new(@document)
     end
 
     def convert(raw_draftjs)
@@ -61,10 +17,10 @@ module DraftjsHtml
 
       @document.html do |html|
         html.body do |body|
-          @previous_parent = body.parent
+          @previous_parents = [body.parent]
 
           draftjs.blocks.each do |block|
-            ensure_nesting_depth(block, body)
+            @html_depth.apply(block)
 
             body.public_send(block_element_for(block)) do |block_body|
               block.each_range do |char_range|
@@ -84,18 +40,7 @@ module DraftjsHtml
     private
 
     def squeeze_newlines(char_range)
-      char_range.text = @options[:newline_squeezer].call(char_range.text)
-    end
-
-    def ensure_nesting_depth(block, body)
-      new_wrapper_tag = BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
-      if body.parent.name != new_wrapper_tag
-        if new_wrapper_tag
-          push_nesting(body, new_wrapper_tag)
-        else
-          pop_nesting(body)
-        end
-      end
+      char_range.text = @options[:newline_squeezer].call(char_range.text.chomp)
     end
 
     def apply_styles_to(html, style_names, child)
@@ -111,49 +56,41 @@ module DraftjsHtml
     end
 
     def append_child(nokogiri, child)
-      nokogiri.parent.add_child(DraftjsHtml::Node.of(child).to_nokogiri(@document.doc))
+      new_node = DraftjsHtml::Node.of(child).to_nokogiri(@document.doc)
+      nokogiri.parent['dir'] = 'rtl' if UnicodeRtlDetector.new.contains_rtl?(new_node.inner_text)
+      nokogiri.parent.add_child(new_node)
     end
 
     def block_element_for(block)
       return 'br' if block.blank?
 
-      @options[:block_type_mapping].fetch(block.type)
+      @options[:block_type_mapping].value_of!(block.type)
     end
 
     def style_element_for(style)
-      @options[:inline_style_mapping][style]
+      @options[:inline_style_mapping].value_of!(style)
     end
 
     def try_apply_entity_to(draftjs, char_range)
       entity = draftjs.find_entity(char_range.entity_key)
       content = char_range.text
       if entity
-        style_fn = (@options[:entity_style_mappings][entity.type] || DEFAULT_ENTITY_STYLE_FN)
+        style_fn = @options[:entity_style_mappings].value_of(entity.type)
         content = style_fn.call(entity, Node.of(content), @document.parent)
       end
 
       content
     end
 
-    def push_nesting(builder, tagname)
-      node = create_child(builder, tagname)
-      @previous_parent = builder.parent
-      builder.parent = node
-    end
-
-    def pop_nesting(builder)
-      builder.parent = @previous_parent
-    end
-
-    def create_child(builder, tagname)
-      builder.parent.add_child(builder.doc.create_element(tagname))
-    end
-
     def ensure_options!(opts)
-      opts[:entity_style_mappings] = ENTITY_CONVERSION_MAP.merge(opts[:entity_style_mappings] || {}).transform_keys(&:to_s)
-      opts[:block_type_mapping] = BLOCK_TYPE_TO_HTML.merge(opts[:block_type_mapping] || {})
+      opts[:entity_style_mappings] = OverrideableMap.new(HtmlDefaults::ENTITY_CONVERSION_MAP)
+        .with_overrides(opts[:entity_style_mappings])
+        .with_default(HtmlDefaults::DEFAULT_ENTITY_STYLE_FN)
+      opts[:block_type_mapping] = OverrideableMap.new(HtmlDefaults::BLOCK_TYPE_TO_HTML)
+        .with_overrides(opts[:block_type_mapping])
       opts[:newline_squeezer] = opts[:squeeze_newlines] ? ->(text) { text.gsub(/(\n|\r\n)+/, "\n") } : ->(text) { text }
-      opts[:inline_style_mapping] = STYLE_MAP.merge(opts[:inline_style_mapping] || {}).transform_keys(&:to_s)
+      opts[:inline_style_mapping] = OverrideableMap.new(HtmlDefaults::STYLE_MAP)
+        .with_overrides(opts[:inline_style_mapping])
       opts[:inline_style_renderer] ||= ->(*) { nil }
       opts
     end

data/lib/draftjs_html/unicode_rtl_detector.rb

@@ -0,0 +1,27 @@
+module DraftjsHtml
+  class UnicodeRtlDetector
+    # This regex was copied from fbjs's UnicodeBidi detection
+    # See https://github.com/facebook/fbjs/blob/main/packages/fbjs/src/unicode/UnicodeBidi.js.
+    STRONG_RTL_CHAR_RANGES = [
+      '\u0590\u05BE\u05C0\u05C3\u05C6\u05C8-\u05CF\u05D0-\u05EA\u05EB-\u05EF',
+      '\u05F0-\u05F2\u05F3-\u05F4\u05F5-\u05FF\u07C0-\u07C9\u07CA-\u07EA',
+      '\u07F4-\u07F5\u07FA\u07FB-\u07FF\u0800-\u0815\u081A\u0824\u0828',
+      '\u082E-\u082F\u0830-\u083E\u083F\u0840-\u0858\u085C-\u085D\u085E',
+      '\u085F-\u089F\u200F\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB37\uFB38-\uFB3C',
+      '\uFB3D\uFB3E\uFB3F\uFB40-\uFB41\uFB42\uFB43-\uFB44\uFB45\uFB46-\uFB4F',
+      '\u0608\u060B\u060D\u061B\u061C\u061D\u061E-\u061F\u0620-\u063F\u0640',
+      '\u0641-\u064A\u066D\u066E-\u066F\u0671-\u06D3\u06D4\u06D5\u06E5-\u06E6',
+      '\u06EE-\u06EF\u06FA-\u06FC\u06FD-\u06FE\u06FF\u0700-\u070D\u070E\u070F',
+      '\u0710\u0712-\u072F\u074B-\u074C\u074D-\u07A5\u07B1\u07B2-\u07BF',
+      '\u08A0-\u08B2\u08B3-\u08E3\uFB50-\uFBB1\uFBB2-\uFBC1\uFBC2-\uFBD2',
+      '\uFBD3-\uFD3D\uFD40-\uFD4F\uFD50-\uFD8F\uFD90-\uFD91\uFD92-\uFDC7',
+      '\uFDC8-\uFDCF\uFDF0-\uFDFB\uFDFC\uFDFE-\uFDFF\uFE70-\uFE74\uFE75',
+      '\uFE76-\uFEFC\uFEFD-\uFEFE',
+    ].join.freeze
+    RTL_MATCHER = /[#{STRONG_RTL_CHAR_RANGES}]/
+
+    def contains_rtl?(text)
+      RTL_MATCHER.match?(text)
+    end
+  end
+end

data/lib/draftjs_html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftjs_html
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - TJ Taylor
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -65,8 +65,12 @@ files:
 - lib/draftjs_html/draftjs/entity.rb
 - lib/draftjs_html/draftjs/entity_map.rb
 - lib/draftjs_html/draftjs/to_raw.rb
+- lib/draftjs_html/html_defaults.rb
+- lib/draftjs_html/html_depth.rb
 - lib/draftjs_html/node.rb
+- lib/draftjs_html/overrideable_map.rb
 - lib/draftjs_html/to_html.rb
+- lib/draftjs_html/unicode_rtl_detector.rb
 - lib/draftjs_html/version.rb
 homepage: https://github.com/dugancathal/draftjs_html
 licenses:
@@ -75,7 +79,7 @@ metadata:
   homepage_uri: https://github.com/dugancathal/draftjs_html
   source_code_uri: https://github.com/dugancathal/draftjs_html
   changelog_uri: https://github.com/dugancathal/draftjs_html/tree/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A tool for converting DraftJS JSON to HTML (and back again)
 test_files: []