bootstrap_form 4.5.0 → 5.0.0

data/bootstrap_form.gemspec

@@ -3,6 +3,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "bootstrap_form/version"
 
+REQUIRED_RAILS_VERSION = ">= 5.2".freeze
+
 Gem::Specification.new do |s|
   s.name        = "bootstrap_form"
   s.version     = BootstrapForm::VERSION
@@ -10,13 +12,11 @@ Gem::Specification.new do |s|
   s.email       = ["potenza@gmail.com", "carlos.el.lopes@gmail.com"]
   s.homepage    = "https://github.com/bootstrap-ruby/bootstrap_form"
   s.summary     = "Rails form builder that makes it easy to style forms using "\
-                  "Bootstrap 4"
+                  "Bootstrap 5"
   s.description = "bootstrap_form is a rails form builder that makes it super "\
-                  "easy to create beautiful-looking forms using Bootstrap 4"
+                  "easy to create beautiful-looking forms using Bootstrap 5"
   s.license     = "MIT"
 
-  s.post_install_message = "Default form attribute role=\"form\" will be dropped in 5.0.0"
-
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test)/})
   end
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.5"
 
-  s.add_dependency("actionpack", ">= 5.2")
-  s.add_dependency("activemodel", ">= 5.2")
+  s.add_dependency("actionpack", REQUIRED_RAILS_VERSION)
+  s.add_dependency("activemodel", REQUIRED_RAILS_VERSION)
+
+  s.add_development_dependency("rails", REQUIRED_RAILS_VERSION)
 end

data/demo/app/assets/config/manifest.js

@@ -1,2 +1 @@
-//= link_tree ../images
-//= link_directory ../stylesheets .css
+//= link application.css

data/demo/app/helpers/bootstrap_helper.rb

@@ -2,7 +2,7 @@ module BootstrapHelper
   def form_with_source(&block)
     form_html = capture(&block)
 
-    content_tag(:div, class: "example") do
+    tag.div(class: "example") do
       concat(form_html)
       concat(toggle)
       concat(codemirror(form_html))
@@ -12,15 +12,15 @@ module BootstrapHelper
   private
 
   def codemirror(form_html)
-    content_tag(:div, class: "code", style: "display: none") do
-      content_tag(:textarea, class: "codemirror") do
+    tag.div(class: "code", style: "display: none") do
+      tag.textarea(class: "codemirror") do
         HtmlBeautifier.beautify(form_html.strip.gsub(">", ">\n").gsub("<", "\n<"))
       end
     end
   end
 
   def toggle
-    content_tag(:button, class: "toggle btn btn-sm btn-info") do
+    tag.button(class: "toggle btn btn-sm btn-info") do
       "Show Source Code"
     end
   end

data/demo/app/views/bootstrap/form.html.erb

@@ -52,3 +52,16 @@
     <%= form.submit %>
   <% end %>
 <% end %>
+
+<h3>Floating Labels</h3>
+
+<%= form_with_source do %>
+  <%= bootstrap_form_for @user do |form| %>
+    <%= form.email_field :email, placeholder: "Enter Email", label: "Email address", help: "We'll never share your email with anyone else", floating: true %>
+    <%= form.password_field :password, placeholder: "Password", floating: true %>
+    <%= form.text_field :misc, floating: true %>
+    <%= form.text_area :comments, floating: true %>
+    <%= form.select :status, [["Active", 1], ["Inactive", 2]], include_blank: "Select a value", floating: true %>
+    <%= form.submit %>
+  <% end %>
+<% end %>

data/demo/app/views/layouts/application.html.erb

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous">
 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.33.0/codemirror.min.css">
 
