Skip to content
Merged
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": "patch",
"comment": "fix: dont apply import/no-extraneous-dependencies rule on stories",
"packageName": "@fluentui/eslint-plugin",
"email": "martinhochel@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: remove circular dependencies from cypress files",
"packageName": "@fluentui/react-breadcrumb",
"email": "martinhochel@microsoft.com",
"dependentChangeType": "none"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "none",
"comment": "fix: remove circular dependencies from cypress files",
"packageName": "@fluentui/react-dialog",
"email": "martinhochel@microsoft.com",
"dependentChangeType": "none"
}
3 changes: 2 additions & 1 deletion packages/eslint-plugin/src/utils/configHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const testFiles = [
];

const docsFiles = ['**/*Page.tsx', '**/{docs,demo}/**', '**/*.doc.{ts,tsx}'];
const storyFiles = ['**/*.stories.tsx', '**/*.stories.ts'];

const configFiles = [
'./just.config.ts',
Expand Down Expand Up @@ -84,7 +85,7 @@ module.exports = {
* - may need to reconsider for converged components depending on website approach
* - the stories suffix is also used for storywright stories in `vr-tests`
*/
devDependenciesFiles: [...testFiles, ...docsFiles, ...configFiles, '**/*.stories.tsx'],
devDependenciesFiles: [...testFiles, ...docsFiles, ...configFiles, ...storyFiles],
Comment thread
Hotell marked this conversation as resolved.

/**
* Whether linting is running in context of lint-staged (which should disable rules requiring
Expand Down
2 changes: 2 additions & 0 deletions packages/react-components/react-breadcrumb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"bundle-size": "monosize measure"
},
"devDependencies": {
"@fluentui/react-menu": "*",
"@fluentui/react-overflow": "*",
"@fluentui/eslint-plugin": "*",
"@fluentui/react-conformance": "*",
"@fluentui/react-conformance-griffel": "*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,9 @@ import { BreadcrumbDivider } from '../BreadcrumbDivider';
import { partitionBreadcrumbItems } from '../../utils';
import type { BreadcrumbProps } from './Breadcrumb.types';
import type { PartitionBreadcrumbItems } from '../../utils';
import {
Button,
Menu,
MenuList,
MenuItemLink,
MenuPopover,
MenuTrigger,
useIsOverflowItemVisible,
useOverflowMenu,
MenuItem,
} from '@fluentui/react-components';
import { Button } from '@fluentui/react-button';
import { Menu, MenuList, MenuItemLink, MenuPopover, MenuTrigger, MenuItem } from '@fluentui/react-menu';
import { useIsOverflowItemVisible, useOverflowMenu } from '@fluentui/react-overflow';

const MoreHorizontal = bundleIcon(MoreHorizontalFilled, MoreHorizontalRegular);
const mountFluent = (element: JSX.Element) => {
Expand Down
4 changes: 4 additions & 0 deletions packages/react-components/react-dialog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
"test-ssr": "test-ssr \"./stories/**/*.stories.tsx\""
},
"devDependencies": {
"@fluentui/react-popover": "*",
"@fluentui/react-tooltip": "*",
"@fluentui/react-menu": "*",
"@fluentui/react-button": "*",
"@fluentui/eslint-plugin": "*",
"@fluentui/react-conformance": "*",
"@fluentui/react-conformance-griffel": "*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,10 @@ import {
DialogTitle,
DialogTrigger,
} from '@fluentui/react-dialog';
import {
Button,
Menu,
MenuItem,
MenuList,
MenuPopover,
MenuTrigger,
Popover,
PopoverSurface,
PopoverTrigger,
Tooltip,
} from '@fluentui/react-components';
import { Popover, PopoverSurface, PopoverTrigger } from '@fluentui/react-popover';
import { Tooltip } from '@fluentui/react-tooltip';
import { Button } from '@fluentui/react-button';
import { Menu, MenuItem, MenuList, MenuPopover, MenuTrigger } from '@fluentui/react-menu';
import {
dialogSurfaceSelector,
dialogTriggerCloseId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
DialogTitle,
DialogTrigger,
} from '@fluentui/react-dialog';
import { Button } from '@fluentui/react-components';
import { Button } from '@fluentui/react-button';
import { dialogActionSelector, dialogTriggerOpenId, dialogTriggerOpenSelector } from '../../testing/selectors';

const mount = (element: JSX.Element) => mountBase(<FluentProvider theme={teamsLightTheme}>{element}</FluentProvider>);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import * as React from 'react';
import { Tree, TreeItem, TreeItemLayout, TreeItemValue } from '@fluentui/react-components';
import {
Tree,
TreeItem,
TreeItemLayout,
TreeItemValue,
TreeOpenChangeData,
TreeOpenChangeEvent,
} from '@fluentui/react-components';
import { AddSquare16Regular, SubtractSquare16Regular } from '@fluentui/react-icons';
import { TreeOpenChangeData, TreeOpenChangeEvent } from './../../src/Tree';
Comment thread
Hotell marked this conversation as resolved.

export const ExpandIcon = () => {
const [openItems, setOpenItems] = React.useState<TreeItemValue[]>([]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const Dynamic = () => {
const [flag, toggleFlag] = React.useState(false);
const styles = useStyles();
const childLength = 1000;
const timeoutRef = useRef<NodeJS.Timeout>();
const timeoutRef = useRef<ReturnType<typeof setTimeout>>();
Comment thread
Hotell marked this conversation as resolved.

React.useEffect(() => {
updateTimeout();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Virtualizer } from '../../src/Virtualizer';
import { Virtualizer } from '@fluentui/react-components/unstable';
import descriptionMd from './VirtualizerDescription.md';

export { Default } from './Default.stories';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as React from 'react';
import { VirtualizerScrollView } from '@fluentui/react-components/unstable';
import type { ScrollToInterface } from '@fluentui/react-components/unstable';
import { Text, Input, makeStyles } from '@fluentui/react-components';
import { Button } from '@fluentui/react-components';
import { ScrollToInterface } from '../../src/Utilities';

const useStyles = makeStyles({
child: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { VirtualizerScrollView } from '../../src/VirtualizerScrollView';
import { VirtualizerScrollView } from '@fluentui/react-components/unstable';
import descriptionMd from './VirtualizerScrollViewDescription.md';

export { Default } from './Default.stories';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as React from 'react';
import { VirtualizerScrollViewDynamic } from '@fluentui/react-components/unstable';
import type { ScrollToInterface } from '@fluentui/react-components/unstable';
import type { VirtualizerDataRef } from '@fluentui/react-virtualizer';
import { Button, Input, makeStyles, Text } from '@fluentui/react-components';
import { useEffect } from 'react';
import { ScrollToInterface } from '../../src/Utilities';
import { VirtualizerDataRef } from '../../src/Virtualizer';

const useStyles = makeStyles({
child: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { VirtualizerScrollViewDynamic } from '../../src/VirtualizerScrollViewDynamic';
import { VirtualizerScrollViewDynamic } from '@fluentui/react-components/unstable';
import descriptionMd from './VirtualizerScrollViewDynamicDescription.md';

export { AutoMeasure } from './AutoMeasure.stories';
Expand Down