Skip to content

Fix multi-combo field remove and undo buttons not working #12406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RudyTheDev wants to merge 2 commits into
base: develop
Choose a base branch
from
+32 −8
Open

Fix multi-combo field remove and undo buttons not working #12406

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0e36d0
Fix uiField not considering sub-tags for multiCombo fields
RudyTheDev Jun 2, 2026
c304191
Fix uiField revert and isModified functions not considering prior mat…
RudyTheDev Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions modules/ui/field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ export function uiField(context, presetField, entityIDs, options) {
}


function allKeys() {
return field.allKeys();
function allKeys(tags) {
return field.allKeys(tags);
}


Expand All @@ -75,15 +75,23 @@ export function uiField(context, presetField, entityIDs, options) {
return entityIDs.some(function(entityID) {
var original = context.graph().base().entities[entityID];
var latest = context.graph().entity(entityID);
return allKeys().some(function(key) {
return original ? latest.tags[key] !== original.tags[key] : latest.tags[key];
});
if (original) {
var originalKeys = allKeys(original.tags);
var latestKeys = allKeys(_tags);
return latestKeys.concat(originalKeys).some(function (key) {
return latest.tags[key] !== original.tags[key];
});
} else {
return allKeys(_tags).some(function (key) {
return !!latest.tags[key];
});
}
});
}


function tagsContainFieldKey() {
return allKeys().some(function(key) {
return allKeys(_tags).some(function(key) {
if (field.type === 'multiCombo') {
for (var tagKey in _tags) {
if (tagKey.indexOf(key) === 0) {
Expand Down Expand Up @@ -111,7 +119,23 @@ export function uiField(context, presetField, entityIDs, options) {
d3_event.preventDefault();
if (!entityIDs || _locked) return;

dispatch.call('revert', d, allKeys());
let keys = allKeys(_tags);

if (entityIDs) {
for (let i = 0; i < entityIDs.length; i++) {
const entityID = entityIDs[i];
const original = context.graph().base().entities[entityID];
if (original) {
allKeys(original.tags).forEach(function(key) {
if (keys.indexOf(key) === -1) {
keys.push(key);
}
});
}
}
}

dispatch.call('revert', d, keys);
}


Expand All @@ -121,7 +145,7 @@ export function uiField(context, presetField, entityIDs, options) {
if (_locked) return;

var t = {};
allKeys().forEach(function(key) {
allKeys(_tags).forEach(function(key) {
t[key] = undefined;
});

Expand Down
Loading