@odoo/o-spreadsheet 17.0.1 → 17.1.0-alpha.1

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.1
- * @date 2023-11-02T09:35:50.522Z
- * @hash 0887d5b
+ * @version 17.1.0-alpha.1
+ * @date 2023-11-02T09:35:10.532Z
+ * @hash 3b1fe3b
  */
 
 'use strict';
@@ -6638,6 +6638,31 @@ function* iterateChildren(el) {
 function getOpenedMenus() {
     return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
 }
+const letterRegex = /^[a-zA-Z]$/;
+/**
+ * Transform a keyboard event into a shortcut string that represent this event. The letters keys will be uppercased.
+ *
+ * @argument ev - The keyboard event to transform
+ * @argument mode - Use either ev.key of ev.code to get the string shortcut
+ *
+ * @example
+ * event : { ctrlKey: true, key: "a" } => "Ctrl+A"
+ * event : { shift: true, alt: true, key: "Home" } => "Alt+Shift+Home"
+ */
+function keyboardEventToShortcutString(ev, mode = "key") {
+    let keyDownString = "";
+    if (ev.ctrlKey && ev.key !== "Ctrl")
+        keyDownString += "Ctrl+";
+    if (ev.metaKey)
+        keyDownString += "Ctrl+";
+    if (ev.altKey && ev.key !== "Alt")
+        keyDownString += "Alt+";
+    if (ev.shiftKey && ev.key !== "Shift")
+        keyDownString += "Shift+";
+    const key = mode === "key" ? ev.key : ev.code;
+    keyDownString += letterRegex.test(key) ? key.toUpperCase() : key;
+    return keyDownString;
+}
 
 /**
  * Return the o-spreadsheet element position relative
@@ -26476,16 +26501,16 @@ class Composer extends owl.Component {
     shouldProcessInputEvents = false;
     tokens = [];
     keyMapping = {
-        ArrowUp: this.processArrowKeys,
-        ArrowDown: this.processArrowKeys,
-        ArrowLeft: this.processArrowKeys,
-        ArrowRight: this.processArrowKeys,
-        Enter: this.processEnterKey,
+        Enter: (ev) => this.processEnterKey(ev, "down"),
+        "Shift+Enter": (ev) => this.processEnterKey(ev, "up"),
+        "Alt+Enter": this.processNewLineEvent,
+        "Ctrl+Enter": this.processNewLineEvent,
         Escape: this.processEscapeKey,
         F2: () => console.warn("Not implemented"),
         F4: this.processF4Key,
-        Tab: (ev) => this.processTabKey(ev),
-        " ": (ev) => this.processSpaceKey(ev),
+        Tab: (ev) => this.processTabKey(ev, "right"),
+        "Shift+Tab": (ev) => this.processTabKey(ev, "left"),
+        "Ctrl+ ": this.processSpaceKey,
     };
     keyCodeMapping = {
         NumpadDecimal: this.processNumpadDecimal,
@@ -26547,7 +26572,7 @@ class Composer extends owl.Component {
             }
         }
     }
-    processTabKey(ev) {
+    processTabKey(ev, direction) {
         ev.preventDefault();
         ev.stopPropagation();
         const state = this.autoCompleteState;
@@ -26558,25 +26583,18 @@ class Composer extends owl.Component {
                 return;
             }
         }
-        const direction = ev.shiftKey ? "left" : "right";
         interactiveStopEdition(this.env);
         this.env.model.selection.moveAnchorCell(direction, 1);
     }
     processSpaceKey(ev) {
-        if (ev.ctrlKey) {
-            ev.preventDefault();
-            ev.stopPropagation();
-            this.showFunctionAutocomplete("");
-            this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
-        }
+        ev.preventDefault();
+        ev.stopPropagation();
+        this.showFunctionAutocomplete("");
+        this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
     }
-    processEnterKey(ev) {
+    processEnterKey(ev, direction) {
         ev.preventDefault();
         ev.stopPropagation();
-        if (ev.altKey || ev.ctrlKey) {
-            this.composerRef.el?.dispatchEvent(new InputEvent("input", { inputType: "insertParagraph", bubbles: true, isComposing: false }));
-            return;
-        }
         const state = this.autoCompleteState;
         if (state.showProvider && state.selectedIndex !== undefined) {
             const autoCompleteValue = this.autoCompleteState.values[state.selectedIndex]?.text;
@@ -26586,9 +26604,22 @@ class Composer extends owl.Component {
             }
         }
         interactiveStopEdition(this.env);
-        const direction = ev.shiftKey ? "up" : "down";
         this.env.model.selection.moveAnchorCell(direction, 1);
     }
+    processNewLineEvent(ev) {
+        ev.preventDefault();
+        ev.stopPropagation();
+        const content = this.contentHelper.getText();
+        const selection = this.contentHelper.getCurrentSelection();
+        const start = Math.min(selection.start, selection.end);
+        const end = Math.max(selection.start, selection.end);
+        this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
+        this.env.model.dispatch("SET_CURRENT_CONTENT", {
+            content: content.slice(0, start) + NEWLINE + content.slice(end),
+            selection: { start: start + 1, end: start + 1 },
+        });
+        this.processContent();
+    }
     processEscapeKey() {
         this.env.model.dispatch("CANCEL_EDITION");
     }
@@ -26622,7 +26653,12 @@ class Composer extends owl.Component {
         this.compositionActive = false;
     }
     onKeydown(ev) {
-        let handler = this.keyMapping[ev.key] || this.keyCodeMapping[ev.code];
+        if (ev.key.startsWith("Arrow")) {
+            this.processArrowKeys(ev);
+            return;
+        }
+        let handler = this.keyMapping[keyboardEventToShortcutString(ev)] ||
+            this.keyCodeMapping[keyboardEventToShortcutString(ev, "code")];
         if (handler) {
             handler.call(this, ev);
         }
@@ -26639,12 +26675,6 @@ class Composer extends owl.Component {
         }
         let content = this.contentHelper.getText();
         let selection = this.contentHelper.getCurrentSelection();
-        if (ev.inputType === "insertParagraph") {
-            const start = Math.min(selection.start, selection.end);
-            const end = Math.max(selection.start, selection.end);
-            content = content.slice(0, start) + NEWLINE + content.slice(end);
-            selection = { start: start + 1, end: start + 1 };
-        }
         this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
         this.env.model.dispatch("SET_CURRENT_CONTENT", {
             content,
@@ -29341,33 +29371,33 @@ class Grid extends owl.Component {
     // this map will handle most of the actions that should happen on key down. The arrow keys are managed in the key
     // down itself
     keyDownMapping = {
-        ENTER: () => {
+        Enter: () => {
             const cell = this.env.model.getters.getActiveCell();
             cell.type === CellValueType.empty
                 ? this.props.onGridComposerCellFocused()
                 : this.props.onComposerContentFocused();
         },
-        TAB: () => this.env.model.selection.moveAnchorCell("right", 1),
-        "SHIFT+TAB": () => this.env.model.selection.moveAnchorCell("left", 1),
+        Tab: () => this.env.model.selection.moveAnchorCell("right", 1),
+        "Shift+Tab": () => this.env.model.selection.moveAnchorCell("left", 1),
         F2: () => {
             const cell = this.env.model.getters.getActiveCell();
             cell.type === CellValueType.empty
                 ? this.props.onGridComposerCellFocused()
                 : this.props.onComposerContentFocused();
         },
-        DELETE: () => {
+        Delete: () => {
             this.env.model.dispatch("DELETE_CONTENT", {
                 sheetId: this.env.model.getters.getActiveSheetId(),
                 target: this.env.model.getters.getSelectedZones(),
             });
         },
-        BACKSPACE: () => {
+        Backspace: () => {
             this.env.model.dispatch("DELETE_CONTENT", {
                 sheetId: this.env.model.getters.getActiveSheetId(),
                 target: this.env.model.getters.getSelectedZones(),
             });
         },
-        ESCAPE: () => {
+        Escape: () => {
             /** TODO: Clean once we introduce proper focus on sub components. Grid should not have to handle all this logic */
             if (this.env.model.getters.hasOpenedPopover()) {
                 this.closeOpenedPopover();
@@ -29382,27 +29412,27 @@ class Grid extends owl.Component {
                 this.env.model.dispatch("CLEAN_CLIPBOARD_HIGHLIGHT");
             }
         },
-        "CTRL+A": () => this.env.model.selection.loopSelection(),
-        "CTRL+Z": () => this.env.model.dispatch("REQUEST_UNDO"),
-        "CTRL+Y": () => this.env.model.dispatch("REQUEST_REDO"),
+        "Ctrl+A": () => this.env.model.selection.loopSelection(),
+        "Ctrl+Z": () => this.env.model.dispatch("REQUEST_UNDO"),
+        "Ctrl+Y": () => this.env.model.dispatch("REQUEST_REDO"),
         F4: () => this.env.model.dispatch("REQUEST_REDO"),
-        "CTRL+B": () => this.env.model.dispatch("SET_FORMATTING", {
+        "Ctrl+B": () => this.env.model.dispatch("SET_FORMATTING", {
             sheetId: this.env.model.getters.getActiveSheetId(),
             target: this.env.model.getters.getSelectedZones(),
             style: { bold: !this.env.model.getters.getCurrentStyle().bold },
         }),
-        "CTRL+I": () => this.env.model.dispatch("SET_FORMATTING", {
+        "Ctrl+I": () => this.env.model.dispatch("SET_FORMATTING", {
             sheetId: this.env.model.getters.getActiveSheetId(),
             target: this.env.model.getters.getSelectedZones(),
             style: { italic: !this.env.model.getters.getCurrentStyle().italic },
         }),
-        "CTRL+U": () => this.env.model.dispatch("SET_FORMATTING", {
+        "Ctrl+U": () => this.env.model.dispatch("SET_FORMATTING", {
             sheetId: this.env.model.getters.getActiveSheetId(),
             target: this.env.model.getters.getSelectedZones(),
             style: { underline: !this.env.model.getters.getCurrentStyle().underline },
         }),
-        "CTRL+O": () => CREATE_IMAGE(this.env),
-        "ALT+=": () => {
+        "Ctrl+O": () => CREATE_IMAGE(this.env),
+        "Alt+=": () => {
             const sheetId = this.env.model.getters.getActiveSheetId();
             const mainSelectedZone = this.env.model.getters.getSelectedZone();
             const { anchor } = this.env.model.getters.getSelection();
@@ -29418,13 +29448,13 @@ class Grid extends owl.Component {
                 this.env.model.dispatch("SUM_SELECTION");
             }
         },
-        "ALT+ENTER": () => {
+        "Alt+Enter": () => {
             const cell = this.env.model.getters.getActiveCell();
             if (cell.link) {
                 openLink(cell.link, this.env);
             }
         },
-        "CTRL+HOME": () => {
+        "Ctrl+Home": () => {
             const sheetId = this.env.model.getters.getActiveSheetId();
             const { col, row } = this.env.model.getters.getNextVisibleCellPosition({
                 sheetId,
@@ -29433,13 +29463,13 @@ class Grid extends owl.Component {
             });
             this.env.model.selection.selectCell(col, row);
         },
-        "CTRL+END": () => {
+        "Ctrl+End": () => {
             const sheetId = this.env.model.getters.getActiveSheetId();
             const col = this.env.model.getters.findVisibleHeader(sheetId, "COL", this.env.model.getters.getNumberCols(sheetId) - 1, 0);
             const row = this.env.model.getters.findVisibleHeader(sheetId, "ROW", this.env.model.getters.getNumberRows(sheetId) - 1, 0);
             this.env.model.selection.selectCell(col, row);
         },
-        "SHIFT+ ": () => {
+        "Shift+ ": () => {
             const sheetId = this.env.model.getters.getActiveSheetId();
             const newZone = {
                 ...this.env.model.getters.getSelectedZone(),
@@ -29449,7 +29479,7 @@ class Grid extends owl.Component {
             const position = this.env.model.getters.getActivePosition();
             this.env.model.selection.selectZone({ cell: position, zone: newZone });
         },
-        "CTRL+ ": () => {
+        "Ctrl+ ": () => {
             const sheetId = this.env.model.getters.getActiveSheetId();
             const newZone = {
                 ...this.env.model.getters.getSelectedZone(),
@@ -29459,18 +29489,18 @@ class Grid extends owl.Component {
             const position = this.env.model.getters.getActivePosition();
             this.env.model.selection.selectZone({ cell: position, zone: newZone });
         },
-        "CTRL+D": async () => this.env.model.dispatch("COPY_PASTE_CELLS_ABOVE"),
-        "CTRL+R": async () => this.env.model.dispatch("COPY_PASTE_CELLS_ON_LEFT"),
-        "CTRL+SHIFT+E": () => this.setHorizontalAlign("center"),
-        "CTRL+SHIFT+L": () => this.setHorizontalAlign("left"),
-        "CTRL+SHIFT+R": () => this.setHorizontalAlign("right"),
-        "CTRL+SHIFT+V": () => PASTE_VALUE_ACTION(this.env),
-        "CTRL+SHIFT+<": () => this.clearFormatting(),
-        "CTRL+<": () => this.clearFormatting(),
-        "CTRL+SHIFT+ ": () => {
+        "Ctrl+D": async () => this.env.model.dispatch("COPY_PASTE_CELLS_ABOVE"),
+        "Ctrl+R": async () => this.env.model.dispatch("COPY_PASTE_CELLS_ON_LEFT"),
+        "Ctrl+Shift+E": () => this.setHorizontalAlign("center"),
+        "Ctrl+Shift+L": () => this.setHorizontalAlign("left"),
+        "Ctrl+Shift+R": () => this.setHorizontalAlign("right"),
+        "Ctrl+Shift+V": () => PASTE_VALUE_ACTION(this.env),
+        "Ctrl+Shift+<": () => this.clearFormatting(),
+        "Ctrl+<": () => this.clearFormatting(),
+        "Ctrl+Shift+ ": () => {
             this.env.model.selection.selectAll();
         },
-        "CTRL+ALT+=": () => {
+        "Ctrl+Alt+=": () => {
             const activeCols = this.env.model.getters.getActiveCols();
             const activeRows = this.env.model.getters.getActiveRows();
             const isSingleSelection = this.env.model.getters.getSelectedZones().length === 1;
@@ -29483,7 +29513,7 @@ class Grid extends owl.Component {
                 INSERT_ROWS_BEFORE_ACTION(this.env);
             }
         },
-        "CTRL+ALT+-": () => {
+        "Ctrl+Alt+-": () => {
             const columns = [...this.env.model.getters.getActiveCols()];
             const rows = [...this.env.model.getters.getActiveRows()];
             if (columns.length > 0 && rows.length === 0) {
@@ -29501,19 +29531,19 @@ class Grid extends owl.Component {
                 });
             }
         },
-        "SHIFT+PAGEDOWN": () => {
+        "Shift+PageDown": () => {
             this.env.model.dispatch("ACTIVATE_NEXT_SHEET");
         },
-        "SHIFT+PAGEUP": () => {
+        "Shift+PageUp": () => {
             this.env.model.dispatch("ACTIVATE_PREVIOUS_SHEET");
         },
-        PAGEDOWN: () => this.env.model.dispatch("SHIFT_VIEWPORT_DOWN"),
-        PAGEUP: () => this.env.model.dispatch("SHIFT_VIEWPORT_UP"),
-        "CTRL+K": () => INSERT_LINK(this.env),
-        "ALT+SHIFT+ARROWRIGHT": () => this.processHeaderGroupingKey("right"),
-        "ALT+SHIFT+ARROWLEFT": () => this.processHeaderGroupingKey("left"),
-        "ALT+SHIFT+ARROWUP": () => this.processHeaderGroupingKey("up"),
-        "ALT+SHIFT+ARROWDOWN": () => this.processHeaderGroupingKey("down"),
+        PageDown: () => this.env.model.dispatch("SHIFT_VIEWPORT_DOWN"),
+        PageUp: () => this.env.model.dispatch("SHIFT_VIEWPORT_UP"),
+        "Ctrl+K": () => INSERT_LINK(this.env),
+        "Alt+Shift+ArrowRight": () => this.processHeaderGroupingKey("right"),
+        "Alt+Shift+ArrowLeft": () => this.processHeaderGroupingKey("left"),
+        "Alt+Shift+ArrowUp": () => this.processHeaderGroupingKey("up"),
+        "Alt+Shift+ArrowDown": () => this.processHeaderGroupingKey("down"),
     };
     focus() {
         if (!this.env.model.getters.getSelectedFigureId() &&
@@ -29641,18 +29671,8 @@ class Grid extends owl.Component {
         }
     }
     onKeydown(ev) {
-        const eventKey = ev.key.toUpperCase();
-        let keyDownString = "";
-        if (ev.ctrlKey && eventKey !== "CTRL")
-            keyDownString += "CTRL+";
-        if (ev.metaKey)
-            keyDownString += "CTRL+";
-        if (ev.altKey && eventKey !== "ALT")
-            keyDownString += "ALT+";
-        if (ev.shiftKey && eventKey !== "SHIFT")
-            keyDownString += "SHIFT+";
-        keyDownString += ev.key.toUpperCase();
-        let handler = this.keyDownMapping[keyDownString];
+        const keyDownString = keyboardEventToShortcutString(ev);
+        const handler = this.keyDownMapping[keyDownString];
         if (handler) {
             ev.preventDefault();
             ev.stopPropagation();
@@ -43487,6 +43507,8 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
         if (height > 1 || width > 1 || isCutOperation) {
             const zones = this.pastedZones(target, width, height);
             const newZone = isCutOperation ? zones[0] : union(...zones);
+            // we want grid selection to capture the selection stream
+            this.selection.getBackToDefault();
             this.selection.selectZone({ cell: { col, row }, zone: newZone }, { scrollIntoView: false });
         }
     }
@@ -44153,6 +44175,8 @@ class FindAndReplacePlugin extends UIPlugin {
         //modulo of negative value to be able to cycle in both directions with previous and next
         nextIndex = ((nextIndex % matches.length) + matches.length) % matches.length;
         this.selectedMatchIndex = nextIndex;
+        // we want grid selection to capture the selection stream
+        this.selection.getBackToDefault();
         this.selection.selectCell(matches[nextIndex].col, matches[nextIndex].row);
         for (let index = 0; index < this.searchMatches.length; index++) {
             this.searchMatches[index].selected = index === this.selectedMatchIndex;
@@ -45500,7 +45524,10 @@ class SelectionInputsManagerPlugin extends UIPlugin {
             };
             this.selection.capture(input, anchor, {
                 handleEvent: input.handleEvent.bind(input),
-                release: () => (this.focusedInputId = null),
+                release: () => {
+                    this.focusedInputId = null;
+                    input.focusedRangeIndex = null;
+                },
             });
             this.focusedInputId = id;
         }
@@ -46681,6 +46708,8 @@ class ClipboardOsState extends ClipboardCellsAbstractState {
             right: activeCol + numberOfCols - 1,
             bottom: activeRow + numberOfRows - 1,
         };
+        // we want grid selection to capture the selection stream
+        this.selection.getBackToDefault();
         this.selection.selectZone({ cell: { col: activeCol, row: activeRow }, zone }, { scrollIntoView: false });
     }
     getClipboardContent() {
@@ -55869,6 +55898,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.1";
-__info__.date = "2023-11-02T09:35:50.522Z";
-__info__.hash = "0887d5b";
+__info__.version = "17.1.0-alpha.1";
+__info__.date = "2023-11-02T09:35:10.532Z";
+__info__.hash = "3b1fe3b";

package/dist/o-spreadsheet.d.ts

@@ -7205,6 +7205,7 @@ declare class Composer extends Component<ComposerProps, SpreadsheetChildEnv> {
     private processTabKey;
     processSpaceKey(ev: KeyboardEvent): void;
     private processEnterKey;
+    private processNewLineEvent;
     private processEscapeKey;
     private processF4Key;
     private processNumpadDecimal;