Skip to content

[Fix]: #1626 Width Column Layout #1675

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 11 commits into from
May 14, 2025
Merged

[Fix]: #1626 Width Column Layout #1675

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
156b06a
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
iamfaran Apr 24, 2025
704a160
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
iamfaran Apr 30, 2025
6c7a7c5
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
iamfaran May 1, 2025
624d349
[FIX]: #1626 Column Layout Component Width Issue
iamfaran May 1, 2025
e035ee2
[Fix]: #1626 Add Toggle between Grid/Flex Layout
iamfaran May 5, 2025
55157a8
[Fix]: #1626 Hide Width in Grid Mode
iamfaran May 5, 2025
112a7f1
[Fix]: #1626 fill available space issue
iamfaran May 5, 2025
1ae320d
[Fix]: #1626 remove min-width from the UI
iamfaran May 5, 2025
603a62d
revert to Grid
iamfaran May 6, 2025
dab7174
[FIX] #1626 add min-width using css grid minmax()
iamfaran May 13, 2025
9eb9341
[FIX] #1503 min-width for ResponsiveLayout Component
iamfaran May 13, 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
Prev Previous commit
Next Next commit
[Fix]: #1626 fill available space issue
  • Loading branch information
@iamfaran
iamfaran committed May 5, 2025
commit 112a7f138ff3cfa2ddac6fa7700e903436c685d8
32 changes: 16 additions & 16 deletions client/packages/lowcoder/src/comps/comps/columnLayout/columnLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,27 @@ const ContainWrapper = styled.div<{
${props => props.$style && getBackgroundStyle(props.$style)}
`;

const getColumnWidth = (column: any): string => {
// Use explicit width if available
if (column.width) {
return column.width;
}

// No explicit width - return auto to let flex handle it
return 'auto';
};

const ColWrapper = styled.div<{
$style: ResponsiveLayoutColStyleType | undefined,
$width: string,
$matchColumnsHeight: boolean,
$useFlexLayout: boolean,
$hasExplicitWidth: boolean,
}>`
${props => props.$useFlexLayout ? `
flex: ${props.$width === '100%' ? '1 0 100%' : `0 0 ${props.$width}`};
max-width: ${props.$width};
${props.$hasExplicitWidth
? `flex: 0 0 ${props.$width}; max-width: ${props.$width};`
: 'flex: 1 1 0%; min-width: 0;'}
` : ''}

> div {
Expand Down Expand Up @@ -143,20 +155,6 @@ const ColumnContainer = (props: ColumnContainerProps) => {
);
};

const getColumnWidth = (column: any): string => {
// Use explicit width if available
if (column.width) {
// For percentage values, calculate precisely to accommodate gaps
if (column.width.endsWith('%')) {
return column.width;
}
return column.width;
}

// If minWidth is set, use it or default to equal distribution
return column.minWidth || 'auto';
};

const ColumnLayout = (props: ColumnLayoutProps) => {
let {
columns,
Expand Down Expand Up @@ -195,6 +193,7 @@ const ColumnLayout = (props: ColumnLayoutProps) => {
if(!containers[id]) return null
const containerProps = containers[id].children;
const columnWidth = getColumnWidth(column);
const hasExplicitWidth = !!column.width;

return (
<BackgroundColorContext.Provider key={id} value={props.columnStyle.background}>
Expand All @@ -203,6 +202,7 @@ const ColumnLayout = (props: ColumnLayoutProps) => {
$width={columnWidth}
$matchColumnsHeight={matchColumnsHeight}
$useFlexLayout={useFlexLayout}
$hasExplicitWidth={hasExplicitWidth}
>
<ColumnContainer
layout={containerProps.layout.getView()}
Expand Down
4 changes: 2 additions & 2 deletions client/packages/lowcoder/src/comps/controls/optionsControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,8 +647,8 @@ ColumnOption = class extends ColumnOption implements OptionCompProperty {

export const ColumnOptionControl = manualOptionsControl(ColumnOption, {
initOptions: [
{ id: 0, key: "Column1", label: "Column1", width: "50%" },
{ id: 1, key: "Column2", label: "Column2", width: "50%" },
{ id: 0, key: "Column1", label: "Column1", width: "" },
{ id: 1, key: "Column2", label: "Column2", width: "" },
],
uniqField: "key",
autoIncField: "id",
Expand Down