Merge branch 'main' into update-dvc

iterative · Apr 13, 2023 · 3f723e6 · 3f723e6
2 parents 9f3de93 + 0d619a4
commit 3f723e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/webview/src/experiments/components/table/header/TableHeaderCellContents.tsx b/webview/src/experiments/components/table/header/TableHeaderCellContents.tsx
@@ -63,7 +63,7 @@ export const ColumnDragHandle: React.FC<{
         onDrop={onDrop}
         onDragLeave={onDragLeave}
       >
-        <span>
+        <span className={header.isPlaceholder ? '' : styles.cellDraggable}>
           {header.isPlaceholder
             ? null
             : flexRender(header.column.columnDef.header, header.getContext())}

diff --git a/webview/src/experiments/components/table/styles.module.scss b/webview/src/experiments/components/table/styles.module.scss
@@ -382,9 +382,13 @@ table.withExpColumnShadow tr > *:first-child {
     display: block;
 
     span[draggable='true'] {
-      display: block;
       cursor: grab;
     }
+
+    .cellDraggable {
+      display: block;
+      padding: 0.31rem $cell-padding;
+    }
   }
 
   & > *:first-child {
@@ -566,9 +570,6 @@ td {
 
 .placeholderHeaderCell {
   background-color: $header-bg-color;
-  .cellContents {
-    padding: 0.31rem $cell-padding;
-  }
 
   &::before {
     @extend %cellBorderLeft;
@@ -841,6 +842,7 @@ td {
   overflow-x: hidden;
   text-overflow: ellipsis;
   text-align: left;
+  pointer-events: none;
 }
 
 thead {