From ae07206100653df63014fcd3c07c7447aee4ad67 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Wed, 20 May 2020 13:15:20 +0200
Subject: [PATCH] open actions on right-click too

---
 .../App/components/buttons/dot-button.vue     | 12 +--
 .../App/components/buttons/icon-button.vue    |  6 +-
 .../App/components/overlays/dropdown-list.vue | 13 ++-
 zero.Web.UI/App/components/tree.vue           | 82 ++++++++++++++++++-
 zero.Web.UI/Sass/Core/_settings.scss          |  2 +-
 zero.Web.UI/Sass/Modules/Buttons/_button.scss |  3 +-
 6 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/zero.Web.UI/App/components/buttons/dot-button.vue b/zero.Web.UI/App/components/buttons/dot-button.vue
index 4336ccec..dae5bcc5 100644
--- a/zero.Web.UI/App/components/buttons/dot-button.vue
+++ b/zero.Web.UI/App/components/buttons/dot-button.vue
@@ -1,5 +1,5 @@
 <template>
-  <button type="button" class="ui-dot-button" :disabled="disabled" @click="click" :title="title | localize">
+  <button type="button" class="ui-dot-button" :disabled="disabled" @click="tryClick" :title="title | localize">
     <span class="sr-only" v-localize="title"></span>
     <i class="ui-button-icon fth-more-horizontal"></i>
   </button>
@@ -19,11 +19,7 @@
         type: String,
         default: '@ui.actions'
       },
-      disabled: Boolean,
-      click: {
-        type: Function,
-        default: () => { }
-      }
+      disabled: Boolean
     },
 
     mounted ()
@@ -33,6 +29,10 @@
 
     methods: {
 
+      tryClick(ev)
+      {
+        this.$emit('click', ev);
+      }
     }
   }
 </script>
\ No newline at end of file
diff --git a/zero.Web.UI/App/components/buttons/icon-button.vue b/zero.Web.UI/App/components/buttons/icon-button.vue
index 7e4387c9..2119526d 100644
--- a/zero.Web.UI/App/components/buttons/icon-button.vue
+++ b/zero.Web.UI/App/components/buttons/icon-button.vue
@@ -27,11 +27,7 @@
         type: String,
         default: '@ui.back'
       },
-      disabled: Boolean,
-      click: {
-        type: Function,
-        default: () => { }
-      }
+      disabled: Boolean
     },
 
     mounted ()
diff --git a/zero.Web.UI/App/components/overlays/dropdown-list.vue b/zero.Web.UI/App/components/overlays/dropdown-list.vue
index 1555edd5..91f58b35 100644
--- a/zero.Web.UI/App/components/overlays/dropdown-list.vue
+++ b/zero.Web.UI/App/components/overlays/dropdown-list.vue
@@ -40,13 +40,6 @@
       dropdown: null
     }),
 