@@ -44,8 +44,8 @@
     <!-- Optional JavaScript -->
     <!-- jQuery first, then Popper.js, then Bootstrap JS -->
     <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.1/dist/umd/popper.min.js" integrity="sha384-SR1sx49pcuLnqZUnnPwx6FCym0wLsk5JZuNx2bPPENzswTNFaQU1RDvt3wT4gWFG" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.min.js" integrity="sha384-j0CNLUeiqtyaRmlzUHCPZ+Gy5fQu0dQ6eZ/xAww941Ai1SxSY+0EQqNXNE6DZiVc" crossorigin="anonymous"></script>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.33.0/codemirror.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.33.0/mode/htmlmixed/htmlmixed.min.js"></script>

data/demo/config/environments/development.rb

@@ -16,7 +16,7 @@ Rails.application.configure do
 
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join("tmp", "caching-dev.txt").exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store

data/demo/config/puma.rb

@@ -4,12 +4,12 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads_count = ENV.fetch("RAILS_MAX_THREADS", 5)
 threads threads_count, threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
-port        ENV.fetch("PORT") { 3000 }
+port        ENV.fetch("PORT", 3000)
 
 # Specifies the `environment` that Puma will run in.
 #

data/demo/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.

data/docker-compose.yml

@@ -0,0 +1,70 @@
+version: '2.4'
+
+services:
+  app: &app
+    build:
+      context: .
+      args:
+        RUBY_VERSION: '2.7.1'
+        NODE_MAJOR: '12'
+        YARN_VERSION: '1.22.4'
+        BUNDLER_VERSION: '2.1.4'
+    image: bootstrap-form:0.0.1
+    tmpfs:
+      - /tmp
+
+  backend: &backend
+    <<: *app
+    stdin_open: true
+    tty: true
+    volumes:
+      - .:/app:cached
+      - rails_cache:/app/tmp/cache
+      - bundle:/usr/local/bundle
+      - node_modules:/app/node_modules
+      - packs:/app/public/packs
+    environment:
+      - NODE_ENV=development
+      - RAILS_ENV=${RAILS_ENV:-development}
+      - BOOTSNAP_CACHE_DIR=/usr/local/bundle/_bootsnap
+      - WEBPACKER_DEV_SERVER_HOST=webpacker
+      - WEB_CONCURRENCY=1
+      - HISTFILE=/app/.bash_history
+      - EDITOR=vi
+
+  shell:
+    <<: *backend
+    command: /bin/bash
+    ports:
+      - '3000:3000'
+
+  server:
+    <<: *backend
+    command: sh -c "cd demo/app && bundle exec rails server -b 0.0.0.0"
+    ports:
+      - '3000:3000'
+
+  test:
+    <<: *backend
+    command: rake test
+
+  webpacker:
+    <<: *app
+    command: ./bin/webpack-dev-server
+    ports:
+      - '3035:3035'
+    volumes:
+      - .:/app:cached
+      - bundle:/usr/local/bundle
+      - node_modules:/app/node_modules
+      - packs:/app/public/packs
+    environment:
+      - NODE_ENV=${NODE_ENV:-development}
+      - RAILS_ENV=${RAILS_ENV:-development}
+      - WEBPACKER_DEV_SERVER_HOST=0.0.0.0
+
+volumes:
+  bundle:
+  node_modules:
+  rails_cache:
+  packs:

data/gemfiles/5.2.gemfile

@@ -1,17 +1,4 @@
-source "http://rubygems.org"
-
-gemspec path: "../"
+gems = "#{File.dirname __dir__}/Gemfile"
+eval File.read(gems), binding, gems # rubocop: disable Security/Eval
 
 gem "rails", "~> 5.2.0"
-
-group :development do
-  gem "rubocop-rails", require: false
-end
-
-group :test do
-  gem "diffy"
-  gem "equivalent-xml"
-  gem "mocha"
-  gem "sqlite3", "~> 1.4"
-  gem "timecop", "~> 0.7.1"
-end

data/gemfiles/6.0.gemfile

@@ -1,19 +1,4 @@
-source "http://rubygems.org"
-
-gemspec path: "../"
+gems = "#{File.dirname __dir__}/Gemfile"
+eval File.read(gems), binding, gems # rubocop: disable Security/Eval
 
 gem "rails", "~> 6.0.0"
