@revolist/revogrid 4.8.0 → 4.8.2

package/dist/cjs/revogr-attribution_6.cjs.entry.js

@@ -10,9 +10,9 @@ const index$1 = require('./index-a9f1b728.js');
 const dimension_helpers = require('./dimension.helpers-8e234f00.js');
 require('./toNumber-838e6ff5.js');
 const events = require('./events-b28cc194.js');
-const column_service = require('./column.service-b3b5a4ee.js');
-const key_utils = require('./key.utils-be4d0b46.js');
-const selection_helpers = require('./selection.helpers-032d7192.js');
+const column_service = require('./column.service-43f8c476.js');
+const key_utils = require('./key.utils-4a384064.js');
+const selection_helpers = require('./selection.helpers-26d856ba.js');
 const debounce = require('./debounce-e2b7c6fb.js');
 const viewport_store = require('./viewport.store-c4b986f9.js');
 const throttle = require('./throttle-46478b04.js');
@@ -259,11 +259,11 @@ class KeyboardService {
         }
         // tab key means same as arrow right
         if (key_utils.codesLetter.TAB === e.code) {
-            this.keyChangeSelection(e, canRange);
+            await this.keyChangeSelection(e, canRange);
             return;
         }
         // pressed enter
-        if (key_utils.isEnterKey(e.code)) {
+        if (key_utils.isEnterKeyValue(e.key)) {
             this.sv.change();
             return;
         }
@@ -328,15 +328,19 @@ class KeyboardService {
         if (!data) {
             return false;
         }
+        const eData = this.sv.getData();
         if (isMulti) {
-            const eData = this.sv.getData();
             if (isAfterLast(data.end, eData.lastCell) || isBeforeFirst(data.start)) {
                 return false;
             }
             const range = selection_helpers.getRange(data.start, data.end);
             return this.sv.range(range);
         }
-        return this.sv.focusNext(data.start, changes);
+        return this.sv.focus(data.start, changes, isAfterLast(data.start, eData.lastCell)
+            ? 1
+            : isBeforeFirst(data.start)
+                ? -1
+                : 0);
     }
     /** Monitor key direction changes */
     changeDirectionKey(e, canRange) {
@@ -344,6 +348,12 @@ class KeyboardService {
         if (DIRECTION_CODES.includes(e.code)) {
             e.preventDefault();
         }
+        if (e.shiftKey) {
+            switch (e.code) {
+                case key_utils.codesLetter.TAB:
+                    return { changes: { x: -1 }, isMulti: false };
+            }
+        }
         switch (e.code) {
             case key_utils.codesLetter.ARROW_UP:
                 return { changes: { y: -1 }, isMulti };
@@ -579,6 +589,7 @@ const OverlaySelection = class {
         this.beforeRegionPaste = index.createEvent(this, "beforepasteregion", 7);
         this.cellEditApply = index.createEvent(this, "celleditapply", 7);
         this.beforeFocusCell = index.createEvent(this, "beforecellfocusinit", 7);
+        this.beforeNextViewportFocus = index.createEvent(this, "beforenextvpfocus", 7);
         this.setEdit = index.createEvent(this, "setedit", 7);
         this.beforeApplyRange = index.createEvent(this, "beforeapplyrange", 7);
         this.beforeSetRange = index.createEvent(this, "beforesetrange", 7);
@@ -601,6 +612,7 @@ const OverlaySelection = class {
         this.keyboardService = null;
         this.autoFillService = null;
         this.revogrEdit = null;
+        this.unsubscribeSelectionStore = [];
         this.readonly = undefined;
         this.range = undefined;
         this.canDrag = undefined;
@@ -668,12 +680,26 @@ const OverlaySelection = class {
         });
     }
     // #endregion
-    /** Selection & Keyboard */
+    /**
+     * Selection & Keyboard
+     */
     selectionServiceSet(s) {
+        // clear subscriptions
+        this.unsubscribeSelectionStore.forEach(v => v());
+        this.unsubscribeSelectionStore.length = 0;
+        this.unsubscribeSelectionStore.push(s.onChange('nextFocus', (v) => this.doFocus(v, v)));
         this.keyboardService = new KeyboardService({
             selectionStore: s,
             range: r => this.triggerRangeEvent(r),
-            focusNext: (f, next) => this.doFocus(f, f, next),
+            focus: (f, changes, focusNextViewport) => {
+                if (focusNextViewport) {
+                    this.beforeNextViewportFocus.emit(f);
+                    return false;
+                }
+                else {
+                    return this.doFocus(f, f, changes);
+                }
+            },
             change: val => {
                 if (this.readonly) {
                     return;
@@ -720,6 +746,9 @@ const OverlaySelection = class {
     }
     disconnectedCallback() {
         var _a;
+        // clear subscriptions
+        this.unsubscribeSelectionStore.forEach(v => v());
+        this.unsubscribeSelectionStore.length = 0;
         (_a = this.columnService) === null || _a === void 0 ? void 0 : _a.destroy();
     }
     async componentWillRender() {
@@ -788,17 +817,17 @@ const OverlaySelection = class {
                 nodes.push(index.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 (index.h(index.Host, { key: '676c1ac41a3658f7c2cb93ada69fbf141a51c660', class: { mobile: this.isMobileDevice }, onDblClick: (e) => this.onElementDblClick(e), onMouseDown: (e) => this.onElementMouseDown(e), onTouchStart: (e) => this.onElementMouseDown(e, true) }, nodes, index.h("slot", { key: '42f4e051d6f531bd92e22106ca0eb1808068e8d0', name: "data" })));
+        return (index.h(index.Host, { key: '81dee4cfcce410cefb2bd9ff2661261472fc3a75', class: { mobile: this.isMobileDevice }, onDblClick: (e) => this.onElementDblClick(e), onMouseDown: (e) => this.onElementMouseDown(e), onTouchStart: (e) => this.onElementMouseDown(e, true) }, nodes, index.h("slot", { key: '6ac75c388ae3fbc5539a27c3acd58178dd53d1af', name: "data" })));
     }
     /**
      * Executes the focus operation on the specified range of cells.
      */
-    doFocus(focus, end, next) {
+    doFocus(focus, end, changes) {
         const { defaultPrevented } = this.beforeFocusCell.emit(this.columnService.getSaveData(focus.y, focus.x));
         if (defaultPrevented) {
             return false;
         }
-        const evData = Object.assign({ range: Object.assign(Object.assign({}, focus), { x1: end.x, y1: end.y }), next }, this.types);
+        const evData = Object.assign({ range: Object.assign(Object.assign({}, focus), { x1: end.x, y1: end.y }), next: changes }, this.types);
         const applyEvent = this.applyFocus.emit(evData);
         if (applyEvent.defaultPrevented) {
             return false;