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.

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

Revert "React: Remove uses of React.createClass in publicKeyCryptography" #17647

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 28 additions & 23 deletions apps/src/publicKeyCryptography/Alice.jsx
Expand Up @@ -17,55 +17,59 @@ import {
import {computePublicKey} from './cryptographyMath';
import {COLORS} from './style';

export default class Alice extends React.Component {
static propTypes = {
const Alice = React.createClass({
propTypes: {
disabled: PropTypes.bool,
setPublicModulus: PropTypes.func.isRequired,
setPublicKey: PropTypes.func.isRequired,
runModuloClock: PropTypes.func.isRequired
};
},

state = {
publicModulus: null,
privateKey: null,
publicNumber: null,
secretNumber: null
};
getInitialState() {
return {
publicModulus: null,
privateKey: null,
publicNumber: null,
secretNumber: null
};
},

startOver = () => this.setState(this.getInitialState());
startOver() {
this.setState(this.getInitialState());
},

setPublicModulus(publicModulus) {
this.setState({publicModulus});
this.setPrivateKey(null);
this.clearSecretNumber();
}
},

onPublicModulusChange = (publicModulus) => {
onPublicModulusChange(publicModulus) {
this.setPublicModulus(publicModulus);
this.props.setPublicModulus(publicModulus);
};
},

setPrivateKey(privateKey) {
this.setState({privateKey});
this.clearSecretNumber();
}
},

onPrivateKeyChange = (privateKey) => {
onPrivateKeyChange(privateKey) {
const {publicModulus} = this.state;
this.setPrivateKey(privateKey);
this.props.setPublicKey(this.getPublicKey({privateKey, publicModulus}));
};
},

setPublicNumber = (publicNumber) => {
setPublicNumber(publicNumber) {
this.setState({publicNumber});
this.clearSecretNumber();
};
},

getPublicKey({privateKey, publicModulus}) {
return privateKey && publicModulus ? computePublicKey(privateKey, publicModulus) : null;
}
},

computeSecretNumber = () => {
computeSecretNumber() {
const {runModuloClock} = this.props;
const {publicModulus, privateKey, publicNumber} = this.state;
if ([publicModulus, privateKey, publicNumber].every(Number.isInteger)) {
Expand All @@ -79,11 +83,11 @@ export default class Alice extends React.Component {
} else {
this.clearSecretNumber();
}
};
},

clearSecretNumber() {
this.setState({secretNumber: null});
}
},

render() {
const {disabled} = this.props;
Expand Down Expand Up @@ -156,4 +160,5 @@ export default class Alice extends React.Component {
</NumberedSteps>
</CharacterPanel>);
}
}
});
export default Alice;
50 changes: 27 additions & 23 deletions apps/src/publicKeyCryptography/Bob.jsx
Expand Up @@ -15,45 +15,49 @@ import {
} from './cryptographyFields';
import {COLORS} from './style';

export default class Bob extends React.Component {
static propTypes = {
const Bob = React.createClass({
propTypes: {
disabled: PropTypes.bool,
setPublicModulus: PropTypes.func.isRequired,
setPublicNumber: PropTypes.func.isRequired,
runModuloClock: PropTypes.func.isRequired
};
},

state = {
publicModulus: null,
publicKey: null,
secretNumber: null,
publicNumber: null
};
getInitialState() {
return {
publicModulus: null,
publicKey: null,
secretNumber: null,
publicNumber: null
};
},

startOver = () => this.setState(this.getInitialState());
startOver() {
this.setState(this.getInitialState());
},

setPublicModulus(publicModulus) {
this.setState({publicModulus});
this.setSecretNumber(null);
this.clearPublicNumber();
}
},

onPublicModulusChange = (publicModulus) => {
onPublicModulusChange(publicModulus) {
this.setPublicModulus(publicModulus);
this.props.setPublicModulus(publicModulus);
};
},

setPublicKey = (publicKey) => {
setPublicKey(publicKey) {
this.setState({publicKey});
this.clearPublicNumber();
};
},

setSecretNumber = (secretNumber) => {
setSecretNumber(secretNumber) {
this.setState({secretNumber});
this.clearPublicNumber();
};
},

computePublicNumber = () => {
computePublicNumber() {
const {runModuloClock} = this.props;
const {publicKey, secretNumber, publicModulus} = this.state;
if ([publicKey, secretNumber, publicModulus].every(Number.isInteger)) {
Expand All @@ -68,11 +72,11 @@ export default class Bob extends React.Component {
} else {
this.clearPublicNumber();
}
};
},

clearPublicNumber() {
this.setState({publicNumber: null});
}
},

render() {
const {disabled} = this.props;
Expand Down Expand Up @@ -136,7 +140,7 @@ export default class Bob extends React.Component {
</div>
</Step>
</NumberedSteps>
</CharacterPanel>
);
</CharacterPanel>);
}
}
});
export default Bob;
18 changes: 11 additions & 7 deletions apps/src/publicKeyCryptography/EqualColumns.jsx
Expand Up @@ -3,14 +3,18 @@ import React, {PropTypes} from 'react';
import Radium from 'radium';
import {AnyChildren} from './types';

