@omegagrid/grid 0.11.32 → 0.11.34

package/dist/editors/baseEditor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseEditor.d.ts","sourceRoot":"","sources":["../../src/editors/baseEditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAgC,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAO,MAAM,KAAK,CAAC;AAEtC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,qBAAa,WAAY,SAAQ,KAAK;CAAI;AAE1C,8BAAsB,UAAW,SAAQ,UAAU;IAElD,MAAM,CAAC,UAAU,0BAef;IAEF,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC;IACrB,SAAS,CAAC,MAAM,UAAS;IACzB,SAAS,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC3C,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC;IACrC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC;IAEhC,SAAS,CAAC,KAAK,UAAS;IACxB,IAAI,MAAM,YAAwB;IAElC,SAAS,CAAC,MAAM,UAAQ;IACxB,IAAI,OAAO,YAAyB;IAEpC,SAAS,KAAK,eAAe,YAAgE;IAE7F,QAAQ;;IAaR,QAAQ,CAAC,QAAQ,IAAK,OAAO;IAE7B,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAI,IAAI;IAExC,eAAe,IAAK,MAAM;IAI1B,IAAI;IAaJ,iBAAiB;IAKjB,aAAa;IAOb,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,GAAE,OAAc,EAAE,cAAc,UAAO;IAiBpE,MAAM;IAWN,KAAK;IAeL,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAI,IAAI;IAKhC,UAAU,IAAK,IAAI;CAInB"}
+{"version":3,"file":"baseEditor.d.ts","sourceRoot":"","sources":["../../src/editors/baseEditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA+B,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAO,MAAM,KAAK,CAAC;AAEtC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,qBAAa,WAAY,SAAQ,KAAK;CAAI;AAE1C,8BAAsB,UAAW,SAAQ,UAAU;IAElD,MAAM,CAAC,UAAU,0BAef;IAEF,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC;IACrB,SAAS,CAAC,MAAM,UAAS;IACzB,SAAS,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC3C,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC;IACrC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC;IAEhC,SAAS,CAAC,KAAK,UAAS;IACxB,IAAI,MAAM,YAAwB;IAElC,SAAS,CAAC,MAAM,UAAQ;IACxB,IAAI,OAAO,YAAyB;IAEpC,SAAS,KAAK,eAAe,YAAgE;IAG7F,QAAQ;;IAaR,QAAQ,CAAC,QAAQ,IAAK,OAAO;IAE7B,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAI,IAAI;IAExC,eAAe,IAAK,MAAM;IAI1B,IAAI;IAaJ,iBAAiB;IAKjB,aAAa;IAOb,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,GAAE,OAAc,EAAE,cAAc,UAAO;IAkBpE,MAAM;IAWN,KAAK;IAgBL,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAI,IAAI;IAKhC,UAAU,IAAK,IAAI;CAInB"}

package/dist/editors/baseEditor.js

@@ -1,4 +1,4 @@
-import { validateValue } from "@omegagrid/grid-core";
+import { isValidValue } from "@omegagrid/grid-core";
 import { LitElement, css } from 'lit';
 import { dom } from "@omegagrid/core";
 export class EditorEvent extends Event {
@@ -7,10 +7,11 @@ export class BaseEditor extends LitElement {
     get isOpen() { return this._open; }
     get isValid() { return this._valid; }
     get formulasEnabled() { return this.grid ? this.grid.model.formulasEnabled : true; }
+    // an invalid value is marked also when the cell takes it (validation.allowInvalid)
     validate() {
         this._valid = true;
         if (this.activeCell)
-            this._valid = validateValue(this.activeCellModel, this.getValue());
+            this._valid = isValidValue(this.activeCellModel, this.getValue());
         this.classList.toggle('invalid', !this._valid);
         return this._valid;
     }
@@ -51,6 +52,7 @@ export class BaseEditor extends LitElement {
     }
     open(grid, initialValue = null, updatePosition = true) {
         this._valid = true;
+        this.classList.remove('invalid'); // the editor is shared by the cells, the mark of the previous one must not stay
         this.initialValue = initialValue;
         this._open = true;
         this.grid = grid;
@@ -81,7 +83,8 @@ export class BaseEditor extends LitElement {
             this.grid.table.renderBodyCell(this.activeCellModel);
             this.grid.selecting.showSelector();
             // preventScroll: focus would otherwise natively scroll overflow:hidden
-            // ancestors (e.g. og-container) that manage scrolling themselves
+            // ancestors (e.g. og-container) that manage scrolling themselves;
+            // the editor is still open here: the blur of a text input commits its value (TextEditor)
             this.grid.focus({ preventScroll: true });
             this._open = false;
             this.grid.editing.endEdit();

package/dist/editors/baseEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseEditor.js","sourceRoot":"","sources":["../../src/editors/baseEditor.ts"],"names":[],"mappings":"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","sourcesContent":["import { CellModel, CellValueType, validateValue } from \"@omegagrid/grid-core\";\nimport { LitElement, css } from 'lit';\nimport { dom } from \"@omegagrid/core\";\nimport { Grid } from \"../ui/grid\";\n\nexport class EditorEvent extends Event { }\n\nexport abstract class BaseEditor extends LitElement {\n\n\tstatic baseStyles = css`\n\t\t* { box-sizing: border-box }\n\n\t\t:host {\n\t\t\tdisplay: block;\n\t\t\twidth: 100%;\n\t\t\theight: 100%;\n\t\t\tbackground: var(--og-cell-background);\n\t\t\tz-index: 200;\n\t\t}\n\n\t\t:host(.invalid) input {\n\t\t\tcolor: #ff0000;\n\t\t\tborder: 1px solid #ff0000;\n\t\t}\n\t`;\n\n\tprotected grid: Grid;\n\tprotected cancel = false;\n\tprotected activeCell: HTMLTableCellElement;\n\tprotected activeCellModel: CellModel;\n\tprotected initialValue: unknown;\n\t\n\tprotected _open = false;\n\tget isOpen() { return this._open }\n\n\tprotected _valid = true;\n\tget isValid() { return this._valid }\n\n\tprotected get formulasEnabled() { return this.grid ? this.grid.model.formulasEnabled : true }\n\n\tvalidate() {\n\t\tthis._valid = true;\n\t\tif (this.activeCell) this._valid = validateValue(this.activeCellModel, this.getValue());\n\t\tthis.classList.toggle('invalid', !this._valid);\n\t\treturn this._valid;\n\t}\n\n\tconstructor() {\n\t\tsuper();\n\t\tthis.init();\n\t}\n\n\t\n\tabstract getValue() : unknown;\n\n\tabstract setValue(value: unknown) : void;\n\t\n\tgetDisplayValue() : string {\n\t\treturn null;\n\t}\n\n\tinit() {\n\t\tthis.addEventListener('keydown', e => {\n\t\t\tif (e.key == 'Enter') {\n\t\t\t\tthis.close();\n\t\t\t} else if (e.key == 'Escape') {\n\t\t\t\tthis.cancel = true;\n\t\t\t\tthis.close();\n\t\t\t} else {\n\t\t\t\te.stopPropagation();\n\t\t\t}\n\t\t});\n\t}\n\n\tconnectedCallback() {\n\t\tsuper.connectedCallback();\n\t\tthis.performUpdate();\n\t}\n\n\talignWithCell() {\n\t\tif (!this.activeCell) return;\n\t\tconst offset = dom.getElementOffset(this.activeCell, this.grid);\n\t\tdom.setPosition(this, {t: offset.top * this.grid.zoom, l: offset.left * this.grid.zoom});\n\t\tdom.setSize(this, {w: this.activeCell.offsetWidth, h: this.activeCell.offsetHeight});\n\t}\n\n\topen(grid: Grid, initialValue: unknown = null, updatePosition = true) {\n\t\tthis._valid = true;\n\t\tthis.initialValue = initialValue;\n\t\tthis._open = true;\n\t\tthis.grid = grid;\n\t\tconst cellModel = grid.selecting.activeCell;\n\t\tthis.activeCellModel = cellModel;\n\t\tthis.activeCell = this.grid.table.getCellByModelIndex(cellModel.c, cellModel.r);\n\t\tthis.grid.selector.hide();\n\t\tdom.showElement(this);\n\t\tif (updatePosition) this.alignWithCell();\n\t\tthis.activate(cellModel);\n\t\tif (initialValue !== null) this.setValue(initialValue);\n\t\tdom.zoomElement(this, this.grid.zoom);\n\t\treturn this;\n\t}\n\n\tcommit() {\n\t\tif (this._open && !this.cancel && this.activeCellModel) {\n\t\t\tthis.grid.editing.updateCell(\n\t\t\t\tthis.activeCellModel, \n\t\t\t\t{v: this.getValue() as CellValueType, dv: this.getDisplayValue()}\n\t\t\t);\n\t\t\tthis.grid.rendering.updateCell(this.activeCellModel, true);\n\t\t}\n\t\tthis.cancel = false;\n\t}\n\n\tclose() {\n\t\tif (this._open) {\n\t\t\tthis.deactivate();\n\t\t\tdom.hideElement(this);\n\t\t\tthis.grid.table.renderBodyCell(this.activeCellModel);\n\t\t\tthis.grid.selecting.showSelector();\n\t\t\t// preventScroll: focus would otherwise natively scroll overflow:hidden\n\t\t\t// ancestors (e.g. og-container) that manage scrolling themselves\n\t\t\tthis.grid.focus({preventScroll: true});\n\t\t\tthis._open = false;\n\t\t\tthis.grid.editing.endEdit();\n\t\t}\n\t\tthis.cancel = false;\n\t}\n\n\tactivate(cell: CellModel) : void {\n\t\tthis.activeCellModel = cell;\n\t\tthis.dispatchEvent(new EditorEvent('activate'));\n\t}\n\t\n\tdeactivate() : void {\n\t\tthis.dispatchEvent(new EditorEvent('deactivate'));\n\t}\n\n}"]}
+{"version":3,"file":"baseEditor.js","sourceRoot":"","sources":["../../src/editors/baseEditor.ts"],"names":[],"mappings":"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","sourcesContent":["import { CellModel, CellValueType, isValidValue } from \"@omegagrid/grid-core\";\nimport { LitElement, css } from 'lit';\nimport { dom } from \"@omegagrid/core\";\nimport { Grid } from \"../ui/grid\";\n\nexport class EditorEvent extends Event { }\n\nexport abstract class BaseEditor extends LitElement {\n\n\tstatic baseStyles = css`\n\t\t* { box-sizing: border-box }\n\n\t\t:host {\n\t\t\tdisplay: block;\n\t\t\twidth: 100%;\n\t\t\theight: 100%;\n\t\t\tbackground: var(--og-cell-background);\n\t\t\tz-index: 200;\n\t\t}\n\n\t\t:host(.invalid) input {\n\t\t\tcolor: #ff0000;\n\t\t\tborder: 1px solid #ff0000;\n\t\t}\n\t`;\n\n\tprotected grid: Grid;\n\tprotected cancel = false;\n\tprotected activeCell: HTMLTableCellElement;\n\tprotected activeCellModel: CellModel;\n\tprotected initialValue: unknown;\n\t\n\tprotected _open = false;\n\tget isOpen() { return this._open }\n\n\tprotected _valid = true;\n\tget isValid() { return this._valid }\n\n\tprotected get formulasEnabled() { return this.grid ? this.grid.model.formulasEnabled : true }\n\n\t// an invalid value is marked also when the cell takes it (validation.allowInvalid)\n\tvalidate() {\n\t\tthis._valid = true;\n\t\tif (this.activeCell) this._valid = isValidValue(this.activeCellModel, this.getValue());\n\t\tthis.classList.toggle('invalid', !this._valid);\n\t\treturn this._valid;\n\t}\n\n\tconstructor() {\n\t\tsuper();\n\t\tthis.init();\n\t}\n\n\t\n\tabstract getValue() : unknown;\n\n\tabstract setValue(value: unknown) : void;\n\t\n\tgetDisplayValue() : string {\n\t\treturn null;\n\t}\n\n\tinit() {\n\t\tthis.addEventListener('keydown', e => {\n\t\t\tif (e.key == 'Enter') {\n\t\t\t\tthis.close();\n\t\t\t} else if (e.key == 'Escape') {\n\t\t\t\tthis.cancel = true;\n\t\t\t\tthis.close();\n\t\t\t} else {\n\t\t\t\te.stopPropagation();\n\t\t\t}\n\t\t});\n\t}\n\n\tconnectedCallback() {\n\t\tsuper.connectedCallback();\n\t\tthis.performUpdate();\n\t}\n\n\talignWithCell() {\n\t\tif (!this.activeCell) return;\n\t\tconst offset = dom.getElementOffset(this.activeCell, this.grid);\n\t\tdom.setPosition(this, {t: offset.top * this.grid.zoom, l: offset.left * this.grid.zoom});\n\t\tdom.setSize(this, {w: this.activeCell.offsetWidth, h: this.activeCell.offsetHeight});\n\t}\n\n\topen(grid: Grid, initialValue: unknown = null, updatePosition = true) {\n\t\tthis._valid = true;\n\t\tthis.classList.remove('invalid'); // the editor is shared by the cells, the mark of the previous one must not stay\n\t\tthis.initialValue = initialValue;\n\t\tthis._open = true;\n\t\tthis.grid = grid;\n\t\tconst cellModel = grid.selecting.activeCell;\n\t\tthis.activeCellModel = cellModel;\n\t\tthis.activeCell = this.grid.table.getCellByModelIndex(cellModel.c, cellModel.r);\n\t\tthis.grid.selector.hide();\n\t\tdom.showElement(this);\n\t\tif (updatePosition) this.alignWithCell();\n\t\tthis.activate(cellModel);\n\t\tif (initialValue !== null) this.setValue(initialValue);\n\t\tdom.zoomElement(this, this.grid.zoom);\n\t\treturn this;\n\t}\n\n\tcommit() {\n\t\tif (this._open && !this.cancel && this.activeCellModel) {\n\t\t\tthis.grid.editing.updateCell(\n\t\t\t\tthis.activeCellModel, \n\t\t\t\t{v: this.getValue() as CellValueType, dv: this.getDisplayValue()}\n\t\t\t);\n\t\t\tthis.grid.rendering.updateCell(this.activeCellModel, true);\n\t\t}\n\t\tthis.cancel = false;\n\t}\n\n\tclose() {\n\t\tif (this._open) {\n\t\t\tthis.deactivate();\n\t\t\tdom.hideElement(this);\n\t\t\tthis.grid.table.renderBodyCell(this.activeCellModel);\n\t\t\tthis.grid.selecting.showSelector();\n\t\t\t// preventScroll: focus would otherwise natively scroll overflow:hidden\n\t\t\t// ancestors (e.g. og-container) that manage scrolling themselves;\n\t\t\t// the editor is still open here: the blur of a text input commits its value (TextEditor)\n\t\t\tthis.grid.focus({preventScroll: true});\n\t\t\tthis._open = false;\n\t\t\tthis.grid.editing.endEdit();\n\t\t}\n\t\tthis.cancel = false;\n\t}\n\n\tactivate(cell: CellModel) : void {\n\t\tthis.activeCellModel = cell;\n\t\tthis.dispatchEvent(new EditorEvent('activate'));\n\t}\n\t\n\tdeactivate() : void {\n\t\tthis.dispatchEvent(new EditorEvent('deactivate'));\n\t}\n\n}"]}

package/dist/editors/calendarEditor.d.ts

@@ -1,12 +1,21 @@
 import { BaseEditor } from "./baseEditor";
 import { CellModel } from '@omegagrid/grid-core';
 export declare class CalendarEditor extends BaseEditor {
+    #private;
     calendar: any;
+    protected withTime: boolean;
+    protected timeOnly: boolean;
+    init(): void;
     setValue(value: number | string | Date): void;
-    getValue(): number;
+    getValue(): number | Date;
+    getDateFormat(cell: CellModel): string;
     activate(cell: CellModel): Promise<void>;
+    commit(): void;
     _onChange: () => void;
+    _onDropdownClose: () => void;
+    _onDocumentKeyDown: (e: KeyboardEvent) => void;
     render: () => import("lit-html").TemplateResult<1>;
+    disconnectedCallback(): void;
     close(): void;
 }
 //# sourceMappingURL=calendarEditor.d.ts.map

package/dist/editors/calendarEditor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calendarEditor.d.ts","sourceRoot":"","sources":["../../src/editors/calendarEditor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,qBACa,cAAe,SAAQ,UAAU;IAG7C,QAAQ,EAAE,GAAG,CAAC;IAEd,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAC,MAAM,GAAC,IAAI;IAuBlC,QAAQ,IAAK,MAAM;IAMb,QAAQ,CAAC,IAAI,EAAE,SAAS;IAO9B,SAAS,aAGR;IAED,MAAM,6CAMJ;IAEF,KAAK;CAKL"}
+{"version":3,"file":"calendarEditor.d.ts","sourceRoot":"","sources":["../../src/editors/calendarEditor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAoC,MAAM,sBAAsB,CAAC;AAEnF,qBACa,cAAe,SAAQ,UAAU;;IAG7C,QAAQ,EAAE,GAAG,CAAC;IAGd,SAAS,CAAC,QAAQ,UAAS;IAG3B,SAAS,CAAC,QAAQ,UAAS;IAQ3B,IAAI;IAQJ,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAC,MAAM,GAAC,IAAI;IAuBlC,QAAQ,IAAK,MAAM,GAAC,IAAI;IAOxB,aAAa,CAAC,IAAI,EAAE,SAAS;IAMvB,QAAQ,CAAC,IAAI,EAAE,SAAS;IAoB9B,MAAM;IAUN,SAAS,aAGR;IAED,gBAAgB,aAEf;IAGD,kBAAkB,GAAI,GAAG,aAAa,UAKrC;IAED,MAAM,6CAOJ;IAGF,oBAAoB;IAMpB,KAAK;CAgBL"}

package/dist/editors/calendarEditor.js

@@ -5,65 +5,159 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _CalendarEditor_changed, _CalendarEditor_typedText, _CalendarEditor_closing;
 import { customElement, query } from 'lit/decorators.js';
 import { dates, utils } from "@omegagrid/core";
 import { getLocale } from "@omegagrid/localize";
 import { BaseEditor } from "./baseEditor";
 import { html } from 'lit';
-import { startOfDay } from 'date-fns';
+import { getDateTimeFormat, getTimeFormat } from '@omegagrid/grid-core';
 let CalendarEditor = class CalendarEditor extends BaseEditor {
     constructor() {
         super(...arguments);
+        // a date and time cell (type dt) and a time cell (type tm) hold a Date, a date cell a serial date
+        this.withTime = false;
+        // a time cell picks its time of day alone, without the calendar
+        this.timeOnly = false;
+        // whether the calendar changed the value: an untouched value is not written back (the cell would count as edited)
+        _CalendarEditor_changed.set(this, false);
+        // a text the editing starts with (the key pressed on the cell): typed into the input of the dropdown when it opens
+        _CalendarEditor_typedText.set(this, null);
+        // the editing is ending: a change taken over from the input meanwhile does not end it again
+        _CalendarEditor_closing.set(this, false);
+        // a day pick ends the editing; with time the dropdown stays open for the time row (or shows it alone) and the editing ends with it
         this._onChange = () => {
-            this.commit();
+            __classPrivateFieldSet(this, _CalendarEditor_changed, true, "f");
+            if (!this.withTime && !__classPrivateFieldGet(this, _CalendarEditor_closing, "f"))
+                this.close();
+        };
+        this._onDropdownClose = () => {
+            if (this.isOpen)
+                this.close();
+        };
+        // the dropdown is not inside the editor: a key pressed after a click in it goes to the document
+        this._onDocumentKeyDown = (e) => {
+            if (e.key != 'Escape' || !this.isOpen)
+                return;
+            if (this.calendar.closeInnerList?.())
+                return; // the month or year list of the calendar was open: closed alone
+            this.cancel = true;
             this.close();
         };
         this.render = () => html `
 		<og-calendar-dropdown
 			buttonInput
 			cross
-			@change="${this._onChange}">
+			@change="${this._onChange}"
+			@dropdown.close="${this._onDropdownClose}">
 		</og-calendar-dropdown>
 	`;
     }
+    init() {
+        super.init();
+        // Escape with the month or year list of the calendar open (the focus in the input) closes that list alone
+        this.addEventListener('keydown', (e) => {
+            if (e.key == 'Escape' && this.calendar?.closeInnerList?.())
+                e.stopImmediatePropagation();
+        }, { capture: true });
+    }
     setValue(value) {
         if (value == null) {
             this.calendar.value = null;
             return;
         }
-        if (utils.isString(value)) {
-            const date = dates.parse(value, getLocale());
-            if (date) {
-                this.calendar.value = date;
-                return;
-            }
-        }
-        else if (utils.isNumber(value)) {
-            this.calendar.value = dates.serialDateToDate(value);
+        if (value instanceof Date) {
+            this.calendar.value = value;
             return;
         }
-        else {
-            this.calendar.value = value;
+        if (utils.isNumber(value)) {
+            this.calendar.value = this.withTime ? dates.serialDateToDateTime(value) : dates.serialDateToDate(value);
             return;
         }
-        this.calendar.value = startOfDay(new Date());
+        const date = this.timeOnly
+            ? dates.parseTime(value, getLocale())
+            : (this.withTime ? dates.parseDateTime(value, getLocale()) : dates.parse(value, getLocale()));
+        if (date)
+            this.calendar.value = date;
+        else
+            __classPrivateFieldSet(this, _CalendarEditor_typedText, value, "f"); // not a date yet: the text goes on being typed in the input
     }
     getValue() {
         const date = this.calendar?.value;
-        console.log(date);
-        return date ? dates.dateToSerialDate(date) : null;
+        if (!date)
+            return null;
+        return this.withTime ? date : dates.dateToSerialDate(date);
+    }
+    // the format the cell shows its date in (the dropdown falls back to its own when it is not a date format)
+    getDateFormat(cell) {
+        const options = cell.model.options;
+        return cell.format
+            || (this.timeOnly ? getTimeFormat(options) : (this.withTime ? getDateTimeFormat(options) : options.dateFormat));
     }
     async activate(cell) {
         super.activate(cell);
-        await this.calendar.updateComplete;
-        await this.calendar.open();
+        __classPrivateFieldSet(this, _CalendarEditor_changed, false, "f");
+        __classPrivateFieldSet(this, _CalendarEditor_typedText, null, "f");
+        this.withTime = cell.type === 'dt' || cell.type === 'tm';
+        this.timeOnly = cell.type === 'tm';
+        this.calendar.withTime = cell.type === 'dt';
+        this.calendar.timeOnly = this.timeOnly;
+        this.calendar.dateFormat = this.getDateFormat(cell);
+        // the value goes first, the key the editing started with comes next (BaseEditor.open) and is typed on top of it
         this.setValue(cell.value);
+        document.addEventListener('keydown', this._onDocumentKeyDown);
+        await this.calendar.updateComplete;
+        if (!this.isOpen)
+            return; // closed meanwhile
+        await this.calendar.open(__classPrivateFieldGet(this, _CalendarEditor_typedText, "f"));
+        // the keys typed go on in the input of the dropdown
+        this.calendar.input?.focus();
+        __classPrivateFieldSet(this, _CalendarEditor_typedText, null, "f");
+    }
+    commit() {
+        if (__classPrivateFieldGet(this, _CalendarEditor_changed, "f"))
+            super.commit();
+        else
+            this.cancel = false;
+        __classPrivateFieldSet(this, _CalendarEditor_changed, false, "f");
     }
+    // a grid removed while the editor is open does not close it: the document listener would keep both alive
+    disconnectedCallback() {
+        super.disconnectedCallback();
+        document.removeEventListener('keydown', this._onDocumentKeyDown);
+    }
+    // the editing may end outside the dropdown too (a click on another cell): the picked value is kept unless cancelled
     close() {
+        document.removeEventListener('keydown', this._onDocumentKeyDown);
+        if (this.isOpen && !this.cancel) {
+            // a text typed into the input and not left yet: the click elsewhere ends the editing before the input loses the focus
+            __classPrivateFieldSet(this, _CalendarEditor_closing, true, "f");
+            try {
+                this.calendar.commitInput?.();
+            }
+            finally {
+                __classPrivateFieldSet(this, _CalendarEditor_closing, false, "f");
+            }
+            this.commit();
+        }
         super.close();
         this.calendar.close();
     }
 };
+_CalendarEditor_changed = new WeakMap();
+_CalendarEditor_typedText = new WeakMap();
+_CalendarEditor_closing = new WeakMap();
 __decorate([
     query('og-calendar-dropdown')
 ], CalendarEditor.prototype, "calendar", void 0);

package/dist/editors/calendarEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"calendarEditor.js","sourceRoot":"","sources":["../../src/editors/calendarEditor.ts"],"names":[],"mappings":"AAAA,uDAAuD;;;;;;;AAEvD,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAI/B,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,UAAU;IAAvC;;QAyCN,cAAS,GAAG,GAAG,EAAE;YAChB,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,KAAK,EAAE,CAAC;QACd,CAAC,CAAA;QAED,WAAM,GAAG,GAAG,EAAE,CAAC,IAAI,CAAA;;;;cAIN,IAAI,CAAC,SAAS;;EAE1B,CAAC;IAOH,CAAC;IAtDA,QAAQ,CAAC,KAAyB;QACjC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC;YAC3B,OAAO;QACR,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAe,EAAE,SAAS,EAAE,CAAC,CAAC;YACvD,IAAI,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC;gBAC3B,OAAO;YACR,CAAC;QACF,CAAC;aAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,gBAAgB,CAAC,KAAe,CAAC,CAAC;YAC9D,OAAO;QACR,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAa,CAAC;YACpC,OAAO;QACR,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,QAAQ;QACP,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAe;QACvB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;QACnC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAe,CAAC,CAAC;IACxC,CAAC;IAeJ,KAAK;QACJ,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;CAED,CAAA;AAxDA;IADC,KAAK,CAAC,sBAAsB,CAAC;gDAChB;AAHF,cAAc;IAD1B,aAAa,CAAC,wBAAwB,CAAC;GAC3B,cAAc,CA2D1B","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\n\nimport { customElement, query } from 'lit/decorators.js';\nimport { dates, utils } from \"@omegagrid/core\";\nimport { getLocale } from \"@omegagrid/localize\";\nimport { BaseEditor } from \"./baseEditor\";\nimport { html } from 'lit';\nimport { startOfDay } from 'date-fns';\nimport { CellModel } from '@omegagrid/grid-core';\n\n@customElement('og-grid-calendareditor')\nexport class CalendarEditor extends BaseEditor {\n\n\t@query('og-calendar-dropdown')\n\tcalendar: any;\n\n\tsetValue(value: number|string|Date) {\n\t\tif (value == null) {\n\t\t\tthis.calendar.value = null;\n\t\t\treturn;\n\t\t}\n\n\t\tif (utils.isString(value)) {\n\t\t\tconst date = dates.parse(value as string, getLocale());\n\t\t\tif (date) {\n\t\t\t\tthis.calendar.value = date;\n\t\t\t\treturn;\n\t\t\t}\n\t\t} else if (utils.isNumber(value)) {\n\t\t\tthis.calendar.value = dates.serialDateToDate(value as number);\n\t\t\treturn;\n\t\t} else {\n\t\t\tthis.calendar.value = value as Date;\n\t\t\treturn;\n\t\t}\n\n\t\tthis.calendar.value = startOfDay(new Date());\n\t}\n\n\tgetValue() : number {\n\t\tconst date = this.calendar?.value;\n\t\tconsole.log(date);\n\t\treturn date ? dates.dateToSerialDate(date) : null;\n\t}\n\n\tasync activate(cell: CellModel) {\n        super.activate(cell);\n\t\tawait this.calendar.updateComplete;\n\t\tawait this.calendar.open();\n        this.setValue(cell.value as number);\n    }\n\n\t_onChange = () => {\n\t\tthis.commit();\n\t\tthis.close();\n\t}\t\t\n\n\trender = () => html`\n\t\t<og-calendar-dropdown\n\t\t\tbuttonInput\n\t\t\tcross\n\t\t\t@change=\"${this._onChange}\">\n\t\t</og-calendar-dropdown>\n\t`;\n\t\n\tclose() {\n\t\tsuper.close();\n\t\tthis.calendar.close();\n\t}\n\n}"]}
+{"version":3,"file":"calendarEditor.js","sourceRoot":"","sources":["../../src/editors/calendarEditor.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any */\n\nimport { customElement, query } from 'lit/decorators.js';\nimport { dates, utils } from \"@omegagrid/core\";\nimport { getLocale } from \"@omegagrid/localize\";\nimport { BaseEditor } from \"./baseEditor\";\nimport { html } from 'lit';\nimport { CellModel, getDateTimeFormat, getTimeFormat } from '@omegagrid/grid-core';\n\n@customElement('og-grid-calendareditor')\nexport class CalendarEditor extends BaseEditor {\n\n\t@query('og-calendar-dropdown')\n\tcalendar: any;\n\n\t// a date and time cell (type dt) and a time cell (type tm) hold a Date, a date cell a serial date\n\tprotected withTime = false;\n\n\t// a time cell picks its time of day alone, without the calendar\n\tprotected timeOnly = false;\n\n\t// whether the calendar changed the value: an untouched value is not written back (the cell would count as edited)\n\t#changed = false;\n\n\t// a text the editing starts with (the key pressed on the cell): typed into the input of the dropdown when it opens\n\t#typedText: string = null;\n\n\tinit() {\n\t\tsuper.init();\n\t\t// Escape with the month or year list of the calendar open (the focus in the input) closes that list alone\n\t\tthis.addEventListener('keydown', (e: KeyboardEvent) => {\n\t\t\tif (e.key == 'Escape' && this.calendar?.closeInnerList?.()) e.stopImmediatePropagation();\n\t\t}, {capture: true});\n\t}\n\n\tsetValue(value: number|string|Date) {\n\t\tif (value == null) {\n\t\t\tthis.calendar.value = null;\n\t\t\treturn;\n\t\t}\n\n\t\tif (value instanceof Date) {\n\t\t\tthis.calendar.value = value;\n\t\t\treturn;\n\t\t}\n\n\t\tif (utils.isNumber(value)) {\n\t\t\tthis.calendar.value = this.withTime ? dates.serialDateToDateTime(value as number) : dates.serialDateToDate(value as number);\n\t\t\treturn;\n\t\t}\n\n\t\tconst date = this.timeOnly\n\t\t\t? dates.parseTime(value as string, getLocale())\n\t\t\t: (this.withTime ? dates.parseDateTime(value as string, getLocale()) : dates.parse(value as string, getLocale()));\n\t\tif (date) this.calendar.value = date;\n\t\telse this.#typedText = value as string; // not a date yet: the text goes on being typed in the input\n\t}\n\n\tgetValue() : number|Date {\n\t\tconst date = this.calendar?.value;\n\t\tif (!date) return null;\n\t\treturn this.withTime ? date : dates.dateToSerialDate(date);\n\t}\n\n\t// the format the cell shows its date in (the dropdown falls back to its own when it is not a date format)\n\tgetDateFormat(cell: CellModel) {\n\t\tconst options = cell.model.options;\n\t\treturn cell.format\n\t\t\t|| (this.timeOnly ? getTimeFormat(options) : (this.withTime ? getDateTimeFormat(options) : options.dateFormat));\n\t}\n\n\tasync activate(cell: CellModel) {\n\t\tsuper.activate(cell);\n\t\tthis.#changed = false;\n\t\tthis.#typedText = null;\n\t\tthis.withTime = cell.type === 'dt' || cell.type === 'tm';\n\t\tthis.timeOnly = cell.type === 'tm';\n\t\tthis.calendar.withTime = cell.type === 'dt';\n\t\tthis.calendar.timeOnly = this.timeOnly;\n\t\tthis.calendar.dateFormat = this.getDateFormat(cell);\n\t\t// the value goes first, the key the editing started with comes next (BaseEditor.open) and is typed on top of it\n\t\tthis.setValue(cell.value as number);\n\t\tdocument.addEventListener('keydown', this._onDocumentKeyDown);\n\t\tawait this.calendar.updateComplete;\n\t\tif (!this.isOpen) return; // closed meanwhile\n\t\tawait this.calendar.open(this.#typedText);\n\t\t// the keys typed go on in the input of the dropdown\n\t\tthis.calendar.input?.focus();\n\t\tthis.#typedText = null;\n\t}\n\n\tcommit() {\n\t\tif (this.#changed) super.commit();\n\t\telse this.cancel = false;\n\t\tthis.#changed = false;\n\t}\n\n\t// the editing is ending: a change taken over from the input meanwhile does not end it again\n\t#closing = false;\n\n\t// a day pick ends the editing; with time the dropdown stays open for the time row (or shows it alone) and the editing ends with it\n\t_onChange = () => {\n\t\tthis.#changed = true;\n\t\tif (!this.withTime && !this.#closing) this.close();\n\t}\n\n\t_onDropdownClose = () => {\n\t\tif (this.isOpen) this.close();\n\t}\n\n\t// the dropdown is not inside the editor: a key pressed after a click in it goes to the document\n\t_onDocumentKeyDown = (e: KeyboardEvent) => {\n\t\tif (e.key != 'Escape' || !this.isOpen) return;\n\t\tif (this.calendar.closeInnerList?.()) return; // the month or year list of the calendar was open: closed alone\n\t\tthis.cancel = true;\n\t\tthis.close();\n\t}\n\n\trender = () => html`\n\t\t<og-calendar-dropdown\n\t\t\tbuttonInput\n\t\t\tcross\n\t\t\t@change=\"${this._onChange}\"\n\t\t\t@dropdown.close=\"${this._onDropdownClose}\">\n\t\t</og-calendar-dropdown>\n\t`;\n\n\t// a grid removed while the editor is open does not close it: the document listener would keep both alive\n\tdisconnectedCallback() {\n\t\tsuper.disconnectedCallback();\n\t\tdocument.removeEventListener('keydown', this._onDocumentKeyDown);\n\t}\n\n\t// the editing may end outside the dropdown too (a click on another cell): the picked value is kept unless cancelled\n\tclose() {\n\t\tdocument.removeEventListener('keydown', this._onDocumentKeyDown);\n\t\tif (this.isOpen && !this.cancel) {\n\t\t\t// a text typed into the input and not left yet: the click elsewhere ends the editing before the input loses the focus\n\t\t\tthis.#closing = true;\n\t\t\ttry {\n\t\t\t\tthis.calendar.commitInput?.();\n\t\t\t} finally {\n\t\t\t\tthis.#closing = false;\n\t\t\t}\n\t\t\tthis.commit();\n\t\t}\n\t\tsuper.close();\n\t\tthis.calendar.close();\n\t}\n\n}"]}

package/dist/editors/dateEditor.d.ts

@@ -1,8 +1,10 @@
 import { TextEditor } from "./textEditor";
 import { CellModel } from "@omegagrid/grid-core";
 export declare class DateEditor extends TextEditor {
+    protected withTime: boolean;
+    protected timeOnly: boolean;
     setValue(value: number | string | Date): void;
-    getValue(): number;
+    getValue(): number | Date;
     activate(cell: CellModel): void;
 }
 //# sourceMappingURL=dateEditor.d.ts.map

package/dist/editors/dateEditor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dateEditor.d.ts","sourceRoot":"","sources":["../../src/editors/dateEditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,qBACa,UAAW,SAAQ,UAAU;IAEzC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAC,MAAM,GAAC,IAAI;IAalC,QAAQ,IAAK,MAAM;IAKnB,QAAQ,CAAC,IAAI,EAAE,SAAS;CAKxB"}
+{"version":3,"file":"dateEditor.d.ts","sourceRoot":"","sources":["../../src/editors/dateEditor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,qBACa,UAAW,SAAQ,UAAU;IAGzC,SAAS,CAAC,QAAQ,UAAS;IAG3B,SAAS,CAAC,QAAQ,UAAS;IAE3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAC,MAAM,GAAC,IAAI;IAoBlC,QAAQ,IAAK,MAAM,GAAC,IAAI;IAOxB,QAAQ,CAAC,IAAI,EAAE,SAAS;CAOxB"}

package/dist/editors/dateEditor.js

@@ -6,27 +6,46 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { TextEditor } from "./textEditor";
 import { customElement } from 'lit/decorators.js';
-import { dates } from "@omegagrid/core";
+import { dates, utils } from "@omegagrid/core";
 import { getLocale } from "@omegagrid/localize";
 let DateEditor = class DateEditor extends TextEditor {
+    constructor() {
+        super(...arguments);
+        // a date and time cell (type dt) holds a Date, a date cell a serial date
+        this.withTime = false;
+        // a time cell (type tm) holds a Date of its time of day
+        this.timeOnly = false;
+    }
     setValue(value) {
         if (value == null) {
             this.input.value = '';
             return;
         }
+        // a text is shown as it is: the key that started the editing (a date is formatted only from its Date or serial date)
+        if (utils.isString(value)) {
+            this.input.value = value;
+            return;
+        }
         try {
-            this.input.value = dates.getDateFormatter(getLocale(), 'yyyy-MM-dd')(value);
+            const format = this.timeOnly ? 'HH:mm:ss' : (this.withTime ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd');
+            this.input.value = dates.getDateFormatter(getLocale(), format)(value);
         }
         catch (error) {
-            this.input.value = value ?? '';
+            this.input.value = value.toString();
         }
     }
     getValue() {
+        if (this.timeOnly)
+            return dates.parseTime(this.input.value, getLocale());
+        if (this.withTime)
+            return dates.parseDateTime(this.input.value, getLocale());
         const date = dates.parse(this.input.value, getLocale());
         return date ? dates.dateToSerialDate(date) : null;
     }
     activate(cell) {
         super.activate(cell);
+        this.withTime = cell.type === 'dt';
+        this.timeOnly = cell.type === 'tm';
         this.setValue(cell.value);
     }
 };

package/dist/editors/dateEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"dateEditor.js","sourceRoot":"","sources":["../../src/editors/dateEditor.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIzC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IAEzC,QAAQ,CAAC,KAAyB;QACjC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC;YACtB,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAe,IAAI,EAAE,CAAC;QAC1C,CAAC;IACF,CAAC;IAED,QAAQ;QACP,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC;IAED,QAAQ,CAAC,IAAe;QACjB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAe,CAAC,CAAC;IACxC,CAAC;CAEJ,CAAA;AAzBY,UAAU;IADtB,aAAa,CAAC,oBAAoB,CAAC;GACvB,UAAU,CAyBtB","sourcesContent":["import { TextEditor } from \"./textEditor\";\nimport { customElement } from 'lit/decorators.js';\nimport { dates } from \"@omegagrid/core\";\nimport { getLocale } from \"@omegagrid/localize\";\nimport { CellModel } from \"@omegagrid/grid-core\";\n\n@customElement('og-grid-dateeditor')\nexport class DateEditor extends TextEditor {\n\n\tsetValue(value: number|string|Date) {\n\t\tif (value == null) {\n\t\t\tthis.input.value = '';\n\t\t\treturn;\n\t\t}\n\n\t\ttry {\n\t\t\tthis.input.value = dates.getDateFormatter(getLocale(), 'yyyy-MM-dd')(value);\n\t\t} catch (error) {\n\t\t\tthis.input.value = value as string ?? '';\t\t\n\t\t}\n\t}\n\n\tgetValue() : number {\n\t\tconst date = dates.parse(this.input.value, getLocale());\n\t\treturn date ? dates.dateToSerialDate(date) : null;\n\t}\n\n\tactivate(cell: CellModel) {\n        super.activate(cell);\n        this.setValue(cell.value as number);\n    }\n\n}"]}
+{"version":3,"file":"dateEditor.js","sourceRoot":"","sources":["../../src/editors/dateEditor.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAIzC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IAAnC;;QAEN,yEAAyE;QAC/D,aAAQ,GAAG,KAAK,CAAC;QAE3B,wDAAwD;QAC9C,aAAQ,GAAG,KAAK,CAAC;IAoC5B,CAAC;IAlCA,QAAQ,CAAC,KAAyB;QACjC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC;YACtB,OAAO;QACR,CAAC;QAED,qHAAqH;QACrH,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAe,CAAC;YACnC,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;YACnG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QACrC,CAAC;IACF,CAAC;IAED,QAAQ;QACP,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACzE,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAC7E,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC;IAED,QAAQ,CAAC,IAAe;QACjB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;QAC7B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAe,CAAC,CAAC;IACxC,CAAC;CAEJ,CAAA;AA1CY,UAAU;IADtB,aAAa,CAAC,oBAAoB,CAAC;GACvB,UAAU,CA0CtB","sourcesContent":["import { TextEditor } from \"./textEditor\";\nimport { customElement } from 'lit/decorators.js';\nimport { dates, utils } from \"@omegagrid/core\";\nimport { getLocale } from \"@omegagrid/localize\";\nimport { CellModel } from \"@omegagrid/grid-core\";\n\n@customElement('og-grid-dateeditor')\nexport class DateEditor extends TextEditor {\n\n\t// a date and time cell (type dt) holds a Date, a date cell a serial date\n\tprotected withTime = false;\n\n\t// a time cell (type tm) holds a Date of its time of day\n\tprotected timeOnly = false;\n\n\tsetValue(value: number|string|Date) {\n\t\tif (value == null) {\n\t\t\tthis.input.value = '';\n\t\t\treturn;\n\t\t}\n\n\t\t// a text is shown as it is: the key that started the editing (a date is formatted only from its Date or serial date)\n\t\tif (utils.isString(value)) {\n\t\t\tthis.input.value = value as string;\n\t\t\treturn;\n\t\t}\n\n\t\ttry {\n\t\t\tconst format = this.timeOnly ? 'HH:mm:ss' : (this.withTime ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd');\n\t\t\tthis.input.value = dates.getDateFormatter(getLocale(), format)(value);\n\t\t} catch (error) {\n\t\t\tthis.input.value = value.toString();\n\t\t}\n\t}\n\n\tgetValue() : number|Date {\n\t\tif (this.timeOnly) return dates.parseTime(this.input.value, getLocale());\n\t\tif (this.withTime) return dates.parseDateTime(this.input.value, getLocale());\n\t\tconst date = dates.parse(this.input.value, getLocale());\n\t\treturn date ? dates.dateToSerialDate(date) : null;\n\t}\n\n\tactivate(cell: CellModel) {\n        super.activate(cell);\n\t\tthis.withTime = cell.type === 'dt';\n\t\tthis.timeOnly = cell.type === 'tm';\n        this.setValue(cell.value as number);\n    }\n\n}\n"]}

package/dist/editors/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/editors/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE/D,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAEhC,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;AAW1D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAI,iBAAiB,CAEnE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/editors/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE/D,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAEhC,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;AAa1D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAI,iBAAiB,CAEnE"}

package/dist/editors/index.js

@@ -19,6 +19,8 @@ const editorMap = new Map([
     ['s', () => new DropdownEditor()],
     ['m', () => new DropdownEditor()],
     ['d', (_cell, options) => options?.dateCalendarEditor ? new CalendarEditor() : new DateEditor()],
+    ['dt', (_cell, options) => options?.dateCalendarEditor ? new CalendarEditor() : new DateEditor()],
+    ['tm', (_cell, options) => options?.dateCalendarEditor ? new CalendarEditor() : new DateEditor()],
 ]);
 export function getEditorFactory(type) {
     return editorMap.get(editorMap.has(type) ? type : 't');

package/dist/editors/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/editors/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAIhC,MAAM,SAAS,GAAG,IAAI,GAAG,CAA8B;IACtD,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;IAC7B,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC;IAC/B,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,EAAE,CAAC;IACjC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,EAAE,CAAC;IACjC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,EAAE,CAAC;IACjC,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;CAChG,CAAC,CAAC;AAEH,MAAM,UAAU,gBAAgB,CAAC,IAAc;IAC9C,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAE,CAAC;AACzD,CAAC","sourcesContent":["import { BaseEditor } from \"./baseEditor\";\nimport { CheckboxEditor } from \"./checkboxEditor\";\nimport { NumberEditor } from \"./numberEditor\";\nimport { TextEditor } from \"./textEditor\";\nimport { DropdownEditor } from \"./dropdownEditor\";\nimport { DateEditor } from \"./dateEditor\";\nimport { CalendarEditor } from \"./calendarEditor\";\nimport { CellType, EditorFactory } from \"@omegagrid/grid-core\";\n\nexport * from \"./baseEditor\";\nexport * from \"./checkboxEditor\";\nexport * from \"./numberEditor\";\nexport * from \"./textEditor\";\nexport * from \"./dropdownEditor\";\nexport * from \"./dateEditor\";\nexport * from \"./calendarEditor\";\nexport * from \"./formulaEditor\";\n\nexport type GridEditorFactory = EditorFactory<BaseEditor>;\n\nconst editorMap = new Map<CellType, GridEditorFactory>([\n\t['t', () => new TextEditor()],\n\t['n', () => new NumberEditor()],\n\t['b', () => new CheckboxEditor()],\n\t['s', () => new DropdownEditor()],\n\t['m', () => new DropdownEditor()],\n\t['d', (_cell, options) => options?.dateCalendarEditor ? new CalendarEditor() : new DateEditor()],\n]);\n\nexport function getEditorFactory(type: CellType) : GridEditorFactory {\n\treturn editorMap.get(editorMap.has(type) ? type : 't')!;\n}"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/editors/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAIhC,MAAM,SAAS,GAAG,IAAI,GAAG,CAA8B;IACtD,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;IAC7B,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC;IAC/B,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,EAAE,CAAC;IACjC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,EAAE,CAAC;IACjC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,EAAE,CAAC;IACjC,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;IAChG,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;IACjG,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC;CACjG,CAAC,CAAC;AAEH,MAAM,UAAU,gBAAgB,CAAC,IAAc;IAC9C,OAAO,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAE,CAAC;AACzD,CAAC","sourcesContent":["import { BaseEditor } from \"./baseEditor\";\nimport { CheckboxEditor } from \"./checkboxEditor\";\nimport { NumberEditor } from \"./numberEditor\";\nimport { TextEditor } from \"./textEditor\";\nimport { DropdownEditor } from \"./dropdownEditor\";\nimport { DateEditor } from \"./dateEditor\";\nimport { CalendarEditor } from \"./calendarEditor\";\nimport { CellType, EditorFactory } from \"@omegagrid/grid-core\";\n\nexport * from \"./baseEditor\";\nexport * from \"./checkboxEditor\";\nexport * from \"./numberEditor\";\nexport * from \"./textEditor\";\nexport * from \"./dropdownEditor\";\nexport * from \"./dateEditor\";\nexport * from \"./calendarEditor\";\nexport * from \"./formulaEditor\";\n\nexport type GridEditorFactory = EditorFactory<BaseEditor>;\n\nconst editorMap = new Map<CellType, GridEditorFactory>([\n\t['t', () => new TextEditor()],\n\t['n', () => new NumberEditor()],\n\t['b', () => new CheckboxEditor()],\n\t['s', () => new DropdownEditor()],\n\t['m', () => new DropdownEditor()],\n\t['d', (_cell, options) => options?.dateCalendarEditor ? new CalendarEditor() : new DateEditor()],\n\t['dt', (_cell, options) => options?.dateCalendarEditor ? new CalendarEditor() : new DateEditor()],\n\t['tm', (_cell, options) => options?.dateCalendarEditor ? new CalendarEditor() : new DateEditor()],\n]);\n\nexport function getEditorFactory(type: CellType) : GridEditorFactory {\n\treturn editorMap.get(editorMap.has(type) ? type : 't')!;\n}"]}

package/dist/filters/dateFilter.d.ts

@@ -0,0 +1,54 @@
+import { BaseFilter } from "./baseFilter";
+import { Dropdown } from '@omegagrid/core';
+import { DateFilterType } from '@omegagrid/grid-core';
+/** The `rangechange` event of og-calendar in the range mode (omega-grid does not depend on omega-calendar) */
+type RangeChangeEvent = Event & {
+    from: Date;
+    to: Date | null;
+};
+/** og-calendar in the range mode, as far as the filter uses it */
+type RangeCalendar = HTMLElement & {
+    range: boolean;
+    rangeStart: Date | null;
+    rangeEnd: Date | null;
+    date: Date;
+};
+/**
+ * Text filter of the date (d), date and time (dt) and time (tm) columns. The user types a date expression such as
+ * `6.11.2026` (the whole day), `6.11.2026..20.11.2026`, `> 6.11.2026`, `11.2026` (the month), `2026` (the year),
+ * `6.11.2026 14:00` (the minute), `9:00..17:00` (a time column), `<= 6.11.2026 or 9.11.2026`; see grid-core's
+ * `parseDateExpression`. A date column has a calendar button too: a day or a range of days picked in the calendar
+ * with two clicks is written into the input and applied. The expression is applied by Enter: the calendar button takes
+ * the place of the filter button of the other text filters.
+ */
+export declare class DateFilter extends BaseFilter {
+    static styles: import("lit").CSSResult[];
+    private inputRef;
+    get input(): HTMLInputElement;
+    private clearButtonRef;
+    get clearButton(): HTMLButtonElement;
+    private dropdownRef;
+    get calendarDropdown(): Dropdown;
+    private calendarRef;
+    get calendar(): RangeCalendar;
+    get type(): DateFilterType;
+    /** a time column has no calendar */
+    get hasCalendar(): boolean;
+    private get dayFormat();
+    private formatDay;
+    /** The text of a term: the expression as typed */
+    private termText;
+    private _apply;
+    _onClearClick(): void;
+    _onInputKeyDown(e: KeyboardEvent): void;
+    _onCalendarOpen: () => void;
+    _onInput: () => void;
+    private _syncCalendar;
+    _onRangeChange: (e: RangeChangeEvent) => void;
+    private get examples();
+    render: () => import("lit-html").TemplateResult<1>;
+    activate(): void;
+    deactivate(): void;
+}
+export {};
+//# sourceMappingURL=dateFilter.d.ts.map

package/dist/filters/dateFilter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dateFilter.d.ts","sourceRoot":"","sources":["../../src/filters/dateFilter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,OAAO,EAAE,QAAQ,EAAS,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAuB,MAAM,sBAAsB,CAAC;AAG3E,8GAA8G;AAC9G,KAAK,gBAAgB,GAAG,KAAK,GAAG;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,EAAE,EAAE,IAAI,GAAC,IAAI,CAAA;CAAE,CAAC;AAE9D,kEAAkE;AAClE,KAAK,aAAa,GAAG,WAAW,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,IAAI,GAAC,IAAI,CAAC;IAAC,QAAQ,EAAE,IAAI,GAAC,IAAI,CAAC;IAAC,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC;AAE9G;;;;;;;GAOG;AACH,qBACa,UAAW,SAAQ,UAAU;IAEzC,MAAM,CAAC,MAAM,4BAsCV;IAEH,OAAO,CAAC,QAAQ,CAAiC;IACjD,IAAI,KAAK,qBAAiC;IAE1C,OAAO,CAAC,cAAc,CAAkC;IACxD,IAAI,WAAW,sBAAuC;IAEtD,OAAO,CAAC,WAAW,CAAyB;IAC5C,IAAI,gBAAgB,aAAoC;IAExD,OAAO,CAAC,WAAW,CAA8B;IACjD,IAAI,QAAQ,kBAAoC;IAEhD,IAAI,IAAI,IAAI,cAAc,CAGzB;IAED,oCAAoC;IACpC,IAAI,WAAW,YAAgC;IAG/C,OAAO,KAAK,SAAS,GAAmC;IAExD,OAAO,CAAC,SAAS;IAEjB,kDAAkD;IAClD,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,MAAM;IASd,aAAa;IAKb,eAAe,CAAC,CAAC,EAAE,aAAa;IAShC,eAAe,aAA8B;IAE7C,QAAQ,aAEP;IAED,OAAO,CAAC,aAAa;IAcrB,cAAc,GAAI,GAAG,gBAAgB,UAMpC;IAED,OAAO,KAAK,QAAQ,GAMnB;IAED,MAAM,6CAiBJ;IAEF,QAAQ;IAQR,UAAU;CAKV"}