Skip to content

Commit 8202d81

Browse files
committed
fix(types): fix conflicts in react types
1 parent 9226be3 commit 8202d81

File tree

4 files changed

+6
-17
lines changed

4 files changed

+6
-17
lines changed

packages/lumx-react/src/components/navigation/NavigationItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { forwardRefPolymorphic } from '@lumx/react/utils/forwardRefPolymorphic';
77
import { ThemeContext } from '@lumx/react/utils/ThemeContext';
88

99
type BaseNavigationItemProps = {
10-
/* Icon (SVG path). */
10+
/** Icon (SVG path). */
1111
icon?: string;
1212
/** Label content. */
1313
label: ReactNode;
@@ -65,7 +65,7 @@ export const NavigationItem = Object.assign(
6565
prefix: `${CLASSNAME}__link`,
6666
isSelected: isCurrentPage,
6767
})}
68-
ref={ref}
68+
ref={ref as React.Ref<any>}
6969
aria-current={isCurrentPage ? 'page' : undefined}
7070
{...buttonProps}
7171
{...forwardedProps}

packages/lumx-react/src/components/uploader/Uploader.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ describe(`<${Uploader.displayName}>`, () => {
7272
it('should render file input', () => {
7373
const label = 'Label';
7474
const accept = '*';
75-
const { uploader } = setup({ label, fileInputProps: { accept } });
75+
const { uploader } = setup({ label, fileInputProps: { accept } as any });
7676

7777
expect(uploader.tagName).toBe('LABEL');
7878
expect(uploader).toHaveTextContent(label);

packages/lumx-react/src/utils/forwardRefPolymorphic.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ import { ComponentRef } from '@lumx/react/utils/type';
44
/** Same as `React.forwardRef` but inferring Ref type from the `as` prop. */
55
export function forwardRefPolymorphic<E extends ElementType, P extends { as?: E }>(
66
render: (props: P, ref: ComponentRef<E>) => React.ReactElement | null,
7-
) {
8-
return React.forwardRef(render as any) as (props: P & { ref?: ComponentRef<E> }) => React.ReactElement | null;
7+
): (props: P & { ref?: ComponentRef<E> }) => React.ReactElement | null {
8+
return React.forwardRef(render as any) as any;
99
}

yarn.lock

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8528,18 +8528,7 @@ __metadata:
85288528
languageName: node
85298529
linkType: hard
85308530

8531-
"@types/react@npm:*, @types/react@npm:>=16":
8532-
version: 18.2.45
8533-
resolution: "@types/react@npm:18.2.45"
8534-
dependencies:
8535-
"@types/prop-types": "*"
8536-
"@types/scheduler": "*"
8537-
csstype: ^3.0.2
8538-
checksum: 40b256bdce67b026348022b4f8616a693afdad88cf493b77f7b4e6c5f4b0e4ba13a6068e690b9b94572920840ff30d501ea3d8518e1f21cc8fb8204d4b140c8a
8539-
languageName: node
8540-
linkType: hard
8541-
8542-
"@types/react@npm:^17, @types/react@npm:^17.0.2":
8531+
"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^17, @types/react@npm:^17.0.2":
85438532
version: 17.0.73
85448533
resolution: "@types/react@npm:17.0.73"
85458534
dependencies:

0 commit comments

Comments
 (0)