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

Jump to bottom

[pull] master from segmentio:master #60

Merged
merged 4 commits into from
Sep 24, 2021
Merged

[pull] master from segmentio:master #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67e1901
types: add `overlayProps` type to `Dialog` (#1313)
GuruM Sep 21, 2021
ca49793
fix 'alignItems' attribute typo (#1321)
ChrisSMendoza Sep 21, 2021
9ee2de1
Fix Dialog containerProps (#1306)
Jupiterrr Sep 21, 2021
0993ac5
Fix typo (#1328)
blakeyoder Sep 22, 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
2 changes: 1 addition & 1 deletion docs/documentation/introduction/getting-started.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { Button, Pane, Text, majorScale } from 'evergreen-ui'
Then, you can use those components in your code like:

```jsx readonly
<Pane display="flex" alginItems="center" marginX={majorScale(2)}>
<Pane display="flex" alignItems="center" marginX={majorScale(2)}>
<Button>Click me!</Button>
<Text>This is a clickable Button</Text>
</Pane>
Expand Down
2 changes: 1 addition & 1 deletion docs/documentation/introduction/theming.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function CustomAppearancesExmaple() {

# Theme Shape

All in all, the shape of the theme object looks as follows. Use this as your baseline disrection for piecing together and building theme objects.
All in all, the shape of the theme object looks as follows. Use this as your baseline direction for piecing together and building theme objects.

```js readonly
export default {
Expand Down
4 changes: 4 additions & 0 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,10 @@ export interface DialogProps {
* Whether or not to prevent scrolling in the outer body. Defaults to false.
*/
preventBodyScrolling?: boolean
/**
* Props that are passed to the Overlay component.
*/
overlayProps?: React.ComponentProps<typeof Pane>
}

export declare const Dialog: React.FC<DialogProps>
Expand Down
2 changes: 1 addition & 1 deletion src/dialog/src/Dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ const Dialog = memo(function Dialog({
)
}

const { className: containerClassName, remainingContainerProps } = containerProps
const { className: containerClassName, ...remainingContainerProps } = containerProps

return (
<Overlay
Expand Down