Skip to content

"[WV-1044] Replaced 'import Dialog from '@mui/material'' with 'import Dialog from '@base-ui-components/react/dialog'', to align with the recent introduction of Base UI." #4533

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

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

"[WV-1044] Replaced 'import Dialog from '@mui/material'' with 'import Dialog from '@base-ui-components/react/dialog'', to align with the recent introduction of Base UI." #4533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf904c1
"[WV-1044] Replaced 'import Dialog from '@mui/material'' with 'import…
Sep 12, 2025
5e598ce
Tried resolving merge conflicts.
Sep 19, 2025
20b120f
Removed package-lock.json from WV-1044.
Sep 23, 2025
549498a
Removed package.json, package-lock.json, SignInModalOriginal.jsx, and…
Sep 23, 2025
7307309
Adding back ModalDisplayTemplateA.jsx after modifying Dialog import.
Sep 23, 2025
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
3 changes: 2 additions & 1 deletion src/js/common/components/Challenge/YourRankModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, DialogTitle, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, DialogTitle, IconButton } from '@mui/material';
import { withStyles } from '@mui/styles';
import PropTypes from 'prop-types';
import React from 'react';
Expand Down
3 changes: 2 additions & 1 deletion src/js/common/components/Settings/CompleteYourProfileModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, DialogTitle, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, DialogTitle, IconButton } from '@mui/material';
import styled from 'styled-components';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
Expand Down
3 changes: 2 additions & 1 deletion src/js/common/components/Settings/SettingsVerifySecretCode.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ArrowBack, ArrowBackIos } from '@mui/icons-material';
import { Button, Dialog, OutlinedInput } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { Button, OutlinedInput } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import clsx from 'clsx';
Expand Down
3 changes: 2 additions & 1 deletion src/js/common/components/SignIn/SignInModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, DialogTitle, IconButton, Typography } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, DialogTitle, IconButton, Typography } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import PropTypes from 'prop-types';
import React, { Component, Suspense } from 'react';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Activity/ActivityPostPublicToggle.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, DialogTitle, FormControl, FormControlLabel, IconButton, Radio, Typography } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, DialogTitle, FormControl, FormControlLabel, IconButton, Radio, Typography } from '@mui/material';
import styled from 'styled-components';
import withStyles from '@mui/styles/withStyles';
import PropTypes from 'prop-types';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Ballot/SelectBallotModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Button, Dialog, DialogContent, DialogTitle, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { Button, DialogContent, DialogTitle, IconButton } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/CompleteYourProfile/AdviserIntroModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, IconButton } from '@mui/material';
import styled from 'styled-components';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/CompleteYourProfile/FirstPositionIntroModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Button, Dialog, DialogContent, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { Button, DialogContent, IconButton } from '@mui/material';
import styled from 'styled-components';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/CompleteYourProfile/HowItWorksModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, IconButton } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/CompleteYourProfile/PersonalizedScoreIntroModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, IconButton } from '@mui/material';
import styled from 'styled-components';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/CompleteYourProfile/ValuesIntroModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Button, Dialog, DialogContent, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { Button, DialogContent, IconButton } from '@mui/material';
import styled from 'styled-components';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/FriendIntro/FAQModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Dialog, DialogContent, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, IconButton } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import { Close } from '@mui/icons-material';
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Friends/AskFriendsModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog } from '@base-ui-components/react/dialog';
import {
Dialog,
DialogContent,
IconButton,
} from '@mui/material';
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Navigation/HeaderBarModals.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Dialog } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import withStyles from '@mui/styles/withStyles';
import PropTypes from 'prop-types';
import React, { Component, Suspense } from 'react';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Ready/VoterPlanModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Button, Dialog, DialogContent, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { Button, DialogContent, IconButton } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/SetUpAccount/AlertDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import Button from '@mui/material/Button';
import Dialog from '@mui/material/Dialog';
import { Dialog } from '@base-ui-components/react/dialog';
import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogContentText from '@mui/material/DialogContentText';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Settings/ImageUploadModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, IconButton } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Settings/PaidAccountUpgradeModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ArrowBack, ArrowBackIos, Close } from '@mui/icons-material';
import { Button, Dialog, DialogContent, FormControl, FormControlLabel, IconButton, OutlinedInput, Radio, RadioGroup } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { Button, DialogContent, FormControl, FormControlLabel, IconButton, OutlinedInput, Radio, RadioGroup } from '@mui/material';
// TODO 5/11/21: import { Elements, StripeProvider } from 'react-stripe-elements';
import styled from 'styled-components';
import withStyles from '@mui/styles/withStyles';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Share/ShareModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ArrowBackIos, Close, People } from '@mui/icons-material';
import { Button, Dialog, DialogContent, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { Button, DialogContent, IconButton } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Share/SharedItemModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close, Info } from '@mui/icons-material';
import { Button, Dialog, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { Button, IconButton } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import clsx from 'clsx';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/VoterGuide/VoterGuideChooseElectionModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, DialogTitle, IconButton, Typography } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, DialogTitle, IconButton, Typography } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/VoterGuide/VoterGuideChooseElectionWithPositionsModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, DialogTitle, IconButton, Typography } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, DialogTitle, IconButton, Typography } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Widgets/DeviceDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Button, Dialog, DialogActions, DialogContent, DialogTitle, Table, TableBody, TableCell, TableHead, TableRow, TextField } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { Button, DialogActions, DialogContent, DialogTitle, Table, TableBody, TableCell, TableHead, TableRow, TextField } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Widgets/ModalDisplayTemplateA.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Close } from '@mui/icons-material';
import { Dialog, DialogContent, DialogTitle, Divider, IconButton } from '@mui/material';
import { Dialog } from '@base-ui-components/react/dialog';
import { DialogContent, DialogTitle, Divider, IconButton } from '@mui/material';
import withStyles from '@mui/styles/withStyles';
import withTheme from '@mui/styles/withTheme';
import PropTypes from 'prop-types';
Expand Down
Loading