PR comments

microsoft · Jul 23, 2024 · e5257ff · e5257ff
1 parent 3d58924
commit e5257ff
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/packages/react-components/react-storybook-addon/src/decorators/withAriaLive.tsx b/packages/react-components/react-storybook-addon/src/decorators/withAriaLive.tsx
@@ -2,11 +2,10 @@ import { AriaLiveAnnouncer } from '@fluentui/react-aria';
 import * as React from 'react';
 
 import { FluentStoryContext } from '../hooks';
+import { isDecoratorDisabled } from '../utils/isDecoratorDisabled';
 
 export const withAriaLive = (Story: () => JSX.Element, context: FluentStoryContext) => {
-  const shouldDisable = context.parameters.reactStorybookAddon?.disabledDecorators?.includes('AriaLive');
-
-  if (shouldDisable) {
+  if (isDecoratorDisabled(context, 'AriaLive')) {
     return Story();
   }
 

diff --git a/packages/react-components/react-storybook-addon/src/decorators/withFluentProvider.tsx b/packages/react-components/react-storybook-addon/src/decorators/withFluentProvider.tsx
@@ -5,6 +5,7 @@ import { Theme } from '@fluentui/react-theme';
 import { themes, defaultTheme, ThemeIds } from '../theme';
 import { DIR_ID, THEME_ID } from '../constants';
 import { FluentGlobals, FluentStoryContext } from '../hooks';
+import { isDecoratorDisabled } from '../utils/isDecoratorDisabled';
 
 const findTheme = (themeId?: ThemeIds) => {
   if (!themeId) {
@@ -24,9 +25,7 @@ export const withFluentProvider = (StoryFn: () => JSX.Element, context: FluentSt
   const { globals, parameters } = context;
   const { mode } = parameters;
 
-  const shouldDisable = parameters.reactStorybookAddon?.disabledDecorators?.includes('FluentProvider');
-
-  if (shouldDisable) {
+  if (isDecoratorDisabled(context, 'FluentProvider')) {
     return StoryFn();
   }
 

diff --git a/packages/react-components/react-storybook-addon/src/decorators/withReactStrictMode.tsx b/packages/react-components/react-storybook-addon/src/decorators/withReactStrictMode.tsx
@@ -2,11 +2,10 @@ import * as React from 'react';
 
 import { STRICT_MODE_ID } from '../constants';
 import { FluentStoryContext } from '../hooks';
+import { isDecoratorDisabled } from '../utils/isDecoratorDisabled';
 
 export const withReactStrictMode = (StoryFn: () => JSX.Element, context: FluentStoryContext) => {
-  const shouldDisable = context.parameters.reactStorybookAddon?.disabledDecorators?.includes('ReactStrictMode');
-
-  if (shouldDisable) {
+  if (isDecoratorDisabled(context, 'ReactStrictMode')) {
     return StoryFn();
   }
 

diff --git a/packages/react-components/react-storybook-addon/src/utils/isDecoratorDisabled.ts b/packages/react-components/react-storybook-addon/src/utils/isDecoratorDisabled.ts
@@ -0,0 +1,7 @@
+import type { FluentParameters, FluentStoryContext } from '../hooks';
+
+type DecoratorName = NonNullable<FluentParameters['reactStorybookAddon']>['disabledDecorators'][number];
+
+export function isDecoratorDisabled(context: FluentStoryContext, decoratorName: DecoratorName): boolean {
+  return context.parameters.reactStorybookAddon?.disabledDecorators?.includes(decoratorName) ?? false;
+}