@caring-dev/react-notion-x 7.8.8 → 7.8.9

package/build/third-party/collection.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as types from 'notion-types';
-import { N as NotionContext } from '../context--HOSgWjH.js';
+import { N as NotionContext } from '../context-MVPVCXSf.js';
 import React__default from 'react';
 
 interface IPropertyProps {

package/build/third-party/collection.js

@@ -393,7 +393,7 @@ var require_format_number = __commonJS({
 import {
   getBlockCollectionId,
   getBlockParentPage as getBlockParentPage2,
-  getBlockValue as getBlockValue9,
+  getBlockValue as getBlockValue10,
   getTextContent as getTextContent4
 } from "notion-utils";
 import React22 from "react";
@@ -5877,7 +5877,7 @@ function isSameMonth(laterDate, earlierDate, options) {
 
 // src/third-party/collection-view-calendar.tsx
 import "notion-types";
-import { getDateValue as getDateValue2 } from "notion-utils";
+import { getBlockValue as getBlockValue6, getDateValue as getDateValue2, idToUuid, uuidToId } from "notion-utils";
 import React20 from "react";
 
 // src/third-party/collection-week-row.tsx
@@ -5906,18 +5906,21 @@ function CalendarWeekRow({
   const [cardHeights, setCardHeights] = React19.useState(
     /* @__PURE__ */ new Map()
   );
-  const propertiesSource = ((_a = collectionView.format) == null ? void 0 : _a.calendar_properties) || ((_b = collectionView.format) == null ? void 0 : _b.list_properties) || [];
+  const calendarFormat = collectionView.type === "calendar" ? collectionView == null ? void 0 : collectionView.format : void 0;
+  const listFormat = collectionView.type === "list" ? collectionView == null ? void 0 : collectionView.format : void 0;
+  const propertiesSource = (_b = (_a = calendarFormat == null ? void 0 : calendarFormat.calendar_properties) != null ? _a : listFormat == null ? void 0 : listFormat.list_properties) != null ? _b : [];
   const visibleProperties = propertiesSource.filter(
     (p) => p.visible === true && p.property !== "title" && (datePropertyId ? p.property !== datePropertyId : true)
   );
-  const calendarCover = ((_c = collectionView.format) == null ? void 0 : _c.calendar_cover) || {
+  const calendarCover = (_c = calendarFormat == null ? void 0 : calendarFormat.calendar_cover) != null ? _c : {
     type: "none"
   };
-  const calendarCoverSize = ((_d = collectionView.format) == null ? void 0 : _d.calendar_cover_size) || "small";
-  const calendarCoverAspect = ((_e = collectionView.format) == null ? void 0 : _e.calendar_cover_aspect) || "cover";
+  const calendarCoverSize = (_d = calendarFormat == null ? void 0 : calendarFormat.calendar_cover_size) != null ? _d : "small";
+  const calendarCoverAspect = (_e = calendarFormat == null ? void 0 : calendarFormat.calendar_cover_aspect) != null ? _e : "cover";
   const MULTIDAY_CARD_MIN_HEIGHT = 44;
   const MULTIDAY_START_OFFSET = 28;
   const { eventsWithAdjustedWidth: allEventsWithWidth, layersPerDay } = React19.useMemo(() => {
+    var _a2;
     const events = [];
     const allEvents = [];
     for (const [dayIndexInWeek, day] of weekDays.entries()) {
@@ -5992,7 +5995,7 @@ function CalendarWeekRow({
       { length: 7 },
       () => []
     );
-    const layersPerDay2 = Array.from({ length: 7 }).fill(0);
+    const layersPerDay2 = Array.from({ length: 7 }, () => 0);
     for (const event of sortedEvents) {
       const spanStart = Math.max(0, event.displayStartDayIndex);
       const spanEnd = Math.min(6, event.displayEndDayIndex);
@@ -6013,7 +6016,7 @@ function CalendarWeekRow({
             if (dayLayers) {
               dayLayers[layerIndex] = event;
               layersPerDay2[dayIndex] = Math.max(
-                layersPerDay2[dayIndex],
+                (_a2 = layersPerDay2[dayIndex]) != null ? _a2 : 0,
                 layerIndex + 1
               );
             }
@@ -6407,53 +6410,110 @@ function CalendarWeekRow({
 // src/third-party/collection-view-calendar.tsx
 import { jsx as jsx55, jsxs as jsxs18 } from "react/jsx-runtime";
 var defaultBlockIds = [];
+function getBlockById(recordMap, blockId) {
+  var _a, _b, _c;
+  const raw = (_a = recordMap.block) == null ? void 0 : _a[blockId];
+  let block = getBlockValue6(raw);
+  if (block) return block;
+  const noDashes = blockId.replace(/-/g, "");
+  if (noDashes.length === 32) {
+    const withDashes = idToUuid(noDashes);
+    block = getBlockValue6((_b = recordMap.block) == null ? void 0 : _b[withDashes]);
+    if (block) return block;
+  }
+  const asId = uuidToId(blockId);
+  block = getBlockValue6((_c = recordMap.block) == null ? void 0 : _c[asId]);
+  if (block) return block;
+  const norm = noDashes.length === 32 ? noDashes : asId;
+  for (const key of Object.keys(recordMap.block || {})) {
+    const b = getBlockValue6(recordMap.block[key]);
+    if ((b == null ? void 0 : b.id) && uuidToId(b.id) === norm) return b;
+  }
+  return void 0;
+}
+function parseDateValue(prop) {
+  const fromUtils = getDateValue2(Array.isArray(prop) ? prop : [prop]);
+  if (fromUtils && typeof fromUtils === "object" && fromUtils.start_date)
+    return fromUtils;
+  if (prop && typeof prop === "object" && !Array.isArray(prop) && "start_date" in prop) {
+    const o = prop;
+    if (o.start_date) return o;
+  }
+  return null;
+}
+function getBlockProperties(block) {
+  if (!block) return void 0;
+  const p = block.properties;
+  if (p && typeof p === "object" && !Array.isArray(p)) return p;
+  const v = block.value;
+  if (v && typeof v === "object" && v.properties && typeof v.properties === "object")
+    return v.properties;
+  return void 0;
+}
 function CollectionViewCalendar({
   collection,
   collectionView,
   collectionData
 }) {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f, _g;
+  if (typeof window !== "undefined") {
+    console.log("[Calendar] component mounted");
+    fetch("http://127.0.0.1:7682/ingest/84ddabf3-24ba-497f-b790-14e045db9106", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "764ae3" }, body: JSON.stringify({ sessionId: "764ae3", location: "collection-view-calendar.tsx:mount", message: "Calendar component mounted", data: {}, timestamp: Date.now(), hypothesisId: "H3" }) }).catch(() => {
+    });
+  }
   const { recordMap } = useNotionContext();
   const [currentMonth, setCurrentMonth] = React20.useState(/* @__PURE__ */ new Date());
-  const blockIds = ((_b = (_a = collectionData.collection_group_results) == null ? void 0 : _a.blockIds) != null ? _b : collectionData.blockIds) || defaultBlockIds;
+  const blockIds = (_c = (_b = (_a = collectionData.collection_group_results) == null ? void 0 : _a.blockIds) != null ? _b : collectionData.blockIds) != null ? _c : defaultBlockIds;
+  const collectionSchema = (_f = (_e = collection == null ? void 0 : collection.schema) != null ? _e : (_d = collection == null ? void 0 : collection.value) == null ? void 0 : _d.schema) != null ? _f : {};
+  const schemaDateIds = React20.useMemo(
+    () => Object.entries(collectionSchema).filter(([, s]) => (s == null ? void 0 : s.type) === "date").map(([id]) => id),
+    [collectionSchema]
+  );
   const datePropertyId = React20.useMemo(() => {
     var _a2;
-    const calendarBy = (_a2 = collectionView == null ? void 0 : collectionView.query2) == null ? void 0 : _a2.calendar_by;
+    const calendarBy = (_a2 = collectionView.query2) == null ? void 0 : _a2.calendar_by;
     if (calendarBy) {
-      const schema2 = collection.schema;
-      const propertySchema = schema2[calendarBy];
+      const propertySchema = collectionSchema[calendarBy];
       if (propertySchema && propertySchema.type === "date") {
         return calendarBy;
       }
     }
-    const schema = collection.schema;
-    for (const [propertyId, propertySchema] of Object.entries(schema)) {
+    for (const [propertyId, propertySchema] of Object.entries(collectionSchema)) {
       if (propertySchema.type === "date") {
         return propertyId;
       }
     }
     return null;
-  }, [collection.schema, collectionView]);
+  }, [collectionSchema, collectionView]);
+  const effectiveDatePropertyId = (_g = datePropertyId != null ? datePropertyId : schemaDateIds[0]) != null ? _g : null;
   const eventsByDate = React20.useMemo(() => {
-    var _a2, _b2;
     const eventsMap = /* @__PURE__ */ new Map();
-    if (!datePropertyId) {
-      return eventsMap;
-    }
     for (const blockId of blockIds) {
-      const block = (_a2 = recordMap.block[blockId]) == null ? void 0 : _a2.value;
+      const block = getBlockById(recordMap, blockId);
       if (!block) continue;
-      const dateProperty = (_b2 = block.properties) == null ? void 0 : _b2[datePropertyId];
+      const props = getBlockProperties(block);
+      if (!props) continue;
+      let dateProperty = effectiveDatePropertyId ? props[effectiveDatePropertyId] : void 0;
+      if (!dateProperty && schemaDateIds.length) {
+        for (const pid of schemaDateIds) {
+          const p = props[pid];
+          if (p) {
+            dateProperty = p;
+            break;
+          }
+        }
+      }
       if (!dateProperty) continue;
-      const dateValue = getDateValue2(dateProperty);
+      const dateValue = parseDateValue(dateProperty);
       if (!dateValue) continue;
       let startDate;
       let endDate = null;
       let dateRange = null;
-      if (dateValue.type === "date" || dateValue.type === "datetime") {
+      const dtype = dateValue.type || "date";
+      if (dtype === "date" || dtype === "datetime") {
         startDate = new Date(dateValue.start_date);
         endDate = null;
-      } else if (dateValue.type === "daterange" || dateValue.type === "datetimerange") {
+      } else if (dtype === "daterange" || dtype === "datetimerange") {
         startDate = new Date(dateValue.start_date);
         endDate = dateValue.end_date ? new Date(dateValue.end_date) : null;
         if (endDate) {
@@ -6482,8 +6542,28 @@ function CollectionViewCalendar({
         eventsMap.get(dateKey).push({ block, dateRange: null });
       }
     }
+    if (typeof window !== "undefined" && blockIds.length > 0 && eventsMap.size === 0) {
+      const firstId = blockIds[0];
+      const block = getBlockById(recordMap, firstId);
+      const props = getBlockProperties(block);
+      let dateProp = effectiveDatePropertyId ? props == null ? void 0 : props[effectiveDatePropertyId] : void 0;
+      if (!dateProp && schemaDateIds.length && props) dateProp = props[schemaDateIds[0]];
+      const dv = dateProp ? parseDateValue(dateProp) : null;
+      const diag = {
+        blockIdsLength: blockIds.length,
+        datePropertyId: effectiveDatePropertyId,
+        firstId,
+        blockFound: !!block,
+        propKeys: props ? Object.keys(props) : [],
+        hasDateProp: !!dateProp,
+        dateValue: dv ? { type: dv.type, start_date: dv.start_date } : null
+      };
+      console.warn("[Calendar] no events \u2014 diagnostic:", diag);
+      fetch("http://127.0.0.1:7682/ingest/84ddabf3-24ba-497f-b790-14e045db9106", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "764ae3" }, body: JSON.stringify({ sessionId: "764ae3", location: "collection-view-calendar.tsx:noEvents", message: "no events diagnostic", data: diag, timestamp: Date.now(), hypothesisId: "H4" }) }).catch(() => {
+      });
+    }
     return eventsMap;
-  }, [blockIds, datePropertyId, recordMap]);
+  }, [blockIds, datePropertyId, recordMap, collectionSchema, effectiveDatePropertyId]);
   const calendarDays = React20.useMemo(() => {
     const weekStartsOn = 1;
     const monthStart = startOfMonth(currentMonth);
@@ -6566,7 +6646,7 @@ function CollectionViewCalendar({
           eventsByDate,
           collection,
           collectionView,
-          datePropertyId,
+          datePropertyId: effectiveDatePropertyId,
           currentMonth,
           today
         },
@@ -6578,7 +6658,7 @@ function CollectionViewCalendar({
 
 // src/third-party/collection-view-gallery.tsx
 import "notion-types";
-import { getBlockValue as getBlockValue6 } from "notion-utils";
+import { getBlockValue as getBlockValue7 } from "notion-utils";
 import { jsx as jsx56 } from "react/jsx-runtime";
 var defaultBlockIds2 = [];
 function CollectionViewGallery({
@@ -6633,7 +6713,7 @@ function Gallery({
       ),
       children: blockIds == null ? void 0 : blockIds.map((blockId) => {
         var _a;
-        const block = getBlockValue6(recordMap.block[blockId]);
+        const block = getBlockValue7(recordMap.block[blockId]);
         if (!block) return null;
         return /* @__PURE__ */ jsx56(
           CollectionCard,
@@ -6654,7 +6734,7 @@ function Gallery({
 
 // src/third-party/collection-view-list.tsx
 import "notion-types";
-import { getBlockValue as getBlockValue7 } from "notion-utils";
+import { getBlockValue as getBlockValue8 } from "notion-utils";
 import { jsx as jsx57, jsxs as jsxs19 } from "react/jsx-runtime";
 var defaultBlockIds3 = [];
 function CollectionViewList({
@@ -6690,7 +6770,7 @@ function List({
   const { components, recordMap, mapPageUrl } = useNotionContext();
   return /* @__PURE__ */ jsx57("div", { className: "notion-list-collection", children: /* @__PURE__ */ jsx57("div", { className: "notion-list-view", children: /* @__PURE__ */ jsx57("div", { className: "notion-list-body", children: blockIds == null ? void 0 : blockIds.map((blockId) => {
     var _a, _b, _c;
-    const block = getBlockValue7(recordMap.block[blockId]);
+    const block = getBlockValue8(recordMap.block[blockId]);
     if (!block) return null;
     const titleSchema = collection.schema.title;
     const titleData = (_a = block == null ? void 0 : block.properties) == null ? void 0 : _a.title;
@@ -6752,7 +6832,7 @@ function List({
 }
 
 // src/third-party/collection-view-table.tsx
-import { getBlockValue as getBlockValue8 } from "notion-utils";
+import { getBlockValue as getBlockValue9 } from "notion-utils";
 
 // src/third-party/react-use.ts
 import {
@@ -6991,7 +7071,7 @@ function Table({
     /* @__PURE__ */ jsx58("div", { className: "notion-table-body", children: blockIds == null ? void 0 : blockIds.map((blockId) => /* @__PURE__ */ jsx58("div", { className: "notion-table-row", children: properties.map((p) => {
       var _a2, _b;
       const schema = (_a2 = collection.schema) == null ? void 0 : _a2[p.property];
-      const block = getBlockValue8(recordMap.block[blockId]);
+      const block = getBlockValue9(recordMap.block[blockId]);
       const data = (_b = block == null ? void 0 : block.properties) == null ? void 0 : _b[p.property];
       const isTitle = p.property === "title";
       const style = {};
@@ -7041,6 +7121,11 @@ function CollectionViewImpl(props) {
     case "board":
       return /* @__PURE__ */ jsx59(CollectionViewBoard, { ...props });
     case "calendar":
+      if (typeof window !== "undefined") {
+        console.log("[Calendar] view selected, rendering");
+        fetch("http://127.0.0.1:7682/ingest/84ddabf3-24ba-497f-b790-14e045db9106", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "764ae3" }, body: JSON.stringify({ sessionId: "764ae3", location: "collection-view.tsx:calendar", message: "calendar view selected", data: {}, timestamp: Date.now(), hypothesisId: "H2" }) }).catch(() => {
+        });
+      }
       return /* @__PURE__ */ jsx59(CollectionViewCalendar, { ...props });
     default:
       console.warn("unsupported collection view", collectionView);
@@ -7083,7 +7168,7 @@ function CollectionViewBlock({
   block,
   className
 }) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const { recordMap, showCollectionViewDropdown } = useNotionContext();
   const { view_ids: viewIds } = block;
   const collectionId = getBlockCollectionId(block, recordMap);
@@ -7110,12 +7195,24 @@ function CollectionViewBlock({
   if (isServer2) {
     windowWidth = 1024;
   }
-  const collection = getBlockValue9(recordMap.collection[collectionId]);
-  const collectionView = getBlockValue9(
+  const collection = getBlockValue10(recordMap.collection[collectionId]);
+  const collectionView = getBlockValue10(
     recordMap.collection_view[collectionViewId]
   );
   const rawCollectionData = (_a = recordMap.collection_query[collectionId]) == null ? void 0 : _a[collectionViewId];
-  const collectionData = (_b = rawCollectionData == null ? void 0 : rawCollectionData.reducerResults) != null ? _b : rawCollectionData;
+  const unwrapped = rawCollectionData && typeof rawCollectionData === "object" && "value" in rawCollectionData ? rawCollectionData.value : rawCollectionData;
+  const reducer = unwrapped == null ? void 0 : unwrapped.reducerResults;
+  const collectionData = reducer && typeof reducer === "object" ? {
+    ...reducer,
+    collection_group_results: (_b = unwrapped == null ? void 0 : unwrapped.collection_group_results) != null ? _b : reducer == null ? void 0 : reducer.collection_group_results,
+    blockIds: (_e = (_d = unwrapped == null ? void 0 : unwrapped.blockIds) != null ? _d : (_c = reducer == null ? void 0 : reducer.collection_group_results) == null ? void 0 : _c.blockIds) != null ? _e : unwrapped == null ? void 0 : unwrapped.blockIds
+  } : unwrapped;
+  if (typeof window !== "undefined" && (collectionView == null ? void 0 : collectionView.type) === "calendar") {
+    const len = (_j = (_i = (_g = (_f = collectionData == null ? void 0 : collectionData.collection_group_results) == null ? void 0 : _f.blockIds) == null ? void 0 : _g.length) != null ? _i : (_h = collectionData == null ? void 0 : collectionData.blockIds) == null ? void 0 : _h.length) != null ? _j : 0;
+    console.log("[Collection] calendar view", { viewType: collectionView.type, blockIdsLength: len });
+    fetch("http://127.0.0.1:7682/ingest/84ddabf3-24ba-497f-b790-14e045db9106", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "764ae3" }, body: JSON.stringify({ sessionId: "764ae3", location: "collection.tsx:calendar", message: "calendar view", data: { viewType: collectionView == null ? void 0 : collectionView.type, blockIdsLength: len }, timestamp: Date.now(), hypothesisId: "H1" }) }).catch(() => {
+    });
+  }
   const parentPage = getBlockParentPage2(block, recordMap);
   const { width, padding } = React22.useMemo(() => {
     var _a2;
@@ -7155,7 +7252,7 @@ function CollectionViewBlock({
     return null;
   }
   const title = getTextContent4(collection.name).trim();
-  const showTitle = ((_c = block.format) == null ? void 0 : _c.hide_inline_collection_name) !== true;
+  const showTitle = ((_k = block.format) == null ? void 0 : _k.hide_inline_collection_name) !== true;
   if (collection.icon) {
     block.format = {
       ...block.format,
@@ -7213,7 +7310,7 @@ function CollectionViewTabs({
       children: /* @__PURE__ */ jsx60(
         CollectionViewColumnDesc,
         {
-          collectionView: getBlockValue9(recordMap.collection_view[viewId])
+          collectionView: getBlockValue10(recordMap.collection_view[viewId])
         }
       )
     },