From 31fbf2ce35f860050fb95f595d290e491ecf1263 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <antonella@standardnotes.org>
Date: Mon, 31 May 2021 19:26:26 -0300
Subject: [PATCH] fix: fix tags dropdown width and tags container height

---
 .../components/AutocompleteTagInput.tsx       |  4 +--
 .../javascripts/components/NoteTags.tsx       | 27 +++++++++++++------
 app/assets/stylesheets/_sn.scss               |  8 ++++++
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/components/AutocompleteTagInput.tsx b/app/assets/javascripts/components/AutocompleteTagInput.tsx
index 413b85c42..0ae19226a 100644
--- a/app/assets/javascripts/components/AutocompleteTagInput.tsx
+++ b/app/assets/javascripts/components/AutocompleteTagInput.tsx
@@ -99,7 +99,7 @@ export const AutocompleteTagInput: FunctionalComponent<Props> = ({
       <Disclosure open={dropdownVisible} onChange={showDropdown}>
         <input
           ref={inputRef}
-          className="min-w-80 bg-default text-xs color-text no-border h-7 focus:outline-none focus:shadow-none focus:border-bottom"
+          className="w-80 bg-default text-xs color-text no-border h-7 focus:outline-none focus:shadow-none focus:border-bottom"
           value={searchQuery}
           onChange={onSearchQueryChange}
           type="text"
@@ -121,7 +121,7 @@ export const AutocompleteTagInput: FunctionalComponent<Props> = ({
         {dropdownVisible && (
           <DisclosurePanel
             ref={dropdownRef}
-            className="sn-dropdown flex flex-col py-2 absolute"
+            className="sn-dropdown w-80 flex flex-col py-2 absolute"
             style={{ maxHeight: dropdownMaxHeight }}
           >
             <div className="overflow-y-scroll">
diff --git a/app/assets/javascripts/components/NoteTags.tsx b/app/assets/javascripts/components/NoteTags.tsx
index ce9ad8de1..6a071eb5d 100644
--- a/app/assets/javascripts/components/NoteTags.tsx
+++ b/app/assets/javascripts/components/NoteTags.tsx
@@ -26,6 +26,8 @@ const NoteTags = observer(({ application, appState }: Props) => {
     tagsOverflowed,
   } = appState.activeNote;
 
+  const [containerHeight, setContainerHeight] =
+    useState(TAGS_ROW_HEIGHT);
   const [tagsContainerHeight, setTagsContainerHeight] =
     useState(TAGS_ROW_HEIGHT);
   const [overflowCountPosition, setOverflowCountPosition] = useState(0);
@@ -76,11 +78,18 @@ const NoteTags = observer(({ application, appState }: Props) => {
     setOverflowCountPosition(position);
   }, [isTagOverflowed, tagsContainerExpanded, tagsContainerPosition]);
 
-  const reloadTagsContainerHeight = useCallback(() => {
-    const height = tagsContainerExpanded
+  const reloadContainersHeight = useCallback(() => {
+    const containerHeight = tagsContainerExpanded
       ? tagsContainerRef.current.scrollHeight
       : TAGS_ROW_HEIGHT;
-    setTagsContainerHeight(height);
+    setContainerHeight(containerHeight);
+
+    const firstTagTop = tagsRef.current[0].getBoundingClientRect().top;
+    const lastTagBottom = tagsRef.current[tagsRef.current.length - 1].getBoundingClientRect().bottom;
+    const tagsContainerHeight = tagsContainerExpanded
+      ? lastTagBottom - firstTagTop
+      : TAGS_ROW_HEIGHT;
+    setTagsContainerHeight(tagsContainerHeight);
   }, [tagsContainerExpanded]);
 
   const reloadOverflowCount = useCallback(() => {
@@ -97,28 +106,30 @@ const NoteTags = observer(({ application, appState }: Props) => {
   useEffect(() => {
     appState.activeNote.reloadTagsContainerLayout();
     reloadOverflowCountPosition();
-    reloadTagsContainerHeight();
+    reloadContainersHeight();
     reloadOverflowCount();
   }, [
     appState.activeNote,
     reloadOverflowCountPosition,
-    reloadTagsContainerHeight,
+    reloadContainersHeight,
     reloadOverflowCount,
     tags,
   ]);
 
-  const tagClass = `bg-contrast border-0 rounded text-xs color-text py-1 pr-2 flex items-center 
+  const tagClass = `h-6 bg-contrast border-0 rounded text-xs color-text py-1 pr-2 flex items-center 
     mt-2 cursor-pointer hover:bg-secondary-contrast focus:bg-secondary-contrast`;
 
   return (
     <div
       className="flex transition-height duration-150"
       ref={containerRef}
-      style={{ height: tagsContainerHeight }}
+      style={{ height: containerHeight }}
     >
       <div
         ref={tagsContainerRef}
-        className="absolute flex flex-wrap pl-1 -ml-1 overflow-hidden transition-height duration-150"
+        className={`absolute flex flex-wrap pl-1 -ml-1 transition-height duration-150 ${
+          tagsContainerExpanded ? '' : 'overflow-hidden'
+        }`}
         style={{
           maxWidth: tagsContainerMaxWidth,
           height: tagsContainerHeight,
diff --git a/app/assets/stylesheets/_sn.scss b/app/assets/stylesheets/_sn.scss
index 56744c242..baa654209 100644
--- a/app/assets/stylesheets/_sn.scss
+++ b/app/assets/stylesheets/_sn.scss
@@ -180,6 +180,10 @@
   height: 1.25rem;
 }
 
+.h-6 {
+  height: 1.5rem;
+}
+
 .h-7 {
   height: 1.75rem;
 }
@@ -240,6 +244,10 @@
   transition-property: height;
 }
 
+.w-80 {
+  width: 20rem;
+}
+
 /**
  * A button that is just an icon. Separated from .sn-button because there
  * is almost no style overlap.