headmin 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b427a7de1334a6a27a66b145247d4d09379f25c446e01ff87bb17e46fb6098c6
-  data.tar.gz: bda5b5c568a4872ce1be8e2da62a10d801370967c5beffed0ff27eb12576d407
+  metadata.gz: 503fa2fc7ec041e2a3baca7937f969f7cc8061da02fcb698924f43f3ccc384f9
+  data.tar.gz: 88ad583e50e5d72b8f08c6212bdee24ce1f504d4776bcf0ff6c21faadb37db6e
 SHA512:
-  metadata.gz: 8b0363d0ee6aec32484806ef1e655d681127ae1318f0e391585f81d97b7cce1f28af1368c9038570a28aa0333abfafbc59dbcc65de49862f8248ff2a574edd83
-  data.tar.gz: 4aaaff3a6a1550829bd10e4af436fc6a5bc0515ff6098b1b6761e577365b5816c0bbea2d65e3c2bee1633944a10890079cdb34a263998524e1adaf45e5887df0
+  metadata.gz: 6bc9c3497c44c255eca104e024d672fa37041029c0da730ee257078f42a72b2d299b427c636b52ee6d0a370c41576d16af83b2ec55db4ad90418f104dbe406e9
+  data.tar.gz: ccecbb9860f879f0bd398954e67f546671e090a230a5f812bff8c59dd268e62755147ee4d14b3eafd7a59f182c39ee012f70e234ea14b47e58a63ef60dea71c7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    headmin (0.3.4)
+    headmin (0.4.0)
       closure_tree (~> 7.4)
       inline_svg (~> 1.7)
       redcarpet (~> 3.5)

data/app/assets/javascripts/headmin/controllers/autocomplete_controller.js

@@ -1,4 +1,4 @@
-/* global fetch */
+/* global fetch, Event */
 import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
@@ -18,11 +18,16 @@ export default class extends Controller {
       this.show()
     })
 
-    // Typing
+    // Navigation
     this.inputTarget.addEventListener('keydown', (event) => {
       this.handleKeydown(event)
     })
 
