-
Notifications
You must be signed in to change notification settings - Fork 398
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.
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
CB-5437 use flex component instead of container #2818
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b8fba60
CB-5437 use flex component instead of container
devnaumov a364b9f
Merge branch 'devel' into CB-5437-flex-component
devnaumov 2775599
CB-5437 use data attributes to apply styles
devnaumov 80d1583
CB-5437 simplify logic
devnaumov 5cf6f92
Merge branch 'devel' into CB-5437-flex-component
dariamarutkina File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
/* | ||
* CloudBeaver - Cloud Database Manager | ||
* Copyright (C) 2020-2024 DBeaver Corp and others | ||
* | ||
* Licensed under the Apache License, Version 2.0. | ||
* you may not use this file except in compliance with the License. | ||
*/ | ||
|
||
.flex { | ||
display: flex; | ||
flex: 1 1 100%; | ||
} | ||
|
||
.overflow { | ||
overflow: auto; | ||
} | ||
|
||
.gapXs { | ||
gap: 8px; | ||
} | ||
|
||
.gapMd { | ||
gap: 16px; | ||
} | ||
|
||
.gapLg { | ||
gap: 24px; | ||
} | ||
|
||
.wrapWrap { | ||
flex-wrap: wrap; | ||
} | ||
|
||
.wrapNoWrap { | ||
flex-wrap: nowrap; | ||
} | ||
|
||
.wrapWrapReverse { | ||
flex-wrap: wrap-reverse; | ||
} | ||
|
||
.directionRow { | ||
flex-direction: row; | ||
} | ||
|
||
.directionColumn { | ||
flex-direction: column; | ||
} | ||
|
||
.directionRowReverse { | ||
flex-direction: row-reverse; | ||
} | ||
|
||
.directionColumnReverse { | ||
flex-direction: column-reverse; | ||
} | ||
|
||
.alignStart { | ||
align-items: flex-start; | ||
} | ||
|
||
.alignCenter { | ||
align-items: center; | ||
} | ||
|
||
.alignEnd { | ||
align-items: flex-end; | ||
} | ||
|
||
.alignStretch { | ||
align-items: stretch; | ||
} | ||
|
||
.justifyStart { | ||
justify-content: flex-start; | ||
} | ||
|
||
.justifyCenter { | ||
justify-content: center; | ||
} | ||
|
||
.justifyEnd { | ||
justify-content: flex-end; | ||
} | ||
|
||
.justifySpaceBetween { | ||
justify-content: space-between; | ||
} | ||
|
||
.justifySpaceAround { | ||
justify-content: space-around; | ||
} | ||
|
||
.justifySpaceEvenly { | ||
justify-content: space-evenly; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
* CloudBeaver - Cloud Database Manager | ||
* Copyright (C) 2020-2024 DBeaver Corp and others | ||
* | ||
* Licensed under the Apache License, Version 2.0. | ||
* you may not use this file except in compliance with the License. | ||
*/ | ||
import { forwardRef } from 'react'; | ||
|
||
import { clsx } from '@cloudbeaver/core-utils'; | ||
|
||
import classes from './Flex.module.css'; | ||
|
||
interface Props extends React.HTMLAttributes<HTMLDivElement> { | ||
overflow?: boolean; | ||
gap?: 'xs' | 'md' | 'lg'; | ||
wrap?: React.CSSProperties['flexWrap']; | ||
direction?: React.CSSProperties['flexDirection']; | ||
align?: React.CSSProperties['alignItems']; | ||
justify?: React.CSSProperties['justifyContent']; | ||
} | ||
|
||
const gapClasses: Record<string, string> = { | ||
xs: classes.gapXs, | ||
md: classes.gapMd, | ||
lg: classes.gapLg, | ||
}; | ||
|
||
const wrapClasses: Record<string, string> = { | ||
wrap: classes.wrapWrap, | ||
nowrap: classes.wrapNoWrap, | ||
'wrap-reverse': classes.wrapWrapReverse, | ||
}; | ||
|
||
const directionClasses: Record<string, string> = { | ||
row: classes.directionRow, | ||
column: classes.directionColumn, | ||
'row-reverse': classes.directionRowReverse, | ||
'column-reverse': classes.directionColumnReverse, | ||
}; | ||
|
||
const alignClasses: Record<string, string> = { | ||
'flex-start': classes.alignStart, | ||
center: classes.alignCenter, | ||
'flex-end': classes.alignEnd, | ||
stretch: classes.alignStretch, | ||
}; | ||
|
||
const justifyClasses: Record<string, string> = { | ||
'flex-start': classes.justifyStart, | ||
center: classes.justifyCenter, | ||
'flex-end': classes.justifyEnd, | ||
'space-between': classes.justifySpaceBetween, | ||
'space-around': classes.justifySpaceAround, | ||
'space-evenly': classes.justifySpaceEvenly, | ||
}; | ||
|
||
export const Flex = forwardRef<HTMLDivElement, Props>(function Flex( | ||
{ overflow, gap, wrap, direction, align, justify, className, children, ...rest }, | ||
ref, | ||
) { | ||
return ( | ||
<div | ||
ref={ref} | ||
{...rest} | ||
className={clsx( | ||
classes.flex, | ||
overflow && classes.overflow, | ||
gap && gapClasses[gap], | ||
wrap && wrapClasses[wrap], | ||
direction && directionClasses[direction], | ||
align && alignClasses[align], | ||
justify && justifyClasses[justify], | ||
className, | ||
)} | ||
> | ||
{children} | ||
</div> | ||
); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems like it will be easier to use
s
helper function together withdata-s-*
attribute