From dea215bd2712d15d137518d06c2d03cfa2dae03a Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Tue, 21 Jun 2022 11:54:31 +0200
Subject: [PATCH] close property actions menu from item

---
 .../backoffice/components/node-property-actions.element.ts | 7 ++++++-
 .../property-actions/property-action-clear.element.ts      | 2 ++
 .../property-actions/property-action-copy.element.ts       | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property-actions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property-actions.element.ts
index 3087d06d44..82aadb86b7 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property-actions.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/components/node-property-actions.element.ts
@@ -62,6 +62,11 @@ export class UmbNodePropertyActions extends UmbContextConsumerMixin(LitElement)
     this._open = !this._open;
   }
 
+  private _handleClose (event: CustomEvent) {
+    this._open = false;
+    event.stopPropagation();
+  };
+
   disconnectedCallback () {
     super.disconnectedCallback();
     this._subscription?.unsubscribe();
@@ -73,7 +78,7 @@ export class UmbNodePropertyActions extends UmbContextConsumerMixin(LitElement)
         <uui-popover
           .open=${this._open}
           placement="bottom-start"
-          @close="${() => this._open = false}">
+          @close="${this._handleClose}">
           <uui-button
             slot="trigger"
             look="secondary"
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/property-action-clear.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/property-action-clear.element.ts
index dc7720f3c5..4bd0feaaff 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/property-action-clear.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/property-action-clear.element.ts
@@ -30,6 +30,8 @@ export default class UmbPropertyActionClear extends UmbContextConsumerMixin(LitE
 
   private _handleLabelClick () {
     this._notificationService?.peek('Clear value');
+    // TODO: how do we want to close the menu? Testing an event based approach
+    this.dispatchEvent(new CustomEvent('close', { bubbles: true, composed: true }));
   }
 
   render() {
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/property-action-copy.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/property-action-copy.element.ts
index c810be71a8..c742f5ad70 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/property-action-copy.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/property-actions/property-action-copy.element.ts
@@ -30,6 +30,8 @@ export default class UmbPropertyActionCopy extends UmbContextConsumerMixin(LitEl
 
   private _handleLabelClick () {
     this._notificationService?.peek('Copied to clipboard');
+    // TODO: how do we want to close the menu? Testing an event based approach
+    this.dispatchEvent(new CustomEvent('close', { bubbles: true, composed: true }));
   }
 
   render() {