From 393c801426d1ae4046934b1d649d32db2b815e7a Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed, 1 Feb 2023 02:29:51 -0800
Subject: [PATCH] Closes #6215 (#6222)

- Markup cleanups, CSS placement improvements for tags.
- Better approach to tag layout.
- CSS prop migrated to _constants.scss.
- Style and layout improvements for `.c-autocomplete*` input.

Co-authored-by: Scott Bell <scott@traclabs.com>
---
 .../notebook/components/NotebookEntry.vue     |  2 +-
 src/styles/_constants.scss                    |  2 +-
 src/styles/_controls.scss                     |  9 +-
 src/ui/components/tags/TagEditor.vue          |  3 +-
 src/ui/components/tags/TagSelection.vue       |  9 +-
 src/ui/components/tags/tags.scss              | 84 ++++++++++++++-----
 .../annotations/AnnotationsInspectorView.vue  |  2 +-
 7 files changed, 78 insertions(+), 33 deletions(-)

diff --git a/src/plugins/notebook/components/NotebookEntry.vue b/src/plugins/notebook/components/NotebookEntry.vue
index 8d1c3a15b0..7a375b505a 100644
--- a/src/plugins/notebook/components/NotebookEntry.vue
+++ b/src/plugins/notebook/components/NotebookEntry.vue
@@ -99,7 +99,7 @@
                 </div>
             </template>
 
-            <div>
+            <div class="c-ne__tags c-tag-holder">
                 <div
                     v-for="(tag, index) in entryTags"
                     :key="index"
diff --git a/src/styles/_constants.scss b/src/styles/_constants.scss
index bdaa66f9fa..65c8587e1b 100755
--- a/src/styles/_constants.scss
+++ b/src/styles/_constants.scss
@@ -94,7 +94,7 @@ $messageListIconD: 32px;
 $tableResizeColHitareaD: 6px;
 /*************** Misc */
 $drawingObjBorderW: 3px;
-
+$tagBorderRadius: 3px;
 /************************** MOBILE */
 $mobileMenuIconD: 24px; // Used
 $mobileTreeItemH: 35px; // Used
