Merge branch 'next' into remove-unused-import-in-mdx-doc

storybookjs · May 3, 2023 · 425e566 · 425e566
2 parents 51a4c6f + bc93263
commit 425e566
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 25 deletions.
diff --git a/code/addons/viewport/src/Tool.tsx b/code/addons/viewport/src/Tool.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable no-fallthrough */
 import type { ReactNode, FC } from 'react';
 import React, { useState, Fragment, useEffect, useRef, memo } from 'react';
 import memoize from 'memoizerific';
@@ -37,25 +36,16 @@ const baseViewports: ViewportItem[] = [responsiveViewport];
 
 const toLinks = memoize(50)((list: ViewportItem[], active: LinkBase, set, state, close): Link[] => {
   return list
+    .filter((i) => i.id !== responsiveViewport.id || active.id !== i.id)
     .map((i) => {
-      switch (i.id) {
-        case responsiveViewport.id: {
-          if (active.id === i.id) {
-            return null;
-          }
-        }
-        default: {
-          return {
-            ...i,
-            onClick: () => {
-              set({ ...state, selected: i.id });
-              close();
-            },
-          };
-        }
-      }
-    })
-    .filter(Boolean);
+      return {
+        ...i,
+        onClick: () => {
+          set({ ...state, selected: i.id });
+          close();
+        },
+      };
+    });
 });
 
 const wrapperId = 'storybook-preview-wrapper';
@@ -112,12 +102,12 @@ interface ViewportToolState {
 }
 
 const getStyles = (
-  prevStyles: ViewportStyles,
+  prevStyles: ViewportStyles | undefined,
   styles: Styles,
   isRotated: boolean
-): ViewportStyles => {
-  if (styles === null) {
-    return null;
+): ViewportStyles | undefined => {
+  if (!styles || !prevStyles) {
+    return undefined;
   }
   const result = typeof styles === 'function' ? styles(prevStyles) : styles;
   return isRotated ? flip(result) : result;
@@ -154,7 +144,8 @@ export const ViewportTool: FC = memo(
     useEffect(() => {
       setState({
         selected:
-          defaultViewport || (viewports[state.selected] ? state.selected : responsiveViewport.id),
+          defaultViewport ||
+          (state.selected && viewports[state.selected] ? state.selected : responsiveViewport.id),
         isRotated: defaultOrientation === 'landscape',
       });
     }, [defaultOrientation, defaultViewport]);

diff --git a/code/addons/viewport/tsconfig.json b/code/addons/viewport/tsconfig.json
@@ -2,6 +2,6 @@
   "extends": "../../tsconfig.json",
   "include": ["src/**/*"],
   "compilerOptions": {
-    "strict": false
+    "strict": true
   }
 }