@revolist/revogrid 4.2.0-next.6 → 4.2.0-next.7

package/custom-element/localScrollService.js

@@ -47,7 +47,7 @@ class LocalScrollService {
     }
   }
   // initiate scrolling event
-  scroll(coordinate, dimension, force = false, delta) {
+  scroll(coordinate, dimension, force = false, delta, outside = false) {
     this.cancelScroll(dimension);
     if (!force && this.previousScroll[dimension] === coordinate) {
       this.previousScroll[dimension] = NO_COORDINATE;
@@ -58,6 +58,7 @@ class LocalScrollService {
       dimension: dimension,
       coordinate: param.virtualSize ? this.convert(coordinate, param) : coordinate,
       delta,
+      outside
     });
   }
   getParams(dimension) {

package/custom-element/revo-grid.js

@@ -2744,7 +2744,7 @@ const ViewPortSections = ({ resize, editors, rowClass, readonly, range, columns,
       const dataView = (h("revogr-overlay-selection", Object.assign({}, data, { slot: data.slot, selectionStore: data.segmentSelectionStore, editors: editors, readonly: readonly, range: range, useClipboard: useClipboard, applyChangesOnClose: applyEditorChangesOnClose, onSetEdit: ({ detail }) => onEdit(detail) }),
         h("revogr-data", Object.assign({}, data, { [UUID]: data.uuid }, { key: key, readonly: readonly, range: range, rowClass: rowClass, rowSelectionStore: data.rowSelectionStore, slot: DATA_SLOT })),
         h("revogr-temp-range", { selectionStore: data.segmentSelectionStore, dimensionRow: data.dimensionRow, dimensionCol: data.dimensionCol }),
-        h("revogr-focus", { focusTemplate: focusTemplate, rowType: data.type, colType: view.type, selectionStore: data.segmentSelectionStore, dimensionRow: data.dimensionRow, dimensionCol: data.dimensionCol })));
+        h("revogr-focus", { colData: data.colData, dataStore: data.dataStore, focusTemplate: focusTemplate, rowType: data.type, colType: view.type, selectionStore: data.segmentSelectionStore, dimensionRow: data.dimensionRow, dimensionCol: data.dimensionCol })));
       dataViews.push(dataView);
     });
     viewPortHtml.push(h("revogr-viewport-scroll", Object.assign({}, view.prop, { ref: el => registerElement(el, view.prop.key), onScrollViewport: e => onScroll(e.detail, view.prop.key) }), dataViews));
