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

Remove accidental props pass from Layout to Grid #4171

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Remove accidental props pass from Layout to Grid #4171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 19 additions & 14 deletions packages/orbit-components/src/Layout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,25 @@ const getChildrenProps = (type: Type, key: string) => {
return null;
};

const Layout = ({ children, type, dataTest }: Props) => (
<Grid
{...LAYOUT_SETTINGS[type]}
className="px-md de:p-lg mx-auto my-0 box-border w-full py-0"
dataTest={dataTest}
>
{React.Children.map(children as React.ReactElement<LayoutColumnProps>, (item, key) => {
return React.cloneElement(item, {
...getChildrenProps(type, key.toString()),
...item.props,
});
})}
</Grid>
);
const Layout = ({ children, type, dataTest }: Props) => {
// Removes unwanted props from Grid
const { layoutColumns: _, ...props } = LAYOUT_SETTINGS[type];

return (
<Grid
{...props}
className="px-md de:p-lg mx-auto my-0 box-border w-full py-0"
dataTest={dataTest}
>
{React.Children.map(children as React.ReactElement<LayoutColumnProps>, (item, key) => {
return React.cloneElement(item, {
...getChildrenProps(type, key.toString()),
...item.props,
});
})}
</Grid>
);
};

export default Layout;

Expand Down
Loading