guestbell-forms 3.0.47 → 3.0.49

package/src/lib/components/bookingCalendar/utils.ts

@@ -223,14 +223,17 @@ export function calculateItemsDimensions<T extends BookingCalendarItemT>(
         const end = endIsCut ? (endMs - startMs) / widthMs : realEnd;
         const realTill = endIsCut ? moment(endMs) : moment(item.till);
         const marginStart = start - lastEnd;
-        lastEnd = Math.min((item.till.valueOf() - startMs) / widthMs, 1);
+        const width = end - start;
+        if (end > 0 && start < 1) {
+          lastEnd = Math.max(Math.min(realEnd, 1), 0);
+        }
         return {
           item,
           start,
           realStart,
           realFrom,
           startIsCut,
-          width: end - start,
+          width,
           end,
           realEnd,
           realTill,

package/src/lib/scss/components/bookingCalendar/bookingCalendar.scss

@@ -122,7 +122,6 @@ $border-color-dark: black;
   height: 100%;
   pointer-events: none;
   grid-column: 2;
-  grid-row-start: 2;
 }
 
 .bookingCalendar__grid__item {
@@ -255,7 +254,6 @@ $border-color-dark: black;
   right: 0;
   height: 100%;
   grid-column: 2;
-  grid-row-start: 2;
 }
 
 .bookingCalendar__selection {
@@ -282,7 +280,6 @@ $border-color-dark: black;
   height: 100%;
   pointer-events: none;
   grid-column: 2;
-  grid-row-start: 2;
   display: flex;
 }
 

package/src/stories/OverlappingSchedule.tsx

@@ -18,7 +18,7 @@ const generateBookingItemsBetweenDates = (
   const width = till.valueOf() - from.valueOf();
   const startMs = from.valueOf();
   const nonOverlappingCount = 10;
-  const laneCount = 5;
+  const laneCount = 6;
   let i = 0;
   return new Array(laneCount)
     .fill(0)
@@ -109,7 +109,7 @@ const generateBookingItemsBetweenDates = (
         : []),
     ])
     .reduce((acc, val) => acc.concat(val), [])
-    .filter((a) => a /*&&a?.laneKey === 1*/);
+    .filter((a) => a /* && a?.laneKey === 0*/);
 };
 
 export const Schedule = () => {
@@ -155,8 +155,8 @@ export const Schedule = () => {
         onRangeChange={setRange}
         onSelection={onSelection}
         selectionContent={'Hold CTRL to zoom'}
-        // lanesCount={3}
-        lanesSource={new Array(5).fill(0).map((_, index) => ({
+        // showHeader={false}
+        lanesSource={new Array(6).fill(0).map((_, index) => ({
           laneKey: index,
           data: { data: 'test' },
           rowClassName: 'test',