trestle 0.9.9 → 0.10.0.pre

data/lib/trestle/form/fields/check_box_helpers.rb

@@ -2,10 +2,6 @@ module Trestle
   class Form
     module Fields
       module CheckBoxHelpers
-        def custom?
-          options[:custom] != false
-        end
-
         def switch?
           options[:switch]
         end
@@ -15,26 +11,19 @@ module Trestle
         end
 
         def default_wrapper_class
-          if custom?
-            [
-              "custom-control",
-              switch? ? "custom-switch" : "custom-checkbox",
-              ("custom-control-inline" if inline?)
-            ].compact
-          else
-            [
-              "form-check",
-              ("form-check-inline" if inline?)
-            ].compact
-          end
+          [
+            "form-check",
+            ("form-switch" if switch?),
+            ("form-check-inline" if inline?)
+          ].compact
         end
 
         def input_class
-          custom? ? ["custom-control-input"] : ["form-check-input"]
+          ["form-check-input"]
         end
 
         def label_class
-          custom? ? ["custom-control-label"] : ["form-check-label"]
+          ["form-check-label"]
         end
 
         def defaults

data/lib/trestle/form/fields/collection_select.rb

@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: disabled? || readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: disabled? || readonly?, data: { controller: "select" })
         end
       end
     end

data/lib/trestle/form/fields/color_field.rb

@@ -2,6 +2,10 @@ class Trestle::Form::Fields::ColorField < Trestle::Form::Fields::FormControl
   def field
     builder.raw_color_field(name, options)
   end
+
+  def defaults
+    super.merge(class: ["form-control-color"])
+  end
 end
 
 Trestle::Form::Builder.register(:color_field, Trestle::Form::Fields::ColorField)

data/lib/trestle/form/fields/date_field.rb

@@ -4,6 +4,10 @@ class Trestle::Form::Fields::DateField < Trestle::Form::Fields::FormControl
   def field
     builder.raw_date_field(name, options)
   end
+
+  def controller
+    "datepicker"
+  end
 end
 
 Trestle::Form::Builder.register(:date_field, Trestle::Form::Fields::DateField)

data/lib/trestle/form/fields/date_picker.rb

@@ -4,13 +4,15 @@ module Trestle::Form::Fields::DatePicker
       options[:prepend] ||= options.delete(:icon) { default_icon }
     end
 
-    if enable_date_picker?
-      options.reverse_merge!(data: { picker: true, allow_clear: true })
-    end
-
     super
   end
 
+  def defaults
+    defaults = super
+    defaults.merge!(data: { controller: controller, allow_clear: true }) if enable_date_picker?
+    defaults
+  end
+
   def default_icon
     icon("fa fa-calendar")
   end
@@ -18,4 +20,8 @@ module Trestle::Form::Fields::DatePicker
   def enable_date_picker?
     !disabled? && !readonly? && options[:picker] != false
   end
+
+  def controller
+    "datepicker"
+  end
 end

data/lib/trestle/form/fields/date_select.rb

@@ -17,7 +17,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: readonly?, data: { controller: "select" })
         end
       end
     end

data/lib/trestle/form/fields/datetime_field.rb

@@ -4,6 +4,10 @@ class Trestle::Form::Fields::DatetimeField < Trestle::Form::Fields::FormControl
   def field
     builder.raw_datetime_field(name, options)
   end
+
+  def controller
+    "datetimepicker"
+  end
 end
 
 Trestle::Form::Builder.register(:datetime_field, Trestle::Form::Fields::DatetimeField)

data/lib/trestle/form/fields/datetime_select.rb

@@ -17,7 +17,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: readonly?, data: { controller: "select" })
         end
       end
     end

data/lib/trestle/form/fields/file_field.rb

