Skip to content

Commit 70b673f

Browse files
committed
chore(react-components): resolve issues related to React 18 types
1 parent 9de96af commit 70b673f

File tree

32 files changed

+67
-62
lines changed

32 files changed

+67
-62
lines changed

packages/react-components/react-aria/library/etc/react-aria.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export type AriaLiveAnnouncerState = {
103103
};
104104

105105
// @public (undocumented)
106-
export const renderAriaLiveAnnouncer_unstable: (state: AriaLiveAnnouncerState, contextValues: AriaLiveAnnouncerContextValues) => JSX.Element;
106+
export const renderAriaLiveAnnouncer_unstable: (state: AriaLiveAnnouncerState, contextValues: AriaLiveAnnouncerContextValues) => React_2.JSX.Element;
107107

108108
// @public (undocumented)
109109
export function useActiveDescendant<TActiveParentElement extends HTMLElement, TListboxElement extends HTMLElement>(options: ActiveDescendantOptions): UseActiveDescendantReturn<TActiveParentElement, TListboxElement>;

packages/react-components/react-aria/library/src/AriaLiveAnnouncer/useAriaLiveAnnouncer.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('useAriaLiveAnnouncer', () => {
1919
},
2020
defaultView: global,
2121
} as unknown as Document;
22-
const ContextWrapper: React.FC = props => {
22+
const ContextWrapper: React.FC<React.PropsWithChildren> = props => {
2323
return <Provider value={{ dir: 'ltr', targetDocument }}>{props.children}</Provider>;
2424
};
2525

packages/react-components/react-aria/library/src/activedescendant/useActiveDescendant.cy.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ describe('onActiveOptionChange', () => {
1616
const [lastActive, setLastActive] = React.useState('');
1717

1818
const onActiveDescendantChange = React.useCallback(
19-
event => {
20-
setLastActive(event ? event.detail.id : 'no event');
19+
(event: CustomEventInit<{ id: string }>) => {
20+
setLastActive(event && event.detail ? event.detail.id : 'no event');
2121
},
2222
[setLastActive],
2323
);

packages/react-components/react-avatar/library/src/components/AvatarGroupItem/AvatarGroupItem.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { isConformant } from '../../testing/isConformant';
66

77
const testId = 'testId';
88

9-
const ContextWrapper: React.FC = ({ children }) => (
9+
const ContextWrapper: React.FC<React.PropsWithChildren> = ({ children }) => (
1010
<AvatarGroupContext.Provider value={{ isOverflow: true }}>{children}</AvatarGroupContext.Provider>
1111
);
1212

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Breadcrumb, BreadcrumbButton, BreadcrumbItem, BreadcrumbDivider } from '@fluentui/react-components';
2+
import * as React from 'react';
23
import descriptionMd from './BreadcrumbDescription.md';
34
export { Default } from './BreadcrumbDefault.stories';
45
export { BreadcrumbSize } from './BreadcrumbSize.stories';
@@ -7,13 +8,13 @@ export { BreadcrumbWithTooltip } from './BreadcrumbWithTooltip.stories';
78

89
import type { Meta } from '@storybook/react';
910

10-
const metadata: Meta<typeof Breadcrumb> = {
11+
const metadata = {
1112
title: 'Components/Breadcrumb',
1213
component: Breadcrumb,
1314
subcomponents: {
14-
BreadcrumbItem,
15-
BreadcrumbButton,
16-
BreadcrumbDivider,
15+
BreadcrumbItem: BreadcrumbItem as React.ComponentType<unknown>,
16+
BreadcrumbButton: BreadcrumbButton as React.ComponentType<unknown>,
17+
BreadcrumbDivider: BreadcrumbDivider as React.ComponentType<unknown>,
1718
},
1819
parameters: {
1920
docs: {
@@ -22,6 +23,6 @@ const metadata: Meta<typeof Breadcrumb> = {
2223
},
2324
},
2425
},
25-
};
26+
} satisfies Meta<typeof Breadcrumb>;
2627

2728
export default metadata;

packages/react-components/react-button/library/src/utils/useToggleState.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function useToggleState<
2020
const isCheckboxTypeRole = role === 'menuitemcheckbox' || role === 'checkbox';
2121

2222
const onToggleClick = React.useCallback(
23-
ev => {
23+
(ev: React.MouseEvent<HTMLButtonElement | HTMLAnchorElement>) => {
2424
if (!disabled && !disabledFocusable) {
2525
if (ev.defaultPrevented) {
2626
return;

packages/react-components/react-combobox/library/config/tests.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

packages/react-components/react-combobox/library/jest.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// @ts-check
2-
/* eslint-disable */
32

43
const { readFileSync } = require('node:fs');
54
const { join } = require('node:path');
@@ -29,6 +28,6 @@ module.exports = {
2928
'^.+\\.tsx?$': ['@swc/jest', swcJestConfig],
3029
},
3130
coverageDirectory: './coverage',
32-
setupFilesAfterEnv: ['./config/tests.js'],
31+
setupFilesAfterEnv: ['./config/tests.ts'],
3332
snapshotSerializers: ['@griffel/jest-serializer'],
3433
};

packages/react-components/react-combobox/library/tsconfig.spec.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"compilerOptions": {
44
"module": "CommonJS",
55
"outDir": "dist",
6-
"types": ["jest", "node", "@testing-library/jest-dom"]
6+
"types": ["jest", "node"]
77
},
88
"include": [
9+
"./config/tests.ts",
910
"**/*.spec.ts",
1011
"**/*.spec.tsx",
1112
"**/*.test.ts",

packages/react-components/react-list/library/src/components/List/List.cy.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { teamsLightTheme } from '@fluentui/react-theme';
55

66
import { List } from './List';
77
import { ListItem } from '../ListItem';
8+
import type { ListProps } from './List.types';
89
import { SelectionItemId } from '@fluentui/react-utilities';
910

1011
const mount = (element: JSX.Element) => {
@@ -72,11 +73,11 @@ type SelectionTestListProps = {
7273
const SelectionTestList = ({ selectionMode, defaultSelectedItems, controlled }: SelectionTestListProps) => {
7374
const [selectedItems, setSelectedItems] = React.useState(defaultSelectedItems || []);
7475

75-
const onChange = React.useCallback((_, { selectedItems: selected }) => {
76+
const onChange = React.useCallback<NonNullable<ListProps['onSelectionChange']>>((_, { selectedItems: selected }) => {
7677
setSelectedItems(selected);
7778
}, []);
7879

79-
const onSelectLastClick = React.useCallback(_ => {
80+
const onSelectLastClick = React.useCallback(() => {
8081
setSelectedItems(['list-item-3']);
8182
}, []);
8283

0 commit comments

Comments
 (0)