chore: types/reactの型定義更新に伴うエラーを修正 (#4908)

kufu · Sep 11, 2024 · 77b7d79 · 77b7d79
1 parent 1b0b967
commit 77b7d79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/smarthr-ui/src/components/TextLink/TextLink.tsx b/packages/smarthr-ui/src/components/TextLink/TextLink.tsx
@@ -3,7 +3,9 @@ import React, {
   ComponentPropsWithoutRef,
   ElementType,
   FC,
+  PropsWithoutRef,
   ReactNode,
+  Ref,
   forwardRef,
   useMemo,
 } from 'react'
@@ -60,8 +62,8 @@ export const TextLink: TextLinkComponent = forwardRef(
       suffix,
       className,
       ...others
-    }: Props<T> & ElementProps<T>,
-    ref: ElementRef<T>,
+    }: PropsWithoutRef<Props<T>> & ElementProps<T>,
+    ref: Ref<ElementRef<T>>,
   ) => {
     const Component = elementAs || 'a'
     const actualSuffix = useMemo(() => {

diff --git a/packages/smarthr-ui/src/libs/util.ts b/packages/smarthr-ui/src/libs/util.ts
@@ -1,4 +1,10 @@
-import React, { type ReactNode, type Ref, type RefAttributes, forwardRef } from 'react'
+import React, {
+  type PropsWithoutRef,
+  type ReactNode,
+  type Ref,
+  type RefAttributes,
+  forwardRef,
+} from 'react'
 
 export const includeDisabledTrigger = (trigger: React.ReactNode) =>
   React.Children.map(trigger, (t) => React.isValidElement(t) && t.props.disabled)?.some(
@@ -8,5 +14,5 @@ export const includeDisabledTrigger = (trigger: React.ReactNode) =>
 /** forwardRef でジェネリクスを使うためのラッパー
  * via https://www.totaltypescript.com/forwardref-with-generic-components */
 export const genericsForwardRef = <T, P = object>(
-  render: (props: P, ref: Ref<T>) => ReactNode,
+  render: (props: PropsWithoutRef<P>, ref: Ref<T>) => ReactNode,
 ): ((props: P & RefAttributes<T>) => ReactNode) => forwardRef(render) as any