Skip to content

Fix hidden data when replicator sets are collapsed by default #6021

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

Merged
jesseleite merged 2 commits into from
May 10, 2022
Merged

Fix hidden data when replicator sets are collapsed by default #6021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d2a05a
Output explicit boolean here.
jesseleite May 10, 2022
390b8cb
Fix with $nextTick, but this doesn’t feel like the best fix.
jesseleite May 10, 2022
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
2 changes: 1 addition & 1 deletion resources/js/components/field-conditions/Validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,6 @@ export default class {
return false;
}

return intersection(this.getCheckedFieldPaths(dottedPrefix), revealerFields).length;
return intersection(this.getCheckedFieldPaths(dottedPrefix), revealerFields).length > 0;
}
}
16 changes: 11 additions & 5 deletions resources/js/components/field-conditions/ValidatorMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,18 @@ export default {

let validator = new Validator(field, this.values, this.$store, this.storeName);
let passes = validator.passesConditions();
let hiddenByRevealerField = validator.hasRevealerCondition(dottedPrefix);

this.$store.commit(`publish/${this.storeName}/setHiddenField`, {
dottedKey: dottedKey || field.handle,
hidden: ! passes,
omitValue: ! hiddenByRevealerField,
// TODO: The next tick here is necessary to fix #6018, but not sure it's the _right_ fix.
// Something is loading differently, causing the below `hiddenByRevealerField` check
// to fail, when the replicator is configured to collapse all sets by default 🤔
this.$nextTick(() => {
let hiddenByRevealerField = validator.hasRevealerCondition(dottedPrefix);

this.$store.commit(`publish/${this.storeName}/setHiddenField`, {
dottedKey: dottedKey || field.handle,
hidden: ! passes,
omitValue: ! hiddenByRevealerField,
});
});

return passes;
Expand Down