Skip to content

Dev #16

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

Merged
illodev merged 4 commits into from
Apr 6, 2025
Merged

Dev #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb6ae3a
feat: enhance useDateFragments hook with minDate and maxDate for impr…
illodev Apr 6, 2025
ee62f92
docs(changeset): fix: useDateFragments behabiour
illodev Apr 6, 2025
66bee5a
chore: update package versions to 0.0.1-beta.2 and update changelogs
illodev Apr 6, 2025
ce388fe
chore: add new changeset pink-impalas-say to the changeset list
illodev Apr 6, 2025
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
10 changes: 10 additions & 0 deletions .changeset/pink-impalas-say.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@illostack/react-calendar-month": patch
"@illostack/react-calendar-range": patch
"@illostack/react-calendar-week": patch
"@illostack/react-calendar-day": patch
"@illostack/react-calendar-ui": patch
"@illostack/react-calendar": patch
---

fix: useDateFragments behabiour
2 changes: 1 addition & 1 deletion .changeset/pre.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"@illostack/react-store": "0.0.1-beta.1",
"@illostack/typescript-config": "0.0.1-beta.1"
},
"changesets": ["pretty-boxes-read"]
"changesets": ["pink-impalas-say", "pretty-boxes-read"]
}
11 changes: 11 additions & 0 deletions apps/demo/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# demo

## 0.0.1-beta.2

### Patch Changes

- Updated dependencies [ee62f92]
- @illostack/react-calendar-month@0.0.1-beta.2
- @illostack/react-calendar-range@0.0.1-beta.2
- @illostack/react-calendar-week@0.0.1-beta.2
- @illostack/react-calendar-day@0.0.1-beta.2
- @illostack/react-calendar@0.0.1-beta.2

