@revolist/revogrid 4.23.17 → 4.23.20

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

@@ -178,9 +178,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/cjs/revogr-attribution_7.cjs.entry.js

@@ -12,7 +12,7 @@ var index$1 = require('./index-DxaSE5uZ.js');
 var debounce = require('./debounce-CcpHiH2p.js');
 var viewport_store = require('./viewport.store-BscUCiUk.js');
 var viewport_helpers = require('./viewport.helpers-BND76K2j.js');
-var throttle = require('./throttle-BCwEuJJq.js');
+var throttle = require('./throttle-fV6BUmM7.js');
 
 const Attribution = class {
     constructor(hostRef) {
@@ -929,13 +929,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) {
@@ -951,10 +951,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;
         }
@@ -1005,7 +1005,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 &&
@@ -1159,7 +1159,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;
@@ -1167,10 +1167,10 @@ const OverlaySelection = class {
         if (isRangeEdit && start) {
             const range = column_service.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/cjs/revogr-clipboard_3.cjs.entry.js

@@ -298,16 +298,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/cjs/revogr-data_4.cjs.entry.js

@@ -9,7 +9,7 @@ var dimension_helpers = require('./dimension.helpers-B9HgANnM.js');
 var cellRenderer = require('./cell-renderer-DfUCisis.js');
 var filter_button = require('./filter.button-C4xpvyyE.js');
 var headerCellRenderer = require('./header-cell-renderer-DyjOxArm.js');
-var throttle = require('./throttle-BCwEuJJq.js');
+var throttle = require('./throttle-fV6BUmM7.js');
 var viewport_helpers = require('./viewport.helpers-BND76K2j.js');
 require('./debounce-CcpHiH2p.js');
 
@@ -873,6 +873,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/cjs/revogr-filter-panel.cjs.entry.js

@@ -120,7 +120,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)) {
@@ -134,9 +134,8 @@ const FilterPanel = class {
         }
         this.currentFilterId = -1;
         const isOutside = !path.includes(this.element);
-        if (e.target instanceof HTMLElement &&
-            isOutside &&
-            !filter_button.isFilterBtn(e.target) &&
+        if (isOutside &&
+            !this.isOwnFilterButton(e.target) &&
             this.closeOnOutsideClick) {
             this.changes = undefined;
         }
@@ -260,7 +259,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;
@@ -464,7 +463,7 @@ const FilterPanel = class {
             }
         };
         const focusNext = () => {
-            const select = document.getElementById('add-filter');
+            const select = this.getAddFilterSelect();
             if (select) {
                 select.value = defaultType;
                 this.currentFilterType = defaultType;
@@ -498,7 +497,7 @@ const FilterPanel = class {
                 }
             }, onKeyDown: e => {
                 if (e.key.toLowerCase() === 'enter') {
-                    const select = document.getElementById('add-filter');
+                    const select = this.getAddFilterSelect();
                     if (select) {
                         focusNext();
                     }
@@ -508,6 +507,31 @@ const FilterPanel = class {
                 e.stopPropagation();
             } }));
     }
+    getAddFilterSelect() {
+        return this.element.querySelector(`#${FILTER_ID}`);
+    }
+    isOwnFilterButton(target) {
+        if (!(target instanceof Element)) {
+            return false;
+        }
+        if (!filter_button.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 = {
@@ -515,7 +539,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 (index.h(index.Host, { key: '4e969f8b7033363c885c94b1f7770917786669f2' }, index.h("dialog", { key: '79b2713724684fa99f56621fe43645a0b0ad54bf', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
+        return (index.h(index.Host, { key: '2a19b35adb56fb7d23385fffebc768838edee162' }, index.h("dialog", { key: '94386d7cbc4bd9c631f72928938b1d1550a3de82', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
                 e.preventDefault();
                 this.onCancel();
             } }, this.changes && [
@@ -524,7 +548,7 @@ const FilterPanel = class {
             ((_g = this.changes) === null || _g === void 0 ? void 0 : _g.hideDefaultFilters) !== true && [
                 index.h("label", { key: "filter-title" }, capts.title),
                 index.h("div", { key: "filter-holder", class: "filter-holder" }, this.getFilterItemsList()),
-                index.h("div", { key: "add-filter", class: "add-filter" }, index.h("select", { key: 'fc894bdfae1ff35d5c49adc7646dd3182b7bd49e', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
+                index.h("div", { key: "add-filter", class: "add-filter" }, index.h("select", { key: '4f7354e39d8e5cf9ae7b735290eff18d105ab87e', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
             ],
             index.h("slot", { key: "default-slot" }),
             ((_j = (_h = this.changes).extraBottomContent) === null || _j === void 0 ? void 0 : _j.call(_h, this.changes)) || '',

package/dist/cjs/{throttle-BCwEuJJq.js → throttle-fV6BUmM7.js}

@@ -189,6 +189,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/collection/components/order/order-row.service.js

@@ -14,16 +14,16 @@ export default 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/collection/components/overlay/revogr-overlay-selection.js

@@ -241,13 +241,13 @@ export 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) {
@@ -263,10 +263,10 @@ export 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;
         }
@@ -317,7 +317,7 @@ export 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 &&
@@ -471,7 +471,7 @@ export 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;
@@ -479,10 +479,10 @@ export 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 {

package/dist/collection/components/scroll/revogr-viewport-scroll.js

@@ -262,6 +262,7 @@ export 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)) {

package/dist/collection/plugins/filter/filter.panel.js

@@ -60,7 +60,7 @@ export 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)) {
@@ -74,9 +74,8 @@ export 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;
         }
@@ -200,7 +199,7 @@ export 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;
@@ -404,7 +403,7 @@ export class FilterPanel {
             }
         };
         const focusNext = () => {
-            const select = document.getElementById('add-filter');
+            const select = this.getAddFilterSelect();
             if (select) {
                 select.value = defaultType;
                 this.currentFilterType = defaultType;
@@ -438,7 +437,7 @@ export class FilterPanel {
                 }
             }, onKeyDown: e => {
                 if (e.key.toLowerCase() === 'enter') {
-                    const select = document.getElementById('add-filter');
+                    const select = this.getAddFilterSelect();
                     if (select) {
                         focusNext();
                     }
@@ -448,6 +447,31 @@ export 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 = {
@@ -455,7 +479,7 @@ export 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 (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 && [
@@ -464,7 +488,7 @@ export class FilterPanel {
             ((_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/collection/services/data.provider.js

@@ -52,9 +52,12 @@ export 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/collection/services/local.scroll.timer.js

@@ -29,6 +29,10 @@ export 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/esm/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/esm/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/esm/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/esm/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)) {