@omegagrid/grid 0.11.32 → 0.11.34

package/dist/filters/dateFilter.js

@@ -0,0 +1,179 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+};
+import constants from "../constants";
+import { customElement } from 'lit/decorators.js';
+import { BaseFilter } from "./baseFilter";
+import { html, css } from 'lit';
+import { createRef, ref } from 'lit/directives/ref.js';
+import { msg } from '@omegagrid/localize';
+import { dates } from '@omegagrid/core';
+import { parseDateExpression } from '@omegagrid/grid-core';
+import { isSameDay, startOfDay, subMilliseconds } from 'date-fns';
+/**
+ * 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.
+ */
+let DateFilter = class DateFilter extends BaseFilter {
+    constructor() {
+        super(...arguments);
+        this.inputRef = createRef();
+        this.clearButtonRef = createRef();
+        this.dropdownRef = createRef();
+        this.calendarRef = createRef();
+        // the calendar shows the days of the typed expression picked, when it is a single day or a range of days: when it
+        // opens, and as the text is edited while it is open
+        this._onCalendarOpen = () => this._syncCalendar();
+        this._onInput = () => {
+            if (this.calendarDropdown?.isOpen)
+                this._syncCalendar();
+        };
+        // the second click completes the range: it is written into the input and applied
+        this._onRangeChange = (e) => {
+            if (!e.to || !this.input)
+                return;
+            this.input.value = isSameDay(e.from, e.to) ? this.formatDay(e.from) : `${this.formatDay(e.from)}..${this.formatDay(e.to)}`;
+            this.calendarDropdown?.close();
+            this._apply();
+            this.deactivate();
+        };
+        this.render = () => html `
+		<div class="filter-inner">
+			<input ${ref(this.inputRef)}
+				type="text"
+				title="${msg('Examples:')} ${this.examples}"
+				@keydown="${this._onInputKeyDown}"
+				@input="${this._onInput}"
+				.value="${this.termText(this.currentValue)}">
+			${this.hasCalendar ? html `
+				<og-dropdown ${ref(this.dropdownRef)} icon="calendar-days" color="accent" alignment="right" noCaret
+					title="${msg('Pick a day or a range of days: the first click starts it, the second ends it')}"
+					@dropdown.open="${this._onCalendarOpen}">
+					<og-calendar ${ref(this.calendarRef)} slot="content" range @rangechange="${this._onRangeChange}"></og-calendar>
+				</og-dropdown>
+			` : ''}
+			<og-button icon="xmark" color="red" ${ref(this.clearButtonRef)} @mousedown="${this._onClearClick}"></og-button>
+		</div>
+	`;
+    }
+    get input() { return this.inputRef.value; }
+    get clearButton() { return this.clearButtonRef.value; }
+    get calendarDropdown() { return this.dropdownRef.value; }
+    get calendar() { return this.calendarRef.value; }
+    get type() {
+        const t = this.columnModel?.type;
+        return (t === 'dt' || t === 'tm') ? t : 'd';
+    }
+    /** a time column has no calendar */
+    get hasCalendar() { return this.type !== 'tm'; }
+    // the format the calendar writes a day in: the date format of the locale, read back by the parser
+    get dayFormat() { return dates.getDateFormat(); }
+    formatDay(day) { return dates.format(day, this.dayFormat); }
+    /** The text of a term: the expression as typed */
+    termText(term) {
+        return term == null ? '' : term.toString();
+    }
+    _apply() {
+        const value = (this.input?.value ?? '').trim();
+        if (value === '') {
+            this.clearFilter();
+        }
+        else {
+            this.filter(value);
+        }
+    }
+    _onClearClick() {
+        if (this.input)
+            this.input.value = '';
+        this.clearFilter();
+    }
+    _onInputKeyDown(e) {
+        if (e.key == 'Enter') {
+            this._apply();
+            this.deactivate();
+        }
+    }
+    _syncCalendar() {
+        const calendar = this.calendar;
+        if (!calendar)
+            return;
+        const groups = parseDateExpression(this.input?.value ?? '', this.type);
+        const bounds = groups?.length === 1 ? groups[0] : null;
+        const from = bounds?.find(b => b.op === '>=')?.value ?? null;
+        const before = bounds?.find(b => b.op === '<')?.value ?? null;
+        calendar.rangeStart = from;
+        calendar.rangeEnd = from && before ? startOfDay(subMilliseconds(before, 1)) : null; // the last day of the range
+        // the calendar shows the month of the start, of today without one
+        calendar.date = startOfDay(from ?? new Date());
+    }
+    get examples() {
+        if (this.type === 'tm')
+            return '9:00, 9:00..17:00, >= 12:00, < 8:00 or > 16:00';
+        const day = this.formatDay(new Date(2026, 10, 6));
+        const other = this.formatDay(new Date(2026, 10, 20));
+        const time = this.type === 'dt' ? `, ${day} 14:00` : '';
+        return `${day}, ${day}..${other}, > ${day}, 11.2026, 2026, != 2026${time}`;
+    }
+    activate() {
+        super.activate();
+        if (this.input) {
+            this.input.value = this.termText(this.currentValue);
+        }
+        setTimeout(() => this.input?.select(), 100);
+    }
+    deactivate() {
+        this.calendarDropdown?.close();
+        super.deactivate();
+    }
+};
+DateFilter.styles = [...BaseFilter.styles, css `
+		.filter-inner {
+			height: 100%;
+			display: flex;
+			flex-direction: row;
+			overflow: hidden;
+		}
+
+		input {
+			border-width: 0;
+			outline: none;
+			height: 100%;
+			flex: 1;
+			width: 100%;
+			min-width: 0;
+			background-color: var(--og-background-color);
+			color: var(--og-text-color);
+		}
+
+		og-button, og-dropdown {
+			flex: 0;
+			min-width: 18px;
+			max-width: 18px;
+			padding: 0;
+			text-align: center;
+			border-width: 0;
+			border-radius: 0;
+			height: 100%;
+		}
+
+		og-dropdown {
+			display: flex;
+		}
+
+		og-calendar {
+			width: 300px;
+			height: 260px;
+		}
+	`];
+DateFilter = __decorate([
+    customElement(`${constants.PREFIX}-filter-date`)
+], DateFilter);
+export { DateFilter };
+//# sourceMappingURL=dateFilter.js.map

