From ad8e62c499fb1f522d849d4a2ec354ff14765362 Mon Sep 17 00:00:00 2001
From: TheoryOfNekomata <allan.crisostomo@outlook.com>
Date: Sat, 8 Jul 2023 13:51:43 +0800
Subject: [PATCH] Fix tagsInput event handling

Properly handle events for focus, blur, and change.
---
 .../src/components/TagInput/TagInput.css      | 13 +++
 .../react/src/components/TagInput/index.tsx   | 81 ++++++++++++++++++-
 packages/react-utils/src/event.ts             | 17 ++--
 .../src/pages/categories/option/index.tsx     | 21 +++--
 .../pages/categories/presentation/index.tsx   |  2 +-
 5 files changed, 113 insertions(+), 21 deletions(-)

diff --git a/categories/multichoice/react/src/components/TagInput/TagInput.css b/categories/multichoice/react/src/components/TagInput/TagInput.css
index 2f63dff..d53f9a5 100644
--- a/categories/multichoice/react/src/components/TagInput/TagInput.css
+++ b/categories/multichoice/react/src/components/TagInput/TagInput.css
@@ -80,6 +80,10 @@
   background-color: rgb(var(--color-positive) / 25%);
 }
 
+.tesseract-design-tag-input textarea + div > span:focus-within {
+  background-color: rgb(var(--color-secondary) / 25%);
+}
+
 .tesseract-design-tag-input textarea + div > span span {
   pointer-events: none;
 }
@@ -91,6 +95,15 @@
   margin-left: 0.25rem;
 }
 
+.tesseract-design-tag-input textarea + div > span button:focus {
+  outline: none;
+  color: rgb(var(--color-secondary));
+}
+
+.tesseract-design-tag-input textarea + div > span button:focus:-moz-focusring {
+  display: none;
+}
+
 .tesseract-design-tag-input textarea + div > span button:hover {
   color: rgb(var(--color-primary));
 }
diff --git a/categories/multichoice/react/src/components/TagInput/index.tsx b/categories/multichoice/react/src/components/TagInput/index.tsx
index ed1fed0..b1a1628 100644
--- a/categories/multichoice/react/src/components/TagInput/index.tsx
+++ b/categories/multichoice/react/src/components/TagInput/index.tsx
@@ -55,6 +55,7 @@ export interface TagInputProps extends Omit<React.HTMLProps<TagInputDerivedEleme
    * Separators for splitting the input value into multiple tags.
    */
   separator?: TagInputSeparator[],
