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

Disable letters in Rate under Track Distance #7931

Merged
2 changes: 2 additions & 0 deletions src/CONST.js
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ const CONST = {
KEYBOARD_TYPE: {
PHONE_PAD: 'phone-pad',
NUMBER_PAD: 'number-pad',
DECIMAL_PAD: 'decimal-pad',
},

ATTACHMENT_PICKER_TYPE: {
Expand Down Expand Up @@ -575,6 +576,7 @@ const CONST = {
CARD_SECURITY_CODE: /^[0-9]{3,4}$/,
CARD_EXPIRATION_DATE: /^(0[1-9]|1[0-2])([^0-9])?([0-9]{4}|([0-9]{2}))$/,
PAYPAL_ME_USERNAME: /^[a-zA-Z0-9]+$/,
RATE_VALUE: /^\d+(\.\d*)?$/,

// Adapted from: https://gist.github.com/dperini/729294
// eslint-disable-next-line max-len
Expand Down
90 changes: 52 additions & 38 deletions src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import compose from '../../../libs/compose';
import ONYXKEYS from '../../../ONYXKEYS';
import * as Policy from '../../../libs/actions/Policy';
import withFullPolicy from '../withFullPolicy';
import CONST from '../../../CONST';

const propTypes = {
/** The policy ID currently being configured */
Expand All @@ -45,29 +46,6 @@ const propTypes = {


class WorkspaceReimburseNoVBAView extends React.Component {
unitItems = [
{
label: this.props.translate('workspace.reimburse.kilometers'),
value: 'km',
},
{
label: this.props.translate('workspace.reimburse.miles'),
value: 'mi',
},
];

/**
* Set the rate throttled by 3 seconds so the user does not have to type over the corrected value
*/
updateRateValueThrottled = _.throttle((value) => {
this.setState({rateValue: this.getRateDisplayValue(value)});
Policy.setCustomUnitRate(this.props.policyID, this.state.unitID, {
customUnitRateID: this.state.rateID,
name: this.state.rateName,
rate: value * 100,
}, null);
}, 3000, {leading: false, trailing: true});

constructor(props) {
super(props);
this.state = {
Expand All @@ -79,31 +57,39 @@ class WorkspaceReimburseNoVBAView extends React.Component {
rateValue: this.getRateDisplayValue(lodashGet(props, 'policy.customUnit.rate.value', 0) / 100),
rateCurrency: lodashGet(props, 'policy.customUnit.rate.currency', ''),
};

this.unitItems = [
{
label: this.props.translate('workspace.reimburse.kilometers'),
value: 'km',
},
{
label: this.props.translate('workspace.reimburse.miles'),
value: 'mi',
},
];

this.updateRateValueDebounced = _.debounce(this.updateRateValue.bind(this), 1000);
}

getRateDisplayValue(value) {
const numValue = parseFloat(value);
if (Number.isNaN(numValue)) {
return '';
}
const fraction = numValue.toString().split('.')[1];
return !fraction || fraction.length < 2
? numValue.toFixed(2)
: numValue.toString();

return numValue.toFixed(2);
}
kakajann marked this conversation as resolved.
Show resolved Hide resolved

setRate(value) {
const numValue = parseFloat(value);
if (Number.isNaN(numValue)) {
this.setState({rateValue: ''});
return;
}

// Set the immediate value so the user does not lose the input
this.setState({rateValue: numValue.toString()});

// Set the corrected value with a delay and sync to the server
this.updateRateValueThrottled(numValue);
const isInvalidRateValue = value !== '' && !CONST.REGEX.RATE_VALUE.test(value);

this.setState(prevState => ({
rateValue: !isInvalidRateValue ? value : prevState.rateValue,
}), () => {
// Set the corrected value with a delay and sync to the server
this.updateRateValueDebounced(this.state.rateValue);
});
kakajann marked this conversation as resolved.
Show resolved Hide resolved
}

setUnit(value) {
Expand All @@ -116,6 +102,32 @@ class WorkspaceReimburseNoVBAView extends React.Component {
}, null);
}

handleKeyPress = (event) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No inline functions. Function names should reflect what they do instead of where they are used.

Suggested change
handleKeyPress = (event) => {
debounceUpdateOnCursorMove(event) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Member

@parasharrajat parasharrajat Mar 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I don't see this change. Did you push it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, sorry, just a sec

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed now

if (!_.contains(['ArrowLeft', 'ArrowRight'], event.key)) {
return;
}

this.updateRateValueDebounced(this.state.rateValue);
}

updateRateValue(value) {
const numValue = parseFloat(value);

if (_.isNaN(numValue)) {
return;
}

this.setState({
rateValue: numValue.toFixed(2),
});

Policy.setCustomUnitRate(this.props.policyID, this.state.unitID, {
customUnitRateID: this.state.rateID,
name: this.state.rateName,
rate: numValue.toFixed(2) * 100,
}, null);
}

render() {
return (
<>
Expand Down Expand Up @@ -160,6 +172,8 @@ class WorkspaceReimburseNoVBAView extends React.Component {
value={this.state.rateValue}
autoCompleteType="off"
autoCorrect={false}
keyboardType={CONST.KEYBOARD_TYPE.DECIMAL_PAD}
onKeyPress={this.handleKeyPress}
/>
</View>
<View style={[styles.unitCol]}>
Expand Down