Don't add bottom padding for overscroll

glideapps · Feb 17, 2021 · 28a56e9 · 28a56e9
1 parent 5f76c34
commit 28a56e9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/data-editor/data-editor-stories.tsx b/src/data-editor/data-editor-stories.tsx
@@ -244,3 +244,26 @@ export function Draggable() {
         />
     );
 }
+
+export function IdealSize() {
+    // trying to be 500x500
+    const cols: GridColumn[] = [
+        { title: "Number", width: 250 },
+        { title: "Square", width: 250 },
+    ];
+    return (
+        <DataEditor
+            isDraggable={true}
+            onDragStart={args => {
+                args.setData("text", "testing");
+            }}
+            getCellContent={getData}
+            columns={cols}
+            rowHeight={50}
+            headerHeight={50}
+            showTrailingBlankRow={false}
+            rowMarkers={false}
+            rows={9}
+        />
+    );
+}
diff --git a/src/scrolling-data-grid/scrolling-data-grid.tsx b/src/scrolling-data-grid/scrolling-data-grid.tsx
@@ -28,12 +28,11 @@ const GridScroller: React.FunctionComponent<ScrollingDataGridProps> = p => {
 
     let height = headerHeight;
     if (typeof rowHeight === "number") {
-        height += rows * rowHeight + rowHeight / 2;
+        height += rows * rowHeight;
     } else {
         for (let r = 0; r < rows; r++) {
             height += rowHeight(r);
         }
-        height += rowHeight(rows - 1) / 2;
     }
 
     const onScrollUpdate = React.useCallback(
@@ -63,7 +62,7 @@ const GridScroller: React.FunctionComponent<ScrollingDataGridProps> = p => {
             let cellY = 0;
             let cellBottom = 0;
             if (typeof rowHeight === "number") {
-                cellY = Math.round(args.scrollTop / rowHeight);
+                cellY = Math.ceil(args.scrollTop / rowHeight);
                 cellBottom = Math.ceil(args.clientHeight / rowHeight) + cellY;
             } else {
                 let y = 0;