diff --git a/packages/main/src/components/AnalyticalTable/AnalyticalTable.stories.tsx b/packages/main/src/components/AnalyticalTable/AnalyticalTable.stories.tsx index 1aec38cc53d..42e2382169c 100644 --- a/packages/main/src/components/AnalyticalTable/AnalyticalTable.stories.tsx +++ b/packages/main/src/components/AnalyticalTable/AnalyticalTable.stories.tsx @@ -155,7 +155,8 @@ const meta = { }, { Header: 'Age', - accessor: 'age' + accessor: 'age', + hAlign: 'End' }, { Header: 'Friend Name', @@ -163,7 +164,8 @@ const meta = { }, { Header: 'Friend Age', - accessor: 'friend.age' + accessor: 'friend.age', + hAlign: 'End' } ], highlightField: 'status', diff --git a/packages/main/src/components/AnalyticalTable/defaults/Column/ColumnHeaderModal.tsx b/packages/main/src/components/AnalyticalTable/defaults/Column/ColumnHeaderModal.tsx index 088c55ca174..1ab08bccdba 100644 --- a/packages/main/src/components/AnalyticalTable/defaults/Column/ColumnHeaderModal.tsx +++ b/packages/main/src/components/AnalyticalTable/defaults/Column/ColumnHeaderModal.tsx @@ -139,17 +139,17 @@ export const ColumnHeaderModal = (instance: TableInstanceWithPopoverProps) => { const horizontalAlign = (() => { switch (column.hAlign) { case TextAlign.Begin: - return isRtl ? PopoverHorizontalAlign.End : PopoverHorizontalAlign.Start; + return PopoverHorizontalAlign.Start; case TextAlign.End: - return isRtl ? PopoverHorizontalAlign.Start : PopoverHorizontalAlign.End; + return PopoverHorizontalAlign.End; case TextAlign.Left: - return PopoverHorizontalAlign.Start; + return isRtl ? PopoverHorizontalAlign.End : PopoverHorizontalAlign.Start; case TextAlign.Right: - return PopoverHorizontalAlign.End; + return isRtl ? PopoverHorizontalAlign.Start : PopoverHorizontalAlign.End; case TextAlign.Center: return PopoverHorizontalAlign.Center; default: - return isRtl ? PopoverHorizontalAlign.End : PopoverHorizontalAlign.Start; + return PopoverHorizontalAlign.Start; } })(); diff --git a/packages/main/src/components/AnalyticalTable/types/index.ts b/packages/main/src/components/AnalyticalTable/types/index.ts index 7cf6815f27f..fda8b97ba5f 100644 --- a/packages/main/src/components/AnalyticalTable/types/index.ts +++ b/packages/main/src/components/AnalyticalTable/types/index.ts @@ -512,11 +512,11 @@ export interface AnalyticalTableColumnDefinition { /** * Horizontal alignment of the cell. */ - hAlign?: TextAlign; + hAlign?: TextAlign | keyof typeof TextAlign; /** * Vertical alignment of the cell. */ - vAlign?: VerticalAlign; + vAlign?: VerticalAlign | keyof typeof VerticalAlign; /** * Allows passing a custom string for the internal width calculation of custom cells for `scaleWidthMode` `Grow` and `Smart`. *