export default Radium(class EqualColumns extends React.Component {
static propTypes = {
const EqualColumns = Radium(React.createClass({
propTypes: {
// Space between columns, in pixels
intercolumnarDistance: PropTypes.number,
children: AnyChildren
};
},

static defaultProps = {intercolumnarDistance: 0};
getDefaultProps() {
return {
intercolumnarDistance: 0
};
},

render() {
const {children, intercolumnarDistance} = this.props;
Expand All @@ -34,7 +38,7 @@ export default Radium(class EqualColumns extends React.Component {
</div>);
})}
<div style={{clear:'both'}}/>
</div>
);
</div>);
}
});
}));
export default EqualColumns;
62 changes: 33 additions & 29 deletions apps/src/publicKeyCryptography/Eve.jsx
Expand Up @@ -26,41 +26,45 @@ const tdEquationStyleLHS = Object.assign({}, tdEquationStyleRHS, {
whiteSpace: 'nowrap'
});

export default class Eve extends React.Component {
static propTypes = {
const Eve = React.createClass({
propTypes: {
disabled: PropTypes.bool,
setPublicModulus: PropTypes.func.isRequired,
runModuloClock: PropTypes.func.isRequired
};
},

state = {
publicModulus: null,
publicKey: null,
privateKey: null,
publicNumber: null,
secretNumber: null,
checkingPrivateKey: false,
privateKeyEquationResult: null,
checkingSecretNumber: false,
secretNumberEquationResult: null
};
getInitialState() {
return {
publicModulus: null,
publicKey: null,
privateKey: null,
publicNumber: null,
secretNumber: null,
checkingPrivateKey: false,
privateKeyEquationResult: null,
checkingSecretNumber: false,
secretNumberEquationResult: null
};
},

startOver = () => this.setState(this.getInitialState());
startOver() {
this.setState(this.getInitialState());
},

setPublicModulus(publicModulus) {
this.setState({publicModulus});
}
},

onPublicModulusChange = (publicModulus) => {
onPublicModulusChange(publicModulus) {
this.setPublicModulus(publicModulus);
this.props.setPublicModulus(publicModulus);
};
},

setPublicKey = (publicKey) => {
setPublicKey(publicKey) {
this.setState({publicKey});
};
},

setPrivateKey = (privateKey) => {
setPrivateKey(privateKey) {
const {runModuloClock} = this.props;
const {publicKey, publicModulus} = this.state;
this.setState({privateKey});
Expand All @@ -81,13 +85,13 @@ export default class Eve extends React.Component {
} else {
this.setState({privateKey: null, privateKeyEquationResult: null});
}
};
},

setPublicNumber = (publicNumber) => {
setPublicNumber(publicNumber) {
this.setState({publicNumber});
};
},

setSecretNumber = (secretNumber) => {
setSecretNumber(secretNumber) {
this.setState({secretNumber});
const {runModuloClock} = this.props;
const {publicKey, publicModulus} = this.state;
Expand All @@ -109,7 +113,7 @@ export default class Eve extends React.Component {
} else {
this.setState({secretNumber: null, secretNumberEquationResult: null});
}
};
},

render() {
const {disabled} = this.props;
Expand Down Expand Up @@ -224,7 +228,7 @@ export default class Eve extends React.Component {
</table>
</Step>
</NumberedSteps>
</CharacterPanel>
);
</CharacterPanel>);
}
}
});
export default Eve;
16 changes: 9 additions & 7 deletions apps/src/publicKeyCryptography/IntegerDropdown.jsx
Expand Up @@ -7,17 +7,19 @@ import 'react-virtualized/styles.css';
import 'react-select/dist/react-select.css';
import 'react-virtualized-select/styles.css';

export default class IntegerDropdown extends React.Component {
static propTypes = {
const IntegerDropdown = React.createClass({
propTypes: {
className: PropTypes.string,
value: PropTypes.number,
options: PropTypes.arrayOf(PropTypes.number).isRequired,
style: PropTypes.object,
disabled: PropTypes.bool,
onChange: PropTypes.func.isRequired
};
},

onChange = (selected) => this.props.onChange(selected ? selected.value : null);
onChange(selected) {
this.props.onChange(selected ? selected.value : null);
},

render() {
let {className, value, options, style, disabled} = this.props;
Expand All @@ -32,7 +34,7 @@ export default class IntegerDropdown extends React.Component {
style={style}
disabled={disabled}
onChange={this.onChange}
/>
);
/>);
}
}
});
export default IntegerDropdown;
13 changes: 7 additions & 6 deletions apps/src/publicKeyCryptography/IntegerTextbox.jsx
Expand Up @@ -2,19 +2,19 @@
import React, {PropTypes} from 'react';
import color from "../util/color";

export default class IntegerTextbox extends React.Component {
static propTypes = {
const IntegerTextbox = React.createClass({
propTypes: {
className: PropTypes.string,
value: PropTypes.number,
disabled: PropTypes.bool,
color: PropTypes.string,
onChange: PropTypes.func.isRequired
};
},

onChange = (event) => {
onChange(event) {
const value = parseInt(event.target.value, 10);
this.props.onChange(Number.isInteger(value) ? value : null);
};
},

render() {
let {className, value, disabled, color: backgroundColor} = this.props;
Expand All @@ -41,4 +41,5 @@ export default class IntegerTextbox extends React.Component {
onChange={this.onChange}
/>);
}
}
});
export default IntegerTextbox;