From ed2eda83c4e872c89d1726830d005ddfc7ecb95a Mon Sep 17 00:00:00 2001 From: KHMakoto Date: Wed, 6 Apr 2022 15:42:05 -0500 Subject: [PATCH 1/7] Re-exporting everything from @fluentui/react-tabster and @fluentui/react-utilities in @fluentui/react-components. --- packages/react-components/package.json | 1 + packages/react-components/src/index.ts | 107 +++++++++++++++++++- packages/react-tabster/src/hooks/index.ts | 6 +- packages/react-tabster/src/index.ts | 19 +++- packages/react-utilities/src/hooks/index.ts | 4 +- packages/react-utilities/src/index.ts | 92 ++++++++++++++++- 6 files changed, 218 insertions(+), 11 deletions(-) diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 948aedeb45667..b7515fc3d70fa 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -53,6 +53,7 @@ "@fluentui/react-slider": "9.0.0-beta.10", "@fluentui/react-switch": "9.0.0-rc.5", "@fluentui/react-tabs": "9.0.0-beta.8", + "@fluentui/react-tabster": "9.0.0-rc.5", "@fluentui/react-theme": "9.0.0-rc.4", "@fluentui/react-tooltip": "9.0.0-rc.5", "@fluentui/react-utilities": "9.0.0-rc.5", diff --git a/packages/react-components/src/index.ts b/packages/react-components/src/index.ts index 2755a1bf19cdc..c68a941588522 100644 --- a/packages/react-components/src/index.ts +++ b/packages/react-components/src/index.ts @@ -26,6 +26,25 @@ export type { FluentProviderSlots, FluentProviderState, } from '@fluentui/react-provider'; +export { + createCustomFocusIndicatorStyle, + createFocusOutlineStyle, + useArrowNavigationGroup, + useFocusableGroup, + useFocusFinders, + useKeyboardNavAttribute, + useModalAttributes, + useTabsterAttributes, +} from '@fluentui/react-tabster'; +export type { + CreateFocusIndicatorStyleRuleOptions, + FocusOutlineOffset, + FocusOutlineStyleOptions, + UseArrowNavigationGroupOptions, + UseFocusableGroupOptions, + UseModalAttributesOptions, +} from '@fluentui/react-tabster'; + export { createDarkTheme, createHighContrastTheme, @@ -55,7 +74,93 @@ export type { StrokeWidthTokens, Theme, } from '@fluentui/react-theme'; -export { SSRProvider } from '@fluentui/react-utilities'; +export { + anchorProperties, + applyTriggerPropsToChildren, + audioProperties, + baseElementEvents, + baseElementProperties, + buttonProperties, + canUseDOM, + clamp, + colGroupProperties, + colProperties, + defaultSSRContextValue, + divProperties, + fieldsetProperties, + formProperties, + getNativeElementProps, + getNativeProps, + getPartitionedNativeProps, + getRTLSafeKey, + getSlots, + getTriggerChild, + htmlElementProperties, + iframeProperties, + // eslint-disable-next-line deprecation/deprecation + imageProperties, + imgProperties, + inputProperties, + labelProperties, + liProperties, + olProperties, + omit, + optionProperties, + resetIdsForTests, + resolveShorthand, + selectProperties, + tableProperties, + tdProperties, + textAreaProperties, + thProperties, + trProperties, + useBoolean, + useConst, + useControllableState, + useEventCallback, + useFirstMount, + useForceUpdate, + useId, + useIsomorphicLayoutEffect, + useIsSSR, + useMergedEventCallbacks, + useMergedRefs, + useMount, + useOnClickOutside, + useOnScrollOutside, + usePrevious, + useSSRContext, + useTimeout, + useUnmount, + videoProperties, + SSRContext, + SSRProvider, +} from '@fluentui/react-utilities'; +export type { + AsIntrinsicElement, + ComponentProps, + ComponentState, + ExtractSlotProps, + ForwardRefComponent, + IsSingleton, + PropsWithoutRef, + RefObjectFunction, + ReplaceNullWithUndefined, + ResolveShorthandFunction, + ResolveShorthandOptions, + Slot, + Slots, + SlotClassNames, + SlotPropsRecord, + SlotRenderFunction, + SlotShorthandValue, + SSRContextValue, + UnionToIntersection, + UnknownSlotProps, + UseBooleanCallbacks, + UseControllableStateOptions, + UseOnClickOrScrollOutsideOptions, +} from '@fluentui/react-utilities'; // Components export { diff --git a/packages/react-tabster/src/hooks/index.ts b/packages/react-tabster/src/hooks/index.ts index 72f74c994b2f7..c1ff99556104b 100644 --- a/packages/react-tabster/src/hooks/index.ts +++ b/packages/react-tabster/src/hooks/index.ts @@ -1,7 +1,7 @@ export * from './useArrowNavigationGroup'; +export * from './useFocusableGroup'; export * from './useFocusFinders'; -export * from './useModalAttributes'; -export * from './useTabsterAttributes'; export * from './useFocusIndicatorStyle'; export * from './useKeyboardNavAttribute'; -export * from './useFocusableGroup'; +export * from './useModalAttributes'; +export * from './useTabsterAttributes'; diff --git a/packages/react-tabster/src/index.ts b/packages/react-tabster/src/index.ts index 429b7dfe4e808..32b147e2f2afb 100644 --- a/packages/react-tabster/src/index.ts +++ b/packages/react-tabster/src/index.ts @@ -1 +1,18 @@ -export * from './hooks/index'; +export { + createCustomFocusIndicatorStyle, + createFocusOutlineStyle, + useArrowNavigationGroup, + useFocusableGroup, + useFocusFinders, + useKeyboardNavAttribute, + useModalAttributes, + useTabsterAttributes, +} from './hooks/index'; +export type { + CreateFocusIndicatorStyleRuleOptions, + FocusOutlineOffset, + FocusOutlineStyleOptions, + UseArrowNavigationGroupOptions, + UseFocusableGroupOptions, + UseModalAttributesOptions, +} from './hooks/index'; diff --git a/packages/react-utilities/src/hooks/index.ts b/packages/react-utilities/src/hooks/index.ts index 09fd9bc34feea..bd84f54a0371e 100644 --- a/packages/react-utilities/src/hooks/index.ts +++ b/packages/react-utilities/src/hooks/index.ts @@ -1,8 +1,9 @@ -export * from './useControllableState'; export * from './useBoolean'; export * from './useConst'; +export * from './useControllableState'; export * from './useEventCallback'; export * from './useFirstMount'; +export * from './useForceUpdate'; export * from './useId'; export * from './useIsomorphicLayoutEffect'; export * from './useMergedEventCallbacks'; @@ -13,4 +14,3 @@ export * from './useOnScrollOutside'; export * from './usePrevious'; export * from './useTimeout'; export * from './useUnmount'; -export * from './useForceUpdate'; diff --git a/packages/react-utilities/src/index.ts b/packages/react-utilities/src/index.ts index 50f5118ce4832..8eef208cbe4cc 100644 --- a/packages/react-utilities/src/index.ts +++ b/packages/react-utilities/src/index.ts @@ -1,4 +1,88 @@ -export * from './compose/index'; -export * from './hooks/index'; -export * from './ssr/index'; -export * from './utils/index'; +export { getSlots, resolveShorthand } from './compose/index'; +export type { + AsIntrinsicElement, + ComponentProps, + ComponentState, + ExtractSlotProps, + ForwardRefComponent, + IsSingleton, + PropsWithoutRef, + ReplaceNullWithUndefined, + ResolveShorthandFunction, + ResolveShorthandOptions, + Slot, + Slots, + SlotClassNames, + SlotPropsRecord, + SlotRenderFunction, + SlotShorthandValue, + UnionToIntersection, + UnknownSlotProps, +} from './compose/index'; + +export { + resetIdsForTests, + useBoolean, + useConst, + useControllableState, + useEventCallback, + useFirstMount, + useForceUpdate, + useId, + useIsomorphicLayoutEffect, + useMergedEventCallbacks, + useMergedRefs, + useMount, + useOnClickOutside, + useOnScrollOutside, + usePrevious, + useTimeout, + useUnmount, +} from './hooks/index'; +export type { + RefObjectFunction, + UseBooleanCallbacks, + UseControllableStateOptions, + UseOnClickOrScrollOutsideOptions, +} from './hooks/index'; + +export { canUseDOM, defaultSSRContextValue, useIsSSR, useSSRContext, SSRContext, SSRProvider } from './ssr/index'; +export type { SSRContextValue } from './ssr/index'; + +export { + anchorProperties, + applyTriggerPropsToChildren, + audioProperties, + baseElementEvents, + baseElementProperties, + buttonProperties, + clamp, + colGroupProperties, + colProperties, + divProperties, + fieldsetProperties, + formProperties, + getNativeElementProps, + getNativeProps, + getPartitionedNativeProps, + getRTLSafeKey, + getTriggerChild, + htmlElementProperties, + iframeProperties, + // eslint-disable-next-line deprecation/deprecation + imageProperties, + imgProperties, + inputProperties, + labelProperties, + liProperties, + olProperties, + omit, + optionProperties, + selectProperties, + tableProperties, + tdProperties, + textAreaProperties, + thProperties, + trProperties, + videoProperties, +} from './utils/index'; From f623086c9fd11aabf1fe80ad93a78a73b223124b Mon Sep 17 00:00:00 2001 From: KHMakoto Date: Wed, 6 Apr 2022 16:14:43 -0500 Subject: [PATCH 2/7] Adding change files. --- ...-ea1f05c8-4a94-4a3a-b122-0bdc10f78a9c.json | 7 + ...-29c1cf42-57a9-47e2-8bdc-0c708b3bcbae.json | 7 + ...-c00d688f-01da-4335-8e5a-00bc2df2a75b.json | 7 + .../etc/react-components.api.md | 294 ++++++++++++++++++ packages/react-components/src/index.ts | 3 + packages/react-utilities/src/index.ts | 3 + 6 files changed, 321 insertions(+) create mode 100644 change/@fluentui-react-components-ea1f05c8-4a94-4a3a-b122-0bdc10f78a9c.json create mode 100644 change/@fluentui-react-tabster-29c1cf42-57a9-47e2-8bdc-0c708b3bcbae.json create mode 100644 change/@fluentui-react-utilities-c00d688f-01da-4335-8e5a-00bc2df2a75b.json diff --git a/change/@fluentui-react-components-ea1f05c8-4a94-4a3a-b122-0bdc10f78a9c.json b/change/@fluentui-react-components-ea1f05c8-4a94-4a3a-b122-0bdc10f78a9c.json new file mode 100644 index 0000000000000..53ef76ab59c0b --- /dev/null +++ b/change/@fluentui-react-components-ea1f05c8-4a94-4a3a-b122-0bdc10f78a9c.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Re-exporting everything from @fluentui/react-tabster and @fluentui/react-utilities in @fluentui/react-components.", + "packageName": "@fluentui/react-components", + "email": "Humberto.Morimoto@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-tabster-29c1cf42-57a9-47e2-8bdc-0c708b3bcbae.json b/change/@fluentui-react-tabster-29c1cf42-57a9-47e2-8bdc-0c708b3bcbae.json new file mode 100644 index 0000000000000..16c88bf5ebb28 --- /dev/null +++ b/change/@fluentui-react-tabster-29c1cf42-57a9-47e2-8bdc-0c708b3bcbae.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Removing star exports at src/index.ts.", + "packageName": "@fluentui/react-tabster", + "email": "Humberto.Morimoto@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@fluentui-react-utilities-c00d688f-01da-4335-8e5a-00bc2df2a75b.json b/change/@fluentui-react-utilities-c00d688f-01da-4335-8e5a-00bc2df2a75b.json new file mode 100644 index 0000000000000..6eb5aa7470d15 --- /dev/null +++ b/change/@fluentui-react-utilities-c00d688f-01da-4335-8e5a-00bc2df2a75b.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Removing star exports at src/index.ts", + "packageName": "@fluentui/react-utilities", + "email": "Humberto.Morimoto@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/react-components/etc/react-components.api.md b/packages/react-components/etc/react-components.api.md index a2df860ee49ce..3f7122daa3be2 100644 --- a/packages/react-components/etc/react-components.api.md +++ b/packages/react-components/etc/react-components.api.md @@ -44,7 +44,11 @@ import { AccordionState } from '@fluentui/react-accordion'; import { AccordionToggleData } from '@fluentui/react-accordion'; import { AccordionToggleEvent } from '@fluentui/react-accordion'; import { AccordionToggleEventHandler } from '@fluentui/react-accordion'; +import { anchorProperties } from '@fluentui/react-utilities'; +import { applyTriggerPropsToChildren } from '@fluentui/react-utilities'; import { arrowHeights } from '@fluentui/react-popover'; +import { AsIntrinsicElement } from '@fluentui/react-utilities'; +import { audioProperties } from '@fluentui/react-utilities'; import { Avatar } from '@fluentui/react-avatar'; import { avatarClassName } from '@fluentui/react-avatar'; import { avatarClassNames } from '@fluentui/react-avatar'; @@ -58,6 +62,8 @@ import { badgeClassNames } from '@fluentui/react-badge'; import { BadgeProps } from '@fluentui/react-badge'; import { BadgeSlots } from '@fluentui/react-badge'; import { BadgeState } from '@fluentui/react-badge'; +import { baseElementEvents } from '@fluentui/react-utilities'; +import { baseElementProperties } from '@fluentui/react-utilities'; import { Body as Body_2 } from '@fluentui/react-text'; import { bodyClassName } from '@fluentui/react-text'; import { bodyClassNames } from '@fluentui/react-text'; @@ -66,14 +72,21 @@ import { BrandVariants } from '@fluentui/react-theme'; import { Button } from '@fluentui/react-button'; import { buttonClassName } from '@fluentui/react-button'; import { buttonClassNames } from '@fluentui/react-button'; +import { buttonProperties } from '@fluentui/react-utilities'; import { ButtonProps } from '@fluentui/react-button'; import { ButtonSlots } from '@fluentui/react-button'; import { ButtonState } from '@fluentui/react-button'; +import { canUseDOM } from '@fluentui/react-utilities'; import { Caption } from '@fluentui/react-text'; import { captionClassName } from '@fluentui/react-text'; import { captionClassNames } from '@fluentui/react-text'; +import { clamp } from '@fluentui/react-utilities'; +import { colGroupProperties } from '@fluentui/react-utilities'; import { ColorPaletteTokens } from '@fluentui/react-theme'; import { ColorTokens } from '@fluentui/react-theme'; +import { colProperties } from '@fluentui/react-utilities'; +import { ComponentProps } from '@fluentui/react-utilities'; +import { ComponentState } from '@fluentui/react-utilities'; import { CompoundButton } from '@fluentui/react-button'; import { compoundButtonClassName } from '@fluentui/react-button'; import { compoundButtonClassNames } from '@fluentui/react-button'; @@ -85,11 +98,15 @@ import { counterBadgeClassName } from '@fluentui/react-badge'; import { counterBadgeClassNames } from '@fluentui/react-badge'; import { CounterBadgeProps } from '@fluentui/react-badge'; import { CounterBadgeState } from '@fluentui/react-badge'; +import { createCustomFocusIndicatorStyle } from '@fluentui/react-tabster'; import { createDarkTheme } from '@fluentui/react-theme'; import { createDOMRenderer } from '@griffel/react'; +import { CreateFocusIndicatorStyleRuleOptions } from '@fluentui/react-tabster'; +import { createFocusOutlineStyle } from '@fluentui/react-tabster'; import { createHighContrastTheme } from '@fluentui/react-theme'; import { createLightTheme } from '@fluentui/react-theme'; import { createTeamsDarkTheme } from '@fluentui/react-theme'; +import { defaultSSRContextValue } from '@fluentui/react-utilities'; import { Display } from '@fluentui/react-text'; import { displayClassName } from '@fluentui/react-text'; import { displayClassNames } from '@fluentui/react-text'; @@ -99,7 +116,10 @@ import { dividerClassNames } from '@fluentui/react-divider'; import { DividerProps } from '@fluentui/react-divider'; import { DividerSlots } from '@fluentui/react-divider'; import { DividerState } from '@fluentui/react-divider'; +import { divProperties } from '@fluentui/react-utilities'; import { elementContains } from '@fluentui/react-portal'; +import { ExtractSlotProps } from '@fluentui/react-utilities'; +import { fieldsetProperties } from '@fluentui/react-utilities'; import { FluentProvider } from '@fluentui/react-provider'; import { fluentProviderClassName } from '@fluentui/react-provider'; import { fluentProviderClassNames } from '@fluentui/react-provider'; @@ -107,18 +127,37 @@ import { FluentProviderContextValues } from '@fluentui/react-provider'; import { FluentProviderProps } from '@fluentui/react-provider'; import { FluentProviderSlots } from '@fluentui/react-provider'; import { FluentProviderState } from '@fluentui/react-provider'; +import { FluentTriggerComponent } from '@fluentui/react-utilities'; +import { FocusOutlineOffset } from '@fluentui/react-tabster'; +import { FocusOutlineStyleOptions } from '@fluentui/react-tabster'; import { FontFamilyTokens } from '@fluentui/react-theme'; import { FontSizeTokens } from '@fluentui/react-theme'; import { FontWeightTokens } from '@fluentui/react-theme'; +import { formProperties } from '@fluentui/react-utilities'; +import { ForwardRefComponent } from '@fluentui/react-utilities'; +import { getNativeElementProps } from '@fluentui/react-utilities'; +import { getNativeProps } from '@fluentui/react-utilities'; +import { getPartitionedNativeProps } from '@fluentui/react-utilities'; +import { getRTLSafeKey } from '@fluentui/react-utilities'; +import { getSlots } from '@fluentui/react-utilities'; +import { getTriggerChild } from '@fluentui/react-utilities'; import { Headline } from '@fluentui/react-text'; import { headlineClassName } from '@fluentui/react-text'; import { headlineClassNames } from '@fluentui/react-text'; +import { htmlElementProperties } from '@fluentui/react-utilities'; +import { iframeProperties } from '@fluentui/react-utilities'; import { Image as Image_2 } from '@fluentui/react-image'; import { imageClassName } from '@fluentui/react-image'; import { imageClassNames } from '@fluentui/react-image'; +import { imageProperties } from '@fluentui/react-utilities'; import { ImageProps } from '@fluentui/react-image'; import { ImageSlots } from '@fluentui/react-image'; import { ImageState } from '@fluentui/react-image'; +import { imgProperties } from '@fluentui/react-utilities'; +import { inputProperties } from '@fluentui/react-utilities'; +import { isFluentTrigger } from '@fluentui/react-utilities'; +import { IsSingleton } from '@fluentui/react-utilities'; +import { labelProperties } from '@fluentui/react-utilities'; import { LargeTitle } from '@fluentui/react-text'; import { largeTitleClassName } from '@fluentui/react-text'; import { largeTitleClassNames } from '@fluentui/react-text'; @@ -129,6 +168,7 @@ import { linkClassNames } from '@fluentui/react-link'; import { LinkProps } from '@fluentui/react-link'; import { LinkSlots } from '@fluentui/react-link'; import { LinkState } from '@fluentui/react-link'; +import { liProperties } from '@fluentui/react-utilities'; import { makeStaticStyles } from '@griffel/react'; import { makeStyles } from '@griffel/react'; import { Menu } from '@fluentui/react-menu'; @@ -216,9 +256,12 @@ import { MenuTriggerContextProvider } from '@fluentui/react-menu'; import { MenuTriggerProps } from '@fluentui/react-menu'; import { MenuTriggerState } from '@fluentui/react-menu'; import { mergeClasses } from '@griffel/react'; +import { olProperties } from '@fluentui/react-utilities'; +import { omit } from '@fluentui/react-utilities'; import { OnOpenChangeData } from '@fluentui/react-popover'; import { OnVisibleChangeData } from '@fluentui/react-tooltip'; import { OpenPopoverEvents } from '@fluentui/react-popover'; +import { optionProperties } from '@fluentui/react-utilities'; import { PartialTheme } from '@fluentui/react-theme'; import { Popover } from '@fluentui/react-popover'; import { PopoverContext } from '@fluentui/react-popover'; @@ -244,6 +287,8 @@ import { presenceBadgeClassNames } from '@fluentui/react-badge'; import { PresenceBadgeProps } from '@fluentui/react-badge'; import { PresenceBadgeState } from '@fluentui/react-badge'; import { PresenceBadgeStatus } from '@fluentui/react-badge'; +import { PropsWithoutRef } from '@fluentui/react-utilities'; +import { RefObjectFunction } from '@fluentui/react-utilities'; import { renderAccordion_unstable } from '@fluentui/react-accordion'; import { renderAccordionHeader_unstable } from '@fluentui/react-accordion'; import { renderAccordionItem_unstable } from '@fluentui/react-accordion'; @@ -279,32 +324,50 @@ import { renderText_unstable } from '@fluentui/react-text'; import { renderToggleButton_unstable } from '@fluentui/react-button'; import { renderTooltip_unstable } from '@fluentui/react-tooltip'; import { renderToStyleElements } from '@griffel/react'; +import { ReplaceNullWithUndefined } from '@fluentui/react-utilities'; +import { resetIdsForTests } from '@fluentui/react-utilities'; +import { resolveShorthand } from '@fluentui/react-utilities'; +import { ResolveShorthandFunction } from '@fluentui/react-utilities'; +import { ResolveShorthandOptions } from '@fluentui/react-utilities'; import { SelectableHandler } from '@fluentui/react-menu'; +import { selectProperties } from '@fluentui/react-utilities'; import { setVirtualParent } from '@fluentui/react-portal'; import { ShadowBrandTokens } from '@fluentui/react-theme'; import { ShadowTokens } from '@fluentui/react-theme'; import { shorthands } from '@griffel/react'; +import { shouldPreventDefaultOnKeyDown } from '@fluentui/react-utilities'; import { Slider } from '@fluentui/react-slider'; import { sliderClassNames } from '@fluentui/react-slider'; import { SliderOnChangeData } from '@fluentui/react-slider'; import { SliderProps } from '@fluentui/react-slider'; import { SliderSlots } from '@fluentui/react-slider'; import { SliderState } from '@fluentui/react-slider'; +import { Slot } from '@fluentui/react-utilities'; +import { SlotClassNames } from '@fluentui/react-utilities'; +import { SlotPropsRecord } from '@fluentui/react-utilities'; +import { SlotRenderFunction } from '@fluentui/react-utilities'; +import { Slots } from '@fluentui/react-utilities'; +import { SlotShorthandValue } from '@fluentui/react-utilities'; import { SplitButton } from '@fluentui/react-button'; import { splitButtonClassName } from '@fluentui/react-button'; import { splitButtonClassNames } from '@fluentui/react-button'; import { SplitButtonProps } from '@fluentui/react-button'; import { SplitButtonSlots } from '@fluentui/react-button'; import { SplitButtonState } from '@fluentui/react-button'; +import { SSRContext } from '@fluentui/react-utilities'; +import { SSRContextValue } from '@fluentui/react-utilities'; import { SSRProvider } from '@fluentui/react-utilities'; import { StrokeWidthTokens } from '@fluentui/react-theme'; import { Subheadline } from '@fluentui/react-text'; import { subheadlineClassName } from '@fluentui/react-text'; import { subheadlineClassNames } from '@fluentui/react-text'; +import { tableProperties } from '@fluentui/react-utilities'; +import { tdProperties } from '@fluentui/react-utilities'; import { teamsDarkTheme } from '@fluentui/react-theme'; import { teamsHighContrastTheme } from '@fluentui/react-theme'; import { teamsLightTheme } from '@fluentui/react-theme'; import { Text as Text_2 } from '@fluentui/react-text'; +import { textAreaProperties } from '@fluentui/react-utilities'; import { textClassName } from '@fluentui/react-text'; import { textClassNames } from '@fluentui/react-text'; import { TextProps } from '@fluentui/react-text'; @@ -312,6 +375,7 @@ import { TextSlots } from '@fluentui/react-text'; import { TextState } from '@fluentui/react-text'; import { Theme } from '@fluentui/react-theme'; import { themeToTokensObject } from '@fluentui/react-theme'; +import { thProperties } from '@fluentui/react-utilities'; import { Title1 } from '@fluentui/react-text'; import { title1ClassName } from '@fluentui/react-text'; import { title1ClassNames } from '@fluentui/react-text'; @@ -334,7 +398,10 @@ import { TooltipProps } from '@fluentui/react-tooltip'; import { TooltipSlots } from '@fluentui/react-tooltip'; import { TooltipState } from '@fluentui/react-tooltip'; import { TooltipTriggerProps } from '@fluentui/react-tooltip'; +import { trProperties } from '@fluentui/react-utilities'; import { UninitializedMenuListState } from '@fluentui/react-menu'; +import { UnionToIntersection } from '@fluentui/react-utilities'; +import { UnknownSlotProps } from '@fluentui/react-utilities'; import { useAccordion_unstable } from '@fluentui/react-accordion'; import { useAccordionContextValues_unstable } from '@fluentui/react-accordion'; import { useAccordionHeader_unstable } from '@fluentui/react-accordion'; @@ -347,25 +414,42 @@ import { useAccordionItemStyles_unstable } from '@fluentui/react-accordion'; import { useAccordionPanel_unstable } from '@fluentui/react-accordion'; import { useAccordionPanelStyles_unstable } from '@fluentui/react-accordion'; import { useAccordionStyles_unstable } from '@fluentui/react-accordion'; +import { useArrowNavigationGroup } from '@fluentui/react-tabster'; +import { UseArrowNavigationGroupOptions } from '@fluentui/react-tabster'; import { useAvatar_unstable } from '@fluentui/react-avatar'; import { useAvatarStyles_unstable } from '@fluentui/react-avatar'; import { useBadge_unstable } from '@fluentui/react-badge'; import { useBadgeStyles_unstable } from '@fluentui/react-badge'; +import { useBoolean } from '@fluentui/react-utilities'; +import { UseBooleanCallbacks } from '@fluentui/react-utilities'; import { useButton_unstable } from '@fluentui/react-button'; import { useButtonStyles_unstable } from '@fluentui/react-button'; import { useCheckmarkStyles_unstable } from '@fluentui/react-menu'; import { useCompoundButton_unstable } from '@fluentui/react-button'; import { useCompoundButtonStyles_unstable } from '@fluentui/react-button'; +import { useConst } from '@fluentui/react-utilities'; +import { useControllableState } from '@fluentui/react-utilities'; +import { UseControllableStateOptions } from '@fluentui/react-utilities'; import { useCounterBadge_unstable } from '@fluentui/react-badge'; import { useCounterBadgeStyles_unstable } from '@fluentui/react-badge'; import { useDivider_unstable } from '@fluentui/react-divider'; import { useDividerStyles_unstable } from '@fluentui/react-divider'; +import { useEventCallback } from '@fluentui/react-utilities'; +import { useFirstMount } from '@fluentui/react-utilities'; import { useFluent } from '@fluentui/react-provider'; import { useFluentProvider_unstable } from '@fluentui/react-provider'; import { useFluentProviderContextValues_unstable } from '@fluentui/react-provider'; import { useFluentProviderStyles_unstable } from '@fluentui/react-provider'; +import { useFocusableGroup } from '@fluentui/react-tabster'; +import { UseFocusableGroupOptions } from '@fluentui/react-tabster'; +import { useFocusFinders } from '@fluentui/react-tabster'; +import { useForceUpdate } from '@fluentui/react-utilities'; +import { useId } from '@fluentui/react-utilities'; import { useImage_unstable } from '@fluentui/react-image'; import { useImageStyles_unstable } from '@fluentui/react-image'; +import { useIsomorphicLayoutEffect } from '@fluentui/react-utilities'; +import { useIsSSR } from '@fluentui/react-utilities'; +import { useKeyboardNavAttribute } from '@fluentui/react-tabster'; import { useLink_unstable } from '@fluentui/react-link'; import { useLinkState_unstable } from '@fluentui/react-link'; import { useLinkStyles_unstable } from '@fluentui/react-link'; @@ -398,6 +482,14 @@ import { useMenuSplitGroup_unstable } from '@fluentui/react-menu'; import { useMenuSplitGroupStyles_unstable } from '@fluentui/react-menu'; import { useMenuTrigger_unstable } from '@fluentui/react-menu'; import { useMenuTriggerContext_unstable } from '@fluentui/react-menu'; +import { useMergedEventCallbacks } from '@fluentui/react-utilities'; +import { useMergedRefs } from '@fluentui/react-utilities'; +import { useModalAttributes } from '@fluentui/react-tabster'; +import { UseModalAttributesOptions } from '@fluentui/react-tabster'; +import { useMount } from '@fluentui/react-utilities'; +import { UseOnClickOrScrollOutsideOptions } from '@fluentui/react-utilities'; +import { useOnClickOutside } from '@fluentui/react-utilities'; +import { useOnScrollOutside } from '@fluentui/react-utilities'; import { usePopover_unstable } from '@fluentui/react-popover'; import { usePopoverContext_unstable } from '@fluentui/react-popover'; import { usePopoverSurface_unstable } from '@fluentui/react-popover'; @@ -405,17 +497,23 @@ import { usePopoverSurfaceStyles_unstable } from '@fluentui/react-popover'; import { usePopoverTrigger_unstable } from '@fluentui/react-popover'; import { usePortal_unstable } from '@fluentui/react-portal'; import { usePresenceBadge_unstable } from '@fluentui/react-badge'; +import { usePrevious } from '@fluentui/react-utilities'; import { useSlider_unstable } from '@fluentui/react-slider'; import { useSliderState_unstable } from '@fluentui/react-slider'; import { useSliderStyles_unstable } from '@fluentui/react-slider'; import { useSplitButton_unstable } from '@fluentui/react-button'; import { useSplitButtonStyles_unstable } from '@fluentui/react-button'; +import { useSSRContext } from '@fluentui/react-utilities'; +import { useTabsterAttributes } from '@fluentui/react-tabster'; import { useText_unstable } from '@fluentui/react-text'; import { useTextStyles_unstable } from '@fluentui/react-text'; +import { useTimeout } from '@fluentui/react-utilities'; import { useToggleButton_unstable } from '@fluentui/react-button'; import { useToggleButtonStyles_unstable } from '@fluentui/react-button'; import { useTooltip_unstable } from '@fluentui/react-tooltip'; import { useTooltipStyles_unstable } from '@fluentui/react-tooltip'; +import { useUnmount } from '@fluentui/react-utilities'; +import { videoProperties } from '@fluentui/react-utilities'; import { webDarkTheme } from '@fluentui/react-theme'; import { webHighContrastTheme } from '@fluentui/react-theme'; import { webLightTheme } from '@fluentui/react-theme'; @@ -500,8 +598,16 @@ export { AccordionToggleEvent } export { AccordionToggleEventHandler } +export { anchorProperties } + +export { applyTriggerPropsToChildren } + export { arrowHeights } +export { AsIntrinsicElement } + +export { audioProperties } + export { Avatar } export { avatarClassName } @@ -528,6 +634,10 @@ export { BadgeSlots } export { BadgeState } +export { baseElementEvents } + +export { baseElementProperties } + export { Body_2 as Body } export { bodyClassName } @@ -544,22 +654,36 @@ export { buttonClassName } export { buttonClassNames } +export { buttonProperties } + export { ButtonProps } export { ButtonSlots } export { ButtonState } +export { canUseDOM } + export { Caption } export { captionClassName } export { captionClassNames } +export { clamp } + +export { colGroupProperties } + export { ColorPaletteTokens } export { ColorTokens } +export { colProperties } + +export { ComponentProps } + +export { ComponentState } + export { CompoundButton } export { compoundButtonClassName } @@ -582,16 +706,24 @@ export { CounterBadgeProps } export { CounterBadgeState } +export { createCustomFocusIndicatorStyle } + export { createDarkTheme } export { createDOMRenderer } +export { CreateFocusIndicatorStyleRuleOptions } + +export { createFocusOutlineStyle } + export { createHighContrastTheme } export { createLightTheme } export { createTeamsDarkTheme } +export { defaultSSRContextValue } + export { Display } export { displayClassName } @@ -610,8 +742,14 @@ export { DividerSlots } export { DividerState } +export { divProperties } + export { elementContains } +export { ExtractSlotProps } + +export { fieldsetProperties } + export { FluentProvider } export { fluentProviderClassName } @@ -626,30 +764,68 @@ export { FluentProviderSlots } export { FluentProviderState } +export { FluentTriggerComponent } + +export { FocusOutlineOffset } + +export { FocusOutlineStyleOptions } + export { FontFamilyTokens } export { FontSizeTokens } export { FontWeightTokens } +export { formProperties } + +export { ForwardRefComponent } + +export { getNativeElementProps } + +export { getNativeProps } + +export { getPartitionedNativeProps } + +export { getRTLSafeKey } + +export { getSlots } + +export { getTriggerChild } + export { Headline } export { headlineClassName } export { headlineClassNames } +export { htmlElementProperties } + +export { iframeProperties } + export { Image_2 as Image } export { imageClassName } export { imageClassNames } +export { imageProperties } + export { ImageProps } export { ImageSlots } export { ImageState } +export { imgProperties } + +export { inputProperties } + +export { isFluentTrigger } + +export { IsSingleton } + +export { labelProperties } + export { LargeTitle } export { largeTitleClassName } @@ -670,6 +846,8 @@ export { LinkSlots } export { LinkState } +export { liProperties } + export { makeStaticStyles } export { makeStyles } @@ -844,12 +1022,18 @@ export { MenuTriggerState } export { mergeClasses } +export { olProperties } + +export { omit } + export { OnOpenChangeData } export { OnVisibleChangeData } export { OpenPopoverEvents } +export { optionProperties } + export { PartialTheme } export { Popover } @@ -900,6 +1084,10 @@ export { PresenceBadgeState } export { PresenceBadgeStatus } +export { PropsWithoutRef } + +export { RefObjectFunction } + export { renderAccordion_unstable } export { renderAccordionHeader_unstable } @@ -970,8 +1158,20 @@ export { renderTooltip_unstable } export { renderToStyleElements } +export { ReplaceNullWithUndefined } + +export { resetIdsForTests } + +export { resolveShorthand } + +export { ResolveShorthandFunction } + +export { ResolveShorthandOptions } + export { SelectableHandler } +export { selectProperties } + export { setVirtualParent } export { ShadowBrandTokens } @@ -980,6 +1180,8 @@ export { ShadowTokens } export { shorthands } +export { shouldPreventDefaultOnKeyDown } + export { Slider } export { sliderClassNames } @@ -992,6 +1194,18 @@ export { SliderSlots } export { SliderState } +export { Slot } + +export { SlotClassNames } + +export { SlotPropsRecord } + +export { SlotRenderFunction } + +export { Slots } + +export { SlotShorthandValue } + export { SplitButton } export { splitButtonClassName } @@ -1004,6 +1218,10 @@ export { SplitButtonSlots } export { SplitButtonState } +export { SSRContext } + +export { SSRContextValue } + export { SSRProvider } export { StrokeWidthTokens } @@ -1014,6 +1232,10 @@ export { subheadlineClassName } export { subheadlineClassNames } +export { tableProperties } + +export { tdProperties } + export { teamsDarkTheme } export { teamsHighContrastTheme } @@ -1022,6 +1244,8 @@ export { teamsLightTheme } export { Text_2 as Text } +export { textAreaProperties } + export { textClassName } export { textClassNames } @@ -1036,6 +1260,8 @@ export { Theme } export { themeToTokensObject } +export { thProperties } + export { Title1 } export { title1ClassName } @@ -1080,8 +1306,14 @@ export { TooltipState } export { TooltipTriggerProps } +export { trProperties } + export { UninitializedMenuListState } +export { UnionToIntersection } + +export { UnknownSlotProps } + export { useAccordion_unstable } export { useAccordionContextValues_unstable } @@ -1106,6 +1338,10 @@ export { useAccordionPanelStyles_unstable } export { useAccordionStyles_unstable } +export { useArrowNavigationGroup } + +export { UseArrowNavigationGroupOptions } + export { useAvatar_unstable } export { useAvatarStyles_unstable } @@ -1114,6 +1350,10 @@ export { useBadge_unstable } export { useBadgeStyles_unstable } +export { useBoolean } + +export { UseBooleanCallbacks } + export { useButton_unstable } export { useButtonStyles_unstable } @@ -1124,6 +1364,12 @@ export { useCompoundButton_unstable } export { useCompoundButtonStyles_unstable } +export { useConst } + +export { useControllableState } + +export { UseControllableStateOptions } + export { useCounterBadge_unstable } export { useCounterBadgeStyles_unstable } @@ -1132,6 +1378,10 @@ export { useDivider_unstable } export { useDividerStyles_unstable } +export { useEventCallback } + +export { useFirstMount } + export { useFluent } export { useFluentProvider_unstable } @@ -1140,10 +1390,26 @@ export { useFluentProviderContextValues_unstable } export { useFluentProviderStyles_unstable } +export { useFocusableGroup } + +export { UseFocusableGroupOptions } + +export { useFocusFinders } + +export { useForceUpdate } + +export { useId } + export { useImage_unstable } export { useImageStyles_unstable } +export { useIsomorphicLayoutEffect } + +export { useIsSSR } + +export { useKeyboardNavAttribute } + export { useLink_unstable } export { useLinkState_unstable } @@ -1208,6 +1474,22 @@ export { useMenuTrigger_unstable } export { useMenuTriggerContext_unstable } +export { useMergedEventCallbacks } + +export { useMergedRefs } + +export { useModalAttributes } + +export { UseModalAttributesOptions } + +export { useMount } + +export { UseOnClickOrScrollOutsideOptions } + +export { useOnClickOutside } + +export { useOnScrollOutside } + export { usePopover_unstable } export { usePopoverContext_unstable } @@ -1222,6 +1504,8 @@ export { usePortal_unstable } export { usePresenceBadge_unstable } +export { usePrevious } + export { useSlider_unstable } export { useSliderState_unstable } @@ -1232,10 +1516,16 @@ export { useSplitButton_unstable } export { useSplitButtonStyles_unstable } +export { useSSRContext } + +export { useTabsterAttributes } + export { useText_unstable } export { useTextStyles_unstable } +export { useTimeout } + export { useToggleButton_unstable } export { useToggleButtonStyles_unstable } @@ -1244,6 +1534,10 @@ export { useTooltip_unstable } export { useTooltipStyles_unstable } +export { useUnmount } + +export { videoProperties } + export { webDarkTheme } export { webHighContrastTheme } diff --git a/packages/react-components/src/index.ts b/packages/react-components/src/index.ts index c68a941588522..32042d5a8258e 100644 --- a/packages/react-components/src/index.ts +++ b/packages/react-components/src/index.ts @@ -101,6 +101,7 @@ export { imageProperties, imgProperties, inputProperties, + isFluentTrigger, labelProperties, liProperties, olProperties, @@ -109,6 +110,7 @@ export { resetIdsForTests, resolveShorthand, selectProperties, + shouldPreventDefaultOnKeyDown, tableProperties, tdProperties, textAreaProperties, @@ -136,6 +138,7 @@ export { SSRContext, SSRProvider, } from '@fluentui/react-utilities'; +export type { FluentTriggerComponent } from '@fluentui/react-utilities'; export type { AsIntrinsicElement, ComponentProps, diff --git a/packages/react-utilities/src/index.ts b/packages/react-utilities/src/index.ts index 8eef208cbe4cc..d6cde7a98e226 100644 --- a/packages/react-utilities/src/index.ts +++ b/packages/react-utilities/src/index.ts @@ -73,12 +73,14 @@ export { imageProperties, imgProperties, inputProperties, + isFluentTrigger, labelProperties, liProperties, olProperties, omit, optionProperties, selectProperties, + shouldPreventDefaultOnKeyDown, tableProperties, tdProperties, textAreaProperties, @@ -86,3 +88,4 @@ export { trProperties, videoProperties, } from './utils/index'; +export type { FluentTriggerComponent } from './utils/index'; From c5c4908ebc2f0c69086b650e49b7910c2f54f360 Mon Sep 17 00:00:00 2001 From: KHMakoto Date: Tue, 19 Apr 2022 11:12:50 -0500 Subject: [PATCH 3/7] Adding missing dependency. --- packages/react-components/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-components/package.json b/packages/react-components/package.json index 1f59b1cdb8fc7..6637bb7e1e086 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -53,6 +53,7 @@ "@fluentui/react-slider": "9.0.0-beta.10", "@fluentui/react-switch": "9.0.0-rc.5", "@fluentui/react-tabs": "9.0.0-beta.8", + "@fluentui/react-tabster": "9.0.0-rc.5", "@fluentui/react-textarea": "9.0.0-alpha.0", "@fluentui/react-theme": "9.0.0-rc.4", "@fluentui/react-tooltip": "9.0.0-rc.5", From 73a9b8972624b47a8e45a1a464f51c520909f8a1 Mon Sep 17 00:00:00 2001 From: KHMakoto Date: Tue, 19 Apr 2022 11:58:10 -0500 Subject: [PATCH 4/7] Cutting back on the things exported by react-components. --- .../etc/react-components.api.md | 162 ------------------ packages/react-components/src/index.ts | 55 ------ 2 files changed, 217 deletions(-) diff --git a/packages/react-components/etc/react-components.api.md b/packages/react-components/etc/react-components.api.md index 3f7122daa3be2..99ff6dd5e6d2d 100644 --- a/packages/react-components/etc/react-components.api.md +++ b/packages/react-components/etc/react-components.api.md @@ -44,11 +44,7 @@ import { AccordionState } from '@fluentui/react-accordion'; import { AccordionToggleData } from '@fluentui/react-accordion'; import { AccordionToggleEvent } from '@fluentui/react-accordion'; import { AccordionToggleEventHandler } from '@fluentui/react-accordion'; -import { anchorProperties } from '@fluentui/react-utilities'; -import { applyTriggerPropsToChildren } from '@fluentui/react-utilities'; import { arrowHeights } from '@fluentui/react-popover'; -import { AsIntrinsicElement } from '@fluentui/react-utilities'; -import { audioProperties } from '@fluentui/react-utilities'; import { Avatar } from '@fluentui/react-avatar'; import { avatarClassName } from '@fluentui/react-avatar'; import { avatarClassNames } from '@fluentui/react-avatar'; @@ -62,8 +58,6 @@ import { badgeClassNames } from '@fluentui/react-badge'; import { BadgeProps } from '@fluentui/react-badge'; import { BadgeSlots } from '@fluentui/react-badge'; import { BadgeState } from '@fluentui/react-badge'; -import { baseElementEvents } from '@fluentui/react-utilities'; -import { baseElementProperties } from '@fluentui/react-utilities'; import { Body as Body_2 } from '@fluentui/react-text'; import { bodyClassName } from '@fluentui/react-text'; import { bodyClassNames } from '@fluentui/react-text'; @@ -72,19 +66,15 @@ import { BrandVariants } from '@fluentui/react-theme'; import { Button } from '@fluentui/react-button'; import { buttonClassName } from '@fluentui/react-button'; import { buttonClassNames } from '@fluentui/react-button'; -import { buttonProperties } from '@fluentui/react-utilities'; import { ButtonProps } from '@fluentui/react-button'; import { ButtonSlots } from '@fluentui/react-button'; import { ButtonState } from '@fluentui/react-button'; -import { canUseDOM } from '@fluentui/react-utilities'; import { Caption } from '@fluentui/react-text'; import { captionClassName } from '@fluentui/react-text'; import { captionClassNames } from '@fluentui/react-text'; import { clamp } from '@fluentui/react-utilities'; -import { colGroupProperties } from '@fluentui/react-utilities'; import { ColorPaletteTokens } from '@fluentui/react-theme'; import { ColorTokens } from '@fluentui/react-theme'; -import { colProperties } from '@fluentui/react-utilities'; import { ComponentProps } from '@fluentui/react-utilities'; import { ComponentState } from '@fluentui/react-utilities'; import { CompoundButton } from '@fluentui/react-button'; @@ -106,7 +96,6 @@ import { createFocusOutlineStyle } from '@fluentui/react-tabster'; import { createHighContrastTheme } from '@fluentui/react-theme'; import { createLightTheme } from '@fluentui/react-theme'; import { createTeamsDarkTheme } from '@fluentui/react-theme'; -import { defaultSSRContextValue } from '@fluentui/react-utilities'; import { Display } from '@fluentui/react-text'; import { displayClassName } from '@fluentui/react-text'; import { displayClassNames } from '@fluentui/react-text'; @@ -116,10 +105,7 @@ import { dividerClassNames } from '@fluentui/react-divider'; import { DividerProps } from '@fluentui/react-divider'; import { DividerSlots } from '@fluentui/react-divider'; import { DividerState } from '@fluentui/react-divider'; -import { divProperties } from '@fluentui/react-utilities'; import { elementContains } from '@fluentui/react-portal'; -import { ExtractSlotProps } from '@fluentui/react-utilities'; -import { fieldsetProperties } from '@fluentui/react-utilities'; import { FluentProvider } from '@fluentui/react-provider'; import { fluentProviderClassName } from '@fluentui/react-provider'; import { fluentProviderClassNames } from '@fluentui/react-provider'; @@ -127,37 +113,25 @@ import { FluentProviderContextValues } from '@fluentui/react-provider'; import { FluentProviderProps } from '@fluentui/react-provider'; import { FluentProviderSlots } from '@fluentui/react-provider'; import { FluentProviderState } from '@fluentui/react-provider'; -import { FluentTriggerComponent } from '@fluentui/react-utilities'; -import { FocusOutlineOffset } from '@fluentui/react-tabster'; import { FocusOutlineStyleOptions } from '@fluentui/react-tabster'; import { FontFamilyTokens } from '@fluentui/react-theme'; import { FontSizeTokens } from '@fluentui/react-theme'; import { FontWeightTokens } from '@fluentui/react-theme'; -import { formProperties } from '@fluentui/react-utilities'; import { ForwardRefComponent } from '@fluentui/react-utilities'; import { getNativeElementProps } from '@fluentui/react-utilities'; import { getNativeProps } from '@fluentui/react-utilities'; import { getPartitionedNativeProps } from '@fluentui/react-utilities'; import { getRTLSafeKey } from '@fluentui/react-utilities'; import { getSlots } from '@fluentui/react-utilities'; -import { getTriggerChild } from '@fluentui/react-utilities'; import { Headline } from '@fluentui/react-text'; import { headlineClassName } from '@fluentui/react-text'; import { headlineClassNames } from '@fluentui/react-text'; -import { htmlElementProperties } from '@fluentui/react-utilities'; -import { iframeProperties } from '@fluentui/react-utilities'; import { Image as Image_2 } from '@fluentui/react-image'; import { imageClassName } from '@fluentui/react-image'; import { imageClassNames } from '@fluentui/react-image'; -import { imageProperties } from '@fluentui/react-utilities'; import { ImageProps } from '@fluentui/react-image'; import { ImageSlots } from '@fluentui/react-image'; import { ImageState } from '@fluentui/react-image'; -import { imgProperties } from '@fluentui/react-utilities'; -import { inputProperties } from '@fluentui/react-utilities'; -import { isFluentTrigger } from '@fluentui/react-utilities'; -import { IsSingleton } from '@fluentui/react-utilities'; -import { labelProperties } from '@fluentui/react-utilities'; import { LargeTitle } from '@fluentui/react-text'; import { largeTitleClassName } from '@fluentui/react-text'; import { largeTitleClassNames } from '@fluentui/react-text'; @@ -168,7 +142,6 @@ import { linkClassNames } from '@fluentui/react-link'; import { LinkProps } from '@fluentui/react-link'; import { LinkSlots } from '@fluentui/react-link'; import { LinkState } from '@fluentui/react-link'; -import { liProperties } from '@fluentui/react-utilities'; import { makeStaticStyles } from '@griffel/react'; import { makeStyles } from '@griffel/react'; import { Menu } from '@fluentui/react-menu'; @@ -256,12 +229,10 @@ import { MenuTriggerContextProvider } from '@fluentui/react-menu'; import { MenuTriggerProps } from '@fluentui/react-menu'; import { MenuTriggerState } from '@fluentui/react-menu'; import { mergeClasses } from '@griffel/react'; -import { olProperties } from '@fluentui/react-utilities'; import { omit } from '@fluentui/react-utilities'; import { OnOpenChangeData } from '@fluentui/react-popover'; import { OnVisibleChangeData } from '@fluentui/react-tooltip'; import { OpenPopoverEvents } from '@fluentui/react-popover'; -import { optionProperties } from '@fluentui/react-utilities'; import { PartialTheme } from '@fluentui/react-theme'; import { Popover } from '@fluentui/react-popover'; import { PopoverContext } from '@fluentui/react-popover'; @@ -287,8 +258,6 @@ import { presenceBadgeClassNames } from '@fluentui/react-badge'; import { PresenceBadgeProps } from '@fluentui/react-badge'; import { PresenceBadgeState } from '@fluentui/react-badge'; import { PresenceBadgeStatus } from '@fluentui/react-badge'; -import { PropsWithoutRef } from '@fluentui/react-utilities'; -import { RefObjectFunction } from '@fluentui/react-utilities'; import { renderAccordion_unstable } from '@fluentui/react-accordion'; import { renderAccordionHeader_unstable } from '@fluentui/react-accordion'; import { renderAccordionItem_unstable } from '@fluentui/react-accordion'; @@ -324,13 +293,10 @@ import { renderText_unstable } from '@fluentui/react-text'; import { renderToggleButton_unstable } from '@fluentui/react-button'; import { renderTooltip_unstable } from '@fluentui/react-tooltip'; import { renderToStyleElements } from '@griffel/react'; -import { ReplaceNullWithUndefined } from '@fluentui/react-utilities'; -import { resetIdsForTests } from '@fluentui/react-utilities'; import { resolveShorthand } from '@fluentui/react-utilities'; import { ResolveShorthandFunction } from '@fluentui/react-utilities'; import { ResolveShorthandOptions } from '@fluentui/react-utilities'; import { SelectableHandler } from '@fluentui/react-menu'; -import { selectProperties } from '@fluentui/react-utilities'; import { setVirtualParent } from '@fluentui/react-portal'; import { ShadowBrandTokens } from '@fluentui/react-theme'; import { ShadowTokens } from '@fluentui/react-theme'; @@ -345,9 +311,6 @@ import { SliderState } from '@fluentui/react-slider'; import { Slot } from '@fluentui/react-utilities'; import { SlotClassNames } from '@fluentui/react-utilities'; import { SlotPropsRecord } from '@fluentui/react-utilities'; -import { SlotRenderFunction } from '@fluentui/react-utilities'; -import { Slots } from '@fluentui/react-utilities'; -import { SlotShorthandValue } from '@fluentui/react-utilities'; import { SplitButton } from '@fluentui/react-button'; import { splitButtonClassName } from '@fluentui/react-button'; import { splitButtonClassNames } from '@fluentui/react-button'; @@ -355,19 +318,15 @@ import { SplitButtonProps } from '@fluentui/react-button'; import { SplitButtonSlots } from '@fluentui/react-button'; import { SplitButtonState } from '@fluentui/react-button'; import { SSRContext } from '@fluentui/react-utilities'; -import { SSRContextValue } from '@fluentui/react-utilities'; import { SSRProvider } from '@fluentui/react-utilities'; import { StrokeWidthTokens } from '@fluentui/react-theme'; import { Subheadline } from '@fluentui/react-text'; import { subheadlineClassName } from '@fluentui/react-text'; import { subheadlineClassNames } from '@fluentui/react-text'; -import { tableProperties } from '@fluentui/react-utilities'; -import { tdProperties } from '@fluentui/react-utilities'; import { teamsDarkTheme } from '@fluentui/react-theme'; import { teamsHighContrastTheme } from '@fluentui/react-theme'; import { teamsLightTheme } from '@fluentui/react-theme'; import { Text as Text_2 } from '@fluentui/react-text'; -import { textAreaProperties } from '@fluentui/react-utilities'; import { textClassName } from '@fluentui/react-text'; import { textClassNames } from '@fluentui/react-text'; import { TextProps } from '@fluentui/react-text'; @@ -375,7 +334,6 @@ import { TextSlots } from '@fluentui/react-text'; import { TextState } from '@fluentui/react-text'; import { Theme } from '@fluentui/react-theme'; import { themeToTokensObject } from '@fluentui/react-theme'; -import { thProperties } from '@fluentui/react-utilities'; import { Title1 } from '@fluentui/react-text'; import { title1ClassName } from '@fluentui/react-text'; import { title1ClassNames } from '@fluentui/react-text'; @@ -398,10 +356,7 @@ import { TooltipProps } from '@fluentui/react-tooltip'; import { TooltipSlots } from '@fluentui/react-tooltip'; import { TooltipState } from '@fluentui/react-tooltip'; import { TooltipTriggerProps } from '@fluentui/react-tooltip'; -import { trProperties } from '@fluentui/react-utilities'; import { UninitializedMenuListState } from '@fluentui/react-menu'; -import { UnionToIntersection } from '@fluentui/react-utilities'; -import { UnknownSlotProps } from '@fluentui/react-utilities'; import { useAccordion_unstable } from '@fluentui/react-accordion'; import { useAccordionContextValues_unstable } from '@fluentui/react-accordion'; import { useAccordionHeader_unstable } from '@fluentui/react-accordion'; @@ -434,8 +389,6 @@ import { useCounterBadge_unstable } from '@fluentui/react-badge'; import { useCounterBadgeStyles_unstable } from '@fluentui/react-badge'; import { useDivider_unstable } from '@fluentui/react-divider'; import { useDividerStyles_unstable } from '@fluentui/react-divider'; -import { useEventCallback } from '@fluentui/react-utilities'; -import { useFirstMount } from '@fluentui/react-utilities'; import { useFluent } from '@fluentui/react-provider'; import { useFluentProvider_unstable } from '@fluentui/react-provider'; import { useFluentProviderContextValues_unstable } from '@fluentui/react-provider'; @@ -443,11 +396,9 @@ import { useFluentProviderStyles_unstable } from '@fluentui/react-provider'; import { useFocusableGroup } from '@fluentui/react-tabster'; import { UseFocusableGroupOptions } from '@fluentui/react-tabster'; import { useFocusFinders } from '@fluentui/react-tabster'; -import { useForceUpdate } from '@fluentui/react-utilities'; import { useId } from '@fluentui/react-utilities'; import { useImage_unstable } from '@fluentui/react-image'; import { useImageStyles_unstable } from '@fluentui/react-image'; -import { useIsomorphicLayoutEffect } from '@fluentui/react-utilities'; import { useIsSSR } from '@fluentui/react-utilities'; import { useKeyboardNavAttribute } from '@fluentui/react-tabster'; import { useLink_unstable } from '@fluentui/react-link'; @@ -487,9 +438,6 @@ import { useMergedRefs } from '@fluentui/react-utilities'; import { useModalAttributes } from '@fluentui/react-tabster'; import { UseModalAttributesOptions } from '@fluentui/react-tabster'; import { useMount } from '@fluentui/react-utilities'; -import { UseOnClickOrScrollOutsideOptions } from '@fluentui/react-utilities'; -import { useOnClickOutside } from '@fluentui/react-utilities'; -import { useOnScrollOutside } from '@fluentui/react-utilities'; import { usePopover_unstable } from '@fluentui/react-popover'; import { usePopoverContext_unstable } from '@fluentui/react-popover'; import { usePopoverSurface_unstable } from '@fluentui/react-popover'; @@ -497,7 +445,6 @@ import { usePopoverSurfaceStyles_unstable } from '@fluentui/react-popover'; import { usePopoverTrigger_unstable } from '@fluentui/react-popover'; import { usePortal_unstable } from '@fluentui/react-portal'; import { usePresenceBadge_unstable } from '@fluentui/react-badge'; -import { usePrevious } from '@fluentui/react-utilities'; import { useSlider_unstable } from '@fluentui/react-slider'; import { useSliderState_unstable } from '@fluentui/react-slider'; import { useSliderStyles_unstable } from '@fluentui/react-slider'; @@ -513,7 +460,6 @@ import { useToggleButtonStyles_unstable } from '@fluentui/react-button'; import { useTooltip_unstable } from '@fluentui/react-tooltip'; import { useTooltipStyles_unstable } from '@fluentui/react-tooltip'; import { useUnmount } from '@fluentui/react-utilities'; -import { videoProperties } from '@fluentui/react-utilities'; import { webDarkTheme } from '@fluentui/react-theme'; import { webHighContrastTheme } from '@fluentui/react-theme'; import { webLightTheme } from '@fluentui/react-theme'; @@ -598,16 +544,8 @@ export { AccordionToggleEvent } export { AccordionToggleEventHandler } -export { anchorProperties } - -export { applyTriggerPropsToChildren } - export { arrowHeights } -export { AsIntrinsicElement } - -export { audioProperties } - export { Avatar } export { avatarClassName } @@ -634,10 +572,6 @@ export { BadgeSlots } export { BadgeState } -export { baseElementEvents } - -export { baseElementProperties } - export { Body_2 as Body } export { bodyClassName } @@ -654,16 +588,12 @@ export { buttonClassName } export { buttonClassNames } -export { buttonProperties } - export { ButtonProps } export { ButtonSlots } export { ButtonState } -export { canUseDOM } - export { Caption } export { captionClassName } @@ -672,14 +602,10 @@ export { captionClassNames } export { clamp } -export { colGroupProperties } - export { ColorPaletteTokens } export { ColorTokens } -export { colProperties } - export { ComponentProps } export { ComponentState } @@ -722,8 +648,6 @@ export { createLightTheme } export { createTeamsDarkTheme } -export { defaultSSRContextValue } - export { Display } export { displayClassName } @@ -742,14 +666,8 @@ export { DividerSlots } export { DividerState } -export { divProperties } - export { elementContains } -export { ExtractSlotProps } - -export { fieldsetProperties } - export { FluentProvider } export { fluentProviderClassName } @@ -764,10 +682,6 @@ export { FluentProviderSlots } export { FluentProviderState } -export { FluentTriggerComponent } - -export { FocusOutlineOffset } - export { FocusOutlineStyleOptions } export { FontFamilyTokens } @@ -776,8 +690,6 @@ export { FontSizeTokens } export { FontWeightTokens } -export { formProperties } - export { ForwardRefComponent } export { getNativeElementProps } @@ -790,42 +702,24 @@ export { getRTLSafeKey } export { getSlots } -export { getTriggerChild } - export { Headline } export { headlineClassName } export { headlineClassNames } -export { htmlElementProperties } - -export { iframeProperties } - export { Image_2 as Image } export { imageClassName } export { imageClassNames } -export { imageProperties } - export { ImageProps } export { ImageSlots } export { ImageState } -export { imgProperties } - -export { inputProperties } - -export { isFluentTrigger } - -export { IsSingleton } - -export { labelProperties } - export { LargeTitle } export { largeTitleClassName } @@ -846,8 +740,6 @@ export { LinkSlots } export { LinkState } -export { liProperties } - export { makeStaticStyles } export { makeStyles } @@ -1022,8 +914,6 @@ export { MenuTriggerState } export { mergeClasses } -export { olProperties } - export { omit } export { OnOpenChangeData } @@ -1032,8 +922,6 @@ export { OnVisibleChangeData } export { OpenPopoverEvents } -export { optionProperties } - export { PartialTheme } export { Popover } @@ -1084,10 +972,6 @@ export { PresenceBadgeState } export { PresenceBadgeStatus } -export { PropsWithoutRef } - -export { RefObjectFunction } - export { renderAccordion_unstable } export { renderAccordionHeader_unstable } @@ -1158,10 +1042,6 @@ export { renderTooltip_unstable } export { renderToStyleElements } -export { ReplaceNullWithUndefined } - -export { resetIdsForTests } - export { resolveShorthand } export { ResolveShorthandFunction } @@ -1170,8 +1050,6 @@ export { ResolveShorthandOptions } export { SelectableHandler } -export { selectProperties } - export { setVirtualParent } export { ShadowBrandTokens } @@ -1200,12 +1078,6 @@ export { SlotClassNames } export { SlotPropsRecord } -export { SlotRenderFunction } - -export { Slots } - -export { SlotShorthandValue } - export { SplitButton } export { splitButtonClassName } @@ -1220,8 +1092,6 @@ export { SplitButtonState } export { SSRContext } -export { SSRContextValue } - export { SSRProvider } export { StrokeWidthTokens } @@ -1232,10 +1102,6 @@ export { subheadlineClassName } export { subheadlineClassNames } -export { tableProperties } - -export { tdProperties } - export { teamsDarkTheme } export { teamsHighContrastTheme } @@ -1244,8 +1110,6 @@ export { teamsLightTheme } export { Text_2 as Text } -export { textAreaProperties } - export { textClassName } export { textClassNames } @@ -1260,8 +1124,6 @@ export { Theme } export { themeToTokensObject } -export { thProperties } - export { Title1 } export { title1ClassName } @@ -1306,14 +1168,8 @@ export { TooltipState } export { TooltipTriggerProps } -export { trProperties } - export { UninitializedMenuListState } -export { UnionToIntersection } - -export { UnknownSlotProps } - export { useAccordion_unstable } export { useAccordionContextValues_unstable } @@ -1378,10 +1234,6 @@ export { useDivider_unstable } export { useDividerStyles_unstable } -export { useEventCallback } - -export { useFirstMount } - export { useFluent } export { useFluentProvider_unstable } @@ -1396,16 +1248,12 @@ export { UseFocusableGroupOptions } export { useFocusFinders } -export { useForceUpdate } - export { useId } export { useImage_unstable } export { useImageStyles_unstable } -export { useIsomorphicLayoutEffect } - export { useIsSSR } export { useKeyboardNavAttribute } @@ -1484,12 +1332,6 @@ export { UseModalAttributesOptions } export { useMount } -export { UseOnClickOrScrollOutsideOptions } - -export { useOnClickOutside } - -export { useOnScrollOutside } - export { usePopover_unstable } export { usePopoverContext_unstable } @@ -1504,8 +1346,6 @@ export { usePortal_unstable } export { usePresenceBadge_unstable } -export { usePrevious } - export { useSlider_unstable } export { useSliderState_unstable } @@ -1536,8 +1376,6 @@ export { useTooltipStyles_unstable } export { useUnmount } -export { videoProperties } - export { webDarkTheme } export { webHighContrastTheme } diff --git a/packages/react-components/src/index.ts b/packages/react-components/src/index.ts index 32042d5a8258e..0383cc0fd5eef 100644 --- a/packages/react-components/src/index.ts +++ b/packages/react-components/src/index.ts @@ -38,7 +38,6 @@ export { } from '@fluentui/react-tabster'; export type { CreateFocusIndicatorStyleRuleOptions, - FocusOutlineOffset, FocusOutlineStyleOptions, UseArrowNavigationGroupOptions, UseFocusableGroupOptions, @@ -75,94 +74,40 @@ export type { Theme, } from '@fluentui/react-theme'; export { - anchorProperties, - applyTriggerPropsToChildren, - audioProperties, - baseElementEvents, - baseElementProperties, - buttonProperties, - canUseDOM, clamp, - colGroupProperties, - colProperties, - defaultSSRContextValue, - divProperties, - fieldsetProperties, - formProperties, getNativeElementProps, getNativeProps, getPartitionedNativeProps, getRTLSafeKey, getSlots, - getTriggerChild, - htmlElementProperties, - iframeProperties, - // eslint-disable-next-line deprecation/deprecation - imageProperties, - imgProperties, - inputProperties, - isFluentTrigger, - labelProperties, - liProperties, - olProperties, omit, - optionProperties, - resetIdsForTests, resolveShorthand, - selectProperties, shouldPreventDefaultOnKeyDown, - tableProperties, - tdProperties, - textAreaProperties, - thProperties, - trProperties, useBoolean, useConst, useControllableState, - useEventCallback, - useFirstMount, - useForceUpdate, useId, - useIsomorphicLayoutEffect, useIsSSR, useMergedEventCallbacks, useMergedRefs, useMount, - useOnClickOutside, - useOnScrollOutside, - usePrevious, useSSRContext, useTimeout, useUnmount, - videoProperties, SSRContext, SSRProvider, } from '@fluentui/react-utilities'; -export type { FluentTriggerComponent } from '@fluentui/react-utilities'; export type { - AsIntrinsicElement, ComponentProps, ComponentState, - ExtractSlotProps, ForwardRefComponent, - IsSingleton, - PropsWithoutRef, - RefObjectFunction, - ReplaceNullWithUndefined, ResolveShorthandFunction, ResolveShorthandOptions, Slot, - Slots, SlotClassNames, SlotPropsRecord, - SlotRenderFunction, - SlotShorthandValue, - SSRContextValue, - UnionToIntersection, - UnknownSlotProps, UseBooleanCallbacks, UseControllableStateOptions, - UseOnClickOrScrollOutsideOptions, } from '@fluentui/react-utilities'; // Components From 235b996a61e7b2b823878fe20371531a3c8388c0 Mon Sep 17 00:00:00 2001 From: KHMakoto Date: Tue, 19 Apr 2022 13:01:26 -0500 Subject: [PATCH 5/7] Cutting back on more things exported by react-components. --- .../etc/react-components.api.md | 39 ++----------------- packages/react-components/src/index.ts | 13 +------ 2 files changed, 4 insertions(+), 48 deletions(-) diff --git a/packages/react-components/etc/react-components.api.md b/packages/react-components/etc/react-components.api.md index 99ff6dd5e6d2d..252ec25b3dd74 100644 --- a/packages/react-components/etc/react-components.api.md +++ b/packages/react-components/etc/react-components.api.md @@ -72,7 +72,6 @@ import { ButtonState } from '@fluentui/react-button'; import { Caption } from '@fluentui/react-text'; import { captionClassName } from '@fluentui/react-text'; import { captionClassNames } from '@fluentui/react-text'; -import { clamp } from '@fluentui/react-utilities'; import { ColorPaletteTokens } from '@fluentui/react-theme'; import { ColorTokens } from '@fluentui/react-theme'; import { ComponentProps } from '@fluentui/react-utilities'; @@ -121,7 +120,6 @@ import { ForwardRefComponent } from '@fluentui/react-utilities'; import { getNativeElementProps } from '@fluentui/react-utilities'; import { getNativeProps } from '@fluentui/react-utilities'; import { getPartitionedNativeProps } from '@fluentui/react-utilities'; -import { getRTLSafeKey } from '@fluentui/react-utilities'; import { getSlots } from '@fluentui/react-utilities'; import { Headline } from '@fluentui/react-text'; import { headlineClassName } from '@fluentui/react-text'; @@ -229,7 +227,6 @@ import { MenuTriggerContextProvider } from '@fluentui/react-menu'; import { MenuTriggerProps } from '@fluentui/react-menu'; import { MenuTriggerState } from '@fluentui/react-menu'; import { mergeClasses } from '@griffel/react'; -import { omit } from '@fluentui/react-utilities'; import { OnOpenChangeData } from '@fluentui/react-popover'; import { OnVisibleChangeData } from '@fluentui/react-tooltip'; import { OpenPopoverEvents } from '@fluentui/react-popover'; @@ -293,6 +290,7 @@ import { renderText_unstable } from '@fluentui/react-text'; import { renderToggleButton_unstable } from '@fluentui/react-button'; import { renderTooltip_unstable } from '@fluentui/react-tooltip'; import { renderToStyleElements } from '@griffel/react'; +import { resetIdsForTests } from '@fluentui/react-utilities'; import { resolveShorthand } from '@fluentui/react-utilities'; import { ResolveShorthandFunction } from '@fluentui/react-utilities'; import { ResolveShorthandOptions } from '@fluentui/react-utilities'; @@ -301,7 +299,6 @@ import { setVirtualParent } from '@fluentui/react-portal'; import { ShadowBrandTokens } from '@fluentui/react-theme'; import { ShadowTokens } from '@fluentui/react-theme'; import { shorthands } from '@griffel/react'; -import { shouldPreventDefaultOnKeyDown } from '@fluentui/react-utilities'; import { Slider } from '@fluentui/react-slider'; import { sliderClassNames } from '@fluentui/react-slider'; import { SliderOnChangeData } from '@fluentui/react-slider'; @@ -317,8 +314,6 @@ import { splitButtonClassNames } from '@fluentui/react-button'; import { SplitButtonProps } from '@fluentui/react-button'; import { SplitButtonSlots } from '@fluentui/react-button'; import { SplitButtonState } from '@fluentui/react-button'; -import { SSRContext } from '@fluentui/react-utilities'; -import { SSRProvider } from '@fluentui/react-utilities'; import { StrokeWidthTokens } from '@fluentui/react-theme'; import { Subheadline } from '@fluentui/react-text'; import { subheadlineClassName } from '@fluentui/react-text'; @@ -375,15 +370,12 @@ import { useAvatar_unstable } from '@fluentui/react-avatar'; import { useAvatarStyles_unstable } from '@fluentui/react-avatar'; import { useBadge_unstable } from '@fluentui/react-badge'; import { useBadgeStyles_unstable } from '@fluentui/react-badge'; -import { useBoolean } from '@fluentui/react-utilities'; import { UseBooleanCallbacks } from '@fluentui/react-utilities'; import { useButton_unstable } from '@fluentui/react-button'; import { useButtonStyles_unstable } from '@fluentui/react-button'; import { useCheckmarkStyles_unstable } from '@fluentui/react-menu'; import { useCompoundButton_unstable } from '@fluentui/react-button'; import { useCompoundButtonStyles_unstable } from '@fluentui/react-button'; -import { useConst } from '@fluentui/react-utilities'; -import { useControllableState } from '@fluentui/react-utilities'; import { UseControllableStateOptions } from '@fluentui/react-utilities'; import { useCounterBadge_unstable } from '@fluentui/react-badge'; import { useCounterBadgeStyles_unstable } from '@fluentui/react-badge'; @@ -433,7 +425,6 @@ import { useMenuSplitGroup_unstable } from '@fluentui/react-menu'; import { useMenuSplitGroupStyles_unstable } from '@fluentui/react-menu'; import { useMenuTrigger_unstable } from '@fluentui/react-menu'; import { useMenuTriggerContext_unstable } from '@fluentui/react-menu'; -import { useMergedEventCallbacks } from '@fluentui/react-utilities'; import { useMergedRefs } from '@fluentui/react-utilities'; import { useModalAttributes } from '@fluentui/react-tabster'; import { UseModalAttributesOptions } from '@fluentui/react-tabster'; @@ -451,10 +442,8 @@ import { useSliderStyles_unstable } from '@fluentui/react-slider'; import { useSplitButton_unstable } from '@fluentui/react-button'; import { useSplitButtonStyles_unstable } from '@fluentui/react-button'; import { useSSRContext } from '@fluentui/react-utilities'; -import { useTabsterAttributes } from '@fluentui/react-tabster'; import { useText_unstable } from '@fluentui/react-text'; import { useTextStyles_unstable } from '@fluentui/react-text'; -import { useTimeout } from '@fluentui/react-utilities'; import { useToggleButton_unstable } from '@fluentui/react-button'; import { useToggleButtonStyles_unstable } from '@fluentui/react-button'; import { useTooltip_unstable } from '@fluentui/react-tooltip'; @@ -600,8 +589,6 @@ export { captionClassName } export { captionClassNames } -export { clamp } - export { ColorPaletteTokens } export { ColorTokens } @@ -698,8 +685,6 @@ export { getNativeProps } export { getPartitionedNativeProps } -export { getRTLSafeKey } - export { getSlots } export { Headline } @@ -914,8 +899,6 @@ export { MenuTriggerState } export { mergeClasses } -export { omit } - export { OnOpenChangeData } export { OnVisibleChangeData } @@ -1042,6 +1025,8 @@ export { renderTooltip_unstable } export { renderToStyleElements } +export { resetIdsForTests } + export { resolveShorthand } export { ResolveShorthandFunction } @@ -1058,8 +1043,6 @@ export { ShadowTokens } export { shorthands } -export { shouldPreventDefaultOnKeyDown } - export { Slider } export { sliderClassNames } @@ -1090,10 +1073,6 @@ export { SplitButtonSlots } export { SplitButtonState } -export { SSRContext } - -export { SSRProvider } - export { StrokeWidthTokens } export { Subheadline } @@ -1206,8 +1185,6 @@ export { useBadge_unstable } export { useBadgeStyles_unstable } -export { useBoolean } - export { UseBooleanCallbacks } export { useButton_unstable } @@ -1220,10 +1197,6 @@ export { useCompoundButton_unstable } export { useCompoundButtonStyles_unstable } -export { useConst } - -export { useControllableState } - export { UseControllableStateOptions } export { useCounterBadge_unstable } @@ -1322,8 +1295,6 @@ export { useMenuTrigger_unstable } export { useMenuTriggerContext_unstable } -export { useMergedEventCallbacks } - export { useMergedRefs } export { useModalAttributes } @@ -1358,14 +1329,10 @@ export { useSplitButtonStyles_unstable } export { useSSRContext } -export { useTabsterAttributes } - export { useText_unstable } export { useTextStyles_unstable } -export { useTimeout } - export { useToggleButton_unstable } export { useToggleButtonStyles_unstable } diff --git a/packages/react-components/src/index.ts b/packages/react-components/src/index.ts index 0383cc0fd5eef..46fd39e0a6b27 100644 --- a/packages/react-components/src/index.ts +++ b/packages/react-components/src/index.ts @@ -34,7 +34,6 @@ export { useFocusFinders, useKeyboardNavAttribute, useModalAttributes, - useTabsterAttributes, } from '@fluentui/react-tabster'; export type { CreateFocusIndicatorStyleRuleOptions, @@ -74,28 +73,18 @@ export type { Theme, } from '@fluentui/react-theme'; export { - clamp, getNativeElementProps, getNativeProps, getPartitionedNativeProps, - getRTLSafeKey, getSlots, - omit, + resetIdsForTests, resolveShorthand, - shouldPreventDefaultOnKeyDown, - useBoolean, - useConst, - useControllableState, useId, useIsSSR, - useMergedEventCallbacks, useMergedRefs, useMount, useSSRContext, - useTimeout, useUnmount, - SSRContext, - SSRProvider, } from '@fluentui/react-utilities'; export type { ComponentProps, From 744a88da8bcaeb041c9c58ec17436df3ad04a6b5 Mon Sep 17 00:00:00 2001 From: KHMakoto Date: Tue, 19 Apr 2022 13:06:30 -0500 Subject: [PATCH 6/7] Cutting back on more things exported by react-components. --- packages/react-components/etc/react-components.api.md | 9 --------- packages/react-components/src/index.ts | 3 --- 2 files changed, 12 deletions(-) diff --git a/packages/react-components/etc/react-components.api.md b/packages/react-components/etc/react-components.api.md index 252ec25b3dd74..8db7466bcbf46 100644 --- a/packages/react-components/etc/react-components.api.md +++ b/packages/react-components/etc/react-components.api.md @@ -90,8 +90,6 @@ import { CounterBadgeState } from '@fluentui/react-badge'; import { createCustomFocusIndicatorStyle } from '@fluentui/react-tabster'; import { createDarkTheme } from '@fluentui/react-theme'; import { createDOMRenderer } from '@griffel/react'; -import { CreateFocusIndicatorStyleRuleOptions } from '@fluentui/react-tabster'; -import { createFocusOutlineStyle } from '@fluentui/react-tabster'; import { createHighContrastTheme } from '@fluentui/react-theme'; import { createLightTheme } from '@fluentui/react-theme'; import { createTeamsDarkTheme } from '@fluentui/react-theme'; @@ -112,7 +110,6 @@ import { FluentProviderContextValues } from '@fluentui/react-provider'; import { FluentProviderProps } from '@fluentui/react-provider'; import { FluentProviderSlots } from '@fluentui/react-provider'; import { FluentProviderState } from '@fluentui/react-provider'; -import { FocusOutlineStyleOptions } from '@fluentui/react-tabster'; import { FontFamilyTokens } from '@fluentui/react-theme'; import { FontSizeTokens } from '@fluentui/react-theme'; import { FontWeightTokens } from '@fluentui/react-theme'; @@ -625,10 +622,6 @@ export { createDarkTheme } export { createDOMRenderer } -export { CreateFocusIndicatorStyleRuleOptions } - -export { createFocusOutlineStyle } - export { createHighContrastTheme } export { createLightTheme } @@ -669,8 +662,6 @@ export { FluentProviderSlots } export { FluentProviderState } -export { FocusOutlineStyleOptions } - export { FontFamilyTokens } export { FontSizeTokens } diff --git a/packages/react-components/src/index.ts b/packages/react-components/src/index.ts index 46fd39e0a6b27..435927381b7fe 100644 --- a/packages/react-components/src/index.ts +++ b/packages/react-components/src/index.ts @@ -28,7 +28,6 @@ export type { } from '@fluentui/react-provider'; export { createCustomFocusIndicatorStyle, - createFocusOutlineStyle, useArrowNavigationGroup, useFocusableGroup, useFocusFinders, @@ -36,8 +35,6 @@ export { useModalAttributes, } from '@fluentui/react-tabster'; export type { - CreateFocusIndicatorStyleRuleOptions, - FocusOutlineStyleOptions, UseArrowNavigationGroupOptions, UseFocusableGroupOptions, UseModalAttributesOptions, From f2151efda63ead48112588346bd77816db430bb1 Mon Sep 17 00:00:00 2001 From: KHMakoto Date: Tue, 19 Apr 2022 13:17:25 -0500 Subject: [PATCH 7/7] Cutting back on more things exported by react-components. --- .../react-components/etc/react-components.api.md | 12 ------------ packages/react-components/src/index.ts | 4 ---- 2 files changed, 16 deletions(-) diff --git a/packages/react-components/etc/react-components.api.md b/packages/react-components/etc/react-components.api.md index 8db7466bcbf46..87f30a1f6f33d 100644 --- a/packages/react-components/etc/react-components.api.md +++ b/packages/react-components/etc/react-components.api.md @@ -367,13 +367,11 @@ import { useAvatar_unstable } from '@fluentui/react-avatar'; import { useAvatarStyles_unstable } from '@fluentui/react-avatar'; import { useBadge_unstable } from '@fluentui/react-badge'; import { useBadgeStyles_unstable } from '@fluentui/react-badge'; -import { UseBooleanCallbacks } from '@fluentui/react-utilities'; import { useButton_unstable } from '@fluentui/react-button'; import { useButtonStyles_unstable } from '@fluentui/react-button'; import { useCheckmarkStyles_unstable } from '@fluentui/react-menu'; import { useCompoundButton_unstable } from '@fluentui/react-button'; import { useCompoundButtonStyles_unstable } from '@fluentui/react-button'; -import { UseControllableStateOptions } from '@fluentui/react-utilities'; import { useCounterBadge_unstable } from '@fluentui/react-badge'; import { useCounterBadgeStyles_unstable } from '@fluentui/react-badge'; import { useDivider_unstable } from '@fluentui/react-divider'; @@ -425,7 +423,6 @@ import { useMenuTriggerContext_unstable } from '@fluentui/react-menu'; import { useMergedRefs } from '@fluentui/react-utilities'; import { useModalAttributes } from '@fluentui/react-tabster'; import { UseModalAttributesOptions } from '@fluentui/react-tabster'; -import { useMount } from '@fluentui/react-utilities'; import { usePopover_unstable } from '@fluentui/react-popover'; import { usePopoverContext_unstable } from '@fluentui/react-popover'; import { usePopoverSurface_unstable } from '@fluentui/react-popover'; @@ -445,7 +442,6 @@ import { useToggleButton_unstable } from '@fluentui/react-button'; import { useToggleButtonStyles_unstable } from '@fluentui/react-button'; import { useTooltip_unstable } from '@fluentui/react-tooltip'; import { useTooltipStyles_unstable } from '@fluentui/react-tooltip'; -import { useUnmount } from '@fluentui/react-utilities'; import { webDarkTheme } from '@fluentui/react-theme'; import { webHighContrastTheme } from '@fluentui/react-theme'; import { webLightTheme } from '@fluentui/react-theme'; @@ -1176,8 +1172,6 @@ export { useBadge_unstable } export { useBadgeStyles_unstable } -export { UseBooleanCallbacks } - export { useButton_unstable } export { useButtonStyles_unstable } @@ -1188,8 +1182,6 @@ export { useCompoundButton_unstable } export { useCompoundButtonStyles_unstable } -export { UseControllableStateOptions } - export { useCounterBadge_unstable } export { useCounterBadgeStyles_unstable } @@ -1292,8 +1284,6 @@ export { useModalAttributes } export { UseModalAttributesOptions } -export { useMount } - export { usePopover_unstable } export { usePopoverContext_unstable } @@ -1332,8 +1322,6 @@ export { useTooltip_unstable } export { useTooltipStyles_unstable } -export { useUnmount } - export { webDarkTheme } export { webHighContrastTheme } diff --git a/packages/react-components/src/index.ts b/packages/react-components/src/index.ts index 435927381b7fe..40769d833e248 100644 --- a/packages/react-components/src/index.ts +++ b/packages/react-components/src/index.ts @@ -79,9 +79,7 @@ export { useId, useIsSSR, useMergedRefs, - useMount, useSSRContext, - useUnmount, } from '@fluentui/react-utilities'; export type { ComponentProps, @@ -92,8 +90,6 @@ export type { Slot, SlotClassNames, SlotPropsRecord, - UseBooleanCallbacks, - UseControllableStateOptions, } from '@fluentui/react-utilities'; // Components