mirror of
https://github.com/quantum5/qcal.git
synced 2025-04-24 17:51:57 -04:00
Improve code quality
This commit is contained in:
parent
b0de1c761d
commit
cf930d3a8b
|
@ -67,9 +67,7 @@ class App extends React.Component<{}, AppState> {
|
||||||
}
|
}
|
||||||
|
|
||||||
changeField(field: keyof AppState, event: any) {
|
changeField(field: keyof AppState, event: any) {
|
||||||
const change: Partial<AppState> = {};
|
this.setState({[field]: event.target.value});
|
||||||
change[field] = event.target.value;
|
|
||||||
this.setState(change);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
validYear() {
|
validYear() {
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import './Calendar.scss';
|
import './Calendar.scss';
|
||||||
import {
|
import {
|
||||||
dateName, dateRuralName,
|
dateName,
|
||||||
|
dateRuralName,
|
||||||
Day,
|
Day,
|
||||||
decadeNames,
|
decadeNames,
|
||||||
endYear,
|
endYear,
|
||||||
|
@ -101,7 +102,6 @@ export class Calendar extends React.Component<CalendarProps, CalendarState> {
|
||||||
yearStr: this.props.year.toString(),
|
yearStr: this.props.year.toString(),
|
||||||
};
|
};
|
||||||
this.selection = React.createRef();
|
this.selection = React.createRef();
|
||||||
this.handleClickOutside = this.handleClickOutside.bind(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
|
@ -134,47 +134,53 @@ export class Calendar extends React.Component<CalendarProps, CalendarState> {
|
||||||
this.props.onSwitch && this.props.onSwitch(year, month as Month);
|
this.props.onSwitch && this.props.onSwitch(year, month as Month);
|
||||||
}
|
}
|
||||||
|
|
||||||
prevYear() {
|
prevYear = () => {
|
||||||
this.goToNormalized(this.props.year - 1, this.props.month);
|
this.goToNormalized(this.props.year - 1, this.props.month);
|
||||||
}
|
}
|
||||||
|
|
||||||
prevMonth() {
|
prevMonth = () => {
|
||||||
this.goToNormalized(this.props.year, this.props.month - 1);
|
this.goToNormalized(this.props.year, this.props.month - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
nextYear() {
|
nextYear = () => {
|
||||||
this.goToNormalized(this.props.year + 1, this.props.month);
|
this.goToNormalized(this.props.year + 1, this.props.month);
|
||||||
}
|
}
|
||||||
|
|
||||||
nextMonth() {
|
nextMonth = () => {
|
||||||
this.goToNormalized(this.props.year, this.props.month + 1);
|
this.goToNormalized(this.props.year, this.props.month + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
startSelection() {
|
startSelection = () => {
|
||||||
this.setState({selecting: true});
|
this.setState({selecting: true});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleClickOutside(event: any) {
|
handleClickOutside = (event: any) => {
|
||||||
if (this.state.selecting && this.selection.current && !this.selection.current.contains(event.target))
|
if (this.state.selecting && this.selection.current && !this.selection.current.contains(event.target))
|
||||||
this.setState({selecting: false});
|
this.setState({selecting: false});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleKeyUp(event: any) {
|
handleKeyUp = (event: any) => {
|
||||||
if (event.key === 'Escape')
|
if (event.key === 'Escape')
|
||||||
this.setState({selecting: false});
|
this.setState({selecting: false});
|
||||||
}
|
}
|
||||||
|
|
||||||
monthChange(event: any) {
|
monthChange = (event: any) => {
|
||||||
this.goToNormalized(this.props.year, +event.target.value as Month);
|
this.goToNormalized(this.props.year, +event.target.value as Month);
|
||||||
}
|
}
|
||||||
|
|
||||||
yearChange(event: any) {
|
yearChange = (event: any) => {
|
||||||
if (/^-?\d+/.test(event.target.value)) {
|
if (/^-?\d+/.test(event.target.value)) {
|
||||||
this.goToNormalized(+event.target.value, this.props.month);
|
this.goToNormalized(+event.target.value, this.props.month);
|
||||||
}
|
}
|
||||||
this.setState({yearStr: event.target.value});
|
this.setState({yearStr: event.target.value});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
goToToday = () => {
|
||||||
|
const {year, month} = jdnFrench(this.props.todayJDN);
|
||||||
|
this.goToNormalized(year, month);
|
||||||
|
this.setState({selecting: false});
|
||||||
|
}
|
||||||
|
|
||||||
componentDidUpdate(prevProps: CalendarProps) {
|
componentDidUpdate(prevProps: CalendarProps) {
|
||||||
if (prevProps.year !== this.props.year) {
|
if (prevProps.year !== this.props.year) {
|
||||||
const yearStr = this.props.year.toString();
|
const yearStr = this.props.year.toString();
|
||||||
|
@ -186,29 +192,22 @@ export class Calendar extends React.Component<CalendarProps, CalendarState> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
goToToday() {
|
|
||||||
const {year, month} = jdnFrench(this.props.todayJDN);
|
|
||||||
this.goToNormalized(year, month);
|
|
||||||
this.setState({selecting: false});
|
|
||||||
}
|
|
||||||
|
|
||||||
render(): JSX.Element {
|
render(): JSX.Element {
|
||||||
return <div className="Calendar">
|
return <div className="Calendar">
|
||||||
<div className="Calendar-head">
|
<div className="Calendar-head">
|
||||||
<div className="Calendar-prev">
|
<div className="Calendar-prev">
|
||||||
<button type="button" className="btn btn-secondary" title="Previous year"
|
<button type="button" className="btn btn-secondary" title="Previous year" onClick={this.prevYear}>«
|
||||||
onClick={this.prevYear.bind(this)}>«
|
|
||||||
</button>
|
</button>
|
||||||
<button type="button" className="btn btn-secondary" title="Previous month"
|
<button type="button" className="btn btn-secondary" title="Previous month"
|
||||||
onClick={this.prevMonth.bind(this)}>‹
|
onClick={this.prevMonth}>‹
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
{!this.state.selecting && <div className="Calendar-month-name" onClick={this.startSelection.bind(this)}>
|
{!this.state.selecting && <div className="Calendar-month-name" onClick={this.startSelection}>
|
||||||
{this.props.month < 13 && monthName(this.props.month)} {this.props.year}
|
{this.props.month < 13 && monthName(this.props.month)} {this.props.year}
|
||||||
</div>}
|
</div>}
|
||||||
{this.state.selecting && <div className="Calendar-month-name input-group" ref={this.selection}
|
{this.state.selecting && <div className="Calendar-month-name input-group" ref={this.selection}
|
||||||
onKeyUp={this.handleKeyUp.bind(this)}>
|
onKeyUp={this.handleKeyUp}>
|
||||||
<select className="Calendar-month-input form-control" onChange={this.monthChange.bind(this)}
|
<select className="Calendar-month-input form-control" onChange={this.monthChange}
|
||||||
value={this.props.month}>{
|
value={this.props.month}>{
|
||||||
Array.from(Array(13).keys()).map(i => {
|
Array.from(Array(13).keys()).map(i => {
|
||||||
const month = i + 1 as Month;
|
const month = i + 1 as Month;
|
||||||
|
@ -216,17 +215,15 @@ export class Calendar extends React.Component<CalendarProps, CalendarState> {
|
||||||
})
|
})
|
||||||
}</select>
|
}</select>
|
||||||
<input type="number" className="Calendar-year-input form-control" value={this.state.yearStr}
|
<input type="number" className="Calendar-year-input form-control" value={this.state.yearStr}
|
||||||
onChange={this.yearChange.bind(this)} min={startYear} max={endYear}/>
|
onChange={this.yearChange} min={startYear} max={endYear}/>
|
||||||
<button type="button" className="form-control btn btn-primary Calendar-today-button"
|
<button type="button" className="form-control btn btn-primary Calendar-today-button"
|
||||||
onClick={this.goToToday.bind(this)}>Today
|
onClick={this.goToToday}>Today
|
||||||
</button>
|
</button>
|
||||||
</div>}
|
</div>}
|
||||||
<div className="Calendar-next">
|
<div className="Calendar-next">
|
||||||
<button type="button" className="btn btn-secondary" title="Next month"
|
<button type="button" className="btn btn-secondary" title="Next month" onClick={this.nextMonth}>›
|
||||||
onClick={this.nextMonth.bind(this)}>›
|
|
||||||
</button>
|
</button>
|
||||||
<button type="button" className="btn btn-secondary" title="Next year"
|
<button type="button" className="btn btn-secondary" title="Next year" onClick={this.nextYear}>»
|
||||||
onClick={this.nextYear.bind(this)}>»
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue