Merge pull request #1013 from ibi-group/timetable-new-features

Support copy from right in timetable editor
ibi-group · Jan 7, 2025 · f044bbb · f044bbb
2 parents d51634b + 1551753
commit f044bbb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/i18n/english.yml b/i18n/english.yml
@@ -1295,6 +1295,7 @@ components:
           - New trip
           - Clone selected trip(s)
           - Copy time value from adjacent cell (the cell immediately to the left)
+          - Copy time value from adjacent cell (the cell immediately to the right)
           - Copy value from cell directly above
     title: Timetable editor keyboard shortcuts
   TimezoneSelect:

diff --git a/lib/editor/components/timetable/TimetableGrid.js b/lib/editor/components/timetable/TimetableGrid.js
@@ -197,14 +197,25 @@ export default class TimetableGrid extends Component<Props> {
       case 222: { // single quote
         // Set current cell's value to adjacent cell's (leftward) value.
         const adjacentCol = columns[this._getColIndex(scrollToColumn) - 1]
-        if (evt.shiftKey && !activeCell && isTimeFormat(adjacentCol.type)) {
+        if (evt.shiftKey && !activeCell && adjacentCol && isTimeFormat(adjacentCol.type) && isTimeFormat(col.type)) {
           const value = objectPath.get(data[scrollToRow], adjacentCol.key)
           this._handleCellChange(value, scrollToRow, col, scrollToColumn)
           this.offsetScrollCol(1)
           return false
         }
         break
       }
+      case 76: { // l
+        // Set current cell's value to adjacent cell's (rightward) value.
+        const adjacentCol = columns[this._getColIndex(scrollToColumn) + 1]
+        if (evt.shiftKey && !activeCell && adjacentCol && isTimeFormat(adjacentCol.type) && isTimeFormat(col.type)) {
+          const value = objectPath.get(data[scrollToRow], adjacentCol.key)
+          this._handleCellChange(value, scrollToRow, col, scrollToColumn)
+          this.offsetScrollCol(-1)
+          return false
+        }
+        break
+      }
       case 186: { // semi-colon
         // Set current cell's value to above cell's value.
         const previousRowIndex = scrollToRow - 1

diff --git a/lib/editor/util/timetable.js b/lib/editor/util/timetable.js
@@ -12,7 +12,7 @@ import { EXCEPTION_EXEMPLARS } from '.'
 export const SHORTCUTS = {
   offset: ['o', 'SHIFT:+:o', 'i', 'SHIFT:+:i', '-', 'SHIFT:+:-', '+', 'SHIFT:+:+'],
   navigate: ['k:/:j', '←:/:→', 'x', 'a', 'd'],
-  modify: ['#', 'n', 'c', 'SHIFT:+:\'', 'SHIFT:+:;']
+  modify: ['#', 'n', 'c', 'SHIFT:+:\'', 'SHIFT:+:l', 'SHIFT:+:;']
 }
 
 /**