Make invariant variant merge for blocks capable of detecting sub layouts (#18234)

Author: Migaroez

src/Umbraco.Core/Models/Blocks/BlockGridLayoutAreaItem.cs

@@ -11,4 +11,10 @@ public BlockGridLayoutAreaItem()
 
     public BlockGridLayoutAreaItem(Guid key)
         => Key = key;
+
+    public bool ContainsContent(Guid key)
+        => Items.Any(item => item.ReferencesContent(key));
+
+    public bool ContainsSetting(Guid key)
+        => Items.Any(item => item.ReferencesSetting(key));
 }

src/Umbraco.Core/Models/Blocks/BlockGridLayoutItem.cs

@@ -38,4 +38,10 @@ public BlockGridLayoutItem(Guid contentKey, Guid settingsKey)
         : base(contentKey, settingsKey)
     {
     }
+
+    public override bool ReferencesContent(Guid key)
+        => ContentKey == key || Areas.Any(area => area.ContainsContent(key));
+
+    public override bool ReferencesSetting(Guid key)
+        => SettingsKey == key || Areas.Any(area => area.ContainsSetting(key));
 }

src/Umbraco.Core/Models/Blocks/BlockLayoutItemBase.cs

@@ -81,4 +81,10 @@ protected BlockLayoutItemBase(Guid contentKey, Guid settingsKey)
         SettingsKey = settingsKey;
         SettingsUdi = new GuidUdi(Constants.UdiEntityType.Element, settingsKey);
     }
+
+    public virtual bool ReferencesContent(Guid key)
+        => ContentKey == key;
+
+    public virtual bool ReferencesSetting(Guid key)
+        => SettingsKey == key;
 }

src/Umbraco.Core/Models/Blocks/IBlockLayoutItem.cs

@@ -14,4 +14,8 @@ public interface IBlockLayoutItem
     public Guid ContentKey { get; set; }
 
     public Guid? SettingsKey { get; set; }
+
+    public bool ReferencesContent(Guid key) => ContentKey == key;
+
+    public bool ReferencesSetting(Guid key) => SettingsKey == key;
 }

src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs

@@ -320,10 +320,10 @@ private void MapBlockItemDataFromEditor(List<BlockItemData> items)
 
         // remove all the blocks that are no longer part of the layout
         target.BlockValue.ContentData.RemoveAll(contentBlock =>
-            target.Layout!.Any(layoutItem => layoutItem.ContentKey == contentBlock.Key) is false);
+            target.Layout!.Any(layoutItem => layoutItem.ReferencesContent(contentBlock.Key)) is false);
 
         target.BlockValue.SettingsData.RemoveAll(settingsBlock =>
-            target.Layout!.Any(layoutItem => layoutItem.SettingsKey == settingsBlock.Key) is false);
+            target.Layout!.Any(layoutItem => layoutItem.ReferencesSetting(settingsBlock.Key)) is false);
 
         CleanupVariantValues(source.BlockValue.ContentData, target.BlockValue.ContentData, canUpdateInvariantData, allowedCultures);
         CleanupVariantValues(source.BlockValue.SettingsData, target.BlockValue.SettingsData, canUpdateInvariantData, allowedCultures);