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

Jump to bottom

refactor: [M3-6306] - MUI v5 Migration SRC > Components > CopyableTextField #9018

Merged
merged 9 commits into from
Apr 27, 2023
Merged

refactor: [M3-6306] - MUI v5 Migration SRC > Components > CopyableTextField #9018

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de23e46
refactor: [M3-6306] - SRC > Components > CopyableTextField
cpathipa Apr 17, 2023
ef0685e
Merge remote-tracking branch 'origin/develop' into M3-6306
cpathipa Apr 21, 2023
40d0da3
PR feedback
cpathipa Apr 21, 2023
dcdd04d
Merge remote-tracking branch 'origin/develop' into M3-6306
cpathipa Apr 26, 2023
17209d2
resolve specificity
cpathipa Apr 26, 2023
5745af8
Update styling
cpathipa Apr 26, 2023
79933eb
refactor styles using styled
cpathipa Apr 26, 2023
7ac88d8
Update CHANGELOG.md
cpathipa Apr 26, 2023
da1a21a
Merge remote-tracking branch 'origin/develop' into M3-6306
cpathipa Apr 26, 2023
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
10 changes: 4 additions & 6 deletions packages/manager/src/components/CopyableTextField/CopyableTextField.tsx
View file
Open in desktop
cpathipa marked this conversation as resolved.
Show resolved Hide resolved
cpathipa marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as React from 'react';
import CopyTooltip from 'src/components/CopyTooltip';
import { makeStyles } from '@mui/styles';
import { makeStyles } from 'tss-react/mui';
import { Theme } from '@mui/material/styles';
import TextField, { Props as TextFieldProps } from 'src/components/TextField';

const useStyles = makeStyles((theme: Theme) => ({
const useStyles = makeStyles()((theme: Theme) => ({
removeDisabledStyles: {
'& .MuiInput-input': {
cpathipa marked this conversation as resolved.
Show resolved Hide resolved
borderColor: theme.name === 'light' ? '#ccc' : '#222',
Expand Down Expand Up @@ -36,8 +36,8 @@ type Props = TextFieldProps & {

type CombinedProps = Props;

export const CopyableTextField: React.FC<CombinedProps> = (props) => {
const classes = useStyles();
export const CopyableTextField = (props: CombinedProps) => {
const { classes } = useStyles();
const { value, className, hideIcon, ...restProps } = props;

return (
Expand All @@ -55,5 +55,3 @@ export const CopyableTextField: React.FC<CombinedProps> = (props) => {
/>
);
};

export default CopyableTextField;
1 change: 0 additions & 1 deletion packages/manager/src/components/CopyableTextField/index.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...nager/src/features/EntityTransfers/EntityTransfersLanding/CreateTransferSuccessDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { DateTime } from 'luxon';
import { update } from 'ramda';
import * as React from 'react';
import Button from 'src/components/Button';
import CopyableTextField from 'src/components/CopyableTextField';
import { CopyableTextField } from 'src/components/CopyableTextField/CopyableTextField';
import { makeStyles } from '@mui/styles';
import { Theme } from '@mui/material/styles';
import ToolTip from 'src/components/core/Tooltip';
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/src/features/Profile/AuthenticationSettings/TwoFactor/QRCodeForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import QRCode from 'qrcode.react';
import { compose } from 'ramda';
import * as React from 'react';
import CopyableTextField from 'src/components/CopyableTextField';
import { CopyableTextField } from 'src/components/CopyableTextField/CopyableTextField';
import { createStyles, withStyles, WithStyles } from '@mui/styles';
import { Theme } from '@mui/material/styles';
import Typography from 'src/components/core/Typography';
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/src/features/Profile/Referrals/Referrals.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 Step1 from 'src/assets/referrals/step-1.svg';
import Step2 from 'src/assets/referrals/step-2.svg';
import Step3 from 'src/assets/referrals/step-3.svg';
import CopyableTextField from 'src/components/CopyableTextField';
import { CopyableTextField } from 'src/components/CopyableTextField/CopyableTextField';
import CircularProgress from 'src/components/core/CircularProgress';
import Paper from 'src/components/core/Paper';
import { makeStyles } from '@mui/styles';
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/src/features/Volumes/VolumeDrawer/ResizeVolumesInstruction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import ActionsPanel from 'src/components/ActionsPanel';
import Button from 'src/components/Button';
import CopyableTextField from 'src/components/CopyableTextField';
import { CopyableTextField } from 'src/components/CopyableTextField/CopyableTextField';
import { createStyles, withStyles, WithStyles } from '@mui/styles';
import { Theme } from '@mui/material/styles';
import Typography from 'src/components/core/Typography';
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/src/features/Volumes/VolumeDrawer/VolumeConfigForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import CopyableTextField from 'src/components/CopyableTextField';
import { CopyableTextField } from 'src/components/CopyableTextField/CopyableTextField';
import { createStyles, withStyles, WithStyles } from '@mui/styles';
import { Theme } from '@mui/material/styles';
import Typography from 'src/components/core/Typography';
Expand Down