Merge branch 'improved_rollup_and_footer'

RafaelGB · RafaelGB · commit ae33aa7d4fa0 · 2023-01-01T19:32:35.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
 		"@rollup/plugin-terser": "0.2.1",
 		"@testing-library/jest-dom": "5.16.5",
 		"@testing-library/react": "13.4.0",
-		"@types/jest": "29.2.4",
+		"@types/jest": "29.2.5",
 		"@types/luxon": "3.1.0",
 		"@types/node": "18.11.18",
 		"@types/react": "18.0.26",
@@ -38,7 +38,7 @@
 		"@types/react-window": "1.8.5",
 		"@typescript-eslint/eslint-plugin": "5.47.1",
 		"@typescript-eslint/parser": "5.47.1",
-		"eslint": "8.30.0",
+		"eslint": "8.31.0",
 		"jest": "29.3.1",
 		"jest-mock-extended": "3.0.1",
 		"jest-environment-jsdom": "29.3.1",
@@ -58,7 +58,7 @@
 		"@tanstack/react-table": "8.7.4",
 		"eventemitter3": "5.0.0",
 		"fuse.js": "6.6.2",
-		"luxon": "3.1.1",
+		"luxon": "3.2.0",
 		"monkey-around": "2.3.0",
 		"obsidian-dataview": "0.5.51",
 		"obsidian-projects-types": "0.6.0",
diff --git a/src/cdm/EditorModel.ts b/src/cdm/EditorModel.ts
@@ -2,7 +2,7 @@ import { DatabaseView } from "DatabaseView";
 import { AllHTMLAttributes, DetailedHTMLProps } from "react";
 
 export interface MarkdownEditorProps
