From 278f4baeb12a9c5118ba4ceefb32004204395c3c Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Wed, 7 Jun 2023 18:14:23 -0400
Subject: [PATCH] dev/core#4319 SearchKit - Fix in-place editable in list/grid
 displays

---
 css/civicrm.css                                        | 2 ++
 ext/search_kit/ang/crmSearchDisplay/colType/field.html | 2 +-
 ext/search_kit/ang/crmSearchDisplayGrid.ang.php        | 2 +-
 ext/search_kit/ang/crmSearchDisplayList.ang.php        | 2 +-
 ext/search_kit/css/crmSearchTasks.css                  | 6 ++++--
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 9e39faf6a9..eeb74ca080 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3375,6 +3375,7 @@ span.crm-select-item-color {
 }
 
 /* in place edit  */
+.crm-container .crm-editable-disabled,
 .crm-container .crm-editable-enabled {
   padding-left: 2px;
   border: 2px dashed transparent;
@@ -3396,6 +3397,7 @@ span.crm-select-item-color {
 .crm-container span.crm-editable-textarea-enabled {
   width: 96%;
 }
+.crm-container span.crm-editable-disabled,
 .crm-container span.crm-editable-enabled {
   display: inline-block !important;
   padding-right: 2px;
diff --git a/ext/search_kit/ang/crmSearchDisplay/colType/field.html b/ext/search_kit/ang/crmSearchDisplay/colType/field.html
index 0877b15aaa..e0493dc0ea 100644
--- a/ext/search_kit/ang/crmSearchDisplay/colType/field.html
+++ b/ext/search_kit/ang/crmSearchDisplay/colType/field.html
@@ -1,5 +1,5 @@
 <crm-search-display-editable row="row" col="colData" do-save="$ctrl.runSearch([apiCall], {}, row)" cancel="$ctrl.editing = null;" ng-if="colData.edit && $ctrl.editing && $ctrl.editing[0] === rowIndex && $ctrl.editing[1] === colIndex"></crm-search-display-editable>
-<span ng-if="::!colData.links" ng-class="{'crm-editable-enabled': colData.edit && !$ctrl.editing}" ng-click="colData.edit && !$ctrl.editing && ($ctrl.editing = [rowIndex, colIndex])">
+<span ng-if="::!colData.links" ng-class="{'crm-editable-enabled': colData.edit && !$ctrl.editing, 'crm-editable-disabled': colData.edit && $ctrl.editing}" ng-click="colData.edit && !$ctrl.editing && ($ctrl.editing = [rowIndex, colIndex])">
   <i ng-repeat="icon in colData.icons" ng-if="icon.side === 'left'" class="crm-i {{:: icon['class'] }}"></i>
   {{:: $ctrl.formatFieldValue(colData) }}
   <i ng-repeat="icon in colData.icons" ng-if="icon.side === 'right'" class="crm-i {{:: icon['class'] }}"></i>
diff --git a/ext/search_kit/ang/crmSearchDisplayGrid.ang.php b/ext/search_kit/ang/crmSearchDisplayGrid.ang.php
index d0a4566899..978734532c 100644
--- a/ext/search_kit/ang/crmSearchDisplayGrid.ang.php
+++ b/ext/search_kit/ang/crmSearchDisplayGrid.ang.php
@@ -12,7 +12,7 @@ return [
     'css/crmSearchDisplayGrid.css',
   ],
   'basePages' => ['civicrm/search', 'civicrm/admin/search'],
-  'requires' => ['crmSearchDisplay', 'crmUi', 'ui.bootstrap'],
+  'requires' => ['crmSearchDisplay', 'crmUi', 'ui.bootstrap', 'crmSearchTasks'],
   'bundles' => ['bootstrap3'],
   'exports' => [
     'crm-search-display-grid' => 'E',
diff --git a/ext/search_kit/ang/crmSearchDisplayList.ang.php b/ext/search_kit/ang/crmSearchDisplayList.ang.php
index 62c961dee4..b34dc856f8 100644
--- a/ext/search_kit/ang/crmSearchDisplayList.ang.php
+++ b/ext/search_kit/ang/crmSearchDisplayList.ang.php
@@ -9,7 +9,7 @@ return [
     'ang/crmSearchDisplayList',
   ],
   'basePages' => ['civicrm/search', 'civicrm/admin/search'],
-  'requires' => ['crmSearchDisplay', 'crmUi', 'ui.bootstrap'],
+  'requires' => ['crmSearchDisplay', 'crmUi', 'ui.bootstrap', 'crmSearchTasks'],
   'bundles' => ['bootstrap3'],
   'exports' => [
     'crm-search-display-list' => 'E',
diff --git a/ext/search_kit/css/crmSearchTasks.css b/ext/search_kit/css/crmSearchTasks.css
index bdb38fbc2d..d70be29fff 100644
--- a/ext/search_kit/css/crmSearchTasks.css
+++ b/ext/search_kit/css/crmSearchTasks.css
@@ -5,6 +5,7 @@
 }
 
 .crm-search-display.crm-search-display-table td > crm-search-display-editable,
+.crm-search-display.crm-search-display-table td > .crm-editable-disabled,
 .crm-search-display.crm-search-display-table td > .crm-editable-enabled {
   display: block !important;
 }
@@ -13,12 +14,13 @@
   position: relative;
 }
 
-.crm-search-display crm-search-display-editable + span {
+.crm-search-display crm-search-display-editable + span.crm-editable-disabled {
   display: none !important;
 }
 
 .crm-search-display .crm-search-display-editable-buttons {
   position: absolute;
-  bottom: -22px;
+  bottom: -24px;
   left: 0;
+  min-width: 50px;
 }
-- 
2.25.1