-
-group :development do
-  gem "rubocop-rails", require: false
-  gem "sassc"
-  gem "webpacker", ">= 4.0.0.rc.3"
-end
-
-group :test do
-  gem "diffy"
-  gem "equivalent-xml"
-  gem "mocha"
-  gem "sqlite3"
-  gem "timecop", "~> 0.7.1"
-end

data/gemfiles/6.1.gemfile

@@ -0,0 +1,4 @@
+gems = "#{File.dirname __dir__}/Gemfile"
+eval File.read(gems), binding, gems # rubocop: disable Security/Eval
+
+gem "rails", "~> 6.1.0"

data/gemfiles/edge.gemfile

@@ -1,19 +1,4 @@
-source "http://rubygems.org"
-
-gemspec path: "../"
+gems = "#{File.dirname __dir__}/Gemfile"
+eval File.read(gems), binding, gems # rubocop: disable Security/Eval
 
 gem "rails", git: "https://github.com/rails/rails.git"
-
-group :development do
-  gem "rubocop-rails", require: false
-  gem "sassc-rails"
-  gem "webpacker"
-end
-
-group :test do
-  gem "diffy"
-  gem "equivalent-xml"
-  gem "mocha"
-  gem "sqlite3"
-  gem "timecop", "~> 0.7.1"
-end

data/lib/bootstrap_form/components/labels.rb

@@ -23,7 +23,7 @@ module BootstrapForm
       end
 
       def label_classes(name, options, custom_label_col, group_layout)
-        classes = [options[:class], label_layout_classes(custom_label_col, group_layout)]
+        classes = ["form-label", options[:class], label_layout_classes(custom_label_col, group_layout)]
 
         case options.delete(:required)
         when true

data/lib/bootstrap_form/components/validation.rb

@@ -14,7 +14,7 @@ module BootstrapForm
       def required_attribute?(obj, attribute)
         return false unless obj && attribute
 
-        target = obj.class == Class ? obj : obj.class
+        target = obj.instance_of?(Class) ? obj : obj.class
 
         target_validators = if target.respond_to? :validators_on
                               target.validators_on(attribute).map(&:class)

data/lib/bootstrap_form/configuration.rb

@@ -16,8 +16,7 @@ module BootstrapForm
     def default_form_attributes
       return @default_form_attributes if defined? @default_form_attributes
 
-      # TODO: Return blank hash ({}) in 5.0.0. Role "form" for form tags is redundant and makes W3C to raise a warning.
-      { role: "form" }
+      {}
     end
   end
 end

data/lib/bootstrap_form/form_builder.rb

@@ -43,9 +43,8 @@ module BootstrapForm
     include BootstrapForm::Inputs::UrlField
     include BootstrapForm::Inputs::WeekField
 
-    delegate :content_tag, :capture, :concat, to: :@template
+    delegate :content_tag, :capture, :concat, :tag, to: :@template
 
-    # rubocop:disable Metrics/AbcSize
     def initialize(object_name, object, template, options)
       @layout = options[:layout] || default_layout
       @label_col = options[:label_col] || default_label_col
@@ -61,7 +60,6 @@ module BootstrapForm
       add_default_form_attributes_and_form_inline options
       super
     end
-    # rubocop:enable Metrics/AbcSize
 
     def add_default_form_attributes_and_form_inline(options)
       options[:html] ||= {}
@@ -69,7 +67,7 @@ module BootstrapForm
 
       return unless options[:layout] == :inline
 
-      options[:html][:class] = [options[:html][:class], "form-inline"].compact.join(" ")
+      options[:html][:class] = [options[:html][:class], "col-auto", "g-3"].compact.join(" ")
     end
 
     def fields_for_with_bootstrap(record_name, record_object=nil, fields_options={}, &block)

data/lib/bootstrap_form/form_group.rb

@@ -10,9 +10,9 @@ module BootstrapForm
 
       options[:class] = form_group_classes(options)
 
