revert unnecessary changes

Author: Ilaiwi

src/lib/headers/CustomHeader.js

@@ -19,7 +19,7 @@ export class CustomHeader extends React.Component {
     showPeriod: PropTypes.func.isRequired,
     headerData: PropTypes.object,
     getLeftOffsetFromDate: PropTypes.func.isRequired,
-    height: PropTypes.number.isRequired
+    height: PropTypes.number.isRequired,
   }
   constructor(props) {
     super(props)
@@ -131,7 +131,7 @@ export class CustomHeader extends React.Component {
       style: Object.assign({}, style ? style : {}, {
         position: 'relative',
         width: this.props.canvasWidth,
-        height: this.props.height
+        height: this.props.height,
       })
     }
   }
@@ -172,7 +172,7 @@ export class CustomHeader extends React.Component {
       timelineWidth,
       visibleTimeStart,
       visibleTimeEnd,
-      headerData
+      headerData,
     } = this.props
     //TODO: only evaluate on changing params
     return {
@@ -190,52 +190,50 @@ export class CustomHeader extends React.Component {
       getRootProps: this.getRootProps,
       getIntervalProps: this.getIntervalProps,
       showPeriod,
-      data: headerData
+      data: headerData,
     }
   }
+
   render() {
     const props = this.getStateAndHelpers()
     const Renderer = this.props.children
-    return <Renderer {...props} />
+    return <Renderer {...props}/>
   }
 }
 
-class CustomHeaderWrapper extends React.Component {
-  static propTypes = {
-    children: PropTypes.func.isRequired,
-    unit: PropTypes.string,
-    headerData: PropTypes.object,
-    height: PropTypes.number
-  }
-  static defaultProps = {
-    height: 30
-  }
-  render() {
-    const { children, unit, headerData, height } = this.props
-    return (
-      <TimelineStateConsumer>
-        {({ getTimelineState, showPeriod, getLeftOffsetFromDate }) => {
-          const timelineState = getTimelineState()
-          return (
-            <TimelineHeadersConsumer>
-              {({ timeSteps }) => (
-                <CustomHeader
-                  children={children}
-                  timeSteps={timeSteps}
-                  showPeriod={showPeriod}
-                  unit={unit ? unit : timelineState.timelineUnit}
-                  {...timelineState}
-                  headerData={headerData}
-                  getLeftOffsetFromDate={getLeftOffsetFromDate}
-                  height={height}
-                />
-              )}
-            </TimelineHeadersConsumer>
-          )
-        }}
-      </TimelineStateConsumer>
-    )
-  }
+const CustomHeaderWrapper = ({ children, unit, headerData, height }) => (
+  <TimelineStateConsumer>
+    {({ getTimelineState, showPeriod, getLeftOffsetFromDate }) => {
+      const timelineState = getTimelineState()
+      return (
+        <TimelineHeadersConsumer>
+          {({ timeSteps }) => (
+            <CustomHeader
+              children={children}
+              timeSteps={timeSteps}
+              showPeriod={showPeriod}
+              unit={unit ? unit : timelineState.timelineUnit}
+              {...timelineState}
+              headerData={headerData}
+              getLeftOffsetFromDate={getLeftOffsetFromDate}
+              height={height}
+            />
+          )}
+        </TimelineHeadersConsumer>
+      )
+    }}
+  </TimelineStateConsumer>
+)
+
+CustomHeaderWrapper.propTypes = {
+  children: PropTypes.func.isRequired,
+  unit: PropTypes.string,
+  headerData: PropTypes.object,
+  height: PropTypes.number,
+}
+
+CustomHeaderWrapper.defaultProps = {
+  height: 30,
 }
 
 export default CustomHeaderWrapper

src/lib/headers/DateHeader.js

@@ -92,55 +92,50 @@ class DateHeader extends React.Component {
   }
 }
 
