From e871ffcba049cf2ef22c52f82ca849bdcccfa33e Mon Sep 17 00:00:00 2001
From: Alex Yang <himself65@outlook.com>
Date: Tue, 4 Jul 2023 14:52:46 +0800
Subject: [PATCH] refactor: input component (#2999)

---
 .../affine/create-workspace-modal/index.tsx   | 11 +----
 .../delete-leave-workspace/delete/index.tsx   |  1 -
 .../new-workspace-setting-detail/profile.tsx  |  2 +-
 .../page-list/view/create-collection.tsx      |  2 +-
 packages/component/src/ui/input/input.tsx     | 40 ++++++++++++-------
 plugins/copilot/src/UI/debug-content.tsx      |  2 +-
 6 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/apps/web/src/components/affine/create-workspace-modal/index.tsx b/apps/web/src/components/affine/create-workspace-modal/index.tsx
index 2fc6ae4995..6742cabdc5 100644
--- a/apps/web/src/components/affine/create-workspace-modal/index.tsx
+++ b/apps/web/src/components/affine/create-workspace-modal/index.tsx
@@ -14,7 +14,7 @@ import { useSetAtom } from 'jotai';
 import type { KeyboardEvent } from 'react';
 import { useEffect } from 'react';
 import { useLayoutEffect } from 'react';
-import { useCallback, useRef, useState } from 'react';
+import { useCallback, useState } from 'react';
 
 import { openDisableCloudAlertModalAtom } from '../../../atoms';
 import { useAppHelper } from '../../../hooks/use-workspaces';
@@ -45,7 +45,6 @@ const NameWorkspaceContent = ({
   onClose,
 }: NameWorkspaceContentProps) => {
   const [workspaceName, setWorkspaceName] = useState('');
-  const isComposition = useRef(false);
 
   const handleCreateWorkspace = useCallback(() => {
     onConfirmName(workspaceName);
@@ -53,7 +52,7 @@ const NameWorkspaceContent = ({
 
   const handleKeyDown = useCallback(
     (event: KeyboardEvent<HTMLInputElement>) => {
-      if (event.key === 'Enter' && workspaceName && !isComposition.current) {
+      if (event.key === 'Enter' && workspaceName) {
         handleCreateWorkspace();
       }
     },
@@ -76,12 +75,6 @@ const NameWorkspaceContent = ({
         maxLength={64}
         minLength={0}
         onChange={setWorkspaceName}
-        onCompositionStart={() => {
-          isComposition.current = true;
-        }}
-        onCompositionEnd={() => {
-          isComposition.current = false;
-        }}
       />
       <div className={style.buttonGroup}>
         <Button
diff --git a/apps/web/src/components/affine/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx b/apps/web/src/components/affine/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx
index ad290bbdc0..5f9e6d7cd8 100644
--- a/apps/web/src/components/affine/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx
+++ b/apps/web/src/components/affine/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx
@@ -86,7 +86,6 @@ export const WorkspaceDeleteModal = ({
             onChange={setDeleteStr}
             data-testid="delete-workspace-input"
             placeholder={t['Placeholder of delete workspace']()}
-            value={deleteStr}
             width={315}
             height={42}
           />
diff --git a/apps/web/src/components/affine/new-workspace-setting-detail/profile.tsx b/apps/web/src/components/affine/new-workspace-setting-detail/profile.tsx
index 321225a639..b4737f30da 100644
--- a/apps/web/src/components/affine/new-workspace-setting-detail/profile.tsx
+++ b/apps/web/src/components/affine/new-workspace-setting-detail/profile.tsx
@@ -71,7 +71,7 @@ export const ProfilePanel: FC<{
         <Input
           width={280}
           height={32}
-          value={input}
+          defaultValue={input}
           data-testid="workspace-name-input"
           placeholder={t['Workspace Name']()}
           maxLength={64}
diff --git a/packages/component/src/components/page-list/view/create-collection.tsx b/packages/component/src/components/page-list/view/create-collection.tsx
index cbf754cf40..4248efc7e0 100644
--- a/packages/component/src/components/page-list/view/create-collection.tsx
+++ b/packages/component/src/components/page-list/view/create-collection.tsx
@@ -219,7 +219,7 @@ export const EditCollection = ({
           <Input
             data-testid="input-collection-title"
             placeholder="Untitled Collection"
-            value={value.name}
+            defaultValue={value.name}
             onChange={text =>
               onChange({
                 ...value,
diff --git a/packages/component/src/ui/input/input.tsx b/packages/component/src/ui/input/input.tsx
index 8ad21637a4..ce03ee73e1 100644
--- a/packages/component/src/ui/input/input.tsx
+++ b/packages/component/src/ui/input/input.tsx
@@ -1,7 +1,7 @@
 import { assignInlineVars } from '@vanilla-extract/dynamic';
 import clsx from 'clsx';
+import { useCompositionInput } from 'foxact/use-composition-input';
 import type {
-  ChangeEventHandler,
   CSSProperties,
   FocusEventHandler,
   ForwardedRef,
@@ -12,8 +12,10 @@ import { forwardRef, useCallback } from 'react';
 
 import { heightVar, inputStyle, widthVar } from './index.css';
 
-type inputProps = {
-  value?: string;
+type InputProps = {
+  // We don't have `value` props here,
+  //  see https://foxact.skk.moe/use-composition-input
+  defaultValue?: string | undefined;
   placeholder?: string;
   disabled?: boolean;
   width?: CSSProperties['width'];
@@ -24,12 +26,19 @@ type inputProps = {
   onBlur?: FocusEventHandler<HTMLInputElement>;
   onKeyDown?: KeyboardEventHandler<HTMLInputElement>;
   noBorder?: boolean;
-} & Omit<HTMLAttributes<HTMLInputElement>, 'onChange'>;
+} & Omit<
+  HTMLAttributes<HTMLInputElement>,
+  | 'onChange'
+  | 'value'
+  | 'defaultValue'
+  | 'onCompositionStart'
+  | 'onCompositionEnd'
+>;
 
-export const Input = forwardRef<HTMLInputElement, inputProps>(function Input(
+export const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
   {
     disabled,
-    value,
+    defaultValue,
     placeholder,
     maxLength,
     minLength,
@@ -39,15 +48,16 @@ export const Input = forwardRef<HTMLInputElement, inputProps>(function Input(
     noBorder = false,
     className,
     ...otherProps
-  }: inputProps,
+  }: InputProps,
   ref: ForwardedRef<HTMLInputElement>
 ) {
-  const handleChange = useCallback<ChangeEventHandler<HTMLInputElement>>(
-    e => {
-      const { value } = e.target;
-      onChange && onChange(value);
-    },
-    [onChange]
+  const inputProps = useCompositionInput(
+    useCallback(
+      (value: string) => {
+        onChange && onChange(value);
+      },
+      [onChange]
+    )
   );
 
   return (
@@ -60,15 +70,15 @@ export const Input = forwardRef<HTMLInputElement, inputProps>(function Input(
       data-no-border={noBorder}
       data-disabled={disabled}
       ref={ref}
-      value={value}
+      defaultValue={defaultValue}
       disabled={disabled}
       placeholder={placeholder}
       width={width}
       maxLength={maxLength}
       minLength={minLength}
-      onChange={handleChange}
       height={height}
       {...otherProps}
+      {...inputProps}
     />
   );
 });
diff --git a/plugins/copilot/src/UI/debug-content.tsx b/plugins/copilot/src/UI/debug-content.tsx
index 4b4050d67d..e2dc392dda 100644
--- a/plugins/copilot/src/UI/debug-content.tsx
+++ b/plugins/copilot/src/UI/debug-content.tsx
@@ -12,7 +12,7 @@ export const DebugContent: PluginUIAdapter['debugContent'] = () => {
     <div>
       <span>OpenAI API Key:</span>
       <Input
-        value={key ?? ''}
+        defaultValue={key ?? undefined}
         onChange={useCallback(
           (newValue: string) => {
             setKey(newValue);