ckeditor5 1.27.3 → 1.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b73e7a07562a8531b071c5d39c8c051cf00a6566d81a6aa78aa791e9943e900
-  data.tar.gz: 5e1ead26d24e2d31b9696cba63b395e8f34c4ea408f27ebedf9498efff97326b
+  metadata.gz: 7c28d638338e7bdb2e029d6eb1a81a65126dfbe16b31828563e5d7a0efc3a51e
+  data.tar.gz: c87327aa99851db71ff50f0d12c606c58194b3840a4c13eb99e7ca22c6e87734
 SHA512:
-  metadata.gz: 8af4082843903c3adf3a378c35673107eeb4fc916f184cb6c2ec2611b35b4e75df9165be1b14746dd1998710c8a1852faabaad0c0e476dc749ecb8273dbf3b96
-  data.tar.gz: 93c2f1c02c4f4c7fcefec7d281e0172be0965ed078feb6484acc50060659a8afd235c4def5053a8e3280028f1d3f4ea71746339d775c4d3cd1d3546422c0c99c
+  metadata.gz: 015fd8f7850a4620aa13d62c8ffee059a417fb8d6e2808f3699753843eb99eeb7c281ee03c949e0bf3458690a406d9854e56190bc0960dd1e2729f4ef56a008b
+  data.tar.gz: 914079678cd53137163f389df3d6a2a42992b7c1f9d84cdd6cd628b878973210eb442de79c5bea4b8cc7e01b0f05534afe0763fdd56534e3c4041c8703d20776

data/README.md

