scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-26 00:58:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Guard calls to componentDidMount with a check for existence.

Browse source 
Fix tag on username step.
This commit is contained in:
picklesrus 2019-11-05 18:17:37 -05:00
parent 30967a3056
commit c77db39062
7 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/join-flow/birthdate-step.jsx
View file

@ -55,8 +55,10 @@ class BirthDateStep extends React.Component {
]);
}
componentDidMount () {
if (this.props.sendAnalytics) {
this.props.sendAnalytics('join-birthdate');
}
}
validateSelect (selection) {
if (selection === 'null') {

2
src/components/join-flow/country-step.jsx
View file

@ -23,7 +23,9 @@ class CountryStep extends React.Component {
this.countryOptions = [];
}
componentDidMount () {
if (this.props.sendAnalytics) {
this.props.sendAnalytics('join-country');
}
this.setCountryOptions();
}
setCountryOptions () {

2
src/components/join-flow/email-step.jsx
View file

@ -35,7 +35,9 @@ class EmailStep extends React.Component {
this.emailRemoteCache = {};
}
componentDidMount () {
if (this.props.sendAnalytics) {
this.props.sendAnalytics('join-email');
}
// automatically start with focus on username field
if (this.emailInput) this.emailInput.focus();

2
src/components/join-flow/gender-step.jsx
View file

@ -62,8 +62,10 @@ class GenderStep extends React.Component {
]);
}
componentDidMount () {
if (this.props.sendAnalytics) {
this.props.sendAnalytics('join-gender');
}
}
handleSetCustomRef (customInputRef) {
this.customInput = customInputRef;
}

2
src/components/join-flow/registration-error-step.jsx
View file

@ -16,8 +16,10 @@ class RegistrationErrorStep extends React.Component {
]);
}
componentDidMount () {
if (this.props.sendAnalytics) {
this.props.sendAnalytics('join-error');
}
}
handleSubmit (e) {
// JoinFlowStep includes a <form> that handles a submit action.
// But here, we're not really submitting, so we need to prevent

4
src/components/join-flow/username-step.jsx
View file

@ -40,7 +40,9 @@ class UsernameStep extends React.Component {
// Send info to analytics when we aren't on the standalone page.
// If we are on the standalone join page, the page load will take care of this.
if (!window.location.pathname.includes('/join')) {
this.props.sendAnalytics('join-email');
if (this.props.sendAnalytics) {
this.props.sendAnalytics('join-username-modal');
}
}
// automatically start with focus on username field

2
test/unit/components/username-step.test.jsx
View file

@ -80,7 +80,7 @@ describe('UsernameStep test', () => {
<UsernameStep
sendAnalytics={sendAnalyticsFn}
/>);
expect(sendAnalyticsFn).toHaveBeenCalledWith('join-email');
expect(sendAnalyticsFn).toHaveBeenCalledWith('join-username-modal');
});
test('handleValidSubmit passes formData to next step', () => {