diff --git a/src/styles/_controls.scss b/src/styles/_controls.scss
index c97e739faf..5907998b8c 100644
--- a/src/styles/_controls.scss
+++ b/src/styles/_controls.scss
@@ -405,16 +405,18 @@ textarea {
 
     &--autocomplete {
         &__wrapper {
-            display: inline-flex;
+            display: flex;
             flex-direction: row;
             align-items: center;
+            overflow: hidden;
+            width: 100%;
         }
 
         &__input {
             min-width: 100px;
+            width: 100%;
 
             // Fend off from afford-arrow
-            min-height: 2em;
             padding-right: 2.5em !important;
         }
 
@@ -437,7 +439,10 @@ textarea {
         }
 
         &__afford-arrow {
+            $p: 2px;
             font-size: 0.8em;
+            padding-bottom: $p;
+            padding-top: $p;
             position: absolute;
             right: 2px;
             z-index: 2;
diff --git a/src/ui/components/tags/TagEditor.vue b/src/ui/components/tags/TagEditor.vue
index 2fe4f795cc..9aa852bb5c 100644
--- a/src/ui/components/tags/TagEditor.vue
+++ b/src/ui/components/tags/TagEditor.vue
@@ -21,10 +21,11 @@
  *****************************************************************************/
 
 <template>
-<div class="c-tag-applier">
+<div class="c-tag-applier has-tag-applier">
     <TagSelection
         v-for="(addedTag, index) in addedTags"
         :key="index"
+        :class="{ 'w-tag-wrapper--tag-selector' : addedTag.newTag }"
         :selected-tag="addedTag.newTag ? null : addedTag"
         :new-tag="addedTag.newTag"
         :added-tags="addedTags"
diff --git a/src/ui/components/tags/TagSelection.vue b/src/ui/components/tags/TagSelection.vue
index 98ce69c2b3..ef03d52792 100644
--- a/src/ui/components/tags/TagSelection.vue
+++ b/src/ui/components/tags/TagSelection.vue
@@ -21,8 +21,8 @@
  *****************************************************************************/
 
 <template>
-<div class="c-tag__parent">
-    <div class="c-tag_selection">
+<div class="w-tag-wrapper">
+    <template v-if="newTag">
         <AutoCompleteField
             v-if="newTag"
             ref="tagSelection"
@@ -32,8 +32,9 @@
             :item-css-class="'icon-circle'"
             @onChange="tagSelected"
         />
+    </template>
+    <template v-else>
         <div
-            v-else
             class="c-tag"
             :class="{'c-tag-edit': !readOnly}"
             :style="{ background: selectedBackgroundColor, color: selectedForegroundColor }"
@@ -48,7 +49,7 @@
                 @click="removeTag"
             ></button>
         </div>
-    </div>
+    </template>
 </div>
 </template>
 
diff --git a/src/ui/components/tags/tags.scss b/src/ui/components/tags/tags.scss
index 964b2361ab..23157937e3 100644
--- a/src/ui/components/tags/tags.scss
+++ b/src/ui/components/tags/tags.scss
@@ -1,19 +1,30 @@
+@mixin tagHolder() {
+  align-items: center;
+  display: flex;
+  flex-wrap: wrap;
+
+  > * {
+    $m: $interiorMarginSm;
+
+    margin: 0 $m $m 0;
+  }
+}
+
+
 /******************************* TAGS */
 .c-tag {
-  border-radius: 10px; //TODO: convert to theme constant
+  border-radius: $tagBorderRadius;
   display: inline-flex;
-  padding: 1px 10px; //TODO: convert to theme constant
-
-  > * + * {
-    margin-left: $interiorMargin;
-  }
+  overflow: hidden;
+  padding: 1px 6px; //TODO: convert to theme constant
+  transition: $transIn;
 
   &__remove-btn {
     color: inherit !important;
-    display: none;
     opacity: 0;
-    overflow: hidden;
-    padding: 1px !important;
+    padding: 0; // Overrides default <button> padding
+    position: absolute;
+    right: 2px;
     transition: $transIn;
     width: 0;
 
@@ -28,28 +39,47 @@
   }
 }
 
-/******************************* TAG EDITOR */
-.c-tag-applier {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  align-items: center;
+.c-tag-holder {
+  @include tagHolder;
+}
 
-  > * + * {
-    margin-left: $interiorMargin;
+.w-tag-wrapper {
+    $m: $interiorMarginSm;
+
+    margin: 0 $m $m 0;
+}
+
+/******************************* TAGS IN INSPECTOR / TAG SELECTION & APPLICATION */
+.c-tag-applier {
+  $tagApplierPadding: 3px 6px;
+  @include tagHolder;
+  grid-column: 1 / 3;
+
+  &__tags {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
   }
 
   &__add-btn {
+    border-radius: $tagBorderRadius;
+    padding: 3px 10px 3px 4px;
+
     &:before { font-size: 0.9em; }
   }
 
   .c-tag {
     flex-direction: row;
     align-items: center;
-    padding-right: 3px !important;
+    padding: $tagApplierPadding;
 
-    &__remove-btn {
-      display: block;
+    > * + * { margin-left: $interiorMarginSm; }
+  }
+
+  .c-tag-selection {
+    .c-input--autocomplete__input {
+      min-height: auto !important;
+      padding: $tagApplierPadding;
     }
   }
 }
@@ -62,10 +92,18 @@
 .has-tag-applier {
   // Apply this class to all components that should trigger tag removal btn on hover
    &:hover {
-     .c-tag__remove-btn {
-       width: 1.1em;
-       opacity: 0.7;
+     .c-tag {
+       padding-right: 17px !important;
        transition: $transOut;
      }
+
+     .c-tag__remove-btn {
+       //display: block;
+       //margin-left: $interiorMarginSm;
+       width: 1em;
+       opacity: 0.8;
+       transition: $transOut;
+       //transition-delay: 250ms;
+     }
    }
  }
diff --git a/src/ui/inspector/annotations/AnnotationsInspectorView.vue b/src/ui/inspector/annotations/AnnotationsInspectorView.vue
index ab38432093..a1b20b2970 100644
--- a/src/ui/inspector/annotations/AnnotationsInspectorView.vue
+++ b/src/ui/inspector/annotations/AnnotationsInspectorView.vue
@@ -22,7 +22,7 @@
 
 <template>
 <div
-    class="c-inspector__properties c-inspect-properties has-tag-applier"
+    class="c-inspector__properties c-inspect-properties"
     aria-label="Tags Inspector"
 >
     <div