From b13f2603412dc62536d759ab67ae4ed7e4f7feb2 Mon Sep 17 00:00:00 2001
From: Patrick de Mooij <patrickdemooij98@hotmail.com>
Date: Mon, 11 Oct 2021 21:15:25 +0200
Subject: [PATCH] 11343: Remove blocklist block on cancel

---
 .../blocklist/umbBlockListPropertyEditor.component.js      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index 7334fbeadf..11ef37029c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -65,6 +65,9 @@
         vm.layout = []; // The layout object specific to this Block Editor, will be a direct reference from Property Model.
         vm.availableBlockTypes = []; // Available block entries of this property editor.
         vm.labels = {};
+        vm.options = {
+            createFlow: false
+        };
 
         localizationService.localizeMany(["grid_addElement", "content_createEmpty"]).then(function (data) {
             vm.labels.grid_addElement = data[0];
@@ -380,7 +383,7 @@
 
         function editBlock(blockObject, openSettings, blockIndex, parentForm, options) {
 
-            options = options || {};
+            options = options || vm.options;
 
             // this must be set
             if (blockIndex === undefined) {
@@ -560,7 +563,9 @@
                 if (inlineEditing === true) {
                     blockObject.activate();
                 } else if (inlineEditing === false && blockObject.hideContentInOverlay !== true) {
+                    vm.options.createFlow = true;
                     blockObject.edit();
+                    vm.options.createFlow = false;
                 }
             }
         }