package/dist/filters/dateFilter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dateFilter.js","sourceRoot":"","sources":["../../src/filters/dateFilter.ts"],"names":[],"mappings":"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","sourcesContent":["import constants from \"../constants\";\nimport { customElement } from 'lit/decorators.js';\nimport { BaseFilter } from \"./baseFilter\";\nimport { html, css } from 'lit';\nimport { createRef, ref } from 'lit/directives/ref.js';\nimport { msg } from '@omegagrid/localize';\nimport { Dropdown, dates } from '@omegagrid/core';\nimport { DateFilterType, parseDateExpression } from '@omegagrid/grid-core';\nimport { isSameDay, startOfDay, subMilliseconds } from 'date-fns';\n\n/** The `rangechange` event of og-calendar in the range mode (omega-grid does not depend on omega-calendar) */\ntype RangeChangeEvent = Event & { from: Date, to: Date|null };\n\n/** og-calendar in the range mode, as far as the filter uses it */\ntype RangeCalendar = HTMLElement & { range: boolean, rangeStart: Date|null, rangeEnd: Date|null, date: Date };\n\n/**\n * Text filter of the date (d), date and time (dt) and time (tm) columns. The user types a date expression such as\n * `6.11.2026` (the whole day), `6.11.2026..20.11.2026`, `> 6.11.2026`, `11.2026` (the month), `2026` (the year),\n * `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\n * `parseDateExpression`. A date column has a calendar button too: a day or a range of days picked in the calendar\n * with two clicks is written into the input and applied. The expression is applied by Enter: the calendar button takes\n * the place of the filter button of the other text filters.\n */\n@customElement(`${constants.PREFIX}-filter-date`)\nexport class DateFilter extends BaseFilter {\n\n\tstatic styles = [...BaseFilter.styles, css`\n\t\t.filter-inner {\n\t\t\theight: 100%;\n\t\t\tdisplay: flex;\n\t\t\tflex-direction: row;\n\t\t\toverflow: hidden;\n\t\t}\n\n\t\tinput {\n\t\t\tborder-width: 0;\n\t\t\toutline: none;\n\t\t\theight: 100%;\n\t\t\tflex: 1;\n\t\t\twidth: 100%;\n\t\t\tmin-width: 0;\n\t\t\tbackground-color: var(--og-background-color);\n\t\t\tcolor: var(--og-text-color);\n\t\t}\n\n\t\tog-button, og-dropdown {\n\t\t\tflex: 0;\n\t\t\tmin-width: 18px;\n\t\t\tmax-width: 18px;\n\t\t\tpadding: 0;\n\t\t\ttext-align: center;\n\t\t\tborder-width: 0;\n\t\t\tborder-radius: 0;\n\t\t\theight: 100%;\n\t\t}\n\n\t\tog-dropdown {\n\t\t\tdisplay: flex;\n\t\t}\n\n\t\tog-calendar {\n\t\t\twidth: 300px;\n\t\t\theight: 260px;\n\t\t}\n\t`];\n\n\tprivate inputRef = createRef<HTMLInputElement>();\n\tget input() { return this.inputRef.value }\n\n\tprivate clearButtonRef = createRef<HTMLButtonElement>();\n\tget clearButton() { return this.clearButtonRef.value }\n\n\tprivate dropdownRef = createRef<Dropdown>();\n\tget calendarDropdown() { return this.dropdownRef.value }\n\n\tprivate calendarRef = createRef<RangeCalendar>();\n\tget calendar() { return this.calendarRef.value }\n\n\tget type(): DateFilterType {\n\t\tconst t = this.columnModel?.type;\n\t\treturn (t === 'dt' || t === 'tm') ? t : 'd';\n\t}\n\n\t/** a time column has no calendar */\n\tget hasCalendar() { return this.type !== 'tm' }\n\n\t// the format the calendar writes a day in: the date format of the locale, read back by the parser\n\tprivate get dayFormat() { return dates.getDateFormat() }\n\n\tprivate formatDay(day: Date) { return dates.format(day, this.dayFormat) }\n\n\t/** The text of a term: the expression as typed */\n\tprivate termText(term: unknown): string {\n\t\treturn term == null ? '' : term.toString();\n\t}\n\n\tprivate _apply() {\n\t\tconst value = (this.input?.value ?? '').trim();\n\t\tif (value === '') {\n\t\t\tthis.clearFilter();\n\t\t} else {\n\t\t\tthis.filter(value);\n\t\t}\n\t}\n\n\t_onClearClick() {\n\t\tif (this.input) this.input.value = '';\n\t\tthis.clearFilter();\n\t}\n\n\t_onInputKeyDown(e: KeyboardEvent) {\n\t\tif (e.key == 'Enter') {\n\t\t\tthis._apply();\n\t\t\tthis.deactivate();\n\t\t}\n\t}\n\n\t// the calendar shows the days of the typed expression picked, when it is a single day or a range of days: when it\n\t// opens, and as the text is edited while it is open\n\t_onCalendarOpen = () => this._syncCalendar();\n\n\t_onInput = () => {\n\t\tif (this.calendarDropdown?.isOpen) this._syncCalendar();\n\t}\n\n\tprivate _syncCalendar() {\n\t\tconst calendar = this.calendar;\n\t\tif (!calendar) return;\n\t\tconst groups = parseDateExpression(this.input?.value ?? '', this.type);\n\t\tconst bounds = groups?.length === 1 ? groups[0] : null;\n\t\tconst from = bounds?.find(b => b.op === '>=')?.value ?? null;\n\t\tconst before = bounds?.find(b => b.op === '<')?.value ?? null;\n\t\tcalendar.rangeStart = from;\n\t\tcalendar.rangeEnd = from && before ? startOfDay(subMilliseconds(before, 1)) : null; // the last day of the range\n\t\t// the calendar shows the month of the start, of today without one\n\t\tcalendar.date = startOfDay(from ?? new Date());\n\t}\n\n\t// the second click completes the range: it is written into the input and applied\n\t_onRangeChange = (e: RangeChangeEvent) => {\n\t\tif (!e.to || !this.input) return;\n\t\tthis.input.value = isSameDay(e.from, e.to) ? this.formatDay(e.from) : `${this.formatDay(e.from)}..${this.formatDay(e.to)}`;\n\t\tthis.calendarDropdown?.close();\n\t\tthis._apply();\n\t\tthis.deactivate();\n\t}\n\n\tprivate get examples() {\n\t\tif (this.type === 'tm') return '9:00, 9:00..17:00, >= 12:00, < 8:00 or > 16:00';\n\t\tconst day = this.formatDay(new Date(2026, 10, 6));\n\t\tconst other = this.formatDay(new Date(2026, 10, 20));\n\t\tconst time = this.type === 'dt' ? `, ${day} 14:00` : '';\n\t\treturn `${day}, ${day}..${other}, > ${day}, 11.2026, 2026, != 2026${time}`;\n\t}\n\n\trender = () => html`\n\t\t<div class=\"filter-inner\">\n\t\t\t<input ${ref(this.inputRef)}\n\t\t\t\ttype=\"text\"\n\t\t\t\ttitle=\"${msg('Examples:')} ${this.examples}\"\n\t\t\t\t@keydown=\"${this._onInputKeyDown}\"\n\t\t\t\t@input=\"${this._onInput}\"\n\t\t\t\t.value=\"${this.termText(this.currentValue)}\">\n\t\t\t${this.hasCalendar ? html`\n\t\t\t\t<og-dropdown ${ref(this.dropdownRef)} icon=\"calendar-days\" color=\"accent\" alignment=\"right\" noCaret\n\t\t\t\t\ttitle=\"${msg('Pick a day or a range of days: the first click starts it, the second ends it')}\"\n\t\t\t\t\t@dropdown.open=\"${this._onCalendarOpen}\">\n\t\t\t\t\t<og-calendar ${ref(this.calendarRef)} slot=\"content\" range @rangechange=\"${this._onRangeChange}\"></og-calendar>\n\t\t\t\t</og-dropdown>\n\t\t\t` : ''}\n\t\t\t<og-button icon=\"xmark\" color=\"red\" ${ref(this.clearButtonRef)} @mousedown=\"${this._onClearClick}\"></og-button>\n\t\t</div>\n\t`;\n\n\tactivate() {\n\t\tsuper.activate();\n\t\tif (this.input) {\n\t\t\tthis.input.value = this.termText(this.currentValue);\n\t\t}\n\t\tsetTimeout(() => this.input?.select(), 100);\n\t}\n\n\tdeactivate() {\n\t\tthis.calendarDropdown?.close();\n\t\tsuper.deactivate();\n\t}\n\n}\n"]}

