Fix measuring

glideapps · Jan 12, 2024 · b569edc · b569edc
1 parent e900935
commit b569edc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/packages/cells/src/cells/dropdown-cell.tsx b/packages/cells/src/cells/dropdown-cell.tsx
@@ -112,6 +112,8 @@ const Editor: ReturnType<ProvideEditorCallback<DropdownCell>> = p => {
                         fontSize: theme.editorFontSize,
                         fontFamily: theme.fontFamily,
                         cursor: isFocused ? "pointer" : undefined,
+                        paddingLeft: theme.cellHorizontalPadding,
+                        paddingRight: theme.cellHorizontalPadding,
                         ":active": {
                             ...base[":active"],
                             color: theme.accentFg,

diff --git a/packages/core/src/cells/number-cell.tsx b/packages/core/src/cells/number-cell.tsx
@@ -16,7 +16,7 @@ export const numberCellRenderer: InternalCellRenderer<NumberCell> = {
     useLabel: true,
     drawPrep: prepTextCell,
     draw: a => drawTextCell(a, a.cell.displayData, a.cell.contentAlign),
-    measure: (ctx, cell) => ctx.measureText(cell.displayData).width + 16,
+    measure: (ctx, cell, theme) => ctx.measureText(cell.displayData).width + theme.cellHorizontalPadding * 2,
     onDelete: c => ({
         ...c,
         data: undefined,

diff --git a/packages/core/src/cells/row-id-cell.tsx b/packages/core/src/cells/row-id-cell.tsx
@@ -11,7 +11,7 @@ export const rowIDCellRenderer: InternalCellRenderer<RowIDCell> = {
     needsHoverPosition: false,
     drawPrep: (a, b) => prepTextCell(a, b, a.theme.textLight),
     draw: a => drawTextCell(a, a.cell.data, a.cell.contentAlign),
-    measure: (ctx, cell) => ctx.measureText(cell.data).width + 16,
+    measure: (ctx, cell, theme) => ctx.measureText(cell.data).width + theme.cellHorizontalPadding * 2,
     // eslint-disable-next-line react/display-name
     provideEditor: () => p => {
         const { isHighlighted, onChange, value, validatedSelection } = p;