Merge pull request #5635 from storybooks/5600-fix-prop-warnings

Fix some prop warnings
storybookjs · Feb 19, 2019 · e05348a · e05348a
2 parents fb0f628 + 0326275
commit e05348a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/addons/actions/src/manager.tsx b/addons/actions/src/manager.tsx
@@ -7,7 +7,7 @@ export function register() {
   addons.register(ADDON_ID, api => {
     addons.addPanel(PANEL_ID, {
       title: 'Actions',
-      render: ({ active }) => <ActionLogger api={api} active={active} />,
+      render: ({ active, key }) => <ActionLogger key={key} api={api} active={active} />,
     });
   });
 }
diff --git a/lib/addons/src/index.ts b/lib/addons/src/index.ts
@@ -8,6 +8,7 @@ import deprecate from 'util-deprecate';
 
 export interface RenderOptions {
   active: boolean;
+  key: string;
 }
 export interface RouteOptions {
   storyId: string;

diff --git a/lib/components/src/tooltip/WithTooltip.js b/lib/components/src/tooltip/WithTooltip.js
@@ -32,19 +32,13 @@ const WithTooltip = ({
 }) => {
   const Container = svg ? TargetSvgContainer : TargetContainer;
 
-  if (tooltipShown !== undefined) {
-    Object.assign(props, { tooltipShown });
-  }
-  if (onVisibilityChange !== undefined) {
-    Object.assign(props, { onVisibilityChange });
-  }
-
   return (
     <TooltipTrigger
       placement={placement}
       trigger={trigger}
       modifiers={modifiers}
-      {...props}
+      tooltipShown={tooltipShown}
+      onVisibilityChange={onVisibilityChange}
       tooltip={({
         getTooltipProps,
         getArrowProps,

diff --git a/lib/ui/src/components/sidebar/NotificationList.js b/lib/ui/src/components/sidebar/NotificationList.js
@@ -38,6 +38,6 @@ export default function NotificationList({ notifications }) {
 }
 
 NotificationList.propTypes = {
-  notifications: PropTypes.arrayOf(PropTypes.shape({ id: PropTypes.number.isRequired }).isRequired)
+  notifications: PropTypes.arrayOf(PropTypes.shape({ id: PropTypes.string.isRequired }).isRequired)
     .isRequired,
 };
diff --git a/lib/ui/src/components/sidebar/NotificationList.stories.js b/lib/ui/src/components/sidebar/NotificationList.stories.js
@@ -13,7 +13,7 @@ const notifications = Object.values(NotificationItemStories)
   .filter(s => s.storyData)
   .map(({ storyData: { notification } }, index) => ({
     ...notification,
-    id: index,
+    id: index.toString(),
   }));
 export const all = () => <NotificationList notifications={notifications} />;
 all.storyData = { notifications };

diff --git a/lib/ui/src/components/sidebar/SidebarSearch.stories.js b/lib/ui/src/components/sidebar/SidebarSearch.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { action } from '@storybook/addon-actions';
+import { actions as makeActions } from '@storybook/addon-actions';
 
 import SidebarSearch, { PureSidebarSearch } from './SidebarSearch';
 
@@ -15,11 +15,13 @@ export default {
   ],
 };
 
-export const simple = () => <SidebarSearch />;
+const actions = makeActions('onChange');
+const pureActions = { ...actions, ...makeActions('onSetFocussed') };
 
-const onSetFocussed = action('onSetFocussed');
-export const focussed = () => <PureSidebarSearch focussed onSetFocussed={onSetFocussed} />;
+export const simple = () => <SidebarSearch {...actions} />;
+
+export const focussed = () => <PureSidebarSearch focussed {...pureActions} />;
 
 export const filledIn = () => (
-  <PureSidebarSearch focussed onSetFocussed={onSetFocussed} defaultValue="Searchstring" />
+  <PureSidebarSearch focussed defaultValue="Searchstring" {...pureActions} />
 );