Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
16 changes: 9 additions & 7 deletions site/src/components/Margins/Margins.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { makeStyles } from "@material-ui/core/styles"
import { FC } from "react"
import { combineClasses } from "utils/combineClasses"
import {
containerWidth,
containerWidthMedium,
Expand All @@ -24,14 +25,15 @@ const useStyles = makeStyles(() => ({
},
}))

interface MarginsProps {
size?: Size
}

export const Margins: FC<React.PropsWithChildren<MarginsProps>> = ({
children,
export const Margins: FC<JSX.IntrinsicElements["div"] & { size?: Size }> = ({
size = "regular",
...divProps
}) => {
const styles = useStyles({ maxWidth: widthBySize[size] })
return <div className={styles.margins}>{children}</div>
return (
<div
{...divProps}
className={combineClasses([styles.margins, divProps.className])}
/>
)
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import { ComponentMeta, Story } from "@storybook/react"
import { Story } from "@storybook/react"
import { RuntimeErrorState, RuntimeErrorStateProps } from "./RuntimeErrorState"

const error = new Error("An error occurred")

export default {
title: "components/RuntimeErrorState",
component: RuntimeErrorState,
argTypes: {
error: {
defaultValue: error,
},
args: {
error,
},
} as ComponentMeta<typeof RuntimeErrorState>
}

const Template: Story<RuntimeErrorStateProps> = (args) => (
<RuntimeErrorState {...args} />
Expand Down

This file was deleted.

Loading