@fluentui/react-popover 0.0.0-nightlya21bfaceec20220202.1 → 0.0.0-nightlyb2b3ec1da320220209.1

package/CHANGELOG.json

@@ -2,15 +2,15 @@
   "name": "@fluentui/react-popover",
   "entries": [
     {
-      "date": "Wed, 02 Feb 2022 04:13:27 GMT",
-      "tag": "@fluentui/react-popover_v0.0.0-nightlya21bfaceec20220202.1",
-      "version": "0.0.0-nightlya21bfaceec20220202.1",
+      "date": "Wed, 09 Feb 2022 04:13:01 GMT",
+      "tag": "@fluentui/react-popover_v0.0.0-nightlyb2b3ec1da320220209.1",
+      "version": "0.0.0-nightlyb2b3ec1da320220209.1",
       "comments": {
         "prerelease": [
           {
             "author": "email not defined",
             "package": "@fluentui/react-popover",
-            "commit": "e975312642c322c9f393ec8345ead680d9df154a",
+            "commit": "066f84c7bef7f4df47448557396199d8b7f26480",
             "comment": "Release nightly v9"
           },
           {
@@ -31,6 +31,12 @@
             "commit": "09804275c7f346db54c33d4ff347bffc33676014",
             "comment": "Fix Popover arrow border in high contrast"
           },
+          {
+            "author": "behowell@microsoft.com",
+            "package": "@fluentui/react-popover",
+            "commit": "53b01d71e335715fda91b33e3d7bbd9d471d5ed3",
+            "comment": "Refactor component Slot typings"
+          },
           {
             "author": "lingfangao@hotmail.com",
             "package": "@fluentui/react-popover",
@@ -49,6 +55,12 @@
             "commit": "b1446dead62e61c9a0f6101d6dfc5a2f780403b8",
             "comment": "use Griffel packages"
           },
+          {
+            "author": "olfedias@microsoft.com",
+            "package": "@fluentui/react-popover",
+            "commit": "aa6cfd8ac825b5a280206808101de549a91094fc",
+            "comment": "standardize trigger implementation & cloning"
+          },
           {
             "author": "olfedias@microsoft.com",
             "package": "@fluentui/react-popover",
@@ -76,44 +88,44 @@
           {
             "author": "beachball",
             "package": "@fluentui/react-popover",
-            "comment": "Bump @fluentui/react-context-selector to v0.0.0-nightlya21bfaceec20220202.1",
-            "commit": "e975312642c322c9f393ec8345ead680d9df154a"
+            "comment": "Bump @fluentui/react-context-selector to v0.0.0-nightlyb2b3ec1da320220209.1",
+            "commit": "066f84c7bef7f4df47448557396199d8b7f26480"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-popover",
-            "comment": "Bump @fluentui/react-portal to v0.0.0-nightlya21bfaceec20220202.1",
-            "commit": "e975312642c322c9f393ec8345ead680d9df154a"
+            "comment": "Bump @fluentui/react-portal to v0.0.0-nightlyb2b3ec1da320220209.1",
+            "commit": "066f84c7bef7f4df47448557396199d8b7f26480"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-popover",
-            "comment": "Bump @fluentui/react-positioning to v0.0.0-nightlya21bfaceec20220202.1",
-            "commit": "e975312642c322c9f393ec8345ead680d9df154a"
+            "comment": "Bump @fluentui/react-positioning to v0.0.0-nightlyb2b3ec1da320220209.1",
+            "commit": "066f84c7bef7f4df47448557396199d8b7f26480"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-popover",
-            "comment": "Bump @fluentui/react-shared-contexts to v0.0.0-nightlya21bfaceec20220202.1",
-            "commit": "e975312642c322c9f393ec8345ead680d9df154a"
+            "comment": "Bump @fluentui/react-shared-contexts to v0.0.0-nightlyb2b3ec1da320220209.1",
+            "commit": "066f84c7bef7f4df47448557396199d8b7f26480"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-popover",
-            "comment": "Bump @fluentui/react-tabster to v0.0.0-nightlya21bfaceec20220202.1",
-            "commit": "e975312642c322c9f393ec8345ead680d9df154a"
+            "comment": "Bump @fluentui/react-tabster to v0.0.0-nightlyb2b3ec1da320220209.1",
+            "commit": "066f84c7bef7f4df47448557396199d8b7f26480"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-popover",
-            "comment": "Bump @fluentui/react-utilities to v0.0.0-nightlya21bfaceec20220202.1",
-            "commit": "e975312642c322c9f393ec8345ead680d9df154a"
+            "comment": "Bump @fluentui/react-utilities to v0.0.0-nightlyb2b3ec1da320220209.1",
+            "commit": "066f84c7bef7f4df47448557396199d8b7f26480"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-popover",
-            "comment": "Bump @fluentui/react-conformance-griffel to v0.0.0-nightlya21bfaceec20220202.1",
-            "commit": "e975312642c322c9f393ec8345ead680d9df154a"
+            "comment": "Bump @fluentui/react-conformance-griffel to v0.0.0-nightlyb2b3ec1da320220209.1",
+            "commit": "066f84c7bef7f4df47448557396199d8b7f26480"
           }
         ],
         "none": [

package/CHANGELOG.md

@@ -1,34 +1,36 @@
 # Change Log - @fluentui/react-popover
 
-This log was last generated on Wed, 02 Feb 2022 04:13:27 GMT and should not be manually modified.
+This log was last generated on Wed, 09 Feb 2022 04:13:01 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## [0.0.0-nightlya21bfaceec20220202.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-popover_v0.0.0-nightlya21bfaceec20220202.1)
+## [0.0.0-nightlyb2b3ec1da320220209.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-popover_v0.0.0-nightlyb2b3ec1da320220209.1)
 
-Wed, 02 Feb 2022 04:13:27 GMT 
-[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-popover_v9.0.0-beta.5..@fluentui/react-popover_v0.0.0-nightlya21bfaceec20220202.1)
+Wed, 09 Feb 2022 04:13:01 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-popover_v9.0.0-beta.5..@fluentui/react-popover_v0.0.0-nightlyb2b3ec1da320220209.1)
 
 ### Changes
 
-- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/e975312642c322c9f393ec8345ead680d9df154a) by email not defined)
+- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/066f84c7bef7f4df47448557396199d8b7f26480) by email not defined)
 - Replacing use of functions in makeStyles with direct use of tokens ([PR #21049](https://github.com/microsoft/fluentui/pull/21049) by Humberto.Morimoto@microsoft.com)
 - Remove component's shorthandProps array ([PR #21134](https://github.com/microsoft/fluentui/pull/21134) by behowell@microsoft.com)
 - Fix Popover arrow border in high contrast ([PR #21086](https://github.com/microsoft/fluentui/pull/21086) by behowell@microsoft.com)
+- Refactor component Slot typings ([PR #21518](https://github.com/microsoft/fluentui/pull/21518) by behowell@microsoft.com)
 - fix: Set `aria-modal` on Popover if focus trap is enabled ([PR #21387](https://github.com/microsoft/fluentui/pull/21387) by lingfangao@hotmail.com)
 - Updating based on removal of functions from makeStyles. ([PR #21239](https://github.com/microsoft/fluentui/pull/21239) by Humberto.Morimoto@microsoft.com)
 - use Griffel packages ([PR #21392](https://github.com/microsoft/fluentui/pull/21392) by olfedias@microsoft.com)
+- standardize trigger implementation & cloning ([PR #21609](https://github.com/microsoft/fluentui/pull/21609) by olfedias@microsoft.com)
 - update styles to not use CSS shorthands ([PR #20796](https://github.com/microsoft/fluentui/pull/20796) by olfedias@microsoft.com)
 - fix: Use role=complementary for Popovers without focus traps ([PR #21416](https://github.com/microsoft/fluentui/pull/21416) by lingfangao@hotmail.com)
 - BREAKING: Rename component hooks add the suffix _unstable, as their API has not been finalized yet ([PR #21365](https://github.com/microsoft/fluentui/pull/21365) by behowell@microsoft.com)
 - Updating based on changes to composition types. ([PR #20891](https://github.com/microsoft/fluentui/pull/20891) by Humberto.Morimoto@microsoft.com)
-- Bump @fluentui/react-context-selector to v0.0.0-nightlya21bfaceec20220202.1 ([commit](https://github.com/microsoft/fluentui/commit/e975312642c322c9f393ec8345ead680d9df154a) by beachball)
-- Bump @fluentui/react-portal to v0.0.0-nightlya21bfaceec20220202.1 ([commit](https://github.com/microsoft/fluentui/commit/e975312642c322c9f393ec8345ead680d9df154a) by beachball)
-- Bump @fluentui/react-positioning to v0.0.0-nightlya21bfaceec20220202.1 ([commit](https://github.com/microsoft/fluentui/commit/e975312642c322c9f393ec8345ead680d9df154a) by beachball)
-- Bump @fluentui/react-shared-contexts to v0.0.0-nightlya21bfaceec20220202.1 ([commit](https://github.com/microsoft/fluentui/commit/e975312642c322c9f393ec8345ead680d9df154a) by beachball)
-- Bump @fluentui/react-tabster to v0.0.0-nightlya21bfaceec20220202.1 ([commit](https://github.com/microsoft/fluentui/commit/e975312642c322c9f393ec8345ead680d9df154a) by beachball)
-- Bump @fluentui/react-utilities to v0.0.0-nightlya21bfaceec20220202.1 ([commit](https://github.com/microsoft/fluentui/commit/e975312642c322c9f393ec8345ead680d9df154a) by beachball)
-- Bump @fluentui/react-conformance-griffel to v0.0.0-nightlya21bfaceec20220202.1 ([commit](https://github.com/microsoft/fluentui/commit/e975312642c322c9f393ec8345ead680d9df154a) by beachball)
+- Bump @fluentui/react-context-selector to v0.0.0-nightlyb2b3ec1da320220209.1 ([commit](https://github.com/microsoft/fluentui/commit/066f84c7bef7f4df47448557396199d8b7f26480) by beachball)
+- Bump @fluentui/react-portal to v0.0.0-nightlyb2b3ec1da320220209.1 ([commit](https://github.com/microsoft/fluentui/commit/066f84c7bef7f4df47448557396199d8b7f26480) by beachball)
+- Bump @fluentui/react-positioning to v0.0.0-nightlyb2b3ec1da320220209.1 ([commit](https://github.com/microsoft/fluentui/commit/066f84c7bef7f4df47448557396199d8b7f26480) by beachball)
+- Bump @fluentui/react-shared-contexts to v0.0.0-nightlyb2b3ec1da320220209.1 ([commit](https://github.com/microsoft/fluentui/commit/066f84c7bef7f4df47448557396199d8b7f26480) by beachball)
+- Bump @fluentui/react-tabster to v0.0.0-nightlyb2b3ec1da320220209.1 ([commit](https://github.com/microsoft/fluentui/commit/066f84c7bef7f4df47448557396199d8b7f26480) by beachball)
+- Bump @fluentui/react-utilities to v0.0.0-nightlyb2b3ec1da320220209.1 ([commit](https://github.com/microsoft/fluentui/commit/066f84c7bef7f4df47448557396199d8b7f26480) by beachball)
+- Bump @fluentui/react-conformance-griffel to v0.0.0-nightlyb2b3ec1da320220209.1 ([commit](https://github.com/microsoft/fluentui/commit/066f84c7bef7f4df47448557396199d8b7f26480) by beachball)
 
 ## [9.0.0-beta.5](https://github.com/microsoft/fluentui/tree/@fluentui/react-popover_v9.0.0-beta.5)
 

package/dist/react-popover.d.ts

@@ -2,12 +2,15 @@ import type { ComponentProps } from '@fluentui/react-utilities';
 import type { ComponentState } from '@fluentui/react-utilities';
 import type { Context } from '@fluentui/react-context-selector';
 import type { ContextSelector } from '@fluentui/react-context-selector';
+import type { FluentTriggerComponent } from '@fluentui/react-utilities';
 import type { ForwardRefComponent } from '@fluentui/react-utilities';
-import type { IntrinsicSlotProps } from '@fluentui/react-utilities';
+import { JSXElementConstructor } from 'react';
 import type { PopperVirtualElement } from '@fluentui/react-positioning';
 import type { PortalProps } from '@fluentui/react-portal';
 import type { PositioningShorthand } from '@fluentui/react-positioning';
 import * as React_2 from 'react';
+import { ReactElement } from 'react';
+import type { Slot } from '@fluentui/react-utilities';
 import type { usePopperMouseTarget } from '@fluentui/react-positioning';
 
 export declare const arrowHeights: Record<PopoverSize, number>;
@@ -145,7 +148,7 @@ export declare type PopoverSurfaceProps = ComponentProps<PopoverSurfaceSlots>;
  * Names of the slots in PopoverSurfaceProps
  */
 export declare type PopoverSurfaceSlots = {
-    root: IntrinsicSlotProps<'div'>;
+    root: Slot<'div'>;
 };
 
 /**
@@ -161,19 +164,27 @@ export declare type PopoverSurfaceState = ComponentState<PopoverSurfaceSlots> &
 /**
  * Wraps a trigger element as an only child and adds the necessary event handling to open a popover.
  */
-export declare const PopoverTrigger: React_2.FC<PopoverTriggerProps>;
+export declare const PopoverTrigger: React_2.FC<PopoverTriggerProps> & FluentTriggerComponent;
+
+export declare type PopoverTriggerChildProps = {
+    ref?: React_2.Ref<never>;
+} & Pick<React_2.HTMLAttributes<HTMLElement>, 'aria-haspopup' | 'onClick' | 'onMouseEnter' | 'onKeyDown' | 'onMouseLeave' | 'onContextMenu'>;
 
 /**
  * PopoverTrigger Props
  */
 export declare type PopoverTriggerProps = {
-    children: React_2.ReactElement;
+    children: (React_2.ReactElement & {
+        ref?: React_2.Ref<unknown>;
+    }) | ((props: PopoverTriggerChildProps) => React_2.ReactElement | null);
 };
 
 /**
  * PopoverTrigger State
  */
-export declare type PopoverTriggerState = PopoverTriggerProps;
+export declare type PopoverTriggerState = {
+    children: React_2.ReactElement | null;
+};
 
 /**
  * Render the final JSX of Popover
@@ -188,7 +199,7 @@ export declare const renderPopoverSurface_unstable: (state: PopoverSurfaceState)
 /**
  * Render the final JSX of PopoverTrigger
  */
-export declare const renderPopoverTrigger_unstable: (state: PopoverTriggerState) => JSX.Element;
+export declare const renderPopoverTrigger_unstable: (state: PopoverTriggerState) => ReactElement<any, string | JSXElementConstructor<any>> | null;
 
 /**
  * Create the state required to render Popover.

package/lib/components/PopoverSurface/PopoverSurface.types.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentProps, ComponentState, IntrinsicSlotProps } from '@fluentui/react-utilities';
+import type { ComponentProps, ComponentState, Slot } from '@fluentui/react-utilities';
 import type { PopoverContextValue } from '../../popoverContext';
 /**
  * PopoverSurface Props
@@ -8,7 +8,7 @@ export declare type PopoverSurfaceProps = ComponentProps<PopoverSurfaceSlots>;
  * Names of the slots in PopoverSurfaceProps
  */
 export declare type PopoverSurfaceSlots = {
-    root: IntrinsicSlotProps<'div'>;
+    root: Slot<'div'>;
 };
 /**
  * PopoverSurface State

package/lib/components/PopoverTrigger/PopoverTrigger.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
+import type { FluentTriggerComponent } from '@fluentui/react-utilities';
 import type { PopoverTriggerProps } from './PopoverTrigger.types';
 /**
  * Wraps a trigger element as an only child and adds the necessary event handling to open a popover.
  */
-export declare const PopoverTrigger: React.FC<PopoverTriggerProps>;
+export declare const PopoverTrigger: React.FC<PopoverTriggerProps> & FluentTriggerComponent;

package/lib/components/PopoverTrigger/PopoverTrigger.js

@@ -9,4 +9,5 @@ export const PopoverTrigger = props => {
   return renderPopoverTrigger_unstable(state);
 };
 PopoverTrigger.displayName = 'PopoverTrigger';
+PopoverTrigger.isFluentTriggerComponent = true;
 //# sourceMappingURL=PopoverTrigger.js.map

package/lib/components/PopoverTrigger/PopoverTrigger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/PopoverTrigger/PopoverTrigger.tsx"],"names":[],"mappings":"AACA,SAAS,0BAAT,QAA2C,qBAA3C;AACA,SAAS,6BAAT,QAA8C,wBAA9C;AAGA;;AAEG;;AACH,OAAO,MAAM,cAAc,GAAkC,KAAK,IAAG;AACnE,QAAM,KAAK,GAAG,0BAA0B,CAAC,KAAD,CAAxC;AAEA,SAAO,6BAA6B,CAAC,KAAD,CAApC;AACD,CAJM;AAMP,cAAc,CAAC,WAAf,GAA6B,gBAA7B","sourceRoot":""}
+{"version":3,"sources":["../../../src/components/PopoverTrigger/PopoverTrigger.tsx"],"names":[],"mappings":"AACA,SAAS,0BAAT,QAA2C,qBAA3C;AACA,SAAS,6BAAT,QAA8C,wBAA9C;AAIA;;AAEG;;AACH,OAAO,MAAM,cAAc,GAA2D,KAAK,IAAG;AAC5F,QAAM,KAAK,GAAG,0BAA0B,CAAC,KAAD,CAAxC;AAEA,SAAO,6BAA6B,CAAC,KAAD,CAApC;AACD,CAJM;AAMP,cAAc,CAAC,WAAf,GAA6B,gBAA7B;AACA,cAAc,CAAC,wBAAf,GAA0C,IAA1C","sourceRoot":""}

package/lib/components/PopoverTrigger/PopoverTrigger.types.d.ts

@@ -3,9 +3,16 @@ import * as React from 'react';
  * PopoverTrigger Props
  */
 export declare type PopoverTriggerProps = {
-    children: React.ReactElement;
+    children: (React.ReactElement & {
+        ref?: React.Ref<unknown>;
+    }) | ((props: PopoverTriggerChildProps) => React.ReactElement | null);
 };
 /**
  * PopoverTrigger State
  */
-export declare type PopoverTriggerState = PopoverTriggerProps;
+export declare type PopoverTriggerState = {
+    children: React.ReactElement | null;
+};
+export declare type PopoverTriggerChildProps = {
+    ref?: React.Ref<never>;
+} & Pick<React.HTMLAttributes<HTMLElement>, 'aria-haspopup' | 'onClick' | 'onMouseEnter' | 'onKeyDown' | 'onMouseLeave' | 'onContextMenu'>;

package/lib/components/PopoverTrigger/renderPopoverTrigger.d.ts

@@ -2,4 +2,4 @@ import type { PopoverTriggerState } from './PopoverTrigger.types';
 /**
  * Render the final JSX of PopoverTrigger
  */
-export declare const renderPopoverTrigger_unstable: (state: PopoverTriggerState) => JSX.Element;
+export declare const renderPopoverTrigger_unstable: (state: PopoverTriggerState) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | null;

package/lib/components/PopoverTrigger/renderPopoverTrigger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/PopoverTrigger/renderPopoverTrigger.tsx"],"names":[],"mappings":"AAEA;;AAEG;AACH,OAAO,MAAM,6BAA6B,GAAI,KAAD,IAA4C;AACvF,SAAO,KAAK,CAAC,QAAb;AACD,CAFM","sourceRoot":""}
+{"version":3,"sources":["../../../src/components/PopoverTrigger/renderPopoverTrigger.tsx"],"names":[],"mappings":"AAEA;;AAEG;AACH,OAAO,MAAM,6BAA6B,GAAI,KAAD,IAA+B;AAC1E,SAAO,KAAK,CAAC,QAAb;AACD,CAFM","sourceRoot":""}

package/lib/components/PopoverTrigger/usePopoverTrigger.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useMergedRefs, useEventCallback, shouldPreventDefaultOnKeyDown } from '@fluentui/react-utilities';
+import { applyTriggerPropsToChildren, getTriggerChild, shouldPreventDefaultOnKeyDown, useMergedRefs, useMergedEventCallbacks, useEventCallback } from '@fluentui/react-utilities';
 import { useModalAttributes } from '@fluentui/react-tabster';
 import { usePopoverContext_unstable } from '../../popoverContext';
 /**
@@ -12,6 +12,12 @@ import { usePopoverContext_unstable } from '../../popoverContext';
  */
 
 export const usePopoverTrigger_unstable = props => {
+  var _a, _b, _c, _d, _e;
+
+  const {
+    children
+  } = props;
+  const child = /*#__PURE__*/React.isValidElement(children) ? getTriggerChild(children) : undefined;
   const setOpen = usePopoverContext_unstable(context => context.setOpen);
   const open = usePopoverContext_unstable(context => context.open);
   const triggerRef = usePopoverContext_unstable(context => context.triggerRef);
@@ -21,27 +27,22 @@ export const usePopoverTrigger_unstable = props => {
   const {
     triggerAttributes
   } = useModalAttributes();
-  const onContextMenu = useEventCallback(e => {
-    var _a, _b;
 
+  const onContextMenu = e => {
     if (openOnContext) {
       e.preventDefault();
       setOpen(e, true);
     }
+  };
 
-    (_b = (_a = child.props) === null || _a === void 0 ? void 0 : _a.onContextMenu) === null || _b === void 0 ? void 0 : _b.call(_a, e);
-  });
-  const onClick = useEventCallback(e => {
-    var _a, _b;
-
+  const onClick = e => {
     if (!openOnContext) {
       setOpen(e, !open);
     }
+  };
 
-    (_b = (_a = child.props) === null || _a === void 0 ? void 0 : _a.onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
-  });
-  const onKeyDown = useEventCallback(e => {
-    var _a, _b, _c;
+  const onKeyDown = e => {
+    var _a;
 
     if (shouldPreventDefaultOnKeyDown(e) && (e.key === ' ' || e.key === 'Enter')) {
       e.preventDefault();
@@ -51,38 +52,30 @@ export const usePopoverTrigger_unstable = props => {
     if (e.key === 'Escape') {
       setOpen(e, false);
     }
+  };
 
-    (_c = (_b = child.props) === null || _b === void 0 ? void 0 : _b.onKeyDown) === null || _c === void 0 ? void 0 : _c.call(_b, e);
-  });
   const onMouseEnter = useEventCallback(e => {
-    var _a, _b;
-
     if (openOnHover) {
       setOpen(e, true);
     }
-
-    (_b = (_a = child.props) === null || _a === void 0 ? void 0 : _a.onMouseEnter) === null || _b === void 0 ? void 0 : _b.call(_a, e);
   });
-  const onMouseLeave = useEventCallback(e => {
-    var _a, _b;
 
+  const onMouseLeave = e => {
     if (openOnHover) {
       setOpen(e, false);
     }
+  };
 
-    (_b = (_a = child.props) === null || _a === void 0 ? void 0 : _a.onMouseLeave) === null || _b === void 0 ? void 0 : _b.call(_a, e);
-  });
-  const child = React.Children.only(props.children);
   return {
-    children: /*#__PURE__*/React.cloneElement(child, { ...triggerAttributes,
+    children: applyTriggerPropsToChildren(props.children, { ...triggerAttributes,
       'aria-haspopup': trapFocus ? 'dialog' : 'true',
-      ...child.props,
-      onClick,
-      onMouseEnter,
-      onKeyDown,
-      onMouseLeave,
-      onContextMenu,
-      ref: useMergedRefs(child.ref, triggerRef)
+      ...(child === null || child === void 0 ? void 0 : child.props),
+      onClick: useMergedEventCallbacks((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.onClick, onClick),
+      onMouseEnter: useMergedEventCallbacks((_b = child === null || child === void 0 ? void 0 : child.props) === null || _b === void 0 ? void 0 : _b.onMouseEnter, onMouseEnter),
+      onKeyDown: useMergedEventCallbacks((_c = child === null || child === void 0 ? void 0 : child.props) === null || _c === void 0 ? void 0 : _c.onKeyDown, onKeyDown),
+      onMouseLeave: useMergedEventCallbacks((_d = child === null || child === void 0 ? void 0 : child.props) === null || _d === void 0 ? void 0 : _d.onMouseLeave, onMouseLeave),
+      onContextMenu: useMergedEventCallbacks((_e = child === null || child === void 0 ? void 0 : child.props) === null || _e === void 0 ? void 0 : _e.onContextMenu, onContextMenu),
+      ref: useMergedRefs(triggerRef, child === null || child === void 0 ? void 0 : child.ref)
     })
   };
 };

package/lib/components/PopoverTrigger/usePopoverTrigger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/PopoverTrigger/usePopoverTrigger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAZ,MAAuB,OAAvB;AACA,SAAS,aAAT,EAAwB,gBAAxB,EAA0C,6BAA1C,QAA+E,2BAA/E;AACA,SAAS,kBAAT,QAAmC,yBAAnC;AACA,SAAS,0BAAT,QAA2C,sBAA3C;AAGA;;;;;;;AAOG;;AACH,OAAO,MAAM,0BAA0B,GAAI,KAAD,IAAoD;AAC5F,QAAM,OAAO,GAAG,0BAA0B,CAAC,OAAO,IAAI,OAAO,CAAC,OAApB,CAA1C;AACA,QAAM,IAAI,GAAG,0BAA0B,CAAC,OAAO,IAAI,OAAO,CAAC,IAApB,CAAvC;AACA,QAAM,UAAU,GAAG,0BAA0B,CAAC,OAAO,IAAI,OAAO,CAAC,UAApB,CAA7C;AACA,QAAM,WAAW,GAAG,0BAA0B,CAAC,OAAO,IAAI,OAAO,CAAC,WAApB,CAA9C;AACA,QAAM,aAAa,GAAG,0BAA0B,CAAC,OAAO,IAAI,OAAO,CAAC,aAApB,CAAhD;AACA,QAAM,SAAS,GAAG,0BAA0B,CAAC,OAAO,IAAI,OAAO,CAAC,SAApB,CAA5C;AACA,QAAM;AAAE,IAAA;AAAF,MAAwB,kBAAkB,EAAhD;AAEA,QAAM,aAAa,GAAG,gBAAgB,CAAE,CAAD,IAAqC;;;AAC1E,QAAI,aAAJ,EAAmB;AACjB,MAAA,CAAC,CAAC,cAAF;AACA,MAAA,OAAO,CAAC,CAAD,EAAI,IAAJ,CAAP;AACD;;AAED,KAAA,EAAA,GAAA,CAAA,EAAA,GAAA,KAAK,CAAC,KAAN,MAAW,IAAX,IAAW,EAAA,KAAA,KAAA,CAAX,GAAW,KAAA,CAAX,GAAW,EAAA,CAAE,aAAb,MAA0B,IAA1B,IAA0B,EAAA,KAAA,KAAA,CAA1B,GAA0B,KAAA,CAA1B,GAA0B,EAAA,CAAA,IAAA,CAAA,EAAA,EAAG,CAAH,CAA1B;AACD,GAPqC,CAAtC;AASA,QAAM,OAAO,GAAG,gBAAgB,CAAE,CAAD,IAAqC;;;AACpE,QAAI,CAAC,aAAL,EAAoB;AAClB,MAAA,OAAO,CAAC,CAAD,EAAI,CAAC,IAAL,CAAP;AACD;;AACD,KAAA,EAAA,GAAA,CAAA,EAAA,GAAA,KAAK,CAAC,KAAN,MAAW,IAAX,IAAW,EAAA,KAAA,KAAA,CAAX,GAAW,KAAA,CAAX,GAAW,EAAA,CAAE,OAAb,MAAoB,IAApB,IAAoB,EAAA,KAAA,KAAA,CAApB,GAAoB,KAAA,CAApB,GAAoB,EAAA,CAAA,IAAA,CAAA,EAAA,EAAG,CAAH,CAApB;AACD,GAL+B,CAAhC;AAOA,QAAM,SAAS,GAAG,gBAAgB,CAAE,CAAD,IAAwC;;;AACzE,QAAI,6BAA6B,CAAC,CAAD,CAA7B,KAAqC,CAAC,CAAC,GAAF,KAAU,GAAV,IAAiB,CAAC,CAAC,GAAF,KAAU,OAAhE,CAAJ,EAA8E;AAC5E,MAAA,CAAC,CAAC,cAAF;AACA,OAAA,EAAA,GAAC,CAAC,CAAC,MAAH,MAAyB,IAAzB,IAAyB,EAAA,KAAA,KAAA,CAAzB,GAAyB,KAAA,CAAzB,GAAyB,EAAA,CAAE,KAAF,EAAzB;AACD;;AAED,QAAI,CAAC,CAAC,GAAF,KAAU,QAAd,EAAwB;AACtB,MAAA,OAAO,CAAC,CAAD,EAAI,KAAJ,CAAP;AACD;;AAED,KAAA,EAAA,GAAA,CAAA,EAAA,GAAA,KAAK,CAAC,KAAN,MAAW,IAAX,IAAW,EAAA,KAAA,KAAA,CAAX,GAAW,KAAA,CAAX,GAAW,EAAA,CAAE,SAAb,MAAsB,IAAtB,IAAsB,EAAA,KAAA,KAAA,CAAtB,GAAsB,KAAA,CAAtB,GAAsB,EAAA,CAAA,IAAA,CAAA,EAAA,EAAG,CAAH,CAAtB;AACD,GAXiC,CAAlC;AAaA,QAAM,YAAY,GAAG,gBAAgB,CAAE,CAAD,IAAqC;;;AACzE,QAAI,WAAJ,EAAiB;AACf,MAAA,OAAO,CAAC,CAAD,EAAI,IAAJ,CAAP;AACD;;AACD,KAAA,EAAA,GAAA,CAAA,EAAA,GAAA,KAAK,CAAC,KAAN,MAAW,IAAX,IAAW,EAAA,KAAA,KAAA,CAAX,GAAW,KAAA,CAAX,GAAW,EAAA,CAAE,YAAb,MAAyB,IAAzB,IAAyB,EAAA,KAAA,KAAA,CAAzB,GAAyB,KAAA,CAAzB,GAAyB,EAAA,CAAA,IAAA,CAAA,EAAA,EAAG,CAAH,CAAzB;AACD,GALoC,CAArC;AAOA,QAAM,YAAY,GAAG,gBAAgB,CAAE,CAAD,IAAqC;;;AACzE,QAAI,WAAJ,EAAiB;AACf,MAAA,OAAO,CAAC,CAAD,EAAI,KAAJ,CAAP;AACD;;AACD,KAAA,EAAA,GAAA,CAAA,EAAA,GAAA,KAAK,CAAC,KAAN,MAAW,IAAX,IAAW,EAAA,KAAA,KAAA,CAAX,GAAW,KAAA,CAAX,GAAW,EAAA,CAAE,YAAb,MAAyB,IAAzB,IAAyB,EAAA,KAAA,KAAA,CAAzB,GAAyB,KAAA,CAAzB,GAAyB,EAAA,CAAA,IAAA,CAAA,EAAA,EAAG,CAAH,CAAzB;AACD,GALoC,CAArC;AAOA,QAAM,KAAK,GAAG,KAAK,CAAC,QAAN,CAAe,IAAf,CAAoB,KAAK,CAAC,QAA1B,CAAd;AACA,SAAO;AACL,IAAA,QAAQ,eAAE,KAAK,CAAC,YAAN,CAAmB,KAAnB,EAA0B,EAClC,GAAG,iBAD+B;AAElC,uBAAiB,SAAS,GAAG,QAAH,GAAc,MAFN;AAGlC,SAAG,KAAK,CAAC,KAHyB;AAIlC,MAAA,OAJkC;AAKlC,MAAA,YALkC;AAMlC,MAAA,SANkC;AAOlC,MAAA,YAPkC;AAQlC,MAAA,aARkC;AASlC,MAAA,GAAG,EAAE,aAAa,CAAG,KAAuE,CAAC,GAA3E,EAAgF,UAAhF;AATgB,KAA1B;AADL,GAAP;AAaD,CAlEM","sourceRoot":""}
+{"version":3,"sources":["../../../src/components/PopoverTrigger/usePopoverTrigger.ts"],"names":[],"mappings":"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","sourceRoot":""}

package/lib-commonjs/components/PopoverSurface/PopoverSurface.types.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentProps, ComponentState, IntrinsicSlotProps } from '@fluentui/react-utilities';
+import type { ComponentProps, ComponentState, Slot } from '@fluentui/react-utilities';
 import type { PopoverContextValue } from '../../popoverContext';
 /**
  * PopoverSurface Props
@@ -8,7 +8,7 @@ export declare type PopoverSurfaceProps = ComponentProps<PopoverSurfaceSlots>;
  * Names of the slots in PopoverSurfaceProps
  */
 export declare type PopoverSurfaceSlots = {
-    root: IntrinsicSlotProps<'div'>;
+    root: Slot<'div'>;
 };
 /**
  * PopoverSurface State

package/lib-commonjs/components/PopoverTrigger/PopoverTrigger.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
+import type { FluentTriggerComponent } from '@fluentui/react-utilities';
 import type { PopoverTriggerProps } from './PopoverTrigger.types';
 /**
  * Wraps a trigger element as an only child and adds the necessary event handling to open a popover.
  */
-export declare const PopoverTrigger: React.FC<PopoverTriggerProps>;
+export declare const PopoverTrigger: React.FC<PopoverTriggerProps> & FluentTriggerComponent;

package/lib-commonjs/components/PopoverTrigger/PopoverTrigger.js

@@ -20,4 +20,5 @@ const PopoverTrigger = props => {
 
 exports.PopoverTrigger = PopoverTrigger;
 exports.PopoverTrigger.displayName = 'PopoverTrigger';
+exports.PopoverTrigger.isFluentTriggerComponent = true;
 //# sourceMappingURL=PopoverTrigger.js.map

package/lib-commonjs/components/PopoverTrigger/PopoverTrigger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/PopoverTrigger/PopoverTrigger.tsx"],"names":[],"mappings":";;;;;;;AACA,MAAA,mBAAA,gBAAA,OAAA,CAAA,qBAAA,CAAA;;AACA,MAAA,sBAAA,gBAAA,OAAA,CAAA,wBAAA,CAAA;AAGA;;AAEG;;;AACI,MAAM,cAAc,GAAkC,KAAK,IAAG;AACnE,QAAM,KAAK,GAAG,mBAAA,CAAA,0BAAA,CAA2B,KAA3B,CAAd;AAEA,SAAO,sBAAA,CAAA,6BAAA,CAA8B,KAA9B,CAAP;AACD,CAJM;;AAAM,OAAA,CAAA,cAAA,GAAc,cAAd;AAMb,OAAA,CAAA,cAAA,CAAe,WAAf,GAA6B,gBAA7B","sourceRoot":""}
+{"version":3,"sources":["../../../src/components/PopoverTrigger/PopoverTrigger.tsx"],"names":[],"mappings":";;;;;;;AACA,MAAA,mBAAA,gBAAA,OAAA,CAAA,qBAAA,CAAA;;AACA,MAAA,sBAAA,gBAAA,OAAA,CAAA,wBAAA,CAAA;AAIA;;AAEG;;;AACI,MAAM,cAAc,GAA2D,KAAK,IAAG;AAC5F,QAAM,KAAK,GAAG,mBAAA,CAAA,0BAAA,CAA2B,KAA3B,CAAd;AAEA,SAAO,sBAAA,CAAA,6BAAA,CAA8B,KAA9B,CAAP;AACD,CAJM;;AAAM,OAAA,CAAA,cAAA,GAAc,cAAd;AAMb,OAAA,CAAA,cAAA,CAAe,WAAf,GAA6B,gBAA7B;AACA,OAAA,CAAA,cAAA,CAAe,wBAAf,GAA0C,IAA1C","sourceRoot":""}

package/lib-commonjs/components/PopoverTrigger/PopoverTrigger.types.d.ts

@@ -3,9 +3,16 @@ import * as React from 'react';
  * PopoverTrigger Props
  */
 export declare type PopoverTriggerProps = {
-    children: React.ReactElement;
+    children: (React.ReactElement & {
+        ref?: React.Ref<unknown>;
+    }) | ((props: PopoverTriggerChildProps) => React.ReactElement | null);
 };
 /**
  * PopoverTrigger State
  */
-export declare type PopoverTriggerState = PopoverTriggerProps;
+export declare type PopoverTriggerState = {
+    children: React.ReactElement | null;
+};
+export declare type PopoverTriggerChildProps = {
+    ref?: React.Ref<never>;
+} & Pick<React.HTMLAttributes<HTMLElement>, 'aria-haspopup' | 'onClick' | 'onMouseEnter' | 'onKeyDown' | 'onMouseLeave' | 'onContextMenu'>;

package/lib-commonjs/components/PopoverTrigger/renderPopoverTrigger.d.ts

@@ -2,4 +2,4 @@ import type { PopoverTriggerState } from './PopoverTrigger.types';
 /**
  * Render the final JSX of PopoverTrigger
  */
-export declare const renderPopoverTrigger_unstable: (state: PopoverTriggerState) => JSX.Element;
+export declare const renderPopoverTrigger_unstable: (state: PopoverTriggerState) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | null;

package/lib-commonjs/components/PopoverTrigger/renderPopoverTrigger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/PopoverTrigger/renderPopoverTrigger.tsx"],"names":[],"mappings":";;;;;;AAEA;;AAEG;;AACI,MAAM,6BAA6B,GAAI,KAAD,IAA4C;AACvF,SAAO,KAAK,CAAC,QAAb;AACD,CAFM;;AAAM,OAAA,CAAA,6BAAA,GAA6B,6BAA7B","sourceRoot":""}
+{"version":3,"sources":["../../../src/components/PopoverTrigger/renderPopoverTrigger.tsx"],"names":[],"mappings":";;;;;;AAEA;;AAEG;;AACI,MAAM,6BAA6B,GAAI,KAAD,IAA+B;AAC1E,SAAO,KAAK,CAAC,QAAb;AACD,CAFM;;AAAM,OAAA,CAAA,6BAAA,GAA6B,6BAA7B","sourceRoot":""}

package/lib-commonjs/components/PopoverTrigger/usePopoverTrigger.js

@@ -23,6 +23,12 @@ const popoverContext_1 = /*#__PURE__*/require("../../popoverContext");
 
 
 const usePopoverTrigger_unstable = props => {
+  var _a, _b, _c, _d, _e;
+
+  const {
+    children
+  } = props;
+  const child = React.isValidElement(children) ? react_utilities_1.getTriggerChild(children) : undefined;
   const setOpen = popoverContext_1.usePopoverContext_unstable(context => context.setOpen);
   const open = popoverContext_1.usePopoverContext_unstable(context => context.open);
   const triggerRef = popoverContext_1.usePopoverContext_unstable(context => context.triggerRef);
@@ -32,27 +38,22 @@ const usePopoverTrigger_unstable = props => {
   const {
     triggerAttributes
   } = react_tabster_1.useModalAttributes();
-  const onContextMenu = react_utilities_1.useEventCallback(e => {
-    var _a, _b;
 
+  const onContextMenu = e => {
     if (openOnContext) {
       e.preventDefault();
       setOpen(e, true);
     }
+  };
 
-    (_b = (_a = child.props) === null || _a === void 0 ? void 0 : _a.onContextMenu) === null || _b === void 0 ? void 0 : _b.call(_a, e);
-  });
-  const onClick = react_utilities_1.useEventCallback(e => {
-    var _a, _b;
-
+  const onClick = e => {
     if (!openOnContext) {
       setOpen(e, !open);
     }
+  };
 
-    (_b = (_a = child.props) === null || _a === void 0 ? void 0 : _a.onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
-  });
-  const onKeyDown = react_utilities_1.useEventCallback(e => {
-    var _a, _b, _c;
+  const onKeyDown = e => {
+    var _a;
 
     if (react_utilities_1.shouldPreventDefaultOnKeyDown(e) && (e.key === ' ' || e.key === 'Enter')) {
       e.preventDefault();
@@ -62,38 +63,30 @@ const usePopoverTrigger_unstable = props => {
     if (e.key === 'Escape') {
       setOpen(e, false);
     }
+  };
 
-    (_c = (_b = child.props) === null || _b === void 0 ? void 0 : _b.onKeyDown) === null || _c === void 0 ? void 0 : _c.call(_b, e);
-  });
   const onMouseEnter = react_utilities_1.useEventCallback(e => {
-    var _a, _b;
-
     if (openOnHover) {
       setOpen(e, true);
     }
-
-    (_b = (_a = child.props) === null || _a === void 0 ? void 0 : _a.onMouseEnter) === null || _b === void 0 ? void 0 : _b.call(_a, e);
   });
-  const onMouseLeave = react_utilities_1.useEventCallback(e => {
-    var _a, _b;
 
+  const onMouseLeave = e => {
     if (openOnHover) {
       setOpen(e, false);
     }
+  };
 
-    (_b = (_a = child.props) === null || _a === void 0 ? void 0 : _a.onMouseLeave) === null || _b === void 0 ? void 0 : _b.call(_a, e);
-  });
-  const child = React.Children.only(props.children);
   return {
-    children: React.cloneElement(child, { ...triggerAttributes,
+    children: react_utilities_1.applyTriggerPropsToChildren(props.children, { ...triggerAttributes,
       'aria-haspopup': trapFocus ? 'dialog' : 'true',
-      ...child.props,
-      onClick,
-      onMouseEnter,
-      onKeyDown,
-      onMouseLeave,
-      onContextMenu,
-      ref: react_utilities_1.useMergedRefs(child.ref, triggerRef)
+      ...(child === null || child === void 0 ? void 0 : child.props),
+      onClick: react_utilities_1.useMergedEventCallbacks((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.onClick, onClick),
+      onMouseEnter: react_utilities_1.useMergedEventCallbacks((_b = child === null || child === void 0 ? void 0 : child.props) === null || _b === void 0 ? void 0 : _b.onMouseEnter, onMouseEnter),
+      onKeyDown: react_utilities_1.useMergedEventCallbacks((_c = child === null || child === void 0 ? void 0 : child.props) === null || _c === void 0 ? void 0 : _c.onKeyDown, onKeyDown),
+      onMouseLeave: react_utilities_1.useMergedEventCallbacks((_d = child === null || child === void 0 ? void 0 : child.props) === null || _d === void 0 ? void 0 : _d.onMouseLeave, onMouseLeave),
+      onContextMenu: react_utilities_1.useMergedEventCallbacks((_e = child === null || child === void 0 ? void 0 : child.props) === null || _e === void 0 ? void 0 : _e.onContextMenu, onContextMenu),
+      ref: react_utilities_1.useMergedRefs(triggerRef, child === null || child === void 0 ? void 0 : child.ref)
     })
   };
 };

package/lib-commonjs/components/PopoverTrigger/usePopoverTrigger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/PopoverTrigger/usePopoverTrigger.ts"],"names":[],"mappings":"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","sourceRoot":""}
+{"version":3,"sources":["../../../src/components/PopoverTrigger/usePopoverTrigger.ts"],"names":[],"mappings":"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","sourceRoot":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui/react-popover",
-  "version": "0.0.0-nightlya21bfaceec20220202.1",
+  "version": "0.0.0-nightlyb2b3ec1da320220209.1",
   "description": "Popover component for Fluent UI",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@fluentui/eslint-plugin": "*",
     "@fluentui/react-conformance": "*",
-    "@fluentui/react-conformance-griffel": "0.0.0-nightlya21bfaceec20220202.1",
+    "@fluentui/react-conformance-griffel": "0.0.0-nightlyb2b3ec1da320220209.1",
     "@fluentui/scripts": "^1.0.0",
     "@types/enzyme": "3.10.3",
     "@types/enzyme-adapter-react-16": "1.0.3",
@@ -43,13 +43,13 @@
     "react-test-renderer": "^16.3.0"
   },
   "dependencies": {
-    "@fluentui/react-context-selector": "0.0.0-nightlya21bfaceec20220202.1",
+    "@fluentui/react-context-selector": "0.0.0-nightlyb2b3ec1da320220209.1",
     "@griffel/react": "1.0.0",
-    "@fluentui/react-portal": "0.0.0-nightlya21bfaceec20220202.1",
-    "@fluentui/react-positioning": "0.0.0-nightlya21bfaceec20220202.1",
-    "@fluentui/react-shared-contexts": "0.0.0-nightlya21bfaceec20220202.1",
-    "@fluentui/react-tabster": "0.0.0-nightlya21bfaceec20220202.1",
-    "@fluentui/react-utilities": "0.0.0-nightlya21bfaceec20220202.1",
+    "@fluentui/react-portal": "0.0.0-nightlyb2b3ec1da320220209.1",
+    "@fluentui/react-positioning": "0.0.0-nightlyb2b3ec1da320220209.1",
+    "@fluentui/react-shared-contexts": "0.0.0-nightlyb2b3ec1da320220209.1",
+    "@fluentui/react-tabster": "0.0.0-nightlyb2b3ec1da320220209.1",
+    "@fluentui/react-utilities": "0.0.0-nightlyb2b3ec1da320220209.1",
     "tslib": "^2.1.0"
   },
   "peerDependencies": {