@fluentui/react-tooltip 0.0.0-nightlydd0f007b3f20220119.1 → 0.0.0-nightlye0b8e1fa6920220128.1

package/CHANGELOG.json

@@ -2,15 +2,15 @@
   "name": "@fluentui/react-tooltip",
   "entries": [
     {
-      "date": "Wed, 19 Jan 2022 04:16:32 GMT",
-      "tag": "@fluentui/react-tooltip_v0.0.0-nightlydd0f007b3f20220119.1",
-      "version": "0.0.0-nightlydd0f007b3f20220119.1",
+      "date": "Fri, 28 Jan 2022 04:13:23 GMT",
+      "tag": "@fluentui/react-tooltip_v0.0.0-nightlye0b8e1fa6920220128.1",
+      "version": "0.0.0-nightlye0b8e1fa6920220128.1",
       "comments": {
         "prerelease": [
           {
             "author": "email not defined",
             "package": "@fluentui/react-tooltip",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55",
+            "commit": "90d10ec8c2d159575962c4d3d913317633b44a7a",
             "comment": "Release nightly v9"
           },
           {
@@ -31,12 +31,24 @@
             "commit": "1bbb753830028fbf133858d523ae2d56ceefeecf",
             "comment": "update styles to not use CSS shorthands"
           },
+          {
+            "author": "behowell@microsoft.com",
+            "package": "@fluentui/react-tooltip",
+            "commit": "317209bb5cd57c40f35bc42060acb7e3cce5ec95",
+            "comment": "BREAKING: Rename component hooks add the suffix _unstable, as their API has not been finalized yet"
+          },
           {
             "author": "behowell@microsoft.com",
             "package": "@fluentui/react-tooltip",
             "commit": "7cc28ed8320b00f42d91c63882f10316db2205c5",
             "comment": "Remove component's shorthandProps array"
           },
+          {
+            "author": "Humberto.Morimoto@microsoft.com",
+            "package": "@fluentui/react-tooltip",
+            "commit": "e0b8e1fa6980077e7b311fd1c72c28d3e4305db0",
+            "comment": "Updating based on changes to composition types."
+          },
           {
             "author": "behowell@microsoft.com",
             "package": "@fluentui/react-tooltip",
@@ -50,58 +62,58 @@
             "comment": "Remove Tooltip's inverted prop in favor of the appearance prop"
           },
           {
-            "author": "beachball",
+            "author": "olfedias@microsoft.com",
             "package": "@fluentui/react-tooltip",
-            "comment": "Bump @fluentui/react-make-styles to v0.0.0-nightlydd0f007b3f20220119.1",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
+            "commit": "02e6236e4db8e1b591223475896537e905bf3580",
+            "comment": "BREAKING: implement `content` slot"
           },
           {
-            "author": "beachball",
+            "author": "olfedias@microsoft.com",
             "package": "@fluentui/react-tooltip",
-            "comment": "Bump @fluentui/react-portal to v0.0.0-nightlydd0f007b3f20220119.1",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
+            "commit": "17c0b18d7983d414095661bf9f57e14c0c22685d",
+            "comment": "Replace make-styles packages with griffel equivalents."
           },
           {
-            "author": "beachball",
+            "author": "behowell@microsoft.com",
             "package": "@fluentui/react-tooltip",
-            "comment": "Bump @fluentui/react-positioning to v0.0.0-nightlydd0f007b3f20220119.1",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
+            "commit": "58ae40d6817b1fa4e095a94707dfef5050aa4c11",
+            "comment": "Replace `triggerAriaAttribute` prop with `relationship` and make it required with no default"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-tooltip",
-            "comment": "Bump @fluentui/react-shared-contexts to v0.0.0-nightlydd0f007b3f20220119.1",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
+            "comment": "Bump @fluentui/react-portal to v0.0.0-nightlye0b8e1fa6920220128.1",
+            "commit": "90d10ec8c2d159575962c4d3d913317633b44a7a"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-tooltip",
-            "comment": "Bump @fluentui/react-theme to v0.0.0-nightlydd0f007b3f20220119.1",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
+            "comment": "Bump @fluentui/react-positioning to v0.0.0-nightlye0b8e1fa6920220128.1",
+            "commit": "90d10ec8c2d159575962c4d3d913317633b44a7a"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-tooltip",
-            "comment": "Bump @fluentui/react-utilities to v0.0.0-nightlydd0f007b3f20220119.1",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
+            "comment": "Bump @fluentui/react-shared-contexts to v0.0.0-nightlye0b8e1fa6920220128.1",
+            "commit": "90d10ec8c2d159575962c4d3d913317633b44a7a"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-tooltip",
-            "comment": "Bump @fluentui/babel-make-styles to v0.0.0-nightlydd0f007b3f20220119.1",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
+            "comment": "Bump @fluentui/react-theme to v0.0.0-nightlye0b8e1fa6920220128.1",
+            "commit": "90d10ec8c2d159575962c4d3d913317633b44a7a"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-tooltip",
-            "comment": "Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightlydd0f007b3f20220119.1",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
+            "comment": "Bump @fluentui/react-utilities to v0.0.0-nightlye0b8e1fa6920220128.1",
+            "commit": "90d10ec8c2d159575962c4d3d913317633b44a7a"
           },
           {
             "author": "beachball",
             "package": "@fluentui/react-tooltip",
-            "comment": "Bump @fluentui/react-conformance-make-styles to v0.0.0-nightlydd0f007b3f20220119.1",
-            "commit": "6044506cc626a9a155e0df40645426ddcc080c55"
+            "comment": "Bump @fluentui/react-conformance-griffel to v0.0.0-nightlye0b8e1fa6920220128.1",
+            "commit": "90d10ec8c2d159575962c4d3d913317633b44a7a"
           }
         ],
         "none": [
@@ -117,6 +129,12 @@
             "commit": "b59f44ed5db37b457476fdb3ec86ff273b776646",
             "comment": "Migrate package to use solution tsconfigs"
           },
+          {
+            "author": "olfedias@microsoft.com",
+            "package": "@fluentui/react-tooltip",
+            "commit": "c061e98be4b4a718c72a144a1f60bb5515824612",
+            "comment": "remove inline-style-expand-shorthand from tsconfigs"
+          },
           {
             "author": "elcraig@microsoft.com",
             "package": "@fluentui/react-tooltip",

package/CHANGELOG.md

@@ -1,32 +1,34 @@
 # Change Log - @fluentui/react-tooltip
 
-This log was last generated on Wed, 19 Jan 2022 04:16:32 GMT and should not be manually modified.
+This log was last generated on Fri, 28 Jan 2022 04:13:23 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## [0.0.0-nightlydd0f007b3f20220119.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-tooltip_v0.0.0-nightlydd0f007b3f20220119.1)
+## [0.0.0-nightlye0b8e1fa6920220128.1](https://github.com/microsoft/fluentui/tree/@fluentui/react-tooltip_v0.0.0-nightlye0b8e1fa6920220128.1)
 
-Wed, 19 Jan 2022 04:16:32 GMT 
-[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-tooltip_v9.0.0-beta.5..@fluentui/react-tooltip_v0.0.0-nightlydd0f007b3f20220119.1)
+Fri, 28 Jan 2022 04:13:23 GMT 
+[Compare changes](https://github.com/microsoft/fluentui/compare/@fluentui/react-tooltip_v9.0.0-beta.5..@fluentui/react-tooltip_v0.0.0-nightlye0b8e1fa6920220128.1)
 
 ### Changes
 
-- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by email not defined)
+- Release nightly v9 ([commit](https://github.com/microsoft/fluentui/commit/90d10ec8c2d159575962c4d3d913317633b44a7a) by email not defined)
 - Move arrowHeight and tooltipBorderRadius into a shared constants.ts file ([PR #21204](https://github.com/microsoft/fluentui/pull/21204) by behowell@microsoft.com)
 - Replacing use of functions in makeStyles with direct use of tokens. ([PR #21058](https://github.com/microsoft/fluentui/pull/21058) by Humberto.Morimoto@microsoft.com)
 - update styles to not use CSS shorthands ([PR #20795](https://github.com/microsoft/fluentui/pull/20795) by olfedias@microsoft.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)
 - Remove component's shorthandProps array ([PR #21134](https://github.com/microsoft/fluentui/pull/21134) 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)
 - Fix tooltip arrow rendering, and add high contrast border around Tooltip ([PR #21086](https://github.com/microsoft/fluentui/pull/21086) by behowell@microsoft.com)
 - Remove Tooltip's inverted prop in favor of the appearance prop ([PR #21327](https://github.com/microsoft/fluentui/pull/21327) by behowell@microsoft.com)
-- Bump @fluentui/react-make-styles to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
-- Bump @fluentui/react-portal to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
-- Bump @fluentui/react-positioning to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
-- Bump @fluentui/react-shared-contexts to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
-- Bump @fluentui/react-theme to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
-- Bump @fluentui/react-utilities to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
-- Bump @fluentui/babel-make-styles to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
-- Bump @fluentui/jest-serializer-make-styles to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
-- Bump @fluentui/react-conformance-make-styles to v0.0.0-nightlydd0f007b3f20220119.1 ([commit](https://github.com/microsoft/fluentui/commit/6044506cc626a9a155e0df40645426ddcc080c55) by beachball)
+- BREAKING: implement `content` slot ([PR #21470](https://github.com/microsoft/fluentui/pull/21470) by olfedias@microsoft.com)
+- Replace make-styles packages with griffel equivalents. ([PR #21422](https://github.com/microsoft/fluentui/pull/21422) by olfedias@microsoft.com)
+- Replace `triggerAriaAttribute` prop with `relationship` and make it required with no default ([PR #21331](https://github.com/microsoft/fluentui/pull/21331) by behowell@microsoft.com)
+- Bump @fluentui/react-portal to v0.0.0-nightlye0b8e1fa6920220128.1 ([commit](https://github.com/microsoft/fluentui/commit/90d10ec8c2d159575962c4d3d913317633b44a7a) by beachball)
+- Bump @fluentui/react-positioning to v0.0.0-nightlye0b8e1fa6920220128.1 ([commit](https://github.com/microsoft/fluentui/commit/90d10ec8c2d159575962c4d3d913317633b44a7a) by beachball)
+- Bump @fluentui/react-shared-contexts to v0.0.0-nightlye0b8e1fa6920220128.1 ([commit](https://github.com/microsoft/fluentui/commit/90d10ec8c2d159575962c4d3d913317633b44a7a) by beachball)
+- Bump @fluentui/react-theme to v0.0.0-nightlye0b8e1fa6920220128.1 ([commit](https://github.com/microsoft/fluentui/commit/90d10ec8c2d159575962c4d3d913317633b44a7a) by beachball)
+- Bump @fluentui/react-utilities to v0.0.0-nightlye0b8e1fa6920220128.1 ([commit](https://github.com/microsoft/fluentui/commit/90d10ec8c2d159575962c4d3d913317633b44a7a) by beachball)
+- Bump @fluentui/react-conformance-griffel to v0.0.0-nightlye0b8e1fa6920220128.1 ([commit](https://github.com/microsoft/fluentui/commit/90d10ec8c2d159575962c4d3d913317633b44a7a) by beachball)
 
 ## [9.0.0-beta.5](https://github.com/microsoft/fluentui/tree/@fluentui/react-tooltip_v9.0.0-beta.5)
 

package/dist/react-tooltip.d.ts

@@ -1,7 +1,6 @@
 import type { ComponentProps } from '@fluentui/react-utilities';
 import type { ComponentState } from '@fluentui/react-utilities';
-import type { ForwardRefComponent } from '@fluentui/react-utilities';
-import type { IntrinsicShorthandProps } from '@fluentui/react-utilities';
+import type { IntrinsicSlotProps } from '@fluentui/react-utilities';
 import type { PositioningShorthand } from '@fluentui/react-positioning';
 import * as React_2 from 'react';
 
@@ -15,12 +14,12 @@ export declare type OnVisibleChangeData = {
 /**
  * Render the final JSX of Tooltip
  */
-export declare const renderTooltip: (state: TooltipState) => JSX.Element;
+export declare const renderTooltip_unstable: (state: TooltipState) => JSX.Element;
 
 /**
  * A tooltip provides light weight contextual information on top of its target element.
  */
-export declare const Tooltip: ForwardRefComponent<TooltipProps>;
+export declare const Tooltip: React_2.FC<TooltipProps>;
 
 export declare const tooltipClassName = "fui-Tooltip";
 
@@ -36,10 +35,6 @@ export declare type TooltipCommons = {
      * @defaultvalue normal
      */
     appearance?: 'normal' | 'inverted';
-    /**
-     * The content displayed inside the tooltip.
-     */
-    content: React_2.ReactNode;
     /**
      * Render an arrow pointing to the target element
      *
@@ -66,15 +61,15 @@ export declare type TooltipCommons = {
      */
     onVisibleChange?: (event: React_2.PointerEvent<HTMLElement> | React_2.FocusEvent<HTMLElement> | undefined, data: OnVisibleChangeData) => void;
     /**
-     * Specifies which aria attribute to set on the trigger element.
-     * * `label` - Set aria-label to the tooltip's content. Requires content to be a string; if not, uses `labelledby`.
-     * * `labelledby` - Set aria-labelledby to the tooltip's id. The id is generated if not provided.
-     * * `describedby` - Set aria-describedby to the tooltip's id. The id is generated if not provided.
-     * * null - Do not set any aria attributes on the trigger element.
+     * (Required) Specifies whether this tooltip is acting as the description or label of its trigger element.
      *
-     * @defaultvalue label
+     * * `label` - The tooltip sets the trigger's aria-label or aria-labelledby attribute. This is useful for buttons
+     *    displaying only an icon, for example.
+     * * `description` - The tooltip sets the trigger's aria-description or aria-describedby attribute.
+     * * `inaccessible` - No aria attributes are set on the trigger. This makes the tooltip's content inaccessible to
+     *   screen readers, and should only be used if the tooltip's text is available by some other means.
      */
-    triggerAriaAttribute: 'label' | 'labelledby' | 'describedby' | null;
+    relationship: 'label' | 'description' | 'inaccessible';
     /**
      * Delay before the tooltip is shown, in milliseconds.
      *
@@ -92,36 +87,26 @@ export declare type TooltipCommons = {
 /**
  * Properties for Tooltip
  */
-export declare type TooltipProps = ComponentProps<TooltipSlots> & Partial<Omit<TooltipCommons, 'content'>> & Pick<TooltipCommons, 'content'>;
+export declare type TooltipProps = Omit<ComponentProps<TooltipSlots>, 'content'> & Required<Pick<ComponentProps<TooltipSlots>, 'content'>> & Partial<Omit<TooltipCommons, 'relationship'>> & Pick<TooltipCommons, 'relationship'> & {
+    children?: (React_2.ReactElement & {
+        ref?: React_2.Ref<unknown>;
+    }) | ((props: TooltipTriggerProps) => React_2.ReactNode) | null;
+};
 
 /**
  * Slot properties for Tooltip
  */
 export declare type TooltipSlots = {
-    root: Omit<IntrinsicShorthandProps<'div'>, 'children'> & {
-        /**
-         * The child is the element that triggers the Tooltip. It will have additional properties added,
-         * including events and aria properties.
-         * Alternatively, children can be a render function that takes the props and adds
-         * them to the appropriate elements.
-         */
-        children?: (React_2.ReactElement<React_2.HTMLAttributes<HTMLElement>> & {
-            ref?: React_2.Ref<unknown>;
-        }) | ((props: TooltipTriggerProps) => React_2.ReactNode) | null;
-    };
+    content: IntrinsicSlotProps<'div'>;
 };
 
 /**
  * State used in rendering Tooltip
  */
 export declare type TooltipState = ComponentState<TooltipSlots> & TooltipCommons & {
+    children?: React_2.ReactNode;
     /**
      * Whether the tooltip should be rendered to the DOM.
-     *
-     * Normally the tooltip will only be rendered when visible. However, if
-     * triggerAriaAttribute is labelledby or describedby, the tooltip will
-     * always be rendered even when hidden so that those aria attributes
-     * to always refer to a valid DOM element.
      */
     shouldRenderTooltip?: boolean;
     /**
@@ -144,17 +129,16 @@ export declare type TooltipTriggerProps = {
 /**
  * Create the state required to render Tooltip.
  *
- * The returned state can be modified with hooks such as useTooltipStyles,
- * before being passed to renderTooltip.
+ * The returned state can be modified with hooks such as useTooltipStyles_unstable,
+ * before being passed to renderTooltip_unstable.
  *
  * @param props - props from this instance of Tooltip
- * @param ref - reference to root HTMLElement of Tooltip
  */
-export declare const useTooltip: (props: TooltipProps, ref: React_2.Ref<HTMLDivElement>) => TooltipState;
+export declare const useTooltip_unstable: (props: TooltipProps) => TooltipState;
 
 /**
  * Apply styling to the Tooltip slots based on the state
  */
-export declare const useTooltipStyles: (state: TooltipState) => TooltipState;
+export declare const useTooltipStyles_unstable: (state: TooltipState) => TooltipState;
 
 export { }

package/lib/components/Tooltip/Tooltip.d.ts

@@ -1,6 +1,6 @@
+import * as React from 'react';
 import type { TooltipProps } from './Tooltip.types';
-import type { ForwardRefComponent } from '@fluentui/react-utilities';
 /**
  * A tooltip provides light weight contextual information on top of its target element.
  */
-export declare const Tooltip: ForwardRefComponent<TooltipProps>;
+export declare const Tooltip: React.FC<TooltipProps>;

package/lib/components/Tooltip/Tooltip.js

@@ -1,15 +1,14 @@
-import * as React from 'react';
-import { useTooltip } from './useTooltip';
-import { renderTooltip } from './renderTooltip';
-import { useTooltipStyles } from './useTooltipStyles';
+import { useTooltip_unstable } from './useTooltip';
+import { renderTooltip_unstable } from './renderTooltip';
+import { useTooltipStyles_unstable } from './useTooltipStyles';
 /**
  * A tooltip provides light weight contextual information on top of its target element.
  */
 
-export const Tooltip = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const state = useTooltip(props, ref);
-  useTooltipStyles(state);
-  return renderTooltip(state);
-});
+export const Tooltip = props => {
+  const state = useTooltip_unstable(props);
+  useTooltipStyles_unstable(state);
+  return renderTooltip_unstable(state);
+};
 Tooltip.displayName = 'Tooltip';
 //# sourceMappingURL=Tooltip.js.map

package/lib/components/Tooltip/Tooltip.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/Tooltip/Tooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAZ,MAAuB,OAAvB;AACA,SAAS,UAAT,QAA2B,cAA3B;AACA,SAAS,aAAT,QAA8B,iBAA9B;AACA,SAAS,gBAAT,QAAiC,oBAAjC;AAIA;;AAEG;;AACH,OAAO,MAAM,OAAO,gBAAsC,KAAK,CAAC,UAAN,CAAiB,CAAC,KAAD,EAAQ,GAAR,KAAe;AACxF,QAAM,KAAK,GAAG,UAAU,CAAC,KAAD,EAAQ,GAAR,CAAxB;AAEA,EAAA,gBAAgB,CAAC,KAAD,CAAhB;AACA,SAAO,aAAa,CAAC,KAAD,CAApB;AACD,CALyD,CAAnD;AAOP,OAAO,CAAC,WAAR,GAAsB,SAAtB","sourceRoot":""}
+{"version":3,"sources":["../../../src/components/Tooltip/Tooltip.tsx"],"names":[],"mappings":"AACA,SAAS,mBAAT,QAAoC,cAApC;AACA,SAAS,sBAAT,QAAuC,iBAAvC;AACA,SAAS,yBAAT,QAA0C,oBAA1C;AAGA;;AAEG;;AACH,OAAO,MAAM,OAAO,GAA2B,KAAK,IAAG;AACrD,QAAM,KAAK,GAAG,mBAAmB,CAAC,KAAD,CAAjC;AAEA,EAAA,yBAAyB,CAAC,KAAD,CAAzB;AACA,SAAO,sBAAsB,CAAC,KAAD,CAA7B;AACD,CALM;AAOP,OAAO,CAAC,WAAR,GAAsB,SAAtB","sourceRoot":""}

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

@@ -1,21 +1,11 @@
 import * as React from 'react';
 import type { PositioningShorthand } from '@fluentui/react-positioning';
-import type { ComponentProps, ComponentState, IntrinsicShorthandProps } from '@fluentui/react-utilities';
+import type { ComponentProps, ComponentState, IntrinsicSlotProps } from '@fluentui/react-utilities';
 /**
  * Slot properties for Tooltip
  */
 export declare type TooltipSlots = {
-    root: Omit<IntrinsicShorthandProps<'div'>, 'children'> & {
-        /**
-         * The child is the element that triggers the Tooltip. It will have additional properties added,
-         * including events and aria properties.
-         * Alternatively, children can be a render function that takes the props and adds
-         * them to the appropriate elements.
-         */
-        children?: (React.ReactElement<React.HTMLAttributes<HTMLElement>> & {
-            ref?: React.Ref<unknown>;
-        }) | ((props: TooltipTriggerProps) => React.ReactNode) | null;
-    };
+    content: IntrinsicSlotProps<'div'>;
 };
 /**
  * Properties and state for Tooltip
@@ -29,10 +19,6 @@ export declare type TooltipCommons = {
      * @defaultvalue normal
      */
     appearance?: 'normal' | 'inverted';
-    /**
-     * The content displayed inside the tooltip.
-     */
-    content: React.ReactNode;
     /**
      * Render an arrow pointing to the target element
      *
@@ -59,15 +45,15 @@ export declare type TooltipCommons = {
      */
     onVisibleChange?: (event: React.PointerEvent<HTMLElement> | React.FocusEvent<HTMLElement> | undefined, data: OnVisibleChangeData) => void;
     /**
-     * Specifies which aria attribute to set on the trigger element.
-     * * `label` - Set aria-label to the tooltip's content. Requires content to be a string; if not, uses `labelledby`.
-     * * `labelledby` - Set aria-labelledby to the tooltip's id. The id is generated if not provided.
-     * * `describedby` - Set aria-describedby to the tooltip's id. The id is generated if not provided.
-     * * null - Do not set any aria attributes on the trigger element.
+     * (Required) Specifies whether this tooltip is acting as the description or label of its trigger element.
      *
-     * @defaultvalue label
+     * * `label` - The tooltip sets the trigger's aria-label or aria-labelledby attribute. This is useful for buttons
+     *    displaying only an icon, for example.
+     * * `description` - The tooltip sets the trigger's aria-description or aria-describedby attribute.
+     * * `inaccessible` - No aria attributes are set on the trigger. This makes the tooltip's content inaccessible to
+     *   screen readers, and should only be used if the tooltip's text is available by some other means.
      */
-    triggerAriaAttribute: 'label' | 'labelledby' | 'describedby' | null;
+    relationship: 'label' | 'description' | 'inaccessible';
     /**
      * Delay before the tooltip is shown, in milliseconds.
      *
@@ -96,18 +82,18 @@ export declare type OnVisibleChangeData = {
 /**
  * Properties for Tooltip
  */
-export declare type TooltipProps = ComponentProps<TooltipSlots> & Partial<Omit<TooltipCommons, 'content'>> & Pick<TooltipCommons, 'content'>;
+export declare type TooltipProps = Omit<ComponentProps<TooltipSlots>, 'content'> & Required<Pick<ComponentProps<TooltipSlots>, 'content'>> & Partial<Omit<TooltipCommons, 'relationship'>> & Pick<TooltipCommons, 'relationship'> & {
+    children?: (React.ReactElement & {
+        ref?: React.Ref<unknown>;
+    }) | ((props: TooltipTriggerProps) => React.ReactNode) | null;
+};
 /**
  * State used in rendering Tooltip
  */
 export declare type TooltipState = ComponentState<TooltipSlots> & TooltipCommons & {
+    children?: React.ReactNode;
     /**
      * Whether the tooltip should be rendered to the DOM.
-     *
-     * Normally the tooltip will only be rendered when visible. However, if
-     * triggerAriaAttribute is labelledby or describedby, the tooltip will
-     * always be rendered even when hidden so that those aria attributes
-     * to always refer to a valid DOM element.
      */
     shouldRenderTooltip?: boolean;
     /**

package/lib/components/Tooltip/renderTooltip.d.ts

@@ -2,4 +2,4 @@ import type { TooltipState } from './Tooltip.types';
 /**
  * Render the final JSX of Tooltip
  */
-export declare const renderTooltip: (state: TooltipState) => JSX.Element;
+export declare const renderTooltip_unstable: (state: TooltipState) => JSX.Element;

package/lib/components/Tooltip/renderTooltip.js

@@ -5,15 +5,15 @@ import { getSlots } from '@fluentui/react-utilities';
  * Render the final JSX of Tooltip
  */
 
-export const renderTooltip = state => {
+export const renderTooltip_unstable = state => {
   const {
     slots,
     slotProps
   } = getSlots(state);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, state.root.children, state.shouldRenderTooltip && /*#__PURE__*/React.createElement(Portal, null, /*#__PURE__*/React.createElement(slots.root, { ...slotProps.root
+  return /*#__PURE__*/React.createElement(React.Fragment, null, state.children, state.shouldRenderTooltip && /*#__PURE__*/React.createElement(Portal, null, /*#__PURE__*/React.createElement(slots.content, { ...slotProps.content
   }, state.withArrow && /*#__PURE__*/React.createElement("div", {
     ref: state.arrowRef,
     className: state.arrowClassName
-  }), state.content)));
+  }), state.content.children)));
 };
 //# sourceMappingURL=renderTooltip.js.map

package/lib/components/Tooltip/renderTooltip.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/Tooltip/renderTooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAZ,MAAuB,OAAvB;AACA,SAAS,MAAT,QAAuB,wBAAvB;AACA,SAAS,QAAT,QAAyB,2BAAzB;AAGA;;AAEG;;AACH,OAAO,MAAM,aAAa,GAAI,KAAD,IAAwB;AACnD,QAAM;AAAE,IAAA,KAAF;AAAS,IAAA;AAAT,MAAuB,QAAQ,CAAe,KAAf,CAArC;AAEA,sBACE,KAAA,CAAA,aAAA,CAAA,KAAA,CAAA,QAAA,EAAA,IAAA,EACG,KAAK,CAAC,IAAN,CAAW,QADd,EAEG,KAAK,CAAC,mBAAN,iBACC,KAAA,CAAA,aAAA,CAAC,MAAD,EAAO,IAAP,eACE,KAAA,CAAA,aAAA,CAAC,KAAK,CAAC,IAAP,EAAW,EAAA,GAAK,SAAS,CAAC;AAAf,GAAX,EACG,KAAK,CAAC,SAAN,iBAAmB,KAAA,CAAA,aAAA,CAAA,KAAA,EAAA;AAAK,IAAA,GAAG,EAAE,KAAK,CAAC,QAAhB;AAA0B,IAAA,SAAS,EAAE,KAAK,CAAC;AAA3C,GAAA,CADtB,EAEG,KAAK,CAAC,OAFT,CADF,CAHJ,CADF;AAaD,CAhBM","sourceRoot":""}
+{"version":3,"sources":["../../../src/components/Tooltip/renderTooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAZ,MAAuB,OAAvB;AACA,SAAS,MAAT,QAAuB,wBAAvB;AACA,SAAS,QAAT,QAAyB,2BAAzB;AAGA;;AAEG;;AACH,OAAO,MAAM,sBAAsB,GAAI,KAAD,IAAwB;AAC5D,QAAM;AAAE,IAAA,KAAF;AAAS,IAAA;AAAT,MAAuB,QAAQ,CAAe,KAAf,CAArC;AAEA,sBACE,KAAA,CAAA,aAAA,CAAA,KAAA,CAAA,QAAA,EAAA,IAAA,EACG,KAAK,CAAC,QADT,EAEG,KAAK,CAAC,mBAAN,iBACC,KAAA,CAAA,aAAA,CAAC,MAAD,EAAO,IAAP,eACE,KAAA,CAAA,aAAA,CAAC,KAAK,CAAC,OAAP,EAAc,EAAA,GAAK,SAAS,CAAC;AAAf,GAAd,EACG,KAAK,CAAC,SAAN,iBAAmB,KAAA,CAAA,aAAA,CAAA,KAAA,EAAA;AAAK,IAAA,GAAG,EAAE,KAAK,CAAC,QAAhB;AAA0B,IAAA,SAAS,EAAE,KAAK,CAAC;AAA3C,GAAA,CADtB,EAEG,KAAK,CAAC,OAAN,CAAc,QAFjB,CADF,CAHJ,CADF;AAaD,CAhBM","sourceRoot":""}

package/lib/components/Tooltip/useTooltip.d.ts

@@ -1,12 +1,10 @@
-import * as React from 'react';
 import type { TooltipProps, TooltipState } from './Tooltip.types';
 /**
  * Create the state required to render Tooltip.
  *
- * The returned state can be modified with hooks such as useTooltipStyles,
- * before being passed to renderTooltip.
+ * The returned state can be modified with hooks such as useTooltipStyles_unstable,
+ * before being passed to renderTooltip_unstable.
  *
  * @param props - props from this instance of Tooltip
- * @param ref - reference to root HTMLElement of Tooltip
  */
-export declare const useTooltip: (props: TooltipProps, ref: React.Ref<HTMLDivElement>) => TooltipState;
+export declare const useTooltip_unstable: (props: TooltipProps) => TooltipState;

package/lib/components/Tooltip/useTooltip.js

@@ -1,19 +1,18 @@
 import * as React from 'react';
 import { mergeArrowOffset, resolvePositioningShorthand, usePopper } from '@fluentui/react-positioning';
 import { TooltipContext, useFluent } from '@fluentui/react-shared-contexts';
-import { applyTriggerPropsToChildren, getNativeElementProps, useControllableState, useId, useIsomorphicLayoutEffect, useIsSSR, useMergedRefs, useTimeout } from '@fluentui/react-utilities';
+import { applyTriggerPropsToChildren, resolveShorthand, useControllableState, useId, useIsomorphicLayoutEffect, useIsSSR, useMergedRefs, useTimeout } from '@fluentui/react-utilities';
 import { arrowHeight, tooltipBorderRadius } from './private/constants';
 /**
  * Create the state required to render Tooltip.
  *
- * The returned state can be modified with hooks such as useTooltipStyles,
- * before being passed to renderTooltip.
+ * The returned state can be modified with hooks such as useTooltipStyles_unstable,
+ * before being passed to renderTooltip_unstable.
  *
  * @param props - props from this instance of Tooltip
- * @param ref - reference to root HTMLElement of Tooltip
  */
 
-export const useTooltip = (props, ref) => {
+export const useTooltip_unstable = props => {
   var _a, _b, _c, _d;
 
   const context = React.useContext(TooltipContext);
@@ -23,12 +22,13 @@ export const useTooltip = (props, ref) => {
   } = useFluent();
   const [setDelayTimeout, clearDelayTimeout] = useTimeout();
   const {
-    content,
     appearance,
+    children,
+    content,
     withArrow,
     positioning,
     onVisibleChange,
-    triggerAriaAttribute = 'label',
+    relationship,
     showDelay = 250,
     hideDelay = 250
   } = props;
@@ -49,26 +49,26 @@ export const useTooltip = (props, ref) => {
     });
   }, [clearDelayTimeout, setVisibleInternal, onVisibleChange]);
   const state = {
-    content,
     withArrow,
     positioning,
     showDelay,
     hideDelay,
-    triggerAriaAttribute,
+    relationship,
     visible,
     shouldRenderTooltip: visible,
     appearance,
     // Slots
     components: {
-      root: 'div'
+      content: 'div'
     },
-    root: getNativeElementProps('div', {
-      role: 'tooltip',
-      ...props,
-      ref,
-      id: useId('tooltip-', props.id)
+    content: resolveShorthand(content, {
+      defaultProps: {
+        role: 'tooltip'
+      },
+      required: true
     })
   };
+  state.content.id = useId('tooltip-', state.content.id);
   const popperOptions = {
     enabled: state.visible,
     arrowPadding: 2 * tooltipBorderRadius,
@@ -87,7 +87,7 @@ export const useTooltip = (props, ref) => {
     containerRef,
     arrowRef
   } = usePopper(popperOptions);
-  state.root.ref = useMergedRefs(state.root.ref, containerRef);
+  state.content.ref = useMergedRefs(state.content.ref, containerRef);
   state.arrowRef = arrowRef; // When this tooltip is visible, hide any other tooltips, and register it
   // as the visibleTooltip with the TooltipContext.
   // Also add a listener on document to hide the tooltip if Escape is pressed
@@ -155,9 +155,9 @@ export const useTooltip = (props, ref) => {
   }, [setDelayTimeout, setVisible, state.hideDelay, targetDocument]); // Cancel the hide timer when the pointer enters the tooltip, and restart it when the mouse leaves.
   // This keeps the tooltip visible when the pointer is moved over it.
 
-  state.root.onPointerEnter = useMergedCallbacks(state.root.onPointerEnter, clearDelayTimeout);
-  state.root.onPointerLeave = useMergedCallbacks(state.root.onPointerLeave, onLeaveTrigger);
-  const child = /*#__PURE__*/React.isValidElement(state.root.children) ? state.root.children : undefined; // The props to add to the trigger element (child)
+  state.content.onPointerEnter = useMergedCallbacks(state.content.onPointerEnter, clearDelayTimeout);
+  state.content.onPointerLeave = useMergedCallbacks(state.content.onPointerLeave, onLeaveTrigger);
+  const child = /*#__PURE__*/React.isValidElement(children) ? children : undefined; // The props to add to the trigger element (child)
 
   const triggerProps = {
     onPointerEnter: useMergedCallbacks((_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.onPointerEnter, onEnterTrigger),
@@ -173,26 +173,25 @@ export const useTooltip = (props, ref) => {
     triggerProps.ref = childTargetRef;
   }
 
-  if (state.triggerAriaAttribute === 'label') {
-    // aria-label only works if the content is a string. Otherwise, need to use labelledby.
-    if (typeof state.content === 'string') {
-      triggerProps['aria-label'] = state.content;
-    } else {
-      state.triggerAriaAttribute = 'labelledby';
-    }
-  }
+  if (relationship === 'label') {
+    // aria-label only works if the content is a string. Otherwise, need to use aria-labelledby.
+    if (typeof state.content.children === 'string') {
+      triggerProps['aria-label'] = state.content.children;
+    } else if (!isServerSideRender) {
+      triggerProps['aria-labelledby'] = state.content.id; // Always render the tooltip even if hidden, so that aria-labelledby refers to a valid element
 
-  if (state.triggerAriaAttribute === 'labelledby' && !isServerSideRender) {
-    triggerProps['aria-labelledby'] = state.root.id; // Always render the tooltip even if hidden, so that aria-labelledby refers to a valid element
+      state.shouldRenderTooltip = true;
+    }
+  } else if (relationship === 'description') {
+    if (!isServerSideRender) {
+      triggerProps['aria-describedby'] = state.content.id; // Always render the tooltip even if hidden, so that aria-describedby refers to a valid element
 
-    state.shouldRenderTooltip = true;
-  } else if (state.triggerAriaAttribute === 'describedby' && !isServerSideRender) {
-    triggerProps['aria-describedby'] = state.root.id;
-    state.shouldRenderTooltip = true;
+      state.shouldRenderTooltip = true;
+    }
   } // Apply the trigger props to the child, either by calling the render function, or cloning with the new props
 
 
-  state.root.children = applyTriggerPropsToChildren(state.root.children, triggerProps);
+  state.children = applyTriggerPropsToChildren(children, triggerProps);
   return state;
 };
 /**