headmin 0.5.9 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de108dc4e7610d069568dcaca3710fe2b57c26f8937087503cba8becc0738134
-  data.tar.gz: ab79adc7a81dd88069dabc832ed9f0b00bf77674cd378f30895a7469e0fea5fc
+  metadata.gz: 4f0d94377c6d3cf0d97bdffa08c34d9c95ef9b72036c8e7b1d0d1b89996ed52d
+  data.tar.gz: 9b263a38b16dacace7769f9eb2cab3b90dc478cc229fead7ae157c4fd48e7f65
 SHA512:
-  metadata.gz: dc7180989c84f5c3362a93c61a22587c2b13f6b5f2af207b0de8556ec1a29a2844add4637c2430bb6d1db2b4b73a28642981a050dea30c4397117f3284b440a6
-  data.tar.gz: d2abdb1d8806ffff2dd5af8cec68a3f87a37afa64ad6bdd4d59db4b9d469b0a22664f4a2cb6ee4539e8acf2deba7eda9f8f40b38b8c8641e9d74885da3591a09
+  metadata.gz: 3ee1ebb9dbc530154fd310c910dbab36e13272a0c3433b494588e6f552c5e8af6c6ee4f39b41f2737a7b2321805c02d9a5c22b7dfeea9c62455584ecc0cbc907
+  data.tar.gz: e88897ec516a9b4f83188f8eb12e1b49d46da547d03b459942da6f77266faee9031f0f3f06c5300529183e6f6cd9aa2112e92ce1b30ba7902edcd919b0f9ceaf

data/.gitignore

@@ -25,3 +25,9 @@
 # Ingore editors
 /.idea
 /headmin.iml
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+Gemfile.lock
+# .ruby-version
+# .ruby-gemset

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Headmin Changelog
 
+## 0.6
+- FEATURE: Blocks can now be configured to have custom anchor names and have its visibility toggled
+- BREAK: Add this migration to current projects that make use of blocks
+```ruby
+class AddVisibleHandleToBlock < ActiveRecord::Migration[7.0]
+  def change
+    add_column :blocks, :visible, :boolean, default: true
+    add_column :blocks, :handle, :string
+  end
+end
+```
+
 ## 0.5
 - FEATURE: Filters now have support for operators and conditionals 
 - BREAK: `headmin/filters` now return a form object that is required for each individual form

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    headmin (0.5.8)
+    headmin (0.6.0)
       closure_tree (~> 7.4)
       inline_svg (~> 1.7)
       redcarpet (~> 3.5)