-      content_tag(:div, options.except(:append, :id, :label, :help, :icon,
-                                       :input_group_class, :label_col, :control_col,
-                                       :add_control_col_class, :layout, :prepend)) do
+      tag.div(**options.except(:append, :id, :label, :help, :icon,
+                               :input_group_class, :label_col, :control_col,
+                               :add_control_col_class, :layout, :prepend, :floating)) do
         form_group_content(
           generate_label(options[:id], name, options[:label], options[:label_col], options[:layout]),
           generate_help(name, options[:help]), options, &block
@@ -24,8 +24,8 @@ module BootstrapForm
 
     def form_group_content_tag(name, field_name, without_field_name, options, html_options)
       html_class = control_specific_class(field_name)
-      html_class = "#{html_class} form-inline" if @layout == :horizontal && options[:skip_inline].blank?
-      content_tag(:div, class: html_class) do
+      html_class = "#{html_class} col-auto g-3" if @layout == :horizontal && options[:skip_inline].blank?
+      tag.div(class: html_class) do
         input_with_error(name) do
           send(without_field_name, name, options, html_options)
         end
@@ -34,10 +34,12 @@ module BootstrapForm
 
     def form_group_content(label, help_text, options, &block)
       if group_layout_horizontal?(options[:layout])
-        concat(label).concat(content_tag(:div, capture(&block) + help_text, class: form_group_control_class(options)))
+        concat(label).concat(tag.div(capture(&block) + help_text, class: form_group_control_class(options)))
       else
-        concat(label)
+        # Floating labels need to be rendered after the field
+        concat(label) unless options[:floating]
         concat(capture(&block))
+        concat(label) if options[:floating]
         concat(help_text) if help_text
       end
     end
@@ -50,15 +52,24 @@ module BootstrapForm
     end
 
     def form_group_classes(options)
-      classes = ["form-group", options[:class].try(:split)].flatten.compact
-      classes << "row" if group_layout_horizontal?(options[:layout]) && classes.exclude?("form-row")
-      classes << "form-inline" if field_inline_override?(options[:layout])
+      classes = ["mb-3", options[:class].try(:split)].flatten.compact
+      classes << "row" if horizontal_group_with_gutters?(options[:layout], classes)
+      classes << "col-auto g-3" if field_inline_override?(options[:layout])
       classes << feedback_class if options[:icon]
+      classes << "form-floating" if options[:floating]
       classes
     end
 
+    def horizontal_group_with_gutters?(layout, classes)
+      group_layout_horizontal?(layout) && !classes_include_gutters?(classes)
+    end
+
     def group_layout_horizontal?(layout)
       get_group_layout(layout) == :horizontal
     end
+
+    def classes_include_gutters?(classes)
+      classes.any? { |c| c =~ /^g-\d+$/ }
+    end
   end
 end

data/lib/bootstrap_form/form_group_builder.rb

@@ -6,7 +6,7 @@ module BootstrapForm
 
     private
 
-    def form_group_builder(method, options, html_options=nil)
+    def form_group_builder(method, options, html_options=nil, &block)
       no_wrapper = options[:wrapper] == false
 
       options = form_group_builder_options(options, method)
@@ -21,16 +21,14 @@ module BootstrapForm
       if no_wrapper
         yield
       else
-        form_group(method, form_group_options) { yield }
+        form_group(method, form_group_options, &block)
       end
     end
 
     def form_group_builder_options(options, method)
       options.symbolize_keys!
       options = convert_form_tag_options(method, options) if acts_like_form_tag
-      unless options[:skip_label]
-        options[:required] = form_group_required(options) if options.key?(:skip_required)
-      end
+      options[:required] = form_group_required(options) if !options[:skip_label] && options.key?(:skip_required)
       options
     end
 
@@ -48,7 +46,8 @@ module BootstrapForm
         id: options[:id], help: options[:help], icon: options[:icon],
         label_col: options[:label_col], control_col: options[:control_col],
         add_control_col_class: options[:add_control_col_class],
-        layout: get_group_layout(options[:layout]), class: options[:wrapper_class]
+        layout: get_group_layout(options[:layout]), class: options[:wrapper_class],
+        floating: options[:floating]
       }
 
       form_group_options.merge!(wrapper_options) if wrapper_options.is_a?(Hash)
