Merge pull request #15 from illostack/dev

Dev

Author: illodev

.changeset/pre.json

@@ -2,16 +2,16 @@
   "mode": "pre",
   "tag": "beta",
   "initialVersions": {
-    "demo": "0.0.1-beta.0",
-    "@illostack/eslint-config": "0.0.1-beta.0",
-    "@illostack/react-calendar": "0.0.1-beta.0",
-    "@illostack/react-calendar-day": "0.0.1-beta.0",
-    "@illostack/react-calendar-month": "0.0.1-beta.0",
-    "@illostack/react-calendar-range": "0.0.1-beta.0",
-    "@illostack/react-calendar-ui": "0.0.1-beta.0",
-    "@illostack/react-calendar-week": "0.0.1-beta.0",
-    "@illostack/react-store": "0.0.1-beta.0",
-    "@illostack/typescript-config": "0.0.1-beta.0"
+    "demo": "0.0.1-beta.1",
+    "@illostack/eslint-config": "0.0.1-beta.1",
+    "@illostack/react-calendar": "0.0.1-beta.1",
+    "@illostack/react-calendar-day": "0.0.1-beta.1",
+    "@illostack/react-calendar-month": "0.0.1-beta.1",
+    "@illostack/react-calendar-range": "0.0.1-beta.1",
+    "@illostack/react-calendar-ui": "0.0.1-beta.1",
+    "@illostack/react-calendar-week": "0.0.1-beta.1",
+    "@illostack/react-store": "0.0.1-beta.1",
+    "@illostack/typescript-config": "0.0.1-beta.1"
   },
-  "changesets": []
+  "changesets": ["pretty-boxes-read"]
 }

.changeset/pretty-boxes-read.md

@@ -0,0 +1,9 @@
+---
+"@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
+"demo": patch
+---

apps/demo/CHANGELOG.md

@@ -0,0 +1,13 @@
+# demo
+
+## 0.0.1-beta.1
+
+### Patch Changes
+
+-
+- Updated dependencies
+  - @illostack/react-calendar-month@0.0.1-beta.1
+  - @illostack/react-calendar-range@0.0.1-beta.1
+  - @illostack/react-calendar-week@0.0.1-beta.1
+  - @illostack/react-calendar-day@0.0.1-beta.1
+  - @illostack/react-calendar@0.0.1-beta.1

apps/demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "demo",
-  "version": "0.0.1-beta.0",
+  "version": "0.0.1-beta.1",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",

apps/demo/src/app/[locale]/calendar/page.tsx

@@ -64,11 +64,20 @@ export default function Page({
 
         setState({
           view: id,
-          days: (meta.days ?? 1) as 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9
+          days: ("days" in meta ? meta.days : 1) as
+            | 1
+            | 2
+            | 3
+            | 4
+            | 5
+            | 6
+            | 7
+            | 8
+            | 9
         });
       }}
       minutesPerRow={15}
-      rowHeight={14}
+      rowHeight={24}
       startHour={0}
       endHour={23}
       onDateChange={(date) => {

apps/demo/src/styles/globals.css

@@ -41,22 +41,13 @@
 
     --calendar-background: var(--background);
     --calendar-foreground: var(--foreground);
-    --calendar-primary: var(--primary);
+    --calendar-primary: 217.2 91.2% 59.8%;
     --calendar-primary-foreground: var(--primary-foreground);
     --calendar-accent: var(--accent);
     --calendar-accent-foreground: var(--accent-foreground);
     --calendar-border: var(--border);
     --calendar-ring: var(--ring);
     --calendar-radius: var(--radius);
-
-    --calendar-blue: 217.2 91.2% 59.8%;
-    --calendar-green: 142.1 70.6% 45.3%;
-    --calendar-red: 0 84.2% 60.2%;
-    --calendar-yellow: 45.4 93.4% 47.5%;
-    --calendar-purple: 238.7 83.5% 66.7%;
-    --calendar-pink: 330.4 81.2% 60.4%;
-    --calendar-indigo: 238.7 83.5% 66.7%;
-    --calendar-cyan: 188.7 94.5% 42.7%;
   }
 
   .dark {

packages/react-calendar-day/CHANGELOG.md

@@ -0,0 +1,10 @@
+# @illostack/react-calendar-day
+
+## 0.0.1-beta.1
+
+### Patch Changes
+
+-
+- Updated dependencies
+  - @illostack/react-calendar-ui@0.0.1-beta.1
+  - @illostack/react-calendar@0.0.1-beta.1

packages/react-calendar-day/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@illostack/react-calendar-day",
-  "version": "0.0.1-beta.0",
+  "version": "0.0.1-beta.1",
   "keywords": [],
   "description": "React Calendar Day",
   "author": "illodev",

packages/react-calendar-day/src/components/calendar-day-event-card-content.tsx

@@ -25,7 +25,7 @@ const CalendarDayEventCardContent = React.forwardRef<
     <div
       ref={ref}
       className={cn(
-        "ring-foreground/5 pointer-events-none relative flex h-full w-full select-none flex-col overflow-hidden rounded-[var(--calendar-radius)] p-2 shadow-md ring-1",
+        "pointer-events-none relative flex h-full w-full select-none flex-col overflow-hidden rounded-[calc(var(--calendar-radius)/2)] p-2 shadow-md",
         calendarEventCardVariants({
           color: event.color,
           className

packages/react-calendar-day/src/components/calendar-day-events.tsx

@@ -9,7 +9,6 @@ import {
 import * as React from "react";
 
 import { useDayViewPosition } from "../hooks/use-day-view-position";
-import { CalendarDayEventCardContent } from "./calendar-day-event-card-content";
 
 interface CalendarDayEventProps {
   startAt: Date;
@@ -20,6 +19,11 @@ interface CalendarDayEventProps {
 const CalendarDayEnvent = React.memo<CalendarDayEventProps>(
   ({ startAt, endAt, event }) => {
     const position = useDayViewPosition(startAt, endAt);
+    const calendar = useCalendar();
+    const Chip = React.useMemo(
+      () => calendar.getCurrentView().meta.chip as typeof CalendarEventCard,
+      [calendar]
+    );
 
     return (
       <CalendarEventCard
@@ -31,7 +35,7 @@ const CalendarDayEnvent = React.memo<CalendarDayEventProps>(
           width: `calc(${position.width} - var(--calendar-overlap-size, 5%) * ${event.overlap})`
         }}
       >
-        <CalendarDayEventCardContent event={event} />
+        <Chip event={event} />
       </CalendarEventCard>
     );
   }