@revolist/revogrid 4.0.10 → 4.0.12

package/standalone/revogr-overlay-selection2.js

@@ -3,81 +3,15 @@
  */
 import { h, proxyCustomElement, HTMLElement, createEvent, Host } from '@stencil/core/internal/client';
 import { g as getRange, C as ColumnService, a as isRangeSingleCell } from './column.service.js';
-import { c as codesLetter, i as isClear, a as isEnterKey, b as isCopy, e as isCut, f as isPaste, g as isAll, h as isLetterKey, d as defineCustomElement$2 } from './revogr-edit2.js';
-import { E as EDIT_INPUT_WR, R as RESIZE_INTERVAL, k as CELL_HANDLER_CLASS, l as MOBILE_CLASS, S as SELECTION_BORDER_CLASS } from './consts.js';
-import { a as getCoordinate, i as isAfterLast, b as isBeforeFirst, c as getCell, d as getCurrentCell, g as getElStyle } from './selection.utils.js';
+import { c as codesLetter, i as isClear, a as isEnterKey, b as isCopy, e as isCut, f as isPaste, g as isAll, h as isLetterKey, j as isEditInput, d as defineCustomElement$2 } from './revogr-edit2.js';
+import { R as RESIZE_INTERVAL, k as CELL_HANDLER_CLASS, l as MOBILE_CLASS, S as SELECTION_BORDER_CLASS } from './consts.js';
+import { b as getCoordinate, i as isAfterLast, c as isBeforeFirst, d as getCell, g as getPropertyFromEvent, e as getCurrentCell, a as getElStyle, f as getFocusCellBasedOnEvent, v as verifyTouchTarget } from './selection.utils.js';
 import { t as timeout } from './index2.js';
 import { d as debounce_1 } from './debounce.js';
 import { b as getSourceItem } from './data.store.js';
 import { d as defineCustomElement$3 } from './revogr-clipboard2.js';
 import { d as defineCustomElement$1 } from './revogr-order-editor2.js';
 