@@ -10,81 +10,81 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.2.4)
-      actionpack (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
+    actioncable (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.2.4)
-      actionpack (= 7.0.2.4)
-      activejob (= 7.0.2.4)
-      activerecord (= 7.0.2.4)
-      activestorage (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
+    actionmailbox (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.2.4)
-      actionpack (= 7.0.2.4)
-      actionview (= 7.0.2.4)
-      activejob (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
+    actionmailer (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      actionview (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.2.4)
-      actionview (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
+    actionpack (7.0.4.1)
+      actionview (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.2.4)
-      actionpack (= 7.0.2.4)
-      activerecord (= 7.0.2.4)
-      activestorage (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
+    actiontext (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.2.4)
-      activesupport (= 7.0.2.4)
+    actionview (7.0.4.1)
+      activesupport (= 7.0.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.2.4)
-      activesupport (= 7.0.2.4)
+    activejob (7.0.4.1)
+      activesupport (= 7.0.4.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.2.4)
-      activesupport (= 7.0.2.4)
-    activerecord (7.0.2.4)
-      activemodel (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
-    activestorage (7.0.2.4)
-      actionpack (= 7.0.2.4)
-      activejob (= 7.0.2.4)
-      activerecord (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
+    activemodel (7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activerecord (7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
+    activestorage (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.2.4)
+    activesupport (7.0.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     acts_as_list (1.0.4)
       activerecord (>= 4.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     bcrypt (3.1.18)
     breadcrumbs_on_rails (4.1.0)
       railties (>= 5.0)
     builder (3.2.4)
-    capybara (3.36.0)
+    capybara (3.38.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -96,42 +96,43 @@ GEM
     closure_tree (7.4.0)
       activerecord (>= 4.2.10)
       with_advisory_lock (>= 4.0.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crass (1.0.6)
-    debug (1.5.0)
-      irb (>= 1.3.6)
-      reline (>= 0.2.7)
+    date (3.3.3)
+    debug (1.7.1)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
     devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    digest (3.1.0)
     enumerize (2.5.0)
       activesupport (>= 3.2)
-    erubi (1.10.0)
+    erubi (1.12.0)
     ffi (1.15.5)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
     hotwire-rails (0.1.3)
       rails (>= 6.0.0)
       stimulus-rails
       turbo-rails
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (1.0.3)
+    importmap-rails (1.1.5)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
     inline_svg (1.8.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-console (0.5.11)
-    irb (1.4.1)
+    io-console (0.6.0)
+    irb (1.6.2)
       reline (>= 0.3.0)
+    json (2.6.3)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -144,74 +145,73 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    loofah (2.16.0)
+    language_server-protocol (3.17.0.2)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
-    minitest (5.15.0)
-    minitest-spec-rails (6.1.0)
+    minitest (5.17.0)
+    minitest-spec-rails (6.2.0)
       minitest (>= 5.0)
       railties (>= 4.1)
-    net-imap (0.2.3)
-      digest
+    net-imap (0.3.4)
+      date
       net-protocol
-      strscan
-    net-pop (0.1.1)
-      digest
+    net-pop (0.1.2)
       net-protocol
+    net-protocol (0.2.1)
       timeout
-    net-protocol (0.1.3)
-      timeout
-    net-smtp (0.3.1)
-      digest
+    net-smtp (0.3.3)
       net-protocol
-      timeout
     nio4r (2.5.8)
-    nokogiri (1.13.4-arm64-darwin)
+    nokogiri (1.14.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-darwin)
+    nokogiri (1.14.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-linux)
+    nokogiri (1.14.0-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.7)
-    puma (5.6.4)
+    public_suffix (5.0.1)
+    puma (5.6.5)
       nio4r (~> 2.0)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (7.0.2.4)
-      actioncable (= 7.0.2.4)
-      actionmailbox (= 7.0.2.4)
-      actionmailer (= 7.0.2.4)
-      actionpack (= 7.0.2.4)
-      actiontext (= 7.0.2.4)
-      actionview (= 7.0.2.4)
-      activejob (= 7.0.2.4)
-      activemodel (= 7.0.2.4)
-      activerecord (= 7.0.2.4)
-      activestorage (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
+    racc (1.6.2)
+    rack (2.2.6.2)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (7.0.4.1)
+      actioncable (= 7.0.4.1)
+      actionmailbox (= 7.0.4.1)
+      actionmailer (= 7.0.4.1)
+      actionpack (= 7.0.4.1)
+      actiontext (= 7.0.4.1)
+      actionview (= 7.0.4.1)
+      activejob (= 7.0.4.1)
+      activemodel (= 7.0.4.1)
+      activerecord (= 7.0.4.1)
+      activestorage (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.2.4)
+      railties (= 7.0.4.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    railties (7.0.2.4)
-      actionpack (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    railties (7.0.4.1)
+      actionpack (= 7.0.4.1)
+      activesupport (= 7.0.4.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -219,8 +219,8 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     redcarpet (3.5.1)
-    regexp_parser (2.3.1)
-    reline (0.3.1)
+    regexp_parser (2.6.2)
+    reline (0.3.2)
       io-console (~> 0.5)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -231,18 +231,19 @@ GEM
       actionpack (>= 5.2, < 7.1)
       activesupport (>= 5.2, < 7.1)
       addressable (~> 2.7)
-    rubocop (1.28.2)
+    rubocop (1.42.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.13.3)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
@@ -256,29 +257,32 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sprockets (4.0.3)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    standard (1.11.0)
-      rubocop (= 1.28.2)
-      rubocop-performance (= 1.13.3)
-    stimulus-rails (1.0.4)
+    sqlite3 (1.6.0-arm64-darwin)
+    sqlite3 (1.6.0-x86_64-darwin)
+    sqlite3 (1.6.0-x86_64-linux)
+    standard (1.22.1)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (= 1.42.0)
+      rubocop-performance (= 1.15.2)
+    stimulus-rails (1.2.1)
       railties (>= 6.0.0)
-    strscan (3.0.1)
     thor (1.2.1)
-    tilt (2.0.10)
-    timeout (0.2.0)
-    turbo-rails (1.0.1)
+    tilt (2.0.11)
+    timeout (0.3.1)
+    turbo-rails (1.3.2)
       actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
       railties (>= 6.0.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
     warden (1.2.9)
       rack (>= 2.0.9)
     websocket-driver (0.7.5)
@@ -288,7 +292,7 @@ GEM
       activerecord (>= 4.2)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   arm64-darwin-21

data/README.md

@@ -128,8 +128,8 @@ $ bundle
 # Update the version number, push commits and tag the release
 $ gem bump -v {patch,minor,major,...} --push --tag
 
-# Release to Rubygems
-$ gem release
+# Release to Rubygems and create a Github release tag
+$ gem release --github
 ```
 
 Update the node package

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

@@ -3,7 +3,7 @@ import Sortable from 'sortablejs'
 
 export default class extends Controller {
   static get targets () {
-    return ['item', 'template', 'thumbnails', 'modalButton', 'placeholder', 'count', 'editButton']
+    return ['item', 'template', 'thumbnails', 'modalButton', 'placeholder', 'count', 'editButton', 'validationInput']
   }
 
   connect () {
@@ -17,6 +17,8 @@ export default class extends Controller {
     if (this.hasSorting()) {
       this.initSortable()
     }
+
+    this.validate()
   }
 
   // Actions
@@ -81,6 +83,41 @@ export default class extends Controller {
 
     // Toggle placeholder
     this.togglePlaceholder()
+
+    // Validate
+    this.validate()
+  }
+
+  validate () {
+    this.clearValidation()
+    this.validateMinimum()
+    this.validateMaximum()
+  }
+
+  clearValidation () {
+    this.validationInputTarget.setCustomValidity('')
+  }
+
+  validateMinimum () {
+    const count = this.activeItems().length
+    if (count < this.minActiveItems()) {
+      this.validationInputTarget.setCustomValidity(this.validationInputTarget.dataset.minMessage)
+    }
+  }
+
+  validateMaximum () {
+    const count = this.activeItems().length
+    if (count > this.maxActiveItems()) {
+      this.validationInputTarget.setCustomValidity(this.validationInputTarget.dataset.maxMessage)
+    }
+  }
+
+  minActiveItems () {
+    return parseInt(this.element.dataset.min, 10) || 0
+  }
+
+  maxActiveItems () {
+    return parseInt(this.element.dataset.max, 10) || Infinity
   }
 
   resetPositions () {

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

@@ -1,3 +1,4 @@
+/* global IntersectionObserver */
 import { Controller } from '@hotwired/stimulus'
 
 export default class extends Controller {
@@ -6,7 +7,7 @@ export default class extends Controller {
   }
 
   connect () {
-    this.update()
+    onVisible(this.textareaTarget, () => { this.update() })
   }
 
   update () {
@@ -32,3 +33,16 @@ export default class extends Controller {
     this.countTarget.textContent = `${currentLength}/${maximumLength}`
   }
 }
+
+// Custom callback event that triggers when an element becomes visible.
+// Solves the bug where textarea fields are not properly sized when they (or their parent) or hidden.
+function onVisible (element, callback) {
+  new IntersectionObserver((entries, observer) => {
+    entries.forEach(entry => {
+      if (entry.intersectionRatio > 0) {
+        callback(element)
+        observer.disconnect()
+      }
+    })
+  }).observe(element)
+}

data/app/assets/javascripts/headmin.js

@@ -10096,7 +10096,7 @@ var hello_controller_default = class extends Controller {
 // app/assets/javascripts/headmin/controllers/media_controller.js
 var media_controller_default = class extends Controller {
   static get targets() {
-    return ["item", "template", "thumbnails", "modalButton", "placeholder", "count", "editButton"];
+    return ["item", "template", "thumbnails", "modalButton", "placeholder", "count", "editButton", "validationInput"];
   }
   connect() {
     document.addEventListener("mediaSelectionSubmitted", (event) => {
@@ -10107,6 +10107,7 @@ var media_controller_default = class extends Controller {
     if (this.hasSorting()) {
       this.initSortable();
     }
+    this.validate();
   }
   destroy(event) {
     const item = event.currentTarget.closest("[data-media-target='item']");
@@ -10147,6 +10148,33 @@ var media_controller_default = class extends Controller {
     this.resetPositions();
     this.syncIds();
     this.togglePlaceholder();
+    this.validate();
+  }
+  validate() {
+    this.clearValidation();
+    this.validateMinimum();
+    this.validateMaximum();
+  }
+  clearValidation() {
+    this.validationInputTarget.setCustomValidity("");
+  }
+  validateMinimum() {
+    const count = this.activeItems().length;
+    if (count < this.minActiveItems()) {
+      this.validationInputTarget.setCustomValidity(this.validationInputTarget.dataset.minMessage);
+    }
+  }
+  validateMaximum() {
+    const count = this.activeItems().length;
+    if (count > this.maxActiveItems()) {
+      this.validationInputTarget.setCustomValidity(this.validationInputTarget.dataset.maxMessage);
+    }
+  }
+  minActiveItems() {
+    return parseInt(this.element.dataset.min, 10) || 0;
+  }
+  maxActiveItems() {
+    return parseInt(this.element.dataset.max, 10) || Infinity;
   }
   resetPositions() {
     this.activeItems().forEach((item, index2) => {
@@ -15825,7 +15853,9 @@ var textarea_controller_default = class extends Controller {
     return ["textarea", "count"];
   }
   connect() {
-    this.update();
+    onVisible(this.textareaTarget, () => {
+      this.update();
+    });
   }
   update() {
     this.resize();
@@ -15846,6 +15876,16 @@ var textarea_controller_default = class extends Controller {
     this.countTarget.textContent = `${currentLength}/${maximumLength}`;
   }
 };
+function onVisible(element, callback) {
+  new IntersectionObserver((entries, observer) => {
+    entries.forEach((entry) => {
+      if (entry.intersectionRatio > 0) {
+        callback(element);
+        observer.disconnect();
+      }
+    });
+  }).observe(element);
+}
 
 // app/assets/javascripts/headmin/index.js
 var Headmin = class {

data/app/assets/stylesheets/headmin/overrides/redactorx.scss

@@ -32,7 +32,8 @@
 }
 
 .rx-toolbar-container.is-rx-toolbar {
-  background: transparent;
+  border-top-left-radius: 0.25rem;
+  border-top-right-radius: 0.25rem;
   border-bottom: 1px solid $input-border-color;
 }
 

data/app/assets/stylesheets/headmin.css

@@ -12936,7 +12936,8 @@ span.flatpickr-weekday {
   background-position: top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem);
 }
 .rx-toolbar-container.is-rx-toolbar {
-  background: transparent;
+  border-top-left-radius: 0.25rem;
+  border-top-right-radius: 0.25rem;
   border-bottom: 1px solid #ced4da;
 }
 .rx-content {

data/app/controllers/concerns/headmin/pagination.rb

@@ -21,7 +21,7 @@ module Headmin
 
     def per_page
       length = params[:per_page].to_i
-      length > 0 ? length : 24
+      (length > 0) ? length : 24
     end
   end
 end

data/app/models/concerns/headmin/attachment.rb

@@ -0,0 +1,34 @@
+module Headmin
+  module Attachment
+    extend ActiveSupport::Concern
+    included do
+      scope :not_a_variant, -> { where.not(record_type: "ActiveStorage::VariantRecord") }
+
+      def record_hierarchy
+        hierarchy = []
+
+        current = record
+
+        current, partial_hierarchy = process_fieldable(current)
+        hierarchy << partial_hierarchy if partial_hierarchy.present?
+
+        current, partial_hierarchy = process_blockable(current)
+        hierarchy << partial_hierarchy if partial_hierarchy.present?
+
+        hierarchy << current if current.present?
+
+        hierarchy.flatten
+      end
+
+      private
+
+      def process_blockable(field)
+        field.respond_to?(:blockable) ? [field.blockable, field] : [field, nil]
+      end
+
+      def process_fieldable(field)
+        field.respond_to?(:fieldable) ? [field.root.fieldable, field.self_and_ancestors] : [field, nil]
+      end
+    end
+  end
+end