formstrap 0.3.3 → 0.3.4

data/app/assets/stylesheets/formstrap.scss

@@ -4,6 +4,10 @@
 // Flatpickr
 @import "formstrap/vendor/flatpickr";
 
+// Redactor
+@import "formstrap/vendor/redactor";
+@import "formstrap/vendor/overrides/redactor";
+
 // Formstrap
 @import "formstrap/general";
 @import "formstrap/utilities";

data/app/models/formstrap/redactor_view.rb

@@ -0,0 +1,57 @@
+module Formstrap
+  class RedactorView < ViewModel
+    def options
+      default_options.deep_merge(to_h)
+    end
+
+    private
+
+    def default_options
+      {
+        data: {
+          controller: "redactor",
+          "redactor-options": redactor_options
+        }
+      }
+    end
+
+    def redactor_options
+      default_redactor_options.deep_merge(redactor || {})
+    end
+
+    def default_redactor_options
+      {
+        lang: I18n.locale,
+        # button to control a block/line in the editor
+        control: false,
+        minHeight: '57px',
+        theme: "light",
+        # Popup when highlighting text
+        context: false,
+        # Top toolbar
+        toolbar: true,
+        popups: {
+          # Options in addbar popup (press + button)
+          addbar: %w[format bold italic deleted list table link embed],
+          # Options in block/line popup
+          control: [],
+          # Options in format popup
+          format: %w[text h1 h2 h3 h4],
+        },
+        block: {
+          # Outline block/line in the editor
+          outline: false,
+        },
+        buttons: {
+          # Options when highlighting text
+          context: %w[bold underline italic],
+          # Options in toolbar on the right
+          extrabar: %w[],
+          # Options in toolbar on the left
+          toolbar: %w[format bold italic deleted list table link html],
+        },
+        plugins: %w[emoji linkstyles],
+      }.delete_if { |k, v| v.nil? }
+    end
+  end
+end

data/app/models/formstrap/wysiwyg_view.rb

@@ -6,9 +6,17 @@ module Formstrap
 
     private
 
+    def toolbar
+      @toolbar != false
+    end
+
     def default_options
       {
-        hybrid: toolbar == false
+        redactor: {
+          context: !toolbar,
+          extrabar: toolbar,
+          toolbar: toolbar
+        }
       }
     end
   end

data/app/views/formstrap/{_redactorx.html.erb → _redactor.html.erb}

@@ -1,5 +1,5 @@
 <%
-  # formstrap/redactorx
+  # formstrap/redactor
   #
   # ==== Required parameters
   # * +attribute+ - Name of the attribute of the form model
@@ -8,24 +8,21 @@
   # ==== Optional parameters
   # * +append+ - Display as input group with text on the right-hand side
   # * +hint+ - Informative text to assist with data input. HTML markup is allowed.
-  # * +hybrid+ - Enables hybrid mode when set to true (default = false)
   # * +label+ - Text to display inside label tag. Defaults to the attribute name. Set to false if you don"t want to show a label.
   # * +prepend+ - Display as input group with text on the left-hand side
   # * +redactor+ - Hash with all options you can pass to redactor JS config
   # * +wrapper+ - Hash with all options for the surrounding html tag
   #
   # ==== References
-  # https://headmin.dev/docs/forms/redactorx
-  # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea
-  # https://apidock.com/rails/ActionView/Helpers/FormHelper/text_area
+  # https://imperavi.com/redactor/docs
   #
   # ==== Examples
   #   Basic version
   #   <%= form_with do |form| %#>
-  #     <%= render "formstrap/redactorx", form: form, attribute: :text %#>
+  #     <%= render "formstrap/redactor", form: form, attribute: :text %#>
   #   <% end %#>
 
-  redactor = Formstrap::RedactorxView.new(local_assigns)
+  redactor = Formstrap::RedactorView.new(local_assigns)
 %>
 
 <%= render "formstrap/textarea", redactor.options %>

data/app/views/formstrap/_wysiwyg.html.erb

@@ -12,17 +12,15 @@
   # * +wrapper+ - Hash with all options for the surrounding html tag
   #
   # ==== References
-  # https://headmin.dev/docs/forms/redactorx
-  # https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea
-  # https://apidock.com/rails/ActionView/Helpers/FormHelper/text_area
+  # https://imperavi.com/redactor/docs
   #
   # ==== Examples
   #   Basic version
   #   <%= form_with do |form| %#>
