Skip to content

Commit a582cdb

Browse files
committed
update the lifecycle name
1 parent 4e7c2ce commit a582cdb

File tree

1 file changed

+37
-32
lines changed

1 file changed

+37
-32
lines changed

src/components/Calculator/Calculator.jsx

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
import React, { Component } from 'react';
2-
import './Calculator.css';
1+
import React, { Component } from "react";
2+
import "./Calculator.css";
33

4-
import Display from '../Display/Display';
5-
import Keypad from '../Keypad/Keypad';
6-
import './Calculator.css';
4+
import Display from "../Display/Display";
5+
import Keypad from "../Keypad/Keypad";
6+
import "./Calculator.css";
77

88
class Calculator extends Component {
99
state = {
10-
displayValue: '0',
11-
numbers: ['9', '8', '7', '6', '5', '4', '3', '2', '1', '.', '0', 'ce'],
12-
operators: ['/', 'x', '-', '+'],
13-
selectedOperator: '',
14-
storedValue: '',
10+
displayValue: "0",
11+
numbers: ["9", "8", "7", "6", "5", "4", "3", "2", "1", ".", "0", "ce"],
12+
operators: ["/", "x", "-", "+"],
13+
selectedOperator: "",
14+
storedValue: ""
1515
};
1616

17-
componentWillMount = () => {
18-
document.addEventListener('keydown', this.handleKeyPress);
17+
UNSAFE_componentWillMount = () => {
18+
document.addEventListener("keydown", this.handleKeyPress);
1919
};
2020

2121
componentWillUnmount = () => {
22-
document.removeEventListener('keydown', this.handleKeyPress);
22+
document.removeEventListener("keydown", this.handleKeyPress);
2323
};
2424

2525
handleKeyPress = event => {
2626
const { numbers, operators } = this.state;
2727

28-
if (event.key === 'Backspace') this.updateDisplay(event, 'ce');
29-
if (event.key === 'Enter' || event.key === '=') this.callOperator(event);
28+
if (event.key === "Backspace") this.updateDisplay(event, "ce");
29+
if (event.key === "Enter" || event.key === "=") this.callOperator(event);
3030

3131
numbers.forEach(number => {
3232
if (event.key === number) {
@@ -49,34 +49,39 @@ class Calculator extends Component {
4949
storedValue = parseInt(storedValue, 10);
5050

5151
switch (selectedOperator) {
52-
case '+':
52+
case "+":
5353
displayValue = storedValue + displayValue;
5454
break;
55-
case '-':
55+
case "-":
5656
displayValue = storedValue - displayValue;
5757
break;
58-
case 'x':
58+
case "x":
5959
displayValue = storedValue * displayValue;
6060
break;
61-
case '/':
61+
case "/":
6262
displayValue = storedValue / displayValue;
6363
break;
6464
default:
65-
displayValue = '0';
65+
displayValue = "0";
6666
}
6767

6868
displayValue = displayValue.toString();
69-
selectedOperator = '';
70-
if (displayValue === 'NaN' || displayValue === 'Infinity') displayValue = '0';
71-
72-
this.setState({ displayValue, selectedOperator, storedValue: updateStoredValue });
69+
selectedOperator = "";
70+
if (displayValue === "NaN" || displayValue === "Infinity")
71+
displayValue = "0";
72+
73+
this.setState({
74+
displayValue,
75+
selectedOperator,
76+
storedValue: updateStoredValue
77+
});
7378
};
7479

7580
handleKeyPress = event => {
7681
const { numbers, operators } = this.state;
7782

78-
if (event.key === 'Backspace') this.updateDisplay('ce');
79-
if (event.key === 'Enter' || event.key === '=') this.callOperator();
83+
if (event.key === "Backspace") this.updateDisplay("ce");
84+
if (event.key === "Enter" || event.key === "=") this.callOperator();
8085

8186
numbers.forEach(number => {
8287
if (event.key === number) this.updateDisplay(number);
@@ -90,9 +95,9 @@ class Calculator extends Component {
9095
setOperator = value => {
9196
let { displayValue, selectedOperator, storedValue } = this.state;
9297

93-
if (selectedOperator === '') {
98+
if (selectedOperator === "") {
9499
storedValue = displayValue;
95-
displayValue = '0';
100+
displayValue = "0";
96101
selectedOperator = value;
97102
} else {
98103
selectedOperator = value;
@@ -104,13 +109,13 @@ class Calculator extends Component {
104109
updateDisplay = value => {
105110
let { displayValue } = this.state;
106111

107-
if (value === '.' && displayValue.includes('.')) value = '';
112+
if (value === "." && displayValue.includes(".")) value = "";
108113

109-
if (value === 'ce') {
114+
if (value === "ce") {
110115
displayValue = displayValue.substr(0, displayValue.length - 1);
111-
if (displayValue === '') displayValue = '0';
116+
if (displayValue === "") displayValue = "0";
112117
} else {
113-
displayValue === '0' ? (displayValue = value) : (displayValue += value);
118+
displayValue === "0" ? (displayValue = value) : (displayValue += value);
114119
}
115120

116121
this.setState({ displayValue });

0 commit comments

Comments
 (0)