From 57576ea45a10d87bffc5acca13ee976dd436f131 Mon Sep 17 00:00:00 2001 From: Bruno Lemos Date: Fri, 18 Jan 2019 04:50:55 -0200 Subject: [PATCH] Fix column size taking in consideration the separator size --- packages/components/src/components/columns/Column.tsx | 3 ++- packages/components/src/components/columns/Columns.tsx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/components/src/components/columns/Column.tsx b/packages/components/src/components/columns/Column.tsx index d63df0db..6412d06d 100644 --- a/packages/components/src/components/columns/Column.tsx +++ b/packages/components/src/components/columns/Column.tsx @@ -5,6 +5,7 @@ import { useCSSVariablesOrSpringAnimatedTheme } from '../../hooks/use-css-variab import { useEmitter } from '../../hooks/use-emitter' import { contentPadding } from '../../styles/variables' import { SpringAnimatedView } from '../animated/spring/SpringAnimatedView' +import { separatorSize } from '../common/Separator' import { useColumnWidth } from '../context/ColumnWidthContext' export const columnMargin = contentPadding / 2 @@ -27,7 +28,7 @@ export const Column = React.memo((props: ColumnProps) => { const [showFocusBorder, setShowFocusBorder] = useState(false) const springAnimatedTheme = useCSSVariablesOrSpringAnimatedTheme() - const width = useColumnWidth() + const width = useColumnWidth() - separatorSize useEmitter( 'FOCUS_ON_COLUMN', diff --git a/packages/components/src/components/columns/Columns.tsx b/packages/components/src/components/columns/Columns.tsx index a6d98f6d..5ea363f7 100644 --- a/packages/components/src/components/columns/Columns.tsx +++ b/packages/components/src/components/columns/Columns.tsx @@ -171,8 +171,8 @@ export const Columns = React.memo((props: ColumnsProps) => { data={columnIds} getItemLayout={(_data, index) => ({ index, - length: columnWidth + separatorSize, - offset: index * (columnWidth + separatorSize), + length: columnWidth, + offset: index * columnWidth, })} horizontal initialNumToRender={4}