-    extends DetailedHTMLProps<AllHTMLAttributes<HTMLTextAreaElement>, any> {
+    extends DetailedHTMLProps<AllHTMLAttributes<HTMLTextAreaElement>, unknown> {
     onEnter: (e: KeyboardEvent) => void;
     onEscape: (e: KeyboardEvent) => void;
     view: DatabaseView;
diff --git a/src/components/cellTypes/CalendarCell.tsx b/src/components/cellTypes/CalendarCell.tsx
@@ -101,7 +101,7 @@ const CalendarCell = (calendarProps: CellComponentProps) => {
   ) : (
     <span
       className={`${c("calendar tabIndex")}`}
-      onClick={handleSpanOnClick}
+      onDoubleClick={handleSpanOnClick}
       style={{ width: column.getSize() }}
       onKeyDown={(e) => {
         if (e.key === "Enter") {
diff --git a/src/components/cellTypes/CalendarTimeCell.tsx b/src/components/cellTypes/CalendarTimeCell.tsx
@@ -103,7 +103,7 @@ const CalendarTimeCell = (calendarTimeProps: CellComponentProps) => {
     <span
       className={`${c("calendar tabIndex")}`}
       style={{ width: column.getSize() }}
-      onClick={handleSpanOnClick}
+      onDoubleClick={handleSpanOnClick}
       onKeyDown={(e) => {
         if (e.key === "Enter") {
           e.preventDefault();
diff --git a/src/components/cellTypes/CheckboxCell.tsx b/src/components/cellTypes/CheckboxCell.tsx
@@ -27,6 +27,10 @@ function CheckboxCell(props: CellComponentProps) {
 
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     const newValue = event.target.checked;
+    editCheckbox(newValue);
+  };
+
+  const editCheckbox = (newValue: boolean) => {
     const newCell = ParseService.parseRowToLiteral(
       checkboxRow,
       tableColumn,
@@ -47,6 +51,13 @@ function CheckboxCell(props: CellComponentProps) {
     <div
       key={`checkbox-div-${row.index}`}
       className={`${c("checkbox tabIndex")}`}
+      tabIndex={0}
+      onKeyDown={(e) => {
+        if (e.key === "Enter") {
+          e.preventDefault();
+          editCheckbox(!checkboxCell);
+        }
+      }}
     >
       <input
         type="checkbox"
diff --git a/src/components/cellTypes/RelationCell.tsx b/src/components/cellTypes/RelationCell.tsx
@@ -108,7 +108,7 @@ const RelationCell = (mdProps: CellComponentProps) => {
   ) : (
     <span
       ref={containerCellRef}
-      onClick={handleOnClick}
+      onDoubleClick={handleOnClick}
       style={{ width: column.getSize() }}
       className={c(
         getAlignmentClassname(
diff --git a/src/components/cellTypes/SelectCell.tsx b/src/components/cellTypes/SelectCell.tsx
@@ -142,7 +142,7 @@ const SelectCell = (popperProps: CellComponentProps) => {
               ["tabIndex"]
             )
           )}
-          onClick={() => setShowSelect(true)}
+          onDoubleClick={() => setShowSelect(true)}
           style={{ width: column.getSize() }}
           onKeyDown={(e) => {
             if (e.key === "Enter") {
diff --git a/src/components/cellTypes/TagsCell.tsx b/src/components/cellTypes/TagsCell.tsx
@@ -146,7 +146,7 @@ const TagsCell = (tagsProps: CellComponentProps) => {
               ["tabIndex", "tags-container"]
             )
           )}
-          onClick={() => setShowSelectTags(true)}
+          onDoubleClick={() => setShowSelectTags(true)}
           style={{ width: column.getSize() }}
           key={`tags-${row.index}-${tableColumn.key}`}
           onKeyDown={(e) => {
diff --git a/src/helpers/Constants.ts b/src/helpers/Constants.ts
@@ -474,10 +474,10 @@ export const SUGGESTER_REGEX = Object.freeze({
   LINK_BLOCK: /\B\[\[([^#\]]+)#?\^([^\]]*)$/,
   EMBED_BLOCK: /\B!\[\[([^#\]]+)#?\^([^\]]*)$/,
 
-  TEXT_ARRAY: /(^\[{1})([^\[]{1}.*)(\]{1})$/g,
+  TEXT_ARRAY: /(^\[{1})([^[]{1}.*)(\]{1})$/g,
   TEXT_OBJECT: /(^\{{1})(.*)(\}{1})$/g,
 
-  CELL_VALID_KEYDOWN: /^[a-zA-Z0-9_\-]{1}$/g,
+  CELL_VALID_KEYDOWN: /^[a-zA-Z0-9_-]{1}$/g,
 });
 
 /******************************************************************************
diff --git a/src/services/MarkdownRenderService.ts b/src/services/MarkdownRenderService.ts
@@ -7,7 +7,6 @@ import { getNormalizedPath } from "helpers/VaultManagement";
 import { CachedMetadata, MarkdownRenderer, setIcon, TFile } from "obsidian";
 import { Literal } from "obsidian-dataview";
 import { LOGGER } from "services/Logger";
-import * as YAML from 'yaml';
 
 const ILLIGAL_CHARS = /[!"#$%&()*+,.:;<=>?@^`{|}~/[\]\\]/g;
 class MarkdownRenderService {
diff --git a/src/services/parseServiceHelpers/MarkdownParser.ts b/src/services/parseServiceHelpers/MarkdownParser.ts
@@ -1,9 +1,8 @@
 import { TypeParser } from "cdm/ServicesModel";
-import { parseLuxonDatetimeToString, parseLuxonDateToString } from "helpers/LuxonHelper";
 import { Literal, WrappedLiteral } from "obsidian-dataview";
 import { DataviewService } from "services/DataviewService";
 import { DateTime } from "luxon";
-import { DEFAULT_SETTINGS, MarkdownBreakerRules } from "helpers/Constants";
+import { MarkdownBreakerRules } from "helpers/Constants";
 import stringifyReplacer from "./StringifyReplacer";
 
 class MarkdownParser extends TypeParser<Literal> {
@@ -38,20 +37,7 @@ class MarkdownParser extends TypeParser<Literal> {
                 auxMarkdown = wrapped.value.markdown();
                 break;
             case 'date':
-                if (wrapped.value.hour === 0 && wrapped.value.minute === 0 && wrapped.value.second === 0) {
-                    // Parse date
-
-                    auxMarkdown = parseLuxonDatetimeToString(
-                        wrapped.value,
-                        this.config.date_format ?? DEFAULT_SETTINGS.local_settings.date_format
-                    );
-                } else {
-                    // Parse datetime
-                    auxMarkdown = parseLuxonDateToString(
-                        wrapped.value,
-                        this.config.datetime_format ?? DEFAULT_SETTINGS.local_settings.datetime_format
-                    );
-                }
+                auxMarkdown = wrapped.value.toISO();
                 break;
             case 'object':
                 if (DateTime.isDateTime(wrapped.value)) {
diff --git a/src/services/parseServiceHelpers/ParseBuilder.ts b/src/services/parseServiceHelpers/ParseBuilder.ts
@@ -17,7 +17,6 @@ class ParseBuilder {
         switch (type) {
             case InputType.MARKDOWN:
                 return new MarkdownParser()
-                    .setConfig(config)
                     .beforeParse(wrapQuotes, isInline);
             case InputType.SORTING:
                 return new SortingParser();
diff --git a/src/typings/dataview.d.ts b/src/typings/dataview.d.ts
@@ -7,7 +7,7 @@ declare module 'obsidian' {
         plugins: {
             enabledPlugins: Set<string>;
             plugins: {
-                [id: string]: any;
+                [id: string]: unknown;
                 dataview?: {
                     api?: DataviewApi;
                 };
@@ -18,14 +18,14 @@ declare module 'obsidian' {
     interface MetadataCache {
         on(
             name: 'dataview:index-ready',
-            callback: (api: DataviewApi) => any,
-            ctx?: any
+            callback: (api: DataviewApi) => unknown,
+            ctx?: unknown
         ): EventRef;
 
         on(
             name: 'dataview:metadata-change',
-            callback: (op: string, file: TFile, oldPath?: string) => any,
-            ctx?: any
+            callback: (op: string, file: TFile, oldPath?: string) => unknown,
+            ctx?: unknown
         ): EventRef;
     }
 }
diff --git a/src/typings/obsidian.d.ts b/src/typings/obsidian.d.ts
@@ -25,7 +25,7 @@ declare module "obsidian" {
      *  WARNING! not exposed by Obsidian, may break in future.
      * @param param 
      */
-    getConfig(param: string): any;
+    getConfig(param: string): unknown;
   }
 
   interface MetadataCache {

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ const SelectCell = (popperProps: CellComponentProps) => {`
`142`	`142`	`["tabIndex"]`
`143`	`143`	`)`
`144`	`144`	`)}`
`145`		`- onClick={() => setShowSelect(true)}`
	`145`	`+ onDoubleClick={() => setShowSelect(true)}`
`146`	`146`	`style={{ width: column.getSize() }}`
`147`	`147`	`onKeyDown={(e) => {`
`148`	`148`	`if (e.key === "Enter") {`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ const TagsCell = (tagsProps: CellComponentProps) => {`
`146`	`146`	`["tabIndex", "tags-container"]`
`147`	`147`	`)`
`148`	`148`	`)}`
`149`		`- onClick={() => setShowSelectTags(true)}`
	`149`	`+ onDoubleClick={() => setShowSelectTags(true)}`
`150`	`150`	`style={{ width: column.getSize() }}`
`151`	`151`	key={`tags-${row.index}-${tableColumn.key}`}
`152`	`152`	`onKeyDown={(e) => {`