-class DateHeaderWrapper extends React.Component {
-  static propTypes = {
-    style: PropTypes.object,
-    className: PropTypes.string,
-    unit: PropTypes.string,
-    labelFormat: PropTypes.oneOfType([
-      PropTypes.func,
-      PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
-      PropTypes.string
-    ]),
-    intervalRenderer: PropTypes.func,
-    headerData: PropTypes.object,
-    height: PropTypes.number
-  }
+const DateHeaderWrapper = ({
+  unit,
+  labelFormat,
+  style,
+  className,
+  intervalRenderer,
+  headerData,
+  height
+}) => (
+  <TimelineStateConsumer>
+    {({ getTimelineState }) => {
+      const timelineState = getTimelineState()
+      return (
+        <DateHeader
+          timelineUnit={timelineState.timelineUnit}
+          unit={unit}
+          labelFormat={labelFormat}
+          style={style}
+          className={className}
+          intervalRenderer={intervalRenderer}
+          headerData={headerData}
+          height={height}
+        />
+      )
+    }}
+  </TimelineStateConsumer>
+)
 
-  static defaultProps = {
-    labelFormat: formatLabel
-  }
+DateHeaderWrapper.propTypes = {
+  style: PropTypes.object,
+  className: PropTypes.string,
+  unit: PropTypes.string,
+  labelFormat: PropTypes.oneOfType([
+    PropTypes.func,
+    PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
+    PropTypes.string
+  ]),
+  intervalRenderer: PropTypes.func,
+  headerData: PropTypes.object,
+  height: PropTypes.number
+}
 
-  render() {
-    const {
-      unit,
-      labelFormat,
-      style,
-      className,
-      intervalRenderer,
-      headerData,
-      height
-    } = this.props
-    return (
-      <TimelineStateConsumer>
-        {({ getTimelineState }) => {
-          const timelineState = getTimelineState()
-          return (
-            <DateHeader
-              timelineUnit={timelineState.timelineUnit}
-              unit={unit}
-              labelFormat={labelFormat}
-              style={style}
-              className={className}
-              intervalRenderer={intervalRenderer}
-              headerData={headerData}
-              height={height}
-            />
-          )
-        }}
-      </TimelineStateConsumer>
-    )
-  }
+DateHeaderWrapper.defaultProps = {
+  labelFormat: formatLabel
 }
 
 function formatLabel(

src/lib/headers/Interval.js

@@ -36,6 +36,7 @@ class Interval extends React.PureComponent {
       onClick: composeEvents(this.onIntervalClick, props.onClick)
     }
   }
+
   render() {
     const { intervalText, interval, intervalRenderer, headerData } = this.props
     const Renderer = intervalRenderer

src/lib/headers/SidebarHeader.js

@@ -21,55 +21,52 @@ class SidebarHeader extends React.PureComponent {
     return {
       style: {
         ...style,
-        width
+        width,
       }
     }
   }
 
   getStateAndHelpers = () => {
     return {
       getRootProps: this.getRootProps,
-      data: this.props.headerData
+      data: this.props.headerData,
     }
   }
+
   render() {
     const props = this.getStateAndHelpers()
     const Renderer = this.props.children
-    return <Renderer {...props} />
+    return <Renderer {...props}/>
   }
 }
 
-class SidebarWrapper extends React.Component {
-  static propTypes = {
-    children: PropTypes.func.isRequired,
-    variant: PropTypes.string,
-    headerData: PropTypes.object
-  }
-  static defaultProps = {
-    variant: LEFT_VARIANT,
-    children: ({ getRootProps }) => (
-      <div data-testid="sidebarHeader" {...getRootProps()} />
-    )
-  }
-  static secretKey = 'SidebarHeader'
-  render() {
-    const { children, variant, headerData } = this.props
-    return (
-      <TimelineHeadersConsumer>
-        {({ leftSidebarWidth, rightSidebarWidth }) => {
-          return (
-            <SidebarHeader
-              leftSidebarWidth={leftSidebarWidth}
-              rightSidebarWidth={rightSidebarWidth}
-              children={children}
-              variant={variant}
-              headerData={headerData}
-            />
-          )
-        }}
-      </TimelineHeadersConsumer>
-    )
-  }
+const SidebarWrapper = ({ children, variant, headerData }) => (
+  <TimelineHeadersConsumer>
+    {({ leftSidebarWidth, rightSidebarWidth }) => {
+      return (
+        <SidebarHeader
+          leftSidebarWidth={leftSidebarWidth}
+          rightSidebarWidth={rightSidebarWidth}
+          children={children}
+          variant={variant}
+          headerData={headerData}
+        />
+      )
+    }}
+  </TimelineHeadersConsumer>
+)
+
+SidebarWrapper.propTypes = {
+  children: PropTypes.func.isRequired,
+  variant: PropTypes.string,
+  headerData: PropTypes.object
 }
 
+SidebarWrapper.defaultProps = {
+  variant: LEFT_VARIANT,
+  children: ({ getRootProps }) => <div data-testid="sidebarHeader" {...getRootProps()} />
+}
+
+SidebarWrapper.secretKey = "SidebarHeader"
+
 export default SidebarWrapper