Skip to content

Commit e4125f6

Browse files
Merge branch 'v5.x' into fix/skip-deep-clone-react-element
2 parents a140075 + 9172305 commit e4125f6

File tree

219 files changed

+365
-307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+365
-307
lines changed

apps/local-ui-lib/index.d.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import * as React from 'react';
2+
13
export const bounceAnim: string;
24
export const Button: React.ComponentType<
3-
JSX.IntrinsicElements['button'] & {
5+
React.JSX.IntrinsicElements['button'] & {
46
isRed?: boolean;
57
sx?: unknown;
68
}

docs/data/base/components/modal/SpringModal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default function SpringModal() {
3737

3838
const Backdrop = React.forwardRef<
3939
HTMLDivElement,
40-
{ children: React.ReactElement; open: boolean }
40+
{ children: React.ReactElement<any>; open: boolean }
4141
>((props, ref) => {
4242
const { open, ...other } = props;
4343
return <Fade ref={ref} in={open} {...other} />;
@@ -61,7 +61,7 @@ const StyledBackdrop = styled(Backdrop)`
6161
`;
6262

6363
interface FadeProps {
64-
children: React.ReactElement;
64+
children: React.ReactElement<any>;
6565
in?: boolean;
6666
onClick?: any;
6767
onEnter?: (node: HTMLElement, isAppearing: boolean) => void;

docs/data/base/components/modal/UseModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default function UseModal() {
3939
}
4040

4141
interface ModalProps {
42-
children: React.ReactElement;
42+
children: React.ReactElement<any>;
4343
closeAfterTransition?: boolean;
4444
container?: Element | (() => Element | null) | null;
4545
disableAutoFocus?: boolean;

docs/data/base/components/popper/PlacementPopper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import { Popper, PopperPlacementType } from '@mui/base/Popper';
33

4-
function Radio({ value, ...props }: JSX.IntrinsicElements['input']) {
4+
function Radio({ value, ...props }: React.JSX.IntrinsicElements['input']) {
55
return (
66
<span>
77
<input

docs/data/base/components/popup/Placement.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from '@mui/base/Unstable_Popup';
66
import { styled, css, Theme } from '@mui/system';
77

8-
function Radio({ value, ...props }: JSX.IntrinsicElements['input']) {
8+
function Radio({ value, ...props }: React.JSX.IntrinsicElements['input']) {
99
return (
1010
<span>
1111
<input

docs/data/base/components/select/UnstyledSelectBasic/system/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const Select = React.forwardRef(function Select<
2323
return <BaseSelect {...props} ref={ref} slots={slots} />;
2424
}) as <TValue extends {}, Multiple extends boolean>(
2525
props: SelectProps<TValue, Multiple> & React.RefAttributes<HTMLButtonElement>,
26-
) => JSX.Element;
26+
) => React.JSX.Element;
2727

2828
export default function UnstyledSelectBasic() {
2929
return (

docs/data/base/components/select/UnstyledSelectForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const Select = React.forwardRef(function CustomSelect<
4747
return <BaseSelect {...props} ref={ref} slots={slots} />;
4848
}) as <TValue extends {}, Multiple extends boolean>(
4949
props: SelectProps<TValue, Multiple> & React.RefAttributes<HTMLButtonElement>,
50-
) => JSX.Element;
50+
) => React.JSX.Element;
5151

5252
const blue = {
5353
100: '#DAECFF',

docs/data/base/components/slider/DiscreteSlider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function DiscreteSlider() {
2121
}
2222

2323
interface SliderValueLabelProps {
24-
children: React.ReactElement;
24+
children: React.ReactElement<any>;
2525
}
2626

2727
function SliderValueLabel({ children }: SliderValueLabelProps) {

docs/data/base/components/slider/LabeledValuesSlider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function LabeledValuesSlider() {
1111
}
1212

1313
interface SliderValueLabelProps {
14-
children: React.ReactElement;
14+
children: React.ReactElement<any>;
1515
}
1616

1717
function SliderValueLabel({ children }: SliderValueLabelProps) {

docs/data/base/components/transitions/ReactTransitionGroup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function PopupWithTrigger(props: PopupProps) {
115115
);
116116
}
117117

118-
function MaterialUITransitionAdapter(props: { children: React.ReactElement }) {
118+
function MaterialUITransitionAdapter(props: { children: React.ReactElement<any> }) {
119119
const { requestedEnter, onExited } = useTransitionStateManager();
120120
const { children } = props;
121121

0 commit comments

Comments
 (0)