+  editOnRemove?: boolean,
 }
 
 /**
@@ -78,6 +79,10 @@ export const TagInput = React.forwardRef<TagInputDerivedElement, TagInputProps>(
     defaultValue,
     disabled,
     id: idProp,
+    onFocus,
+    onBlur,
+    editOnRemove = false,
+    placeholder,
     ...etcProps
   },
   forwardedRef,
@@ -119,7 +124,19 @@ export const TagInput = React.forwardRef<TagInputDerivedElement, TagInputProps>(
     });
   };
 
-  const handleBlur = () => {
+  const handleFocus: React.FocusEventHandler<HTMLTextAreaElement> = (e) => {
+    if (!clientSide) {
+      onFocus?.(e);
+    }
+  };
+
+  const handleBlur: React.FocusEventHandler<HTMLTextAreaElement> = (e) => {
+    if (!clientSide) {
+      onBlur?.(e);
+    }
+  };
+
+  const handleRemoveTag = () => {
     if (!(typeof ref === 'object' && ref)) {
       return;
     }
@@ -128,10 +145,59 @@ export const TagInput = React.forwardRef<TagInputDerivedElement, TagInputProps>(
       return;
     }
     setTimeout(() => {
-      delegateTriggerEvent('blur', input);
+      const sibling = input.nextElementSibling as HTMLDivElement;
+      const tagsInput = sibling.children[sibling.children.length - 1] as HTMLInputElement;
+      tagsInput.focus();
+    });
+  };
+
+  const handleInputBlur: React.FocusEventHandler<HTMLInputElement> = (e) => {
+    if (!(typeof ref === 'object' && ref)) {
+      return;
+    }
+    const { current: input } = ref;
+    if (!input) {
+      return;
+    }
+    onBlur?.({
+      ...e,
+      target: input,
+      currentTarget: input,
     });
   };
 
+  const handleFocusCapture: React.FocusEventHandler<HTMLDivElement> = (e) => {
+    const { currentTarget } = e;
+    if (!clientSide) {
+      return;
+    }
+    const { activeElement } = window.document;
+    if (!activeElement) {
+      return;
+    }
+    const tagInputWrapper = currentTarget.children[1] as HTMLDivElement;
+    const tagInput = (
+      tagInputWrapper.children[tagInputWrapper.children.length - 1] as HTMLInputElement
+    );
+    if (activeElement !== tagInput) {
+      return;
+    }
+    if (!(typeof ref === 'object' && ref)) {
+      return;
+    }
+    const { current: input } = ref;
+    if (!input) {
+      return;
+    }
+    if (activeElement.tagName === 'INPUT') {
+      onFocus?.({
+        ...e,
+        target: input,
+        currentTarget: input,
+      });
+    }
+  };
+
   return (
     <div
       className={clsx(
@@ -155,18 +221,23 @@ export const TagInput = React.forwardRef<TagInputDerivedElement, TagInputProps>(
         variant === 'alternate' && 'tag-input-alternate',
         className,
       )}
+      onFocusCapture={handleFocusCapture}
     >
       <textarea
         {...etcProps}
+        placeholder={placeholder}
         disabled={disabled}
         ref={ref}
         id={id}
         aria-labelledby={labelId}
         data-testid="input"
         defaultValue={defaultValue}
+        onFocus={handleFocus}
+        onBlur={handleBlur}
         style={{
           height: clientSide ? undefined : 0,
         }}
+        tabIndex={clientSide ? -1 : undefined}
         className={clsx(
           'bg-negative rounded-inherit peer block',
           'focus:outline-0',
@@ -219,9 +290,12 @@ export const TagInput = React.forwardRef<TagInputDerivedElement, TagInputProps>(
             input: 'peer bg-transparent',
             tag: 'text-xs p-2 select-none',
           }}
+          isEditOnRemove={editOnRemove}
+          placeHolder={placeholder}
           disabled={disabled}
+          onBlur={handleInputBlur}
           onChange={handleTagsInputChange}
-          onBlur={handleBlur}
+          onRemoved={handleRemoveTag}
           separators={separator.map((s) => TAG_INPUT_SEPARATOR_MAP[s])}
         />
       )}
@@ -322,4 +396,5 @@ TagInput.defaultProps = {
   block: false,
   hiddenLabel: false,
   enhanced: false,
+  editOnRemove: false,
 };
diff --git a/packages/react-utils/src/event.ts b/packages/react-utils/src/event.ts
index 0cfb651..3d5bb7f 100644
--- a/packages/react-utils/src/event.ts
+++ b/packages/react-utils/src/event.ts
@@ -1,4 +1,8 @@
-export const delegateTriggerEvent = <T extends HTMLElement>(eventName: string, target: T, value?: unknown) => {
+export const delegateTriggerEvent = <T extends HTMLElement>(
+  eventName: string,
+  target: T,
+  value?: unknown,
+) => {
   if (typeof window === 'undefined') {
     return;
   }
@@ -29,15 +33,4 @@ export const delegateTriggerEvent = <T extends HTMLElement>(eventName: string, t
     }
     return;
   }
-
-  if (eventName === 'blur') {
-    target.focus({
-      preventScroll: true,
-    });
-    setTimeout(() => {
-      target.blur();
-    });
-  }
-  const simulatedEvent = new Event(eventName, {bubbles: true});
-  target.dispatchEvent(simulatedEvent);
 };
diff --git a/showcases/web-kitchensink-reactnext/src/pages/categories/option/index.tsx b/showcases/web-kitchensink-reactnext/src/pages/categories/option/index.tsx
index 24e55ec..1445dcc 100644
--- a/showcases/web-kitchensink-reactnext/src/pages/categories/option/index.tsx
+++ b/showcases/web-kitchensink-reactnext/src/pages/categories/option/index.tsx
@@ -1493,11 +1493,19 @@ const OptionPage: NextPage<Props> = ({
                     <div>
                       <MultiChoice.TagInput
                         size="large"
-                        label="MultilineTextInput"
+                        label="not enhanced"
                         hint="Type anything here&hellip;"
                         indicator="A"
                         block
-                        enhanced
+                        onFocus={(e) => {
+                          console.log('focus', e.currentTarget);
+                        }}
+                        onBlur={(e) => {
+                          console.log('blur', e.currentTarget);
+                        }}
+                        onChange={(e) => {
+                          console.log('change', e.currentTarget.value);
+                        }}
                       />
                     </div>
                     <div>
@@ -1509,12 +1517,15 @@ const OptionPage: NextPage<Props> = ({
                         indicator="A"
                         block
                         enhanced
-                        separator={['\n', ',']}
+                        separator={['newline', 'comma']}
+                        onFocus={(e) => {
+                          console.log('focus', e.currentTarget);
+                        }}
                         onBlur={(e) => {
-                          console.log(e.currentTarget);
+                          console.log('blur', e.currentTarget);
                         }}
                         onChange={(e) => {
-                          console.log(e.currentTarget.value);
+                          console.log('change', e.currentTarget.value);
                         }}
                       />
                     </div>
diff --git a/showcases/web-kitchensink-reactnext/src/pages/categories/presentation/index.tsx b/showcases/web-kitchensink-reactnext/src/pages/categories/presentation/index.tsx
index 5e33e5d..0b4d0b5 100644
--- a/showcases/web-kitchensink-reactnext/src/pages/categories/presentation/index.tsx
+++ b/showcases/web-kitchensink-reactnext/src/pages/categories/presentation/index.tsx
@@ -1,5 +1,5 @@
 import { NextPage } from 'next';
-import { DefaultLayout } from 'src/components/DefaultLayout';
+import { DefaultLayout } from '@/components/DefaultLayout';
 
 const PresentationPage: NextPage = () => {
   return (