@@ -3152,6 +3152,7 @@ const RevoGridComponent = /*@__PURE__*/ proxyCustomElement(class extends HTMLEle
     this.afteredit = createEvent(this, "afteredit", 7);
     this.beforeautofill = createEvent(this, "beforeautofill", 7);
     this.beforeange = createEvent(this, "beforeange", 7);
+    this.afterfocus = createEvent(this, "afterfocus", 7);
     this.roworderchanged = createEvent(this, "roworderchanged", 7);
     this.beforesourcesortingapply = createEvent(this, "beforesourcesortingapply", 7);
     this.beforesortingapply = createEvent(this, "beforesortingapply", 7);
@@ -3273,6 +3274,12 @@ const RevoGridComponent = /*@__PURE__*/ proxyCustomElement(class extends HTMLEle
     this.stretch = true;
     // --------------------------------------------------------------------------
     //
+    //  Listeners outside scope
+    //
+    // --------------------------------------------------------------------------
+    this.clickTrackForFocusClear = null;
+    // --------------------------------------------------------------------------
+    //
     //  Private Properties
     //
     // --------------------------------------------------------------------------
@@ -3285,7 +3292,6 @@ const RevoGridComponent = /*@__PURE__*/ proxyCustomElement(class extends HTMLEle
      * Define plugins collection
      */
     this.internalPlugins = [];
-    this.subscribers = {};
   }
   // --------------------------------------------------------------------------
   //
@@ -3462,15 +3468,19 @@ const RevoGridComponent = /*@__PURE__*/ proxyCustomElement(class extends HTMLEle
     var _a;
     return (_a = this.viewport) === null || _a === void 0 ? void 0 : _a.getSelectedRange();
   }
-  // --------------------------------------------------------------------------
-  //
-  //  Listeners outside scope
-  //
-  // --------------------------------------------------------------------------
-  /** Clear data which is outside of grid container */
-  handleOutsideClick(e) {
+  mousedownHandle(e) {
+    this.clickTrackForFocusClear = e.screenX + e.screenY;
+  }
+  mouseupHandle(e) {
     const target = e.target;
-    // if event prevented or it is a table where we click at
+    const pos = e.screenX + e.screenY;
+    // detect if mousemove then do nothing
+    if (Math.abs(this.clickTrackForFocusClear - pos) > 10) {
+      return;
+    }
+    // check if action finished inside of the document
+    // clear data which is outside of grid
+    // if event prevented or it is current table don't clear focus
     if (e.defaultPrevented || (target === null || target === void 0 ? void 0 : target.closest(`[${UUID}="${this.uuid}"]`))) {
       return;
     }
@@ -3745,20 +3755,11 @@ const RevoGridComponent = /*@__PURE__*/ proxyCustomElement(class extends HTMLEle
       });
       this.viewportscroll.emit(e);
     });
-    this.subscribers = { mouseup: this.handleOutsideClick.bind(this) };
-    for (let type in this.subscribers) {
-      document.addEventListener(type, this.subscribers[type]);
-    }
   }
   disconnectedCallback() {
     // destroy plugins on element disconnect
     each(this.internalPlugins, p => p.destroy());
     this.internalPlugins = [];
-    // clear events
-    for (let type in this.subscribers) {
-      document.removeEventListener(type, this.subscribers[type]);
-      delete this.subscribers[type];
-    }
   }
   render() {
     const contentHeight = this.dimensionProvider.stores['rgRow'].store.get('realSize');
@@ -3853,7 +3854,7 @@ const RevoGridComponent = /*@__PURE__*/ proxyCustomElement(class extends HTMLEle
     "getFocused": [64],
     "getContentSize": [64],
     "getSelectedRange": [64]
-  }, [[0, "internalRowDragStart", "onRowDragStarted"], [0, "internalRowDragEnd", "onRowDragEnd"], [0, "internalRowDrag", "onRowDrag"], [0, "internalRowMouseMove", "onRowMouseMove"], [0, "internalCellEdit", "onBeforeEdit"], [0, "internalRangeDataApply", "onBeforeRangeEdit"], [0, "internalSelectionChanged", "onRangeChanged"], [0, "initialRowDropped", "onRowDropped"], [0, "initialHeaderClick", "onHeaderClick"], [0, "beforeFocusCell", "onCellFocus"]]]);
+  }, [[5, "mousedown", "mousedownHandle"], [5, "mouseup", "mouseupHandle"], [0, "internalRowDragStart", "onRowDragStarted"], [0, "internalRowDragEnd", "onRowDragEnd"], [0, "internalRowDrag", "onRowDrag"], [0, "internalRowMouseMove", "onRowMouseMove"], [0, "internalCellEdit", "onBeforeEdit"], [0, "internalRangeDataApply", "onBeforeRangeEdit"], [0, "internalSelectionChanged", "onRangeChanged"], [0, "initialRowDropped", "onRowDropped"], [0, "initialHeaderClick", "onHeaderClick"], [0, "beforeFocusCell", "onCellFocus"]]]);
 function defineCustomElement$1() {
   if (typeof customElements === "undefined") {
     return;

package/custom-element/revogr-focus2.js

@@ -4,6 +4,7 @@
 import { proxyCustomElement, HTMLElement, createEvent, h, Host } from '@stencil/core/internal/client';
 import { F as FOCUS_CLASS } from './consts.js';
 import { g as getElStyle } from './selection.utils.js';
+import { g as getSourceItem } from './data.store.js';
 
 const revogrFocusStyleCss = ".revo-drag-icon{-webkit-mask-image:url(\"data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg viewBox='0 0 438 383' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%3E%3Cpath d='M421.875,70.40625 C426.432292,70.40625 430.175781,68.9414062 433.105469,66.0117188 C436.035156,63.0820312 437.5,59.3385417 437.5,54.78125 L437.5,54.78125 L437.5,15.71875 C437.5,11.1614583 436.035156,7.41796875 433.105469,4.48828125 C430.175781,1.55859375 426.432292,0.09375 421.875,0.09375 L421.875,0.09375 L15.625,0.09375 C11.0677083,0.09375 7.32421875,1.55859375 4.39453125,4.48828125 C1.46484375,7.41796875 0,11.1614583 0,15.71875 L0,15.71875 L0,54.78125 C0,59.3385417 1.46484375,63.0820312 4.39453125,66.0117188 C7.32421875,68.9414062 11.0677083,70.40625 15.625,70.40625 L15.625,70.40625 L421.875,70.40625 Z M421.875,226.65625 C426.432292,226.65625 430.175781,225.191406 433.105469,222.261719 C436.035156,219.332031 437.5,215.588542 437.5,211.03125 L437.5,211.03125 L437.5,171.96875 C437.5,167.411458 436.035156,163.667969 433.105469,160.738281 C430.175781,157.808594 426.432292,156.34375 421.875,156.34375 L421.875,156.34375 L15.625,156.34375 C11.0677083,156.34375 7.32421875,157.808594 4.39453125,160.738281 C1.46484375,163.667969 0,167.411458 0,171.96875 L0,171.96875 L0,211.03125 C0,215.588542 1.46484375,219.332031 4.39453125,222.261719 C7.32421875,225.191406 11.0677083,226.65625 15.625,226.65625 L15.625,226.65625 L421.875,226.65625 Z M421.875,382.90625 C426.432292,382.90625 430.175781,381.441406 433.105469,378.511719 C436.035156,375.582031 437.5,371.838542 437.5,367.28125 L437.5,367.28125 L437.5,328.21875 C437.5,323.661458 436.035156,319.917969 433.105469,316.988281 C430.175781,314.058594 426.432292,312.59375 421.875,312.59375 L421.875,312.59375 L15.625,312.59375 C11.0677083,312.59375 7.32421875,314.058594 4.39453125,316.988281 C1.46484375,319.917969 0,323.661458 0,328.21875 L0,328.21875 L0,367.28125 C0,371.838542 1.46484375,375.582031 4.39453125,378.511719 C7.32421875,381.441406 11.0677083,382.90625 15.625,382.90625 L15.625,382.90625 L421.875,382.90625 Z'%3E%3C/path%3E%3C/g%3E%3C/svg%3E\");mask-image:url(\"data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg viewBox='0 0 438 383' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%3E%3Cpath d='M421.875,70.40625 C426.432292,70.40625 430.175781,68.9414062 433.105469,66.0117188 C436.035156,63.0820312 437.5,59.3385417 437.5,54.78125 L437.5,54.78125 L437.5,15.71875 C437.5,11.1614583 436.035156,7.41796875 433.105469,4.48828125 C430.175781,1.55859375 426.432292,0.09375 421.875,0.09375 L421.875,0.09375 L15.625,0.09375 C11.0677083,0.09375 7.32421875,1.55859375 4.39453125,4.48828125 C1.46484375,7.41796875 0,11.1614583 0,15.71875 L0,15.71875 L0,54.78125 C0,59.3385417 1.46484375,63.0820312 4.39453125,66.0117188 C7.32421875,68.9414062 11.0677083,70.40625 15.625,70.40625 L15.625,70.40625 L421.875,70.40625 Z M421.875,226.65625 C426.432292,226.65625 430.175781,225.191406 433.105469,222.261719 C436.035156,219.332031 437.5,215.588542 437.5,211.03125 L437.5,211.03125 L437.5,171.96875 C437.5,167.411458 436.035156,163.667969 433.105469,160.738281 C430.175781,157.808594 426.432292,156.34375 421.875,156.34375 L421.875,156.34375 L15.625,156.34375 C11.0677083,156.34375 7.32421875,157.808594 4.39453125,160.738281 C1.46484375,163.667969 0,167.411458 0,171.96875 L0,171.96875 L0,211.03125 C0,215.588542 1.46484375,219.332031 4.39453125,222.261719 C7.32421875,225.191406 11.0677083,226.65625 15.625,226.65625 L15.625,226.65625 L421.875,226.65625 Z M421.875,382.90625 C426.432292,382.90625 430.175781,381.441406 433.105469,378.511719 C436.035156,375.582031 437.5,371.838542 437.5,367.28125 L437.5,367.28125 L437.5,328.21875 C437.5,323.661458 436.035156,319.917969 433.105469,316.988281 C430.175781,314.058594 426.432292,312.59375 421.875,312.59375 L421.875,312.59375 L15.625,312.59375 C11.0677083,312.59375 7.32421875,314.058594 4.39453125,316.988281 C1.46484375,319.917969 0,323.661458 0,328.21875 L0,328.21875 L0,367.28125 C0,371.838542 1.46484375,375.582031 4.39453125,378.511719 C7.32421875,381.441406 11.0677083,382.90625 15.625,382.90625 L15.625,382.90625 L421.875,382.90625 Z'%3E%3C/path%3E%3C/g%3E%3C/svg%3E\");width:11px;height:7px;background-size:cover;background-repeat:no-repeat}.revo-alt-icon{-webkit-mask-image:url(\"data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg viewBox='0 0 384 383' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%3E%3Cpath d='M192.4375,383 C197.424479,383 201.663411,381.254557 205.154297,377.763672 L205.154297,377.763672 L264.25,318.667969 C270.234375,312.683594 271.605794,306.075846 268.364258,298.844727 C265.122721,291.613607 259.51237,287.998047 251.533203,287.998047 L251.533203,287.998047 L213.382812,287.998047 L213.382812,212.445312 L288.935547,212.445312 L288.935547,250.595703 C288.935547,258.57487 292.551107,264.185221 299.782227,267.426758 C307.013346,270.668294 313.621094,269.296875 319.605469,263.3125 L319.605469,263.3125 L378.701172,204.216797 C382.192057,200.725911 383.9375,196.486979 383.9375,191.5 C383.9375,186.513021 382.192057,182.274089 378.701172,178.783203 L378.701172,178.783203 L319.605469,119.6875 C313.621094,114.201823 307.013346,112.955078 299.782227,115.947266 C292.551107,118.939453 288.935547,124.42513 288.935547,132.404297 L288.935547,132.404297 L288.935547,170.554688 L213.382812,170.554688 L213.382812,95.0019531 L251.533203,95.0019531 C259.51237,95.0019531 264.998047,91.3863932 267.990234,84.1552734 C270.982422,76.9241536 269.735677,70.3164062 264.25,64.3320312 L264.25,64.3320312 L205.154297,5.23632812 C201.663411,1.74544271 197.424479,0 192.4375,0 C187.450521,0 183.211589,1.74544271 179.720703,5.23632812 L179.720703,5.23632812 L120.625,64.3320312 C114.640625,70.3164062 113.269206,76.9241536 116.510742,84.1552734 C119.752279,91.3863932 125.36263,95.0019531 133.341797,95.0019531 L133.341797,95.0019531 L171.492188,95.0019531 L171.492188,170.554688 L95.9394531,170.554688 L95.9394531,132.404297 C95.9394531,124.42513 92.3238932,118.814779 85.0927734,115.573242 C77.8616536,112.331706 71.2539062,113.703125 65.2695312,119.6875 L65.2695312,119.6875 L6.17382812,178.783203 C2.68294271,182.274089 0.9375,186.513021 0.9375,191.5 C0.9375,196.486979 2.68294271,200.725911 6.17382812,204.216797 L6.17382812,204.216797 L65.2695312,263.3125 C71.2539062,268.798177 77.8616536,270.044922 85.0927734,267.052734 C92.3238932,264.060547 95.9394531,258.57487 95.9394531,250.595703 L95.9394531,250.595703 L95.9394531,212.445312 L171.492188,212.445312 L171.492188,287.998047 L133.341797,287.998047 C125.36263,287.998047 119.876953,291.613607 116.884766,298.844727 C113.892578,306.075846 115.139323,312.683594 120.625,318.667969 L120.625,318.667969 L179.720703,377.763672 C183.211589,381.254557 187.450521,383 192.4375,383 Z'%3E%3C/path%3E%3C/g%3E%3C/svg%3E\");mask-image:url(\"data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg viewBox='0 0 384 383' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%3E%3Cpath d='M192.4375,383 C197.424479,383 201.663411,381.254557 205.154297,377.763672 L205.154297,377.763672 L264.25,318.667969 C270.234375,312.683594 271.605794,306.075846 268.364258,298.844727 C265.122721,291.613607 259.51237,287.998047 251.533203,287.998047 L251.533203,287.998047 L213.382812,287.998047 L213.382812,212.445312 L288.935547,212.445312 L288.935547,250.595703 C288.935547,258.57487 292.551107,264.185221 299.782227,267.426758 C307.013346,270.668294 313.621094,269.296875 319.605469,263.3125 L319.605469,263.3125 L378.701172,204.216797 C382.192057,200.725911 383.9375,196.486979 383.9375,191.5 C383.9375,186.513021 382.192057,182.274089 378.701172,178.783203 L378.701172,178.783203 L319.605469,119.6875 C313.621094,114.201823 307.013346,112.955078 299.782227,115.947266 C292.551107,118.939453 288.935547,124.42513 288.935547,132.404297 L288.935547,132.404297 L288.935547,170.554688 L213.382812,170.554688 L213.382812,95.0019531 L251.533203,95.0019531 C259.51237,95.0019531 264.998047,91.3863932 267.990234,84.1552734 C270.982422,76.9241536 269.735677,70.3164062 264.25,64.3320312 L264.25,64.3320312 L205.154297,5.23632812 C201.663411,1.74544271 197.424479,0 192.4375,0 C187.450521,0 183.211589,1.74544271 179.720703,5.23632812 L179.720703,5.23632812 L120.625,64.3320312 C114.640625,70.3164062 113.269206,76.9241536 116.510742,84.1552734 C119.752279,91.3863932 125.36263,95.0019531 133.341797,95.0019531 L133.341797,95.0019531 L171.492188,95.0019531 L171.492188,170.554688 L95.9394531,170.554688 L95.9394531,132.404297 C95.9394531,124.42513 92.3238932,118.814779 85.0927734,115.573242 C77.8616536,112.331706 71.2539062,113.703125 65.2695312,119.6875 L65.2695312,119.6875 L6.17382812,178.783203 C2.68294271,182.274089 0.9375,186.513021 0.9375,191.5 C0.9375,196.486979 2.68294271,200.725911 6.17382812,204.216797 L6.17382812,204.216797 L65.2695312,263.3125 C71.2539062,268.798177 77.8616536,270.044922 85.0927734,267.052734 C92.3238932,264.060547 95.9394531,258.57487 95.9394531,250.595703 L95.9394531,250.595703 L95.9394531,212.445312 L171.492188,212.445312 L171.492188,287.998047 L133.341797,287.998047 C125.36263,287.998047 119.876953,291.613607 116.884766,298.844727 C113.892578,306.075846 115.139323,312.683594 120.625,318.667969 L120.625,318.667969 L179.720703,377.763672 C183.211589,381.254557 187.450521,383 192.4375,383 Z'%3E%3C/path%3E%3C/g%3E%3C/svg%3E\");width:11px;height:11px;background-size:cover;background-repeat:no-repeat}.arrow-down{position:absolute;right:5px;top:0}.arrow-down svg{width:8px;margin-top:5px;margin-left:5px;opacity:0.4}.cell-value-wrapper{margin-right:10px;overflow:hidden;text-overflow:ellipsis}.revo-button{position:relative;overflow:hidden;color:#fff;background-color:#6200ee;height:34px;line-height:34px;padding:0 15px;outline:0;border:0;border-radius:7px;box-sizing:border-box;cursor:pointer}.revo-button.green{background-color:#2ee072;border:1px solid #20d565}.revo-button.red{background-color:#E0662E;border:1px solid #d55920}.revo-button:disabled,.revo-button[disabled]{cursor:not-allowed !important;filter:opacity(0.35) !important}.revo-button.light{border:2px solid #cedefa;line-height:32px;background:none;color:#4876ca;box-shadow:none}revogr-focus.focused-cell{box-shadow:-1px 0 0 #0d63e8 inset, 1px 0 0 #0d63e8 inset, 0 -1px 0 #0d63e8 inset, 0 1px 0 #0d63e8 inset;position:absolute;pointer-events:none;z-index:9;display:block}";
 
@@ -12,15 +13,24 @@ const RevogrFocus = /*@__PURE__*/ proxyCustomElement(class extends HTMLElement {
     super();
     this.__registerHost();
     this.beforeFocusRender = createEvent(this, "before-focus-render", 7);
+    this.afterFocus = createEvent(this, "afterfocus", 7);
+    this.focusTemplate = null;
   }
-  changed(e) {
+  changed(e, focus) {
     e === null || e === void 0 ? void 0 : e.scrollIntoView({
       block: 'nearest',
       inline: 'nearest',
     });
+    const model = getSourceItem(this.dataStore, focus.y);
+    const column = getSourceItem(this.colData, focus.x);
+    this.afterFocus.emit({
+      model,
+      column
+    });
   }
   componentDidRender() {
-    this.el && this.changed(this.el);
+    const currentFocus = this.selectionStore.get('focus');
+    currentFocus && this.el && this.changed(this.el, currentFocus);
   }
   render() {
     const editCell = this.selectionStore.get('edit');
@@ -49,6 +59,8 @@ const RevogrFocus = /*@__PURE__*/ proxyCustomElement(class extends HTMLElement {
     "selectionStore": [16],
     "dimensionRow": [16],
     "dimensionCol": [16],
+    "dataStore": [16],
+    "colData": [16],
     "colType": [1, "col-type"],
     "rowType": [1, "row-type"],
     "focusTemplate": [16]

package/custom-element/revogr-viewport-scroll2.js

@@ -168,8 +168,11 @@ const RevogrViewportScroll = /*@__PURE__*/ proxyCustomElement(class extends HTML
   mousewheelHorizontal({ detail: e }) {
     this.horizontalMouseWheel(e);
   }
+  /**
+   * Allows to use outside listener
+   */
   scrollApply({ detail: { type, coordinate } }) {
-    this.applyOnScroll(type, coordinate);
+    this.applyOnScroll(type, coordinate, true);
   }
   connectedCallback() {
     /**
@@ -307,12 +310,12 @@ const RevogrViewportScroll = /*@__PURE__*/ proxyCustomElement(class extends HTML
     }
     this.applyOnScroll(type, scroll);
   }
-  applyOnScroll(type, coordinate) {
+  applyOnScroll(type, coordinate, outside = false) {
     var _a;
     const change = new Date().getTime() - this.mouseWheelScroll[type];
     // apply after throttling
     if (change > this.scrollThrottling) {
-      (_a = this.scrollService) === null || _a === void 0 ? void 0 : _a.scroll(coordinate, type);
+      (_a = this.scrollService) === null || _a === void 0 ? void 0 : _a.scroll(coordinate, type, undefined, undefined, outside);
     }
   }
   /** remember last mw event time */

package/dist/cjs/loader.cjs.js

@@ -31,7 +31,7 @@ const patchEsm = () => {
 const defineCustomElements = (win, options) => {
   if (typeof window === 'undefined') return Promise.resolve();
   return patchEsm().then(() => {
-  return index.bootstrapLazy([["revogr-clipboard.cjs",[[0,"revogr-clipboard",{"doCopy":[64]},[[4,"paste","onPaste"],[4,"copy","copyStarted"]]]]],["revogr-filter-panel.cjs",[[0,"revogr-filter-panel",{"uuid":[1537],"filterItems":[16],"filterTypes":[16],"filterNames":[16],"filterEntities":[16],"filterCaptions":[16],"disableDynamicFiltering":[4,"disable-dynamic-filtering"],"isFilterIdSet":[32],"filterId":[32],"currentFilterId":[32],"currentFilterType":[32],"changes":[32],"show":[64],"getChanges":[64]},[[5,"mousedown","onMouseDown"]]]]],["revo-grid_11.cjs",[[0,"revo-grid",{"rowHeaders":[4,"row-headers"],"frameSize":[2,"frame-size"],"rowSize":[2,"row-size"],"colSize":[2,"col-size"],"range":[4],"readonly":[4],"resize":[4],"canFocus":[4,"can-focus"],"useClipboard":[4,"use-clipboard"],"columns":[16],"source":[16],"pinnedTopSource":[16],"pinnedBottomSource":[16],"rowDefinitions":[16],"editors":[16],"applyEditorChangesOnClose":[4,"apply-editor-changes-on-close"],"plugins":[16],"columnTypes":[16],"theme":[1537],"rowClass":[513,"row-class"],"autoSizeColumn":[4,"auto-size-column"],"filter":[4],"focusTemplate":[16],"canMoveColumns":[4,"can-move-columns"],"trimmedRows":[16],"exporting":[4],"grouping":[16],"stretch":[8],"extraElements":[32],"refresh":[64],"scrollToRow":[64],"scrollToColumnIndex":[64],"scrollToColumnProp":[64],"updateColumns":[64],"addTrimmed":[64],"scrollToCoordinate":[64],"setCellEdit":[64],"setCellsFocus":[64],"registerVNode":[64],"getSource":[64],"getVisibleSource":[64],"getSourceStore":[64],"getColumnStore":[64],"updateColumnSorting":[64],"clearSorting":[64],"getColumns":[64],"clearFocus":[64],"getPlugins":[64],"getFocused":[64],"getContentSize":[64],"getSelectedRange":[64]},[[0,"internalRowDragStart","onRowDragStarted"],[0,"internalRowDragEnd","onRowDragEnd"],[0,"internalRowDrag","onRowDrag"],[0,"internalRowMouseMove","onRowMouseMove"],[0,"internalCellEdit","onBeforeEdit"],[0,"internalRangeDataApply","onBeforeRangeEdit"],[0,"internalSelectionChanged","onRangeChanged"],[0,"initialRowDropped","onRowDropped"],[0,"initialHeaderClick","onHeaderClick"],[0,"beforeFocusCell","onCellFocus"]]],[0,"revogr-row-headers",{"height":[2],"dataPorts":[16],"headerProp":[16],"uiid":[1],"rowClass":[1,"row-class"],"resize":[4],"rowHeaderColumn":[16]}],[4,"revogr-overlay-selection",{"readonly":[4],"range":[4],"canDrag":[4,"can-drag"],"useClipboard":[4,"use-clipboard"],"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"colData":[16],"lastCell":[16],"editors":[16],"applyChangesOnClose":[4,"apply-changes-on-close"]},[[5,"mousemove","onMouseMove"],[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"],[0,"dragStartCell","onCellDrag"],[4,"keyup","onKeyUp"],[4,"keydown","onKeyDown"]]],[0,"revogr-focus",{"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16],"colType":[1,"col-type"],"rowType":[1,"row-type"],"focusTemplate":[16]}],[0,"revogr-scroll-virtual",{"dimension":[1],"viewportStore":[16],"dimensionStore":[16],"setScroll":[64],"changeScroll":[64]}],[0,"revogr-temp-range",{"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16]}],[0,"revogr-data",{"readonly":[4],"range":[4],"rowClass":[1,"row-class"],"rowSelectionStore":[16],"viewportRow":[16],"viewportCol":[16],"dimensionRow":[16],"colData":[16],"dataStore":[16],"type":[1]}],[0,"revogr-edit",{"editCell":[16],"column":[16],"editor":[16],"saveOnClose":[4,"save-on-close"],"cancel":[64]}],[0,"revogr-header",{"viewportCol":[16],"dimensionCol":[16],"selectionStore":[16],"parent":[1],"groups":[16],"groupingDepth":[2,"grouping-depth"],"canResize":[4,"can-resize"],"colData":[16],"columnFilter":[4,"column-filter"],"type":[1]}],[0,"revogr-order-editor",{"parent":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"dragStart":[64],"endOrder":[64],"clearOrder":[64]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"]]],[4,"revogr-viewport-scroll",{"contentWidth":[2,"content-width"],"contentHeight":[2,"content-height"],"setScroll":[64],"changeScroll":[64]},[[0,"mousewheel-vertical","mousewheelVertical"],[0,"mousewheel-horizontal","mousewheelHorizontal"],[0,"scroll-coordinate","scrollApply"]]]]]], options);
+  return index.bootstrapLazy([["revogr-clipboard.cjs",[[0,"revogr-clipboard",{"doCopy":[64]},[[4,"paste","onPaste"],[4,"copy","copyStarted"]]]]],["revogr-filter-panel.cjs",[[0,"revogr-filter-panel",{"uuid":[1537],"filterItems":[16],"filterTypes":[16],"filterNames":[16],"filterEntities":[16],"filterCaptions":[16],"disableDynamicFiltering":[4,"disable-dynamic-filtering"],"isFilterIdSet":[32],"filterId":[32],"currentFilterId":[32],"currentFilterType":[32],"changes":[32],"show":[64],"getChanges":[64]},[[5,"mousedown","onMouseDown"]]]]],["revo-grid_11.cjs",[[0,"revo-grid",{"rowHeaders":[4,"row-headers"],"frameSize":[2,"frame-size"],"rowSize":[2,"row-size"],"colSize":[2,"col-size"],"range":[4],"readonly":[4],"resize":[4],"canFocus":[4,"can-focus"],"useClipboard":[4,"use-clipboard"],"columns":[16],"source":[16],"pinnedTopSource":[16],"pinnedBottomSource":[16],"rowDefinitions":[16],"editors":[16],"applyEditorChangesOnClose":[4,"apply-editor-changes-on-close"],"plugins":[16],"columnTypes":[16],"theme":[1537],"rowClass":[513,"row-class"],"autoSizeColumn":[4,"auto-size-column"],"filter":[4],"focusTemplate":[16],"canMoveColumns":[4,"can-move-columns"],"trimmedRows":[16],"exporting":[4],"grouping":[16],"stretch":[8],"extraElements":[32],"refresh":[64],"scrollToRow":[64],"scrollToColumnIndex":[64],"scrollToColumnProp":[64],"updateColumns":[64],"addTrimmed":[64],"scrollToCoordinate":[64],"setCellEdit":[64],"setCellsFocus":[64],"registerVNode":[64],"getSource":[64],"getVisibleSource":[64],"getSourceStore":[64],"getColumnStore":[64],"updateColumnSorting":[64],"clearSorting":[64],"getColumns":[64],"clearFocus":[64],"getPlugins":[64],"getFocused":[64],"getContentSize":[64],"getSelectedRange":[64]},[[5,"mousedown","mousedownHandle"],[5,"mouseup","mouseupHandle"],[0,"internalRowDragStart","onRowDragStarted"],[0,"internalRowDragEnd","onRowDragEnd"],[0,"internalRowDrag","onRowDrag"],[0,"internalRowMouseMove","onRowMouseMove"],[0,"internalCellEdit","onBeforeEdit"],[0,"internalRangeDataApply","onBeforeRangeEdit"],[0,"internalSelectionChanged","onRangeChanged"],[0,"initialRowDropped","onRowDropped"],[0,"initialHeaderClick","onHeaderClick"],[0,"beforeFocusCell","onCellFocus"]]],[0,"revogr-row-headers",{"height":[2],"dataPorts":[16],"headerProp":[16],"uiid":[1],"rowClass":[1,"row-class"],"resize":[4],"rowHeaderColumn":[16]}],[4,"revogr-overlay-selection",{"readonly":[4],"range":[4],"canDrag":[4,"can-drag"],"useClipboard":[4,"use-clipboard"],"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"colData":[16],"lastCell":[16],"editors":[16],"applyChangesOnClose":[4,"apply-changes-on-close"]},[[5,"mousemove","onMouseMove"],[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"],[0,"dragStartCell","onCellDrag"],[4,"keyup","onKeyUp"],[4,"keydown","onKeyDown"]]],[0,"revogr-focus",{"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"colData":[16],"colType":[1,"col-type"],"rowType":[1,"row-type"],"focusTemplate":[16]}],[0,"revogr-scroll-virtual",{"dimension":[1],"viewportStore":[16],"dimensionStore":[16],"setScroll":[64],"changeScroll":[64]}],[0,"revogr-temp-range",{"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16]}],[0,"revogr-data",{"readonly":[4],"range":[4],"rowClass":[1,"row-class"],"rowSelectionStore":[16],"viewportRow":[16],"viewportCol":[16],"dimensionRow":[16],"colData":[16],"dataStore":[16],"type":[1]}],[0,"revogr-edit",{"editCell":[16],"column":[16],"editor":[16],"saveOnClose":[4,"save-on-close"],"cancel":[64]}],[0,"revogr-header",{"viewportCol":[16],"dimensionCol":[16],"selectionStore":[16],"parent":[1],"groups":[16],"groupingDepth":[2,"grouping-depth"],"canResize":[4,"can-resize"],"colData":[16],"columnFilter":[4,"column-filter"],"type":[1]}],[0,"revogr-order-editor",{"parent":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"dragStart":[64],"endOrder":[64],"clearOrder":[64]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"]]],[4,"revogr-viewport-scroll",{"contentWidth":[2,"content-width"],"contentHeight":[2,"content-height"],"setScroll":[64],"changeScroll":[64]},[[0,"mousewheel-vertical","mousewheelVertical"],[0,"mousewheel-horizontal","mousewheelHorizontal"],[0,"scroll-coordinate","scrollApply"]]]]]], options);
   });
 };
 

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

@@ -75,5 +75,5 @@ const patchDynamicImport = (base, orgScriptElm) => {
 };
 
 patchBrowser().then(options => {
-  return index.bootstrapLazy([["revogr-clipboard.cjs",[[0,"revogr-clipboard",{"doCopy":[64]},[[4,"paste","onPaste"],[4,"copy","copyStarted"]]]]],["revogr-filter-panel.cjs",[[0,"revogr-filter-panel",{"uuid":[1537],"filterItems":[16],"filterTypes":[16],"filterNames":[16],"filterEntities":[16],"filterCaptions":[16],"disableDynamicFiltering":[4,"disable-dynamic-filtering"],"isFilterIdSet":[32],"filterId":[32],"currentFilterId":[32],"currentFilterType":[32],"changes":[32],"show":[64],"getChanges":[64]},[[5,"mousedown","onMouseDown"]]]]],["revo-grid_11.cjs",[[0,"revo-grid",{"rowHeaders":[4,"row-headers"],"frameSize":[2,"frame-size"],"rowSize":[2,"row-size"],"colSize":[2,"col-size"],"range":[4],"readonly":[4],"resize":[4],"canFocus":[4,"can-focus"],"useClipboard":[4,"use-clipboard"],"columns":[16],"source":[16],"pinnedTopSource":[16],"pinnedBottomSource":[16],"rowDefinitions":[16],"editors":[16],"applyEditorChangesOnClose":[4,"apply-editor-changes-on-close"],"plugins":[16],"columnTypes":[16],"theme":[1537],"rowClass":[513,"row-class"],"autoSizeColumn":[4,"auto-size-column"],"filter":[4],"focusTemplate":[16],"canMoveColumns":[4,"can-move-columns"],"trimmedRows":[16],"exporting":[4],"grouping":[16],"stretch":[8],"extraElements":[32],"refresh":[64],"scrollToRow":[64],"scrollToColumnIndex":[64],"scrollToColumnProp":[64],"updateColumns":[64],"addTrimmed":[64],"scrollToCoordinate":[64],"setCellEdit":[64],"setCellsFocus":[64],"registerVNode":[64],"getSource":[64],"getVisibleSource":[64],"getSourceStore":[64],"getColumnStore":[64],"updateColumnSorting":[64],"clearSorting":[64],"getColumns":[64],"clearFocus":[64],"getPlugins":[64],"getFocused":[64],"getContentSize":[64],"getSelectedRange":[64]},[[0,"internalRowDragStart","onRowDragStarted"],[0,"internalRowDragEnd","onRowDragEnd"],[0,"internalRowDrag","onRowDrag"],[0,"internalRowMouseMove","onRowMouseMove"],[0,"internalCellEdit","onBeforeEdit"],[0,"internalRangeDataApply","onBeforeRangeEdit"],[0,"internalSelectionChanged","onRangeChanged"],[0,"initialRowDropped","onRowDropped"],[0,"initialHeaderClick","onHeaderClick"],[0,"beforeFocusCell","onCellFocus"]]],[0,"revogr-row-headers",{"height":[2],"dataPorts":[16],"headerProp":[16],"uiid":[1],"rowClass":[1,"row-class"],"resize":[4],"rowHeaderColumn":[16]}],[4,"revogr-overlay-selection",{"readonly":[4],"range":[4],"canDrag":[4,"can-drag"],"useClipboard":[4,"use-clipboard"],"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"colData":[16],"lastCell":[16],"editors":[16],"applyChangesOnClose":[4,"apply-changes-on-close"]},[[5,"mousemove","onMouseMove"],[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"],[0,"dragStartCell","onCellDrag"],[4,"keyup","onKeyUp"],[4,"keydown","onKeyDown"]]],[0,"revogr-focus",{"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16],"colType":[1,"col-type"],"rowType":[1,"row-type"],"focusTemplate":[16]}],[0,"revogr-scroll-virtual",{"dimension":[1],"viewportStore":[16],"dimensionStore":[16],"setScroll":[64],"changeScroll":[64]}],[0,"revogr-temp-range",{"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16]}],[0,"revogr-data",{"readonly":[4],"range":[4],"rowClass":[1,"row-class"],"rowSelectionStore":[16],"viewportRow":[16],"viewportCol":[16],"dimensionRow":[16],"colData":[16],"dataStore":[16],"type":[1]}],[0,"revogr-edit",{"editCell":[16],"column":[16],"editor":[16],"saveOnClose":[4,"save-on-close"],"cancel":[64]}],[0,"revogr-header",{"viewportCol":[16],"dimensionCol":[16],"selectionStore":[16],"parent":[1],"groups":[16],"groupingDepth":[2,"grouping-depth"],"canResize":[4,"can-resize"],"colData":[16],"columnFilter":[4,"column-filter"],"type":[1]}],[0,"revogr-order-editor",{"parent":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"dragStart":[64],"endOrder":[64],"clearOrder":[64]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"]]],[4,"revogr-viewport-scroll",{"contentWidth":[2,"content-width"],"contentHeight":[2,"content-height"],"setScroll":[64],"changeScroll":[64]},[[0,"mousewheel-vertical","mousewheelVertical"],[0,"mousewheel-horizontal","mousewheelHorizontal"],[0,"scroll-coordinate","scrollApply"]]]]]], options);
+  return index.bootstrapLazy([["revogr-clipboard.cjs",[[0,"revogr-clipboard",{"doCopy":[64]},[[4,"paste","onPaste"],[4,"copy","copyStarted"]]]]],["revogr-filter-panel.cjs",[[0,"revogr-filter-panel",{"uuid":[1537],"filterItems":[16],"filterTypes":[16],"filterNames":[16],"filterEntities":[16],"filterCaptions":[16],"disableDynamicFiltering":[4,"disable-dynamic-filtering"],"isFilterIdSet":[32],"filterId":[32],"currentFilterId":[32],"currentFilterType":[32],"changes":[32],"show":[64],"getChanges":[64]},[[5,"mousedown","onMouseDown"]]]]],["revo-grid_11.cjs",[[0,"revo-grid",{"rowHeaders":[4,"row-headers"],"frameSize":[2,"frame-size"],"rowSize":[2,"row-size"],"colSize":[2,"col-size"],"range":[4],"readonly":[4],"resize":[4],"canFocus":[4,"can-focus"],"useClipboard":[4,"use-clipboard"],"columns":[16],"source":[16],"pinnedTopSource":[16],"pinnedBottomSource":[16],"rowDefinitions":[16],"editors":[16],"applyEditorChangesOnClose":[4,"apply-editor-changes-on-close"],"plugins":[16],"columnTypes":[16],"theme":[1537],"rowClass":[513,"row-class"],"autoSizeColumn":[4,"auto-size-column"],"filter":[4],"focusTemplate":[16],"canMoveColumns":[4,"can-move-columns"],"trimmedRows":[16],"exporting":[4],"grouping":[16],"stretch":[8],"extraElements":[32],"refresh":[64],"scrollToRow":[64],"scrollToColumnIndex":[64],"scrollToColumnProp":[64],"updateColumns":[64],"addTrimmed":[64],"scrollToCoordinate":[64],"setCellEdit":[64],"setCellsFocus":[64],"registerVNode":[64],"getSource":[64],"getVisibleSource":[64],"getSourceStore":[64],"getColumnStore":[64],"updateColumnSorting":[64],"clearSorting":[64],"getColumns":[64],"clearFocus":[64],"getPlugins":[64],"getFocused":[64],"getContentSize":[64],"getSelectedRange":[64]},[[5,"mousedown","mousedownHandle"],[5,"mouseup","mouseupHandle"],[0,"internalRowDragStart","onRowDragStarted"],[0,"internalRowDragEnd","onRowDragEnd"],[0,"internalRowDrag","onRowDrag"],[0,"internalRowMouseMove","onRowMouseMove"],[0,"internalCellEdit","onBeforeEdit"],[0,"internalRangeDataApply","onBeforeRangeEdit"],[0,"internalSelectionChanged","onRangeChanged"],[0,"initialRowDropped","onRowDropped"],[0,"initialHeaderClick","onHeaderClick"],[0,"beforeFocusCell","onCellFocus"]]],[0,"revogr-row-headers",{"height":[2],"dataPorts":[16],"headerProp":[16],"uiid":[1],"rowClass":[1,"row-class"],"resize":[4],"rowHeaderColumn":[16]}],[4,"revogr-overlay-selection",{"readonly":[4],"range":[4],"canDrag":[4,"can-drag"],"useClipboard":[4,"use-clipboard"],"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"colData":[16],"lastCell":[16],"editors":[16],"applyChangesOnClose":[4,"apply-changes-on-close"]},[[5,"mousemove","onMouseMove"],[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"],[0,"dragStartCell","onCellDrag"],[4,"keyup","onKeyUp"],[4,"keydown","onKeyDown"]]],[0,"revogr-focus",{"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"colData":[16],"colType":[1,"col-type"],"rowType":[1,"row-type"],"focusTemplate":[16]}],[0,"revogr-scroll-virtual",{"dimension":[1],"viewportStore":[16],"dimensionStore":[16],"setScroll":[64],"changeScroll":[64]}],[0,"revogr-temp-range",{"selectionStore":[16],"dimensionRow":[16],"dimensionCol":[16]}],[0,"revogr-data",{"readonly":[4],"range":[4],"rowClass":[1,"row-class"],"rowSelectionStore":[16],"viewportRow":[16],"viewportCol":[16],"dimensionRow":[16],"colData":[16],"dataStore":[16],"type":[1]}],[0,"revogr-edit",{"editCell":[16],"column":[16],"editor":[16],"saveOnClose":[4,"save-on-close"],"cancel":[64]}],[0,"revogr-header",{"viewportCol":[16],"dimensionCol":[16],"selectionStore":[16],"parent":[1],"groups":[16],"groupingDepth":[2,"grouping-depth"],"canResize":[4,"can-resize"],"colData":[16],"columnFilter":[4,"column-filter"],"type":[1]}],[0,"revogr-order-editor",{"parent":[16],"dimensionRow":[16],"dimensionCol":[16],"dataStore":[16],"dragStart":[64],"endOrder":[64],"clearOrder":[64]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"]]],[4,"revogr-viewport-scroll",{"contentWidth":[2,"content-width"],"contentHeight":[2,"content-height"],"setScroll":[64],"changeScroll":[64]},[[0,"mousewheel-vertical","mousewheelVertical"],[0,"mousewheel-horizontal","mousewheelHorizontal"],[0,"scroll-coordinate","scrollApply"]]]]]], options);
 });

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

@@ -24686,7 +24686,7 @@ const ViewPortSections = ({ resize, editors, rowClass, readonly, range, columns,
       const dataView = (index.h("revogr-overlay-selection", Object.assign({}, data, { slot: data.slot, selectionStore: data.segmentSelectionStore, editors: editors, readonly: readonly, range: range, useClipboard: useClipboard, applyChangesOnClose: applyEditorChangesOnClose, onSetEdit: ({ detail }) => onEdit(detail) }),
         index.h("revogr-data", Object.assign({}, data, { [UUID]: data.uuid }, { key: key, readonly: readonly, range: range, rowClass: rowClass, rowSelectionStore: data.rowSelectionStore, slot: DATA_SLOT })),
         index.h("revogr-temp-range", { selectionStore: data.segmentSelectionStore, dimensionRow: data.dimensionRow, dimensionCol: data.dimensionCol }),
-        index.h("revogr-focus", { focusTemplate: focusTemplate, rowType: data.type, colType: view.type, selectionStore: data.segmentSelectionStore, dimensionRow: data.dimensionRow, dimensionCol: data.dimensionCol })));
+        index.h("revogr-focus", { colData: data.colData, dataStore: data.dataStore, focusTemplate: focusTemplate, rowType: data.type, colType: view.type, selectionStore: data.segmentSelectionStore, dimensionRow: data.dimensionRow, dimensionCol: data.dimensionCol })));
       dataViews.push(dataView);
     });
     viewPortHtml.push(index.h("revogr-viewport-scroll", Object.assign({}, view.prop, { ref: el => registerElement(el, view.prop.key), onScrollViewport: e => onScroll(e.detail, view.prop.key) }), dataViews));
@@ -25111,6 +25111,7 @@ const RevoGridComponent = class {
     this.afteredit = index.createEvent(this, "afteredit", 7);
     this.beforeautofill = index.createEvent(this, "beforeautofill", 7);
     this.beforeange = index.createEvent(this, "beforeange", 7);
+    this.afterfocus = index.createEvent(this, "afterfocus", 7);
     this.roworderchanged = index.createEvent(this, "roworderchanged", 7);
     this.beforesourcesortingapply = index.createEvent(this, "beforesourcesortingapply", 7);
     this.beforesortingapply = index.createEvent(this, "beforesortingapply", 7);
@@ -25232,6 +25233,12 @@ const RevoGridComponent = class {
     this.stretch = true;
     // --------------------------------------------------------------------------
     //
+    //  Listeners outside scope
+    //
+    // --------------------------------------------------------------------------
+    this.clickTrackForFocusClear = null;
+    // --------------------------------------------------------------------------
+    //
     //  Private Properties
     //
     // --------------------------------------------------------------------------
@@ -25244,7 +25251,6 @@ const RevoGridComponent = class {
      * Define plugins collection
      */
     this.internalPlugins = [];
-    this.subscribers = {};
   }
   // --------------------------------------------------------------------------
   //
@@ -25421,15 +25427,19 @@ const RevoGridComponent = class {
     var _a;
     return (_a = this.viewport) === null || _a === void 0 ? void 0 : _a.getSelectedRange();
   }
-  // --------------------------------------------------------------------------
-  //
-  //  Listeners outside scope
-  //
-  // --------------------------------------------------------------------------
-  /** Clear data which is outside of grid container */
-  handleOutsideClick(e) {
+  mousedownHandle(e) {
+    this.clickTrackForFocusClear = e.screenX + e.screenY;
+  }
+  mouseupHandle(e) {
     const target = e.target;
-    // if event prevented or it is a table where we click at
+    const pos = e.screenX + e.screenY;
+    // detect if mousemove then do nothing
+    if (Math.abs(this.clickTrackForFocusClear - pos) > 10) {
+      return;
+    }
+    // check if action finished inside of the document
+    // clear data which is outside of grid
+    // if event prevented or it is current table don't clear focus
     if (e.defaultPrevented || (target === null || target === void 0 ? void 0 : target.closest(`[${UUID}="${this.uuid}"]`))) {
       return;
     }
@@ -25704,20 +25714,11 @@ const RevoGridComponent = class {
       });
       this.viewportscroll.emit(e);
     });
-    this.subscribers = { mouseup: this.handleOutsideClick.bind(this) };
-    for (let type in this.subscribers) {
-      document.addEventListener(type, this.subscribers[type]);
-    }
   }
   disconnectedCallback() {
     // destroy plugins on element disconnect
     each(this.internalPlugins, p => p.destroy());
     this.internalPlugins = [];
-    // clear events
-    for (let type in this.subscribers) {
-      document.removeEventListener(type, this.subscribers[type]);
-      delete this.subscribers[type];
-    }
   }
   render() {
     const contentHeight = this.dimensionProvider.stores['rgRow'].store.get('realSize');
@@ -26701,15 +26702,24 @@ const RevogrFocus$1 = class {
   constructor(hostRef) {
     index.registerInstance(this, hostRef);
     this.beforeFocusRender = index.createEvent(this, "before-focus-render", 7);
+    this.afterFocus = index.createEvent(this, "afterfocus", 7);
+    this.focusTemplate = null;
   }
-  changed(e) {
+  changed(e, focus) {
     e === null || e === void 0 ? void 0 : e.scrollIntoView({
       block: 'nearest',
       inline: 'nearest',
     });
+    const model = getSourceItem(this.dataStore, focus.y);
+    const column = getSourceItem(this.colData, focus.x);
+    this.afterFocus.emit({
+      model,
+      column
+    });
   }
   componentDidRender() {
-    this.el && this.changed(this.el);
+    const currentFocus = this.selectionStore.get('focus');
+    currentFocus && this.el && this.changed(this.el, currentFocus);
   }
   render() {
     const editCell = this.selectionStore.get('edit');
@@ -28267,7 +28277,7 @@ class LocalScrollService {
     }
   }
   // initiate scrolling event
-  scroll(coordinate, dimension, force = false, delta) {
+  scroll(coordinate, dimension, force = false, delta, outside = false) {
     this.cancelScroll(dimension);
     if (!force && this.previousScroll[dimension] === coordinate) {
       this.previousScroll[dimension] = NO_COORDINATE;
@@ -28278,6 +28288,7 @@ class LocalScrollService {
       dimension: dimension,
       coordinate: param.virtualSize ? this.convert(coordinate, param) : coordinate,
       delta,
+      outside
     });
   }
   getParams(dimension) {
@@ -28624,8 +28635,11 @@ const RevogrViewportScroll = class {
   mousewheelHorizontal({ detail: e }) {
     this.horizontalMouseWheel(e);
   }
+  /**
+   * Allows to use outside listener
+   */
   scrollApply({ detail: { type, coordinate } }) {
-    this.applyOnScroll(type, coordinate);
+    this.applyOnScroll(type, coordinate, true);
   }
   connectedCallback() {
     /**
@@ -28763,12 +28777,12 @@ const RevogrViewportScroll = class {
     }
     this.applyOnScroll(type, scroll);
   }
-  applyOnScroll(type, coordinate) {
+  applyOnScroll(type, coordinate, outside = false) {
     var _a;
     const change = new Date().getTime() - this.mouseWheelScroll[type];
     // apply after throttling
     if (change > this.scrollThrottling) {
-      (_a = this.scrollService) === null || _a === void 0 ? void 0 : _a.scroll(coordinate, type);
+      (_a = this.scrollService) === null || _a === void 0 ? void 0 : _a.scroll(coordinate, type, undefined, undefined, outside);
     }
   }
   /** remember last mw event time */

package/dist/collection/components/revoGrid/revo-grid.d.ts

@@ -164,6 +164,14 @@ export declare class RevoGridComponent {
    * Use e.preventDefault() to prevent range.
    */
   beforeange: EventEmitter<Selection.ChangedRange>;
+  /**
+   * Triggered after focus render finished.
+   * Can be used to access a focus element through @event.target
+   */
+  afterfocus: EventEmitter<{
+    model: any;
+    column: RevoGrid.ColumnRegular;
+  }>;
   /**
    * Before rgRow order apply.
    * Use e.preventDefault() to prevent rgRow order change.
@@ -397,8 +405,9 @@ export declare class RevoGridComponent {
    * Get the currently selected Range.
    */
   getSelectedRange(): Promise<Selection.RangeArea | null>;
-  /** Clear data which is outside of grid container */
-  private handleOutsideClick;
+  private clickTrackForFocusClear;
+  mousedownHandle(e: MouseEvent): void;
+  mouseupHandle(e: MouseEvent): void;
   /** DRAG AND DROP */
   onRowDragStarted(e: CustomEvent<{
     pos: RevoGrid.PositionItem;
@@ -433,7 +442,6 @@ export declare class RevoGridComponent {
    * Define plugins collection
    */
   private internalPlugins;
-  private subscribers;
   element: HTMLRevoGridElement;
   columnChanged(newVal?: RevoGrid.ColumnDataSchema[]): void;
   themeChanged(t: ThemeSpace.Theme): void;

package/dist/collection/components/revoGrid/revo-grid.js

@@ -123,6 +123,12 @@ export class RevoGridComponent {
     this.stretch = true;
     // --------------------------------------------------------------------------
     //
+    //  Listeners outside scope
+    //
+    // --------------------------------------------------------------------------
+    this.clickTrackForFocusClear = null;
+    // --------------------------------------------------------------------------
+    //
     //  Private Properties
     //
     // --------------------------------------------------------------------------
@@ -135,7 +141,6 @@ export class RevoGridComponent {
      * Define plugins collection
      */
     this.internalPlugins = [];
-    this.subscribers = {};
   }
   // --------------------------------------------------------------------------
   //
@@ -312,15 +317,19 @@ export class RevoGridComponent {
     var _a;
     return (_a = this.viewport) === null || _a === void 0 ? void 0 : _a.getSelectedRange();
   }
-  // --------------------------------------------------------------------------
-  //
-  //  Listeners outside scope
-  //
-  // --------------------------------------------------------------------------
-  /** Clear data which is outside of grid container */
-  handleOutsideClick(e) {
+  mousedownHandle(e) {
+    this.clickTrackForFocusClear = e.screenX + e.screenY;
+  }
+  mouseupHandle(e) {
     const target = e.target;
-    // if event prevented or it is a table where we click at
+    const pos = e.screenX + e.screenY;
+    // detect if mousemove then do nothing
+    if (Math.abs(this.clickTrackForFocusClear - pos) > 10) {
+      return;
+    }
+    // check if action finished inside of the document
+    // clear data which is outside of grid
+    // if event prevented or it is current table don't clear focus
     if (e.defaultPrevented || (target === null || target === void 0 ? void 0 : target.closest(`[${UUID}="${this.uuid}"]`))) {
       return;
     }
@@ -595,20 +604,11 @@ export class RevoGridComponent {
       });
       this.viewportscroll.emit(e);
     });
-    this.subscribers = { mouseup: this.handleOutsideClick.bind(this) };
-    for (let type in this.subscribers) {
-      document.addEventListener(type, this.subscribers[type]);
-    }
   }
   disconnectedCallback() {
     // destroy plugins on element disconnect
     each(this.internalPlugins, p => p.destroy());
     this.internalPlugins = [];
-    // clear events
-    for (let type in this.subscribers) {
-      document.removeEventListener(type, this.subscribers[type]);
-      delete this.subscribers[type];
-    }
   }
   render() {
     const contentHeight = this.dimensionProvider.stores['rgRow'].store.get('realSize');
@@ -1325,6 +1325,26 @@ export class RevoGridComponent {
           }
         }
       }
+    }, {
+      "method": "afterfocus",
+      "name": "afterfocus",
+      "bubbles": true,
+      "cancelable": true,
+      "composed": true,
+      "docs": {
+        "tags": [],
+        "text": "Triggered after focus render finished.\nCan be used to access a focus element through @event.target"
+      },
+      "complexType": {
+        "original": "{ model: any; column: RevoGrid.ColumnRegular; }",
+        "resolved": "{ model: any; column: ColumnRegular; }",
+        "references": {
+          "RevoGrid": {
+            "location": "import",
+            "path": "../../interfaces"
+          }
+        }
+      }
     }, {
       "method": "roworderchanged",
       "name": "roworderchanged",
@@ -1691,7 +1711,7 @@ export class RevoGridComponent {
       },
       "complexType": {
         "original": "RevoGrid.ViewPortScrollEvent",
-        "resolved": "{ dimension: DimensionType; coordinate: number; delta?: number; }",
+        "resolved": "{ dimension: DimensionType; coordinate: number; delta?: number; outside?: boolean; }",
         "references": {
           "RevoGrid": {
             "location": "import",
@@ -2395,6 +2415,18 @@ export class RevoGridComponent {
       "methodName": "rowHeadersChange"
     }]; }
   static get listeners() { return [{
+      "name": "mousedown",
+      "method": "mousedownHandle",
+      "target": "document",
+      "capture": false,
+      "passive": true
+    }, {
+      "name": "mouseup",
+      "method": "mouseupHandle",
+      "target": "document",
+      "capture": false,
+      "passive": true
+    }, {
       "name": "internalRowDragStart",
       "method": "onRowDragStarted",
       "target": undefined,

package/dist/collection/components/revoGrid/viewport.section.js

@@ -21,7 +21,7 @@ export const ViewPortSections = ({ resize, editors, rowClass, readonly, range, c
       const dataView = (h("revogr-overlay-selection", Object.assign({}, data, { slot: data.slot, selectionStore: data.segmentSelectionStore, editors: editors, readonly: readonly, range: range, useClipboard: useClipboard, applyChangesOnClose: applyEditorChangesOnClose, onSetEdit: ({ detail }) => onEdit(detail) }),
         h("revogr-data", Object.assign({}, data, { [UUID]: data.uuid }, { key: key, readonly: readonly, range: range, rowClass: rowClass, rowSelectionStore: data.rowSelectionStore, slot: DATA_SLOT })),
         h("revogr-temp-range", { selectionStore: data.segmentSelectionStore, dimensionRow: data.dimensionRow, dimensionCol: data.dimensionCol }),
-        h("revogr-focus", { focusTemplate: focusTemplate, rowType: data.type, colType: view.type, selectionStore: data.segmentSelectionStore, dimensionRow: data.dimensionRow, dimensionCol: data.dimensionCol })));
+        h("revogr-focus", { colData: data.colData, dataStore: data.dataStore, focusTemplate: focusTemplate, rowType: data.type, colType: view.type, selectionStore: data.segmentSelectionStore, dimensionRow: data.dimensionRow, dimensionCol: data.dimensionCol })));
       dataViews.push(dataView);
     });
     viewPortHtml.push(h("revogr-viewport-scroll", Object.assign({}, view.prop, { ref: el => registerElement(el, view.prop.key), onScrollViewport: e => onScroll(e.detail, view.prop.key) }), dataViews));

package/dist/collection/components/rowHeaders/revogr-row-headers.js

@@ -202,7 +202,7 @@ export class RevogrRowHeaders {
       },
       "complexType": {
         "original": "RevoGrid.ViewPortScrollEvent",
-        "resolved": "{ dimension: DimensionType; coordinate: number; delta?: number; }",
+        "resolved": "{ dimension: DimensionType; coordinate: number; delta?: number; outside?: boolean; }",
         "references": {
           "RevoGrid": {
             "location": "import",

package/dist/collection/components/scroll/revogr-viewport-scroll.d.ts

@@ -51,6 +51,9 @@ export declare class RevogrViewportScroll {
   changeScroll(e: RevoGrid.ViewPortScrollEvent): Promise<RevoGrid.ViewPortScrollEvent>;
   mousewheelVertical({ detail: e }: CustomEvent<ScrollEvent>): void;
   mousewheelHorizontal({ detail: e }: CustomEvent<ScrollEvent>): void;
+  /**
+   * Allows to use outside listener
+   */
   scrollApply({ detail: { type, coordinate } }: CustomEvent<ScrollCoordinateEvent>): void;
   connectedCallback(): void;
   componentDidLoad(): void;