-class SelectionStoreService {
-    constructor(store, config) {
-        this.store = store;
-        this.config = config;
-        this.store = store;
-    }
-    get edited() {
-        return this.store.get('edit');
-    }
-    get focused() {
-        return this.store.get('focus');
-    }
-    get ranged() {
-        return this.store.get('range');
-    }
-    changeRange(range) {
-        return this.config.changeRange(range);
-    }
-    focus(cell, isMulti = false) {
-        if (!cell) {
-            return false;
-        }
-        let end = cell;
-        // range edit
-        if (isMulti) {
-            let start = this.store.get('focus');
-            if (start) {
-                return this.config.changeRange(getRange(start, end));
-            }
-        }
-        // single focus
-        return this.config.focus(cell, end);
-    }
-}
-
-function isTouch(e) {
-    return !!e.touches;
-}
-function verifyTouchTarget(touchEvent, focusClass) {
-    if (focusClass && touchEvent) {
-        if (!(touchEvent.target instanceof Element && touchEvent.target.classList.contains(focusClass))) {
-            return false;
-        }
-    }
-    return true;
-}
-function getFromEvent(e, prop, focusClass // for touch events
-) {
-    if (isTouch(e)) {
-        if (e.touches.length > 0) {
-            const touchEvent = e.touches[0];
-            if (!verifyTouchTarget(touchEvent, focusClass)) {
-                return null;
-            }
-            return touchEvent[prop] || 0;
-        }
-        return null;
-    }
-    return e[prop] || 0;
-}
-
-// is edit input
-function isEditInput(el) {
-    return !!(el === null || el === void 0 ? void 0 : el.closest(`.${EDIT_INPUT_WR}`));
-}
-
 const DIRECTION_CODES = [
     codesLetter.TAB,
     codesLetter.ARROW_UP,
@@ -89,9 +23,9 @@ class KeyboardService {
     constructor(sv) {
         this.sv = sv;
     }
-    async keyDown(e, canRange) {
+    async keyDown(e, canRange, isEditMode, { range, focus }) {
         // IF EDIT MODE
-        if (this.sv.selectionStoreService.edited) {
+        if (isEditMode) {
             switch (e.code) {
                 case codesLetter.ESCAPE:
                     this.sv.cancel();
@@ -101,12 +35,12 @@ class KeyboardService {
         }
         // IF NOT EDIT MODE
         // pressed clear key
-        if (this.sv.selectionStoreService.ranged && isClear(e.code)) {
+        if (range && isClear(e.code)) {
             this.sv.clearCell();
             return;
         }
         // below works with focus only
-        if (!this.sv.selectionStoreService.focused) {
+        if (!focus) {
             return;
         }
         // tab key means same as arrow right
@@ -182,7 +116,7 @@ class KeyboardService {
         }
         if (isMulti) {
             const eData = this.sv.getData();
-            if (isAfterLast(data.end, eData) || isBeforeFirst(data.start)) {
+            if (isAfterLast(data.end, eData.lastCell) || isBeforeFirst(data.start)) {
                 return false;
             }
             const range = getRange(data.start, data.end);
@@ -234,7 +168,10 @@ class AutoFillService {
         return (h("div", { class: {
                 [CELL_HANDLER_CLASS]: true,
                 [MOBILE_CLASS]: true,
-            }, style: { left: `${handlerStyle.right}px`, top: `${handlerStyle.bottom}px` }, onMouseDown: (e) => this.autoFillHandler(e), onTouchStart: (e) => this.autoFillHandler(e) }));
+            }, style: {
+                left: `${handlerStyle.right}px`,
+                top: `${handlerStyle.bottom}px`,
+            }, onMouseDown: (e) => this.autoFillHandler(e), onTouchStart: (e) => this.autoFillHandler(e) }));
     }
     autoFillHandler(e, type = "AutoFill" /* AutoFillType.autoFill */) {
         let target = null;
@@ -250,7 +187,9 @@ class AutoFillService {
     get isAutoFill() {
         return !!this.autoFillType;
     }
-    /** Process mouse move events */
+    /**
+     * Process mouse move events
+     */
     selectionMouseMove(e) {
         // initiate mouse move debounce if not present
         if (!this.onMouseMoveAutofill) {
@@ -260,9 +199,7 @@ class AutoFillService {
             this.onMouseMoveAutofill(e, this.sv.getData());
         }
     }
-    getFocus() {
-        let focus = this.sv.selectionStoreService.focused;
-        const range = this.sv.selectionStoreService.ranged;
+    getFocus(focus, range) {
         // there was an issue that it was taking last cell from range but focus was out
         if (!focus && range) {
             focus = { x: range.x, y: range.y };
@@ -278,8 +215,8 @@ class AutoFillService {
         if (!this.autoFillInitial) {
             return;
         }
-        const x = getFromEvent(event, 'clientX', MOBILE_CLASS);
-        const y = getFromEvent(event, 'clientY', MOBILE_CLASS);
+        const x = getPropertyFromEvent(event, 'clientX', MOBILE_CLASS);
+        const y = getPropertyFromEvent(event, 'clientY', MOBILE_CLASS);
         // skip touch
         if (x === null || y === null) {
             return;
@@ -292,11 +229,12 @@ class AutoFillService {
             }
         }
         // check if not the latest, if latest - do nothing
-        if (isAfterLast(current, data)) {
+        if (isAfterLast(current, data.lastCell)) {
             return;
         }
         this.autoFillLast = current;
-        const isSame = current.x === this.autoFillInitial.x && current.y === this.autoFillInitial.y;
+        const isSame = current.x === this.autoFillInitial.x &&
+            current.y === this.autoFillInitial.y;
         // if same as initial - clear
         if (isSame) {
             this.sv.setTempRange(null);
@@ -317,39 +255,48 @@ class AutoFillService {
     selectionStart(target, data, type = "Selection" /* AutoFillType.selection */) {
         /** Get cell by autofill element */
         const { top, left } = target.getBoundingClientRect();
-        this.autoFillInitial = this.getFocus();
+        this.autoFillInitial = this.getFocus(data.focus, data.range);
         this.autoFillType = type;
         this.autoFillStart = getCurrentCell({ x: left, y: top }, data);
     }
     /**
-     * Clear current range selection
-     * on mouse up and mouse leave events
+     * Clear current range selection on mouse up and mouse leave events
      */
-    clearAutoFillSelection() {
-        // Apply autofill values on mouse up if present
+    clearAutoFillSelection(focus, oldRange) {
+        // If autofill was active, apply autofill values
         if (this.autoFillInitial) {
-            // Get latest
-            this.autoFillInitial = this.getFocus();
-            // Apply range data if present
+            // Fetch latest focus
+            this.autoFillInitial = this.getFocus(focus, oldRange);
+            // Apply range data if autofill mode is active
             if (this.autoFillType === "AutoFill" /* AutoFillType.autoFill */) {
                 const range = getRange(this.autoFillInitial, this.autoFillLast);
+                // If range is present, apply data
                 if (range) {
-                    const { defaultPrevented: stopApply, detail: { range: newRange } } = this.sv.clearRangeDataApply({
+                    const { defaultPrevented: stopApply, detail: { range: newRange }, } = this.sv.clearRangeDataApply({
                         range,
                     });
+                    // If data apply was not prevented, apply new range
                     if (!stopApply) {
-                        this.applyRangeWithData(newRange);
+                        this.applyRangeWithData(newRange, oldRange);
                     }
                     else {
-                        // if prevented - clear temp range
+                        // If data apply was prevented, clear temporary range
                         this.sv.setTempRange(null);
                     }
                 }
             }
             else {
+                // If not autofill mode, apply range only
                 this.applyRangeOnly(this.autoFillInitial, this.autoFillLast);
             }
         }
+        // Reset autofill state
+        this.resetAutoFillState();
+    }
+    /**
+     * Reset autofill state
+     */
+    resetAutoFillState() {
         this.autoFillType = null;
         this.autoFillInitial = null;
         this.autoFillLast = null;
@@ -369,8 +316,7 @@ class AutoFillService {
         this.sv.setRange(range);
     }
     /** Apply range and copy data during range application */
-    applyRangeWithData(newRange) {
-        const oldRange = this.sv.selectionStoreService.ranged;
+    applyRangeWithData(newRange, oldRange) {
         const rangeData = {
             type: this.sv.dataStore.get('type'),
             colType: this.sv.columnService.type,
@@ -460,44 +406,60 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
     // #endregion
     // #region Listeners
     onMouseMove(e) {
-        if (this.selectionStoreService.focused) {
+        if (this.selectionStore.get('focus')) {
             this.autoFillService.selectionMouseMove(e);
         }
     }
-    /** Action finished inside of the document. */
-    /** Pointer left document, clear any active operation. */
+    /**
+     * Action finished inside of the document.
+     * Pointer left document, clear any active operation.
+     */
     onMouseUp() {
-        this.autoFillService.clearAutoFillSelection();
+        // Clear auto fill selection
+        // when pointer left document,
+        // clear any active operation.
+        this.autoFillService.clearAutoFillSelection(this.selectionStore.get('focus'), this.selectionStore.get('range'));
     }
-    /** Row drag started. */
+    /**
+     * Row drag started.
+     * This event is fired when drag action started on cell.
+     */
     onCellDrag(e) {
         var _a;
+        // Invoke drag start on order editor.
         (_a = this.orderEditor) === null || _a === void 0 ? void 0 : _a.dragStart(e.detail);
     }
-    /** Get keyboard down from element. */
+    /**
+     * Get keyboard down from element.
+     * This event is fired when keyboard key is released.
+     */
     onKeyUp(e) {
+        // Emit before key up event.
         this.beforeKeyUp.emit(e);
     }
-    /** Get keyboard down from element. */
+    /**
+     * Get keyboard down from element.
+     * This event is fired when keyboard key is pressed.
+     */
     onKeyDown(e) {
         var _a;
+        // Emit before key down event and check if default prevention is set.
         const proxy = this.beforeKeyDown.emit(e);
         if (e.defaultPrevented || proxy.defaultPrevented) {
             return;
         }
-        (_a = this.keyboardService) === null || _a === void 0 ? void 0 : _a.keyDown(e, this.range);
+        // Invoke key down on keyboard service.
+        (_a = this.keyboardService) === null || _a === void 0 ? void 0 : _a.keyDown(e, this.range, !!this.selectionStore.get('edit'), {
+            focus: this.selectionStore.get('focus'),
+            range: this.selectionStore.get('range'),
+        });
     }
     // #endregion
     /** Selection & Keyboard */
     selectionServiceSet(s) {
-        this.selectionStoreService = new SelectionStoreService(s, {
-            changeRange: range => this.triggerRangeEvent(range),
-            focus: (focus, end) => this.doFocus(focus, end),
-        });
         this.keyboardService = new KeyboardService({
-            selectionStoreService: this.selectionStoreService,
             selectionStore: s,
-            range: r => this.selectionStoreService.changeRange(r),
+            range: r => this.triggerRangeEvent(r),
             focusNext: (f, next) => this.doFocus(f, f, next),
             change: val => {
                 if (this.readonly) {
@@ -519,7 +481,6 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
     /** Autofill */
     createAutoFillService() {
         this.autoFillService = new AutoFillService({
-            selectionStoreService: this.selectionStoreService,
             dimensionRow: this.dimensionRow,
             dimensionCol: this.dimensionCol,
             columnService: this.columnService,
@@ -595,10 +556,10 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
             nodes.push(editCell);
         }
         else {
-            const range = this.selectionStoreService.ranged;
-            const selectionFocus = this.selectionStoreService.focused;
+            const range = this.selectionStore.get('range');
+            const focus = this.selectionStore.get('focus');
             // Clipboard
-            if ((range || selectionFocus) && this.useClipboard) {
+            if ((range || focus) && this.useClipboard) {
                 nodes.push(h("revogr-clipboard", { readonly: this.readonly, onCopyregion: e => this.onCopy(e.detail), onClearregion: () => !this.readonly && this.clearCell(), ref: e => (this.clipboard = e), onPasteregion: e => this.onPaste(e.detail) }));
             }
             // Range
@@ -606,23 +567,19 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
                 nodes.push(...this.renderRange(range));
             }
             // Autofill
-            if (selectionFocus && !this.readonly && this.range) {
-                nodes.push(this.autoFillService.renderAutofill(range, selectionFocus));
+            if (focus && !this.readonly && this.range) {
+                nodes.push(this.autoFillService.renderAutofill(range, focus));
             }
             // Order
             if (this.canDrag) {
                 nodes.push(h("revogr-order-editor", { ref: e => (this.orderEditor = e), dataStore: this.dataStore, dimensionRow: this.dimensionRow, dimensionCol: this.dimensionCol, parent: this.element, onRowdragstartinit: e => this.rowDragStart(e) }));
             }
         }
-        return (h(Host, { key: 'd20fcf63958e3d491f4fd881a4a5dd242cfdd9ac', class: { mobile: this.isMobileDevice },
-            // Open Editor on DblClick
-            onDblClick: (e) => {
-                // DblClick prevented outside - Editor will not open
-                if (!e.defaultPrevented) {
-                    this.doEdit();
-                }
-            }, onMouseDown: (e) => this.onElementMouseDown(e), onTouchStart: (e) => this.onElementMouseDown(e, true) }, nodes, h("slot", { key: '89b9bec7824739ea11fadeecbf3908ac74e85c96', name: "data" })));
+        return (h(Host, { key: '9dbb6247aebf4ad00c1c8c78852191671be33a11', class: { mobile: this.isMobileDevice }, onDblClick: (e) => this.onElementDblClick(e), onMouseDown: (e) => this.onElementMouseDown(e), onTouchStart: (e) => this.onElementMouseDown(e, true) }, nodes, h("slot", { key: '7769092a5029c5a49da8c2d6f36eb9f17b461bc2', name: "data" })));
     }
+    /**
+     * Executes the focus operation on the specified range of cells.
+     */
     doFocus(focus, end, next) {
         const { defaultPrevented } = this.beforeFocusCell.emit(this.columnService.getSaveData(focus.y, focus.x));
         if (defaultPrevented) {
@@ -656,31 +613,48 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
         }
         return !e.defaultPrevented;
     }
+    /**
+     * Open Editor on DblClick
+     */
+    onElementDblClick(e) {
+        // DblClick prevented outside - Editor will not open
+        // Get data from the component
+        const data = this.getData();
+        const focusCell = getFocusCellBasedOnEvent(e, data);
+        if (!focusCell) {
+            return;
+        }
+        this.doEdit();
+    }
+    /**
+     * Handle mouse down event on Host element
+     */
     onElementMouseDown(e, touch = false) {
+        // Get the target element from the event object
+        const targetElement = e.target;
         // Ignore focus if clicked input
-        if (isEditInput(e.target)) {
+        if (isEditInput(targetElement)) {
             return;
         }
+        // Get data from the component
         const data = this.getData();
-        if (e.defaultPrevented) {
-            return;
-        }
-        const x = getFromEvent(e, 'clientX');
-        const y = getFromEvent(e, 'clientY');
-        // skip touch
-        if (x === null || y === null) {
+        const focusCell = getFocusCellBasedOnEvent(e, data);
+        if (!focusCell) {
             return;
         }
-        // Regular cell click
-        const focusCell = getCurrentCell({ x, y }, data);
-        this.selectionStoreService.focus(focusCell, this.range && e.shiftKey);
+        // Set focus on the current cell
+        this.focus(focusCell, this.range && e.shiftKey);
         // Initiate autofill selection
         if (this.range) {
-            this.autoFillService.selectionStart(e.target, data);
+            this.autoFillService.selectionStart(targetElement, this.getData());
+            // Prevent default behavior for mouse events,
+            // but only if target element is not a mobile input
             if (!touch) {
                 e.preventDefault();
             }
             else if (verifyTouchTarget(e.touches[0], MOBILE_CLASS)) {
+                // Prevent default behavior for touch events
+                // if target element is a mobile input
                 e.preventDefault();
             }
         }
@@ -691,8 +665,8 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
     doEdit(val = '') {
         var _a;
         if (this.canEdit()) {
-            const editCell = this.selectionStore.get('focus');
-            const data = this.columnService.getSaveData(editCell.y, editCell.x);
+            const focus = this.selectionStore.get('focus');
+            const data = this.columnService.getSaveData(focus.y, focus.x);
             (_a = this.setEdit) === null || _a === void 0 ? void 0 : _a.emit(Object.assign(Object.assign({}, data), { val }));
         }
     }
@@ -715,8 +689,8 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
         this.cellEditApply.emit(dataToSave);
     }
     getRegion() {
-        const focus = this.selectionStoreService.focused;
-        let range = this.selectionStoreService.ranged;
+        const focus = this.selectionStore.get('focus');
+        let range = this.selectionStore.get('range');
         if (!range) {
             range = getRange(focus, focus);
         }
@@ -742,8 +716,8 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
         return true;
     }
     onPaste(data) {
-        const focus = this.selectionStoreService.focused;
-        const isEditing = this.selectionStoreService.edited !== null;
+        const focus = this.selectionStore.get('focus');
+        const isEditing = this.selectionStore.get('edit') !== null;
         if (!focus || isEditing) {
             return;
         }
@@ -763,13 +737,13 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
         }
     }
     clearCell() {
-        if (this.selectionStoreService.ranged &&
-            !isRangeSingleCell(this.selectionStoreService.ranged)) {
-            const data = this.columnService.getRangeStaticData(this.selectionStoreService.ranged, '');
-            this.autoFillService.onRangeApply(data, this.selectionStoreService.ranged);
+        if (this.selectionStore.get('range') &&
+            !isRangeSingleCell(this.selectionStore.get('range'))) {
+            const data = this.columnService.getRangeStaticData(this.selectionStore.get('range'), '');
+            this.autoFillService.onRangeApply(data, this.selectionStore.get('range'));
         }
         else if (this.canEdit()) {
-            const focused = this.selectionStoreService.focused;
+            const focused = this.selectionStore.get('focus');
             const cell = this.columnService.getSaveData(focused.y, focused.x);
             this.cellEdit({
                 rgRow: focused.y,
@@ -791,8 +765,24 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
         if (this.readonly) {
             return false;
         }
-        const editCell = this.selectionStoreService.focused;
-        return editCell && !((_a = this.columnService) === null || _a === void 0 ? void 0 : _a.isReadOnly(editCell.y, editCell.x));
+        const focus = this.selectionStore.get('focus');
+        return focus && !((_a = this.columnService) === null || _a === void 0 ? void 0 : _a.isReadOnly(focus.y, focus.x));
+    }
+    get edited() {
+        return this.selectionStore.get('edit');
+    }
+    /**
+     * Sets the focus on a cell and optionally edits a range.
+     */
+    focus(cell, isRangeEdit = false) {
+        if (!cell)
+            return false;
+        const end = cell;
+        const start = this.selectionStore.get('focus');
+        if (isRangeEdit && start) {
+            return this.triggerRangeEvent(getRange(start, end));
+        }
+        return this.doFocus(cell, end);
     }
     get types() {
         return {
@@ -809,6 +799,8 @@ const OverlaySelection = /*@__PURE__*/ proxyCustomElement(class OverlaySelection
             rows: this.dimensionRow.state,
             cols: this.dimensionCol.state,
             lastCell: this.lastCell,
+            focus: this.selectionStore.get('focus'),
+            range: this.selectionStore.get('range'),
         };
     }
     get element() { return this; }
@@ -871,6 +863,6 @@ function defineCustomElement() {
     } });
 }
 
-export { OverlaySelection as O, defineCustomElement as d, getFromEvent as g };
+export { OverlaySelection as O, defineCustomElement as d };
 
 //# sourceMappingURL=revogr-overlay-selection2.js.map