Merge branch 'main' into feat-create-dayjs-module

Author: victor-enogwe

packages/web/src/common/types/web.event.types.ts

@@ -15,7 +15,6 @@ export const GridEventSchema = CoreEventSchema.extend({
 });
 
 export const SomedayEventSchema = CoreEventSchema.extend({
-  _id: z.string(),
   order: z.number(),
   isSomeday: z.literal(true),
 });

packages/web/src/views/Calendar/components/Draft/sidebar/hooks/useSidebarActions.ts

@@ -373,6 +373,10 @@ export const useSidebarActions = (
     if (!event) return;
 
     let _event = { ...event };
+    // We need to provide it to pass zod validation.
+    // Order is already corrected after the event is submitted
+    // so its okay to provide any random int (hence -1)
+    _event.order = -1;
 
     if (!_event.startDate || !_event.endDate) {
       // This probably means we are creating a new event, hence why we don't have start/end dates

packages/web/src/views/Calendar/components/Sidebar/SomedayTab/SomedayEvents/SomedayEvent/styled.ts

@@ -59,10 +59,7 @@ export const StyledNewSomedayEvent = styled.div<Props>`
   border-radius: 2px;
   color: ${({ theme }) => theme.color.text.dark};
   height: ${SOMEDAY_EVENT_HEIGHT}px;
-  filter: brightness(
-    ${({ isDragging, isFocused }) =>
-      isFocused && !isDragging ? "160%" : "100%"}
-  );
+  filter: brightness(${({ isFocused }) => (isFocused ? "160%" : "100%")});
   margin-bottom: 2px;
   opacity: ${({ isDragging, isOverGrid }) => {
     if (isDragging && isOverGrid) return 0;