Revert "refactor: rewrite some code to avoid anonymous fct in JS comp…

…iled code" This reverts commit 538ee0f as TS is now compiled using Babel instead of tsc
storybookjs · Apr 7, 2019 · d8b0858 · d8b0858
1 parent 57fd649
commit d8b0858
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 39 deletions.
diff --git a/lib/components/src/ActionBar/ActionBar.tsx b/lib/components/src/ActionBar/ActionBar.tsx
@@ -53,21 +53,12 @@ export interface ActionBarProps {
   actionItems: ActionItem[];
 }
 
-// Need to define ActionBar using old fashioned `function ActionBar` to avoid TS compiler to
-// generate an anonymous function instead of naming it ActionBar...
-// See https://github.com/storybooks/storybook/pull/6095#issuecomment-477480930
-// tslint:disable-next-line:no-shadowed-variable
-export const ActionBar: FunctionComponent<ActionBarProps> = function ActionBar({
-  actionItems,
-  ...props
-}) {
-  return (
-    <Container {...props}>
-      {actionItems.map(({ title, onClick }, index: number) => (
-        <ActionButton key={index} onClick={onClick}>
-          {title}
-        </ActionButton>
-      ))}
-    </Container>
-  );
-};
+export const ActionBar: FunctionComponent<ActionBarProps> = ({ actionItems, ...props }) => (
+  <Container {...props}>
+    {actionItems.map(({ title, onClick }, index: number) => (
+      <ActionButton key={index} onClick={onClick}>
+        {title}
+      </ActionButton>
+    ))}
+  </Container>
+);
diff --git a/lib/components/src/ScrollArea/ScrollArea.tsx b/lib/components/src/ScrollArea/ScrollArea.tsx
@@ -1,7 +1,7 @@
 // Storybook's implementation of SimpleBar https://github.com/Grsmto/simplebar
 // Note: "SimpleBar can't be used on the <body>, <textarea> or <iframe> elements."
 
-import React, { Fragment, FunctionComponent, ReactNode } from 'react';
+import React, { Fragment, FunctionComponent } from 'react';
 import { styled, Global } from '@storybook/theming';
 
 import SimpleBar from 'simplebar-react';
@@ -38,25 +38,19 @@ export interface ScrollAreaProps {
   className?: string;
 }
 
-// Need to define ScrollArea using old fashioned `function ScrollArea` to avoid TS compiler to
-// generate an anonymous function instead of naming it ScrollArea...
-// See https://github.com/storybooks/storybook/pull/6095#issuecomment-477480930
-// tslint:disable-next-line:no-shadowed-variable
-export const ScrollArea: FunctionComponent<ScrollAreaProps> = function ScrollArea({
+export const ScrollArea: FunctionComponent<ScrollAreaProps> = ({
   children,
   vertical,
   horizontal,
   ...props
-}) {
-  return (
-    <Fragment>
-      <Global styles={getScrollAreaStyles} />
-      <Scroll vertical={vertical} horizontal={horizontal} {...props}>
-        {children}
-      </Scroll>
-    </Fragment>
-  );
-};
+}) => (
+  <Fragment>
+    <Global styles={getScrollAreaStyles} />
+    <Scroll vertical={vertical} horizontal={horizontal} {...props}>
+      {children}
+    </Scroll>
+  </Fragment>
+);
 
 ScrollArea.defaultProps = {
   horizontal: false,

diff --git a/lib/components/src/placeholder/placeholder.tsx b/lib/components/src/placeholder/placeholder.tsx
@@ -14,11 +14,7 @@ const Message = styled.div`
   font-size: ${props => props.theme.typography.size.s2 - 1}px;
 `;
 
-// Need to define Placeholder using old fashioned `function Placeholder` to avoid TS compiler to
-// generate an anonymous function instead of naming it Placeholder...
-// See https://github.com/storybooks/storybook/pull/6095#issuecomment-477480930
-// tslint:disable-next-line:no-shadowed-variable
-export const Placeholder: FunctionComponent = function Placeholder({ children, ...props }) {
+export const Placeholder: FunctionComponent = ({ children, ...props }) => {
   const [title, desc] = Children.toArray(children);
   return (
     <Message {...props}>