Skip to content

Commit

Permalink
fix merge conflict problem
Browse files Browse the repository at this point in the history
  • Loading branch information
brendanbond committed Dec 11, 2024
1 parent 0eb4411 commit 4ae654a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/process/clearHidden/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const clearHiddenProcess: ProcessorFnSync<ClearHiddenScope> = (context) =

if (
shouldClearValueWhenHidden &&
(isConditionallyHidden || component.hidden || component.scope?.conditionallyHidden)
(isConditionallyHidden || component.scope?.conditionallyHidden)
) {
unset(data, path);
scope.clearHidden[path] = true;
Expand Down
2 changes: 1 addition & 1 deletion src/process/hideChildren.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const hideChildrenProcessor: ProcessorFnSync<ConditionsScope> = (context)
scope.conditionals = [];
}

if (isConditionallyHidden || component.hidden || parent?.scope?.conditionallyHidden) {
if (isConditionallyHidden || parent?.scope?.conditionallyHidden) {
setComponentScope(component, 'conditionallyHidden', true);
}

Expand Down

0 comments on commit 4ae654a

Please sign in to comment.