lexxy 0.9.2.beta → 0.9.4.beta

data/app/assets/stylesheets/lexxy-editor.css

@@ -637,23 +637,19 @@
 
   lexxy-link-dropdown {
     font-size: var(--lexxy-text-small);
+    gap: var(--lexxy-toolbar-spacing);
     inset-inline-start: var(--lexxy-toolbar-spacing);
     inset-inline-end: var(--lexxy-toolbar-spacing);
 
-    form {
-      display: flex;
-      flex: 1;
-      gap: var(--lexxy-toolbar-spacing);
-
-      [overflowing] & {
-        display: block;
+    [overflowing] [open] & {
+      display: block;
 
-        .lexxy-editor__toolbar-dropdown-actions {
-          margin-block-start: var(--lexxy-toolbar-spacing);
-        }
+      .lexxy-editor__toolbar-dropdown-actions {
+        margin-block-start: var(--lexxy-toolbar-spacing);
       }
     }
 
+
     .lexxy-editor__toolbar-dropdown-actions {
       display: flex;
       flex: 1;
@@ -681,7 +677,7 @@
       padding-inline: 2ch;
     }
 
-    button[type="submit"] {
+    button[value="link"] {
       background-color: var(--lexxy-color-accent-dark);
       color: var(--lexxy-color-ink-inverted);
 
@@ -1022,6 +1018,7 @@
   &[data-clipped-at-right] {
     inset-inline-start: unset;
     inset-inline-end: 1ch;
+    max-inline-size: calc(100% - 1ch);
   }
 
   &[data-clipped-at-bottom] {

data/lib/action_text/editor/lexxy_editor.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ActionText
+  class Editor::LexxyEditor < Editor
+    def editor_tag(...)
+      Tag.new(editor_name, ...)
+    end
+  end
+
+  class Editor::LexxyEditor::Tag < Editor::Tag
+    def render_in(view_context, ...)
+      # Strip html_safe to preserve attribute escaping (see #749)
+      options[:value] = options[:value].to_str if options[:value].respond_to?(:to_str)
+      super
+    end
+  end
+end

data/lib/lexxy/engine.rb

@@ -1,7 +1,3 @@
-require_relative "rich_text_area_tag"
-require_relative "form_helper"
-require_relative "form_builder"
-require_relative "action_text_tag"
 require_relative "attachable"
 
 require "active_storage/blob_with_preview_url"
@@ -11,18 +7,37 @@ module Lexxy
     isolate_namespace Lexxy
 
     config.lexxy = ActiveSupport::OrderedOptions.new
-    config.lexxy.override_action_text_defaults = true
 
-    initializer "lexxy.initialize" do |app|
+    if Lexxy.supports_editor_adapter?
+      require_relative "../action_text/editor/lexxy_editor"
+
+      initializer "lexxy.action_text_editor", before: "action_text.editors" do |app|
+        app.config.action_text.editors[:lexxy] = {}
+      end
+    else
+      # Rails 8.0/8.1 fallback: monkey-patch Action Text helpers
+      require_relative "rich_text_area_tag"
+      require_relative "form_helper"
+      require_relative "form_builder"
+      require_relative "action_text_tag"
+
+      config.lexxy.override_action_text_defaults = true
+
+      initializer "lexxy.initialize" do |app|
+        app.config.to_prepare do
+          ActionText::TagHelper.prepend(Lexxy::TagHelper)
+          ActionView::Helpers::FormHelper.prepend(Lexxy::FormHelper)
+          ActionView::Helpers::FormBuilder.prepend(Lexxy::FormBuilder)
+          ActionView::Helpers::Tags::ActionText.prepend(Lexxy::ActionTextTag)
+
+          Lexxy.override_action_text_defaults if app.config.lexxy.override_action_text_defaults
+        end
+      end
+    end
+
+    initializer "lexxy.attachable" do |app|
       app.config.to_prepare do
-        # TODO: We need to move these extensions to Action Text
-        ActionText::TagHelper.prepend(Lexxy::TagHelper)
-        ActionView::Helpers::FormHelper.prepend(Lexxy::FormHelper)
-        ActionView::Helpers::FormBuilder.prepend(Lexxy::FormBuilder)
-        ActionView::Helpers::Tags::ActionText.prepend(Lexxy::ActionTextTag)
         ActionText::Attachable.singleton_class.prepend(Lexxy::Attachable)
-
-        Lexxy.override_action_text_defaults if app.config.lexxy.override_action_text_defaults
       end
     end
 
@@ -41,7 +56,7 @@ module Lexxy
         default_allowed_attributes = Class.new.include(ActionText::ContentHelper).new.sanitizer_allowed_attributes
         ActionText::ContentHelper.allowed_attributes = default_allowed_attributes + %w[ controls poster data-language style ]
 
-        Loofah::HTML5::SafeList::ALLOWED_CSS_FUNCTIONS << "var" # Allow CSS variables
+        Loofah::HTML5::SafeList::ALLOWED_CSS_FUNCTIONS << "var"
       end
     end
 

data/lib/lexxy/version.rb

@@ -1,3 +1,3 @@
 module Lexxy
-  VERSION = "0.9.2.beta"
+  VERSION = "0.9.4.beta"
 end

data/lib/lexxy.rb

@@ -1,25 +1,33 @@
 require "lexxy/version"
-require "lexxy/engine"
 
 module Lexxy
-  def self.override_action_text_defaults
-    ActionText::TagHelper.module_eval do
-      alias_method :rich_textarea_tag, :lexxy_rich_textarea_tag
-      alias_method :rich_text_area_tag, :lexxy_rich_textarea_tag
+  class << self
+    # Check for ActionText::Editor with block-children support (rails/rails#56926)
+    def supports_editor_adapter?
+      !!(defined?(ActionText::Editor) && ActionText::Editor.instance_method(:editor_tag).parameters.assoc(:block))
     end
 
-    ActionView::Helpers::FormHelper.module_eval do
-      alias_method :rich_textarea, :lexxy_rich_textarea
-      alias_method :rich_text_area, :lexxy_rich_textarea
-    end
+    def override_action_text_defaults
+      ActionText::TagHelper.module_eval do
+        alias_method :rich_textarea_tag, :lexxy_rich_textarea_tag
+        alias_method :rich_text_area_tag, :lexxy_rich_textarea_tag
+      end
 
-    ActionView::Helpers::FormBuilder.module_eval do
-      alias_method :rich_textarea, :lexxy_rich_textarea
-      alias_method :rich_text_area, :lexxy_rich_textarea
-    end
+      ActionView::Helpers::FormHelper.module_eval do
+        alias_method :rich_textarea, :lexxy_rich_textarea
+        alias_method :rich_text_area, :lexxy_rich_textarea
+      end
 
-    ActionView::Helpers::Tags::ActionText.module_eval do
-      alias_method :render, :lexxy_render
+      ActionView::Helpers::FormBuilder.module_eval do
+        alias_method :rich_textarea, :lexxy_rich_textarea
+        alias_method :rich_text_area, :lexxy_rich_textarea
+      end
+
+      ActionView::Helpers::Tags::ActionText.module_eval do
+        alias_method :render, :lexxy_render
+      end
     end
   end
 end
+
+require "lexxy/engine"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lexxy
 version: !ruby/object:Gem::Version
-  version: 0.9.2.beta
+  version: 0.9.4.beta
 platform: ruby
 authors:
 - Jorge Manrubia
@@ -27,86 +27,86 @@ dependencies:
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: stimulus-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: cuprite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: A new editor for Action Text based on Meta's Lexical framework.
 email:
 - jorge@37signals.com
@@ -133,6 +133,7 @@ files:
 - config/ci.rb
 - ext/Rakefile
 - lib/action_text/attachables/remote_video.rb
+- lib/action_text/editor/lexxy_editor.rb
 - lib/active_storage/blob_with_preview_url.rb
 - lib/lexxy.rb
 - lib/lexxy/action_text_tag.rb