From b1234e7257c98e5ed80ba12f58418b812a93f2c7 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 13:22:46 -0700 Subject: [PATCH 01/17] [Popper]: Move from mui-material to mui-core --- docs/pages/api-docs/popper.json | 2 +- .../{mui-material => mui-core}/src/Popper/Popper.d.ts | 0 .../{mui-material => mui-core}/src/Popper/Popper.js | 11 ++++------- .../src/Popper/Popper.spec.tsx | 0 .../src/Popper/Popper.test.js | 2 +- .../{mui-material => mui-core}/src/Popper/index.d.ts | 0 .../{mui-material => mui-core}/src/Popper/index.js | 0 packages/mui-core/src/index.d.ts | 3 +++ packages/mui-core/src/index.js | 3 +++ .../mui-lab/src/internal/pickers/PickersPopper.tsx | 2 +- .../mui-material/src/Autocomplete/Autocomplete.d.ts | 2 +- packages/mui-material/src/Tooltip/Tooltip.d.ts | 4 ++-- packages/mui-material/src/index.d.ts | 3 --- packages/mui-material/src/index.js | 3 --- .../test/integration/PopperChildrenLayout.test.js | 2 +- 15 files changed, 17 insertions(+), 20 deletions(-) rename packages/{mui-material => mui-core}/src/Popper/Popper.d.ts (100%) rename packages/{mui-material => mui-core}/src/Popper/Popper.js (98%) rename packages/{mui-material => mui-core}/src/Popper/Popper.spec.tsx (100%) rename packages/{mui-material => mui-core}/src/Popper/Popper.test.js (99%) rename packages/{mui-material => mui-core}/src/Popper/index.d.ts (100%) rename packages/{mui-material => mui-core}/src/Popper/index.js (100%) diff --git a/docs/pages/api-docs/popper.json b/docs/pages/api-docs/popper.json index 9e611f3710467a..e0b3dd56408780 100644 --- a/docs/pages/api-docs/popper.json +++ b/docs/pages/api-docs/popper.json @@ -38,7 +38,7 @@ "styles": { "classes": [], "globalClasses": {}, "name": null }, "spread": true, "forwardsRefTo": "HTMLDivElement", - "filename": "/packages/mui-material/src/Popper/Popper.js", + "filename": "/packages/mui-core/src/Popper/Popper.js", "inheritance": null, "demos": "", "cssComponent": false diff --git a/packages/mui-material/src/Popper/Popper.d.ts b/packages/mui-core/src/Popper/Popper.d.ts similarity index 100% rename from packages/mui-material/src/Popper/Popper.d.ts rename to packages/mui-core/src/Popper/Popper.d.ts diff --git a/packages/mui-material/src/Popper/Popper.js b/packages/mui-core/src/Popper/Popper.js similarity index 98% rename from packages/mui-material/src/Popper/Popper.js rename to packages/mui-core/src/Popper/Popper.js index 775ecee509230d..9c9ae9bae69424 100644 --- a/packages/mui-material/src/Popper/Popper.js +++ b/packages/mui-core/src/Popper/Popper.js @@ -1,12 +1,9 @@ -import * as React from 'react'; -import PropTypes from 'prop-types'; -import { createPopper } from '@popperjs/core'; -import { chainPropTypes, refType, HTMLElementType } from '@mui/utils'; import { useThemeWithoutDefault as useTheme } from '@mui/system'; +import { chainPropTypes, HTMLElementType, refType, unstable_ownerDocument as ownerDocument, unstable_useEnhancedEffect as useEnhancedEffect, unstable_useForkRef as useForkRef } from '@mui/utils'; +import { createPopper } from '@popperjs/core'; +import PropTypes from 'prop-types'; +import * as React from 'react'; import Portal from '../Portal'; -import ownerDocument from '../utils/ownerDocument'; -import useForkRef from '../utils/useForkRef'; -import useEnhancedEffect from '../utils/useEnhancedEffect'; function flipPlacement(placement, theme) { const direction = (theme && theme.direction) || 'ltr'; diff --git a/packages/mui-material/src/Popper/Popper.spec.tsx b/packages/mui-core/src/Popper/Popper.spec.tsx similarity index 100% rename from packages/mui-material/src/Popper/Popper.spec.tsx rename to packages/mui-core/src/Popper/Popper.spec.tsx diff --git a/packages/mui-material/src/Popper/Popper.test.js b/packages/mui-core/src/Popper/Popper.test.js similarity index 99% rename from packages/mui-material/src/Popper/Popper.test.js rename to packages/mui-core/src/Popper/Popper.test.js index 9388f6594d9f34..53de0bd43574b3 100644 --- a/packages/mui-material/src/Popper/Popper.test.js +++ b/packages/mui-core/src/Popper/Popper.test.js @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'; import { describeConformance, act, createClientRender, fireEvent, screen } from 'test/utils'; import { ThemeProvider, createTheme } from '@mui/material/styles'; import Grow from '@mui/material/Grow'; -import Popper from '@mui/material/Popper'; +import Popper from '@mui/core/Popper'; describe('', () => { let rtlTheme; diff --git a/packages/mui-material/src/Popper/index.d.ts b/packages/mui-core/src/Popper/index.d.ts similarity index 100% rename from packages/mui-material/src/Popper/index.d.ts rename to packages/mui-core/src/Popper/index.d.ts diff --git a/packages/mui-material/src/Popper/index.js b/packages/mui-core/src/Popper/index.js similarity index 100% rename from packages/mui-material/src/Popper/index.js rename to packages/mui-core/src/Popper/index.js diff --git a/packages/mui-core/src/index.d.ts b/packages/mui-core/src/index.d.ts index 0055f2caf5f462..0b3cbb260ceef1 100644 --- a/packages/mui-core/src/index.d.ts +++ b/packages/mui-core/src/index.d.ts @@ -26,6 +26,9 @@ export * from './ModalUnstyled'; export { default as NoSsr } from './NoSsr'; +export { default as Popper } from './Popper'; +export * from './Popper'; + export { default as Portal } from './Portal'; export * from './Portal'; diff --git a/packages/mui-core/src/index.js b/packages/mui-core/src/index.js index 87f603ba7c16e8..10c2425c4b04ab 100644 --- a/packages/mui-core/src/index.js +++ b/packages/mui-core/src/index.js @@ -23,6 +23,9 @@ export * from './ModalUnstyled'; export { default as NoSsr } from './NoSsr'; +export { default as Popper } from './Popper'; +export * from './Popper'; + export { default as Portal } from './Portal'; export { default as SliderUnstyled } from './SliderUnstyled'; diff --git a/packages/mui-lab/src/internal/pickers/PickersPopper.tsx b/packages/mui-lab/src/internal/pickers/PickersPopper.tsx index b03e2f6ebff669..b47c33e62ffd86 100644 --- a/packages/mui-lab/src/internal/pickers/PickersPopper.tsx +++ b/packages/mui-lab/src/internal/pickers/PickersPopper.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import Grow from '@mui/material/Grow'; import Paper, { PaperProps as MuiPaperProps } from '@mui/material/Paper'; -import Popper, { PopperProps as MuiPopperProps } from '@mui/material/Popper'; +import Popper, { PopperProps as MuiPopperProps } from '@mui/core/Popper'; import TrapFocus, { TrapFocusProps as MuiTrapFocusProps } from '@mui/material/Unstable_TrapFocus'; import { useForkRef, useEventCallback, ownerDocument } from '@mui/material/utils'; import { styled } from '@mui/material/styles'; diff --git a/packages/mui-material/src/Autocomplete/Autocomplete.d.ts b/packages/mui-material/src/Autocomplete/Autocomplete.d.ts index 385f7a8ecc0525..77e4525a6a6ff1 100644 --- a/packages/mui-material/src/Autocomplete/Autocomplete.d.ts +++ b/packages/mui-material/src/Autocomplete/Autocomplete.d.ts @@ -1,7 +1,7 @@ import * as React from 'react'; import { IconButtonProps, InternalStandardProps as StandardProps, Theme } from '@mui/material'; import { ChipProps, ChipTypeMap } from '@mui/material/Chip'; -import { PopperProps } from '@mui/material/Popper'; +import { PopperProps } from '@mui/core/Popper'; import { SxProps } from '@mui/system'; import { OverridableStringUnion } from '@mui/types'; import { diff --git a/packages/mui-material/src/Tooltip/Tooltip.d.ts b/packages/mui-material/src/Tooltip/Tooltip.d.ts index 2e35b25c762eaa..31afe393af2266 100644 --- a/packages/mui-material/src/Tooltip/Tooltip.d.ts +++ b/packages/mui-material/src/Tooltip/Tooltip.d.ts @@ -1,8 +1,8 @@ -import * as React from 'react'; +import { PopperProps } from '@mui/core/Popper'; import { MUIStyledCommonProps, SxProps } from '@mui/system'; +import * as React from 'react'; import { InternalStandardProps as StandardProps, Theme } from '..'; import { TransitionProps } from '../transitions/transition'; -import { PopperProps } from '../Popper/Popper'; import { TooltipClasses } from './tooltipClasses'; export interface TooltipComponentsPropsOverrides {} diff --git a/packages/mui-material/src/index.d.ts b/packages/mui-material/src/index.d.ts index 2afba6018f9a02..fa73f0f4f4b2cc 100644 --- a/packages/mui-material/src/index.d.ts +++ b/packages/mui-material/src/index.d.ts @@ -322,9 +322,6 @@ export * from './Paper'; export { default as Popover } from './Popover'; export * from './Popover'; -export { default as Popper } from './Popper'; -export * from './Popper'; - export { default as Radio } from './Radio'; export * from './Radio'; diff --git a/packages/mui-material/src/index.js b/packages/mui-material/src/index.js index 1196f18273e6fd..4cf516da11f9ab 100644 --- a/packages/mui-material/src/index.js +++ b/packages/mui-material/src/index.js @@ -254,9 +254,6 @@ export * from './Paper'; export { default as Popover } from './Popover'; export * from './Popover'; -export { default as Popper } from './Popper'; -export * from './Popper'; - export { default as Radio } from './Radio'; export * from './Radio'; diff --git a/packages/mui-material/test/integration/PopperChildrenLayout.test.js b/packages/mui-material/test/integration/PopperChildrenLayout.test.js index ffc58e4c813570..a0b964bfe62340 100644 --- a/packages/mui-material/test/integration/PopperChildrenLayout.test.js +++ b/packages/mui-material/test/integration/PopperChildrenLayout.test.js @@ -7,7 +7,7 @@ import Fade from '@mui/material/Fade'; import Grow from '@mui/material/Grow'; import Slide from '@mui/material/Slide'; import Zoom from '@mui/material/Zoom'; -import Popper from '@mui/material/Popper'; +import Popper from '@mui/core/Popper'; describe('', () => { let isSafari; From f55f1fc55c691c61fce24667ecdc39eff21479d4 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 13:27:24 -0700 Subject: [PATCH 02/17] [Popper]Import Popper back into mui-material pkg --- packages/mui-material/src/Popper/index.d.ts | 2 ++ packages/mui-material/src/Popper/index.js | 1 + 2 files changed, 3 insertions(+) create mode 100644 packages/mui-material/src/Popper/index.d.ts create mode 100644 packages/mui-material/src/Popper/index.js diff --git a/packages/mui-material/src/Popper/index.d.ts b/packages/mui-material/src/Popper/index.d.ts new file mode 100644 index 00000000000000..c6ee05172899d1 --- /dev/null +++ b/packages/mui-material/src/Popper/index.d.ts @@ -0,0 +1,2 @@ +export { default } from '@mui/core/Popper'; +export * from '@mui/core/Popper'; diff --git a/packages/mui-material/src/Popper/index.js b/packages/mui-material/src/Popper/index.js new file mode 100644 index 00000000000000..978da736f3d3e5 --- /dev/null +++ b/packages/mui-material/src/Popper/index.js @@ -0,0 +1 @@ +export { default } from '@mui/core/Popper'; From fedca5332c93fd40096fabeb192a1a1012d95738 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 13:29:51 -0700 Subject: [PATCH 03/17] [Popper]:Revert Popper import path for dependents --- packages/mui-material/src/Autocomplete/Autocomplete.d.ts | 2 +- packages/mui-material/src/Tooltip/Tooltip.d.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mui-material/src/Autocomplete/Autocomplete.d.ts b/packages/mui-material/src/Autocomplete/Autocomplete.d.ts index 77e4525a6a6ff1..385f7a8ecc0525 100644 --- a/packages/mui-material/src/Autocomplete/Autocomplete.d.ts +++ b/packages/mui-material/src/Autocomplete/Autocomplete.d.ts @@ -1,7 +1,7 @@ import * as React from 'react'; import { IconButtonProps, InternalStandardProps as StandardProps, Theme } from '@mui/material'; import { ChipProps, ChipTypeMap } from '@mui/material/Chip'; -import { PopperProps } from '@mui/core/Popper'; +import { PopperProps } from '@mui/material/Popper'; import { SxProps } from '@mui/system'; import { OverridableStringUnion } from '@mui/types'; import { diff --git a/packages/mui-material/src/Tooltip/Tooltip.d.ts b/packages/mui-material/src/Tooltip/Tooltip.d.ts index 31afe393af2266..2e35b25c762eaa 100644 --- a/packages/mui-material/src/Tooltip/Tooltip.d.ts +++ b/packages/mui-material/src/Tooltip/Tooltip.d.ts @@ -1,8 +1,8 @@ -import { PopperProps } from '@mui/core/Popper'; -import { MUIStyledCommonProps, SxProps } from '@mui/system'; import * as React from 'react'; +import { MUIStyledCommonProps, SxProps } from '@mui/system'; import { InternalStandardProps as StandardProps, Theme } from '..'; import { TransitionProps } from '../transitions/transition'; +import { PopperProps } from '../Popper/Popper'; import { TooltipClasses } from './tooltipClasses'; export interface TooltipComponentsPropsOverrides {} From 50cdaafef1712a2c58ac8ca6af8e7b60f9019e42 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 13:31:15 -0700 Subject: [PATCH 04/17] [Popper]: Update Tooltip popper import --- packages/mui-material/src/Tooltip/Tooltip.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mui-material/src/Tooltip/Tooltip.d.ts b/packages/mui-material/src/Tooltip/Tooltip.d.ts index 2e35b25c762eaa..00506d30b6ae12 100644 --- a/packages/mui-material/src/Tooltip/Tooltip.d.ts +++ b/packages/mui-material/src/Tooltip/Tooltip.d.ts @@ -1,8 +1,8 @@ -import * as React from 'react'; +import { PopperProps } from '@mui/material/Popper'; import { MUIStyledCommonProps, SxProps } from '@mui/system'; +import * as React from 'react'; import { InternalStandardProps as StandardProps, Theme } from '..'; import { TransitionProps } from '../transitions/transition'; -import { PopperProps } from '../Popper/Popper'; import { TooltipClasses } from './tooltipClasses'; export interface TooltipComponentsPropsOverrides {} From 5a5ac5bf768d79c1530a26da89c3fecda1152552 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 13:33:52 -0700 Subject: [PATCH 05/17] [Popper]: Revert Popper import --- .../mui-material/test/integration/PopperChildrenLayout.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mui-material/test/integration/PopperChildrenLayout.test.js b/packages/mui-material/test/integration/PopperChildrenLayout.test.js index a0b964bfe62340..ffc58e4c813570 100644 --- a/packages/mui-material/test/integration/PopperChildrenLayout.test.js +++ b/packages/mui-material/test/integration/PopperChildrenLayout.test.js @@ -7,7 +7,7 @@ import Fade from '@mui/material/Fade'; import Grow from '@mui/material/Grow'; import Slide from '@mui/material/Slide'; import Zoom from '@mui/material/Zoom'; -import Popper from '@mui/core/Popper'; +import Popper from '@mui/material/Popper'; describe('', () => { let isSafari; From 00f92d3eb8a17ba30a73dd1950bbd310b9d7ae87 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 13:40:33 -0700 Subject: [PATCH 06/17] [Popper]: Run yarn prettier --- packages/mui-core/src/Popper/Popper.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/mui-core/src/Popper/Popper.js b/packages/mui-core/src/Popper/Popper.js index 9c9ae9bae69424..39d5d4914f93dc 100644 --- a/packages/mui-core/src/Popper/Popper.js +++ b/packages/mui-core/src/Popper/Popper.js @@ -1,5 +1,12 @@ import { useThemeWithoutDefault as useTheme } from '@mui/system'; -import { chainPropTypes, HTMLElementType, refType, unstable_ownerDocument as ownerDocument, unstable_useEnhancedEffect as useEnhancedEffect, unstable_useForkRef as useForkRef } from '@mui/utils'; +import { + chainPropTypes, + HTMLElementType, + refType, + unstable_ownerDocument as ownerDocument, + unstable_useEnhancedEffect as useEnhancedEffect, + unstable_useForkRef as useForkRef, +} from '@mui/utils'; import { createPopper } from '@popperjs/core'; import PropTypes from 'prop-types'; import * as React from 'react'; From 816b3703845f0bcf2f4bf0335a60dbed51043b4e Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 18:31:57 -0700 Subject: [PATCH 07/17] [Popper]: Update documentation to include Unstyled import --- docs/src/pages/components/popper/popper.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/src/pages/components/popper/popper.md b/docs/src/pages/components/popper/popper.md index 4675c323fddcc3..2b1e4378c41434 100644 --- a/docs/src/pages/components/popper/popper.md +++ b/docs/src/pages/components/popper/popper.md @@ -72,3 +72,13 @@ There is a 3rd party package [`material-ui-popup-state`](https://github.com/jcor state for you in most cases. {{"demo": "pages/components/popper/PopperPopupState.js"}} + +## Unstyled + +- 📦 [784 B gzipped](https://bundlephobia.com/result?p=@mui/core@latest) + +As the component does not have any styles, it also comes with the unstyled package. + +```js +import NoSsr from '@mui/core/Popper'; +``` From 37774e5535d982a9c89ed6ad70d4771d85560946 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 18:32:31 -0700 Subject: [PATCH 08/17] [Popper]: Remove unnecessary Popper import within core index.js --- packages/mui-core/src/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mui-core/src/index.js b/packages/mui-core/src/index.js index 10c2425c4b04ab..ddf693e6a45eef 100644 --- a/packages/mui-core/src/index.js +++ b/packages/mui-core/src/index.js @@ -24,7 +24,6 @@ export * from './ModalUnstyled'; export { default as NoSsr } from './NoSsr'; export { default as Popper } from './Popper'; -export * from './Popper'; export { default as Portal } from './Portal'; From 74189c1674cafbedab8cdac9706773bac668964f Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 18:40:05 -0700 Subject: [PATCH 09/17] [Popper]: Update documentation to display correct import name for Popper and remove inaccurate bundle size from Unstyled section. --- docs/src/pages/components/popper/popper.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/src/pages/components/popper/popper.md b/docs/src/pages/components/popper/popper.md index 2b1e4378c41434..bd2cfea0877afe 100644 --- a/docs/src/pages/components/popper/popper.md +++ b/docs/src/pages/components/popper/popper.md @@ -75,10 +75,8 @@ state for you in most cases. ## Unstyled -- 📦 [784 B gzipped](https://bundlephobia.com/result?p=@mui/core@latest) - As the component does not have any styles, it also comes with the unstyled package. ```js -import NoSsr from '@mui/core/Popper'; +import Popper from '@mui/core/Popper'; ``` From ecd82d9e6c60d5342060b71587be276d230d4891 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Fri, 8 Oct 2021 19:02:53 -0700 Subject: [PATCH 10/17] [Popper]: Fix Popper import within Tooltip --- packages/mui-material/src/Tooltip/Tooltip.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mui-material/src/Tooltip/Tooltip.d.ts b/packages/mui-material/src/Tooltip/Tooltip.d.ts index 00506d30b6ae12..31afe393af2266 100644 --- a/packages/mui-material/src/Tooltip/Tooltip.d.ts +++ b/packages/mui-material/src/Tooltip/Tooltip.d.ts @@ -1,4 +1,4 @@ -import { PopperProps } from '@mui/material/Popper'; +import { PopperProps } from '@mui/core/Popper'; import { MUIStyledCommonProps, SxProps } from '@mui/system'; import * as React from 'react'; import { InternalStandardProps as StandardProps, Theme } from '..'; From 70d6d73641dbad6c028bf5d3632ab8a9e995dea2 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Mon, 11 Oct 2021 07:51:51 -0700 Subject: [PATCH 11/17] [Popper]: Revert Popper export changes in material --- packages/mui-material/src/index.d.ts | 3 +++ packages/mui-material/src/index.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/mui-material/src/index.d.ts b/packages/mui-material/src/index.d.ts index fa73f0f4f4b2cc..2afba6018f9a02 100644 --- a/packages/mui-material/src/index.d.ts +++ b/packages/mui-material/src/index.d.ts @@ -322,6 +322,9 @@ export * from './Paper'; export { default as Popover } from './Popover'; export * from './Popover'; +export { default as Popper } from './Popper'; +export * from './Popper'; + export { default as Radio } from './Radio'; export * from './Radio'; diff --git a/packages/mui-material/src/index.js b/packages/mui-material/src/index.js index 4cf516da11f9ab..1196f18273e6fd 100644 --- a/packages/mui-material/src/index.js +++ b/packages/mui-material/src/index.js @@ -254,6 +254,9 @@ export * from './Paper'; export { default as Popover } from './Popover'; export * from './Popover'; +export { default as Popper } from './Popper'; +export * from './Popper'; + export { default as Radio } from './Radio'; export * from './Radio'; From f31787862b9ecd08cf63712ce2da7ff5b1700984 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Mon, 11 Oct 2021 08:01:21 -0700 Subject: [PATCH 12/17] [Popper] Update imports to follow the same format as other files --- packages/mui-material/src/Tooltip/Tooltip.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mui-material/src/Tooltip/Tooltip.d.ts b/packages/mui-material/src/Tooltip/Tooltip.d.ts index 31afe393af2266..5724b222750fd9 100644 --- a/packages/mui-material/src/Tooltip/Tooltip.d.ts +++ b/packages/mui-material/src/Tooltip/Tooltip.d.ts @@ -1,6 +1,6 @@ -import { PopperProps } from '@mui/core/Popper'; -import { MUIStyledCommonProps, SxProps } from '@mui/system'; import * as React from 'react'; +import { MUIStyledCommonProps, SxProps } from '@mui/system'; +import { PopperProps } from '@mui/core/Popper'; import { InternalStandardProps as StandardProps, Theme } from '..'; import { TransitionProps } from '../transitions/transition'; import { TooltipClasses } from './tooltipClasses'; From 0a4d05ddb031d54b414aa2c94d7200318a00263e Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Mon, 11 Oct 2021 10:10:05 -0700 Subject: [PATCH 13/17] [Popper]: Remove popper package from material --- packages/mui-material/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mui-material/package.json b/packages/mui-material/package.json index fc2efe751373ed..4bf7f0cd595bd9 100644 --- a/packages/mui-material/package.json +++ b/packages/mui-material/package.json @@ -64,7 +64,6 @@ "@mui/system": "^5.0.3", "@mui/types": "^7.0.0", "@mui/utils": "^5.0.1", - "@popperjs/core": "^2.4.4", "@types/react-transition-group": "^4.4.3", "clsx": "^1.1.1", "csstype": "^3.0.9", From 8ad39d28507432db1fadf91e0f99741706928705 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Mon, 11 Oct 2021 10:12:44 -0700 Subject: [PATCH 14/17] [Popper]: Add popperjs pkg to core --- packages/mui-core/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mui-core/package.json b/packages/mui-core/package.json index 38459b60f7d1ca..103af19d081fcf 100644 --- a/packages/mui-core/package.json +++ b/packages/mui-core/package.json @@ -50,6 +50,7 @@ "@babel/runtime": "^7.15.4", "@emotion/is-prop-valid": "^1.1.0", "@mui/utils": "^5.0.1", + "@popperjs/core": "^2.4.4", "clsx": "^1.1.1", "prop-types": "^15.7.2", "react-is": "^17.0.2" From e23ed5e90739c0058e16fa819670da63ce80828f Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Tue, 12 Oct 2021 09:11:08 -0700 Subject: [PATCH 15/17] [Popper]: Adjust Popper ThemeProvider import, Revert PickersPopper popper import --- packages/mui-core/src/Popper/Popper.test.js | 2 +- packages/mui-lab/src/internal/pickers/PickersPopper.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mui-core/src/Popper/Popper.test.js b/packages/mui-core/src/Popper/Popper.test.js index 53de0bd43574b3..90496e3f5da660 100644 --- a/packages/mui-core/src/Popper/Popper.test.js +++ b/packages/mui-core/src/Popper/Popper.test.js @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { useFakeTimers } from 'sinon'; import PropTypes from 'prop-types'; import { describeConformance, act, createClientRender, fireEvent, screen } from 'test/utils'; -import { ThemeProvider, createTheme } from '@mui/material/styles'; +import { ThemeProvider, createTheme } from '@mui/system'; import Grow from '@mui/material/Grow'; import Popper from '@mui/core/Popper'; diff --git a/packages/mui-lab/src/internal/pickers/PickersPopper.tsx b/packages/mui-lab/src/internal/pickers/PickersPopper.tsx index b47c33e62ffd86..b03e2f6ebff669 100644 --- a/packages/mui-lab/src/internal/pickers/PickersPopper.tsx +++ b/packages/mui-lab/src/internal/pickers/PickersPopper.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import Grow from '@mui/material/Grow'; import Paper, { PaperProps as MuiPaperProps } from '@mui/material/Paper'; -import Popper, { PopperProps as MuiPopperProps } from '@mui/core/Popper'; +import Popper, { PopperProps as MuiPopperProps } from '@mui/material/Popper'; import TrapFocus, { TrapFocusProps as MuiTrapFocusProps } from '@mui/material/Unstable_TrapFocus'; import { useForkRef, useEventCallback, ownerDocument } from '@mui/material/utils'; import { styled } from '@mui/material/styles'; From 3586940e2db86d049f4e3d1b463fc79299de6956 Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Tue, 12 Oct 2021 09:13:41 -0700 Subject: [PATCH 16/17] [Popper]: Update snapshot scripts webpack conditional for Popper testing --- scripts/sizeSnapshot/webpack.config.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/sizeSnapshot/webpack.config.js b/scripts/sizeSnapshot/webpack.config.js index 766b5d32a1de23..a21236b080062a 100644 --- a/scripts/sizeSnapshot/webpack.config.js +++ b/scripts/sizeSnapshot/webpack.config.js @@ -17,9 +17,7 @@ async function getWebpackEntries() { entryName = '@material-ui/core/Paper.esm'; } else if (componentName === 'TextareaAutosize') { entryName = '@material-ui/core/Textarea'; - } else if (['Popper'].indexOf(componentName) !== -1) { - entryName = `@material-ui/core/${componentName}`; - } + } return { id: entryName, @@ -32,9 +30,14 @@ async function getWebpackEntries() { const coreComponents = (await glob(path.join(corePackagePath, '([A-Z])*/index.js'))).map( (componentPath) => { const componentName = path.basename(path.dirname(componentPath)); + let entryName = componentName; + if (['Popper'].indexOf(componentName) !== -1) { + entryName = `@material-ui/core/${componentName}`; + } + return { - id: componentName, + id: entryName, path: path.relative(workspaceRoot, path.dirname(componentPath)), }; }, From 5278e11dfe419574531754dd5116c59404cc89cb Mon Sep 17 00:00:00 2001 From: rebeccahongsf Date: Tue, 12 Oct 2021 14:10:24 -0700 Subject: [PATCH 17/17] [Popper]: Fixup prettier issue with webpack --- scripts/sizeSnapshot/webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/sizeSnapshot/webpack.config.js b/scripts/sizeSnapshot/webpack.config.js index 13e125de33fd2f..f3d2a5ebe4e646 100644 --- a/scripts/sizeSnapshot/webpack.config.js +++ b/scripts/sizeSnapshot/webpack.config.js @@ -17,7 +17,7 @@ async function getWebpackEntries() { entryName = '@material-ui/core/Paper.esm'; } else if (componentName === 'TextareaAutosize') { entryName = '@material-ui/core/Textarea'; - } + } return { id: entryName, @@ -35,7 +35,7 @@ async function getWebpackEntries() { if (['Popper'].indexOf(componentName) !== -1) { entryName = `@material-ui/core/${componentName}`; } - + return { id: entryName, path: path.relative(workspaceRoot, path.dirname(componentPath)),