@revolist/revogrid 4.23.17 → 4.23.20

package/dist/esm/revogr-filter-panel.entry.js

@@ -3,7 +3,7 @@
  */
 import { r as registerInstance, d as createEvent, h, e as Host, g as getElement } from './index-Chp_81rd.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
-import { i as isFilterBtn, e as AndOrButton, f as ReorderButton, d as TrashButton } from './filter.button-B-RBiF67.js';
+import { e as AndOrButton, f as ReorderButton, d as TrashButton, i as isFilterBtn } from './filter.button-B-RBiF67.js';
 
 (function closest() {
     if (!Element.prototype.matches) {
@@ -118,7 +118,7 @@ const FilterPanel = class {
             return;
         }
         const path = e.composedPath();
-        const select = document.getElementById(FILTER_ID);
+        const select = this.getAddFilterSelect();
         if (select instanceof HTMLSelectElement) {
             // click on select should be skipped
             if (path.includes(select)) {
@@ -132,9 +132,8 @@ const FilterPanel = class {
         }
         this.currentFilterId = -1;
         const isOutside = !path.includes(this.element);
-        if (e.target instanceof HTMLElement &&
-            isOutside &&
-            !isFilterBtn(e.target) &&
+        if (isOutside &&
+            !this.isOwnFilterButton(e.target) &&
             this.closeOnOutsideClick) {
             this.changes = undefined;
         }
@@ -258,7 +257,7 @@ const FilterPanel = class {
         this.currentFilterType = el.value;
         this.addNewFilterToProp();
         // reset value after adding new filter
-        const select = document.getElementById('add-filter');
+        const select = this.getAddFilterSelect();
         if (select) {
             select.value = defaultType;
             this.currentFilterType = defaultType;
@@ -462,7 +461,7 @@ const FilterPanel = class {
             }
         };
         const focusNext = () => {
-            const select = document.getElementById('add-filter');
+            const select = this.getAddFilterSelect();
             if (select) {
                 select.value = defaultType;
                 this.currentFilterType = defaultType;
@@ -496,7 +495,7 @@ const FilterPanel = class {
                 }
             }, onKeyDown: e => {
                 if (e.key.toLowerCase() === 'enter') {
-                    const select = document.getElementById('add-filter');
+                    const select = this.getAddFilterSelect();
                     if (select) {
                         focusNext();
                     }
@@ -506,6 +505,31 @@ const FilterPanel = class {
                 e.stopPropagation();
             } }));
     }
+    getAddFilterSelect() {
+        return this.element.querySelector(`#${FILTER_ID}`);
+    }
+    isOwnFilterButton(target) {
+        if (!(target instanceof Element)) {
+            return false;
+        }
+        if (!isFilterBtn(target)) {
+            return false;
+        }
+        const panelGrid = this.getOwningGrid(this.element);
+        const targetGrid = this.getOwningGrid(target);
+        return !!panelGrid && panelGrid === targetGrid;
+    }
+    getOwningGrid(element) {
+        const grid = element.closest('revo-grid');
+        if (grid) {
+            return grid;
+        }
+        const root = element.getRootNode();
+        if (root instanceof ShadowRoot && root.host.localName === 'revo-grid') {
+            return root.host;
+        }
+        return undefined;
+    }
     render() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const style = {
@@ -513,7 +537,7 @@ const FilterPanel = class {
             top: `${(_d = (_c = this.changes) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0}px`,
         };
         const capts = Object.assign(Object.assign({}, this.filterCaptionsInternal), this.filterCaptions);
-        return (h(Host, { key: '4e969f8b7033363c885c94b1f7770917786669f2' }, h("dialog", { key: '79b2713724684fa99f56621fe43645a0b0ad54bf', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
+        return (h(Host, { key: '2a19b35adb56fb7d23385fffebc768838edee162' }, h("dialog", { key: '94386d7cbc4bd9c631f72928938b1d1550a3de82', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
                 e.preventDefault();
                 this.onCancel();
             } }, this.changes && [
@@ -522,7 +546,7 @@ const FilterPanel = class {
             ((_g = this.changes) === null || _g === void 0 ? void 0 : _g.hideDefaultFilters) !== true && [
                 h("label", { key: "filter-title" }, capts.title),
                 h("div", { key: "filter-holder", class: "filter-holder" }, this.getFilterItemsList()),
-                h("div", { key: "add-filter", class: "add-filter" }, h("select", { key: 'fc894bdfae1ff35d5c49adc7646dd3182b7bd49e', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
+                h("div", { key: "add-filter", class: "add-filter" }, h("select", { key: '4f7354e39d8e5cf9ae7b735290eff18d105ab87e', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
             ],
             h("slot", { key: "default-slot" }),
             ((_j = (_h = this.changes).extraBottomContent) === null || _j === void 0 ? void 0 : _j.call(_h, this.changes)) || '',

package/dist/esm/{throttle-CaUDyxyU.js → throttle-Cpk1LoGk.js}

@@ -187,6 +187,10 @@ class LocalScrollTimer {
     setCoordinate(e) {
         this.lastKnownScrollCoordinate[e.dimension] = e.coordinate;
     }
+    setCoordinateFromScroll(e) {
+        this.setCoordinate(e);
+        this.mouseWheelScrollTimestamp[e.dimension] = 0;
+    }
     /**
      * Remember last mw event time
      */

package/dist/revo-grid/revo-grid.entry.js

@@ -176,9 +176,12 @@ class DataProvider {
         // take out
         const toMove = newItemsOrder.splice(newItemsOrder.indexOf(prevItems[from]), // get index in proxy
         1);
+        const targetItem = prevItems[from < to ? to + 1 : to];
+        const targetIndex = targetItem === undefined
+            ? newItemsOrder.length
+            : newItemsOrder.indexOf(targetItem);
         // insert before
-        newItemsOrder.splice(newItemsOrder.indexOf(prevItems[to]), // get index in proxy
-        0, ...toMove);
+        newItemsOrder.splice(targetIndex, 0, ...toMove);
         storeService.setData({
             proxyItems: newItemsOrder,
         });

package/dist/revo-grid/revogr-attribution_7.entry.js

@@ -10,7 +10,7 @@ import { t as timeout, g as getScrollbarSize } from './index-Db3qZoW5.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
 import { V as ViewportStore, j as calculateRowHeaderSize } from './viewport.store-_c579YyM.js';
 import { H as HEADER_SLOT } from './viewport.helpers-CoCAvmZs.js';
-import { L as LocalScrollTimer, a as LocalScrollService, g as getContentSize, t as throttle } from './throttle-CaUDyxyU.js';
+import { L as LocalScrollTimer, a as LocalScrollService, g as getContentSize, t as throttle } from './throttle-Cpk1LoGk.js';
 
 const Attribution = class {
     constructor(hostRef) {
@@ -927,13 +927,13 @@ const OverlaySelection = class {
     /**
      * Executes the focus operation on the specified range of cells.
      */
-    doFocus(focus, end, changes) {
+    doFocus(focus, end, changes, originalEvent) {
         // 1. Trigger beforeFocus event
-        const { defaultPrevented } = this.beforeFocusCell.emit(this.columnService.getSaveData(focus.y, focus.x));
+        const { defaultPrevented } = this.beforeFocusCell.emit(Object.assign(Object.assign({}, this.columnService.getSaveData(focus.y, focus.x)), { originalEvent }));
         if (defaultPrevented) {
             return false;
         }
-        const evData = Object.assign(Object.assign({ range: Object.assign(Object.assign({}, focus), { x1: end.x, y1: end.y }), next: changes }, this.types), { rowDimension: Object.assign({}, this.dimensionRow.state), colDimension: Object.assign({}, this.dimensionCol.state) });
+        const evData = Object.assign(Object.assign({ range: Object.assign(Object.assign({}, focus), { x1: end.x, y1: end.y }), next: changes }, this.types), { rowDimension: Object.assign({}, this.dimensionRow.state), colDimension: Object.assign({}, this.dimensionCol.state), originalEvent });
         // 2. Trigger apply focus event
         const applyEvent = this.applyFocus.emit(evData);
         if (applyEvent.defaultPrevented) {
@@ -949,10 +949,10 @@ const OverlaySelection = class {
                 y: range.y1,
             } }, applyEvent.detail)).defaultPrevented;
     }
-    triggerRangeEvent(range) {
+    triggerRangeEvent(range, originalEvent) {
         const type = this.types.rowType;
         // 1. Apply range
-        const applyEvent = this.beforeApplyRange.emit(Object.assign(Object.assign({ range: Object.assign({}, range) }, this.types), { rowDimension: Object.assign({}, this.dimensionRow.state), colDimension: Object.assign({}, this.dimensionCol.state) }));
+        const applyEvent = this.beforeApplyRange.emit(Object.assign(Object.assign({ range: Object.assign({}, range) }, this.types), { rowDimension: Object.assign({}, this.dimensionRow.state), colDimension: Object.assign({}, this.dimensionCol.state), originalEvent }));
         if (applyEvent.defaultPrevented) {
             return false;
         }
@@ -1003,7 +1003,7 @@ const OverlaySelection = class {
             return;
         }
         // Set focus on the current cell
-        this.focus(focusCell, this.range && e.shiftKey);
+        this.focus(focusCell, this.range && e.shiftKey, e);
         // Initiate autofill selection
         if (this.range) {
             targetElement &&
@@ -1157,7 +1157,7 @@ const OverlaySelection = class {
     /**
      * Sets the focus on a cell and optionally edits a range.
      */
-    focus(cell, isRangeEdit = false) {
+    focus(cell, isRangeEdit = false, originalEvent) {
         if (!cell)
             return false;
         const end = cell;
@@ -1165,10 +1165,10 @@ const OverlaySelection = class {
         if (isRangeEdit && start) {
             const range = getRange(start, end);
             if (range) {
-                return this.triggerRangeEvent(range);
+                return this.triggerRangeEvent(range, originalEvent);
             }
         }
-        return this.doFocus(cell, end);
+        return this.doFocus(cell, end, undefined, originalEvent);
     }
     get types() {
         return {

package/dist/revo-grid/revogr-clipboard_3.entry.js

@@ -296,16 +296,16 @@ class RowOrderService {
             return;
         }
         const newRow = this.getCell(e, data);
+        // rgRow dragged out table
+        if (newRow.y < 0) {
+            newRow.y = 0;
+        }
+        // rgRow dragged to the top
+        else if (newRow.y < this.currentCell.y) {
+            newRow.y++;
+        }
         // if position changed
         if (newRow.y !== this.currentCell.y) {
-            // rgRow dragged out table
-            if (newRow.y < 0) {
-                newRow.y = 0;
-            }
-            // rgRow dragged to the top
-            else if (newRow.y < this.currentCell.y) {
-                newRow.y++;
-            }
             this.config.positionChanged(this.currentCell.y, newRow.y);
         }
         this.clear();

package/dist/revo-grid/revogr-data_4.entry.js

@@ -7,7 +7,7 @@ import { B as ROW_FOCUSED_CLASS, b as getSourceItem, n as DATA_ROW, m as DATA_CO
 import { G as GroupingRowRenderer, C as CellRenderer, R as RowRenderer, P as PADDING_DEPTH, S as SortingSign } from './cell-renderer-CLTRlCa5.js';
 import { c as FilterButton } from './filter.button-B-RBiF67.js';
 import { H as HeaderCellRenderer } from './header-cell-renderer-BMmXRsd_.js';
-import { t as throttle, L as LocalScrollTimer, a as LocalScrollService, g as getContentSize } from './throttle-CaUDyxyU.js';
+import { t as throttle, L as LocalScrollTimer, a as LocalScrollService, g as getContentSize } from './throttle-Cpk1LoGk.js';
 import { H as HEADER_SLOT, C as CONTENT_SLOT, F as FOOTER_SLOT } from './viewport.helpers-CoCAvmZs.js';
 import './debounce-PCRWZliA.js';
 
@@ -871,6 +871,7 @@ const RevogrViewportScroll = class {
         const lastScrollUpdate = () => {
             var _a;
             (_a = this.localScrollService) === null || _a === void 0 ? void 0 : _a.scroll(coordinate, type, undefined, undefined, outside);
+            this.localScrollTimer.setCoordinateFromScroll({ dimension: type, coordinate });
         };
         // apply after throttling
         if (this.localScrollTimer.isReady(type, coordinate)) {

package/dist/revo-grid/revogr-filter-panel.entry.js

@@ -3,7 +3,7 @@
  */
 import { r as registerInstance, d as createEvent, h, e as Host, g as getElement } from './index-Chp_81rd.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
-import { i as isFilterBtn, e as AndOrButton, f as ReorderButton, d as TrashButton } from './filter.button-B-RBiF67.js';
+import { e as AndOrButton, f as ReorderButton, d as TrashButton, i as isFilterBtn } from './filter.button-B-RBiF67.js';
 
 (function closest() {
     if (!Element.prototype.matches) {
@@ -118,7 +118,7 @@ const FilterPanel = class {
             return;
         }
         const path = e.composedPath();
-        const select = document.getElementById(FILTER_ID);
+        const select = this.getAddFilterSelect();
         if (select instanceof HTMLSelectElement) {
             // click on select should be skipped
             if (path.includes(select)) {
@@ -132,9 +132,8 @@ const FilterPanel = class {
         }
         this.currentFilterId = -1;
         const isOutside = !path.includes(this.element);
-        if (e.target instanceof HTMLElement &&
-            isOutside &&
-            !isFilterBtn(e.target) &&
+        if (isOutside &&
+            !this.isOwnFilterButton(e.target) &&
             this.closeOnOutsideClick) {
             this.changes = undefined;
         }
@@ -258,7 +257,7 @@ const FilterPanel = class {
         this.currentFilterType = el.value;
         this.addNewFilterToProp();
         // reset value after adding new filter
-        const select = document.getElementById('add-filter');
+        const select = this.getAddFilterSelect();
         if (select) {
             select.value = defaultType;
             this.currentFilterType = defaultType;
@@ -462,7 +461,7 @@ const FilterPanel = class {
             }
         };
         const focusNext = () => {
-            const select = document.getElementById('add-filter');
+            const select = this.getAddFilterSelect();
             if (select) {
                 select.value = defaultType;
                 this.currentFilterType = defaultType;
@@ -496,7 +495,7 @@ const FilterPanel = class {
                 }
             }, onKeyDown: e => {
                 if (e.key.toLowerCase() === 'enter') {
-                    const select = document.getElementById('add-filter');
+                    const select = this.getAddFilterSelect();
                     if (select) {
                         focusNext();
                     }
@@ -506,6 +505,31 @@ const FilterPanel = class {
                 e.stopPropagation();
             } }));
     }
+    getAddFilterSelect() {
+        return this.element.querySelector(`#${FILTER_ID}`);
+    }
+    isOwnFilterButton(target) {
+        if (!(target instanceof Element)) {
+            return false;
+        }
+        if (!isFilterBtn(target)) {
+            return false;
+        }
+        const panelGrid = this.getOwningGrid(this.element);
+        const targetGrid = this.getOwningGrid(target);
+        return !!panelGrid && panelGrid === targetGrid;
+    }
+    getOwningGrid(element) {
+        const grid = element.closest('revo-grid');
+        if (grid) {
+            return grid;
+        }
+        const root = element.getRootNode();
+        if (root instanceof ShadowRoot && root.host.localName === 'revo-grid') {
+            return root.host;
+        }
+        return undefined;
+    }
     render() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const style = {
@@ -513,7 +537,7 @@ const FilterPanel = class {
             top: `${(_d = (_c = this.changes) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0}px`,
         };
         const capts = Object.assign(Object.assign({}, this.filterCaptionsInternal), this.filterCaptions);
-        return (h(Host, { key: '4e969f8b7033363c885c94b1f7770917786669f2' }, h("dialog", { key: '79b2713724684fa99f56621fe43645a0b0ad54bf', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
+        return (h(Host, { key: '2a19b35adb56fb7d23385fffebc768838edee162' }, h("dialog", { key: '94386d7cbc4bd9c631f72928938b1d1550a3de82', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
                 e.preventDefault();
                 this.onCancel();
             } }, this.changes && [
@@ -522,7 +546,7 @@ const FilterPanel = class {
             ((_g = this.changes) === null || _g === void 0 ? void 0 : _g.hideDefaultFilters) !== true && [
                 h("label", { key: "filter-title" }, capts.title),
                 h("div", { key: "filter-holder", class: "filter-holder" }, this.getFilterItemsList()),
-                h("div", { key: "add-filter", class: "add-filter" }, h("select", { key: 'fc894bdfae1ff35d5c49adc7646dd3182b7bd49e', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
+                h("div", { key: "add-filter", class: "add-filter" }, h("select", { key: '4f7354e39d8e5cf9ae7b735290eff18d105ab87e', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
             ],
             h("slot", { key: "default-slot" }),
             ((_j = (_h = this.changes).extraBottomContent) === null || _j === void 0 ? void 0 : _j.call(_h, this.changes)) || '',

package/dist/revo-grid/{throttle-CaUDyxyU.js → throttle-Cpk1LoGk.js}

@@ -187,6 +187,10 @@ class LocalScrollTimer {
     setCoordinate(e) {
         this.lastKnownScrollCoordinate[e.dimension] = e.coordinate;
     }
+    setCoordinateFromScroll(e) {
+        this.setCoordinate(e);
+        this.mouseWheelScrollTimestamp[e.dimension] = 0;
+    }
     /**
      * Remember last mw event time
      */

package/dist/types/components/overlay/revogr-overlay-selection.d.ts

@@ -268,7 +268,7 @@ export declare class OverlaySelection {
     /**
      * Sets the focus on a cell and optionally edits a range.
      */
-    focus(cell?: Cell, isRangeEdit?: boolean): boolean;
+    focus(cell?: Cell, isRangeEdit?: boolean, originalEvent?: MouseEvent | TouchEvent | KeyboardEvent): boolean;
     get types(): AllDimensionType;
     /**
      * Collect data

package/dist/types/plugins/filter/filter.button.d.ts

@@ -31,5 +31,5 @@ type ReorderButtonProps = {
     onKeyDown?: (event: KeyboardEvent) => void;
 };
 export declare const ReorderButton: ({ ariaLabel, dragging, dragOver, onDragStart, onDragEnd, onDragOver, onDragLeave, onDrop, onKeyDown, }: ReorderButtonProps) => any;
-export declare function isFilterBtn(e: HTMLElement): true | Element | null;
+export declare function isFilterBtn(e: Element): true | Element | null;
 export {};

package/dist/types/plugins/filter/filter.panel.d.ts

@@ -60,5 +60,8 @@ export declare class FilterPanel {
     private assertChanges;
     renderSelectOptions(type: FilterType, isDefaultTypeRemoved?: boolean): VNode[] | undefined;
     renderExtra(prop: ColumnProp, index: number): any;
+    private getAddFilterSelect;
+    private isOwnFilterButton;
+    private getOwningGrid;
     render(): any;
 }

package/dist/types/services/local.scroll.timer.d.ts

@@ -15,6 +15,10 @@ export declare class LocalScrollTimer {
         dimension: DimensionType;
         coordinate: number;
     }): void;
+    setCoordinateFromScroll(e: {
+        dimension: DimensionType;
+        coordinate: number;
+    }): void;
     /**
      * Remember last mw event time
      */

package/dist/types/types/interfaces.d.ts

@@ -742,6 +742,10 @@ export interface FocusRenderEvent extends AllDimensionType {
      * Changes for the next cell to focus. @example { y: -1 }
      */
     next?: Partial<Cell>;
+    /**
+     * Original user input event that initiated the focus/range change, when available.
+     */
+    originalEvent?: MouseEvent | TouchEvent | KeyboardEvent;
 }
 export interface FocusAfterRenderEvent<TModel extends DataType = DataType> extends AllDimensionType {
     model?: TModel;

package/dist/types/types/selection.d.ts

@@ -117,6 +117,10 @@ export interface BeforeSaveDataDetails<TModel extends DataType = DataType, TColu
      * Value from editor to save, not part of the model value yet
      */
     val?: any;
+    /**
+     * Original user input event that initiated the save/focus flow, when available.
+     */
+    originalEvent?: MouseEvent | TouchEvent | KeyboardEvent;
 }
 export type BeforeRangeSaveDataDetails<TModel extends DataType = DataType> = {
     data: {

package/hydrate/index.js

@@ -7505,7 +7505,7 @@ class FilterPanel {
             return;
         }
         const path = e.composedPath();
-        const select = document.getElementById(FILTER_ID);
+        const select = this.getAddFilterSelect();
         if (select instanceof HTMLSelectElement) {
             // click on select should be skipped
             if (path.includes(select)) {
@@ -7519,9 +7519,8 @@ class FilterPanel {
         }
         this.currentFilterId = -1;
         const isOutside = !path.includes(this.element);
-        if (e.target instanceof HTMLElement &&
-            isOutside &&
-            !isFilterBtn(e.target) &&
+        if (isOutside &&
+            !this.isOwnFilterButton(e.target) &&
             this.closeOnOutsideClick) {
             this.changes = undefined;
         }
@@ -7645,7 +7644,7 @@ class FilterPanel {
         this.currentFilterType = el.value;
         this.addNewFilterToProp();
         // reset value after adding new filter
-        const select = document.getElementById('add-filter');
+        const select = this.getAddFilterSelect();
         if (select) {
             select.value = defaultType;
             this.currentFilterType = defaultType;
@@ -7849,7 +7848,7 @@ class FilterPanel {
             }
         };
         const focusNext = () => {
-            const select = document.getElementById('add-filter');
+            const select = this.getAddFilterSelect();
             if (select) {
                 select.value = defaultType;
                 this.currentFilterType = defaultType;
@@ -7883,7 +7882,7 @@ class FilterPanel {
                 }
             }, onKeyDown: e => {
                 if (e.key.toLowerCase() === 'enter') {
-                    const select = document.getElementById('add-filter');
+                    const select = this.getAddFilterSelect();
                     if (select) {
                         focusNext();
                     }
@@ -7893,6 +7892,31 @@ class FilterPanel {
                 e.stopPropagation();
             } }));
     }
+    getAddFilterSelect() {
+        return this.element.querySelector(`#${FILTER_ID}`);
+    }
+    isOwnFilterButton(target) {
+        if (!(target instanceof Element)) {
+            return false;
+        }
+        if (!isFilterBtn(target)) {
+            return false;
+        }
+        const panelGrid = this.getOwningGrid(this.element);
+        const targetGrid = this.getOwningGrid(target);
+        return !!panelGrid && panelGrid === targetGrid;
+    }
+    getOwningGrid(element) {
+        const grid = element.closest('revo-grid');
+        if (grid) {
+            return grid;
+        }
+        const root = element.getRootNode();
+        if (root instanceof ShadowRoot && root.host.localName === 'revo-grid') {
+            return root.host;
+        }
+        return undefined;
+    }
     render() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const style = {
@@ -7900,7 +7924,7 @@ class FilterPanel {
             top: `${(_d = (_c = this.changes) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0}px`,
         };
         const capts = Object.assign(Object.assign({}, this.filterCaptionsInternal), this.filterCaptions);
-        return (hAsync(Host, { key: '4e969f8b7033363c885c94b1f7770917786669f2' }, hAsync("dialog", { key: '79b2713724684fa99f56621fe43645a0b0ad54bf', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
+        return (hAsync(Host, { key: '2a19b35adb56fb7d23385fffebc768838edee162' }, hAsync("dialog", { key: '94386d7cbc4bd9c631f72928938b1d1550a3de82', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
                 e.preventDefault();
                 this.onCancel();
             } }, this.changes && [
@@ -7909,7 +7933,7 @@ class FilterPanel {
             ((_g = this.changes) === null || _g === void 0 ? void 0 : _g.hideDefaultFilters) !== true && [
                 hAsync("label", { key: "filter-title" }, capts.title),
                 hAsync("div", { key: "filter-holder", class: "filter-holder" }, this.getFilterItemsList()),
-                hAsync("div", { key: "add-filter", class: "add-filter" }, hAsync("select", { key: 'fc894bdfae1ff35d5c49adc7646dd3182b7bd49e', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
+                hAsync("div", { key: "add-filter", class: "add-filter" }, hAsync("select", { key: '4f7354e39d8e5cf9ae7b735290eff18d105ab87e', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
             ],
             hAsync("slot", { key: "default-slot" }),
             ((_j = (_h = this.changes).extraBottomContent) === null || _j === void 0 ? void 0 : _j.call(_h, this.changes)) || '',
@@ -12655,16 +12679,16 @@ class RowOrderService {
             return;
         }
         const newRow = this.getCell(e, data);
+        // rgRow dragged out table
+        if (newRow.y < 0) {
+            newRow.y = 0;
+        }
+        // rgRow dragged to the top
+        else if (newRow.y < this.currentCell.y) {
+            newRow.y++;
+        }
         // if position changed
         if (newRow.y !== this.currentCell.y) {
-            // rgRow dragged out table
-            if (newRow.y < 0) {
-                newRow.y = 0;
-            }
-            // rgRow dragged to the top
-            else if (newRow.y < this.currentCell.y) {
-                newRow.y++;
-            }
             this.config.positionChanged(this.currentCell.y, newRow.y);
         }
         this.clear();
@@ -14246,13 +14270,13 @@ class OverlaySelection {
     /**
      * Executes the focus operation on the specified range of cells.
      */
-    doFocus(focus, end, changes) {
+    doFocus(focus, end, changes, originalEvent) {
         // 1. Trigger beforeFocus event
-        const { defaultPrevented } = this.beforeFocusCell.emit(this.columnService.getSaveData(focus.y, focus.x));
+        const { defaultPrevented } = this.beforeFocusCell.emit(Object.assign(Object.assign({}, this.columnService.getSaveData(focus.y, focus.x)), { originalEvent }));
         if (defaultPrevented) {
             return false;
         }
-        const evData = Object.assign(Object.assign({ range: Object.assign(Object.assign({}, focus), { x1: end.x, y1: end.y }), next: changes }, this.types), { rowDimension: Object.assign({}, this.dimensionRow.state), colDimension: Object.assign({}, this.dimensionCol.state) });
+        const evData = Object.assign(Object.assign({ range: Object.assign(Object.assign({}, focus), { x1: end.x, y1: end.y }), next: changes }, this.types), { rowDimension: Object.assign({}, this.dimensionRow.state), colDimension: Object.assign({}, this.dimensionCol.state), originalEvent });
         // 2. Trigger apply focus event
         const applyEvent = this.applyFocus.emit(evData);
         if (applyEvent.defaultPrevented) {
@@ -14268,10 +14292,10 @@ class OverlaySelection {
                 y: range.y1,
             } }, applyEvent.detail)).defaultPrevented;
     }
-    triggerRangeEvent(range) {
+    triggerRangeEvent(range, originalEvent) {
         const type = this.types.rowType;
         // 1. Apply range
-        const applyEvent = this.beforeApplyRange.emit(Object.assign(Object.assign({ range: Object.assign({}, range) }, this.types), { rowDimension: Object.assign({}, this.dimensionRow.state), colDimension: Object.assign({}, this.dimensionCol.state) }));
+        const applyEvent = this.beforeApplyRange.emit(Object.assign(Object.assign({ range: Object.assign({}, range) }, this.types), { rowDimension: Object.assign({}, this.dimensionRow.state), colDimension: Object.assign({}, this.dimensionCol.state), originalEvent }));
         if (applyEvent.defaultPrevented) {
             return false;
         }
@@ -14322,7 +14346,7 @@ class OverlaySelection {
             return;
         }
         // Set focus on the current cell
-        this.focus(focusCell, this.range && e.shiftKey);
+        this.focus(focusCell, this.range && e.shiftKey, e);
         // Initiate autofill selection
         if (this.range) {
             targetElement &&
@@ -14476,7 +14500,7 @@ class OverlaySelection {
     /**
      * Sets the focus on a cell and optionally edits a range.
      */
-    focus(cell, isRangeEdit = false) {
+    focus(cell, isRangeEdit = false, originalEvent) {
         if (!cell)
             return false;
         const end = cell;
@@ -14484,10 +14508,10 @@ class OverlaySelection {
         if (isRangeEdit && start) {
             const range = getRange(start, end);
             if (range) {
-                return this.triggerRangeEvent(range);
+                return this.triggerRangeEvent(range, originalEvent);
             }
         }
-        return this.doFocus(cell, end);
+        return this.doFocus(cell, end, undefined, originalEvent);
     }
     get types() {
         return {
@@ -14942,9 +14966,12 @@ class DataProvider {
         // take out
         const toMove = newItemsOrder.splice(newItemsOrder.indexOf(prevItems[from]), // get index in proxy
         1);
+        const targetItem = prevItems[from < to ? to + 1 : to];
+        const targetIndex = targetItem === undefined
+            ? newItemsOrder.length
+            : newItemsOrder.indexOf(targetItem);
         // insert before
-        newItemsOrder.splice(newItemsOrder.indexOf(prevItems[to]), // get index in proxy
-        0, ...toMove);
+        newItemsOrder.splice(targetIndex, 0, ...toMove);
         storeService.setData({
             proxyItems: newItemsOrder,
         });
@@ -21704,6 +21731,10 @@ class LocalScrollTimer {
     setCoordinate(e) {
         this.lastKnownScrollCoordinate[e.dimension] = e.coordinate;
     }
+    setCoordinateFromScroll(e) {
+        this.setCoordinate(e);
+        this.mouseWheelScrollTimestamp[e.dimension] = 0;
+    }
     /**
      * Remember last mw event time
      */
@@ -22192,6 +22223,7 @@ class RevogrViewportScroll {
         const lastScrollUpdate = () => {
             var _a;
             (_a = this.localScrollService) === null || _a === void 0 ? void 0 : _a.scroll(coordinate, type, undefined, undefined, outside);
+            this.localScrollTimer.setCoordinateFromScroll({ dimension: type, coordinate });
         };
         // apply after throttling
         if (this.localScrollTimer.isReady(type, coordinate)) {