-  #     <%= render "formstrap/redactorx", form: form, attribute: :text %#>
+  #     <%= render "formstrap/wysiwyg", form: form, attribute: :text %#>
   #   <% end %#>
 
   wysiwyg = Formstrap::WysiwygView.new(local_assigns)
 %>
 
-<%= render "formstrap/redactorx", wysiwyg.options %>
+<%= render "formstrap/redactor", wysiwyg.options %>

data/lib/formstrap/form_builder.rb

@@ -118,8 +118,12 @@ module Formstrap
       @template.render("formstrap/repeater", form: self, attribute: attribute, **options, &block)
     end
 
-    def redactorx(attribute, options = {})
-      render_input(:redactorx, attribute, options)
+    def redactor(attribute, formstrap: true, **options)
+      if formstrap
+        render_input(:redactor, attribute, options)
+      else
+        text_area attribute, options
+      end
     end
 
     def search(attribute, options = {})
@@ -162,8 +166,12 @@ module Formstrap
       end
     end
 
-    def wysiwyg(attribute, options = {})
-      render_input(:wysiwyg, attribute, options)
+    def wysiwyg(attribute, formstrap: true, **options)
+      if formstrap
+        render_input(:wysiwyg, attribute, options)
+      else
+        text_area attribute, options
+      end
     end
 
     def render_input(name, attribute, options)

data/lib/formstrap/version.rb

@@ -1,3 +1,3 @@
 module Formstrap
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontierdotbe/formstrap",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Bootstrap-powered Form Helpers",
   "module": "app/assets/javascripts/formstrap.js",
   "main": "app/assets/javascripts/formstrap.js",
@@ -28,7 +28,7 @@
     "flatpickr": "^4.6.9",
     "sass": "^1.58.3",
     "sortablejs": "^1.14.0",
