From 1da1bc791ad9472ac53ff22b47b9577b78f73cb8 Mon Sep 17 00:00:00 2001
From: Lingfan Gao <lingfangao@hotmail.com>
Date: Mon, 10 Oct 2022 22:54:22 +0200
Subject: [PATCH 1/3] fix: PopoverTriggerChildProps should be exported

---
 .../etc/react-components.api.md               |  3 ++
 .../react-components/src/index.ts             |  1 +
 .../Popover/PopoverCustomTrigger.stories.tsx  | 41 ++++++++-----------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/packages/react-components/react-components/etc/react-components.api.md b/packages/react-components/react-components/etc/react-components.api.md
index d462ae8ac15a99..14ac32054ab629 100644
--- a/packages/react-components/react-components/etc/react-components.api.md
+++ b/packages/react-components/react-components/etc/react-components.api.md
@@ -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';
@@ -1002,6 +1003,8 @@ export { PopoverSurfaceState }
 
 export { PopoverTrigger }
 
+export { PopoverTriggerChildProps }
+
 export { PopoverTriggerProps }
 
 export { PopoverTriggerState }
diff --git a/packages/react-components/react-components/src/index.ts b/packages/react-components/react-components/src/index.ts
index ae1a4eea8ebe0b..610ea5d86e3aaa 100644
--- a/packages/react-components/react-components/src/index.ts
+++ b/packages/react-components/react-components/src/index.ts
@@ -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';
diff --git a/packages/react-components/react-popover/src/stories/Popover/PopoverCustomTrigger.stories.tsx b/packages/react-components/react-popover/src/stories/Popover/PopoverCustomTrigger.stories.tsx
index fe90abaec5471a..455cbaafcf9b38 100644
--- a/packages/react-components/react-popover/src/stories/Popover/PopoverCustomTrigger.stories.tsx
+++ b/packages/react-components/react-popover/src/stories/Popover/PopoverCustomTrigger.stories.tsx
@@ -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',
@@ -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>
   );
 };
 

From b0ca220d1819d941fef321b9c75f1e0d5597ef8d Mon Sep 17 00:00:00 2001
From: Lingfan Gao <lingfangao@hotmail.com>
Date: Mon, 10 Oct 2022 22:55:03 +0200
Subject: [PATCH 2/3] changefile

---
 ...ct-components-81148a7c-403f-4aed-a1a2-9412d2525260.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 change/@fluentui-react-components-81148a7c-403f-4aed-a1a2-9412d2525260.json

diff --git a/change/@fluentui-react-components-81148a7c-403f-4aed-a1a2-9412d2525260.json b/change/@fluentui-react-components-81148a7c-403f-4aed-a1a2-9412d2525260.json
new file mode 100644
index 00000000000000..d3ed1db3404fed
--- /dev/null
+++ b/change/@fluentui-react-components-81148a7c-403f-4aed-a1a2-9412d2525260.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: Export PopoverTriggerChildProps",
+  "packageName": "@fluentui/react-components",
+  "email": "lingfangao@hotmail.com",
+  "dependentChangeType": "patch"
+}

From 74544c768fb3afe2743a460bce46f64e5cc1277d Mon Sep 17 00:00:00 2001
From: ling1726 <lingfangao@hotmail.com>
Date: Wed, 19 Oct 2022 14:41:31 +0200
Subject: [PATCH 3/3] Update
 packages/react-components/react-components/src/index.ts

Co-authored-by: Makoto Morimoto <Humberto.Morimoto@microsoft.com>
---
 packages/react-components/react-components/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-components/react-components/src/index.ts b/packages/react-components/react-components/src/index.ts
index 610ea5d86e3aaa..0c2b4529e77a55 100644
--- a/packages/react-components/react-components/src/index.ts
+++ b/packages/react-components/react-components/src/index.ts
@@ -469,9 +469,9 @@ export type {
   PopoverSurfaceProps,
   PopoverSurfaceSlots,
   PopoverSurfaceState,
+  PopoverTriggerChildProps,
   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';