Skip to content

fix: expose padding prop and adjust z-index for Popover component #263

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

Merged
merged 2 commits into from
Jul 21, 2022
Merged

fix: expose padding prop and adjust z-index for Popover component #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d688a37
style(popover): expose padding prop for Popover component
Jul 21, 2022
38b4870
fix: update zIndex on Popover content container
Jul 21, 2022
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
10 changes: 7 additions & 3 deletions src/components/Popover/Popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ interface PopoverProps {
* Popover content (can be any valid React Element or component containing React Elements)
*/
content: React.ReactNode;
/**
* Popover content padding
*/
padding?: string | number;
/**
* Optional: Specify the Popover content placement (it changes automatically if the Popover content cannot fit inside the viewport with the selected placement)
*/
Expand All @@ -97,6 +101,7 @@ interface PopoverProps {
const Popover: React.FC<PopoverProps> = ({
children,
content = '',
padding = undefined,
placement = 'bottom-start',
offset = 5,
isOpen = false,
Expand Down Expand Up @@ -228,12 +233,11 @@ const Popover: React.FC<PopoverProps> = ({
<PopoverContentContainer
id="popover-content"
ref={setContentReference}
// zIndex temporary until we have Portal component
style={{ ...styles.popper, zIndex: 9999 }}
style={{ ...styles.popper, zIndex: 999 }}
{...attributes.popper}
>
<PopoverContentWrapper ref={popoverContentRef}>
<PopoverContent>{content}</PopoverContent>
<PopoverContent padding={padding}>{content}</PopoverContent>
</PopoverContentWrapper>
</PopoverContentContainer>
)}
Expand Down
16 changes: 12 additions & 4 deletions src/components/Popover/PopoverContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,28 @@ import styled from 'styled-components';
import { Spaces } from '../../essentials';
import { Card } from '../Card/Card';

const DEFAULT_PADDING = Spaces[2];

interface PopoverContentProps {
/**
* Popover content (can be any valid React Element or component)
*/
children: React.ReactNode;
/**
* Popover content padding
*/
padding: string | number;
}

const PopoverContentContainer = styled(Card)`
const PopoverContentContainer = styled(Card)<{ padding: string | number }>`
display: block;
padding: ${Spaces[2]};
padding: ${props => props.padding};
`;

export const PopoverContent = ({ children }: PopoverContentProps): React.ReactElement => (
export const PopoverContent = ({ padding = DEFAULT_PADDING, children }: PopoverContentProps): React.ReactElement => (
<>
<PopoverContentContainer level={200}>{children}</PopoverContentContainer>
<PopoverContentContainer padding={padding} level={200}>
{children}
</PopoverContentContainer>
</>
);
15 changes: 15 additions & 0 deletions src/components/Popover/docs/Popover.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,21 @@ The Popover supports:
```
<br/>

### With No Padding

<ItemWrapper>
<Popover content={'There is no padding...'} padding={0}>
<Button size='small' variant="secondary"><SettingsIcon size={20} style={{marginRight: 5}} /> Manage Booking</Button>
</Popover>
</ItemWrapper>

```jsx
<Popover content={'There is no padding...'} padding={0}>
<Button size='small' variant="secondary"><SettingsIcon size={20} /> Manage Booking</Button>
</Popover>
```
<br/>

## Playground

<Playground>
Expand Down