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

Add support for labelGrid #7027

Merged
merged 12 commits into from
Nov 29, 2021
Merged

Add support for labelGrid #7027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f8856c5
Add support for labelGrid
ivarne Oct 1, 2021
b6920d0
// eslint-disable-next-line react/jsx-no-bind
ivarne Oct 1, 2021
d38c4f3
Merge branch 'eslint-ignore' into labelGrid
ivarne Oct 3, 2021
4679f34
Merge remote-tracking branch 'origin/master' into labelGrid
ivarne Oct 9, 2021
761b1fc
Add underline when labelGrid is in use.
ivarne Oct 9, 2021
e294b2d
Merge branch 'master' into labelGrid
ivarne Oct 19, 2021
11837de
Use jss instead of css styling, and use border-bottom on Grid
ivarne Oct 19, 2021
d67d04f
remove obsolete fragment.
ivarne Oct 19, 2021
7fdd5a6
Merge remote-tracking branch 'origin/master' into labelGrid
ivarne Nov 16, 2021
55188b2
Merge remote-tracking branch 'origin/master' into labelGrid
ivarne Nov 29, 2021
8600cb6
bump frontend version
ivarne Nov 29, 2021
527ce78
Update src/Altinn.Apps/AppFrontend/react/altinn-app-frontend/package.…
lorang92 Nov 29, 2021
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
9 changes: 8 additions & 1 deletion src/Altinn.Apps/AppFrontend/react/altinn-app-frontend/src/components/GenericComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,14 @@ export function GenericComponent(props: IGenericComponentProps) {
alignItems='baseline'
>
{!noLabelComponents.includes(props.type) &&
<Grid item={true} xs={12}>
<Grid
item={true}
xs={props.grid?.labelGrid?.xs || 12}
sm={props.grid?.labelGrid?.sm || false}
md={props.grid?.labelGrid?.md || false}
lg={props.grid?.labelGrid?.lg || false}
xl={props.grid?.labelGrid?.xl || false}
>
<RenderLabelScoped
props={props}
passThroughProps={passThroughProps}
Expand Down
1 change: 1 addition & 0 deletions src/Altinn.Apps/AppFrontend/react/altinn-app-frontend/src/features/form/layout/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export interface IFileuploadProps extends ILayoutComponent {
}

export interface IGrid extends IGridStyling {
labelGrid?: IGridStyling;
innerGrid?: IGridStyling;
}

Expand Down