Skip to content

Commit 718f23e

Browse files
committed
fix(react-19): switch JSX.Element to React.ReactElement to support React 19 and 18
1 parent eb78a2b commit 718f23e

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

packages/autodemo/src/AutoDemo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const AutoDemo = ({
7575
treeRef3: React.Ref<TreeRef>,
7676
treeRef4: React.Ref<TreeRef>,
7777
treeRef5: React.Ref<TreeRef>
78-
) => JSX.Element;
78+
) => React.ReactElement;
7979
storyScript: (story: AutomationStoryHelpers) => Promise<void>;
8080
restart?: boolean;
8181
}) => {

packages/core/src/tree/TreeManager.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { useTreeEnvironment } from '../controlledEnvironment/ControlledTreeEnvir
1010
import { useDragAndDrop } from '../drag/DragAndDropProvider';
1111
import { MaybeLiveDescription } from './MaybeLiveDescription';
1212

13-
export const TreeManager = (): JSX.Element => {
13+
export const TreeManager = (): React.ReactElement => {
1414
const { treeId, rootItem, renderers, treeInformation } = useTree();
1515
const environment = useTreeEnvironment();
1616
const containerRef = useRef<HTMLElement>();
@@ -68,5 +68,5 @@ export const TreeManager = (): JSX.Element => {
6868
children: treeChildren,
6969
info: treeInformation,
7070
containerProps,
71-
}) as JSX.Element;
71+
}) as React.ReactElement;
7272
};

packages/core/src/treeItem/TreeItemChildren.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ export const TreeItemChildren = (props: {
77
children: TreeItemIndex[];
88
depth: number;
99
parentId: TreeItemIndex;
10-
}): JSX.Element => {
10+
}): React.ReactElement => {
1111
const { renderers, treeInformation } = useTree();
1212

13-
const childElements: JSX.Element[] = [];
13+
const childElements: React.ReactElement[] = [];
1414

1515
for (const child of props.children) {
1616
childElements.push(

packages/core/src/treeItem/TreeItemElement.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { TreeItemRenamingInput } from './TreeItemRenamingInput';
1010
export const TreeItemElement = (props: {
1111
itemIndex: TreeItemIndex;
1212
depth: number;
13-
}): JSX.Element => {
13+
}): React.ReactElement => {
1414
const [hasBeenRequested, setHasBeenRequested] = useState(false);
1515
const { renderers, treeInformation, renamingItem } = useTree();
1616
const environment = useTreeEnvironment();

packages/core/src/treeItem/TreeItemRenamingInput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,5 @@ export const TreeItemRenamingInput: React.FC<{
9797
submitButtonRef,
9898
formProps,
9999
inputProps,
100-
}) as JSX.Element;
100+
}) as React.ReactElement;
101101
};

packages/core/src/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ export interface ControlledTreeEnvironmentProps<
368368
T = any,
369369
C extends string = never
370370
> extends TreeEnvironmentConfiguration<T, C> {
371-
children?: JSX.Element | (JSX.Element | null)[] | null;
371+
children?: React.ReactElement | (React.ReactElement | null)[] | null;
372372
}
373373

374374
export interface UncontrolledTreeEnvironmentProps<
@@ -382,7 +382,7 @@ export interface UncontrolledTreeEnvironmentProps<
382382
keyboardBindings?: KeyboardBindings;
383383
liveDescriptors?: LiveDescriptors;
384384
getItemTitle: (item: TreeItem<T>) => string;
385-
children: JSX.Element | (JSX.Element | null)[] | null;
385+
children: React.ReactElement | (React.ReactElement | null)[] | null;
386386
disableMultiselect?: boolean;
387387
}
388388

0 commit comments

Comments
 (0)