fixed problems and some linting

Author: rghorbani

Days.js

@@ -9,18 +9,12 @@
 
 const React = require('react');
 const PropTypes = require('prop-types');
-const moment = require('moment-jalaali');
-const {
-  Text,
-  View,
-} = require('react-native');
+const jMoment = require('moment-jalaali');
+const { Text, View } = require('react-native');
 
-const styles = require('./style');
-const {
-  MAX_ROWS,
-  MAX_COLUMNS,
-} = require('./util');
 const Day = require('./Day');
+const styles = require('./style');
+const { MAX_ROWS, MAX_COLUMNS } = require('./util');
 
 class Days extends React.Component {
   static propTypes = {
@@ -60,7 +54,7 @@ class Days extends React.Component {
 
   updateSelectedStates(day) {
     let selectedStates = [],
-      daysInMonth = moment.jDaysInMonth(this.props.year, this.props.month);
+      daysInMonth = jMoment.jDaysInMonth(this.props.year, this.props.month);
 
     for (let i = 1; i <= daysInMonth; i++) {
       if (i === day) {
@@ -90,21 +84,21 @@ class Days extends React.Component {
       month = this.props.month,
       year = this.props.year,
       currentDay = 0,
-      thisMonthFirstDay = moment(year + '/' + (month + 1) + '/1', 'jYYYY/jM/jD'),
-      dayOfWeek = (thisMonthFirstDay.weekday() + 1) % 7,
+      thisMonthFirstDay = jMoment(year + '/' + (month + 1) + '/1', 'jYYYY/jM/jD'),
+      dayOfWeek = (thisMonthFirstDay.weekday() - 1) % 7,
       slotsAccumulator = 0;
 
     for (let i = 0; i < MAX_ROWS; i++ ) { // Week rows
       columns = [];
 
       for (let j = 0; j < MAX_COLUMNS; j++) { // Day columns
         if (slotsAccumulator >= dayOfWeek) {
-          if (currentDay < moment.jDaysInMonth(year, month)) {
+          if (currentDay < jMoment.jDaysInMonth(year, month)) {
             columns.push(<Day
                       key={j}
                       day={currentDay + 1}
                       selected={this.state.selectedStates[currentDay]}
-                      date={moment(year + '/' + (month + 1) + '/' + (currentDay + 1), 'jYYYY/jM/jD')}
+                      date={jMoment(year + '/' + (month + 1) + '/' + (currentDay + 1), 'jYYYY/jM/jD')}
                       maxDate={this.props.maxDate}
                       minDate={this.props.minDate}
                       onDayChange={this.onPressDay}
@@ -113,7 +107,7 @@ class Days extends React.Component {
                       selectedDayTextColor={this.props.selectedDayTextColor}
                       textStyle={this.props.textStyle} />);
             currentDay++;
-          } else if (currentDay >= moment.jDaysInMonth(year, month)) {
+          } else if (currentDay >= jMoment.jDaysInMonth(year, month)) {
               columns.push(<Day
                           key={j}
                           day={''}

HeaderControls.js

@@ -9,16 +9,10 @@
 
 const React = require('react');
 const PropTypes = require('prop-types');
-const {
-  Text,
-  TouchableOpacity,
-  View,
-} = require('react-native');
+const { Text, TouchableOpacity, View } = require('react-native');
 
 const styles = require('./style');
-const {
-  MONTHS,
-} = require('./util');
+const { MONTHS } = require('./util');
 
 class HeaderControls extends React.Component {
   static propTypes = {

PersianCalendarPicker.js

@@ -9,16 +9,13 @@
 
 const React = require('react');
 const PropTypes = require('prop-types');
-const moment = require('moment-jalaali');
-const {
-  Text,
-  View,
-} = require('react-native');
+const jMoment = require('moment-jalaali');
+const { Text, View } = require('react-native');
 
-const styles = require('./style');
+const Days = require('./Days');
 const HeaderControls = require('./HeaderControls');
 const WeekDaysLabels = require('./WeekDaysLabels');
-const Days = require('./Days');
+const styles = require('./style');
 
 class PersianCalendarPicker extends React.Component {
   static propTypes = {
@@ -42,7 +39,7 @@ class PersianCalendarPicker extends React.Component {
     // if (this.props.scaleFactor !== undefined) {
     //   styles = StyleSheet.create(makeStyles(this.props.scaleFactor));
     // }
-    let date = moment(this.props.selectedDate);
+    let date = jMoment(this.props.selectedDate);
     // console.log(date.format('jYYYY/jMM/jDD'));
     this.state = {
       date: date,
@@ -63,7 +60,7 @@ class PersianCalendarPicker extends React.Component {
   // Typically, when selectedDate is changed programmatically.
   //
   componentWillReceiveProps(newProps) {
-    let date = moment(newProps.selectedDate);
+    let date = jMoment(newProps.selectedDate);
     this.setState({
       date: date,
       day: date.jDate(),
@@ -94,7 +91,7 @@ class PersianCalendarPicker extends React.Component {
       month,
       year,
     } = this.state;
-    let date = moment(year + '/' + (month + 1) + '/' + day, 'jYYYY/jM/jD');
+    let date = jMoment(year + '/' + (month + 1) + '/' + day, 'jYYYY/jM/jD');
     let date2 = new Date(date.year(), date.month(), date.date());
 
     this.setState({date: date});

WeekDaysLabels.js

@@ -9,15 +9,10 @@
 
 const React = require('react');
 const PropTypes = require('prop-types');
-const {
-  Text,
-  View,
-} = require('react-native');
+const { Text, View } = require('react-native');
 
 const styles = require('./style');
-const {
-  WEEKDAYS,
-} = require('./util');
+const { WEEKDAYS } = require('./util');
 
 class WeekDaysLabels extends React.Component {
   static propTypes: {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-persian-calendar-picker",
-  "version": "1.1.7",
-  "description": "Persian Calendar Picker Component for React Native",
+  "version": "1.2.0",
+  "description": "Persian (Jalaali) Calendar Picker Component for React Native",
   "main": "PersianCalendarPicker.js",
   "scripts": {
     "test": "eslint ."

style.js

@@ -9,10 +9,7 @@
 
 'use strict';
 
-const {
-  Dimensions,
-  StyleSheet,
-} = require('react-native');
+const { Dimensions, StyleSheet } = require('react-native');
 
 const scale = Dimensions.get('window').width / 375;