From 0d60da61cbd3bcec0544a4f328fc45dd065a004d Mon Sep 17 00:00:00 2001
From: Innei <i@innei.in>
Date: Thu, 29 Aug 2024 19:57:54 +0800
Subject: [PATCH] fix: setting item support props

Signed-off-by: Innei <i@innei.in>
---
 .../src/atoms/settings/integration.ts         |  4 ++--
 .../src/hooks/common/useInputComposition.ts   | 11 +++++++--
 src/renderer/src/modules/settings/control.tsx | 24 ++++++++++++++++---
 .../src/modules/settings/setting-builder.tsx  | 10 ++++++++
 .../src/modules/settings/tabs/integration.tsx |  7 ++++++
 5 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/atoms/settings/integration.ts b/src/renderer/src/atoms/settings/integration.ts
index c732f39ab..f8cee02bc 100644
--- a/src/renderer/src/atoms/settings/integration.ts
+++ b/src/renderer/src/atoms/settings/integration.ts
@@ -4,9 +4,9 @@ import { createSettingAtom } from "./helper"
 
 export const createDefaultSettings = (): IntegrationSettings => ({
   enableEagle: true,
-  enableReadwise: true,
+  enableReadwise: false,
   readwiseToken: "",
-  enableInstapaper: true,
+  enableInstapaper: false,
   instapaperUsername: "",
   instapaperPassword: "",
 })
diff --git a/src/renderer/src/hooks/common/useInputComposition.ts b/src/renderer/src/hooks/common/useInputComposition.ts
index 8629e78d7..b97e4a42a 100644
--- a/src/renderer/src/hooks/common/useInputComposition.ts
+++ b/src/renderer/src/hooks/common/useInputComposition.ts
@@ -57,10 +57,17 @@ export const useInputComposition = <E = HTMLInputElement>(
     [onKeyDown],
   )
 
-  return {
+  const ret = {
     onCompositionEnd: handleCompositionEnd,
     onCompositionStart: handleCompositionStart,
     onKeyDown: handleKeyDown,
-    isCompositionRef,
+
+  }
+  Object.defineProperty(ret, "isCompositionRef", {
+    value: isCompositionRef,
+    enumerable: false,
+  })
+  return ret as typeof ret & {
+    isCompositionRef: typeof isCompositionRef
   }
 }
diff --git a/src/renderer/src/modules/settings/control.tsx b/src/renderer/src/modules/settings/control.tsx
index 6bb6ff618..2242ac62c 100644
--- a/src/renderer/src/modules/settings/control.tsx
+++ b/src/renderer/src/modules/settings/control.tsx
@@ -53,14 +53,32 @@ export const SettingInput: Component<{
   value: string
   onChange: ChangeEventHandler<HTMLInputElement>
   type: string
-}> = ({ value, label, onChange, className, type }) => {
+  vertical?: boolean
+  labelClassName?: string
+}> = ({
+  value,
+  label,
+  onChange,
+  labelClassName,
+  className,
+  type,
+  vertical,
+}) => {
   const id = useId()
 
   return (
     <div
-      className={cn("mb-1 flex items-center justify-between gap-12", className)}
+      className={cn(
+        "mb-1 flex",
+        vertical ?
+          "mb-2 flex-col gap-3" :
+          "flex-row items-center justify-between gap-12",
+        className,
+      )}
     >
-      <Label className="shrink-0" htmlFor={id}>{label}</Label>
+      <Label className={cn("shrink-0", labelClassName)} htmlFor={id}>
+        {label}
+      </Label>
       <Input
         type={type}
         id={id}
diff --git a/src/renderer/src/modules/settings/setting-builder.tsx b/src/renderer/src/modules/settings/setting-builder.tsx
index 76036ae4b..4a5b9a89e 100644
--- a/src/renderer/src/modules/settings/setting-builder.tsx
+++ b/src/renderer/src/modules/settings/setting-builder.tsx
@@ -22,6 +22,14 @@ export type SettingItem<T, K extends keyof T = keyof T> = {
   description?: string
   onChange: (value: T[K]) => void
   type?: "password"
+
+  vertical?: boolean
+
+  componentProps?: {
+    labelClassName?: string
+    className?: string
+    [key: string]: any
+  }
 } & SharedSettingItem
 
 type SectionSettingItem = {
@@ -97,6 +105,8 @@ export const createSettingBuilder =
               case "string": {
                 ControlElement = (
                   <SettingInput
+                    vertical={assertSetting.vertical}
+                    labelClassName={assertSetting.componentProps?.labelClassName}
                     type={assertSetting.type || "text"}
                     className="mt-4"
                     value={settingObject[assertSetting.key] as string}
diff --git a/src/renderer/src/modules/settings/tabs/integration.tsx b/src/renderer/src/modules/settings/tabs/integration.tsx
index 4b29f7c9b..986610686 100644
--- a/src/renderer/src/modules/settings/tabs/integration.tsx
+++ b/src/renderer/src/modules/settings/tabs/integration.tsx
@@ -49,6 +49,7 @@ export const SettingIntegration = () => (
           }),
           defineSettingItem("readwiseToken", {
             label: "Readwise Access Token",
+            vertical: true,
             type: "password",
             description: <>You can get it here: <a target="_blank" className="underline" rel="noreferrer noopener" href="https://readwise.io/access_token">readwise.io/access_token</a>.</>,
           }),
@@ -62,10 +63,16 @@ export const SettingIntegration = () => (
           }),
           defineSettingItem("instapaperUsername", {
             label: "Instapaper Username",
+            componentProps: {
+              labelClassName: "w-[150px]",
+            },
           }),
           defineSettingItem("instapaperPassword", {
             label: "Instapaper Password",
             type: "password",
+            componentProps: {
+              labelClassName: "w-[150px]",
+            },
           }),
         ]}
       />