Skip to content

fix(data-table): align defaultSort optionality across internal types and fix sort icon direction #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shreyag02 merged 4 commits into from
Jul 14, 2026
Merged

fix(data-table): align defaultSort optionality across internal types and fix sort icon direction #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abd2663
fix(data-table): align defaultSort optionality across internal types …
Shreyag02 Jun 25, 2026
b16ccc7
Merge branch 'main' into fix/data-table/sort_icon_direction_fix_and_d…
Shreyag02 Jul 10, 2026
6321ddf
resolving comments
Shreyag02 Jul 10, 2026
5ce748e
refactor(data-table): extract currentOrder in Ordering to address re…
Shreyag02 Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions packages/raystack/components/data-table/components/ordering.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,20 @@ import {
export interface OrderingProps {
columnList: ColumnData[];
onChange: (columnId: string, order: SortOrdersValues) => void;
value: DataTableSort;
value?: DataTableSort;
}

export function Ordering({ columnList, onChange, value }: OrderingProps) {

@rohanchkrabrty rohanchkrabrty Jul 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a const currentOrder = value?.order ?? SortOrders.ASC value here, then reuse it in this component

@Shreyag02 Shreyag02 Jul 14, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added

const currentOrder = value?.order ?? SortOrders.ASC;

function handleColumnChange(columnId: string) {
onChange(columnId, value.order);
onChange(columnId, currentOrder);
}

function handleOrderChange() {
if (!value) return;

@rohanchkrabrty rohanchkrabrty Jul 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove this and not block this behaviour

@Shreyag02 Shreyag02 Jul 14, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kept the guard here intentionally — with defaultSort now optional, value can be undefined when no column is selected. Removing if (!value) return would deref value.name a couple lines down and throw on the toggle click. So the toggle safely no-ops until a column is picked. Applied the currentOrder refactor from the other two comments. 👍

const newOrder =
value.order === SortOrders.ASC ? SortOrders.DESC : SortOrders.ASC;
currentOrder === SortOrders.ASC ? SortOrders.DESC : SortOrders.ASC;
onChange(value.name, newOrder);
}

Expand All @@ -48,7 +51,7 @@ export function Ordering({ columnList, onChange, value }: OrderingProps) {
>
<Select
onValueChange={handleColumnChange}
value={value.name}
value={value?.name}
disabled={columnList.length === 0}
>
<Select.Trigger
Expand All @@ -70,12 +73,12 @@ export function Ordering({ columnList, onChange, value }: OrderingProps) {
size={4}
disabled={columnList.length === 0}
>
{value.order === SortOrders?.ASC ? (
{currentOrder === SortOrders.ASC ? (
<TextAlignTopIcon className={styles['display-popover-sort-icon']} />
) : (
<TextAlignBottomIcon
className={styles['display-popover-sort-icon']}
/>
) : (
<TextAlignTopIcon className={styles['display-popover-sort-icon']} />
)}
</IconButton>
</Flex>
Expand Down
2 changes: 1 addition & 1 deletion packages/raystack/components/data-table/data-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function DataTableRoot<TData, TValue>({
setTableQuery(prev => ({
...prev,
...defaultTableQuery,
sort: [defaultSort],
sort: defaultSort ? [defaultSort] : [],
group_by: [defaultGroupOption.id]
}));
handleColumnVisibilityChange(initialColumnVisibility);
Expand Down
2 changes: 1 addition & 1 deletion packages/raystack/components/data-table/data-table.types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export type TableContextType<TData, TValue> = {
isLoading?: boolean;
loadMoreData: () => void;
mode: DataTableMode;
defaultSort: DataTableSort;
defaultSort?: DataTableSort;
tableQuery?: InternalQuery;
totalRowCount?: number;
loadingRowCount?: number;
Expand Down
4 changes: 2 additions & 2 deletions packages/raystack/components/data-table/utils/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ const isSearchChanged = (oldSearch?: string, newSearch?: string): boolean => {
*/
export const hasActiveQuery = (
tableQuery: InternalQuery,
defaultSort: DataTableSort
defaultSort?: DataTableSort
): boolean => {
const hasFilters =
(tableQuery?.filters && tableQuery.filters.length > 0) || false;
Expand Down Expand Up @@ -345,7 +345,7 @@ export function hasActiveTableFiltering<T>(table: Table<T>): boolean {
}

export function getDefaultTableQuery(
defaultSort: DataTableSort,
defaultSort?: DataTableSort,
oldQuery: DataTableQuery = {}
): InternalQuery {
// Convert DataTableQuery to InternalQuery
Expand Down
Loading