-    "tom-select": "^2.0.0",
+    "tom-select": "^2.3.1",
     "yarn": "^1.22.18"
   },
   "devDependencies": {

data/yarn.lock

@@ -1710,10 +1710,10 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-tom-select@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tom-select/-/tom-select-2.2.2.tgz#8e5f9296e6d80254feccb57f0986bd6c44d126e2"
-  integrity sha512-igGah1yY6yhrnN2h/Ky8I5muw/nE/YQxIsEZoYu5qaA4bsRibvKto3s8QZZosKpOd0uO8fNYhRfAwgHB4IAYew==
+tom-select@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tom-select/-/tom-select-2.3.1.tgz#df338d9082874cd0bceb3bee87ed0184447c47f1"
+  integrity sha512-QS4vnOcB6StNGqX4sGboGXL2fkhBF2gIBB+8Hwv30FZXYPn0CyYO8kkdATRvwfCTThxiR4WcXwKJZ3cOmtI9eg==
   dependencies:
     "@orchidjs/sifter" "^1.0.3"
     "@orchidjs/unicode-variants" "^1.0.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Jef Vlamings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies: []
 description: An extensive Bootstrap form library to power your Ruby On Rails application.
 email:
@@ -47,11 +47,18 @@ files:
 - app/assets/javascripts/formstrap/controllers/nested_preview_controller.js
 - app/assets/javascripts/formstrap/controllers/popup_controller.js
 - app/assets/javascripts/formstrap/controllers/preview_controller.js
-- app/assets/javascripts/formstrap/controllers/redactorx_controller.js
+- app/assets/javascripts/formstrap/controllers/redactor_controller.js
 - app/assets/javascripts/formstrap/controllers/repeater_controller.js
 - app/assets/javascripts/formstrap/controllers/select_controller.js
 - app/assets/javascripts/formstrap/controllers/textarea_controller.js
 - app/assets/javascripts/formstrap/index.js
+- app/assets/javascripts/formstrap/vendor/redactor/i18n/de.js
+- app/assets/javascripts/formstrap/vendor/redactor/i18n/en.js
+- app/assets/javascripts/formstrap/vendor/redactor/i18n/fr.js
+- app/assets/javascripts/formstrap/vendor/redactor/i18n/nl.js
+- app/assets/javascripts/formstrap/vendor/redactor/index.js
+- app/assets/javascripts/formstrap/vendor/redactor/plugins/emoji.js
+- app/assets/javascripts/formstrap/vendor/redactor/plugins/linkstyles.js
 - app/assets/stylesheets/formstrap.css
 - app/assets/stylesheets/formstrap.scss
 - app/assets/stylesheets/formstrap/autocomplete.scss
@@ -69,6 +76,8 @@ files:
 - app/assets/stylesheets/formstrap/utilities.scss
 - app/assets/stylesheets/formstrap/utilities/dropzone.scss
 - app/assets/stylesheets/formstrap/vendor/flatpickr.css
+- app/assets/stylesheets/formstrap/vendor/overrides/redactor.scss
+- app/assets/stylesheets/formstrap/vendor/redactor.css
 - app/assets/stylesheets/formstrap/vendor/tom-select-bootstrap.scss
 - app/controllers/concerns/formstrap/pagination.rb
 - app/controllers/formstrap/media_controller.rb
@@ -104,7 +113,7 @@ files:
 - app/models/formstrap/media_view.rb
 - app/models/formstrap/number_view.rb
 - app/models/formstrap/password_view.rb
-- app/models/formstrap/redactorx_view.rb
+- app/models/formstrap/redactor_view.rb
 - app/models/formstrap/search_view.rb
 - app/models/formstrap/select_view.rb
 - app/models/formstrap/switch_view.rb
@@ -137,7 +146,7 @@ files:
 - app/views/formstrap/_media.html.erb
 - app/views/formstrap/_number.html.erb
 - app/views/formstrap/_password.html.erb
-- app/views/formstrap/_redactorx.html.erb
+- app/views/formstrap/_redactor.html.erb
 - app/views/formstrap/_repeater.html.erb
 - app/views/formstrap/_search.html.erb
 - app/views/formstrap/_select.html.erb

data/app/assets/javascripts/formstrap/controllers/redactorx_controller.js

@@ -1,40 +0,0 @@
-/* global RedactorX */
-import { Controller } from '@hotwired/stimulus'
-
-export default class extends Controller {
-  connect () {
-    this.initRedactor()
-  }
-
-  initRedactor () {
-    if (typeof RedactorX === 'undefined') {
-      console.error('RedactorX is a paid module and is not included in Headmin. Please purchase it and import it as a JS module')
-      return false
-    }
-
-    const defaultOptions = {
-      editor: {
-        minHeight: '57px'
-      },
-      subscribe: {
-        'app.start': () => {
-          this.stylize()
-        }
-      }
-    }
-    const options = JSON.parse(this.element.getAttribute('data-redactor-options'))
-    RedactorX(this.element, { ...defaultOptions, ...options })
-  }
-
-  stylize () {
-    const container = this.element.nextElementSibling
-
-    // Copy textarea classes
-    const inputClasses = this.element.classList
-    container.classList.add(...inputClasses)
-
-    // Add top margin to input group
-    // const inputGroup = container.closest('.input-group')
-    // inputGroup.classList.add('mt-4')
-  }
-}

data/app/models/formstrap/redactorx_view.rb

@@ -1,57 +0,0 @@
-module Formstrap
-  class RedactorxView < ViewModel
-    def options
-      default_options.deep_merge(to_h)
-    end
-
-    private
-
-    def default_options
-      {
-        data: {
-          controller: "redactorx",
-          "redactor-options": redactor_options
-        }
-      }
-    end
-
-    def control
-      @control || (hybrid ? true : nil)
-    end
-
-    def context
-      @context || (hybrid ? true : nil)
-    end
-
-    def toolbar
-      @toolbar || (hybrid ? false : nil)
-    end
-
-    def addbar
-      @addbar || %w[paragraph image embed table quote pre line]
-    end
-
-    def plugins
-      @plugins || %w[shortcut]
-    end
-
-    attr_reader :topbar
-
-    def redactor_options
-      default_redactor_options.deep_merge(redactor || {})
-    end
-
-    def default_redactor_options
-      {
-        control: control,
-        context: context,
-        toolbar: toolbar,
-        buttons: {
-          addbar: addbar,
-          plugins: plugins,
-          topbar: topbar
-        }
-      }.delete_if { |k, v| v.nil? }
-    end
-  end
-end