Skip to content

Added blank column to take 100% width #1840

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
merged 4 commits into from
Apr 3, 2025
+78 −46
Merged

Added blank column to take 100% width #1840

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe04e84
Added blank column to take 100% width
Georgi2704 Mar 31, 2025
a477cf2
Fix cell separator resets to previous width, code refactor
Georgi2704 Apr 1, 2025
ad9d408
linted
Georgi2704 Apr 1, 2025
f8d701b
Add changeset
Georgi2704 Apr 3, 2025
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
57 changes: 35 additions & 22 deletions packages/orchestrator-ui-components/src/components/WfoTable/WfoTable/WfoDragHandler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,49 +22,62 @@ export const WfoDragHandler: FC<WfoDragHandlerProps> = ({
onUpdateColumWidth,
}) => {
const [position, setPosition] = useState({ x: 0, y: 0 });
const [isDragging, setIsDragging] = useState(false);
const { dragAndDropStyle } = useWithOrchestratorTheme(getWfoTableStyles);

const resetPosition = () => {
setPosition({ x: 0, y: 0 });
};

const onStart: DraggableEventHandler = () => {
setIsDragging(false);
};

const onDrag: DraggableEventHandler = (_, data) => {
setIsDragging(true);
setPosition({ x: data.x, y: data.y });
};

const resetPosition = () => {
setPosition({ x: 0, y: 0 });
};
const onStop: DraggableEventHandler = (_, data) => {
if (headerRowRef.current && isDragging) {
const newWidth = startWidth + data.x;

const { dragAndDropStyle } = useWithOrchestratorTheme(getWfoTableStyles);
onUpdateColumWidth(
fieldName,
newWidth > MINIMUM_COLUMN_WIDTH
? newWidth
: MINIMUM_COLUMN_WIDTH,
);
resetPosition();
setIsDragging(false);
}
};

const thElement =
headerRowRef.current &&
(headerRowRef.current.querySelector(
`th[data-field-name="${fieldName}"]`,
) as HTMLTableCellElement);

const startWidth =
thElement?.getBoundingClientRect().width ?? MINIMUM_COLUMN_WIDTH;

const bounds = {
left: MINIMUM_COLUMN_WIDTH - startWidth,
top: 0,
bottom: 0,
};

return (
<div>
<Draggable
allowAnyClick={false}
axis="x"
position={position}
onStart={onStart}
onDrag={onDrag}
bounds={{
left: MINIMUM_COLUMN_WIDTH - startWidth,
top: 0,
bottom: 0,
}}
onStop={(_, data) => {
if (headerRowRef.current) {
const newWidth = startWidth + data.x;

onUpdateColumWidth(
fieldName,
newWidth > MINIMUM_COLUMN_WIDTH
? newWidth
: MINIMUM_COLUMN_WIDTH,
);
resetPosition();
}
}}
bounds={bounds}
onStop={onStop}
>
<div css={dragAndDropStyle} />
</Draggable>
Expand Down
1 change: 1 addition & 0 deletions ...trator-ui-components/src/components/WfoTable/WfoTable/WfoGroupedTable/WfoGroupedTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ export const WfoGroupedTable = <T extends object>({
uniqueRowIdToExpandedRowMap,
}}
onRowClick={({ groupName }) => toggleExpandedRow(groupName)}
appendFillerColumn={false}
/>
</>
);
Expand Down
36 changes: 18 additions & 18 deletions packages/orchestrator-ui-components/src/components/WfoTable/WfoTable/WfoTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { DEFAULT_PAGE_SIZES } from '../utils/constants';
import { WfoTableDataRows } from './WfoTableDataRows';
import { WfoTableHeaderRow } from './WfoTableHeaderRow';
import { getWfoTableStyles } from './styles';
import { getSortedVisibleColumns } from './utils';
import { getColumnWidthsFromConfig, getSortedVisibleColumns } from './utils';

export type Pagination = {
pageSize: number;
Expand Down Expand Up @@ -99,10 +99,11 @@ export type WfoTableProps<T extends object> = {
onRowClick?: (row: T) => void;
onUpdateDataSorting?: (updatedDataSorting: WfoDataSorting<T>) => void;
onUpdateDataSearch?: (updatedDataSearch: WfoDataSearch<T>) => void;
appendFillerColumn?: boolean;
className?: string;
};

type LocalColumnWidths = {
export type LocalColumnWidths = {
[key: string]: string;
};

Expand All @@ -119,25 +120,24 @@ export const WfoTable = <T extends object>({
onUpdateDataSorting,
onUpdateDataSearch,
onRowClick,
appendFillerColumn = true,
className,
}: WfoTableProps<T>) => {
const getColumnWidthsFromConfig = (
columnConfig: WfoTableColumnConfig<T>,
): LocalColumnWidths => {
return Object.entries(columnConfig).reduce(
(columnWidths, [key, config]) => {
if (config.columnType === ColumnType.DATA) {
columnWidths[key] = config.width ?? 'auto';
}
return columnWidths;
},
{} as LocalColumnWidths,
);
};

const [localColumnWidths, setLocalColumnWidths] =
useState<LocalColumnWidths>(getColumnWidthsFromConfig(columnConfig));

const columnConfigWithFiller: WfoTableColumnConfig<T> = appendFillerColumn
? {
...columnConfig,
filler: {
columnType: ColumnType.CONTROL,
label: '',
width: '100%',
renderControl: () => null,
},
}
: columnConfig;

const {
tableContainerStyle,
tableStyle,
Expand All @@ -151,7 +151,7 @@ export const WfoTable = <T extends object>({
const t = useTranslations('common');

const sortedVisibleColumns = getSortedVisibleColumns(
columnConfig,
columnConfigWithFiller,
columnOrder,
hiddenColumns,
);
Expand All @@ -166,7 +166,7 @@ export const WfoTable = <T extends object>({
};

const configWithLocalWidths: WfoTableColumnConfig<T> = Object.entries(
columnConfig,
columnConfigWithFiller,
).reduce((mergedConfig, [fieldName, fieldConfig]) => {
const key = fieldName as keyof WfoTableColumnConfig<T>;
if (fieldConfig.columnType === ColumnType.DATA) {
Expand Down
6 changes: 3 additions & 3 deletions packages/orchestrator-ui-components/src/components/WfoTable/WfoTable/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const getWfoTableStyles = ({ theme, isDarkThemeActive }: WfoTheme) => {
});

const tableStyle = css({
width: 'auto',
width: '100%',
});

const headerStyle = css({
Expand Down Expand Up @@ -136,7 +136,7 @@ export const getWfoTableStyles = ({ theme, isDarkThemeActive }: WfoTheme) => {
position: 'absolute',
height: '100%',
zIndex: theme.levels.menu,
'&:hover, &:active': {
'&:active, &:focus': {
transition: 'background-color 0.15s',
backgroundColor: isDarkThemeActive
? theme.colors.mediumShade
Expand All @@ -152,7 +152,7 @@ export const getWfoTableStyles = ({ theme, isDarkThemeActive }: WfoTheme) => {
opacity: 0.6,
zIndex: theme.levels.navigation,
},
'&:hover::after, &:active::after': {
'&:active::after': {
transition: 'opacity 0.15s',
opacity: 0,
},
Expand Down
15 changes: 14 additions & 1 deletion packages/orchestrator-ui-components/src/components/WfoTable/WfoTable/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TableColumnKeys } from '@/components';
import { LocalColumnWidths, TableColumnKeys } from '@/components';
import { SortOrder } from '@/types';
import { toObjectWithSortedKeys } from '@/utils';

Expand Down Expand Up @@ -80,3 +80,16 @@ export function mapSortableAndFilterableValuesToTableColumnConfig<

return Object.fromEntries(tableColumnConfigUpdatedEntries);
}

export const getColumnWidthsFromConfig = <T extends object>(
columnConfig: WfoTableColumnConfig<T>,
): LocalColumnWidths => {
const columnEntries = Object.entries(columnConfig);

return columnEntries.reduce((columnWidths, [key, config]) => {
if (config.columnType === ColumnType.DATA) {
columnWidths[key] = config.width ?? 'auto';
}
return columnWidths;
}, {} as LocalColumnWidths);
};
4 changes: 2 additions & 2 deletions packages/orchestrator-ui-components/src/icons/WfoQuestionCircle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ export const WfoQuestionCircle: FC<WfoIconProps> = ({
>
<g id="icon/play-circle" fill="none" fillRule="nonzero">
<path
stroke-linecap="round"
stroke-linejoin="round"
strokeLinecap="round"
strokeLinejoin="round"
d="M9.879 7.519c1.171-1.025 3.071-1.025 4.242 0 1.172 1.025 1.172 2.687 0 3.712-.203.179-.43.326-.67.442-.745.361-1.45.999-1.45 1.827v.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 5.25h.008v.008H12v-.008Z"
/>
</g>
Expand Down
Loading