card-mod-tinymce_editor 0.14.1 → 0.15.0

data/{db/migrate_core_cards/20171113233151_update_tinymce_config.rb → data/real.yml}

@@ -1,22 +1,15 @@
-# -*- encoding : utf-8 -*-
-
-class UpdateTinymceConfig < Cardio::Migration::Core
-  TINYMCE_CONF = <<-JSON.strip_heredoc
+- :name: "*tinyMCE"
+  :type: :json
+  :codename: tiny_mce
+  :content: |
     {
-      "theme": "modern",
+      "theme": "silver",
       "menubar": "edit view insert format table",
-      "plugins": "autoresize code lists hr link autolink table contextmenu textcolor colorpicker",
-      "toolbar1": "formatselect | bold italic strikethrough forecolor backcolor | link | alignleft aligncenter alignright alignjustify  | numlist bullist outdent indent  | removeformat",
+      "plugins": "autoresize code lists hr link autolink table",
+      "toolbar1": "formatselect | bold italic strikethrough forecolor backcolor | deckolink nest |   | numlist bullist outdent indent  | removeformat",
       "width":"100%",
       "auto_resize":true,
       "autoresize_max_height": 500,
       "relative_urls":false,
       "extended_valid_elements":"a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"
-     }
-  JSON
-
-  def up
-    ensure_card :tiny_mce,
-                content: TINYMCE_CONF
-  end
-end
+     }

data/lib/card/reference/nest_parser.rb

@@ -5,30 +5,44 @@ class Card
     class NestParser
       NEST_OPTIONS = %i[view title show hide wrap help variant size params].freeze
 
-      attr_reader :name, :options, :item_options, :raw
+      attr_reader :name, :view, :options, :item_options, :raw
 
-      def self.new nest_string, default_view, default_item_view
+      def self.new nest_string
         return super if nest_string.is_a? String
 
         OpenStruct.new(name: "", field?: true,
-                       options: [[:view, default_view]], item_options: [],
-                       raw: "{{+|view: #{default_view}}}")
+                       options: [], item_options: [],
+                       raw: "{{+ }}")
       end
 
       def self.new_image name
-        OpenStruct.new(name: name, field?: true,
-                       options: [%i[view content], %i[size medium]],
+        OpenStruct.new(name: name, field?: false,
+                       view: "content",
+                       options: [%i[size medium]],
                        item_options: [],
-                       raw: "{{+#{name}|view: content; size: medium}}")
+                       raw: "{{#{name}|view: content; size: medium}}")
+      end
+
+      def empty?
+        @raw.empty? || @raw =~ /\{\{+?\s*\|?\s*\}\}/
       end
 
       def field?
         @field
       end
 