package/dist/filters/filterFactory.js

@@ -25,9 +25,9 @@ const createDropdownFilter = (column) => {
 const filterMap = new Map([
     ['t', () => dom.createElement('og-filter-text')],
     ['n', () => dom.createElement('og-filter-number')],
-    ['d', () => dom.createElement('og-filter-range')],
-    ['dt', () => dom.createElement('og-filter-range')],
-    ['tm', () => dom.createElement('og-filter-range')],
+    ['d', () => dom.createElement('og-filter-date')],
+    ['dt', () => dom.createElement('og-filter-date')],
+    ['tm', () => dom.createElement('og-filter-date')],
     ['b', () => dom.createElement('og-filter-checkbox')],
     ['s', (column) => createDropdownFilter(column)],
     ['m', (column) => createDropdownFilter(column)]

package/dist/filters/filterFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterFactory.js","sourceRoot":"","sources":["../../src/filters/filterFactory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAItC,SAAS,oBAAoB,CAAC,MAAmB;IAChD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAe,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC;IAC7C,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,oBAAoB,GAAG,CAAC,MAAmB,EAAE,EAAE;IACpD,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAiB,oBAAoB,CAAC,CAAC;IAC1E,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC,OAAsB,CAAC;IACnD,CAAC;SAAM,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACjC,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,aAA2B,CAAC;IACtD,CAAC;SAAM,CAAC;QACP,SAAS,CAAC,KAAK,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAgD;IACxE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;IAClD,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACjD,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAClD,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;IACpD,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;CAC/C,CAAC,CAAC;AAEH,MAAM,UAAU,YAAY,CAAC,MAAmB,EAAE,UAAuB;IACxE,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAe,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAC9F,SAAS,CAAC,WAAW,GAAG,MAAM,CAAC;IAC/B,SAAS,CAAC,WAAW,GAAG,UAAU,CAAC;IACnC,OAAO,SAAS,CAAC;AAClB,CAAC","sourcesContent":["import { CellType, ColumnModel, FilterModel } from \"@omegagrid/grid-core\";\nimport { BaseFilter } from \"./baseFilter\";\nimport { dom } from \"@omegagrid/core\";\nimport { DropdownFilter } from \"./dropdownFilter\";\nimport { TreeAdapter, TreeSource } from \"@omegagrid/tree\";\n\nfunction collectDropdownItems(column: ColumnModel) : TreeSource {\n\tconst values = new Map<string, string>();\n\t\n\tfor (let r = 0; r < column.model.rows.length; r++) {\n\t\tconst cell = column.cell(r);\n\t\tvalues.set(cell.value as string, (cell.displayValue ?? cell.value ?? \"\").toString());\n\t}\n\n\tconst items: TreeSource = [];\n\tvalues.forEach((v, k) => items.push({k, v}));\n\treturn items;\n}\n\nconst createDropdownFilter = (column: ColumnModel) => {\n\tconst component = dom.createElement<DropdownFilter>('og-filter-dropdown');\n\tif (column.adapter) {\n\t\tcomponent.adapter = column.adapter as TreeAdapter;\n\t} else if (column.editorContent) {\n\t\tcomponent.items = column.editorContent as TreeSource;\n\t} else {\n\t\tcomponent.items = collectDropdownItems(column);\n\t}\n\treturn component;\n}\n\nconst filterMap = new Map<CellType, (column: ColumnModel) => BaseFilter>([\n\t['t', () => dom.createElement('og-filter-text')],\n\t['n', () => dom.createElement('og-filter-number')],\n\t['d', () => dom.createElement('og-filter-range')],\n\t['dt', () => dom.createElement('og-filter-range')],\n\t['tm', () => dom.createElement('og-filter-range')],\n\t['b', () => dom.createElement('og-filter-checkbox')],\n\t['s', (column) => createDropdownFilter(column)],\n\t['m', (column) => createDropdownFilter(column)]\n]);\n\nexport function createFilter(column: ColumnModel, filteModel: FilterModel): BaseFilter {\n\tconst factory = filterMap.get(column.type);\n\tconst component: BaseFilter = factory ? factory(column) : dom.createElement('og-filter-text');\n\tcomponent.columnModel = column;\n\tcomponent.filterModel = filteModel;\n\treturn component;\n}\n"]}
+{"version":3,"file":"filterFactory.js","sourceRoot":"","sources":["../../src/filters/filterFactory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAItC,SAAS,oBAAoB,CAAC,MAAmB;IAChD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAe,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC;IAC7C,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,oBAAoB,GAAG,CAAC,MAAmB,EAAE,EAAE;IACpD,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAiB,oBAAoB,CAAC,CAAC;IAC1E,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC,OAAsB,CAAC;IACnD,CAAC;SAAM,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;QACjC,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,aAA2B,CAAC;IACtD,CAAC;SAAM,CAAC;QACP,SAAS,CAAC,KAAK,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAgD;IACxE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;IAClD,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IACjD,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IACjD,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;IACpD,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;CAC/C,CAAC,CAAC;AAEH,MAAM,UAAU,YAAY,CAAC,MAAmB,EAAE,UAAuB;IACxE,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAe,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAC9F,SAAS,CAAC,WAAW,GAAG,MAAM,CAAC;IAC/B,SAAS,CAAC,WAAW,GAAG,UAAU,CAAC;IACnC,OAAO,SAAS,CAAC;AAClB,CAAC","sourcesContent":["import { CellType, ColumnModel, FilterModel } from \"@omegagrid/grid-core\";\nimport { BaseFilter } from \"./baseFilter\";\nimport { dom } from \"@omegagrid/core\";\nimport { DropdownFilter } from \"./dropdownFilter\";\nimport { TreeAdapter, TreeSource } from \"@omegagrid/tree\";\n\nfunction collectDropdownItems(column: ColumnModel) : TreeSource {\n\tconst values = new Map<string, string>();\n\t\n\tfor (let r = 0; r < column.model.rows.length; r++) {\n\t\tconst cell = column.cell(r);\n\t\tvalues.set(cell.value as string, (cell.displayValue ?? cell.value ?? \"\").toString());\n\t}\n\n\tconst items: TreeSource = [];\n\tvalues.forEach((v, k) => items.push({k, v}));\n\treturn items;\n}\n\nconst createDropdownFilter = (column: ColumnModel) => {\n\tconst component = dom.createElement<DropdownFilter>('og-filter-dropdown');\n\tif (column.adapter) {\n\t\tcomponent.adapter = column.adapter as TreeAdapter;\n\t} else if (column.editorContent) {\n\t\tcomponent.items = column.editorContent as TreeSource;\n\t} else {\n\t\tcomponent.items = collectDropdownItems(column);\n\t}\n\treturn component;\n}\n\nconst filterMap = new Map<CellType, (column: ColumnModel) => BaseFilter>([\n\t['t', () => dom.createElement('og-filter-text')],\n\t['n', () => dom.createElement('og-filter-number')],\n\t['d', () => dom.createElement('og-filter-date')],\n\t['dt', () => dom.createElement('og-filter-date')],\n\t['tm', () => dom.createElement('og-filter-date')],\n\t['b', () => dom.createElement('og-filter-checkbox')],\n\t['s', (column) => createDropdownFilter(column)],\n\t['m', (column) => createDropdownFilter(column)]\n]);\n\nexport function createFilter(column: ColumnModel, filteModel: FilterModel): BaseFilter {\n\tconst factory = filterMap.get(column.type);\n\tconst component: BaseFilter = factory ? factory(column) : dom.createElement('og-filter-text');\n\tcomponent.columnModel = column;\n\tcomponent.filterModel = filteModel;\n\treturn component;\n}\n"]}

package/dist/filters/index.d.ts

@@ -2,7 +2,6 @@ export * from "./textFilter";
 export * from "./checkboxFilter";
 export * from "./dropdownFilter";
 export * from "./numberFilter";
-export * from "./rangeFilter";
-export * from "./rangeFilterPopup";
+export * from "./dateFilter";
 export * from "./filterFactory";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC"}

package/dist/filters/index.js

@@ -2,7 +2,6 @@ export * from "./textFilter";
 export * from "./checkboxFilter";
 export * from "./dropdownFilter";
 export * from "./numberFilter";
-export * from "./rangeFilter";
-export * from "./rangeFilterPopup";
+export * from "./dateFilter";
 export * from "./filterFactory";
 //# sourceMappingURL=index.js.map

package/dist/filters/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC","sourcesContent":["export * from \"./textFilter\";\nexport * from \"./checkboxFilter\";\nexport * from \"./dropdownFilter\";\nexport * from \"./numberFilter\";\nexport * from \"./rangeFilter\";\nexport * from \"./rangeFilterPopup\";\nexport * from \"./filterFactory\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC","sourcesContent":["export * from \"./textFilter\";\nexport * from \"./checkboxFilter\";\nexport * from \"./dropdownFilter\";\nexport * from \"./numberFilter\";\nexport * from \"./dateFilter\";\nexport * from \"./filterFactory\";\n"]}

package/dist/renderers/DateTimeRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateTimeRenderer.d.ts","sourceRoot":"","sources":["../../src/renderers/DateTimeRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAI,cAAc,CAkBrH"}
+{"version":3,"file":"DateTimeRenderer.d.ts","sourceRoot":"","sources":["../../src/renderers/DateTimeRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAI,cAAc,CAoBrH"}

package/dist/renderers/DateTimeRenderer.js

@@ -3,8 +3,10 @@ import { dom } from "@omegagrid/core";
 export function DateTimeRenderer(div, cell, options) {
     const opts = cell.model.options;
     try {
+        // a date and time cell (type dt) or a time cell (type tm) without a format of its own shows the format of its type
+        const formatter = cell.type == 'dt' ? opts.dateTimeFormatter : (cell.type == 'tm' ? opts.timeFormatter : opts.dateFormatter);
         div.textContent = cell.value
-            ? opts.dateFormatter(cell.value, cell.format)
+            ? formatter(cell.value, cell.format)
             : '';
     }
     catch (_err) {

package/dist/renderers/DateTimeRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"DateTimeRenderer.js","sourceRoot":"","sources":["../../src/renderers/DateTimeRenderer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,MAAM,UAAU,gBAAgB,CAAC,GAAmB,EAAE,IAAe,EAAE,OAA6B;IACnG,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;IAChC,IAAI,CAAC;QACJ,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK;YAC3B,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAoB,EAAE,IAAI,CAAC,MAAM,CAAC;YAC5D,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IAAC,OAAO,IAAI,EAAE,CAAC;QACf,GAAG,CAAC,WAAW,GAAG,iBAAiB,CAAC;IACrC,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,kBAAkB,EAAE,CAAC;QACvD,MAAM,QAAQ,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,QAAQ,CAAC,SAAS,GAAG,eAAe,CAAC;QACrC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;QACxC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC","sourcesContent":["import { CellModel } from \"@omegagrid/grid-core\";\nimport { BaseRenderer } from \"./BaseRenderer\";\nimport { CellRendererOptions } from \"../types\";\nimport { dom } from \"@omegagrid/core\";\n\nexport function DateTimeRenderer(div: HTMLDivElement, cell: CellModel, options?: CellRendererOptions) : HTMLDivElement {\n\tconst opts = cell.model.options;\n\ttry {\n\t\tdiv.textContent = cell.value \n\t\t\t? opts.dateFormatter(cell.value as Date|string, cell.format)\n\t\t\t: '';\t\n\t} catch (_err) {\n\t\tdiv.textContent = '!invalid format';\n\t}\n\t\n\tif (cell.editable && opts.editing?.dateCalendarEditor) {\n\t\tconst triangle = dom.createElement('div');\n\t\ttriangle.className = 'triangle-down';\n\t\tdom.setPosition(triangle, {t: 8, r: 8});\n\t\tdiv.appendChild(triangle);\n\t}\n\n\treturn BaseRenderer.call(this, div, cell, options);\n}"]}
+{"version":3,"file":"DateTimeRenderer.js","sourceRoot":"","sources":["../../src/renderers/DateTimeRenderer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAEtC,MAAM,UAAU,gBAAgB,CAAC,GAAmB,EAAE,IAAe,EAAE,OAA6B;IACnG,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;IAChC,IAAI,CAAC;QACJ,mHAAmH;QACnH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7H,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK;YAC3B,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,KAAoB,EAAE,IAAI,CAAC,MAAM,CAAC;YACnD,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IAAC,OAAO,IAAI,EAAE,CAAC;QACf,GAAG,CAAC,WAAW,GAAG,iBAAiB,CAAC;IACrC,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,kBAAkB,EAAE,CAAC;QACvD,MAAM,QAAQ,GAAG,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,QAAQ,CAAC,SAAS,GAAG,eAAe,CAAC;QACrC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;QACxC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC","sourcesContent":["import { CellModel } from \"@omegagrid/grid-core\";\nimport { BaseRenderer } from \"./BaseRenderer\";\nimport { CellRendererOptions } from \"../types\";\nimport { dom } from \"@omegagrid/core\";\n\nexport function DateTimeRenderer(div: HTMLDivElement, cell: CellModel, options?: CellRendererOptions) : HTMLDivElement {\n\tconst opts = cell.model.options;\n\ttry {\n\t\t// a date and time cell (type dt) or a time cell (type tm) without a format of its own shows the format of its type\n\t\tconst formatter = cell.type == 'dt' ? opts.dateTimeFormatter : (cell.type == 'tm' ? opts.timeFormatter : opts.dateFormatter);\n\t\tdiv.textContent = cell.value\n\t\t\t? formatter(cell.value as Date|string, cell.format)\n\t\t\t: '';\n\t} catch (_err) {\n\t\tdiv.textContent = '!invalid format';\n\t}\n\t\n\tif (cell.editable && opts.editing?.dateCalendarEditor) {\n\t\tconst triangle = dom.createElement('div');\n\t\ttriangle.className = 'triangle-down';\n\t\tdom.setPosition(triangle, {t: 8, r: 8});\n\t\tdiv.appendChild(triangle);\n\t}\n\n\treturn BaseRenderer.call(this, div, cell, options);\n}"]}

package/dist/ui/filterLabel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterLabel.d.ts","sourceRoot":"","sources":["../../src/ui/filterLabel.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AA2B5C,qBACa,WAAY,SAAQ,UAAU;IAE1C,MAAM,CAAC,MAAM,0BA4CX;IAGF,KAAK,EAAE,WAAW,CAAC;;IAMnB,iBAAiB;IAIjB,WAAW;IAUX,MAAM,6CAGJ;CAEF"}
+{"version":3,"file":"filterLabel.d.ts","sourceRoot":"","sources":["../../src/ui/filterLabel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAa,MAAM,KAAK,CAAC;AAG5C,qBACa,WAAY,SAAQ,UAAU;IAE1C,MAAM,CAAC,MAAM,0BA4CX;IAGF,KAAK,EAAE,WAAW,CAAC;;IAMnB,iBAAiB;IAIjB,WAAW;IASX,MAAM,6CAGJ;CAEF"}

package/dist/ui/filterLabel.js

@@ -7,31 +7,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { utils } from '@omegagrid/core';
 import { LitElement, html, css } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-const isRangeTerm = (v) => !!v && typeof v === 'object' && !Array.isArray(v) && v.kind === 'range';
-const formatRangePart = (v) => {
-    if (v == null || v === '')
-        return '';
-    if (v instanceof Date)
-        return v.toLocaleDateString();
-    if (typeof v === 'string') {
-        const d = new Date(v);
-        if (!Number.isNaN(d.getTime()))
-            return d.toLocaleDateString();
-        return v;
-    }
-    return String(v);
-};
-const formatRange = (r) => {
-    const from = formatRangePart(r.from);
-    const to = formatRangePart(r.to);
-    if (from && to)
-        return `${from} – ${to}`;
-    if (from)
-        return `≥ ${from}`;
-    if (to)
-        return `≤ ${to}`;
-    return '';
-};
 let FilterLabel = class FilterLabel extends LitElement {
     constructor() {
         super();
@@ -49,8 +24,6 @@ let FilterLabel = class FilterLabel extends LitElement {
         if (utils.isBool(this.value)) {
             return html `<og-icon .icon="${this.value ? 'square-check' : 'square'}"></og-icon>`;
         }
-        if (isRangeTerm(this.value))
-            return formatRange(this.value);
         if (typeof this.value === 'object')
             return '';
         return this.value;

package/dist/ui/filterLabel.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterLabel.js","sourceRoot":"","sources":["../../src/ui/filterLabel.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE5D,MAAM,WAAW,GAAG,CAAC,CAAU,EAAoB,EAAE,CACpD,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAK,CAAiB,CAAC,IAAI,KAAK,OAAO,CAAC;AAE1F,MAAM,eAAe,GAAG,CAAC,CAAU,EAAU,EAAE;IAC9C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,CAAC;IACrC,IAAI,CAAC,YAAY,IAAI;QAAE,OAAO,CAAC,CAAC,kBAAkB,EAAE,CAAC;IACrD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;YAAE,OAAO,CAAC,CAAC,kBAAkB,EAAE,CAAC;QAC9D,OAAO,CAAC,CAAC;IACV,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,CAAc,EAAU,EAAE;IAC9C,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACjC,IAAI,IAAI,IAAI,EAAE;QAAE,OAAO,GAAG,IAAI,MAAM,EAAE,EAAE,CAAC;IACzC,IAAI,IAAI;QAAE,OAAO,KAAK,IAAI,EAAE,CAAC;IAC7B,IAAI,EAAE;QAAE,OAAO,KAAK,EAAE,EAAE,CAAC;IACzB,OAAO,EAAE,CAAC;AACX,CAAC,CAAC;AAIK,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,UAAU;IAmD1C;QACC,KAAK,EAAE,CAAC;QAiBT,WAAM,GAAG,GAAG,EAAE,CAAA,IAAI,CAAA;oCACiB,EAAC,IAAI,EAAE,QAAQ,EAAC;sBAC9B,IAAI,CAAC,WAAW,EAAE;EACtC,CAAC;IAnBF,CAAC;IAED,iBAAiB;QAChB,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED,WAAW;QACV,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI;YAAE,OAAO,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAA,mBAAmB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,cAAc,CAAC;QACpF,CAAC;QACD,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5D,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,KAAe,CAAC;IAC7B,CAAC;;AAjEM,kBAAM,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4ClB,AA5CY,CA4CX;AAGF;IADC,QAAQ,EAAE;0CACQ;AAjDP,WAAW;IADvB,aAAa,CAAC,iBAAiB,CAAC;GACpB,WAAW,CA0EvB","sourcesContent":["import { utils } from '@omegagrid/core';\nimport { FilterRange, FilterValue } from '@omegagrid/grid-core';\nimport { LitElement, html, css } from 'lit';\nimport { customElement, property } from 'lit/decorators.js';\n\nconst isRangeTerm = (v: unknown): v is FilterRange =>\n\t!!v && typeof v === 'object' && !Array.isArray(v) && (v as FilterRange).kind === 'range';\n\nconst formatRangePart = (v: unknown): string => {\n\tif (v == null || v === '') return '';\n\tif (v instanceof Date) return v.toLocaleDateString();\n\tif (typeof v === 'string') {\n\t\tconst d = new Date(v);\n\t\tif (!Number.isNaN(d.getTime())) return d.toLocaleDateString();\n\t\treturn v;\n\t}\n\treturn String(v);\n};\n\nconst formatRange = (r: FilterRange): string => {\n\tconst from = formatRangePart(r.from);\n\tconst to = formatRangePart(r.to);\n\tif (from && to) return `${from} – ${to}`;\n\tif (from) return `≥ ${from}`;\n\tif (to) return `≤ ${to}`;\n\treturn '';\n};\n\n\n@customElement('og-filter-label')\nexport class FilterLabel extends LitElement {\n\n\tstatic styles = css`\n\t\t:host {\n\t\t\tpadding: 0;\n\t\t\tdisplay: block;\n\t\t\talign-items: center;\n\t\t\tcursor: pointer;\n\t\t\theight: 100%;\n\t\t\tline-height: 21px;\n\t\t}\n\n\t\t:host(:hover og-icon) {\n\t\t\tbackground-color: var(--og-accent-color-highlight);\n\t\t}\n\n\t\tinput {\n\t\t\tcolor: var(--og-text-color);\n\t\t}\n\n\t\tog-icon {\n\t\t\tcolor: var(--og-accent-color);\n\t\t\tflex: 0;\n\t\t\tmin-width: 20px;\n\t\t\tpadding-top: 1px;\n\t\t\tpadding-left: 0px;\n\t\t}\n\n\t\t#filterIcon {\n\t\t\tposition: absolute;\n\t\t\tleft: 0px;\n\t\t\ttop: 0px;\n\t\t}\n\n\t\t.text {\n\t\t\tflex: 1;\n\t\t\theight: 100%;\n\t\t\tfont-style: italic;\n\t\t\tfont-weight: normal;\n\t\t}\n\n\t\t.text:empty {\n\t\t\tbackground-image: repeating-linear-gradient(45deg, var(--og-accent-color-alpha) 0, var(--og-accent-color-alpha) 2px, transparent 0, transparent 50%);\n\t\t\tbackground-size: 10px 10px;\n\t\t\tbackground-color: transparent;\n\t\t}\n\t`;\n\n\t@property()\n\tvalue: FilterValue;\n\n\tconstructor() {\n\t\tsuper();\n\t}\n\n\tconnectedCallback() {\n\t\tsuper.connectedCallback();\n\t}\n\n\trenderValue() {\n\t\tif (this.value == null) return '';\n\t\tif (utils.isBool(this.value)) {\n\t\t\treturn html`<og-icon .icon=\"${this.value ? 'square-check' : 'square'}\"></og-icon>`;\n\t\t}\n\t\tif (isRangeTerm(this.value)) return formatRange(this.value);\n\t\tif (typeof this.value === 'object') return '';\n\t\treturn this.value as string;\n\t}\n\n\trender = () =>html`\n\t\t<og-icon id=\"filterIcon\" .icon=\"${{icon: \"filter\"}}\"></og-icon>\n\t\t<div class=\"text\">${this.renderValue()}</div>\n\t`;\n\t\n}"]}
+{"version":3,"file":"filterLabel.js","sourceRoot":"","sources":["../../src/ui/filterLabel.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAGrD,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,UAAU;IAmD1C;QACC,KAAK,EAAE,CAAC;QAgBT,WAAM,GAAG,GAAG,EAAE,CAAA,IAAI,CAAA;oCACiB,EAAC,IAAI,EAAE,QAAQ,EAAC;sBAC9B,IAAI,CAAC,WAAW,EAAE;EACtC,CAAC;IAlBF,CAAC;IAED,iBAAiB;QAChB,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED,WAAW;QACV,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI;YAAE,OAAO,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAA,mBAAmB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,cAAc,CAAC;QACpF,CAAC;QACD,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,KAAe,CAAC;IAC7B,CAAC;;AAhEM,kBAAM,GAAG,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4ClB,AA5CY,CA4CX;AAGF;IADC,QAAQ,EAAE;0CACQ;AAjDP,WAAW;IADvB,aAAa,CAAC,iBAAiB,CAAC;GACpB,WAAW,CAyEvB","sourcesContent":["import { utils } from '@omegagrid/core';\nimport { FilterValue } from '@omegagrid/grid-core';\nimport { LitElement, html, css } from 'lit';\nimport { customElement, property } from 'lit/decorators.js';\n\n@customElement('og-filter-label')\nexport class FilterLabel extends LitElement {\n\n\tstatic styles = css`\n\t\t:host {\n\t\t\tpadding: 0;\n\t\t\tdisplay: block;\n\t\t\talign-items: center;\n\t\t\tcursor: pointer;\n\t\t\theight: 100%;\n\t\t\tline-height: 21px;\n\t\t}\n\n\t\t:host(:hover og-icon) {\n\t\t\tbackground-color: var(--og-accent-color-highlight);\n\t\t}\n\n\t\tinput {\n\t\t\tcolor: var(--og-text-color);\n\t\t}\n\n\t\tog-icon {\n\t\t\tcolor: var(--og-accent-color);\n\t\t\tflex: 0;\n\t\t\tmin-width: 20px;\n\t\t\tpadding-top: 1px;\n\t\t\tpadding-left: 0px;\n\t\t}\n\n\t\t#filterIcon {\n\t\t\tposition: absolute;\n\t\t\tleft: 0px;\n\t\t\ttop: 0px;\n\t\t}\n\n\t\t.text {\n\t\t\tflex: 1;\n\t\t\theight: 100%;\n\t\t\tfont-style: italic;\n\t\t\tfont-weight: normal;\n\t\t}\n\n\t\t.text:empty {\n\t\t\tbackground-image: repeating-linear-gradient(45deg, var(--og-accent-color-alpha) 0, var(--og-accent-color-alpha) 2px, transparent 0, transparent 50%);\n\t\t\tbackground-size: 10px 10px;\n\t\t\tbackground-color: transparent;\n\t\t}\n\t`;\n\n\t@property()\n\tvalue: FilterValue;\n\n\tconstructor() {\n\t\tsuper();\n\t}\n\n\tconnectedCallback() {\n\t\tsuper.connectedCallback();\n\t}\n\n\trenderValue() {\n\t\tif (this.value == null) return '';\n\t\tif (utils.isBool(this.value)) {\n\t\t\treturn html`<og-icon .icon=\"${this.value ? 'square-check' : 'square'}\"></og-icon>`;\n\t\t}\n\t\tif (typeof this.value === 'object') return '';\n\t\treturn this.value as string;\n\t}\n\n\trender = () =>html`\n\t\t<og-icon id=\"filterIcon\" .icon=\"${{icon: \"filter\"}}\"></og-icon>\n\t\t<div class=\"text\">${this.renderValue()}</div>\n\t`;\n\t\n}"]}

package/dist/ui/grid.d.ts

@@ -45,6 +45,12 @@ export declare class Grid extends LitElement implements Layout {
     model: GridModel;
     adapter: GridAdapter;
     selection: SelectionModel;
+    /**
+     * The options objects this grid made with initOptions(): a `.options` binding or an assignment from outside
+     * brings a partial object instead, which willUpdate() completes before the model gets it
+     * (a model holding partial options has no `selecting`, `scrolling`... and the rendering falls over).
+     */
+    private _initializedOptions;
     options: Options;
     logger: log.Logger;
     zoom: number;
@@ -76,6 +82,15 @@ export declare class Grid extends LitElement implements Layout {
     destroy(): void;
     initAdapter(): Promise<void>;
     updateOptions(options: Partial<Options>): void;
+    /**
+     * Options started over from the defaults: only the state the grid holds itself (the zoom) is carried over
+     * from the previous ones. Used when the adapter is replaced - the options of the previous adapter must not
+     * leak into the next one (a refresh of the same adapter merges its options over the current ones instead,
+     * see initAdapter()).
+     */
+    resetOptions(previous?: Options): Options;
+    /** initOptions() whose result the grid recognizes as complete (see `_initializedOptions`) */
+    private _initOptions;
     private _debounceVerticalSlide;
     private _debounceHorizontalSlide;
     render: () => import("lit-html").TemplateResult<1>;

package/dist/ui/grid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../src/ui/grid.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../src/ui/grid.ts"],"names":[],"mappings":"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"}

package/dist/ui/grid.editing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid.editing.d.ts","sourceRoot":"","sources":["../../src/ui/grid.editing.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,SAAS,EAA0D,aAAa,EAA2B,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC1K,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAI9B,MAAM,MAAM,aAAa,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;CACrB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAC3C,KAAK,CAAC,EAAE,OAAO,CAAA;CACf,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAC3C,WAAW,EAAE,MAAM,CAAA;CACnB,CAAC;AAEF,qBAAa,WAAW;IAmBX,QAAQ,CAAC,IAAI,EAAE,IAAI;IAjB/B,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,MAAM,CAAa;IAE3B,YAAY,UAAS;IACrB,SAAS,UAAS;IAElB,IAAI,KAAK,6CAA6B;IACtC,IAAI,SAAS,kDAAiC;IAC9C,IAAI,QAAQ,kCAAgC;IAC5C,IAAI,MAAM,uCAA8B;IACxC,IAAI,KAAK,4BAA6B;IACtC,IAAI,SAAS,YAA2B;IACxC,IAAI,YAAY,eAAyB;IAEzC,OAAO,CAAC,YAAY,CAAS;IAC7B,IAAI,aAAa,YAAiE;gBAE7D,IAAI,EAAE,IAAI;IAE/B,OAAO,CAAC,IAAI,EAAE,SAAS;IAIvB,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,GAAG,UAAU,EAAE,aAAa,UAAO,EAAE,WAAW,UAAQ;IAIxG,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE,EAAE,aAAa,UAAO,EAAE,WAAW,UAAQ;IA6DjH,gBAAgB;IAKhB,cAAc,CAAC,KAAK,UAAO;IAQ3B,SAAS,CAAC,YAAY,GAAE,OAAc;IAuBtC,OAAO;IASP,UAAU;IAOV,UAAU,CAAC,OAAO,EAAE,aAAa;IAYjC,aAAa,CAAC,OAAO,EAAE,aAAa;IAYpC,UAAU,CAAC,OAAO,EAAE,aAAa;IAYjC,aAAa,CAAC,OAAO,EAAE,aAAa;IAYpC,QAAQ,CAAC,OAAO,EAAE,aAAa;IAY/B,WAAW,CAAC,OAAO,EAAE,aAAa;IAYlC,cAAc,CAAC,aAAa,UAAO;IAMnC,SAAS,CAAC,IAAI,EAAE,SAAS;IAoBzB,gBAAgB;IAUhB,mGAAmG;IACnG,oBAAoB;IAMpB;;;OAGG;IACH,aAAa;YA2BC,WAAW;IA4FzB;;;OAGG;YACW,qBAAqB;YAiBrB,SAAS;IAIjB,KAAK;IAoBX,YAAY,CAAC,IAAI,EAAE,SAAS;IAM5B,IAAI;IA6BJ,IAAI;IA6BJ,iBAAiB,CAAC,EAAE,EAAE,MAAM;IAI5B,KAAK,CAAC,KAAK,CAAC,EAAE,WAAW;IASzB,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW;CAW3B"}
+{"version":3,"file":"grid.editing.d.ts","sourceRoot":"","sources":["../../src/ui/grid.editing.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,SAAS,EAA0D,aAAa,EAA2B,UAAU,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAC;AACxL,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAI9B,MAAM,MAAM,aAAa,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAA;CACrB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAC3C,KAAK,CAAC,EAAE,OAAO,CAAA;CACf,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG;IAC3C,WAAW,EAAE,MAAM,CAAA;CACnB,CAAC;AAEF,qBAAa,WAAW;IAmBX,QAAQ,CAAC,IAAI,EAAE,IAAI;IAjB/B,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,MAAM,CAAa;IAE3B,YAAY,UAAS;IACrB,SAAS,UAAS;IAElB,IAAI,KAAK,6CAA6B;IACtC,IAAI,SAAS,kDAAiC;IAC9C,IAAI,QAAQ,kCAAgC;IAC5C,IAAI,MAAM,uCAA8B;IACxC,IAAI,KAAK,4BAA6B;IACtC,IAAI,SAAS,YAA2B;IACxC,IAAI,YAAY,eAAyB;IAEzC,OAAO,CAAC,YAAY,CAAS;IAC7B,IAAI,aAAa,YAAiE;gBAE7D,IAAI,EAAE,IAAI;IAE/B,OAAO,CAAC,IAAI,EAAE,SAAS;IAIvB,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,GAAG,UAAU,EAAE,aAAa,UAAO,EAAE,WAAW,UAAQ;IAIxG,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE,EAAE,aAAa,UAAO,EAAE,WAAW,UAAQ;IA8DjH,gBAAgB;IAKhB,cAAc,CAAC,KAAK,UAAO;IAQ3B,SAAS,CAAC,YAAY,GAAE,OAAc;IAuBtC,OAAO;IASP,UAAU;IAOV,UAAU,CAAC,OAAO,EAAE,aAAa;IAYjC,aAAa,CAAC,OAAO,EAAE,aAAa;IAYpC,UAAU,CAAC,OAAO,EAAE,aAAa;IAYjC,aAAa,CAAC,OAAO,EAAE,aAAa;IAYpC,QAAQ,CAAC,OAAO,EAAE,aAAa;IAY/B,WAAW,CAAC,OAAO,EAAE,aAAa;IAYlC,cAAc,CAAC,aAAa,UAAO;IAMnC,SAAS,CAAC,IAAI,EAAE,SAAS;IAoBzB,gBAAgB;IAUhB,mGAAmG;IACnG,oBAAoB;IAMpB;;;OAGG;IACH,aAAa;YA2BC,WAAW;IA4FzB;;;OAGG;YACW,qBAAqB;YAiBrB,SAAS;IAIjB,KAAK;IAoBX,YAAY,CAAC,IAAI,EAAE,SAAS;IAM5B,IAAI;IA6BJ,IAAI;IA6BJ,iBAAiB,CAAC,EAAE,EAAE,MAAM;IAI5B,KAAK,CAAC,KAAK,CAAC,EAAE,WAAW;IASzB,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW;CAW3B"}

package/dist/ui/grid.editing.js

@@ -1,7 +1,7 @@
 import { csv, utils } from "@omegagrid/core";
 import { FormulaEditor, getEditorFactory } from "../editors";
 import { getDropdownListSource, loadDropdownList } from "../editors/dropdownList";
-import { isFormula, hasQuotePrefix, stripQuotePrefix, CellRange, decodeColumn, decodeRow } from "@omegagrid/grid-core";
+import { isFormula, hasQuotePrefix, stripQuotePrefix, CellRange, decodeColumn, decodeRow, isCellSource } from "@omegagrid/grid-core";
 import { GridEditEvent, GridEvent } from "./grid.events";
 import constants from "../constants";
 export class GridEditing {
@@ -36,7 +36,8 @@ export class GridEditing {
             const oldValue = cell.value;
             let newValue;
             let newProps;
-            if (utils.isObject(values[i])) {
+            // a Date (the value of a date and time cell put back by redo) is a value, not the properties of the cell
+            if (isCellSource(values[i])) {
                 newProps = values[i];
                 newValue = ('v' in newProps) ? newProps.v : undefined;
                 if (cell.quotePrefixable && hasQuotePrefix(newValue)) {
@@ -324,7 +325,7 @@ export class GridEditing {
                 if (!cell.editable)
                     continue;
                 const j = (c - range.c1) % data[i].length;
-                if (pasteProps && utils.isObject(data[i][j])) {
+                if (pasteProps && isCellSource(data[i][j])) {
                     // filter unwanted properties
                     const updateProps = {};
                     pasteProps.forEach((key) => {
@@ -355,7 +356,7 @@ export class GridEditing {
             const source = getDropdownListSource(cell);
             // a pasted formula stays a formula, its result is not an item of the list
             const formula = this.model.formulasEnabled
-                && (utils.isObject(values[i]) ? !!values[i].f : isFormula(values[i]));
+                && (isCellSource(values[i]) ? !!values[i].f : isFormula(values[i]));
             if (!source || formula)
                 return;
             if (!lists.has(source))