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

fix: invalid array length #29

Merged
merged 1 commit into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-ui-datepicker",
"version": "1.0.6",
"version": "1.0.7",
"description": "Customizable datetime picker for React Native",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down
4 changes: 2 additions & 2 deletions src/components/DaySelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ const DaySelector = () => {
return (
<View style={styles.container}>
<View style={[styles.weekDaysContainer, theme?.weekDaysContainerStyle]}>
{utils.getWeekdaysMin().map((item, index) => (
{utils.getWeekdaysMin()?.map((item, index) => (
<View key={index} style={styles.weekDayCell}>
<Text style={theme?.weekDaysTextStyle}>{item}</Text>
</View>
))}
</View>
<View style={styles.daysContainer}>
{days.map((day, index) => {
{days?.map((day, index) => {
const dayContainerStyle =
day && day.isCurrentMonth
? theme?.dayContainerStyle
Expand Down
2 changes: 2 additions & 0 deletions src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const Header = ({ buttonPrevIcon, buttonNextIcon }: HeaderProps) => {

const renderPrevButton = (
<TouchableOpacity
disabled={calendarView === CalendarViews.time}
onPress={() =>
calendarView === CalendarViews.day
? onChangeMonth(-1)
Expand Down Expand Up @@ -49,6 +50,7 @@ const Header = ({ buttonPrevIcon, buttonNextIcon }: HeaderProps) => {

const renderNextButton = (
<TouchableOpacity
disabled={calendarView === CalendarViews.time}
onPress={() =>
calendarView === CalendarViews.day
? onChangeMonth(1)
Expand Down
2 changes: 1 addition & 1 deletion src/components/MonthSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const MonthSelector = () => {
return (
<View style={styles.container}>
<View style={styles.monthsContainer}>
{utils.getMonths().map((item, index) => {
{utils.getMonths()?.map((item, index) => {
const activeItemStyle =
index === month
? {
Expand Down
35 changes: 19 additions & 16 deletions src/components/TimePicker/Wheel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,22 +113,25 @@ const Wheel = ({
translateY.setValue(0);
translateY.setOffset(0);
const currentIndex = displayValues.indexOf(value);
return displayValues.map((_, index) =>
translateY
.interpolate({
inputRange: [-radius, radius],
outputRange: [
-radius + ((radius * 2) / displayCount) * (index - currentIndex),
radius + ((radius * 2) / displayCount) * (index - currentIndex),
],
extrapolate: 'extend',
})
.interpolate({
inputRange: [-radius, radius],
outputRange: [-Math.PI / 2, Math.PI / 2],
extrapolate: 'clamp',
})
);
return displayValues && displayValues.length > 0
? displayValues.map((_, index) =>
translateY
.interpolate({
inputRange: [-radius, radius],
outputRange: [
-radius +
((radius * 2) / displayCount) * (index - currentIndex),
radius + ((radius * 2) / displayCount) * (index - currentIndex),
],
extrapolate: 'extend',
})
.interpolate({
inputRange: [-radius, radius],
outputRange: [-Math.PI / 2, Math.PI / 2],
extrapolate: 'clamp',
})
)
: [];
}, [displayValues, radius, value, displayCount, translateY]);

return (
Expand Down
115 changes: 58 additions & 57 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,62 +126,63 @@ export default class utils {
: 35 - monthDaysOffset
: 0;

const prevDays = this.displayFullDays
? prevDaysArray.map((day) => {
const thisDay = date.add(-1, 'month').date(day);
let disabled = false;
if (this.minimumDate) {
disabled = thisDay < this.getDate(this.minimumDate);
}
if (this.maximumDate && !disabled) {
disabled = thisDay > this.getDate(this.maximumDate);
}
return {
text: day.toString(),
day,
date: this.getFormatedDate(thisDay, 'YYYY/MM/DD'),
disabled,
isCurrentMonth: false,
};
})
: new Array(dayOfMonth);

return [
...prevDays,
...Array.from({ length: currentMonthDays }, (_, i) => {
const thisDay = date.date(i + 1);
let disabled = false;
if (this.minimumDate) {
disabled = thisDay < this.getDate(this.minimumDate);
}
if (this.maximumDate && !disabled) {
disabled = thisDay > this.getDate(this.maximumDate);
}
return {
text: (i + 1).toString(),
day: i + 1,
date: this.getFormatedDate(thisDay, 'YYYY/MM/DD'),
disabled,
isCurrentMonth: true,
};
}),
...Array.from({ length: nextMonthDays }, (_, i) => {
const thisDay = date.add(1, 'month').date(i + 1);
let disabled = false;
if (this.minimumDate) {
disabled = thisDay < this.getDate(this.minimumDate);
}
if (this.maximumDate && !disabled) {
disabled = thisDay > this.getDate(this.maximumDate);
}
return {
text: (i + 1).toString(),
day: i + 1,
date: this.getFormatedDate(thisDay, 'YYYY/MM/DD'),
disabled,
isCurrentMonth: false,
};
}),
];
const prevDays =
this.displayFullDays && prevDaysArray && prevDaysArray.length > 0
? prevDaysArray.map((day) => {
const thisDay = date.add(-1, 'month').date(day);
let disabled = false;
if (this.minimumDate) {
disabled = thisDay < this.getDate(this.minimumDate);
}
if (this.maximumDate && !disabled) {
disabled = thisDay > this.getDate(this.maximumDate);
}
return {
text: day.toString(),
day,
date: this.getFormatedDate(thisDay, 'YYYY/MM/DD'),
disabled,
isCurrentMonth: false,
};
})
: new Array(dayOfMonth);

const currentDays = Array.from({ length: currentMonthDays }, (_, i) => {
const thisDay = date.date(i + 1);
let disabled = false;
if (this.minimumDate) {
disabled = thisDay < this.getDate(this.minimumDate);
}
if (this.maximumDate && !disabled) {
disabled = thisDay > this.getDate(this.maximumDate);
}
return {
text: (i + 1).toString(),
day: i + 1,
date: this.getFormatedDate(thisDay, 'YYYY/MM/DD'),
disabled,
isCurrentMonth: true,
};
});

const nextDays = Array.from({ length: nextMonthDays }, (_, i) => {
const thisDay = date.add(1, 'month').date(i + 1);
let disabled = false;
if (this.minimumDate) {
disabled = thisDay < this.getDate(this.minimumDate);
}
if (this.maximumDate && !disabled) {
disabled = thisDay > this.getDate(this.maximumDate);
}
return {
text: (i + 1).toString(),
day: i + 1,
date: this.getFormatedDate(thisDay, 'YYYY/MM/DD'),
disabled,
isCurrentMonth: false,
};
});

return [...prevDays, ...currentDays, ...nextDays];
};
}
Loading