@@ -57,12 +56,11 @@ module BootstrapForm
     end
 
     def form_group_label(options, css_options)
-      hash = {
+      {
         text: form_group_label_text(options[:label]),
         class: form_group_label_class(options),
         required: options[:required]
       }.merge(css_options[:id].present? ? { for: css_options[:id] } : {})
-      hash
     end
 
     def form_group_label_text(label)

data/lib/bootstrap_form/helpers/bootstrap.rb

@@ -14,7 +14,7 @@ module BootstrapForm
       def primary(name=nil, options={}, &block)
         setup_css_class "btn btn-primary", options
 
-        if options[:render_as_button] || block_given?
+        if options[:render_as_button] || block
           options.except! :render_as_button
           button(name, options, &block)
         else
@@ -26,8 +26,8 @@ module BootstrapForm
         css = options[:class] || "alert alert-danger"
         return unless object.respond_to?(:errors) && object.errors.full_messages.any?
 
-        content_tag :div, class: css do
-          concat content_tag :p, title
+        tag.div class: css do
+          concat tag.p title
           concat error_summary unless options[:error_summary] == false
         end
       end
@@ -35,9 +35,9 @@ module BootstrapForm
       def error_summary
         return unless object.errors.any?
 
-        content_tag :ul, class: "rails-bootstrap-forms-error-summary" do
+        tag.ul class: "rails-bootstrap-forms-error-summary" do
           object.errors.full_messages.each do |error|
-            concat content_tag(:li, error)
+            concat tag.li(error)
           end
         end
       end
@@ -46,8 +46,9 @@ module BootstrapForm
         return unless error?(name)
 
         hide_attribute_name = options[:hide_attribute_name] || false
+        custom_class = options[:custom_class] || false
 
-        content_tag :div, class: "alert alert-danger" do
+        tag.div class: custom_class || "invalid-feedback" do
           if hide_attribute_name
             object.errors[name].join(", ")
           else
@@ -85,7 +86,7 @@ module BootstrapForm
         input = attach_input(options, :prepend) + input + attach_input(options, :append)
         input += generate_error(name)
         options.present? &&
-          input = content_tag(:div, input, class: ["input-group", options[:input_group_class]].compact)
+          input = tag.div(input, class: ["input-group", options[:input_group_class]].compact)
         input
       end
 
@@ -95,9 +96,9 @@ module BootstrapForm
       end
 
       def input_group_content(content)
-        return content if content =~ /btn/
+        return content if /btn/.match?(content)
 
-        content_tag(:span, content, class: "input-group-text")
+        tag.span(content, class: "input-group-text")
       end
 
       def static_class
@@ -108,7 +109,7 @@ module BootstrapForm
 
       def attach_input(options, key)
         tags = [*options[key]].map do |item|
-          content_tag(:div, input_group_content(item), class: "input-group-#{key}")
+          input_group_content(item)
         end
         ActiveSupport::SafeBuffer.new(tags.join)
       end

data/lib/bootstrap_form/inputs/base.rb

@@ -10,7 +10,8 @@ module BootstrapForm
           define_method "#{field_name}_with_bootstrap" do |name, options={}|
             form_group_builder(name, options) do
               prepend_and_append_input(name, options) do
-                send("#{field_name}_without_bootstrap".to_sym, name, options)
+                options[:placeholder] ||= name if options[:floating]
+                send("#{field_name}_without_bootstrap".to_sym, name, options.except(:floating))
               end
             end
           end
@@ -19,11 +20,10 @@ module BootstrapForm
         end
 
         def bootstrap_select_group(field_name)
-          with_field_name = "#{field_name}_with_bootstrap"
-          without_field_name = "#{field_name}_without_bootstrap"
-          define_method(with_field_name) do |name, options={}, html_options={}|
+          define_method("#{field_name}_with_bootstrap") do |name, options={}, html_options={}|
+            html_options = html_options.reverse_merge(control_class: "form-select")
             form_group_builder(name, options, html_options) do
-              form_group_content_tag(name, field_name, without_field_name, options, html_options)
+              form_group_content_tag(name, field_name, "#{field_name}_without_bootstrap", options, html_options)
             end
           end
 

data/lib/bootstrap_form/inputs/check_box.rb

@@ -10,10 +10,10 @@ module BootstrapForm
         def check_box_with_bootstrap(name, options={}, checked_value="1", unchecked_value="0", &block)
           options = options.symbolize_keys!
           check_box_options = options.except(:class, :label, :label_class, :error_message, :help,
-                                             :inline, :custom, :hide_label, :skip_label, :wrapper_class)
+                                             :inline, :hide_label, :skip_label, :wrapper_class, :switch)
           check_box_options[:class] = check_box_classes(name, options)
 
