From d3344e2cd400e7aee3678cf4d4755bb80fb29b04 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 24 Oct 2019 21:54:34 +0200
Subject: [PATCH] V8: Make "add property" shortcut work with multiple groups
 (#6821)

---
 .../components/umbgroupsbuilder.directive.js    | 17 +++++++++++++++++
 .../views/components/umb-groups-builder.html    |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 2fa1500c75..07b690ad2b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -475,6 +475,23 @@
 
       /* ---------- PROPERTIES ---------- */
 
+      scope.addPropertyToActiveGroup = function () {
+        var group = _.find(scope.model.groups, group => group.tabState === "active");
+        if (!group && scope.model.groups.length) {
+          group = scope.model.groups[0];
+        }
+
+        if (!group || !group.name) {
+          return;
+        }
+
+        var property = _.find(group.properties, property => property.propertyState === "init");
+        if (!property) {
+          return;
+        }
+        scope.addProperty(property, group);
+      }
+
       scope.addProperty = function(property, group) {
 
         // set property sort order
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index 1857ba61e3..a5ec479dfd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -37,6 +37,8 @@
         <localize key="contentTypeEditor_noGroups"></localize>
     </div>
 
+    <a ng-if="!sortingMode" hotkey="alt+shift+p" ng-click="addPropertyToActiveGroup()"></a>    
+
     <ul class="umb-group-builder__groups" ui-sortable="sortableOptionsGroup" ng-model="model.groups">
 
         <li ng-repeat="tab in model.groups" ng-class="{'umb-group-builder__group-sortable': sortingMode}" data-element="group-{{tab.name}}">
@@ -47,7 +49,7 @@
             </a>
 
             <!-- TAB ACTIVE OR INACTIVE STATE -->
-            <div class="umb-group-builder__group" ng-if="tab.tabState !== 'init'" ng-class="{'-active':tab.tabState=='active', '-inherited': tab.inherited, 'umb-group-builder__group-handle -sortable': sortingMode && !tab.inherited}" ng-click="activateGroup(tab)">
+            <div class="umb-group-builder__group" ng-if="tab.tabState !== 'init'" ng-class="{'-active':tab.tabState=='active', '-inherited': tab.inherited, 'umb-group-builder__group-handle -sortable': sortingMode && !tab.inherited}" tabindex="0" ng-focus="activateGroup(tab)">
 
                 <div class="umb-group-builder__group-title-wrapper">
 
@@ -119,8 +121,6 @@
                             data-element="property-add"
                             class="umb-group-builder__group-add-property"
                             ng-if="property.propertyState=='init' && !sortingMode"
-                            hotkey="alt+shift+p"
-                            hotkey-when="{{tab.tabState === 'active' && property.propertyState=='init'}}"
                             ng-click="addProperty(property, tab)"
                             ng-focus="activateGroup(tab)"
                             focus-when="{{property.focus}}">