From f88833f24eadf6ce60317810f8dce46085df787d Mon Sep 17 00:00:00 2001
From: Zack Lee <90279765+zackcl@users.noreply.github.com>
Date: Wed, 25 Sep 2024 01:26:39 +0900
Subject: [PATCH] Fix the visibility of multiple-row chips and the alignment of
 the icon button (#1980)

Co-authored-by: Pratik Prajapati <33730817+ppratikcr7@users.noreply.github.com>
---
 .../common-tag-input.component.html           | 64 ++++++++++---------
 .../common-tag-input.component.scss           | 11 +++-
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-tag-input/common-tag-input.component.html b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-tag-input/common-tag-input.component.html
index 5a5477cb65..c9fee16801 100644
--- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-tag-input/common-tag-input.component.html
+++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-tag-input/common-tag-input.component.html
@@ -9,38 +9,40 @@
     {{ label | translate }}
     <span *ngIf="inputType === CommonTagInputType.VALUES" class="required-asterisk">*</span>
   </mat-label>
-  <div class="chips-container dense-2">
-    <mat-chip-grid #tagsList>
-      <mat-chip-row
-        *ngFor="let componentTag of tags.value"
-        [selectable]="isChipSelectable"
-        [removable]="isChipRemovable"
-        (removed)="removeChip(componentTag)"
-      >
-        <span class="chip-label">
-          {{ componentTag }}
-        </span>
-        <mat-icon matChipRemove *ngIf="isChipRemovable">cancel</mat-icon>
-      </mat-chip-row>
+  <div class="chips-wrapper">
+    <div class="chips-container dense-2">
+      <mat-chip-grid #tagsList>
+        <mat-chip-row
+          *ngFor="let componentTag of tags.value"
+          [selectable]="isChipSelectable"
+          [removable]="isChipRemovable"
+          (removed)="removeChip(componentTag)"
+        >
+          <span class="chip-label">
+            {{ componentTag }}
+          </span>
+          <mat-icon matChipRemove *ngIf="isChipRemovable">cancel</mat-icon>
+        </mat-chip-row>
 
-      <input
-        [matChipInputFor]="tagsList"
-        [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-        [matChipInputAddOnBlur]="addChipOnBlur"
-        (matChipInputTokenEnd)="addChip($event)"
-        (focus)="onFocus()"
-        (blur)="onBlur()"
-        [placeholder]="tagsExist ? '' : (placeholder | translate)"
-        autocomplete="off"
-        class="ft-14-400"
-      />
-    </mat-chip-grid>
-    <div *ngIf="inputType === CommonTagInputType.VALUES" class="sharing-icon-buttons">
-      <button mat-icon-button class="icon-button" (click)="onActionButtonClick($event)">
-        <span class="material-symbols-outlined">
-          {{ tagsExist ? 'download' : 'upload' }}
-        </span>
-      </button>
+        <input
+          [matChipInputFor]="tagsList"
+          [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+          [matChipInputAddOnBlur]="addChipOnBlur"
+          (matChipInputTokenEnd)="addChip($event)"
+          (focus)="onFocus()"
+          (blur)="onBlur()"
+          [placeholder]="tagsExist ? '' : (placeholder | translate)"
+          autocomplete="off"
+          class="ft-14-400"
+        />
+      </mat-chip-grid>
+      <div *ngIf="inputType === CommonTagInputType.VALUES" class="sharing-icon-buttons">
+        <button mat-icon-button class="icon-button" (click)="onActionButtonClick($event)">
+          <span class="material-symbols-outlined">
+            {{ tagsExist ? 'download' : 'upload' }}
+          </span>
+        </button>
+      </div>
     </div>
   </div>
 </mat-form-field>
diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-tag-input/common-tag-input.component.scss b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-tag-input/common-tag-input.component.scss
index f22d17171d..7eb0580889 100644
--- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-tag-input/common-tag-input.component.scss
+++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-tag-input/common-tag-input.component.scss
@@ -7,6 +7,10 @@
 
     .mat-mdc-form-field-infix {
       padding: 6px 0;
+
+      .mat-mdc-chip-remove {
+        padding: 2px 4px;
+      }
     }
   }
 
@@ -30,9 +34,10 @@
     display: flex;
     flex-direction: row;
     justify-content: space-between;
-    align-items: center;
+    align-items: flex-start;
     max-height: 64px;
     overflow: auto;
+    padding-right: 32px;
 
     .mat-mdc-chip-grid {
       width: 100%;
@@ -43,6 +48,10 @@
     }
 
     .icon-button {
+      position: absolute;
+      right: 8px;
+      top: 50%;
+      transform: translateY(-50%);
       width: 32px;
       height: 32px;
       background: none;