@@ -1,31 +1,6 @@
-module Trestle
-  class Form
-    module Fields
-      class FileField < Field
-        def field
-          if custom?
-            content_tag(:div, class: "custom-file") do
-              concat builder.raw_file_field(name, options.merge(class: "custom-file-input"))
-              concat builder.label(name, choose_file_text, class: "custom-file-label", data: { browse: browse_text })
-            end
-          else
-            builder.raw_file_field(name, options)
-          end
-        end
-
-        def custom?
-          options[:custom] != false
-        end
-
-        def choose_file_text
-          I18n.t("trestle.file.choose_file", default: "Choose file...")
-        end
-
-        def browse_text
-          I18n.t("trestle.file.browse", default: "Browse")
-        end
-      end
-    end
+class Trestle::Form::Fields::FileField < Trestle::Form::Fields::FormControl
+  def field
+    builder.raw_file_field(name, options)
   end
 end
 

data/lib/trestle/form/fields/form_control.rb

@@ -13,9 +13,9 @@ module Trestle
         def input_group
           if @prepend || @append
             content_tag(:div, class: "input-group") do
-              concat content_tag(:div, input_group_addon(@prepend), class: "input-group-prepend") if @prepend
+              concat input_group_addon(@prepend) if @prepend
               concat yield
-              concat content_tag(:div, input_group_addon(@append), class: "input-group-append") if @append
+              concat input_group_addon(@append) if @append
             end
           else
             yield

data/lib/trestle/form/fields/form_group.rb

@@ -42,7 +42,7 @@ module Trestle
         end
 
         def label
-          builder.label(name, options[:label], class: ["control-label", ("sr-only" if options[:hide_label])].compact)
+          builder.label(name, options[:label], class: ["form-label", ("visually-hidden" if options[:hide_label])].compact)
         end
 
         def defaults

data/lib/trestle/form/fields/grouped_collection_select.rb

@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: disabled? || readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: disabled? || readonly?, data: { controller: "select" })
         end
       end
     end

data/lib/trestle/form/fields/radio_button_helpers.rb

@@ -2,35 +2,23 @@ module Trestle
   class Form
     module Fields
       module RadioButtonHelpers
-        def custom?
-          options[:custom] != false
-        end
-
         def inline?
           options[:inline]
         end
 
         def default_wrapper_class
-          if custom?
-            [
-              "custom-control",
-              "custom-radio",
-              ("custom-control-inline" if inline?)
-            ].compact
-          else
-            [
-              "form-check",
-              ("form-check-inline" if inline?)
+          [
+            "form-check",
+            ("form-check-inline" if inline?)
           ].compact
-          end
         end
 
         def input_class
-          custom? ? ["custom-control-input"] : ["form-check-input"]
+          ["form-check-input"]
         end
 
         def label_class
-          custom? ? ["custom-control-label"] : ["form-check-label"]
+          ["form-check-label"]
         end
       end
     end

data/lib/trestle/form/fields/range_field.rb

@@ -6,12 +6,8 @@ module Trestle
           builder.raw_range_field(name, options)
         end
 
-        def custom?
-          options[:custom] != false
-        end
-
         def defaults
-          custom? ? super.merge(class: ["custom-range"]) : super
+          super.merge(class: ["form-range"])
         end
       end
     end

data/lib/trestle/form/fields/select.rb

@@ -18,13 +18,29 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: disabled? || readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: disabled? || readonly?, data: { controller: "select", placeholder: placeholder, allow_clear: clearable? })
         end
 
         def default_choices
           builder.object.send(name) if builder.object
         end
 
+        def placeholder
+          prompt = options[:prompt] || options[:include_blank]
+
+          if prompt.kind_of?(String)
+            prompt
+          elsif options[:prompt]
+            I18n.translate("helpers.select.prompt", default: "Please select")
+          elsif options[:include_blank]
+            ""
+          end
+        end
+
+        def clearable?
+          options[:allow_clear] || options[:prompt].present? || options[:include_blank].present?
+        end
+
         # Allows an array of model instances (or a scope) to be
         # passed to the select field as the list of choices.
         class Choices

data/lib/trestle/form/fields/time_field.rb

@@ -8,6 +8,10 @@ class Trestle::Form::Fields::TimeField < Trestle::Form::Fields::FormControl
   def default_icon
     icon("fa fa-clock-o")
   end
