From c4730c36ba14149a6b9608f8ae06aee4c88ef898 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 27 Jun 2022 14:44:38 +0100 Subject: [PATCH 1/2] Fix slight issue with column editor layout --- .../PropertyControls/ColumnEditor/ColumnDrawer.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte index 48ebddbcf1..cf85b2506b 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColumnEditor/ColumnDrawer.svelte @@ -178,7 +178,7 @@ .column { gap: var(--spacing-l); display: grid; - grid-template-columns: 20px 1fr 1fr auto auto; + grid-template-columns: 20px 1fr 1fr 16px 16px; align-items: center; border-radius: var(--border-radius-s); transition: background-color ease-in-out 130ms; From 148c91641637cfbdb7a8dc32741f54fad558c5b8 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 27 Jun 2022 14:44:52 +0100 Subject: [PATCH 2/2] Use string renderer for datetime fields with custom templates --- packages/bbui/src/Table/CellRenderer.svelte | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Table/CellRenderer.svelte b/packages/bbui/src/Table/CellRenderer.svelte index 4dda31240a..246323244a 100644 --- a/packages/bbui/src/Table/CellRenderer.svelte +++ b/packages/bbui/src/Table/CellRenderer.svelte @@ -26,12 +26,20 @@ array: ArrayRenderer, internal: InternalRenderer, } - $: type = schema?.type ?? "string" + $: type = getType(schema) $: customRenderer = customRenderers?.find(x => x.column === schema?.name) $: renderer = customRenderer?.component ?? typeMap[type] ?? StringRenderer $: width = schema?.width || "150px" $: cellValue = getCellValue(value, schema.template) + const getType = schema => { + // Use a string renderer for dates if we use a custom template + if (schema?.type === "datetime" && schema?.template) { + return "string" + } + return schema?.type || "string" + } + const getCellValue = (value, template) => { if (!template) { return value