used of wrappedLiteral

Author: RafaelGB

src/components/Cell.tsx

@@ -45,7 +45,7 @@ export default function DefaultCell(cellProperties: Cell) {
     }
   }, []);
 
-  useLayoutEffect(() => {
+  useEffect(() => {
     if (!dirtyCell && containerCellRef.current) {
       //TODO - this is a hack. find why is layout effect called twice
       containerCellRef.current.innerHTML = "";
@@ -109,6 +109,7 @@ export default function DefaultCell(cellProperties: Cell) {
               setContextValue((old) => ({ value: old.value, update: true }))
             }
             className={"data-input"}
+            //innerRef={containerCellRef}
           />
         );
       /** Number option */

src/components/portals/CalendarPortal.tsx

@@ -9,6 +9,7 @@ import { usePopper } from "react-popper";
 import { Cell } from "react-table";
 import NoteInfo from "services/NoteInfo";
 import { DataviewService } from "services/DataviewService";
+import { Literal } from "obsidian-dataview/lib/data-model/value";
 
 type CalendarProps = {
   intialState: TableDataType;
@@ -42,6 +43,7 @@ const CalendarPortal = (calendarProps: CalendarProps) => {
       row: cellProperties.row,
       columnId: (cellProperties.column as any).id,
     });
+
     setCalendarState(date);
     setShowCalendar(false);
     setContextValue({
@@ -50,6 +52,12 @@ const CalendarPortal = (calendarProps: CalendarProps) => {
     });
   }
 
+  if (contextValue.value instanceof DateTime) {
+    console.log("calendar datatime value");
+  } else {
+    console.log("calendar differ value");
+  }
+
   function handlerOnClick(e: any) {
     if (!column.isMetadata) {
       const portalActive = document.getElementById("unique-calendar-portal");
@@ -101,7 +109,10 @@ const CalendarPortal = (calendarProps: CalendarProps) => {
         onClick={handlerOnClick}
       >
         <span>
-          {DataviewService.parseLiteral(contextValue.value, DataTypes.TEXT)}
+          {DataviewService.parseLiteral(
+            contextValue.value as Literal,
+            DataTypes.TEXT
+          )}
         </span>
       </div>
       {showCalendar &&

src/services/DataviewService.ts

@@ -2,10 +2,9 @@ import { FilterCondition } from "cdm/DatabaseModel";
 import { DataTypes, getOperatorFilterValue, OperatorFilter } from "helpers/Constants";
 import { Notice } from "obsidian";
 import { getAPI, isPluginEnabled } from "obsidian-dataview";
-import { Literal } from "obsidian-dataview/lib/data-model/value";
+import { Literal, WrappedLiteral } from "obsidian-dataview/lib/data-model/value";
 import { DvAPIInterface } from "obsidian-dataview/lib/typings/api";
 import { DateTime } from "luxon";
-import NoteInfo from "services/NoteInfo";
 class DataviewProxy {
 
     private static instance: DataviewProxy;
@@ -61,25 +60,24 @@ class DataviewProxy {
         }
     }
 
-    parseLiteral(literal: Literal | NoteInfo, dataTypeDst: string): Literal | NoteInfo {
-        if (literal === null || literal === undefined) return "";
-        let parsedLiteral: Literal | NoteInfo = literal;
+    parseLiteral(literal: Literal, dataTypeDst: string): Literal {
+        let parsedLiteral: Literal = literal;
+        const wrapped = this.getDataviewAPI().value.wrapValue(literal)
         // Check empty or undefined literals
         switch (dataTypeDst) {
             case DataTypes.CALENDAR:
-                switch (typeof literal) {
-                    case "string":
-                        parsedLiteral = DateTime.fromISO(literal);
-                        break;
-                }
+                parsedLiteral = this.parseToCalendar(wrapped);
                 break;
             case DataTypes.NUMBER:
-                parsedLiteral = isNaN(literal as any) ? ""
-                    : Number.parseInt(literal as string);
+                parsedLiteral = wrapped.type === 'number' ? literal : Number(literal);
                 break;
             default:
                 // Values of dataview parse to md friendly strings
-                parsedLiteral = this.getDataviewAPI().value.toString(literal);
+                if (DateTime.isDateTime(wrapped.value)) {
+                    parsedLiteral = wrapped.value.toFormat("yyyy-MM-dd");
+                } else {
+                    parsedLiteral = this.getDataviewAPI().value.toString(literal);
+                }
         }
         return parsedLiteral;
     }
@@ -94,6 +92,14 @@ class DataviewProxy {
         }
         return this.instance;
     }
+
+    private parseToCalendar(literal: WrappedLiteral): Literal {
+        if (literal.type === 'string') {
+            return DateTime.fromISO(literal.value);
+        } else {
+            return literal.value;
+        }
+    }
 }
 
 export const DataviewService = DataviewProxy.getInstance();