+
+  def controller
+    "timepicker"
+  end
 end
 
 Trestle::Form::Builder.register(:time_field, Trestle::Form::Fields::TimeField)

data/lib/trestle/form/fields/time_select.rb

@@ -17,7 +17,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: readonly?, data: { controller: "select" })
         end
       end
     end

data/lib/trestle/form/fields/time_zone_select.rb

@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: disabled? || readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: disabled? || readonly?, data: { controller: "select" })
         end
       end
     end

data/lib/trestle/form/renderer.rb

@@ -23,6 +23,9 @@ module Trestle
       # that they can be delegated to the form builder or template by method_missing.
       undef_method :select, :display
 
+      # These methods defined in ActionView::Helpers::CaptureHelper should be called directly on the existing template object.
+      delegate :content_for, :content_for?, :provide, to: :@template
+
       delegate :concat, to: :output_buffer
 
       def initialize(template, form=nil)

data/lib/trestle/form.rb

@@ -10,10 +10,25 @@ module Trestle
 
     def initialize(options={}, &block)
       @options, @block = options, block
+
+      if @options[:modal] == true
+        @options[:modal] = {}
+      end
+
+      if options[:dialog]
+        Trestle.deprecator.warn("`form dialog: true` is deprecated. Please use `form modal: true` instead.", caller_locations(3))
+        @options.delete(:dialog)
+        @options[:modal] = {}
+      end
+    end
+
+    def modal?
+      options[:modal]
     end
 
     def dialog?
-      options[:dialog] == true
+      Trestle.deprecator.warn("`Trestle::Form#dialog?` is deprecated. Please use `modal?` instead.")
+      options[:modal]
     end
 
     def render(template, instance)

data/lib/trestle/resource/toolbar.rb

@@ -14,11 +14,11 @@ module Trestle
         end
 
         def delete
-          link(t("buttons.delete", default: "Delete %{model_name}"), instance, action: :destroy, method: :delete, style: :danger, icon: "fa fa-trash", data: { toggle: "confirm-delete", placement: "bottom" }) if action?(:destroy)
+          link(t("buttons.delete", default: "Delete %{model_name}"), instance, action: :destroy, style: :danger, icon: "fa fa-trash", data: { turbo_method: "delete", controller: "confirm-delete", confirm_delete_placement_value: "bottom" }) if action?(:destroy)
         end
 
         def dismiss
-          button(t("buttons.ok", default: "OK"), style: :light, data: { dismiss: "modal" }) if @template.dialog_request?
+          button(t("buttons.ok", default: "OK"), style: :light, data: { bs_dismiss: "modal" }) if @template.modal_request?
         end
         alias ok dismiss
 

data/lib/trestle/table/actions_column.rb

@@ -42,7 +42,7 @@ module Trestle
         end
 
         def delete
-          link(t("buttons.delete", default: "Delete"), instance, admin: admin, action: :destroy, method: :delete, icon: "fa fa-trash", style: :danger, data: { toggle: "confirm-delete", placement: "left" })
+          link(t("buttons.delete", default: "Delete"), instance, admin: admin, action: :destroy, icon: "fa fa-trash", style: :danger, data: { turbo_method: "delete", controller: "confirm-delete", confirm_delete_placement_value: "left" })
         end
 
         builder_method :show, :edit, :delete
@@ -67,7 +67,7 @@ module Trestle
         end
 
         def classes
-          super + ["actions"]
+          super + ["table-actions"]
         end
 
         def content(instance)

data/lib/trestle/table/row.rb

@@ -33,8 +33,9 @@ module Trestle
           options = Trestle::Options.new
 
           if @table.admin && @table.autolink? && @table.admin.actions.include?(:show)
+            options.merge!(data: { controller: "follow-url", action: "click->follow-url#follow" })
             options.merge!(data: { url: admin_url_for(instance) })
-            options.merge!(data: { behavior: "dialog" }) if @table.admin.form.dialog?
+            options.merge!(data: { modal: true }) if @table.admin.form.modal?
           end
 
           options.merge!(@row.options)

