diff --git a/apps/vr-tests-react-components/.storybook/preview.js b/apps/vr-tests-react-components/.storybook/preview.js
index 3be23ff332e8f..50e39889ee309 100644
--- a/apps/vr-tests-react-components/.storybook/preview.js
+++ b/apps/vr-tests-react-components/.storybook/preview.js
@@ -67,8 +67,3 @@ setAddon({
/** @type {import("@fluentui/react-storybook-addon").FluentParameters} */
export const parameters = { layout: 'none', mode: 'vr-test' };
-
-// For static storybook per https://github.com/screener-io/screener-storybook#testing-with-static-storybook-app
-if (typeof window === 'object') {
- /** @type {*} */ (window).__screener_storybook__ = require('@storybook/react').getStorybook;
-}
diff --git a/apps/vr-tests-react-components/package.json b/apps/vr-tests-react-components/package.json
index 5b6a97420a87d..31b0333e55e8f 100644
--- a/apps/vr-tests-react-components/package.json
+++ b/apps/vr-tests-react-components/package.json
@@ -5,15 +5,14 @@
"description": "Visual regression tests for @fluentui/react-components",
"scripts": {
"build": "build-storybook -o dist/storybook",
- "test:component": "storywright --browsers chromium --url dist/storybook --destpath dist/screenshots --waitTimeScreenshot 500 --concurrency 4 --headless true",
"convert": "bash convertStoriesToStoryWright.sh",
"clean": "just-scripts clean",
"format": "prettier . -w --ignore-path ../../.prettierignore",
"lint": "just-scripts lint",
- "screener": "just-scripts screener",
"screener:build": "yarn build",
"start": "start-storybook",
"test": "just-scripts test",
+ "test:component": "storywright --browsers chromium --url dist/storybook --destpath dist/screenshots --waitTimeScreenshot 500 --concurrency 4 --headless true",
"type-check": "tsc"
},
"devDependencies": {
@@ -63,7 +62,6 @@
"@griffel/react": "^1.4.2",
"react": "17.0.2",
"react-dom": "17.0.2",
- "screener-storybook": "0.23.0",
"tslib": "^2.1.0"
}
}
diff --git a/apps/vr-tests-react-components/screener.config.js b/apps/vr-tests-react-components/screener.config.js
deleted file mode 100644
index 0e229136d99d1..0000000000000
--- a/apps/vr-tests-react-components/screener.config.js
+++ /dev/null
@@ -1,49 +0,0 @@
-const cp = require('child_process');
-
-function getCurrentHash() {
- try {
- const buffer = cp.execSync('git rev-list --parents -n 1 HEAD', {
- stdio: ['pipe', 'pipe', process.stderr],
- });
-
- if (buffer) {
- // The command returns a list of hashes, the last one is the one we want
- return buffer.toString().trim().split(' ').pop();
- }
- } catch (e) {
- console.error('Cannot get current git hash');
- process.exit(1);
- }
-
- return '';
-}
-/**
- *
- * @param {Object} options
- * @param {string} options.screenerApiKey
- * @param {string} options.sourceBranchName
- * @param {string} options.deployUrl
- * @param {string} options.targetBranch
- * @returns {import('@fluentui/scripts/screener/screener.types').ScreenerRunnerConfig}
- */
-function getConfig({ screenerApiKey, sourceBranchName, deployUrl, targetBranch }) {
- const baseBranch = targetBranch ? targetBranch.replace(/^refs\/heads\//, '') : 'master';
- // https://github.com/screener-io/screener-storybook#additional-configuration-options
- const config = {
- projectRepo: 'microsoft/fluentui/react-components',
- storybookStaticBuildDir: 'dist/storybook',
- storybookConfigDir: '.storybook',
- apiKey: screenerApiKey,
- resolution: '1024x768',
- baseBranch,
- failureExitCode: 0,
- alwaysAcceptBaseBranch: true,
- states: [],
- ...(sourceBranchName !== 'master' ? { commit: getCurrentHash() } : null),
- baseUrl: `${deployUrl}/react-components-screener/iframe.html`,
- };
- console.log('Screener config: ' + JSON.stringify({ ...config, apiKey: '...' }, null, 2));
- return config;
-}
-
-module.exports = getConfig;
diff --git a/apps/vr-tests-react-components/src/stories/Accordion/Accordion.stories.tsx b/apps/vr-tests-react-components/src/stories/Accordion/Accordion.stories.tsx
index 611d822aa403a..08c1e884d4430 100644
--- a/apps/vr-tests-react-components/src/stories/Accordion/Accordion.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Accordion/Accordion.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { Accordion, AccordionItem, AccordionHeader, AccordionPanel } from '@fluentui/react-accordion';
import { CircleRegular } from '@fluentui/react-icons';
import { ComponentMeta } from '@storybook/react';
@@ -10,11 +10,11 @@ export default {
decorators: [
story => (
-
+
{story()}
-
+
),
],
} as ComponentMeta;
diff --git a/apps/vr-tests-react-components/src/stories/Accordion/AccordionFocusInteractions.stories.tsx b/apps/vr-tests-react-components/src/stories/Accordion/AccordionFocusInteractions.stories.tsx
index 81c0afc7df01a..450dcd268df27 100644
--- a/apps/vr-tests-react-components/src/stories/Accordion/AccordionFocusInteractions.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Accordion/AccordionFocusInteractions.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { Accordion, AccordionItem, AccordionHeader, AccordionPanel } from '@fluentui/react-accordion';
import { ComponentMeta } from '@storybook/react';
import { getStoryVariant, DARK_MODE, HIGH_CONTRAST, RTL } from '../../utilities';
@@ -9,8 +9,8 @@ export default {
decorators: [
story => (
-
{story()}
-
+
),
],
} as ComponentMeta;
diff --git a/apps/vr-tests-react-components/src/stories/Avatar.stories.tsx b/apps/vr-tests-react-components/src/stories/Avatar.stories.tsx
index 2b70d2ee57e89..282b0674b386e 100644
--- a/apps/vr-tests-react-components/src/stories/Avatar.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Avatar.stories.tsx
@@ -1,6 +1,6 @@
import { storiesOf } from '@storybook/react';
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { Avatar, AvatarProps } from '@fluentui/react-avatar';
import { PeopleRegular, PersonCallRegular } from '@fluentui/react-icons';
@@ -42,7 +42,7 @@ const nameAndImage = [
/** Arrays of example values for each Avatar prop */
const examples = {
size: [16, 20, 24, 28, 32, 36, 40, 48, 56, 64, 72, 96, 120, 128],
- nameAndImage: nameAndImage,
+ nameAndImage,
name: nameAndImage.map(p => p.name),
image: nameAndImage.map(p => p.image),
badge: [
@@ -193,7 +193,7 @@ storiesOf('Avatar Converged', module)
))
.addDecorator(story => (
- {story()}
+ {story()}
))
.addStory(
'basic',
diff --git a/apps/vr-tests-react-components/src/stories/AvatarGroup.stories.tsx b/apps/vr-tests-react-components/src/stories/AvatarGroup.stories.tsx
index 4ba18d54606c9..6bd674763f1cb 100644
--- a/apps/vr-tests-react-components/src/stories/AvatarGroup.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/AvatarGroup.stories.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
import { storiesOf } from '@storybook/react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import {
AvatarGroup,
AvatarGroupItem,
@@ -74,7 +74,7 @@ const AvatarGroupList: React.FC<
storiesOf('AvatarGroup Converged', module)
.addDecorator(TestWrapperDecorator)
.addDecorator(story => (
- {story()}
+ {story()}
))
.addStory('basic', () => , {
includeHighContrast: true,
@@ -136,9 +136,9 @@ storiesOf('AvatarGroup Converged', module)
storiesOf('AvatarGroup Converged', module)
.addDecorator(TestWrapperDecorator)
.addDecorator(story => (
-
+
{story()}
-
+
))
.addStory(
'overflowContent',
diff --git a/apps/vr-tests-react-components/src/stories/Button/Button.stories.tsx b/apps/vr-tests-react-components/src/stories/Button/Button.stories.tsx
index 88c0021b684d3..53bb727299c9a 100644
--- a/apps/vr-tests-react-components/src/stories/Button/Button.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Button/Button.stories.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import { Button } from '@fluentui/react-button';
import { bundleIcon, CalendarMonthFilled, CalendarMonthRegular } from '@fluentui/react-icons';
import { ComponentMeta } from '@storybook/react';
-import { getStoryVariant, withScreenerSteps, DARK_MODE, HIGH_CONTRAST, RTL } from '../../utilities';
+import { getStoryVariant, withStoryWrightSteps, DARK_MODE, HIGH_CONTRAST, RTL } from '../../utilities';
import { buttonId, steps, useStyles } from './utils';
const CalendarMonth = bundleIcon(CalendarMonthFilled, CalendarMonthRegular);
@@ -10,7 +10,7 @@ const CalendarMonth = bundleIcon(CalendarMonthFilled, CalendarMonthRegular);
export default {
title: 'Button Converged',
Component: Button,
- decorators: [story => withScreenerSteps({ story, steps })],
+ decorators: [story => withStoryWrightSteps({ story, steps })],
} as ComponentMeta;
export const Default = () => ;
diff --git a/apps/vr-tests-react-components/src/stories/Button/CompoundButton.stories.tsx b/apps/vr-tests-react-components/src/stories/Button/CompoundButton.stories.tsx
index 4c067d60f8704..01daae64e160a 100644
--- a/apps/vr-tests-react-components/src/stories/Button/CompoundButton.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Button/CompoundButton.stories.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import { CompoundButton } from '@fluentui/react-button';
import { bundleIcon, CalendarMonthFilled, CalendarMonthRegular } from '@fluentui/react-icons';
import { ComponentMeta } from '@storybook/react';
-import { getStoryVariant, withScreenerSteps, RTL } from '../../utilities';
+import { getStoryVariant, withStoryWrightSteps, RTL } from '../../utilities';
import { buttonId, steps, useStyles } from './utils';
const CalendarMonth = bundleIcon(CalendarMonthFilled, CalendarMonthRegular);
@@ -10,7 +10,7 @@ const CalendarMonth = bundleIcon(CalendarMonthFilled, CalendarMonthRegular);
export default {
title: 'CompoundButton Converged',
component: CompoundButton,
- decorators: [story => withScreenerSteps({ story, steps })],
+ decorators: [story => withStoryWrightSteps({ story, steps })],
} as ComponentMeta;
export const Outline = () => (
diff --git a/apps/vr-tests-react-components/src/stories/Button/CompoundButtonDefault.stories.tsx b/apps/vr-tests-react-components/src/stories/Button/CompoundButtonDefault.stories.tsx
index 3d73daf5f7d91..cce9b57adaa9c 100644
--- a/apps/vr-tests-react-components/src/stories/Button/CompoundButtonDefault.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Button/CompoundButtonDefault.stories.tsx
@@ -1,14 +1,14 @@
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps } from 'storywright';
import { CompoundButton } from '@fluentui/react-button';
import { bundleIcon, CalendarMonthFilled, CalendarMonthRegular } from '@fluentui/react-icons';
import { ComponentMeta } from '@storybook/react';
-import { getStoryVariant, withScreenerSteps, RTL } from '../../utilities';
+import { getStoryVariant, withStoryWrightSteps, RTL } from '../../utilities';
import { buttonId } from './utils';
const CalendarMonth = bundleIcon(CalendarMonthFilled, CalendarMonthRegular);
-const steps = new Screener.Steps()
+const steps = new Steps()
.snapshot('default', { cropTo: '.testWrapper' })
// https://github.com/microsoft/fluentui/issues/21998
// .hover('#button-id')
@@ -20,7 +20,7 @@ const steps = new Screener.Steps()
export default {
title: 'CompoundButton Converged',
component: CompoundButton,
- decorators: [story => withScreenerSteps({ story, steps })],
+ decorators: [story => withStoryWrightSteps({ story, steps })],
} as ComponentMeta;
export const Default = () => (
diff --git a/apps/vr-tests-react-components/src/stories/Button/MenuButton.stories.tsx b/apps/vr-tests-react-components/src/stories/Button/MenuButton.stories.tsx
index 492115ce9318c..811a358b2c386 100644
--- a/apps/vr-tests-react-components/src/stories/Button/MenuButton.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Button/MenuButton.stories.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import { MenuButton } from '@fluentui/react-button';
import { bundleIcon, CalendarMonthFilled, CalendarMonthRegular } from '@fluentui/react-icons';
import { ComponentMeta } from '@storybook/react';
-import { getStoryVariant, withScreenerSteps, RTL } from '../../utilities';
+import { getStoryVariant, withStoryWrightSteps, RTL } from '../../utilities';
import { buttonId, steps, useStyles } from './utils';
const CalendarMonth = bundleIcon(CalendarMonthFilled, CalendarMonthRegular);
@@ -10,7 +10,7 @@ const CalendarMonth = bundleIcon(CalendarMonthFilled, CalendarMonthRegular);
export default {
title: 'MenuButton Converged',
component: MenuButton,
- decorators: [story => withScreenerSteps({ story, steps })],
+ decorators: [story => withStoryWrightSteps({ story, steps })],
} as ComponentMeta;
export const Default = () => Hello, world;
diff --git a/apps/vr-tests-react-components/src/stories/Button/ToggleButton.stories.tsx b/apps/vr-tests-react-components/src/stories/Button/ToggleButton.stories.tsx
index 4e8e4bff57ea6..bbf967d53bb44 100644
--- a/apps/vr-tests-react-components/src/stories/Button/ToggleButton.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Button/ToggleButton.stories.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import { ToggleButton } from '@fluentui/react-button';
import { bundleIcon, CalendarMonthFilled, CalendarMonthRegular } from '@fluentui/react-icons';
import { ComponentMeta } from '@storybook/react';
-import { getStoryVariant, withScreenerSteps, DARK_MODE, HIGH_CONTRAST, RTL } from '../../utilities';
+import { getStoryVariant, withStoryWrightSteps, DARK_MODE, HIGH_CONTRAST, RTL } from '../../utilities';
import { buttonId, steps, useStyles } from './utils';
const CalendarMonth = bundleIcon(CalendarMonthFilled, CalendarMonthRegular);
@@ -10,7 +10,7 @@ const CalendarMonth = bundleIcon(CalendarMonthFilled, CalendarMonthRegular);
export default {
title: 'ToggleButton Converged',
component: ToggleButton,
- decorators: [story => withScreenerSteps({ story, steps })],
+ decorators: [story => withStoryWrightSteps({ story, steps })],
} as ComponentMeta;
export const Default = () => Hello, world;
diff --git a/apps/vr-tests-react-components/src/stories/Button/utils.ts b/apps/vr-tests-react-components/src/stories/Button/utils.ts
index 41cf2954cabb2..651478afafb80 100644
--- a/apps/vr-tests-react-components/src/stories/Button/utils.ts
+++ b/apps/vr-tests-react-components/src/stories/Button/utils.ts
@@ -1,4 +1,4 @@
-import Screener from 'screener-storybook/src/screener';
+import { Steps } from 'storywright';
import { makeStyles } from '@griffel/react';
export const buttonId = 'button-id';
@@ -9,7 +9,7 @@ export const useStyles = makeStyles({
},
});
-export const steps = new Screener.Steps()
+export const steps = new Steps()
.snapshot('default', { cropTo: '.testWrapper' })
.hover('#button-id')
.snapshot('hover', { cropTo: '.testWrapper' })
diff --git a/apps/vr-tests-react-components/src/stories/Card/Card.stories.tsx b/apps/vr-tests-react-components/src/stories/Card/Card.stories.tsx
index 12f1bb416a430..93952e93137c1 100644
--- a/apps/vr-tests-react-components/src/stories/Card/Card.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Card/Card.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { Card, CardHeader, CardPreview } from '@fluentui/react-card';
import { MoreHorizontal24Filled } from '@fluentui/react-icons';
import { Body1, Caption1 } from '@fluentui/react-text';
@@ -13,11 +13,11 @@ export default {
decorators: [
story => (
-
+
{story()}
-
+
),
],
} as ComponentMeta;
diff --git a/apps/vr-tests-react-components/src/stories/Card/CardInteractive.stories.tsx b/apps/vr-tests-react-components/src/stories/Card/CardInteractive.stories.tsx
index 2a4946ff607a4..953270ef12da4 100644
--- a/apps/vr-tests-react-components/src/stories/Card/CardInteractive.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Card/CardInteractive.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { Card } from '@fluentui/react-card';
import { action } from '@storybook/addon-actions';
import { SampleCardContent } from './utils';
@@ -11,8 +11,8 @@ export default {
decorators: [
story => (
-
{story()}
-
+
),
],
} as ComponentMeta;
diff --git a/apps/vr-tests-react-components/src/stories/Card/CardSelectable.stories.tsx b/apps/vr-tests-react-components/src/stories/Card/CardSelectable.stories.tsx
index 8ffcbb067ec18..c05755f3317c9 100644
--- a/apps/vr-tests-react-components/src/stories/Card/CardSelectable.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Card/CardSelectable.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { Card } from '@fluentui/react-card';
import { SampleCardContent } from './utils';
import { ComponentMeta } from '@storybook/react';
@@ -10,8 +10,8 @@ export default {
decorators: [
story => (
-
{story()}
-
+
),
],
} as ComponentMeta;
diff --git a/apps/vr-tests-react-components/src/stories/Checkbox.stories.tsx b/apps/vr-tests-react-components/src/stories/Checkbox.stories.tsx
index ec456a60d55a0..375a23d90e89b 100644
--- a/apps/vr-tests-react-components/src/stories/Checkbox.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Checkbox.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener, { Steps } from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { storiesOf } from '@storybook/react';
import { Checkbox } from '@fluentui/react-checkbox';
import { TestWrapperDecoratorFixedWidth } from '../utilities/TestWrapperDecorator';
@@ -7,7 +7,7 @@ import { TestWrapperDecoratorFixedWidth } from '../utilities/TestWrapperDecorato
storiesOf('Checkbox Converged', module)
.addDecorator(TestWrapperDecoratorFixedWidth)
.addDecorator(story => (
-
{story()}
-
+
))
.addStory('unchecked', () => , { includeRtl: true })
.addStory('checked', () => )
@@ -27,7 +27,7 @@ storiesOf('Checkbox Converged', module)
storiesOf('Checkbox Converged', module)
.addDecorator(TestWrapperDecoratorFixedWidth)
.addDecorator(story => (
- {story()}
+ {story()}
))
.addStory('disabled+checked', () => )
.addStory('disabled+mixed', () => )
diff --git a/apps/vr-tests-react-components/src/stories/Divider.stories.tsx b/apps/vr-tests-react-components/src/stories/Divider.stories.tsx
index 3c07d6fd9b943..28cbc16ac0efb 100644
--- a/apps/vr-tests-react-components/src/stories/Divider.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Divider.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener, { Steps } from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { storiesOf } from '@storybook/react';
import { Divider } from '@fluentui/react-divider';
import { TestWrapperDecorator, TestWrapperDecoratorFixedWidth } from '../utilities/index';
@@ -7,7 +7,7 @@ import { TestWrapperDecorator, TestWrapperDecoratorFixedWidth } from '../utiliti
storiesOf('Divider Converged - Horizontal', module)
.addDecorator(TestWrapperDecoratorFixedWidth)
.addDecorator(story => (
- {story()}
+ {story()}
))
.addStory('without content', () => , { includeRtl: true })
.addStory('with content', () => Today, {
@@ -37,7 +37,7 @@ storiesOf('Divider Converged - Vertical', module)
.addDecorator(TestWrapperDecorator)
.addDecorator(story => (
- {story()}
+ {story()}
))
.addStory('Center Aligned', () => Today)
diff --git a/apps/vr-tests-react-components/src/stories/Field.stories.tsx b/apps/vr-tests-react-components/src/stories/Field.stories.tsx
index 8f1fae22d29d7..a633595429512 100644
--- a/apps/vr-tests-react-components/src/stories/Field.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Field.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener, { Steps } from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { storiesOf } from '@storybook/react';
import { CheckboxField_unstable as CheckboxField } from '@fluentui/react-checkbox';
import { ComboboxField_unstable as ComboboxField } from '@fluentui/react-combobox';
@@ -24,11 +24,11 @@ type FieldControlProps = Pick<
*/
const storiesOfField = (name: string, Field: React.VoidFunctionComponent) =>
storiesOf(name, module)
- .addDecorator(story => {story()})
+ .addDecorator(story => {story()})
.addDecorator(story => (
))
diff --git a/apps/vr-tests-react-components/src/stories/Image/Image.stories.tsx b/apps/vr-tests-react-components/src/stories/Image/Image.stories.tsx
index d24288b7aee42..e8f0e9953a255 100644
--- a/apps/vr-tests-react-components/src/stories/Image/Image.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Image/Image.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { Image } from '@fluentui/react-image';
import { ComponentMeta } from '@storybook/react';
@@ -10,7 +10,7 @@ export default {
decorators: [
(story: () => React.ReactNode) => (
- {story()}
+ {story()}
),
],
} as ComponentMeta;
diff --git a/apps/vr-tests-react-components/src/stories/Input.stories.tsx b/apps/vr-tests-react-components/src/stories/Input.stories.tsx
index 8e527d9776296..d3233f1b52820 100644
--- a/apps/vr-tests-react-components/src/stories/Input.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Input.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener, { Steps } from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { storiesOf } from '@storybook/react';
import { Input } from '@fluentui/react-input';
import { SearchRegular, DismissRegular } from '@fluentui/react-icons';
@@ -8,7 +8,7 @@ import { TestWrapperDecoratorFixedWidth } from '../utilities/TestWrapperDecorato
storiesOf('Input Converged', module)
.addDecorator(TestWrapperDecoratorFixedWidth)
.addDecorator(story => (
-
{story()}
-
+
))
.addStory('Appearance: outline (default)', () => )
.addStory('Appearance: underline', () => )
@@ -47,7 +47,7 @@ storiesOf('Input Converged', module)
.addDecorator(TestWrapperDecoratorFixedWidth)
// note: due to reused "Input Converged" story ID, TestWrapperDecoratorFixedWidth is also reused
.addDecorator(story => (
- {story()}
+ {story()}
))
.addStory('Size: small', () => )
.addStory('Size: large', () => )
diff --git a/apps/vr-tests-react-components/src/stories/Label.stories.tsx b/apps/vr-tests-react-components/src/stories/Label.stories.tsx
index 7129463cf183e..e7be90a5e6ba5 100644
--- a/apps/vr-tests-react-components/src/stories/Label.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Label.stories.tsx
@@ -1,18 +1,18 @@
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { storiesOf } from '@storybook/react';
import { Label } from '@fluentui/react-label';
storiesOf('Label Converged', module)
.addDecorator(story =>
// prettier-ignore
-
{story()}
- ,
+ ,
)
.addStory('Root', () => , {
includeRtl: true,
diff --git a/apps/vr-tests-react-components/src/stories/Link.stories.tsx b/apps/vr-tests-react-components/src/stories/Link.stories.tsx
index 9627393c11d62..102bc0f6f626d 100644
--- a/apps/vr-tests-react-components/src/stories/Link.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Link.stories.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import Screener, { Steps } from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import { storiesOf } from '@storybook/react';
import { Link, LinkProps } from '@fluentui/react-link';
@@ -8,7 +8,7 @@ const ButtonLink = (props: LinkProps) => ;
storiesOf('Link Converged - Rendered as anchor', module)
.addDecorator(story => (
-
{story()}
-
+
))
.addStory('Stand-alone', () => Stand-alone link, {
includeRtl: true,
@@ -62,7 +62,7 @@ storiesOf('Link Converged - Rendered as anchor', module)
// We put the disabled stories separately so they do not error on the focused step.
storiesOf('Link Converged - Rendered as anchor', module)
.addDecorator(story => (
-
{story()}
-
+
))
.addStory('Stand-alone Disabled', () => Stand-alone disabled link)
.addStory('Inline Disabled', () => (
@@ -88,7 +88,7 @@ storiesOf('Link Converged - Rendered as anchor', module)
storiesOf('Link Converged - Rendered as button', module)
.addDecorator(story => (
-
{story()}
-
+
))
.addStory('Stand-alone', () => Stand-alone link, { includeRtl: true })
.addStory('Stand-alone Disabled Focusable', () => (
@@ -134,7 +134,7 @@ storiesOf('Link Converged - Rendered as button', module)
// We put the disabled stories separately so they do not error on the focused step.
storiesOf('Link Converged - Rendered as button', module)
.addDecorator(story => (
-
{story()}
-
+
))
.addStory('Stand-alone Disabled', () => Stand-alone disabled link)
.addStory('Inline Disabled', () => (
diff --git a/apps/vr-tests-react-components/src/stories/MakeStyles.stories.tsx b/apps/vr-tests-react-components/src/stories/MakeStyles.stories.tsx
index 04f5d24878ccf..ccbd6d5f9cd57 100644
--- a/apps/vr-tests-react-components/src/stories/MakeStyles.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/MakeStyles.stories.tsx
@@ -3,7 +3,7 @@ import { FluentProvider } from '@fluentui/react-provider';
import { tokens, webLightTheme } from '@fluentui/react-theme';
import { storiesOf } from '@storybook/react';
import * as React from 'react';
-import Screener, { Steps } from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
const useStyles = makeStyles({
box: {
@@ -155,11 +155,11 @@ export const Propagation = () => (
storiesOf('MakeStyles', module)
.addDecorator(story => (
-
+
{story()}
-
+
))
.addStory('RTL: two components in a single Provider', () => (
@@ -194,7 +194,7 @@ storiesOf('MakeStyles', module)
storiesOf('MakeStyles (pseudo)', module)
.addDecorator(story => (
-
{story()}
-
+
))
.addStory('insertion is ordered', () => );
diff --git a/apps/vr-tests-react-components/src/stories/Menu.stories.tsx b/apps/vr-tests-react-components/src/stories/Menu.stories.tsx
index 3042f445b1620..9c16136f367aa 100644
--- a/apps/vr-tests-react-components/src/stories/Menu.stories.tsx
+++ b/apps/vr-tests-react-components/src/stories/Menu.stories.tsx
@@ -1,6 +1,6 @@
import { storiesOf } from '@storybook/react';
import * as React from 'react';
-import Screener from 'screener-storybook/src/screener';
+import { Steps, StoryWright } from 'storywright';
import {
Menu,
MenuTrigger,
@@ -18,9 +18,7 @@ import { CutRegular, EditRegular, ClipboardPasteRegular } from '@fluentui/react-
storiesOf('Menu Converged - basic', module)
.addDecorator(story => (
-
- {story()}
-
+ {story()}
))
.addStory(
'default',
@@ -44,9 +42,7 @@ storiesOf('Menu Converged - basic', module)
storiesOf('Menu Converged - secondary content', module)
.addDecorator(story => (
-
- {story()}
-
+ {story()}
))
.addStory(
'default',
@@ -73,7 +69,7 @@ storiesOf('Menu Converged - secondary content', module)
);
storiesOf('Menu Converged - groups', module)
- .addDecorator(story => {story()})
+ .addDecorator(story => {story()})
.addStory(
'default',
() => (
@@ -106,9 +102,9 @@ storiesOf('Menu Converged - groups', module)
storiesOf('Menu Converged - selection', module)
.addDecorator(story => (
-
+
{story()}
-
+
))
.addStory(
'checkbox',
@@ -138,9 +134,9 @@ storiesOf('Menu Converged - selection', module)
storiesOf('Menu Converged - selection groups', module)
.addDecorator(story => (
-
+
{story()}
-
+
))
.addStory(
'default',
@@ -187,7 +183,7 @@ storiesOf('Menu Converged - selection groups', module)
storiesOf('Menu Converged - nested submenus', module)
.addDecorator(story => (
// https://github.com/microsoft/fluentui/issues/19782
- {story()}
+ {story()}
))
.addStory(
'default',
@@ -225,7 +221,7 @@ storiesOf('Menu Converged - nested submenus', module)
storiesOf('Menu Converged - split item', module)
.addDecorator(story => (
// https://github.com/microsoft/fluentui/issues/19782
- {story()}
+ {story()}
))
.addStory(
'default',
@@ -311,7 +307,7 @@ const ContextMenuArea = React.forwardRef((props, ref) => {
storiesOf('Menu nested within a MenuTrigger', module)
.addDecorator(story => (
// https://github.com/microsoft/fluentui/issues/19782
- {story()}
+ {story()}
))
.addStory('default', () => (