+    // Typing
+    this.inputTarget.addEventListener('keyup', (event) => {
+      this.handleKeyup(event)
+    })
+
     // Clicked outside dropdown
     document.addEventListener('click', (event) => {
       this.handleOutsideClick(event)
@@ -30,20 +35,33 @@ export default class extends Controller {
   }
 
   handleKeydown (event) {
-    this.show()
-
     const keyCode = parseInt(event.keyCode, 10)
     if (this.isArrowKey(keyCode)) {
       this.handleArrowKey(keyCode)
-    } else if (this.isEnterKey(keyCode)) {
-      this.selectActiveItem()
-    } else {
-      this.handleTextKey()
+    }
+
+    if (this.isEnterKey(keyCode)) {
+      this.selectActiveItem(event)
     }
   }
 
-  selectActiveItem () {
-    this.activeItem().click()
+  handleKeyup (event) {
+    // Ignore arrow keys or enters
+    const keyCode = parseInt(event.keyCode, 10)
+    if (this.isArrowKey(keyCode) || this.isEnterKey(keyCode)) {
+      return false
+    }
+
+    this.handleTextKey()
+  }
+
+  selectActiveItem (event) {
+    const activeItem = this.activeItem()
+    if (activeItem) {
+      this.deselectAll()
+      this.setValue(activeItem.getAttribute('value'))
+      event.preventDefault()
+    }
   }
 
   isEnterKey (keyCode) {
@@ -51,6 +69,7 @@ export default class extends Controller {
   }
 
   handleArrowKey (keyCode) {
+    this.show()
     switch (keyCode) {
       case 38:
         this.handleArrowUp()
@@ -72,8 +91,10 @@ export default class extends Controller {
 
   selectNextItem () {
     const next = this.nextItem()
-    this.deselectAll()
-    next.classList.add('active')
+    if (next) {
+      this.deselectAll()
+      next.classList.add('active')
+    }
   }
 
   nextItem () {
@@ -94,8 +115,10 @@ export default class extends Controller {
 
   selectPreviousItem () {
     const previous = this.previousItem()
-    this.deselectAll()
-    previous.classList.add('active')
+    if (previous) {
+      this.deselectAll()
+      previous.classList.add('active')
+    }
   }
 
   previousItem () {
@@ -160,13 +183,22 @@ export default class extends Controller {
       // 2. render html
       this.renderCollection(html)
     }).then(() => {
-      // 3. sort by relevance
-      // ...
-      // 4. Highlight
+      // 3. Highlight
       this.highlight()
+    }).then(() => {
+      // 4. Preselect first result
+      this.activateFirstItem()
+    }).then(() => {
+      // 5. Show results
+      this.show()
     })
   }
 
+  activateFirstItem () {
+    this.deselectAll()
+    this.firstItem().classList.add('active')
+  }
+
   show () {
     if (this.isDropdownEmpty()) {
       this.dropdownTarget.classList.remove('d-none')
@@ -190,7 +222,7 @@ export default class extends Controller {
 
   fetchCollection () {
     if (this.isRemote()) {
-      return fetch(this.urlValue).then((response) => {
+      return fetch(this.remoteURL()).then((response) => {
         return response.text()
       }).catch((error) => {
         console.error('The URL you provided for the autocomplete collection didn\'t return a successful result', error)
@@ -200,6 +232,29 @@ export default class extends Controller {
     }
   }
 
+  remoteURL () {
+    // Set dummy base in case a relative path is provided as remote URL
+    const base = 'https://example.com'
+    const url = new URL(this.urlValue, base)
+
+    // Update pagination params
+    const params = new URLSearchParams(url.search)
+    params.set('search', this.value())
+    params.set('page', '1')
+    params.set('per_page', '6')
+    url.search = params.toString()
+
+    // Convert to string
+    let urlString = url.toString()
+
+    // Convert back to relative url if needed
+    if (urlString.includes(base)) {
+      urlString = urlString.replace(base, '')
+    }
+
+    return urlString
+  }
+
   renderCollection (html) {
     this.dropdownTarget.innerHTML = html
   }
@@ -217,15 +272,23 @@ export default class extends Controller {
       text = text.replace(/<mark.*?>(.*?)<\/mark>/ig, '$1')
 
       // Highlight query
-      const regex2 = new RegExp(`(${query})`, 'gi')
-      text = text.replace(regex2, '<mark>$1</mark>')
+      if (query && query.length > 0) {
+        // Ignore all strings inside < >
+        const regex2 = new RegExp(`(?<!<[^>]*?)(&nbsp;)?(${query})`, 'gi')
+        text = text.replace(regex2, '<mark>$2</mark>')
+      }
 
       dropdownItem.innerHTML = text
     })
   }
 
   select (event) {
-    this.inputTarget.value = event.target.getAttribute('value')
+    this.setValue(event.currentTarget.getAttribute('value'))
+  }
+
+  setValue (value) {
+    this.inputTarget.value = value
+    this.inputTarget.dispatchEvent(new Event('change'))
     this.hide()
   }
 

data/app/assets/javascripts/headmin/controllers/popup_controller.js

@@ -1,3 +1,4 @@
+/* global HTMLInputElement */
 import { Controller } from '@hotwired/stimulus'
 import { createPopper } from '@popperjs/core'
 
@@ -32,14 +33,20 @@ export default class extends Controller {
     const popup = this.popupById(button.dataset.popupId)
     const passThru = button.dataset.popupPassThru
 
+    // Open the popup
+    createPopper(button, popup)
+    this.openPopup(popup)
+
     if (passThru) {
       // Pass click event to an element inside the popup
       const passThruElement = popup.querySelector(passThru)
       passThruElement.click()
-    } else {
-      // Open the popup
-      createPopper(button, popup)
-      this.openPopup(popup)
+
+      // Focus and select value if it's an input element
+      if (passThruElement instanceof HTMLInputElement) {
+        passThruElement.focus()
+        passThruElement.select()
+      }
     }
   }
 

data/app/assets/javascripts/headmin.js

@@ -4979,28 +4979,42 @@ var autocomplete_controller_default = class extends Controller {
     this.inputTarget.addEventListener("keydown", (event) => {
       this.handleKeydown(event);
     });
+    this.inputTarget.addEventListener("keyup", (event) => {
+      this.handleKeyup(event);
+    });
     document.addEventListener("click", (event) => {
       this.handleOutsideClick(event);
     });
   }
   handleKeydown(event) {
-    this.show();
     const keyCode = parseInt(event.keyCode, 10);
     if (this.isArrowKey(keyCode)) {
       this.handleArrowKey(keyCode);
-    } else if (this.isEnterKey(keyCode)) {
-      this.selectActiveItem();
-    } else {
-      this.handleTextKey();
+    }
+    if (this.isEnterKey(keyCode)) {
+      this.selectActiveItem(event);
     }
   }
-  selectActiveItem() {
-    this.activeItem().click();
+  handleKeyup(event) {
+    const keyCode = parseInt(event.keyCode, 10);
+    if (this.isArrowKey(keyCode) || this.isEnterKey(keyCode)) {
+      return false;
+    }
+    this.handleTextKey();
+  }
+  selectActiveItem(event) {
+    const activeItem = this.activeItem();
+    if (activeItem) {
+      this.deselectAll();
+      this.setValue(activeItem.getAttribute("value"));
+      event.preventDefault();
+    }
   }
   isEnterKey(keyCode) {
     return keyCode === 13;
   }
   handleArrowKey(keyCode) {
+    this.show();
     switch (keyCode) {
       case 38:
         this.handleArrowUp();
@@ -5019,8 +5033,10 @@ var autocomplete_controller_default = class extends Controller {
   }
   selectNextItem() {
     const next = this.nextItem();
-    this.deselectAll();
-    next.classList.add("active");
+    if (next) {
+      this.deselectAll();
+      next.classList.add("active");
+    }
   }
   nextItem() {
     const current = this.activeItem();
@@ -5036,8 +5052,10 @@ var autocomplete_controller_default = class extends Controller {
   }
   selectPreviousItem() {
     const previous = this.previousItem();
-    this.deselectAll();
-    previous.classList.add("active");
+    if (previous) {
+      this.deselectAll();
+      previous.classList.add("active");
+    }
   }
   previousItem() {
     const current = this.activeItem();
@@ -5087,8 +5105,16 @@ var autocomplete_controller_default = class extends Controller {
       this.renderCollection(html);
     }).then(() => {
       this.highlight();
+    }).then(() => {
+      this.activateFirstItem();
+    }).then(() => {
+      this.show();
     });
   }
+  activateFirstItem() {
+    this.deselectAll();
+    this.firstItem().classList.add("active");
+  }
   show() {
     if (this.isDropdownEmpty()) {
       this.dropdownTarget.classList.remove("d-none");
@@ -5108,7 +5134,7 @@ var autocomplete_controller_default = class extends Controller {
   }
   fetchCollection() {
     if (this.isRemote()) {
-      return fetch(this.urlValue).then((response) => {
+      return fetch(this.remoteURL()).then((response) => {
         return response.text();
       }).catch((error2) => {
         console.error("The URL you provided for the autocomplete collection didn't return a successful result", error2);
@@ -5117,6 +5143,20 @@ var autocomplete_controller_default = class extends Controller {
       return Promise.resolve(this.dropdownTarget.innerHTML);
     }
   }
+  remoteURL() {
+    const base = "https://example.com";
+    const url = new URL(this.urlValue, base);
+    const params = new URLSearchParams(url.search);
+    params.set("search", this.value());
+    params.set("page", "1");
+    params.set("per_page", "6");
+    url.search = params.toString();
+    let urlString = url.toString();
+    if (urlString.includes(base)) {
+      urlString = urlString.replace(base, "");
+    }
+    return urlString;
+  }
   renderCollection(html) {
     this.dropdownTarget.innerHTML = html;
   }
@@ -5128,13 +5168,19 @@ var autocomplete_controller_default = class extends Controller {
     this.dropdownItemTargets.forEach((dropdownItem) => {
       let text = dropdownItem.innerHTML;
       text = text.replace(/<mark.*?>(.*?)<\/mark>/ig, "$1");
-      const regex2 = new RegExp(`(${query})`, "gi");
-      text = text.replace(regex2, "<mark>$1</mark>");
+      if (query && query.length > 0) {
+        const regex2 = new RegExp(`(?<!<[^>]*?)(&nbsp;)?(${query})`, "gi");
+        text = text.replace(regex2, "<mark>$2</mark>");
+      }
       dropdownItem.innerHTML = text;
     });
   }
   select(event) {
-    this.inputTarget.value = event.target.getAttribute("value");
+    this.setValue(event.currentTarget.getAttribute("value"));
+  }
+  setValue(value) {
+    this.inputTarget.value = value;
+    this.inputTarget.dispatchEvent(new Event("change"));
     this.hide();
   }
   value() {
@@ -15046,12 +15092,15 @@ var popup_controller_default = class extends Controller {
     const button = event.target.closest('[data-popup-target="button"]');
     const popup = this.popupById(button.dataset.popupId);
     const passThru = button.dataset.popupPassThru;
+    createPopper3(button, popup);
+    this.openPopup(popup);
     if (passThru) {
       const passThruElement = popup.querySelector(passThru);
       passThruElement.click();
-    } else {
-      createPopper3(button, popup);
-      this.openPopup(popup);
+      if (passThruElement instanceof HTMLInputElement) {
+        passThruElement.focus();
+        passThruElement.select();
+      }
     }
   }
   close(event) {

data/app/assets/stylesheets/headmin/general.scss

@@ -1,5 +1,14 @@
 html {
   height: 100%;
+  background: red;
+}
+
+.list-group-item {
+  &.active {
+    .text-muted {
+      color: $list-group-active-color !important;
+    }
+  }
 }
 
 mark {

data/app/assets/stylesheets/headmin.css

@@ -13103,6 +13103,10 @@ input[type=search] {
 }
 html {
   height: 100%;
+  background: red;
+}
+.list-group-item.active .text-muted {
+  color: #fff !important;
 }
 mark,
 .mark {

data/app/models/headmin/form/blocks_view.rb

@@ -4,7 +4,7 @@ module Headmin
       def repeater_options
         keys = %i[form attribute names label]
         options = to_h.slice(*keys)
-        default_repeater_options.merge(options)
+        default_repeater_options.deep_merge(options)
       end
 
       def paths

data/app/models/headmin/form/checkbox_view.rb

@@ -17,7 +17,7 @@ module Headmin
       def input_options
         keys = attributes - %i[attribute form label validate wrapper checked_value unchecked_value]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def label_options
@@ -31,11 +31,11 @@ module Headmin
       end
 
       def wrapper_options
-        default_wrapper_options.merge(
+        default_wrapper_options.deep_merge(
           {
             class: %w[form-check mb-3]
           }
-        ).merge(@wrapper || {})
+        ).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/date_range_view.rb

@@ -2,11 +2,11 @@ module Headmin
   module Form
     class DateRangeView < ViewModel
       def start_options
-        default_start_options.merge(@start || {})
+        default_start_options.deep_merge(@start || {})
       end
 
       def end_options
-        default_end_options.merge(@end || {})
+        default_end_options.deep_merge(@end || {})
       end
 
       private

data/app/models/headmin/form/date_view.rb

@@ -12,19 +12,19 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute float form input_group input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/email_view.rb

@@ -13,21 +13,21 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute collection float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options.merge(autocomplete_input_options)
+        options = default_input_options.deep_merge(options)
+        options.deep_merge(autocomplete_input_options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(autocomplete_input_group_options)
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(autocomplete_input_group_options)
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/file_view.rb

@@ -11,24 +11,24 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute dropzone destroy form input_group label prepend preview validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options = options.merge(required: false) if attachments.any?
+        options = default_input_options.deep_merge(options)
+        options = options.deep_merge(required: false) if attachments.any?
         options
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3 h-form-file", ("form-floating" if float)],
           data: {
             controller: ("file-preview" if preview)
           }
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       def preview

data/app/models/headmin/form/flatpickr_range_view.rb

@@ -22,32 +22,32 @@ module Headmin
       end
 
       def start_options
-        default_start_options.merge(@start || {})
+        default_start_options.deep_merge(@start || {})
       end
 
       def end_options
-        default_end_options.merge(@end || {})
+        default_end_options.deep_merge(@end || {})
       end
 
       def input_options
         keys = attributes - %i[append attribute end float form input_group label prepend start validate wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)],
           data: {
             controller: "flatpickr date-range"
           }
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/flatpickr_view.rb

@@ -4,15 +4,15 @@ module Headmin
       def options
         keys = attributes - %i[data wrapper]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private
 
       def default_options
         {
-          data: default_data.merge(data || {}),
-          wrapper: default_wrapper_options.merge(wrapper || {})
+          data: default_data.deep_merge(data || {}),
+          wrapper: default_wrapper_options.deep_merge(wrapper || {})
         }
       end
 

data/app/models/headmin/form/input_group_view.rb

@@ -4,7 +4,7 @@ module Headmin
       def options
         keys = attributes - %i[bypass append prepend]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private

data/app/models/headmin/form/label_view.rb

@@ -8,7 +8,7 @@ module Headmin
       def options
         keys = attributes - %i[attribute form text]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private

data/app/models/headmin/form/number_view.rb

@@ -12,19 +12,19 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", float_class]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/password_view.rb

@@ -11,19 +11,19 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/redactorx_view.rb

@@ -2,7 +2,7 @@ module Headmin
   module Form
     class RedactorxView < ViewModel
       def options
-        default_options.merge(to_h)
+        default_options.deep_merge(to_h)
       end
 
       private
@@ -39,7 +39,7 @@ module Headmin
       attr_reader :topbar
 
       def redactor_options
-        default_redactor_options.merge(redactor || {})
+        default_redactor_options.deep_merge(redactor || {})
       end
 
       def default_redactor_options

data/app/models/headmin/form/search_view.rb

@@ -13,21 +13,21 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute collection float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options.merge(autocomplete_input_options)
+        options = default_input_options.deep_merge(options)
+        options.deep_merge(autocomplete_input_options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(autocomplete_input_group_options)
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(autocomplete_input_group_options)
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/select_view.rb

@@ -12,25 +12,25 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute collection float form input_group include_blank label prepend validate selected tags wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       def select_options
         keys = %i[include_blank selected]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private

data/app/models/headmin/form/switch_view.rb

@@ -2,7 +2,7 @@ module Headmin
   module Form
     class SwitchView < ViewModel
       def options
-        default_options.merge(to_h)
+        default_options.deep_merge(to_h)
       end
 
       private

data/app/models/headmin/form/text_view.rb

@@ -13,21 +13,21 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute collection float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options.merge(autocomplete_input_options)
+        options = default_input_options.deep_merge(options)
+        options.deep_merge(autocomplete_input_options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(autocomplete_input_group_options)
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(autocomplete_input_group_options)
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/textarea_view.rb

@@ -11,19 +11,19 @@ module Headmin
       def input_options
         keys = attributes - %i[attribute float form input_group label validate wrapper]
         options = to_h.slice(*keys)
-        default_input_options.merge(options)
+        default_input_options.deep_merge(options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/url_view.rb

@@ -13,21 +13,21 @@ module Headmin
       def input_options
         keys = attributes - %i[append attribute collection float form input_group label prepend validate wrapper]
         options = to_h.slice(*keys)
-        options = default_input_options.merge(options)
-        options.merge(autocomplete_input_options)
+        options = default_input_options.deep_merge(options)
+        options.deep_merge(autocomplete_input_options)
       end
 
       def input_group_options
         default_input_group_options
-          .merge(autocomplete_input_group_options)
-          .merge(label_input_group_options)
-          .merge(@input_group || {})
+          .deep_merge(autocomplete_input_group_options)
+          .deep_merge(label_input_group_options)
+          .deep_merge(@input_group || {})
       end
 
       def wrapper_options
-        default_wrapper_options.merge({
+        default_wrapper_options.deep_merge({
           class: ["mb-3", ("form-floating" if float)]
-        }).merge(@wrapper || {})
+        }).deep_merge(@wrapper || {})
       end
 
       private

data/app/models/headmin/form/wrapper_view.rb

@@ -4,7 +4,7 @@ module Headmin
       def options
         keys = attributes - %i[bypass]
         options = to_h.slice(*keys)
-        default_options.merge(options)
+        default_options.deep_merge(options)
       end
 
       private

data/app/models/headmin/form/wysiwyg_view.rb

@@ -2,7 +2,7 @@ module Headmin
   module Form
     class WysiwygView < ViewModel
       def options
-        default_options.merge(to_h)
+        default_options.deep_merge(to_h)
       end
 
       private

data/app/views/headmin/forms/fields/_group.html.erb

@@ -24,6 +24,7 @@
   #   <% end %#>
 
   label = local_assigns.has_key?(:label) ? label : nil
+  wrapper = local_assigns.has_key?(:wrapper) ? local_assigns[:wrapper] : true
   show_label = label != false
 %>
 
@@ -32,9 +33,13 @@
     <%= render 'headmin/forms/label', form: form, attribute: :value, text: label || field_label %>
   <% end %>
 
+  <% if wrapper %>
   <ul class="list-group mb-3">
     <li class="list-group-item">
       <%= yield group %>
     </li>
   </ul>
+  <% else %>
+    <%= yield group %>
+  <% end %>
 <% end %>

data/config/locales/headmin/forms/en.yml

@@ -22,7 +22,7 @@ en:
         blank: Make a choice
       repeater:
         add: "Add %{name}"
-        empty: This list is empty for now.
+        empty: Start by adding your first block
         row:
           add: Add row
           remove: Remove row

data/config/locales/headmin/forms/nl.yml

@@ -21,7 +21,7 @@ nl:
         blank: Maak een keuze
       repeater:
         add: "%{name} toevoegen"
-        empty: Deze lijst is voorlopig nog leeg.
+        empty: Voeg je eerste blok toe om te beginnen
         row:
           add: Rij toevoegen
           remove: Rij verwijderen

data/lib/headmin/version.rb

@@ -1,3 +1,3 @@
 module Headmin
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: headmin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jef Vlamings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: closure_tree