Skip to content

feat: Add OverlayPositioner interface + DefaultOverlayPositioner & AnchorOverlayPositioner #5

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

Open
nwidynski wants to merge 1 commit into
base: feat-box-layout
Choose a base branch
from
Open

feat: Add OverlayPositioner interface + DefaultOverlayPositioner & AnchorOverlayPositioner #5

Show file tree
Hide file tree
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
170 changes: 130 additions & 40 deletions packages/react-aria-components/stories/Popover.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@
* governing permissions and limitations under the License.
*/

import {AnchorOverlayPositioner, DefaultOverlayPositioner} from 'react-aria/useOverlayPosition';
import {Button} from '../src/Button';

import {Dialog, DialogTrigger} from '../src/Dialog';
import {Heading} from '../src/Heading';
import {Meta, StoryFn, StoryObj} from '@storybook/react';
import {OverlayArrow} from '../src/OverlayArrow';
import {Popover} from '../src/Popover';
import React, {JSX, useEffect, useRef, useState} from 'react';
import {Popover, PopoverProps} from '../src/Popover';
import React, {JSX, ReactNode, useEffect, useRef, useState} from 'react';
import styles from './styles.css';
import {UNSAFE_PortalProvider} from 'react-aria/PortalProvider';

export default {
title: 'React Aria Components/Popover',
Expand Down Expand Up @@ -64,45 +66,56 @@ export default {

export type PopoverStory = StoryFn<typeof Popover>;

export const PopoverExample: PopoverStory = args => (
<DialogTrigger>
<Button>Open popover</Button>
<Popover
{...args}
className={`${styles['popover-base']} ${styles[(args as any).animation]}`}
style={{
background: 'Canvas',
color: 'CanvasText',
border: '1px solid gray',
padding: 30,
zIndex: 5
}}>
{!(args as any).hideArrow && (
<OverlayArrow style={{display: 'flex'}}>
<svg width="12" height="12" viewBox="0 0 12 12" style={{display: 'block'}}>
<path d="M0 0L6 6L12 0" fill="white" strokeWidth={1} stroke="gray" />
</svg>
</OverlayArrow>
)}
<Dialog>
{({close}) => (
<form style={{display: 'flex', flexDirection: 'column'}}>
<Heading slot="title">Sign up</Heading>
<label>
First Name: <input placeholder="John" />
</label>
<label>
Last Name: <input placeholder="Smith" />
</label>
<Button onPress={close} style={{marginTop: 10}}>
Submit
</Button>
</form>
interface PopoverExampleProps extends PopoverProps {
animation?: 'transition' | 'animation' | 'animation-delayed';
hideArrow?: boolean;
}

function PopoverExampleRender(args: PopoverExampleProps): JSX.Element {
return (
<DialogTrigger>
<Button>Open popover</Button>
<Popover
{...args}
className={`${styles['popover-base']} ${styles[args.animation!]}`}
style={{
background: 'Canvas',
color: 'CanvasText',
border: '1px solid gray',
padding: 30,
zIndex: 5
}}>
{!args.hideArrow && (
<OverlayArrow style={{display: 'flex'}}>
<svg width="12" height="12" viewBox="0 0 12 12" style={{display: 'block'}}>
<path d="M0 0L6 6L12 0" fill="white" strokeWidth={1} stroke="gray" />
</svg>
</OverlayArrow>
)}
</Dialog>
</Popover>
</DialogTrigger>
);
<Dialog>
{({close}) => (
<form style={{display: 'flex', flexDirection: 'column'}}>
<Heading slot="title">Sign up</Heading>
<label>
First Name: <input placeholder="John" />
</label>
<label>
Last Name: <input placeholder="Smith" />
</label>
<Button onPress={close} style={{marginTop: 10}}>
Submit
</Button>
</form>
)}
</Dialog>
</Popover>
</DialogTrigger>
);
}

export const PopoverExample: StoryObj<typeof PopoverExampleRender> = {
render: args => <PopoverExampleRender {...args} />
};

const COUNTDOWN = 5000;

Expand Down Expand Up @@ -609,3 +622,80 @@ export const ScrollingBoundaryContainer: StoryObj<typeof ScrollingBoundaryContai
}
}
};

const DEFAULT_POSITIONER = new DefaultOverlayPositioner();
const ANCHOR_POSITIONER = new AnchorOverlayPositioner();

interface PositionerContainerProps {
children: (container: HTMLDivElement) => ReactNode;
}

function PositionerContainer(props: PositionerContainerProps): JSX.Element {
let [container, setContainer] = useState<HTMLDivElement | null>(null);

return (
<div
ref={setContainer}
style={{
position: 'relative',
contain: 'layout',
resize: 'both',
overflow: 'hidden',
boxSizing: 'border-box',
width: 640,
height: 560,
minWidth: 200,
minHeight: 200,
paddingTop: 240,
paddingLeft: 240,
border: '1px dashed gray'
}}>
{container && props.children(container)}
</div>
);
}

export const DefaultPositionerExample: StoryObj<typeof Popover> = {
render: args => (
<PositionerContainer>
{container => (
<PopoverExampleRender
{...args}
positioner={DEFAULT_POSITIONER}
boundaryElement={container}
shouldCloseOnInteractOutside={element => element !== container}
/>
)}
</PositionerContainer>
),
args: {
placement: 'bottom'
},
argTypes: {
positioner: {table: {disable: true}}
}
};

export const AnchorPositionerExample: StoryObj<typeof Popover> = {
render: args => (
<PositionerContainer>
{container => (
<UNSAFE_PortalProvider getContainer={() => container}>
<PopoverExampleRender
{...args}
positioner={ANCHOR_POSITIONER}
boundaryElement={container}
shouldCloseOnInteractOutside={element => element !== container}
/>
</UNSAFE_PortalProvider>
)}
</PositionerContainer>
),
args: {
placement: 'bottom'
},
argTypes: {
crossOffset: {table: {disable: true}},
positioner: {table: {disable: true}}
}
};
6 changes: 5 additions & 1 deletion packages/react-aria/exports/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ export {Overlay} from '../src/overlays/Overlay';
export {useModalOverlay} from '../src/overlays/useModalOverlay';
export {useOverlay} from '../src/overlays/useOverlay';
export {useOverlayPosition} from '../src/overlays/useOverlayPosition';
export {DefaultOverlayPositioner} from '../src/overlays/DefaultOverlayPositioner';
export {AnchorOverlayPositioner} from '../src/overlays/AnchorOverlayPositioner';
export {useOverlayTrigger} from '../src/overlays/useOverlayTrigger';
export {usePopover} from '../src/overlays/usePopover';
export {usePreventScroll} from '../src/overlays/usePreventScroll';
Expand Down Expand Up @@ -422,7 +424,9 @@ export type {
PlacementAxis,
PositionProps,
Axis,
SizeAxis
SizeAxis,
OverlayPositioner,
SubscribeOpts
} from '../src/overlays/useOverlayPosition';
export type {DismissButtonProps} from '../src/overlays/DismissButton';
export type {OverlayProps} from '../src/overlays/Overlay';
Expand Down
6 changes: 5 additions & 1 deletion packages/react-aria/exports/useOverlayPosition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,9 @@ export {
useOverlayPosition,
type PositionAria,
type Axis,
type SizeAxis
type SizeAxis,
type OverlayPositioner,
type SubscribeOpts
} from '../src/overlays/useOverlayPosition';
export {DefaultOverlayPositioner} from '../src/overlays/DefaultOverlayPositioner';
export {AnchorOverlayPositioner} from '../src/overlays/AnchorOverlayPositioner';
Loading
Loading