fix: Input Tables cannot paste more rows than number of visible rows (#…

…2152) Resolves #2089
deephaven · Dec 13, 2024 · 4d8496b · 4d8496b
1 parent 552f4d7
commit 4d8496b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 28 deletions.
diff --git a/packages/grid/src/Grid.tsx b/packages/grid/src/Grid.tsx
@@ -1497,6 +1497,7 @@ class Grid extends PureComponent<GridProps, GridState> {
       const { columnCount, rowCount } = model;
       let ranges = selectedRanges;
       // If each cell is a single selection, we need to update the selection to map to the newly pasted data
+      // Check for
       if (
         ranges.every(
           range =>
@@ -1518,16 +1519,6 @@ class Grid extends PureComponent<GridProps, GridState> {
         this.setSelectedRanges(ranges);
       }
 
-      if (
-        !ranges.every(
-          range =>
-            GridRange.rowCount([range]) === tableHeight &&
-            GridRange.columnCount([range]) === tableWidth
-        )
-      ) {
-        throw new PasteError('Copy and paste area are not same size.');
-      }
-
       const edits: EditOperation[] = [];
       ranges.forEach(range => {
         for (let x = 0; x < tableWidth; x += 1) {

diff --git a/packages/iris-grid/src/IrisGridTableModelTemplate.ts b/packages/iris-grid/src/IrisGridTableModelTemplate.ts
@@ -1040,7 +1040,7 @@ class IrisGridTableModelTemplate<
    */
   pendingRow(y: ModelIndex): ModelIndex | null {
     const pendingRow = y - this.floatingTopRowCount - this.table.size;
-    if (pendingRow >= 0 && pendingRow < this.pendingNewRowCount) {
+    if (pendingRow >= 0) {
       return pendingRow;
     }
 
@@ -1635,7 +1635,11 @@ class IrisGridTableModelTemplate<
 
   isEditableRange(range: GridRange): boolean {
     // Make sure we have an input table and a valid range
-    if (this.inputTable == null || !GridRange.isBounded(range)) {
+    if (
+      this.inputTable == null ||
+      range.startRow == null ||
+      range.endRow == null
+    ) {
       return false;
     }
 
@@ -1647,12 +1651,10 @@ class IrisGridTableModelTemplate<
       this.isPendingRow(range.startRow) && this.isPendingRow(range.endRow);
 
     let isKeyColumnInRange = false;
+    assertNotNull(range.startColumn);
     // Check if any of the columns in grid range are key columns
-    for (
-      let column = range.startColumn;
-      column <= range.endColumn;
-      column += 1
-    ) {
+    const bound = range.endColumn ?? this.table.size;
+    for (let column = range.startColumn; column <= bound; column += 1) {
       if (this.isKeyColumn(column)) {
         isKeyColumnInRange = true;
         break;
@@ -1665,17 +1667,6 @@ class IrisGridTableModelTemplate<
       return false;
     }
 
-    // Editing the aggregations/totals which are floating above/below is not allowed
-    if (
-      range.startRow < this.floatingTopRowCount ||
-      range.startRow >=
-        this.floatingTopRowCount + this.table.size + this.pendingRowCount ||
-      range.endRow >=
-        this.floatingTopRowCount + this.table.size + this.pendingRowCount
-    ) {
-      return false;
-    }
-
     return true;
   }