-          content_tag(:div, class: check_box_wrapper_class(options)) do
+          tag.div(class: check_box_wrapper_class(options)) do
             html = check_box_without_bootstrap(name, check_box_options, checked_value, unchecked_value)
             html.concat(check_box_label(name, options, checked_value, &block)) unless options[:skip_label]
             html.concat(generate_error(name)) if options[:error_message]
@@ -38,7 +38,7 @@ module BootstrapForm
       end
 
       def check_box_description(name, options, &block)
-        content = block_given? ? capture(&block) : options[:label]
+        content = block ? capture(&block) : options[:label]
         content || object&.class&.human_attribute_name(name) || name.to_s.humanize
       end
 
@@ -50,40 +50,26 @@ module BootstrapForm
       end
 
       def check_box_classes(name, options)
-        classes = [options[:class]]
-        classes << (options[:custom] ? "custom-control-input" : "form-check-input")
+        classes = Array(options[:class]) << "form-check-input"
         classes << "is-invalid" if error?(name)
         classes << "position-static" if options[:skip_label] || options[:hide_label]
         classes.flatten.compact
       end
 
       def check_box_label_class(options)
-        classes = []
-        classes << (options[:custom] ? "custom-control-label" : "form-check-label")
+        classes = ["form-check-label"]
         classes << options[:label_class]
         classes << hide_class if options[:hide_label]
         classes.flatten.compact
       end
 
       def check_box_wrapper_class(options)
-        classes = []
-        if options[:custom]
-          classes << custom_check_box_wrapper_class(options)
-        else
-          classes << "form-check"
-          classes << "form-check-inline" if layout_inline?(options[:inline])
-        end
+        classes = ["form-check"]
+        classes << "form-check-inline" if layout_inline?(options[:inline])
+        classes << "form-switch" if options[:switch]
         classes << options[:wrapper_class] if options[:wrapper_class].present?
         classes.flatten.compact
       end
-
-      def custom_check_box_wrapper_class(options)
-        classes = []
-        classes << "custom-control"
-        classes << (options[:custom] == :switch ? "custom-switch" : "custom-checkbox")
-        classes << "custom-control-inline" if layout_inline?(options[:inline])
-        classes
-      end
     end
   end
 end

data/lib/bootstrap_form/inputs/collection_select.rb

@@ -10,6 +10,7 @@ module BootstrapForm
         # Disabling Metrics/ParameterLists because the upstream Rails method has the same parameters
         # rubocop:disable Metrics/ParameterLists
         def collection_select_with_bootstrap(method, collection, value_method, text_method, options={}, html_options={})
+          html_options = html_options.reverse_merge(control_class: "form-select")
           form_group_builder(method, options, html_options) do
             input_with_error(method) do
               collection_select_without_bootstrap(method, collection, value_method, text_method, options, html_options)