## 0.0.1-beta.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "demo",
"version": "0.0.1-beta.1",
"version": "0.0.1-beta.2",
"private": true,
"scripts": {
"dev": "next dev --turbopack",
Expand Down
9 changes: 9 additions & 0 deletions packages/react-calendar-day/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @illostack/react-calendar-day

## 0.0.1-beta.2

### Patch Changes

- ee62f92: fix: useDateFragments behabiour
- Updated dependencies [ee62f92]
- @illostack/react-calendar-ui@0.0.1-beta.2
- @illostack/react-calendar@0.0.1-beta.2

## 0.0.1-beta.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/react-calendar-day/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@illostack/react-calendar-day",
"version": "0.0.1-beta.1",
"version": "0.0.1-beta.2",
"keywords": [],
"description": "React Calendar Day",
"author": "illodev",
Expand Down
9 changes: 9 additions & 0 deletions packages/react-calendar-month/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @illostack/react-calendar-month

## 0.0.1-beta.2

### Patch Changes

- ee62f92: fix: useDateFragments behabiour
- Updated dependencies [ee62f92]
- @illostack/react-calendar-ui@0.0.1-beta.2
- @illostack/react-calendar@0.0.1-beta.2

## 0.0.1-beta.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/react-calendar-month/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@illostack/react-calendar-month",
"version": "0.0.1-beta.1",
"version": "0.0.1-beta.2",
"keywords": [],
"description": "React Calendar Month",
"author": "illodev",
Expand Down
10 changes: 10 additions & 0 deletions packages/react-calendar-range/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @illostack/react-calendar-range

## 0.0.1-beta.2

### Patch Changes

- ee62f92: fix: useDateFragments behabiour
- Updated dependencies [ee62f92]
- @illostack/react-calendar-day@0.0.1-beta.2
- @illostack/react-calendar-ui@0.0.1-beta.2
- @illostack/react-calendar@0.0.1-beta.2

## 0.0.1-beta.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/react-calendar-range/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@illostack/react-calendar-range",
"version": "0.0.1-beta.1",
"version": "0.0.1-beta.2",
"keywords": [],
"description": "React Calendar Range",
"author": "illodev",
Expand Down
6 changes: 6 additions & 0 deletions packages/react-calendar-ui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @illostack/react-calendar-ui

## 0.0.1-beta.2

### Patch Changes

- ee62f92: fix: useDateFragments behabiour

## 0.0.1-beta.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/react-calendar-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@illostack/react-calendar-ui",
"version": "0.0.1-beta.1",
"version": "0.0.1-beta.2",
"keywords": [],
"description": "React Calendar UI",
"author": "illodev",
Expand Down
10 changes: 10 additions & 0 deletions packages/react-calendar-week/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @illostack/react-calendar-week

## 0.0.1-beta.2

### Patch Changes

- ee62f92: fix: useDateFragments behabiour
- Updated dependencies [ee62f92]
- @illostack/react-calendar-day@0.0.1-beta.2
- @illostack/react-calendar-ui@0.0.1-beta.2
- @illostack/react-calendar@0.0.1-beta.2

## 0.0.1-beta.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/react-calendar-week/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@illostack/react-calendar-week",
"version": "0.0.1-beta.1",
"version": "0.0.1-beta.2",
"keywords": [],
"description": "React Calendar Week",
"author": "illodev",
Expand Down
8 changes: 8 additions & 0 deletions packages/react-calendar/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @illostack/react-calendar

## 0.0.1-beta.2

### Patch Changes

- ee62f92: fix: useDateFragments behabiour
- Updated dependencies [ee62f92]
- @illostack/react-calendar-ui@0.0.1-beta.2

## 0.0.1-beta.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/react-calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@illostack/react-calendar",
"version": "0.0.1-beta.1",
"version": "0.0.1-beta.2",
"keywords": [],
"description": "React Calendar",
"author": "illodev",
Expand Down
24 changes: 19 additions & 5 deletions packages/react-calendar/src/hooks/use-date-fragments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use client";

import * as React from "react";
import { useCalendar } from "../components/calendar";
import { addMinutes } from "../lib/time";

export type DateFragmentType = "start" | "end" | "full" | "middle";
Expand All @@ -14,6 +15,13 @@ interface DateFragment {
}

const useDateFragments = (startAt?: Date, endAt?: Date): DateFragment[] => {
const calendar = useCalendar();
const dates = calendar.getDates();
const minDate = new Date(dates[0]?.date!.setHours(0, 0, 0, 0)!);
const maxDate = new Date(
dates[dates.length - 1]?.date!.setHours(23, 59, 59, 59)!
);

const fragments = React.useMemo(() => {
if (!startAt || !endAt) {
return [];
Expand All @@ -24,36 +32,42 @@ const useDateFragments = (startAt?: Date, endAt?: Date): DateFragment[] => {
const endDate = addMinutes(endAt, -1);

while (currentDate <= endDate) {
if (currentDate < minDate || currentDate > maxDate) {
currentDate.setDate(currentDate.getDate() + 1);
currentDate.setHours(0, 0, 0, 0);
continue;
}

if (
currentDate.toDateString() === startAt.toDateString() &&
currentDate.toDateString() === endDate.toDateString()
) {
result.push({
id: `fragment-${currentDate.toISOString()}`,
id: `fragment-${currentDate.toISOString()}-${minDate.toISOString()}-${maxDate.toISOString()}`,
type: "full",
date: new Date(currentDate),
startAt: new Date(startAt),
endAt: new Date(endAt)
});
} else if (currentDate.getDate() === startAt.getDate()) {
result.push({
id: `fragment-${currentDate.toISOString()}`,
id: `fragment-${currentDate.toISOString()}-${minDate.toISOString()}-${maxDate.toISOString()}`,
type: "start",
date: new Date(currentDate),
startAt: new Date(startAt),
endAt: new Date(new Date(currentDate).setHours(24, 0, 0, 0))
});
} else if (currentDate.getDate() === endDate.getDate()) {
result.push({
id: `fragment-${currentDate.toISOString()}`,
id: `fragment-${currentDate.toISOString()}-${minDate.toISOString()}-${maxDate.toISOString()}`,
type: "end",
date: new Date(currentDate),
startAt: new Date(new Date(currentDate).setHours(0, 0, 0, 0)),
endAt: new Date(endAt)
});
} else {
result.push({
id: `fragment-${currentDate.toISOString()}`,
id: `fragment-${currentDate.toISOString()}-${minDate.toISOString()}-${maxDate.toISOString()}`,
type: "middle",
date: new Date(currentDate),
startAt: new Date(new Date(currentDate).setHours(0, 0, 0, 0)),
Expand All @@ -66,7 +80,7 @@ const useDateFragments = (startAt?: Date, endAt?: Date): DateFragment[] => {
}

return result;
}, [startAt, endAt]);
}, [startAt, endAt, minDate, maxDate]);

return fragments;
};
Expand Down