Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: updates dependencies from react-utilities to react-trigger",
"packageName": "@fluentui/react-dialog",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: updates dependencies from react-utilities to react-trigger",
"packageName": "@fluentui/react-menu",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: updates dependencies from react-utilities to react-trigger",
"packageName": "@fluentui/react-overflow",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: updates dependencies from react-utilities to react-trigger",
"packageName": "@fluentui/react-popover",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: updates dependencies from react-utilities to react-trigger",
"packageName": "@fluentui/react-tooltip",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "feat: move trigger methods from react-utilities",
"packageName": "@fluentui/react-trigger",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "chore: delete trigger methods",
"packageName": "@fluentui/react-utilities",
"email": "[email protected]",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ARIAButtonResultProps } from '@fluentui/react-aria';
import { ARIAButtonType } from '@fluentui/react-aria';
import type { ComponentProps } from '@fluentui/react-utilities';
import type { ComponentState } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-trigger';
import type { ForwardRefComponent } from '@fluentui/react-utilities';
import { JSXElementConstructor } from 'react';
import * as React_2 from 'react';
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/react-dialog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"dependencies": {
"@griffel/react": "^1.3.0",
"@fluentui/react-utilities": "^9.1.0",
"@fluentui/react-trigger": "^9.0.0-alpha.0",
"@fluentui/keyboard-keys": "^9.0.0",
"@fluentui/react-context-selector": "^9.0.3",
"@fluentui/react-shared-contexts": "^9.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { useDialogTrigger_unstable } from './useDialogTrigger';
import { renderDialogTrigger_unstable } from './renderDialogTrigger';
import type { DialogTriggerProps } from './DialogTrigger.types';
import type { FluentTriggerComponent } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-trigger';

/**
* A non-visual component that wraps its child
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as React from 'react';
import { useModalAttributes } from '@fluentui/react-tabster';
import { applyTriggerPropsToChildren, getTriggerChild, useEventCallback } from '@fluentui/react-utilities';
import { useEventCallback } from '@fluentui/react-utilities';
import { applyTriggerPropsToChildren, getTriggerChild } from '@fluentui/react-trigger';
import { DialogTriggerChildProps, DialogTriggerProps, DialogTriggerState } from './DialogTrigger.types';
import { useDialogContext_unstable, useDialogSurfaceContext_unstable } from '../../contexts';
import { useARIAButtonProps } from '@fluentui/react-aria';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { ARIAButtonType } from '@fluentui/react-aria';
import type { ComponentProps } from '@fluentui/react-utilities';
import type { ComponentState } from '@fluentui/react-utilities';
import type { ContextSelector } from '@fluentui/react-context-selector';
import type { FluentTriggerComponent } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-trigger';
import type { ForwardRefComponent } from '@fluentui/react-utilities';
import type { PositioningShorthand } from '@fluentui/react-positioning';
import * as React_2 from 'react';
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/react-menu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"@fluentui/react-tabster": "^9.1.1",
"@fluentui/react-theme": "^9.1.0",
"@fluentui/react-utilities": "^9.1.0",
"@fluentui/react-trigger": "^9.0.0-alpha.0",
"@griffel/react": "^1.3.0",
"tslib": "^2.1.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { useMenuTrigger_unstable } from './useMenuTrigger';
import { renderMenuTrigger_unstable } from './renderMenuTrigger';
import type { MenuTriggerProps } from './MenuTrigger.types';
import type { FluentTriggerComponent } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-trigger';

/**
* Wraps a trigger element as an only child
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@ import { useIsSubmenu } from '../../utils/useIsSubmenu';
import { useFocusFinders } from '@fluentui/react-tabster';
import { useFluent_unstable as useFluent } from '@fluentui/react-shared-contexts';
import { ArrowRight, ArrowLeft, Escape, ArrowDown } from '@fluentui/keyboard-keys';
import {
applyTriggerPropsToChildren,
getTriggerChild,
mergeCallbacks,
useEventCallback,
useMergedRefs,
} from '@fluentui/react-utilities';
import { mergeCallbacks, useEventCallback, useMergedRefs } from '@fluentui/react-utilities';
import { applyTriggerPropsToChildren, getTriggerChild } from '@fluentui/react-trigger';
import { useARIAButtonProps } from '@fluentui/react-aria';

/**
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/react-overflow/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"@fluentui/react-context-selector": "^9.0.3",
"@fluentui/react-theme": "^9.1.0",
"@fluentui/react-utilities": "^9.1.0",
"@fluentui/react-trigger": "^9.0.0-alpha.0",
"@griffel/react": "^1.3.0",
"tslib": "^2.1.0"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as React from 'react';
import { makeStyles, mergeClasses } from '@griffel/react';
import type { OnUpdateOverflow, OverflowGroupState, ObserveOptions } from '@fluentui/priority-overflow';
import { applyTriggerPropsToChildren, useMergedRefs } from '@fluentui/react-utilities';
import { useMergedRefs } from '@fluentui/react-utilities';
import { applyTriggerPropsToChildren } from '@fluentui/react-trigger';

import { OverflowContext } from '../overflowContext';
import { updateVisibilityAttribute, useOverflowContainer } from '../useOverflowContainer';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import { applyTriggerPropsToChildren, useMergedRefs } from '@fluentui/react-utilities';
import { useMergedRefs } from '@fluentui/react-utilities';
import { applyTriggerPropsToChildren } from '@fluentui/react-trigger';
import { useOverflowItem } from '../../useOverflowItem';
import { OverflowItemProps } from './OverflowItem.types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type { ComponentProps } from '@fluentui/react-utilities';
import type { ComponentState } from '@fluentui/react-utilities';
import type { ContextSelector } from '@fluentui/react-context-selector';
import { FC } from 'react';
import type { FluentTriggerComponent } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-trigger';
import type { ForwardRefComponent } from '@fluentui/react-utilities';
import { JSXElementConstructor } from 'react';
import type { PortalProps } from '@fluentui/react-portal';
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/react-popover/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"@fluentui/react-tabster": "^9.1.1",
"@fluentui/react-theme": "^9.1.0",
"@fluentui/react-utilities": "^9.1.0",
"@fluentui/react-trigger": "^9.0.0-alpha.0",
"@griffel/react": "^1.3.0",
"tslib": "^2.1.0"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { usePopoverTrigger_unstable } from './usePopoverTrigger';
import { renderPopoverTrigger_unstable } from './renderPopoverTrigger';
import type { FluentTriggerComponent } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-trigger';
import type { PopoverTriggerProps } from './PopoverTrigger.types';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import * as React from 'react';
import {
applyTriggerPropsToChildren,
getTriggerChild,
mergeCallbacks,
useMergedRefs,
useEventCallback,
} from '@fluentui/react-utilities';
import { mergeCallbacks, useMergedRefs, useEventCallback } from '@fluentui/react-utilities';
import { applyTriggerPropsToChildren, getTriggerChild } from '@fluentui/react-trigger';
import { useModalAttributes } from '@fluentui/react-tabster';
import { usePopoverContext_unstable } from '../../popoverContext';
import type { PopoverTriggerChildProps, PopoverTriggerProps, PopoverTriggerState } from './PopoverTrigger.types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import type { ComponentProps } from '@fluentui/react-utilities';
import type { ComponentState } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-trigger';
import type { PortalProps } from '@fluentui/react-portal';
import type { PositioningShorthand } from '@fluentui/react-positioning';
import * as React_2 from 'react';
Expand Down
1 change: 1 addition & 0 deletions packages/react-components/react-tooltip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"@fluentui/react-shared-contexts": "^9.0.1",
"@fluentui/react-theme": "^9.1.0",
"@fluentui/react-utilities": "^9.1.0",
"@fluentui/react-trigger": "^9.0.0-alpha.0",
"@griffel/react": "^1.3.0",
"tslib": "^2.1.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useTooltip_unstable } from './useTooltip';
import { renderTooltip_unstable } from './renderTooltip';
import { useTooltipStyles_unstable } from './useTooltipStyles';
import type { TooltipProps } from './Tooltip.types';
import type { FluentTriggerComponent } from '@fluentui/react-utilities';
import type { FluentTriggerComponent } from '@fluentui/react-trigger';

/**
* A tooltip provides light weight contextual information on top of its target element.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@ import {
useFluent_unstable as useFluent,
} from '@fluentui/react-shared-contexts';
import {
applyTriggerPropsToChildren,
resolveShorthand,
useControllableState,
useId,
useIsomorphicLayoutEffect,
useIsSSR,
useMergedRefs,
useTimeout,
getTriggerChild,
mergeCallbacks,
useEventCallback,
} from '@fluentui/react-utilities';
import { applyTriggerPropsToChildren, getTriggerChild } from '@fluentui/react-trigger';
import type { TooltipProps, TooltipState, TooltipTriggerProps } from './Tooltip.types';
import { arrowHeight, tooltipBorderRadius } from './private/constants';
import { Escape } from '@fluentui/keyboard-keys';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@

```ts

import * as React_2 from 'react';

// @internal
export const applyTriggerPropsToChildren: <TTriggerProps>(children: React_2.ReactElement<any, string | React_2.JSXElementConstructor<any>> | ((props: TTriggerProps) => React_2.ReactElement | null) | null | undefined, triggerProps: TTriggerProps) => React_2.ReactElement | null;

// @public
export type FluentTriggerComponent = {
isFluentTriggerComponent?: boolean;
};

// @internal
export const getTriggerChild: <P = any>(children: React_2.ReactNode) => React_2.ReactElement<P, string | React_2.JSXElementConstructor<any>> & {
ref?: React_2.Ref<unknown> | undefined;
};

// @public
export const isFluentTrigger: (element: React_2.ReactElement) => boolean | undefined;

// (No @packageDocumentation comment for this package)

```
4 changes: 1 addition & 3 deletions packages/react-components/react-trigger/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@fluentui/react-trigger",
"version": "9.0.0-alpha.0",
"private": true,
"description": "A set of trigger specific utilities",
"main": "lib-commonjs/index.js",
"module": "lib/index.js",
Expand Down Expand Up @@ -43,8 +42,7 @@
"beachball": {
"disallowedChangeTypes": [
"major",
"minor",
"patch"
"prerelease"
]
}
}
6 changes: 4 additions & 2 deletions packages/react-components/react-trigger/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
// TODO: replace with real exports
export {};
export { applyTriggerPropsToChildren } from './applyTriggerPropsToChildren';
export { getTriggerChild } from './getTriggerChild';
export { isFluentTrigger } from './isFluentTrigger';
export type { FluentTriggerComponent } from './types';
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/**
* @internal
* Allows a component to be tagged as a FluentUI trigger component.
*
* Triggers are special-case components: they attach event listeners and other props on their child,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
import { DispatchWithoutAction } from 'react';
import * as React_2 from 'react';

// @internal
export const applyTriggerPropsToChildren: <TTriggerProps>(children: React_2.ReactElement<any, string | React_2.JSXElementConstructor<any>> | ((props: TTriggerProps) => React_2.ReactElement | null) | null | undefined, triggerProps: TTriggerProps) => React_2.ReactElement | null;

// @public
export function canUseDOM(): boolean;

Expand All @@ -31,11 +28,6 @@ export type ComponentState<Slots extends SlotPropsRecord> = {
// @public
export type ExtractSlotProps<S> = Exclude<S, SlotShorthandValue | null | undefined>;

// @internal
export type FluentTriggerComponent = {
isFluentTriggerComponent?: boolean;
};

// @public
export type ForwardRefComponent<Props> = ObscureEventName extends keyof Props ? Required<Props>[ObscureEventName] extends React_2.PointerEventHandler<infer Element> ? React_2.ForwardRefExoticComponent<Props & React_2.RefAttributes<Element>> : never : never;

Expand Down Expand Up @@ -64,11 +56,6 @@ export function getSlots<R extends SlotPropsRecord>(state: ComponentState<R>): {
slotProps: ObjectSlotProps<R>;
};

// @internal
export const getTriggerChild: <P = any>(children: React_2.ReactNode) => React_2.ReactElement<P, string | React_2.JSXElementConstructor<any>> & {
ref?: React_2.Ref<unknown> | undefined;
};

// @public
export function isResolvedShorthand<Shorthand extends Slot<UnknownSlotProps>>(shorthand?: Shorthand): shorthand is ExtractSlotProps<Shorthand>;

Expand Down
4 changes: 0 additions & 4 deletions packages/react-components/react-utilities/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,3 @@ export {
mergeCallbacks,
shouldPreventDefaultOnKeyDown,
} from './utils/index';

export { applyTriggerPropsToChildren, getTriggerChild } from './trigger/index';

export type { FluentTriggerComponent } from './trigger/index';

This file was deleted.