-
+
) : (
{isStepOptional(activeStep) && (
diff --git a/docs/src/pages/components/steppers/HorizontalLinearStepper.tsx b/docs/src/pages/components/steppers/HorizontalLinearStepper.tsx
index 8ffb2bb1094757..ec07781c2a5368 100644
--- a/docs/src/pages/components/steppers/HorizontalLinearStepper.tsx
+++ b/docs/src/pages/components/steppers/HorizontalLinearStepper.tsx
@@ -29,28 +29,25 @@ const useStyles = makeStyles((theme: Theme) =>
}),
);
-function getSteps() {
- return ['Select campaign settings', 'Create an ad group', 'Create an ad'];
-}
-
-function getStepContent(step: number) {
- switch (step) {
- case 0:
- return 'Select campaign settings...';
- case 1:
- return 'What is an ad group anyways?';
- case 2:
- return 'This is the bit I really care about!';
- default:
- return 'Unknown step';
- }
-}
+const steps = [
+ {
+ label: 'Select campaign settings',
+ description: 'Select campaign settings...',
+ },
+ {
+ tabel: 'Create an ad group',
+ description: 'What is an ad group anyway?',
+ },
+ {
+ label: 'Create an ad',
+ description: 'This is the bit I really care about!',
+ },
+];
export default function HorizontalLinearStepper() {
const classes = useStyles();
const [activeStep, setActiveStep] = React.useState(0);
const [skipped, setSkipped] = React.useState(new Set
-
+
) : (
{isStepOptional(activeStep) && (
diff --git a/docs/src/pages/components/steppers/HorizontalNonLinearAlternativeLabelStepper.js b/docs/src/pages/components/steppers/HorizontalNonLinearAlternativeLabelStepper.js
deleted file mode 100644
index a0bfc346e69cfa..00000000000000
--- a/docs/src/pages/components/steppers/HorizontalNonLinearAlternativeLabelStepper.js
+++ /dev/null
@@ -1,218 +0,0 @@
-import * as React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import Stepper from '@material-ui/core/Stepper';
-import Step from '@material-ui/core/Step';
-import StepButton from '@material-ui/core/StepButton';
-import Button from '@material-ui/core/Button';
-import Typography from '@material-ui/core/Typography';
-
-const useStyles = makeStyles((theme) => ({
- root: {
- width: '100%',
- },
- button: {
- marginRight: theme.spacing(1),
- },
- backButton: {
- marginRight: theme.spacing(1),
- },
- completed: {
- display: 'inline-block',
- },
- instructions: {
- marginTop: theme.spacing(1),
- marginBottom: theme.spacing(1),
- },
-}));
-
-function getSteps() {
- return ['Select campaign settings', 'Create an ad group', 'Create an ad'];
-}
-
-function getStepContent(step) {
- switch (step) {
- case 0:
- return 'Step 1: Select campaign settings...';
- case 1:
- return 'Step 2: What is an ad group anyways?';
- case 2:
- return 'Step 3: This is the bit I really care about!';
- default:
- return 'Unknown step';
- }
-}
-
-export default function HorizontalNonLinearAlternativeLabelStepper() {
- const classes = useStyles();
- const [activeStep, setActiveStep] = React.useState(0);
- const [completed, setCompleted] = React.useState(new Set());
- const [skipped, setSkipped] = React.useState(new Set());
- const steps = getSteps();
-
- const totalSteps = () => {
- return getSteps().length;
- };
-
- const isStepOptional = (step) => {
- return step === 1;
- };
-
- const handleSkip = () => {
- if (!isStepOptional(activeStep)) {
- // You probably want to guard against something like this
- // it should never occur unless someone's actively trying to break something.
- throw new Error("You can't skip a step that isn't optional.");
- }
-
- setActiveStep((prevActiveStep) => prevActiveStep + 1);
- setSkipped((prevSkipped) => {
- const newSkipped = new Set(prevSkipped.values());
- newSkipped.add(activeStep);
- return newSkipped;
- });
- };
-
- const skippedSteps = () => {
- return skipped.size;
- };
-
- const completedSteps = () => {
- return completed.size;
- };
-
- const allStepsCompleted = () => {
- return completedSteps() === totalSteps() - skippedSteps();
- };
-
- const isLastStep = () => {
- return activeStep === totalSteps() - 1;
- };
-
- const handleNext = () => {
- const newActiveStep =
- isLastStep() && !allStepsCompleted()
- ? // It's the last step, but not all steps have been completed
- // find the first step that has been completed
- steps.findIndex((step, i) => !completed.has(i))
- : activeStep + 1;
-
- setActiveStep(newActiveStep);
- };
-
- const handleBack = () => {
- setActiveStep((prevActiveStep) => prevActiveStep - 1);
- };
-
- const handleStep = (step) => () => {
- setActiveStep(step);
- };
-
- const handleComplete = () => {
- const newCompleted = new Set(completed);
- newCompleted.add(activeStep);
- setCompleted(newCompleted);
-
- /**
- * Sigh... it would be much nicer to replace the following if conditional with
- * `if (!this.allStepsComplete())` however state is not set when we do this,
- * thus we have to resort to not being very DRY.
- */
- if (completed.size !== totalSteps() - skippedSteps()) {
- handleNext();
- }
- };
-
- const handleReset = () => {
- setActiveStep(0);
- setCompleted(new Set());
- setSkipped(new Set());
- };
-
- const isStepSkipped = (step) => {
- return skipped.has(step);
- };
-
- function isStepComplete(step) {
- return completed.has(step);
- }
-
- return (
-
-
- {steps.map((label, index) => {
- const stepProps = {};
- const buttonProps = {};
- if (isStepOptional(index)) {
- buttonProps.optional = (
- Optional
- );
- }
- if (isStepSkipped(index)) {
- stepProps.completed = false;
- }
- return (
-
-
- {label}
-
-
- );
- })}
-
-
- );
-}
diff --git a/docs/src/pages/components/steppers/HorizontalNonLinearAlternativeLabelStepper.tsx b/docs/src/pages/components/steppers/HorizontalNonLinearAlternativeLabelStepper.tsx
deleted file mode 100644
index 25ffb9c40ca99e..00000000000000
--- a/docs/src/pages/components/steppers/HorizontalNonLinearAlternativeLabelStepper.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-import * as React from 'react';
-import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';
-import Stepper from '@material-ui/core/Stepper';
-import Step from '@material-ui/core/Step';
-import StepButton from '@material-ui/core/StepButton';
-import Button from '@material-ui/core/Button';
-import Typography from '@material-ui/core/Typography';
-
-const useStyles = makeStyles((theme: Theme) =>
- createStyles({
- root: {
- width: '100%',
- },
- button: {
- marginRight: theme.spacing(1),
- },
- backButton: {
- marginRight: theme.spacing(1),
- },
- completed: {
- display: 'inline-block',
- },
- instructions: {
- marginTop: theme.spacing(1),
- marginBottom: theme.spacing(1),
- },
- }),
-);
-
-function getSteps() {
- return ['Select campaign settings', 'Create an ad group', 'Create an ad'];
-}
-
-function getStepContent(step: number) {
- switch (step) {
- case 0:
- return 'Step 1: Select campaign settings...';
- case 1:
- return 'Step 2: What is an ad group anyways?';
- case 2:
- return 'Step 3: This is the bit I really care about!';
- default:
- return 'Unknown step';
- }
-}
-
-export default function HorizontalNonLinearAlternativeLabelStepper() {
- const classes = useStyles();
- const [activeStep, setActiveStep] = React.useState(0);
- const [completed, setCompleted] = React.useState(new Set
- {allStepsCompleted() ? (
-
-
-
- All steps completed - you're finished
-
-
-
- ) : (
-
-
- {getStepContent(activeStep)}
-
-
- )}
-
-
-
- {isStepOptional(activeStep) && !completed.has(activeStep) && (
-
- )}
-
- {activeStep !== steps.length &&
- (completed.has(activeStep) ? (
-
- Step {activeStep + 1} already completed
-
- ) : (
-
- ))}
-
-
-
- {steps.map((label, index) => {
- const stepProps: { completed?: boolean } = {};
- const buttonProps: {
- optional?: React.ReactNode;
- } = {};
- if (isStepOptional(index)) {
- buttonProps.optional = (
- Optional
- );
- }
- if (isStepSkipped(index)) {
- stepProps.completed = false;
- }
- return (
-
-
- {label}
-
-
- );
- })}
-
-
- );
-}
diff --git a/docs/src/pages/components/steppers/HorizontalNonLinearStepper.js b/docs/src/pages/components/steppers/HorizontalNonLinearStepper.js
index 233983f0362bc0..c0e6aa743ec279 100644
--- a/docs/src/pages/components/steppers/HorizontalNonLinearStepper.js
+++ b/docs/src/pages/components/steppers/HorizontalNonLinearStepper.js
@@ -10,40 +10,45 @@ const useStyles = makeStyles((theme) => ({
root: {
width: '100%',
},
+ buttonWrapper: {
+ display: 'flex',
+ flexDirection: 'row',
+ padding: '16px 0 0',
+ },
button: {
marginRight: theme.spacing(1),
},
+ spacer: {
+ flex: '1 1 auto',
+ },
completed: {
display: 'inline-block',
},
instructions: {
- marginTop: theme.spacing(1),
+ marginTop: theme.spacing(2),
marginBottom: theme.spacing(1),
},
}));
-function getSteps() {
- return ['Select campaign settings', 'Create an ad group', 'Create an ad'];
-}
-
-function getStepContent(step) {
- switch (step) {
- case 0:
- return 'Step 1: Select campaign settings...';
- case 1:
- return 'Step 2: What is an ad group anyways?';
- case 2:
- return 'Step 3: This is the bit I really care about!';
- default:
- return 'Unknown step';
- }
-}
+const steps = [
+ {
+ label: 'Select campaign settings',
+ description: 'Select campaign settings...',
+ },
+ {
+ tabel: 'Create an ad group',
+ description: 'What is an ad group anyway?',
+ },
+ {
+ label: 'Create an ad',
+ description: 'This is the bit I really care about!',
+ },
+];
export default function HorizontalNonLinearStepper() {
const classes = useStyles();
const [activeStep, setActiveStep] = React.useState(0);
const [completed, setCompleted] = React.useState({});
- const steps = getSteps();
const totalSteps = () => {
return steps.length;
@@ -94,38 +99,41 @@ export default function HorizontalNonLinearStepper() {
return (
- {allStepsCompleted() ? (
-
-
-
- All steps completed - you're finished
-
-
-
- ) : (
-
-
- {getStepContent(activeStep)}
-
-
- )}
-
-
-
- {isStepOptional(activeStep) && !completed.has(activeStep) && (
-
- )}
- {activeStep !== steps.length &&
- (completed.has(activeStep) ? (
-
- Step {activeStep + 1} already completed
-
- ) : (
-
- ))}
-
-
{allStepsCompleted() ? (
-
diff --git a/docs/src/pages/components/steppers/HorizontalNonLinearStepper.tsx b/docs/src/pages/components/steppers/HorizontalNonLinearStepper.tsx
index 74a01fe653657f..d9300fda43511f 100644
--- a/docs/src/pages/components/steppers/HorizontalNonLinearStepper.tsx
+++ b/docs/src/pages/components/steppers/HorizontalNonLinearStepper.tsx
@@ -11,35 +11,41 @@ const useStyles = makeStyles((theme: Theme) =>
root: {
width: '100%',
},
+ buttonWrapper: {
+ display: 'flex',
+ flexDirection: 'row',
+ padding: '16px 0 0',
+ },
button: {
marginRight: theme.spacing(1),
},
+ spacer: {
+ flex: '1 1 auto',
+ },
completed: {
display: 'inline-block',
},
instructions: {
- marginTop: theme.spacing(1),
+ marginTop: theme.spacing(2),
marginBottom: theme.spacing(1),
},
}),
);
-function getSteps() {
- return ['Select campaign settings', 'Create an ad group', 'Create an ad'];
-}
-
-function getStepContent(step: number) {
- switch (step) {
- case 0:
- return 'Step 1: Select campaign settings...';
- case 1:
- return 'Step 2: What is an ad group anyways?';
- case 2:
- return 'Step 3: This is the bit I really care about!';
- default:
- return 'Unknown step';
- }
-}
+const steps = [
+ {
+ label: 'Select campaign settings',
+ description: 'Select campaign settings...',
+ },
+ {
+ tabel: 'Create an ad group',
+ description: 'What is an ad group anyway?',
+ },
+ {
+ label: 'Create an ad',
+ description: 'This is the bit I really care about!',
+ },
+];
export default function HorizontalNonLinearStepper() {
const classes = useStyles();
@@ -47,7 +53,6 @@ export default function HorizontalNonLinearStepper() {
const [completed, setCompleted] = React.useState<{
[k: number]: boolean;
}>({});
- const steps = getSteps();
const totalSteps = () => {
return steps.length;
@@ -98,38 +103,41 @@ export default function HorizontalNonLinearStepper() {
return (
+
All steps completed - you're finished
-
-
+
+
+
+
+
) : (
-
+
- {getStepContent(activeStep)}
+ {steps[activeStep].description}
-
)}
+
+
-
-
{allStepsCompleted() ? (
-
diff --git a/docs/src/pages/components/steppers/HorizontalNonLinearStepperWithError.js b/docs/src/pages/components/steppers/HorizontalNonLinearStepperWithError.js
deleted file mode 100644
index d0b4018251dd8f..00000000000000
--- a/docs/src/pages/components/steppers/HorizontalNonLinearStepperWithError.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import * as React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import Stepper from '@material-ui/core/Stepper';
-import Step from '@material-ui/core/Step';
-import StepLabel from '@material-ui/core/StepLabel';
-import Button from '@material-ui/core/Button';
-import Typography from '@material-ui/core/Typography';
-
-const useStyles = makeStyles((theme) => ({
- root: {
- width: '100%',
- },
- button: {
- marginRight: theme.spacing(1),
- },
- instructions: {
- marginTop: theme.spacing(1),
- marginBottom: theme.spacing(1),
- },
-}));
-
-function getSteps() {
- return ['Select campaign settings', 'Create an ad group', 'Create an ad'];
-}
-
-function getStepContent(step) {
- switch (step) {
- case 0:
- return 'Select campaign settings...';
- case 1:
- return 'What is an ad group anyways?';
- case 2:
- return 'This is the bit I really care about!';
- default:
- return 'Unknown step';
- }
-}
-
-export default function HorizontalNonLinearStepperWithError() {
- const classes = useStyles();
- const [activeStep, setActiveStep] = React.useState(0);
- const [skipped, setSkipped] = React.useState(new Set());
- const steps = getSteps();
-
- const isStepOptional = (step) => {
- return step === 1;
- };
-
- const isStepFailed = (step) => {
- return step === 1;
- };
-
- const isStepSkipped = (step) => {
- return skipped.has(step);
- };
-
- const handleNext = () => {
- let newSkipped = skipped;
- if (isStepSkipped(activeStep)) {
- newSkipped = new Set(skipped.values());
- newSkipped.delete(activeStep);
- }
-
- setActiveStep((prevActiveStep) => prevActiveStep + 1);
- setSkipped(newSkipped);
- };
-
- const handleBack = () => {
- setActiveStep((prevActiveStep) => prevActiveStep - 1);
- };
-
- const handleSkip = () => {
- if (!isStepOptional(activeStep)) {
- // You probably want to guard against something like this,
- // it should never occur unless someone's actively trying to break something.
- throw new Error("You can't skip a step that isn't optional.");
- }
-
- setSkipped((prevSkipped) => {
- const newSkipped = new Set(prevSkipped.values());
- newSkipped.add(activeStep);
- return newSkipped;
- });
- setActiveStep((prevActiveStep) => prevActiveStep + 1);
- };
-
- const handleReset = () => {
- setActiveStep(0);
- };
-
- return (
-
+
All steps completed - you're finished
-
-
+
+
+
+
+
) : (
-
+
- {getStepContent(activeStep)}
+ {steps[activeStep].description}
-
)}
+
+
-
-
-
- {steps.map((label, index) => {
- const stepProps = {};
- const labelProps = {};
- if (isStepOptional(index)) {
- labelProps.optional = (
-
- Alert message
-
- );
- }
- if (isStepFailed(index)) {
- labelProps.error = true;
- }
- if (isStepSkipped(index)) {
- stepProps.completed = false;
- }
- return (
-
- {label}
-
- );
- })}
-
-
- );
-}
diff --git a/docs/src/pages/components/steppers/HorizontalNonLinearStepperWithError.tsx b/docs/src/pages/components/steppers/HorizontalNonLinearStepperWithError.tsx
deleted file mode 100644
index 76a8a90c9b20cc..00000000000000
--- a/docs/src/pages/components/steppers/HorizontalNonLinearStepperWithError.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import * as React from 'react';
-import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';
-import Stepper from '@material-ui/core/Stepper';
-import Step from '@material-ui/core/Step';
-import StepLabel from '@material-ui/core/StepLabel';
-import Button from '@material-ui/core/Button';
-import Typography from '@material-ui/core/Typography';
-
-const useStyles = makeStyles((theme: Theme) =>
- createStyles({
- root: {
- width: '100%',
- },
- button: {
- marginRight: theme.spacing(1),
- },
- instructions: {
- marginTop: theme.spacing(1),
- marginBottom: theme.spacing(1),
- },
- }),
-);
-
-function getSteps() {
- return ['Select campaign settings', 'Create an ad group', 'Create an ad'];
-}
-
-function getStepContent(step: number) {
- switch (step) {
- case 0:
- return 'Select campaign settings...';
- case 1:
- return 'What is an ad group anyways?';
- case 2:
- return 'This is the bit I really care about!';
- default:
- return 'Unknown step';
- }
-}
-
-export default function HorizontalNonLinearStepperWithError() {
- const classes = useStyles();
- const [activeStep, setActiveStep] = React.useState(0);
- const [skipped, setSkipped] = React.useState(new Set
- {activeStep === steps.length ? (
-
-
-
- All steps completed - you're finished
-
-
-
- ) : (
-
-
- {getStepContent(activeStep)}
-
-
- )}
-
-
- {isStepOptional(activeStep) && (
-
- )}
-
-
-
-
-
- {steps.map((label, index) => {
- const stepProps: { completed?: boolean } = {};
- const labelProps: {
- optional?: React.ReactNode;
- error?: boolean;
- } = {};
- if (isStepOptional(index)) {
- labelProps.optional = (
-
- Alert message
-
- );
- }
- if (isStepFailed(index)) {
- labelProps.error = true;
- }
- if (isStepSkipped(index)) {
- stepProps.completed = false;
- }
- return (
-
- {label}
-
- );
- })}
-
-
- );
-}
diff --git a/docs/src/pages/components/steppers/HorizontalStepperWithError.js b/docs/src/pages/components/steppers/HorizontalStepperWithError.js
new file mode 100644
index 00000000000000..2df16aa8edfbd2
--- /dev/null
+++ b/docs/src/pages/components/steppers/HorizontalStepperWithError.js
@@ -0,0 +1,71 @@
+import * as React from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import Stepper from '@material-ui/core/Stepper';
+import Step from '@material-ui/core/Step';
+import StepLabel from '@material-ui/core/StepLabel';
+import Typography from '@material-ui/core/Typography';
+
+const useStyles = makeStyles((theme) => ({
+ root: {
+ width: '100%',
+ },
+ buttonWrapper: {
+ display: 'flex',
+ flexDirection: 'row',
+ padding: '16px 0 0',
+ },
+ button: {
+ marginRight: theme.spacing(1),
+ },
+ spacer: {
+ flex: '1 1 auto',
+ },
+ instructions: {
+ marginTop: theme.spacing(2),
+ marginBottom: theme.spacing(1),
+ },
+}));
+
+const steps = [
+ 'Select campaign settings',
+ 'Create an ad group',
+ 'Create an ad',
+];
+
+export default function HorizontalStepperWithError() {
+ const classes = useStyles();
+
+ const isStepOptional = (step) => {
+ return step === 1;
+ };
+
+ const isStepFailed = (step) => {
+ return step === 1;
+ };
+
+ return (
+
- {activeStep === steps.length ? (
-
-
-
- All steps completed - you're finished
-
-
-
- ) : (
-
-
- {getStepContent(activeStep)}
-
-
- )}
-
-
- {isStepOptional(activeStep) && (
-
- )}
-
-
-
+
+ {steps.map((label, index) => {
+ const labelProps = {};
+ if (isStepOptional(index)) {
+ labelProps.optional = (
+
+ Alert message
+
+ );
+ }
+ if (isStepFailed(index)) {
+ labelProps.error = true;
+ }
+
+ return (
+
+ {label}
+
+ );
+ })}
+
+
+ );
+}
diff --git a/docs/src/pages/components/steppers/HorizontalStepperWithError.tsx b/docs/src/pages/components/steppers/HorizontalStepperWithError.tsx
new file mode 100644
index 00000000000000..5034f7fe3c790d
--- /dev/null
+++ b/docs/src/pages/components/steppers/HorizontalStepperWithError.tsx
@@ -0,0 +1,76 @@
+import * as React from 'react';
+import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';
+import Stepper from '@material-ui/core/Stepper';
+import Step from '@material-ui/core/Step';
+import StepLabel from '@material-ui/core/StepLabel';
+import Typography from '@material-ui/core/Typography';
+
+const useStyles = makeStyles((theme: Theme) =>
+ createStyles({
+ root: {
+ width: '100%',
+ },
+ buttonWrapper: {
+ display: 'flex',
+ flexDirection: 'row',
+ padding: '16px 0 0',
+ },
+ button: {
+ marginRight: theme.spacing(1),
+ },
+ spacer: {
+ flex: '1 1 auto',
+ },
+ instructions: {
+ marginTop: theme.spacing(2),
+ marginBottom: theme.spacing(1),
+ },
+ }),
+);
+
+const steps = [
+ 'Select campaign settings',
+ 'Create an ad group',
+ 'Create an ad',
+];
+
+export default function HorizontalStepperWithError() {
+ const classes = useStyles();
+
+ const isStepOptional = (step: number) => {
+ return step === 1;
+ };
+
+ const isStepFailed = (step: number) => {
+ return step === 1;
+ };
+
+ return (
+
+
+ {steps.map((label, index) => {
+ const labelProps: {
+ optional?: React.ReactNode;
+ error?: boolean;
+ } = {};
+ if (isStepOptional(index)) {
+ labelProps.optional = (
+
+ Alert message
+
+ );
+ }
+ if (isStepFailed(index)) {
+ labelProps.error = true;
+ }
+
+ return (
+
+ {label}
+
+ );
+ })}
+
+
+ );
+}
diff --git a/docs/src/pages/components/steppers/SwipeableTextMobileStepper.js b/docs/src/pages/components/steppers/SwipeableTextMobileStepper.js
index a37a51f878bfb4..b20bf9ce0750ac 100644
--- a/docs/src/pages/components/steppers/SwipeableTextMobileStepper.js
+++ b/docs/src/pages/components/steppers/SwipeableTextMobileStepper.js
@@ -11,7 +11,7 @@ import { autoPlay } from 'react-swipeable-views-utils';
const AutoPlaySwipeableViews = autoPlay(SwipeableViews);
-const tutorialSteps = [
+const images = [
{
label: 'San Francisco – Oakland Bay Bridge, United States',
imgPath:
@@ -27,11 +27,6 @@ const tutorialSteps = [
imgPath:
'https://images.unsplash.com/photo-1537996194471-e657df975ab4?auto=format&fit=crop&w=400&h=250&q=80',
},
- {
- label: 'NeONBRAND Digital Marketing, Las Vegas, United States',
- imgPath:
- 'https://images.unsplash.com/photo-1518732714860-b62714ce0c59?auto=format&fit=crop&w=400&h=250&q=60',
- },
{
label: 'Goč, Serbia',
imgPath:
@@ -48,7 +43,7 @@ const useStyles = makeStyles((theme) => ({
display: 'flex',
alignItems: 'center',
height: 50,
- paddingLeft: theme.spacing(4),
+ paddingLeft: theme.spacing(2),
backgroundColor: theme.palette.background.default,
},
img: {
@@ -64,7 +59,7 @@ function SwipeableTextMobileStepper() {
const classes = useStyles();
const theme = useTheme();
const [activeStep, setActiveStep] = React.useState(0);
- const maxSteps = tutorialSteps.length;
+ const maxSteps = images.length;
const handleNext = () => {
setActiveStep((prevActiveStep) => prevActiveStep + 1);
@@ -81,7 +76,7 @@ function SwipeableTextMobileStepper() {
return (
{Math.abs(activeStep - index) <= 2 ? (
![]()
({
display: 'flex',
alignItems: 'center',
height: 50,
- paddingLeft: theme.spacing(4),
+ paddingLeft: theme.spacing(2),
backgroundColor: theme.palette.background.default,
},
img: {
@@ -64,7 +59,7 @@ function SwipeableTextMobileStepper() {
const classes = useStyles();
const theme = useTheme();
const [activeStep, setActiveStep] = React.useState(0);
- const maxSteps = tutorialSteps.length;
+ const maxSteps = images.length;
const handleNext = () => {
setActiveStep((prevActiveStep) => prevActiveStep + 1);
@@ -81,7 +76,7 @@ function SwipeableTextMobileStepper() {
return (
- {tutorialSteps[activeStep].label}
+ {images[activeStep].label}
- {tutorialSteps.map((step, index) => (
+ {images.map((step, index) => (
{Math.abs(activeStep - index) <= 2 ? (
![]()
({
root: {
maxWidth: 400,
@@ -44,23 +16,43 @@ const useStyles = makeStyles((theme) => ({
display: 'flex',
alignItems: 'center',
height: 50,
- paddingLeft: theme.spacing(4),
+ paddingLeft: theme.spacing(2),
backgroundColor: theme.palette.background.default,
},
- img: {
+ stepContent: {
height: 255,
maxWidth: 400,
- overflow: 'hidden',
- display: 'block',
width: '100%',
+ padding: theme.spacing(2),
},
}));
+const steps = [
+ {
+ label: 'Select campaign settings',
+ description: `For each ad campaign that you create, you can control how much
+ you're willing to spend on clicks and conversions, which networks
+ and geographical locations you want your ads to show on, and more.`,
+ },
+ {
+ tabel: 'Create an ad group',
+ description:
+ 'An ad group contains one or more ads which target a shared set of keywords.',
+ },
+ {
+ label: 'Create an ad',
+ description: `Try out different ad text to see what brings in the most customers,
+ and learn how to enhance your ads using features like ad extensions.
+ If you run into any problems with your ads, find out how to tell if
+ they're running and how to resolve approval issues.`,
+ },
+];
+
export default function TextMobileStepper() {
const classes = useStyles();
const theme = useTheme();
const [activeStep, setActiveStep] = React.useState(0);
- const maxSteps = tutorialSteps.length;
+ const maxSteps = steps.length;
const handleNext = () => {
setActiveStep((prevActiveStep) => prevActiveStep + 1);
@@ -73,17 +65,12 @@ export default function TextMobileStepper() {
return (
- {tutorialSteps[activeStep].label}
+ {steps[activeStep].label}
- ![{tutorialSteps[activeStep].label}]({tutorialSteps[activeStep].imgPath})
+
createStyles({
root: {
@@ -50,24 +22,44 @@ const useStyles = makeStyles((theme: Theme) =>
display: 'flex',
alignItems: 'center',
height: 50,
- paddingLeft: theme.spacing(4),
+ paddingLeft: theme.spacing(2),
backgroundColor: theme.palette.background.default,
},
- img: {
+ stepContent: {
height: 255,
maxWidth: 400,
- overflow: 'hidden',
- display: 'block',
width: '100%',
+ padding: theme.spacing(2),
},
}),
);
+const steps = [
+ {
+ label: 'Select campaign settings',
+ description: `For each ad campaign that you create, you can control how much
+ you're willing to spend on clicks and conversions, which networks
+ and geographical locations you want your ads to show on, and more.`,
+ },
+ {
+ tabel: 'Create an ad group',
+ description:
+ 'An ad group contains one or more ads which target a shared set of keywords.',
+ },
+ {
+ label: 'Create an ad',
+ description: `Try out different ad text to see what brings in the most customers,
+ and learn how to enhance your ads using features like ad extensions.
+ If you run into any problems with your ads, find out how to tell if
+ they're running and how to resolve approval issues.`,
+ },
+];
+
export default function TextMobileStepper() {
const classes = useStyles();
const theme = useTheme();
const [activeStep, setActiveStep] = React.useState(0);
- const maxSteps = tutorialSteps.length;
+ const maxSteps = steps.length;
const handleNext = () => {
setActiveStep((prevActiveStep) => prevActiveStep + 1);
@@ -80,17 +72,12 @@ export default function TextMobileStepper() {
return (
- {tutorialSteps[activeStep].label}
+ {steps[activeStep].label}
-
+ ({
root: {
- width: '100%',
+ maxWidth: 400,
},
button: {
marginTop: theme.spacing(1),
@@ -24,32 +24,30 @@ const useStyles = makeStyles((theme) => ({
},
}));
-function getSteps() {
- return ['Select campaign settings', 'Create an ad group', 'Create an ad'];
-}
-
-function getStepContent(step) {
- switch (step) {
- case 0:
- return `For each ad campaign that you create, you can control how much
+const steps = [
+ {
+ label: 'Select campaign settings',
+ description: `For each ad campaign that you create, you can control how much
you're willing to spend on clicks and conversions, which networks
- and geographical locations you want your ads to show on, and more.`;
- case 1:
- return 'An ad group contains one or more ads which target a shared set of keywords.';
- case 2:
- return `Try out different ad text to see what brings in the most customers,
+ and geographical locations you want your ads to show on, and more.`,
+ },
+ {
+ label: 'Create an ad group',
+ description:
+ 'An ad group contains one or more ads which target a shared set of keywords.',
+ },
+ {
+ label: 'Create an ad',
+ description: `Try out different ad text to see what brings in the most customers,
and learn how to enhance your ads using features like ad extensions.
If you run into any problems with your ads, find out how to tell if
- they're running and how to resolve approval issues.`;
- default:
- return 'Unknown step';
- }
-}
+ they're running and how to resolve approval issues.`,
+ },
+];
export default function VerticalLinearStepper() {
const classes = useStyles();
const [activeStep, setActiveStep] = React.useState(0);
- const steps = getSteps();
const handleNext = () => {
setActiveStep((prevActiveStep) => prevActiveStep + 1);
@@ -66,8 +64,8 @@ export default function VerticalLinearStepper() {
return (
- {steps.map((label, index) => (
-
+ {steps.map((step, index) => (
+
- {label}
+ {step.label}
- {getStepContent(index)}
+ {step.description}
diff --git a/docs/src/pages/components/steppers/VerticalLinearStepper.tsx b/docs/src/pages/components/steppers/VerticalLinearStepper.tsx
index 897bf7c7b26845..7f3a391a778e7b 100644
--- a/docs/src/pages/components/steppers/VerticalLinearStepper.tsx
+++ b/docs/src/pages/components/steppers/VerticalLinearStepper.tsx
@@ -11,7 +11,7 @@ import Typography from '@material-ui/core/Typography';
const useStyles = makeStyles((theme: Theme) =>
createStyles({
root: {
- width: '100%',
+ maxWidth: 400,
},
button: {
marginTop: theme.spacing(1),
@@ -26,32 +26,30 @@ const useStyles = makeStyles((theme: Theme) =>
}),
);
-function getSteps() {
- return ['Select campaign settings', 'Create an ad group', 'Create an ad'];
-}
-
-function getStepContent(step: number) {
- switch (step) {
- case 0:
- return `For each ad campaign that you create, you can control how much
+const steps = [
+ {
+ label: 'Select campaign settings',
+ description: `For each ad campaign that you create, you can control how much
you're willing to spend on clicks and conversions, which networks
- and geographical locations you want your ads to show on, and more.`;
- case 1:
- return 'An ad group contains one or more ads which target a shared set of keywords.';
- case 2:
- return `Try out different ad text to see what brings in the most customers,
+ and geographical locations you want your ads to show on, and more.`,
+ },
+ {
+ label: 'Create an ad group',
+ description:
+ 'An ad group contains one or more ads which target a shared set of keywords.',
+ },
+ {
+ label: 'Create an ad',
+ description: `Try out different ad text to see what brings in the most customers,
and learn how to enhance your ads using features like ad extensions.
If you run into any problems with your ads, find out how to tell if
- they're running and how to resolve approval issues.`;
- default:
- return 'Unknown step';
- }
-}
+ they're running and how to resolve approval issues.`,
+ },
+];
export default function VerticalLinearStepper() {
const classes = useStyles();
const [activeStep, setActiveStep] = React.useState(0);
- const steps = getSteps();
const handleNext = () => {
setActiveStep((prevActiveStep) => prevActiveStep + 1);
@@ -68,8 +66,8 @@ export default function VerticalLinearStepper() {
return (
- {steps.map((label, index) => (
-
+ {steps.map((step, index) => (
+
- {label}
+ {step.label}
- {getStepContent(index)}
+ {step.description}
diff --git a/docs/src/pages/components/steppers/steppers.md b/docs/src/pages/components/steppers/steppers.md
index a76df96774c9a1..54fea3edf91b5d 100644
--- a/docs/src/pages/components/steppers/steppers.md
+++ b/docs/src/pages/components/steppers/steppers.md
@@ -19,32 +19,25 @@ Steppers may display a transient feedback message after a step is saved.
> **Note:** Steppers are no longer documented in the [Material Design guidelines](https://material.io/), but Material-UI will continue to support them.
-## Horizontal Stepper
+## Horizontal stepper
+
+Horizontal steppers are ideal when the contents of one step depend on an earlier step.
+
+Avoid using long step names in horizontal steppers.
### Linear
+A linear stepper allows the user to complete the steps in sequence.
+
The `Stepper` can be controlled by passing the current step index (zero-based) as the `activeStep` prop. `Stepper` orientation is set using the `orientation` prop.
This example also shows the use of an optional step by placing the `optional` prop on the second `Step` component. Note that it's up to you to manage when an optional step is skipped. Once you've determined this for a particular step you must set `completed={false}` to signify that even though the active step index has gone beyond the optional step, it's not actually complete.
{{"demo": "pages/components/steppers/HorizontalLinearStepper.js"}}
-### Linear - Alternative Label
-
-Labels can be placed below the step icon by setting the `alternativeLabel` prop on the `Stepper` component.
-
-{{"demo": "pages/components/steppers/HorizontalLinearAlternativeLabelStepper.js"}}
-
-### Customized Stepper
-
-Here is an example of customizing the component. You can learn more about this in the
-[overrides documentation page](/customization/components/).
-
-{{"demo": "pages/components/steppers/CustomizedSteppers.js"}}
-
### Non-linear
-Non-linear steppers allow users to enter a multi-step flow at any point.
+Non-linear steppers allow the user to enter a multi-step flow at any point.
This example is similar to the regular horizontal stepper, except steps are no longer automatically set to `disabled={true}` based on the `activeStep` prop.
@@ -54,41 +47,51 @@ determine when all steps are completed (or even if they need to be completed).
{{"demo": "pages/components/steppers/HorizontalNonLinearStepper.js"}}
-### Non-linear - Alternative Label
+### Alternative Label
Labels can be placed below the step icon by setting the `alternativeLabel` prop on the `Stepper` component.
-{{"demo": "pages/components/steppers/HorizontalNonLinearAlternativeLabelStepper.js"}}
+{{"demo": "pages/components/steppers/HorizontalLinearAlternativeLabelStepper.js"}}
+
+### Error step
-### Non-linear - Error Step
+{{"demo": "pages/components/steppers/HorizontalStepperWithError.js"}}
-{{"demo": "pages/components/steppers/HorizontalNonLinearStepperWithError.js"}}
+### Customized horizontal stepper
-## Vertical Stepper
+Here is an example of customizing the component. You can learn more about this in the
+[overrides documentation page](/customization/components/).
+
+{{"demo": "pages/components/steppers/CustomizedSteppers.js"}}
+
+## Vertical stepper
+
+Vertical steppers are designed for narrow screen sizes. They are ideal for mobile. All the features of the horizontal stepper can be implemented.
{{"demo": "pages/components/steppers/VerticalLinearStepper.js"}}
-## Mobile Stepper
+## Mobile stepper
+
+This component implements a compact stepper suitable for a mobile device. IT has more limited functionality than the vertical stepper. See [mobile steps](https://material.io/archive/guidelines/components/steppers.html#steppers-types-of-steps) for its inspiration.
-This component implements a compact stepper suitable for a mobile device. See [mobile steps](https://material.io/archive/guidelines/components/steppers.html#steppers-types-of-steps) for its inspiration.
+The mobile stepper supports three variants to display progress through the available steps: text, dots, and progress.
### Text
-This is essentially a back/next button positioned correctly.
-You must implement the textual description yourself, however, an example is provided below for reference.
+The current step and total number of steps are displayed as text.
{{"demo": "pages/components/steppers/TextMobileStepper.js", "bg": true}}
-### Text with Carousel effect
+### Text with carousel effect
-This demo is very similar to the previous, the difference is the usage of
-[react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views) to make the transition of steps.
+This demo uses
+[react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views) to create a carousel.
{{"demo": "pages/components/steppers/SwipeableTextMobileStepper.js", "bg": true}}
### Dots
-Use dots when the number of steps isn’t large.
+Use dots when the number of steps is small.
{{"demo": "pages/components/steppers/DotsMobileStepper.js", "bg": true}}
{steps[activeStep].description}
{steps[activeStep].description}