Skip to content

fix: PopoverTriggerChildProps should be exported #25159

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
ling1726 merged 5 commits into from
Oct 25, 2022
Merged

fix: PopoverTriggerChildProps should be exported #25159

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1da1bc7
fix: PopoverTriggerChildProps should be exported
ling1726 Oct 10, 2022
b0ca220
changefile
ling1726 Oct 10, 2022
74544c7
Update packages/react-components/react-components/src/index.ts
ling1726 Oct 19, 2022
1073701
Merge remote-tracking branch 'origin/master' into docs/popover-custom…
ling1726 Oct 25, 2022
60c5d06
Merge branch 'docs/popover-custom-target' of https://github.com/ling1…
ling1726 Oct 25, 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
7 changes: 7 additions & 0 deletions change/@fluentui-react-components-81148a7c-403f-4aed-a1a2-9412d2525260.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Export PopoverTriggerChildProps",
"packageName": "@fluentui/react-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
3 changes: 3 additions & 0 deletions packages/react-components/react-components/etc/react-components.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ import { PopoverSurfaceProps } from '@fluentui/react-popover';
import { PopoverSurfaceSlots } from '@fluentui/react-popover';
import { PopoverSurfaceState } from '@fluentui/react-popover';
import { PopoverTrigger } from '@fluentui/react-popover';
import { PopoverTriggerChildProps } from '@fluentui/react-popover';
import { PopoverTriggerProps } from '@fluentui/react-popover';
import { PopoverTriggerState } from '@fluentui/react-popover';
import { Portal } from '@fluentui/react-portal';
Expand Down Expand Up @@ -1002,6 +1003,8 @@ export { PopoverSurfaceState }

export { PopoverTrigger }

export { PopoverTriggerChildProps }

export { PopoverTriggerProps }

export { PopoverTriggerState }
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/react-components/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ export type {
PopoverSurfaceState,
PopoverTriggerProps,
PopoverTriggerState,
PopoverTriggerChildProps,
} from '@fluentui/react-popover';
export { Portal, usePortal_unstable, renderPortal_unstable } from '@fluentui/react-portal';
export type { PortalProps, PortalState } from '@fluentui/react-portal';
Expand Down
41 changes: 18 additions & 23 deletions packages/react-components/react-popover/src/stories/Popover/PopoverCustomTrigger.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { makeStyles, Button, Popover, PopoverSurface } from '@fluentui/react-components';
import type { PopoverProps } from '@fluentui/react-components';
import { makeStyles, Button, Popover, PopoverSurface, PopoverTrigger } from '@fluentui/react-components';
import type { PopoverTriggerChildProps } from '@fluentui/react-components';
const useStyles = makeStyles({
contentHeader: {
marginTop: '0',
Expand All @@ -18,29 +18,24 @@ const ExampleContent = () => {
);
};

export const CustomTrigger = () => {
const [open, setOpen] = React.useState(false);
const [target, setTarget] = React.useState<HTMLElement | null>(null);

const onClick = () => setOpen(s => !s);
const onOpenChange: PopoverProps['onOpenChange'] = (e, data) => {
// handle custom trigger interactions separately
if (e.target !== target) {
setOpen(data.open);
}
};
const CustomPopoverTrigger = React.forwardRef<HTMLButtonElement, Partial<PopoverTriggerChildProps>>((props, ref) => {
return (
<Button {...props} ref={ref}>
Custom Trigger
</Button>
);
});

export const CustomTrigger = () => {
return (
<>
<Button aria-expanded={`${open}`} ref={setTarget} onClick={onClick}>
Custom trigger
</Button>
<Popover positioning={{ target }} open={open} onOpenChange={onOpenChange}>
<PopoverSurface>
<ExampleContent />
</PopoverSurface>
</Popover>
</>
<Popover>
<PopoverTrigger>
<CustomPopoverTrigger />
</PopoverTrigger>
<PopoverSurface>
<ExampleContent />
</PopoverSurface>
</Popover>
);
};

Expand Down