data/lib/trestle/table/select_column.rb

@@ -13,11 +13,11 @@ module Trestle
 
       class Renderer < Column::Renderer
         def header
-          checkbox "", nil, id: checkbox_id("all")
+          checkbox "", nil, id: checkbox_id("all"), data: { checkbox_select_target: "selectAll", action: "change->checkbox-select#toggleAll" }
         end
 
         def content(instance)
-          checkbox "selected[]", instance.to_param, id: checkbox_id(instance.to_param)
+          checkbox "selected[]", instance.to_param, id: checkbox_id(instance.to_param), data: { checkbox_select_target: "checkbox", action: "change->checkbox-select#toggle" }
         end
 
         def classes
@@ -34,10 +34,7 @@ module Trestle
         end
 
         def checkbox(name, value="1", options={})
-          @template.content_tag(:div, class: "custom-control custom-checkbox") do
-            @template.check_box_tag(name, value, false, options.merge(class: "custom-control-input")) +
-              @template.tag(:label, for: options.fetch(:id), class: "custom-control-label")
-          end
+          @template.check_box_tag(name, value, false, options.merge(class: "form-check-input"))
         end
       end
     end

data/lib/trestle/table.rb

@@ -70,7 +70,12 @@ module Trestle
       end
 
       def data
-        options[:data]
+        data = options[:data] || {}
+
+        controllers = Array(data[:controller])
+        controllers << "checkbox-select"
+
+        data.merge(controller: controllers.join(" "))
       end
     end
   end

data/lib/trestle/toolbar/item.rb

@@ -97,7 +97,7 @@ module Trestle
 
     class Dropdown < Button
       def options
-        super.merge(type: "button", data: { toggle: "dropdown" })
+        super.merge(type: "button", data: { bs_toggle: "dropdown" })
       end
 
       def label

data/lib/trestle/toolbar/menu.rb

@@ -18,16 +18,13 @@ module Trestle
       end
 
       def render_toggle(options={})
-        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle"], data: { toggle: "dropdown" }) do
-          safe_join([
-            content_tag(:span, "", class: "caret"),
-            content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "sr-only")
-          ])
+        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle dropdown-toggle-split"], data: { bs_toggle: "dropdown" }, aria: { expanded: false }) do
+          content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "visually-hidden")
         end
       end
 
       def render_items
-        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-right", role: "menu")
+        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-end", role: "menu")
       end
 
       class Builder

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.9.9"
+  VERSION = "0.10.0.pre"
 end

data/lib/trestle.rb

@@ -6,6 +6,7 @@ require "kaminari"
 module Trestle
   require_relative "trestle/evaluation_context"
   require_relative "trestle/builder"
+  require_relative "trestle/color"
   require_relative "trestle/hook"
   require_relative "trestle/toolbar"
   require_relative "trestle/adapters"
@@ -64,30 +65,8 @@ module Trestle
     Navigation.build(blocks, context)
   end
 
-  # Returns the I18n fallbacks for the given locale.
-  #
-  # This is used from within a Sprockets asset (JavaScript)
-  # to determine which locale files to include.
-  #
-  # Examples
-  #
-  #   Trestle.i18n_fallbacks("pt-BR") => ["pt-BR", "pt"]
-  #   Trestle.i18n_fallbacks("ca") => ["ca", "es-ES", "es"] %>
-  #
-  # Returns an array of locale Strings.
-  def self.i18n_fallbacks(locale=I18n.locale)
-    if I18n.respond_to?(:fallbacks)
-      I18n.fallbacks[locale].map(&:to_s)
-    elsif locale.to_s.include?("-")
-      fallback = locale.to_s.split("-").first
-      [locale, fallback]
-    else
-      [locale]
-    end
-  end
-
   def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new
+    @deprecator ||= ActiveSupport::Deprecation.new('1.0', 'Trestle')
   end
 end
 

data/package.json

