Merge remote-tracking branch 'upstream/dev' into feature/share-review-timestamp

This commit is contained in:
0x464e
2026-04-05 14:06:59 +03:00
433 changed files with 19470 additions and 3221 deletions
+5 -2
View File
@@ -649,8 +649,11 @@ const mergeSectionConfig = (
return srcValue ?? objValue;
}
if (key === "uiSchema" && srcValue !== undefined) {
return srcValue;
if (key === "uiSchema") {
if (objValue && srcValue) {
return merge({}, objValue, srcValue);
}
return srcValue ?? objValue;
}
return undefined;