-      def initialize nest_string, _default_view, default_item_view
+      def field!
+        @raw.sub!(/\{\{\s*\+?/, "{{+")
+        @field = true
+      end
+
+      def option_value name
+        options.find  { |(key, _value)| key == name }&.second
+      end
+
+      def initialize nest_string
         @raw = nest_string
-        @default_item_view = default_item_view
+        # @default_item_view = default_item_view
         nest = Card::Content::Chunk::Nest.new nest_string, nil
         init_name nest.name
         extract_item_options nest.options
@@ -42,10 +56,12 @@ class Card
         @name = @field ? name.to_s[1..-1] : name
       end
 
-      def extract_options options
+      def extract_options options, item_options=false
         applicable_options(options).each_with_object([]) do |key, res|
           if key.in? %i[show hide]
             res.concat viz_values(key, options)
+          elsif key == :view && !item_options
+            @view = options[key]
           else
             res << [key, options[key]]
           end
@@ -65,7 +81,7 @@ class Card
         item_options = options[:items]
         while item_options
           next_item_options = item_options[:items]
-          @item_options << extract_options(item_options)
+          @item_options << extract_options(item_options, true)
           item_options = next_item_options
         end
         # @item_options << default_item_options

data/locales/en.yml

@@ -0,0 +1,9 @@
+en:
+  tinymce_editor_nest_editor_card_help_text: Hello
+  tinymce_editor_nest_editor_card_help_title: Title
+  tinymce_editor_nest_editor_view_help_title: Hello
+  tinymce_editor_nest_editor_view_help_text: World
+  tinymce_editor_image_nest_editor_name_help_text: Hello
+  tinymce_editor_image_nest_editor_name_help_title: World
+  tinymce_editor_image_nest_editor_view_help_text: World
+  tinymce_editor_image_nest_editor_view_help_title: Hello

data/set/all/reference_editor/_image_nest_editor.haml

@@ -0,0 +1,2 @@
+
+= image_nest_editor_tabs snippet

data/set/all/reference_editor/_link_editor.haml

@@ -1,17 +1,19 @@
-.form-row.align-items-center.mb-4.ml-1
+.row.align-items-center.mb-4.ms-1
   .col-9
     .input-group{class: [snippet.field? ? "show-prefix" : "hide-prefix"]}
-      .input-group-prepend._field-indicator
-        .input-group-text.text-muted
-          +
-      = text_field_tag "link_name", snippet.name, class: "form-control _link-target", placeholder: "URL or Card name"
+      .input-group-text.text-muted._field-indicator
+        +
+      = text_field_tag "link_name", snippet.name,
+        class: "form-control _link-target _autocomplete",
+        placeholder: "URL or Card name",
+        "data-options-card": [:all, :by_name].to_name
 
   .col-3
     = check_box_tag :field, "field", snippet.field?,
                     class: "_link-field-toggle", id: "link-editor-field"
     %label.form-check-label{for: "link-editor-field"} field
 
-.form-row.align-items-center.mb-4.ml-1.mr-1
+.row.align-items-center.mb-4.ms-1.me-1
   .col-12
     %label.form-check-label{for: "link_title"} Text to display
     = text_field_tag "link_title", snippet.title, class: "form-control _link-title"

data/set/all/reference_editor/_nest_editor.haml

@@ -1,17 +1,15 @@
-.form
-  .form-row.align-items-center.mb-4.ml-1
-    .col-9
-      .input-group{class: [snippet.field? ? "show-prefix" : "hide-prefix"]}
-        .input-group-prepend._field-indicator
-          .input-group-text.text-muted
-            +
-        = text_field_tag "nest_name", snippet.name, class: "form-control _nest-name",
-                         "data-left-name" => card.name,
-                         "data-left-type" => card.left_type_for_nest_editor_set_selection,
-                         placeholder: "Card name"
-    .col-3
-      = check_box_tag :field, "field", snippet.field?,
-                      class: "_nest-field-toggle", id: "nest-editor-field"
-      %label.form-check-label{for: "nest-editor-field"} field
+.form-group
+  %label{:for => "nest_name"} Card
+  = help_link t(:tinymce_editor_nest_editor_card_help_text), t(:tinymce_editor_nest_editor_card_help_title)
+  .input-group{class: [snippet.field? ? "show-prefix" : "hide-prefix"]}
+    .input-group-text.text-muted._field-indicator
+      +
+    = text_field_tag "nest_name", snippet.name, class: "form-control _nest-name _autocomplete ",
+                     "data-left-name" => card.name,
+                     "data-left-type" => card.left_type_for_nest_editor_set_selection,
+                     "data-options-card": [:all, :by_name].to_name
+    .input-group-text.btn.btn-secondary._nest-field-toggle
+      +
 
+.mt-4
   = nest_editor_tabs

data/set/all/reference_editor/link_editor.rb

@@ -11,9 +11,11 @@ format :html do
     modal_link_editor
   end
 
-  def link_editor editor_mode
+  def   link_editor editor_mode
     @tm_snippet_editor_mode = editor_mode
-    haml :reference_editor, ref_type: :link, editor_mode: @tm_snippet_editor_mode,
+    haml :reference_editor, title: "Link",
+                            editor: :link,
+                            ref_type: :link, editor_mode: @tm_snippet_editor_mode,
                             apply_opts: link_apply_opts, snippet: link_snippet
   end
 

data/set/all/reference_editor/nest_editor/_basics.haml

@@ -0,0 +1,5 @@
+.form-group
+  %label View
+  = help_link t(:tinymce_editor_nest_editor_view_help_text), t(:tinymce_editor_nest_editor_view_help_title)
+  = nest_view_select snippet.view
+

data/set/all/reference_editor/nest_editor/_image_find.haml

@@ -0,0 +1,7 @@
+.form-group
+  %label{:for => "nest_name"} Name
+  = help_link t(:tinymce_editor_image_nest_editor_name_help_text), t(:tinymce_editor_image_nest_editor_name_help_title)
+  = # autocomplete_field snippet.name, "image+*type+by name",  "form-control _autocomplete _nest-name _image-name"
+  = select_tag "image-name-select", "",
+               class: "_image-card-select _image-name _no-select2-init",
+               "data-dropdown-parent": "true"

data/set/all/reference_editor/nest_editor/_image_options.haml

@@ -0,0 +1,8 @@
+.form-group
+  %label View
+  = help_link t(:tinymce_editor_image_nest_editor_view_help_text), t(:tinymce_editor_image_nest_editor_view_help_title)
+  = image_view_select snippet.view
+
+.form-group
+  %label Size
+  = image_size_select

data/set/all/reference_editor/nest_editor/_options.haml

@@ -1,12 +1,20 @@
-.options-container.p-2.border-bottom
-  = haml_partial :options_select, template: false, level: 0, data: snippet.options
-- snippet.item_options.each_with_index do |options, i|
-  .options-container.p-2.border-bottom._configure-items
-    %h6
-      = "#{'sub' * i} items"
-    = haml_partial :options_select, template: false, level: i + 1, data: options
-.options-container.p-2.border-bottom._configure-items
-  = button_tag "Configure #{'sub' * snippet.item_options.size}items", situation: "secondary", class: "_configure-items-button btn-sm"
-  = haml_partial :options_select, template: true, level: snippet.item_options.size + 1, data: default_nest_editor_item_options
+._nest-options
+  .options-container
+    %label Options
+    = haml_partial :options_select, template: false, level: 0, data: snippet.options, view_selectable: false
+  - snippet.item_options.each_with_index do |options, i|
+    .options-container._configure-items
+      %label
+        = "#{'sub' * i} item options".strip.capitalize
+      = haml_partial :options_select, template: false, level: i + 1, data: options, view_selectable: true
+  .options-container._configure-items
+    = button_tag "Add #{'sub' * snippet.item_options.size}item options", situation: "secondary", class: "_configure-items-button btn-sm"
+    = haml_partial :options_select, template: true, level: snippet.item_options.size + 1, data: default_nest_editor_item_options, view_selectable: true
 
+  ._templates.d-none
+
+    = nest_option_value_default_template
+    = nest_size_select_template
+    = nest_view_select_template
+    = nest_show_and_hide_select_template
 

data/set/all/reference_editor/nest_editor/_options_select.haml

@@ -2,8 +2,9 @@
   - if data
     - data.each do |name, value|
       = haml_partial :options_select_row, template: false, name: name,
-                                          level: level, value: value
-  = haml_partial :options_select_row, template: false, name: nil, level: level,
-                                      value: nil
-  = haml_partial :options_select_row, template: true, name: nil, level: level,
-                                      value: nil
+                                          level: level, value: value, view_selectable: view_selectable
+  = haml_partial :options_select_row, template: template, name: nil, level: level,
+                                      value: nil, view_selectable: view_selectable
+  - if !template
+    = haml_partial :options_select_row, template: true, name: nil, level: level,
+                                        value: nil, view_selectable: view_selectable

data/set/all/reference_editor/nest_editor/_options_select_row.haml

@@ -1,10 +1,9 @@
-.form-row._nest-option-row{class: [template && "_template"]}
-  .col-6
-    .input-group.input-group-sm.mb-2.mr-2.d-flex.flex-nowrap
-      .input-group-prepend{class: [!name && "d-none"]}
-        %button.btn.btn-secondary.input-group-text.p-1._nest-delete-option{:type => "button"}
-          %small.text-muted
-            = fa_icon :times
-      = nest_option_name_select name, level
+.row._nest-option-row{class: [template && "_template"]}
   .col-6
+    .input-group.mb-2.me-2.d-flex.flex-nowrap
+      %button.btn.btn-secondary.input-group-text.p-1._nest-delete-option{:type => "button", class: [!name && "d-none"]}
+        %small.text-muted
+          = fa_icon :times
+      = nest_option_name_select name, level, view_selectable, template
+  .col-6._nest-option-value-col
     = nest_option_value_select value

data/set/all/reference_editor/nest_editor/nest_editor_options.rb

@@ -0,0 +1,95 @@
+format :html do
+  def nest_option_classes
+    "form-control"
+  end
+
+  def nest_option_name_select selected=nil, level=0,
+                              include_view_option=true, template=false
+    classes = "#{nest_option_classes} _nest-option-name"
+    classes += " _new-row" unless selected
+    classes += " _no-select2" if template
+    select_tag "nest_option_name_#{unique_id}",
+               nest_option_name_select_options(selected, level, include_view_option),
+               class: classes, id: nil, "data-placeholder": "Select option"
+    # id: nil ensures that select2 generates its own unique identifier
+    # that ensures that we can clone this tag without breaking select2
+  end
+
+  def nest_option_name_select_options selected, level, include_view_option=true
+    options = [""] + Card::Reference::NestParser::NEST_OPTIONS.dup
+    options.delete :view unless include_view_option
+    options_for_select(
+      options, disabled: nest_option_name_disabled(selected, level),
+               selected: selected
+    )
+  end
+
+  def nest_option_name_disabled selected, level
+    disabled = nest_option_name_disabled_options level
+    disabled = disabled&.map(&:first)
+    disabled&.delete selected if selected
+    disabled
+  end
+
+  def nest_option_name_disabled_options level
+    if level.zero?
+      nest_snippet.options
+    else
+      nest_snippet.item_options[level - 1] || default_nest_editor_item_options
+    end
+  end
+
+  def nest_view_select selected
+    select_tag :view, options_for_select(view_list.unshift(nil), selected: selected),
+               class: "tags _view-select _nest-option-value",
+               "data-placeholder": "Select view"
+  end
+
+  def image_view_select selected
+    select_tag :view, options_for_select(view_list.unshift(nil), selected: selected),
+               class: "tags _image-view-select",
+               "data-placeholder": "Select view"
+  end
+
+  def image_size_select
+    select_tag :size, size_select_options(:medium), class: "_image-size-select"
+  end
+
+  def nest_option_value_select value=nil
+    text_field_tag "value", value,
+                   class: "_nest-option-value #{nest_option_classes}",
+                   disabled: !value, id: nil
+  end
+
+  def nest_option_value_default_template
+    text_field_tag "value", nil,
+                   class: "_nest-option-template-default _nest-option-value "\
+                          "#{nest_option_classes}",
+                   id: nil
+  end
+
+  def size_select_options selected=:medium
+    options_for_select(%w[icon small medium large original], selected: selected)
+  end
+
+  def nest_size_select_template
+    nest_option_value_select_tag :size, size_select_options
+  end
+
+  def nest_view_select_template
+    nest_option_value_select_tag :view, options_for_select(view_list)
+  end
+
+  def nest_show_and_hide_select_template
+    nest_option_value_select_tag %i[show hide], options_for_select(all_views)
+  end
+
+  def nest_option_value_select_tag option_names, options
+    wrap_classes =
+      Array.wrap(option_names).map  { |name| "_nest-option-template-#{name}" }.join " "
+    wrap_with :div, class: wrap_classes do
+      select_tag :size, options,
+                 class: "_no-select2 _nest-option-value #{nest_option_classes}"
+    end
+  end
+end

data/set/all/reference_editor/nest_editor/nest_editor_tabs.rb

@@ -0,0 +1,59 @@
+format :html do
+  def nest_editor_tabs
+    tab_hash = {}
+    # tab_hash[:content] = nest_content_tab if voo.show? :content_tab
+    tab_hash.merge! view: haml(:_basics, snippet: nest_snippet),
+                    options: haml(:_options, snippet: nest_snippet),
+                    rules: nest_rules_tab
+
+    tabs tab_hash, default_active_tab, panel_attr: { class: "nest-options" }
+  end
+
+  def image_nest_editor_tabs snippet
+    # tab_hash[:content] = nest_content_tab if voo.show? :content_tab
+    tab_hash = { upload: image_content_tab(snippet),
+                 select: haml(:_image_find, snippet: snippet),
+                 options: haml(:_image_options, snippet: snippet),
+                 preview: image_preview_tab(snippet) }
+
+    class_up "nav", "nav-fill"
+    tabs tab_hash, :content, panel_attr: { class: "nest-options" }
+  end
+
+  def image_content_tab snippet
+    nest(snippet.name, view: :new_image, type: :image, hide: :guide)
+  end
+
+  def image_find_tab snippet
+    wrap true do
+      nest(snippet.name, view: :new_image, type: :image, hide: :guide)
+    end
+  end
+
+  def image_preview_tab snippet
+    wrap true do
+      nest(snippet.name, view: :core, type: :image, hide: :guide)
+    end
+  end
+
+  def show_content_tab?
+    !card.is_structure?
+  end
+
+  def default_active_tab
+    voo.show?(:content_tab) ? :content : :basics
+  end
+
+  def nest_content_tab
+    name_dependent_slot do
+      @nest_content_tab || nest(card.name.field(nest_snippet.name),
+                                view: :nest_content, hide: :guide)
+    end
+  end
+
+  def nest_rules_tab
+    name_dependent_slot do
+      nest(set_name_for_nest_rules, view: :nest_rules)
+    end
+  end
+end

data/set/all/reference_editor/nest_editor.rb

@@ -27,44 +27,17 @@ format :html do
     end
   end
 
-  def nest_editor editor_mode
+  def nest_editor editor_mode, ref_type=:nest, title="Nest", editor=nil
     @tm_snippet_editor_mode = editor_mode
     voo.hide :content_tab unless show_content_tab?
-    haml :reference_editor, ref_type: :nest, editor_mode: @tm_snippet_editor_mode,
+    haml :reference_editor, title: title,
+                            editor: editor || ref_type,
+                            ref_type: ref_type,
+                            editor_mode: @tm_snippet_editor_mode,
                             apply_opts: nest_apply_opts,
                             snippet: nest_snippet
   end
 
-  def nest_editor_tabs
-    tab_hash = {}
-    tab_hash[:content] = nest_content_tab if voo.show? :content_tab
-    tab_hash.merge! options: haml(:_options, snippet: nest_snippet),
-                    rules: nest_rules_tab,
-                    help: haml(:_help)
-    tabs tab_hash, default_active_tab
-  end
-
-  def show_content_tab?
-    !card.is_structure?
-  end
-
-  def default_active_tab
-    voo.show?(:content_tab) ? :content : :options
-  end
-
-  def nest_content_tab
-    name_dependent_slot do
-      @nest_content_tab || nest(card.name.field(nest_snippet.name),
-                                view: :nest_content, hide: :guide)
-    end
-  end
-
-  def nest_rules_tab
-    name_dependent_slot do
-      nest(set_name_for_nest_rules, view: :nest_rules)
-    end
-  end
-
   def name_dependent_slot
     result = [empty_nest_name_alert(nest_snippet.name.blank?)]
     result <<
@@ -91,8 +64,7 @@ format :html do
 
   def nest_snippet
     @nest_snippet ||=
-      Card::Reference::NestParser.new params[:tm_snippet_raw],
-                                      default_nest_view, default_item_view
+      Card::Reference::NestParser.new params[:tm_snippet_raw]
   end
 
   def set_name_for_nest_rules
@@ -105,63 +77,24 @@ format :html do
   end
 
   def default_nest_editor_item_options
-    [[:view, default_item_view]]
+    []
+    # [[:view, default_item_view]]
   end
 
-  def nest_option_name_select selected=nil, level=0
-    classes = "form-control form-control-sm _nest-option-name"
-    classes += " _new-row" unless selected
-    select_tag "nest_option_name_#{unique_id}",
-               nest_option_name_select_options(selected, level),
-               class: classes, id: nil
-    # id: nil ensures that select2 generates its own unique identifier
-    # that ensures that we can clone this tag without breaking select2
-  end
-
-  def nest_option_name_select_options selected, level
-    options = selected ? [] : ["--"]
-    options += Card::Reference::NestParser::NEST_OPTIONS
-    options_for_select(
-      options, disabled: nest_option_name_disabled(selected, level),
-               selected: selected
-    )
-  end
-
-  def nest_option_name_disabled selected, level
-    disabled = nest_option_name_disabled_options level
-    disabled = disabled&.map(&:first)
-    disabled&.delete selected if selected
-    disabled
-  end
-
-  def nest_option_name_disabled_options level
-    if level.zero?
-      nest_snippet.options
-    else
-      nest_snippet.item_options[level - 1] || default_nest_editor_item_options
-    end
+  def demo
+    _render_demo
   end
 
   def nest_apply_opts
     apply_tm_snippet_data nest_snippet
   end
 
-  def nest_option_value_select value=nil
-    # select_tag "nest_option_value_#{unique_id}"
-    text_field_tag "value", value,
-                   class: "_nest-option-value form-control form-control-sm",
-                   disabled: !value,
-                   id: nil
-  end
-
   def known_nest_content
     voo.hide! :cancel_button
     add_name_context
     with_nest_mode :edit do
-      frame do
-        [
-          render_edit_inline
-        ]
+      wrap true do
+        render_edit_inline
       end
     end
   end
@@ -170,6 +103,9 @@ format :html do
     voo.hide! :guide
     voo.show! :new_type_formgroup
     voo.buttons_view = :new_image_buttons
-    framed_create_form success: { tinymce_id: Env.params[:tinymce_id] }
+    wrap true do
+      create_form success: { tinymce_id: Env.params[:tinymce_id] }
+    end
+    # framed_create_form
   end
 end

data/set/all/reference_editor/nest_image.rb

@@ -10,29 +10,30 @@ format :html do
     nest_image_editor :modal
   end
 
-  view :new_image, perms: :create, unknown: true, cache: :never do
+  view :new_image, perms: :create, unknown: true, cache: :never, wrap: :slot do
     voo.buttons_view = :new_image_buttons
-    framed_create_form success: { tinymce_id: Env.params[:tinymce_id], view: :open }
+    create_form success: { tinymce_id: Env.params[:tinymce_id],
+                           view: :new_image, type: :image,
+                           slot: { hide: :guide, type: :image, show: :preview_redirect },
+                           id: card.autoname(card.name.next) }
   end
 
   view :new_image_buttons do
     button_formgroup do
-      [standard_save_button(no_origin_update: true, class: "_change-create-to-update")]
+      [standard_save_button(no_origin_update: true)]
     end
   end
 
   def nest_image_editor editor_mode
     adapt_reference_editor_for_images
-    nest_editor editor_mode
+    nest_editor editor_mode, :nest, "Image", "image_nest"
   end
 
   def adapt_reference_editor_for_images
-    nest_name = card.autoname(card.name.field("image01"))
+    nest_name = card.autoname("image01")
     voo.show! :content_tab
     @nest_content_tab = nest(nest_name, view: :new_image, type: :image, hide: :guide)
-
-    image_name = nest_name.to_name.right
-    @nest_snippet = Card::Reference::NestParser.new_image image_name
+    @nest_snippet = Card::Reference::NestParser.new_image nest_name
   end
 end
 

data/set/all/reference_editor/reference_editor.haml

@@ -1,18 +1,20 @@
 %div._nest-editor
-  .nest-header.d-flex.ml-2
+  .card-header.d-flex
     %h5.mt-1
-      = ref_type.capitalize
-    .ml-auto
-      = link_to fa_icon(:close), path: "#", "data-dismiss": editor_mode, class: "text-dark p-1 ml-1"
+      = title
+    .ms-auto
+      = link_to fa_icon(:close), path: "#", "data-bs-dismiss": editor_mode, class: "text-dark p-1 ms-1"
 
-  .form
-    = haml_partial "#{ref_type}_editor", snippet: snippet
+  .card-body
+    .form
+      = haml_partial "#{editor}_editor", snippet: snippet
 
   .card-footer.p-0
     .preview.mx-1.my-1.form-control-feedback
+      Syntax preview
       = text_field_tag "preview", snippet.raw, class: "_#{ref_type}-preview w-100 text-muted", readonly: true
     %hr.mt-1.mb-1
-    .form-group-inline.d-flex.justify-content-center.py-2
-      = button_tag (modal_tm_snippet_editor? ? "Apply and Close" : "Apply"), apply_opts.merge(class: "_#{ref_type}-apply btn-sm mr-3")
-      %a.border-light.text-dark.btn.btn-sm.btn-outline-secondary{"data-dismiss": editor_mode, href: "#"}
+    .form-group-inline.d-flex.justify-content-center.py-3
+      = button_tag (modal_tm_snippet_editor? ? "Apply and Close" : "Apply"), apply_opts.merge(class: "_#{ref_type}-apply btn-sm me-3")
+      %a.border-light.text-dark.btn.btn-sm.btn-secondary{"data-bs-dismiss": editor_mode, href: "#"}
         = modal_tm_snippet_editor? ? "Cancel" : "Close"

data/set/all/reference_editor.rb

@@ -24,7 +24,7 @@ format :html do
   end
 
   def apply_tm_data_dismiss data
-    data["data-dismiss"] = "modal" if modal_tm_snippet_editor?
+    data["data-bs-dismiss"] = "modal" if modal_tm_snippet_editor?
   end
 
   def apply_tm_data_index data