chore: useDecoratorsをgenericsなくても動作するように修正

kufu · Jan 24, 2025 · 7c70320 · 7c70320
1 parent 139d213
commit 7c70320
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/packages/smarthr-ui/src/components/Textarea/Textarea.tsx b/packages/smarthr-ui/src/components/Textarea/Textarea.tsx
@@ -64,7 +64,7 @@ const DECORATOR_DEFAULT_TEXTS = {
   afterMaxLettersCountExceeded: 'オーバー',
   beforeScreenReaderMaxLettersDescription: '最大',
   afterScreenReaderMaxLettersDescription: '文字入力できます',
-}
+} as const
 
 const textarea = tv({
   slots: {
@@ -120,10 +120,7 @@ export const Textarea = forwardRef<HTMLTextAreaElement, Props & ElementProps>(
     const [count, setCount] = useState(currentValue ? getStringLength(currentValue) : 0)
     const [srCounterMessage, setSrCounterMessage] = useState<ReactNode>('')
 
-    const decorated = useDecorators<keyof typeof DECORATOR_DEFAULT_TEXTS>(
-      DECORATOR_DEFAULT_TEXTS,
-      decorators,
-    )
+    const decorated = useDecorators<DECORATOR_DEFAULT_TEXTS>(DECORATOR_DEFAULT_TEXTS, decorators)
 
     const getCounterMessage = useCallback(
       (counterValue: number) => {

diff --git a/packages/smarthr-ui/src/libs/decorator.ts b/packages/smarthr-ui/src/libs/decorator.ts
@@ -6,16 +6,16 @@ export type DecoratorsType<T extends string> = {
 
 export type DecoratorType = (text: string) => ReactNode
 
-export const useDecorators = <T extends string>(
-  defaultTexts: { [K in T]: string },
-  decorators: DecoratorsType<T> | undefined,
+export const useDecorators = <T extends { [key: string]: string }>(
+  defaultTexts: T,
+  decorators: DecoratorsType<keyof T> | undefined,
 ) =>
   useMemo(() => {
     if (!decorators) {
       return defaultTexts
     }
 
-    const decorated = {} as { [K in T]: ReactNode }
+    const decorated = {} as { [K in keyof T]: ReactNode }
 
     for (const key in defaultTexts) {
       const value = defaultTexts[key]