@@ -127,6 +127,7 @@ For extending CKEditor's functionality, refer to the [plugins directory](https:/
     - [Available Configuration Methods ⚙️](#available-configuration-methods-️)
       - [`cdn(cdn = nil, &block)` method](#cdncdn--nil-block-method)
       - [`version(version, apply_patches: true)` method](#versionversion-apply_patches-true-method)
+      - [`automatic_upgrades(enabled: true)` method](#automatic_upgradesenabled-true-method)
       - [`gpl` method](#gpl-method)
       - [`license_key(key)` method](#license_keykey-method)
       - [`premium` method](#premium-method)
@@ -145,7 +146,6 @@ For extending CKEditor's functionality, refer to the [plugins directory](https:/
       - [`inline_plugin(name, code)` method](#inline_pluginname-code-method)
       - [`external_plugin(name, script:, import_as: nil, window_name: nil, stylesheets: [])` method](#external_pluginname-script-import_as-nil-window_name-nil-stylesheets--method)
       - [`patch_plugin(plugin)`](#patch_pluginplugin)
-      - [`apply_integration_patches` method](#apply_integration_patches-method)
       - [`simple_upload_adapter(url)` method](#simple_upload_adapterurl-method)
       - [`special_characters(&block)` method](#special_charactersblock-method)
       - [`wproofreader(version: nil, cdn: nil, **config)` method](#wproofreaderversion-nil-cdn-nil-config-method)
@@ -346,22 +346,6 @@ CKEditor5::Rails.configure do
 end
 ```
 
-In order to disable default patches, you can pass the `apply_patches: false` keyword argument to the `version` method.
-
-```rb
-# config/initializers/ckeditor5.rb
-
-CKEditor5::Rails.configure do
-  # ... other configuration
-
-  version '44.3.0', apply_patches: false
-end
-```
-
-The patches are defined in the `lib/ckeditor5/rails/plugins/patches` directory. If you want to apply custom patches, you can use the `patch_plugin` method.
-
-```rb
-
 </details>
 
 #### `automatic_upgrades(enabled: true)` method
@@ -1053,29 +1037,6 @@ end
 ```
 </details>
 
-#### `apply_integration_patches` method
-
-<details>
-  <summary>Apply patches to the specific versions of CKEditor 5</summary>
-
-<br />
-
-Defines a method that applies patches to the specific versions of CKEditor 5. The example below shows how to apply patches to the `44.1.0` version:
-
-```rb
-# config/initializers/ckeditor5.rb
-
-CKEditor5::Rails.configure do
-  # ... other configuration
-
-  apply_integration_patches
-end
-```
-
-It's useful when you want to apply patches to the specific versions of CKEditor 5. The patches are defined in the `lib/ckeditor5/rails/plugins/patches` directory.
-
-</details>
-
 #### `simple_upload_adapter(url)` method
 
 <details>

data/lib/ckeditor5/rails/assets/assets_bundle.rb

@@ -32,16 +32,34 @@ module CKEditor5::Rails::Assets
 
     def to_json(*_args)
       {
-        scripts: scripts.map(&:to_h),
-        stylesheets: stylesheets
+        scripts: unique_scripts(scripts).map(&:to_h),
+        stylesheets: unique_stylesheets(stylesheets)
       }.to_json
     end
 
     def <<(other)
       raise TypeError, 'other must be an instance of AssetsBundle' unless other.is_a?(AssetsBundle)
 
-      @scripts = scripts + other.scripts
-      @stylesheets = stylesheets + other.stylesheets
+      @scripts = unique_scripts(scripts + other.scripts)
+      @stylesheets = unique_stylesheets(stylesheets + other.stylesheets)
+    end
+
+    private
+
+    def unique_scripts(scripts_array)
+      with_url, without_url = scripts_array.partition { |script| script.respond_to?(:url) && script.url }
+      unique_with_url = with_url.uniq { |script| drop_version_from_url(script.url) }
+      unique_with_url + without_url
+    end
+
+    def unique_stylesheets(stylesheets_array)
+      stylesheets_array.uniq { |stylesheet| drop_version_from_url(stylesheet) }
+    end
+
+    def drop_version_from_url(url)
+      url.to_s
+         .gsub(%r{/v?\d+\.\d+\.\d+(-[a-z0-9.]+)?/}, '/')
+         .gsub(%r{@\d+\.\d+\.\d+(-[a-z0-9.]+)?/?}, '')
     end
   end
 

data/lib/ckeditor5/rails/cdn/helpers.rb

@@ -55,7 +55,7 @@ module CKEditor5::Rails
     #
     # @example Using preset builder object
     #   <% @preset = ckeditor5_preset do
-    #     version '43.3.1'
+    #     version '44.3.0'
     #     toolbar :bold, :italic
     #     plugins :Bold, :Italic
     #   end %>

data/lib/ckeditor5/rails/context/preset_builder.rb

@@ -12,7 +12,7 @@ module CKEditor5::Rails
     #
     # @example Basic preset definition
     #   preset = PresetBuilder.new do
-    #     version '43.3.1'
+    #     version '44.3.0'
     #     gpl
     #     type :classic
     #     toolbar :bold, :italic
@@ -35,7 +35,7 @@ module CKEditor5::Rails
       # @param block [Proc] Optional configuration block
       # @example Initialize with block
       #   PresetBuilder.new do
-      #     version '43.3.1'
+      #     version '44.3.0'
       #     toolbar :bold, :italic
       #   end
       def initialize(&block)

data/lib/ckeditor5/rails/editor/helpers/config_helpers.rb

@@ -44,7 +44,7 @@ module CKEditor5::Rails::Editor::Helpers
     #
     # @example Creating a custom preset in controller
     #   @preset = ckeditor5_preset do
-    #     version '43.3.1'
+    #     version '44.3.0'
     #     toolbar :sourceEditing, :|, :bold, :italic
     #     plugins :Essentials, :Paragraph, :Bold, :Italic
     #   end

data/lib/ckeditor5/rails/editor/props_inline_plugin.rb

@@ -35,7 +35,7 @@ module CKEditor5::Rails::Editor
     def to_html(nonce: nil)
       code = wrap_with_handlers(@plugin.code)
 
-      tag.script(code.html_safe, nonce: nonce)
+      tag.script(code.html_safe, type: 'module', nonce: nonce)
     end
 
     private

data/lib/ckeditor5/rails/engine.rb

@@ -3,7 +3,10 @@
 require 'rails/engine'
 
 require_relative 'presets/manager'
-require_relative 'plugins'
+require_relative 'plugins/simple_upload_adapter'
+require_relative 'plugins/wproofreader'
+require_relative 'plugins/special_characters_bootstrap'
+require_relative 'plugins/custom_translations_loader'
 
 module CKEditor5::Rails
   class PresetNotFoundError < ArgumentError; end

data/lib/ckeditor5/rails/presets/manager.rb

@@ -27,7 +27,7 @@ module CKEditor5::Rails::Presets
     #   end
     # @example Define preset from scratch
     #   presets.define :blank, inherit: false do
-    #     version '43.3.1'
+    #     version '44.3.0'
     #     gpl
     #     type :classic
     #   end
@@ -78,7 +78,7 @@ module CKEditor5::Rails::Presets
     # @example Basic configuration
     #   CKEditor5::Rails.configure do
     #     presets.define :default do
-    #       version '43.3.1'
+    #       version '44.3.0'
     #       gpl
     #       type :classic
     #       menubar

data/lib/ckeditor5/rails/presets/preset_builder.rb

@@ -6,14 +6,14 @@ require_relative 'special_characters_builder'
 
 module CKEditor5::Rails
   module Presets
-    class PresetBuilder # rubocop:disable Metrics/ClassLength
+    class PresetBuilder
       include Editor::Helpers::Config
       include Concerns::ConfigurationMethods
       include Concerns::PluginMethods
 
       # @example Basic initialization
       #   PresetBuilder.new do
-      #     version '43.3.1'
+      #     version '44.3.0'
       #     gpl
       #     type :classic
       #   end
@@ -174,15 +174,12 @@ module CKEditor5::Rails
 
       # Set or get editor version
       # @param version [String, nil] Editor version to set
-      # @param apply_patches [Boolean] Whether to apply integration patches after setting version
       # @example Set specific version
-      #   version '43.3.1'
-      # @example Set version without applying patches
-      #   version '43.3.1', apply_patches: false
+      #   version '44.3.0'
       # @example Get current version
       #   version # => "43.3.1"
       # @return [String, nil] Current version string or nil if not set
-      def version(version = nil, apply_patches: true)
+      def version(version = nil)
         return @version&.to_s if version.nil?
 
         if @automatic_upgrades && version
@@ -195,13 +192,6 @@ module CKEditor5::Rails
         # If there is no license key set, and the version if newer than 44.0.0, switch to GPL
         # as the license key is now required in all versions
         gpl if license_key.nil? && @version.major >= 44
-        apply_integration_patches if apply_patches
-      end
-
-      # Apply integration patches for the current version
-      # @return [void]
-      def apply_integration_patches
-        patch_plugin(Plugins::Patches::FixColorPickerRaceCondition.new)
       end
 
       # Enable or disable automatic version upgrades

data/lib/ckeditor5/rails/version.rb

@@ -2,7 +2,7 @@
 
 module CKEditor5
   module Rails
-    VERSION = '1.27.3'
+    VERSION = '1.28.1'
 
     DEFAULT_CKEDITOR_VERSION = '44.3.0'
   end

data/spec/lib/ckeditor5/rails/cdn/helpers_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe CKEditor5::Rails::Cdn::Helpers do
   let(:helper) { test_class.new }
   let(:preset) do
     CKEditor5::Rails::Presets::PresetBuilder.new do
-      version '34.1.0', apply_patches: false
+      version '34.1.0'
       type :classic
       translations :pl
       cdn :cloud
@@ -151,7 +151,7 @@ RSpec.describe CKEditor5::Rails::Cdn::Helpers do
     context 'when overriding preset values' do
       let(:preset) do
         CKEditor5::Rails::Presets::PresetBuilder.new do
-          version '34.1.0', apply_patches: false
+          version '34.1.0'
           type :classic
           language :pl
           cdn :cloud

data/spec/lib/ckeditor5/rails/presets/manager_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe CKEditor5::Rails::Presets::Manager do
       it 'creates new preset based on default' do
         manager.define(:custom) do
           automatic_upgrades enabled: false
-          version '36.0.0', apply_patches: false
+          version '36.0.0'
         end
 
         expect(manager[:custom].version).to eq('36.0.0')
@@ -32,7 +32,7 @@ RSpec.describe CKEditor5::Rails::Presets::Manager do
       it 'creates completely new preset' do
         manager.define(:custom, inherit: false) do
           automatic_upgrades enabled: false
-          version '36.0.0', apply_patches: false
+          version '36.0.0'
         end
 
         expect(manager[:custom].version).to eq('36.0.0')

data/spec/lib/ckeditor5/rails/presets/preset_builder_spec.rb

@@ -709,7 +709,7 @@ RSpec.describe CKEditor5::Rails::Presets::PresetBuilder do
     it 'applies patch when applicable' do
       allow(patch_plugin).to receive(:applicable_for_version?).and_return(true)
 
-      builder.version('35.0.0', apply_patches: false)
+      builder.version('35.0.0')
       builder.patch_plugin(patch_plugin)
 
       plugin_names = builder.config[:plugins].map(&:name)
@@ -733,19 +733,4 @@ RSpec.describe CKEditor5::Rails::Presets::PresetBuilder do
       expect(plugin_names).to include(:TestPatch)
     end
   end
-
-  describe '#apply_integration_patches' do
-    it 'applies known integration patches' do
-      builder.version('35.0.0', apply_patches: false)
-      expect { builder.apply_integration_patches }
-        .to change { builder.config[:plugins].count }
-        .by(1)
-    end
-
-    it 'apply patches when version is not set' do
-      expect { builder.apply_integration_patches }
-        .to change { builder.config[:plugins].count }
-        .by(1)
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ckeditor5
 version: !ruby/object:Gem::Version
-  version: 1.27.3
+  version: 1.28.1
 platform: ruby
 authors:
 - Mateusz Bagiński
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-08 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,9 +89,7 @@ files:
 - lib/ckeditor5/rails/hooks/form.rb
 - lib/ckeditor5/rails/hooks/importmap.rb
 - lib/ckeditor5/rails/hooks/simple_form.rb
-- lib/ckeditor5/rails/plugins.rb
 - lib/ckeditor5/rails/plugins/custom_translations_loader.rb
-- lib/ckeditor5/rails/plugins/patches/fix_color_picker_race_condition.rb
 - lib/ckeditor5/rails/plugins/simple_upload_adapter.rb
 - lib/ckeditor5/rails/plugins/special_characters_bootstrap.rb
 - lib/ckeditor5/rails/plugins/wproofreader.rb

data/lib/ckeditor5/rails/plugins/patches/fix_color_picker_race_condition.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../editor/props_patch_plugin'
-
-module CKEditor5::Rails::Plugins::Patches
-  # Fixes focus management issues in the CKEditor5 color picker component
-  # by ensuring proper focus handling when the color picker is opened.
-  #
-  # The patch modifies the ColorPickerView's focus behavior to properly
-  # focus either the hex input field (when visible) or the first slider.
-  #
-  # @see https://github.com/ckeditor/ckeditor5/issues/17069
-  class FixColorPickerRaceCondition < CKEditor5::Rails::Editor::PropsPatchPlugin
-    PLUGIN_CODE = <<~JS
-      const { Plugin, ColorPickerView, debounce } = await import( 'ckeditor5' );
-
-      return class FixColorPickerRaceCondition extends Plugin {
-        static get pluginName() {
-          return 'FixColorPickerRaceCondition';
-        }
-
-        constructor(editor) {
-          super(editor);
-          this.editor = editor;
-          this.#applyPatch();
-        }
-
-        #applyPatch() {
-          const { focus } = ColorPickerView.prototype;
-
-          ColorPickerView.prototype.focus = function() {
-              try {
-                if (!this._config.hideInput) {
-                  this.hexInputRow.children.get( 1 ).focus();
-                }
-
-                this.slidersView.first.focus();
-              } catch (error) {
-                focus.apply(this, arguments);
-              }
-          }
-        }
-      }
-    JS
-
-    def initialize
-      super(:FixColorPickerRaceCondition, PLUGIN_CODE, max_version: '44.4.0')
-      compress!
-    end
-  end
-end

data/lib/ckeditor5/rails/plugins.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module CKEditor5::Rails::Plugins
-  module Patches
-  end
-end
-
-# Core plugins
-require_relative 'plugins/simple_upload_adapter'
-require_relative 'plugins/wproofreader'
-require_relative 'plugins/special_characters_bootstrap'
-require_relative 'plugins/custom_translations_loader'
-
-# Plugin patches and fixes
-require_relative 'plugins/patches/fix_color_picker_race_condition'