Skip to content

Fix: Error of calculator when enter only one number with operator to get output #469

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: Error of calculator when enter only one number with operator to get output #469

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9334455
Update index.jsx
SAGARSINGH-1 Sep 26, 2023
7e803bb
Merge branch 'freeCodeCamp:main' into fix-Invalid-Input-Error
SAGARSINGH-1 Oct 4, 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
44 changes: 23 additions & 21 deletions apps/javascript-calculator/client/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,33 +50,35 @@ class Calculator extends React.Component {
});
setTimeout(() => this.setState({ currentVal: this.state.prevVal }), 1000);
}

handleEvaluate() {
if (!this.state.currentVal.includes('Limit')) {
let expression = this.state.formula;
while (endsWithOperator.test(expression)) {
expression = expression.slice(0, -1);
}

// Validate and sanitize the expression
expression = expression
.replace(/x/g, '*')
.replace(/-/g, '-')
.replace('--', '-');
let answer = Math.round(1000000000000 * eval(expression)) / 1000000000000;
this.setState({
currentVal: answer.toString(),
formula:
expression
.replace(/\*/g, '⋅')
.replace(/-/g, '-')
.replace(/(x|\/|\+)-/, '$1-')
.replace(/^-/, '-') +
'=' +
answer,
prevVal: answer,
evaluated: true
});
.replace(/[^0-9x/\-+]/g, '') // Remove invalid characters
.replace(/x/g, '*') // Replace 'x' with '*' for multiplication

try {
// Evaluate the sanitized expression
let answer = Math.round(1000000000000 * eval(expression)) / 1000000000000;
this.setState({
currentVal: answer.toString(),
formula: expression + '=' + answer,
prevVal: answer,
evaluated: true
});
} catch (error) {
// Handle evaluation errors
this.setState({
currentVal: 'Error',
formula: 'Error',
evaluated: true
});
}
}
}


handleOperators(e) {
if (!this.state.currentVal.includes('Limit')) {
Expand Down