-    watch: {
-      value: function (val)
-      {
-        console.info(JSON.parse(JSON.stringify(val)));
-      }
-    },
-
     mounted ()
     {
       // find parent dropdown so we can pass it on item click
@@ -80,7 +73,11 @@
             dropdown: this.dropdown,
             hide()
             {
-              this.dropdown.hide();
+              if (this.dropdown)
+              {
+                this.dropdown.hide();
+              }
+              instance.$emit('hide');
             },
             loading(isLoading)
             {
diff --git a/zero.Web.UI/App/components/tree.vue b/zero.Web.UI/App/components/tree.vue
index 36c614be..3a599197 100644
--- a/zero.Web.UI/App/components/tree.vue
+++ b/zero.Web.UI/App/components/tree.vue
@@ -2,7 +2,7 @@
   <div class="ui-tree" :style="{ 'padding-left': depth > 0 ? ((depth * 18) + 'px') : null }">
     <span v-if="status === 'loading'" class="ui-tree-item-loading"><i></i></span>
     <template v-for="item in items">
-      <div class="ui-tree-item" :class="getClasses(item)">
+      <div class="ui-tree-item" :class="getClasses(item)" v-on:contextmenu="onRightClicked(item, $event)">
         <button v-if="item.hasChildren" @click="toggle(item)" type="button" class="ui-tree-item-toggle">
           <i class="ui-tree-item-arrow" :class="['fth-chevron-' + (item.isOpen ? 'up' : 'down')]"></i>
         </button>
@@ -11,10 +11,13 @@
           <i v-if="item.modifier" :title="item.modifier.name" class="ui-tree-item-modifier" :class="item.modifier.icon"></i>
           <span class="ui-tree-item-text">{{item.name | localize}}</span>
         </router-link>
-        <ui-dot-button class="ui-tree-item-actions" v-if="configuration.onActionsRequested" />
+        <ui-dot-button class="ui-tree-item-actions" v-if="configuration.onActionsRequested" @click="onActionsClicked(item, $event)" />
       </div>
       <ui-tree v-if="item.hasChildren && item.isOpen" :get="get" :parent="item.id" :depth="depth + 1" :active="active" :config="config" />
     </template>
+    <div ref="dropdown" class="ui-dropdown ui-tree-dropdown theme-dark align-top" role="dialog" v-click-outside="hideActions" v-if="actionsOpen">
+      <ui-dropdown-list v-model="actions" @hide="hideActions" />
+    </div>
   </div>
 </template>
 
@@ -59,6 +62,8 @@
     data: () => ({
       items: [],
       status: 'none',
+      actionsOpen: false,
+      actionsLoaded: false,
       actions: [],
       configuration: {}
     }),
@@ -119,6 +124,73 @@
           'is-inactive': item.isInactive,
           'is-open': item.isOpen
         };
+      },
+
+      // hide actions overlay
+      hideActions()
+      {
+        if (this.actionsLoaded)
+        {
+          this.actionsOpen = false;
+        }
+      },
+
+      // right clicked on an item
+      onRightClicked(item, ev)
+      {
+        if (this.configuration.onActionsRequested)
+        {
+          ev.preventDefault();  
+          this.onActionsClicked(item, ev);
+        }
+      },
+
+      // actions button clicked on item
+      onActionsClicked(item, ev)
+      {
+        this.actionsLoaded = false;
+        this.actionsOpen = !this.actionsOpen;
+
+        if (!this.actionsOpen)
+        {
+          this.actionsLoaded = true;
+          return;
+        }
+
+        this.actions = this.configuration.onActionsRequested(item);
+
+        this.$nextTick(() =>
+        {
+          let dropdown = this.$refs.dropdown;
+          let target = ev.target;
+          do
+          {
+            if (target.classList.contains('ui-tree-item'))
+            {
+              break;
+            }
+          }
+          while (target = target.parentElement);
+
+          target = target.querySelector('.ui-tree-item-actions');
+
+          var rect = target.getBoundingClientRect();
+          var width = 240;
+
+          var position = {
+            x: rect.left - width + rect.width,
+            y: rect.top + rect.height
+          };
+
+          dropdown.style.top = position.y + 'px';
+          dropdown.style.left = position.x + 'px';
+          dropdown.style.width = width + 'px';
+
+          setTimeout(() =>
+          {
+            this.actionsLoaded = true;
+          }, 300);
+        });
       }
 
     }
@@ -264,4 +336,10 @@
     opacity: 0;
     color: var(--color-fg-mid);
   }
+
+  .ui-tree-dropdown
+  {
+    position: fixed;
+    min-width: 200px;
+  }
 </style>
\ No newline at end of file
diff --git a/zero.Web.UI/Sass/Core/_settings.scss b/zero.Web.UI/Sass/Core/_settings.scss
index 56dfb870..1d502eaa 100644
--- a/zero.Web.UI/Sass/Core/_settings.scss
+++ b/zero.Web.UI/Sass/Core/_settings.scss
@@ -49,7 +49,7 @@
   --padding: 32px;
   --padding-s: 24px;
   --height-top: 74px;
-  --radius: 5px;
+  --radius: 3px;
 
   --font-size-xs: 12px;
   --font-size-s: 13px;
diff --git a/zero.Web.UI/Sass/Modules/Buttons/_button.scss b/zero.Web.UI/Sass/Modules/Buttons/_button.scss
index 559a38bb..c0a8e1a9 100644
--- a/zero.Web.UI/Sass/Modules/Buttons/_button.scss
+++ b/zero.Web.UI/Sass/Modules/Buttons/_button.scss
@@ -236,7 +236,7 @@ button::-moz-focus-inner
   width: 36px;
   text-align: center;
   justify-content: center;
-  font-size: var(--font-size-xl);
+  color: var(--color-text);
 
   &:hover
   {
@@ -245,6 +245,7 @@ button::-moz-focus-inner
 
   .ui-button-icon
   {
+    font-size: var(--font-size-xl);
     margin: 0;
   }
 }