Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-10-31 10:25:50 +01:00
Code Issues Packages Projects Releases Activity

looks like a fix for deeply nested sortable fields!

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-09-19 21:15:28 -06:00
parent 6d673fc7c4
commit a8ac6f8573
2 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
themes/grav/app/forms/fields/collections.js
View File

@@ -231,11 +231,15 @@ export default class CollectionsField {
// special case to preserve array field index keys // special case to preserve array field index keys
if (prop === 'name' && element.data('gravArrayType')) { if (prop === 'name' && element.data('gravArrayType')) {
const match_index = element.attr(prop).match(/\[[0-9]{1,}\]$/); const match_index = element.attr(prop).match(/\[[0-9]{1,}\]$/);
const pattern = element[0].closest('[data-grav-array-name]').dataset.gravArrayName; const array_container = element[0].closest('[data-grav-array-name]');
if (match_index && pattern) {
if (match_index) {
array_index = match_index[0]; array_index = match_index[0];
element.attr(prop, `${pattern}${match_index[0]}`); element.attr(prop, element.attr(prop).slice(0, array_index.length * -1));
return; }
if (array_container && array_container.dataset && array_container.dataset.gravArrayName) {
element.attr(prop, array_container.dataset.gravArrayName);
} }
} }
@@ -255,14 +259,8 @@ export default class CollectionsField {
let matchedKey = currentKey; let matchedKey = currentKey;
let replaced = element.attr(prop).replace(regexps[0], (/* str, p1, offset */) => { let replaced = element.attr(prop).replace(regexps[0], (/* str, p1, offset */) => {
let extras = '';
if (array_index) {
extras = array_index;
console.log(indexes, extras);
}
matchedKey = indexes.shift() || matchedKey; matchedKey = indexes.shift() || matchedKey;
return `[${matchedKey}]${extras}`; return `[${matchedKey}]`;
}); });
replaced = replaced.replace(regexps[1], (/* str, p1, offset */) => { replaced = replaced.replace(regexps[1], (/* str, p1, offset */) => {
@@ -270,7 +268,7 @@ export default class CollectionsField {
return `.${matchedKey}.`; return `.${matchedKey}.`;
}); });
element.attr(prop, replaced); element.attr(prop, array_index ? `${replaced}${array_index}` : replaced);
}); });
}); });
}); });

19
themes/grav/js/admin.min.js vendored
View File

@@ -5723,11 +5723,13 @@ var CollectionsField = /*#__PURE__*/function () {
// special case to preserve array field index keys // special case to preserve array field index keys
if (prop === 'name' && element.data('gravArrayType')) { if (prop === 'name' && element.data('gravArrayType')) {
var match_index = element.attr(prop).match(/\[[0-9]{1,}\]$/); var match_index = element.attr(prop).match(/\[[0-9]{1,}\]$/);
var pattern = element[0].closest('[data-grav-array-name]').dataset.gravArrayName; var array_container = element[0].closest('[data-grav-array-name]');
if (match_index && pattern) { if (match_index) {
array_index = match_index[0]; array_index = match_index[0];
element.attr(prop, "".concat(pattern).concat(match_index[0])); element.attr(prop, element.attr(prop).slice(0, array_index.length * -1));
return; }
if (array_container && array_container.dataset && array_container.dataset.gravArrayName) {
element.attr(prop, array_container.dataset.gravArrayName);
} }
} }
if (hasCustomKey && !observedValue) { if (hasCustomKey && !observedValue) {
@@ -5746,20 +5748,15 @@ var CollectionsField = /*#__PURE__*/function () {
var matchedKey = currentKey; var matchedKey = currentKey;
var replaced = element.attr(prop).replace(regexps[0], function /* str, p1, offset */ var replaced = element.attr(prop).replace(regexps[0], function /* str, p1, offset */
() { () {
var extras = '';
if (array_index) {
extras = array_index;
console.log(indexes, extras);
}
matchedKey = indexes.shift() || matchedKey; matchedKey = indexes.shift() || matchedKey;
return "[".concat(matchedKey, "]").concat(extras); return "[".concat(matchedKey, "]");
}); });
replaced = replaced.replace(regexps[1], function /* str, p1, offset */ replaced = replaced.replace(regexps[1], function /* str, p1, offset */
() { () {
matchedKey = indexes.shift() || matchedKey; matchedKey = indexes.shift() || matchedKey;
return ".".concat(matchedKey, "."); return ".".concat(matchedKey, ".");
}); });
element.attr(prop, replaced); element.attr(prop, array_index ? "".concat(replaced).concat(array_index) : replaced);
}); });
}); });
}); });