@@ -1,11 +1,11 @@
 {
   "name": "trestle",
-  "version": "0.9.7",
+  "version": "0.10.0.pre",
   "description": "A modern, responsive admin framework for Ruby on Rails",
   "homepage": "https://trestle.io",
   "repository": "https://github.com/TrestleAdmin/trestle.git",
   "author": "Sam Pohlenz <sam@sampohlenz.com>",
-  "license": "LGPL-3.0",
+  "license": "LGPL-3.0-only",
   "private": true,
   "scripts": {
     "dev": "webpack --mode development",
@@ -13,33 +13,37 @@
     "watch": "webpack --mode development --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.6",
-    "@babel/preset-env": "^7.14.7",
-    "autoprefixer": "^10.2.6",
-    "babel-loader": "^8.0.6",
-    "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^5.2.6",
-    "css-minimizer-webpack-plugin": "^3.0.2",
-    "expose-loader": "^3.0.0",
-    "mini-css-extract-plugin": "^2.0.0",
-    "postcss": "^8.3.5",
-    "postcss-loader": "^6.1.1",
-    "sass": "^1.76.0",
-    "sass-loader": "^12.1.0",
-    "webpack": "^5.42.0",
-    "webpack-cli": "^4.7.2"
+    "@babel/core": "^7.20.12",
+    "@babel/helper-explode-assignable-expression": "^7.18.6",
+    "@babel/preset-env": "^7.20.2",
+    "autoprefixer": "^10.4.13",
+    "babel-loader": "^9.1.2",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.7.3",
+    "css-minimizer-webpack-plugin": "^5.0.0",
+    "expose-loader": "^4.0.0",
+    "mini-css-extract-plugin": "^2.7.2",
+    "postcss": "^8.4.21",
+    "postcss-loader": "^7.0.2",
+    "sass": "^1.57.1",
+    "sass-loader": "^13.2.0",
+    "webpack": "^5.75.0",
+    "webpack-bundle-analyzer": "^4.7.0",
+    "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.15.3",
-    "@rails/ujs": "^6.1.3-1",
-    "bootstrap": "^4.5.0",
-    "bootstrap-confirmation2": "^4.2.1",
-    "bs-custom-file-input": "^1.3.2",
-    "flatpickr": "^4.6.2",
+    "@fortawesome/fontawesome-free": "^6.2.1",
+    "@hotwired/stimulus": "^3.2.2",
+    "@hotwired/stimulus-webpack-helpers": "^1.0.1",
+    "@hotwired/turbo": "^8.0.2",
+    "@popperjs/core": "^2.11.8",
+    "bootstrap": "~5.3.1",
+    "flatpickr": "^4.6.13",
+    "get-video-id": "^4.1.7",
+    "i18n-js": "^4.4.3",
     "jquery": "^3.6.0",
-    "magnific-popup": "^1.1.0",
-    "popper.js": "^1.15.0",
-    "select2": "^4.0.10",
-    "select2-theme-bootstrap4": "^1.0.0"
+    "photoswipe": "^5.4.4",
+    "select2": "^4.0.13",
+    "select2-bootstrap-5-theme": "~1.3.0"
   }
 }

data/trestle.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "A modern, responsive admin framework for Ruby on Rails"
   spec.description   = "Trestle is a modern, responsive admin framework for Ruby on Rails."
   spec.homepage      = "https://www.trestle.io"
-  spec.license       = "LGPL-3.0"
+  spec.license       = "LGPL-3.0-only"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|coverage|gemfiles|node_modules|spec|sandbox)/}) }
 
@@ -22,16 +22,15 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "railties",        ">= 5.2.0"
   spec.add_dependency "activemodel",     ">= 5.2.0"
-  spec.add_dependency "sprockets-rails", ">= 2.0.0"
   spec.add_dependency "kaminari",        ">= 1.1.0"
 
   spec.add_development_dependency "rspec-rails",         ">= 5.1.2"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0"
   spec.add_development_dependency "database_cleaner",    "~> 2.0.2"
   spec.add_development_dependency "ammeter",             "~> 1.1.5"
+  spec.add_development_dependency "i18n-js",             "~> 4.2.3"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "turbolinks"
 end