Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Improve getReactElementRef() utils #43022

Merged
merged 14 commits into from
Sep 19, 2024
Merged

[core] Improve getReactElementRef() utils #43022

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
62e5726
move logic
sai6855 Aug 9, 2024
b7ea8dd
fix types
sai6855 Aug 9, 2024
aecd27a
modify logic according to https://github.com/mui/material-ui/pull/430…
sai6855 Sep 15, 2024
43b4ef6
Rename folder
aarongarciah Sep 19, 2024
009ad13
Rename utility function
aarongarciah Sep 19, 2024
c14f907
update file names
sai6855 Sep 15, 2024
25d3e9d
pnpm prettier
sai6855 Sep 15, 2024
7bc2059
update logic
sai6855 Sep 15, 2024
68ee1e7
remove error code
sai6855 Sep 15, 2024
170f6ae
update portal logic
sai6855 Sep 15, 2024
ca2d271
trigger
sai6855 Sep 15, 2024
2852483
check for react version instead of using propertyIsEnumerable
sai6855 Sep 19, 2024
abe26e2
update return type
sai6855 Sep 19, 2024
b84c85d
use parseInt instead of split
sai6855 Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename folder
  • Loading branch information
@aarongarciah
aarongarciah committed Sep 19, 2024
commit 43b4ef6b5fc1d7de224b0a5ad310b16a85fd7627
2 changes: 1 addition & 1 deletion packages/mui-base/src/Portal/Portal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';
import {
exactProp,
HTMLElementType,
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/ClickAwayListener/ClickAwayListener.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
unstable_useForkRef as useForkRef,
unstable_useEventCallback as useEventCallback,
} from '@mui/utils';
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';

// TODO: return `EventHandlerName extends `on${infer EventName}` ? Lowercase<EventName> : never` once generatePropTypes runs with TS 4.1
function mapEventPropToEvent(
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/Fade/Fade.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import { Transition } from 'react-transition-group';
import elementAcceptingRef from '@mui/utils/elementAcceptingRef';
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';
import { useTheme } from '../zero-styled';
import { reflow, getTransitionProps } from '../transitions/utils';
import useForkRef from '../utils/useForkRef';
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/Grow/Grow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import useTimeout from '@mui/utils/useTimeout';
import elementAcceptingRef from '@mui/utils/elementAcceptingRef';
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';
import { Transition } from 'react-transition-group';
import { useTheme } from '../zero-styled';
import { getTransitionProps, reflow } from '../transitions/utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/Select/Select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import deepmerge from '@mui/utils/deepmerge';
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';
import SelectInput from './SelectInput';
import formControlState from '../FormControl/formControlState';
import useFormControl from '../FormControl/useFormControl';
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/Slide/Slide.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Transition } from 'react-transition-group';
import chainPropTypes from '@mui/utils/chainPropTypes';
import HTMLElementType from '@mui/utils/HTMLElementType';
import elementAcceptingRef from '@mui/utils/elementAcceptingRef';
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';
import debounce from '../utils/debounce';
import useForkRef from '../utils/useForkRef';
import { useTheme } from '../zero-styled';
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/Tooltip/Tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { alpha } from '@mui/system/colorManipulator';
import { useRtl } from '@mui/system/RtlProvider';
import isFocusVisible from '@mui/utils/isFocusVisible';
import appendOwnerState from '@mui/utils/appendOwnerState';
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';
import { styled, useTheme } from '../zero-styled';
import memoTheme from '../utils/memoTheme';
import { useDefaultProps } from '../DefaultPropsProvider';
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/Zoom/Zoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import { Transition } from 'react-transition-group';
import elementAcceptingRef from '@mui/utils/elementAcceptingRef';
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';
import { useTheme } from '../zero-styled';
import { reflow, getTransitionProps } from '../transitions/utils';
import useForkRef from '../utils/useForkRef';
Expand Down
2 changes: 1 addition & 1 deletion .../getReactNodeRef/getReactNodeRef.spec.tsx → ...actElementRef/getReactElementRef.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';
import * as React from 'react';

// @ts-expect-error
Expand Down
2 changes: 1 addition & 1 deletion .../getReactNodeRef/getReactNodeRef.test.tsx → ...actElementRef/getReactElementRef.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import getReactNodeRef from '@mui/utils/getReactNodeRef';
import getReactNodeRef from '@mui/utils/getReactElementRef';
import * as React from 'react';

describe('getReactNodeRef', () => {
Expand Down
0 ...ls/src/getReactNodeRef/getReactNodeRef.ts → .../getReactElementRef/getReactElementRef.ts
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions packages/mui-utils/src/getReactElementRef/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './getReactElementRef';
1 change: 0 additions & 1 deletion packages/mui-utils/src/getReactNodeRef/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/mui-utils/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ export { default as unstable_useSlotProps } from './useSlotProps';
export type { UseSlotPropsParameters, UseSlotPropsResult } from './useSlotProps';
export { default as unstable_resolveComponentProps } from './resolveComponentProps';
export { default as unstable_extractEventHandlers } from './extractEventHandlers';
export { default as unstable_getReactNodeRef } from './getReactNodeRef';
export { default as unstable_getReactNodeRef } from './getReactElementRef';
export * from './types';
2 changes: 1 addition & 1 deletion packages/mui-utils/src/useForkRef/useForkRef.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { expect } from 'chai';
import { createRenderer, screen } from '@mui/internal-test-utils';
import useForkRef from './useForkRef';
import getReactNodeRef from '../getReactNodeRef';
import getReactNodeRef from '../getReactElementRef';

describe('useForkRef', () => {
const { render } = createRenderer();
Expand Down