Skip to content
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

fix(AnalyticalTable): fix minWidth and maxWidth column option, disable dragging while resizing #518

Merged
merged 5 commits into from
May 18, 2020
Merged

fix(AnalyticalTable): fix minWidth and maxWidth column option, disable dragging while resizing #518

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7732c96
fix(AnalyticalTable): enable column option minWidth and maxWidth agai…
Lukas742 May 15, 2020
0c8779d
fix table placeholder
Lukas742 May 15, 2020
47981a6
update snapshots
Lukas742 May 15, 2020
e627cc2
fix: use totalWidth instead of width
MarcusNotheis May 18, 2020
510bca4
Merge branch 'master' into fix/analytical-table-column-width
Lukas742 May 18, 2020
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
4 changes: 2 additions & 2 deletions packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/TablePlaceholder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ const TableRow: FC<RowProps> = ({ columns, y, row }: RowProps) => {
y={y}
rx="2"
ry="8"
width={column.width - 4}
width={column.totalWidth - 4}
height="16"
/>
);
columnOffset += column.width;
columnOffset += column.totalWidth;
return el;
})}
</>
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/components/AnalyticalTable/defaults/LoadingComponent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ const styles: CSSProperties = {
zIndex: 1
};

const DefaultLoadingComponent = () => {
return <Loader delay={500} style={styles} />;
const DefaultLoadingComponent = ({ style }) => {
return <Loader delay={500} style={{ ...styles, ...style }} />;
};

DefaultLoadingComponent.displayName = 'DefaultLoadingComponent';
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/components/AnalyticalTable/hooks/useDragAndDrop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const useDragAndDrop = (props, setColumnOrder, columnOrder, resizeInfo, c

const handleDragStart = useCallback(
(e) => {
if (resizeInfo.isResizingColumn === e.currentTarget.dataset.columnId) {
if (resizeInfo.isResizingColumn) {
e.preventDefault();
return;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/components/AnalyticalTable/hooks/useStyling.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const getHeaderProps = (columnProps, { instance, column }) => {
const lastColumnId = instance.visibleColumns[instance.visibleColumns.length - 1].id;
const isLastColumn = column.id === lastColumnId;
const style: CSSProperties = {
width: column.width
width: column.totalWidth
};

if (instance.state.isScrollable && isLastColumn) {
Expand Down
4 changes: 3 additions & 1 deletion packages/main/src/components/AnalyticalTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,9 @@ const AnalyticalTable: FC<TableProps> = forwardRef((props: TableProps, ref: Ref<
</header>
);
})}
{loading && busyIndicatorEnabled && props.data?.length > 0 && <LoadingComponent />}
{loading && busyIndicatorEnabled && props.data?.length > 0 && (
<LoadingComponent style={{ width: `${totalColumnsWidth}px` }} />
)}
{loading && props.data?.length === 0 && (
<TablePlaceholder
columns={tableInternalColumns.filter(
Expand Down