From af4cfec4519b8d42ce3ee07e3d5aebed51f77d72 Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <xxnerowingerxx@gmail.com>
Date: Wed, 17 Jul 2019 17:25:12 +0200
Subject: [PATCH] Auto-open publish history drawer

---
 app/src/components/Sidebar/HistoryDrawer.tsx  | 77 ++++++++++---------
 .../components/Sidebar/Publish/Publish.tsx    |  2 +-
 .../Sidebar/Publish/PublishHistory.tsx        |  2 +-
 .../Sidebar/ValueRenderer/ValueRenderer.tsx   | 15 ++--
 4 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/app/src/components/Sidebar/HistoryDrawer.tsx b/app/src/components/Sidebar/HistoryDrawer.tsx
index e036c02..0df619e 100644
--- a/app/src/components/Sidebar/HistoryDrawer.tsx
+++ b/app/src/components/Sidebar/HistoryDrawer.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react'
+import React, { useCallback, useState, useEffect, memo } from 'react'
 import { Badge, Typography } from '@material-ui/core'
 import { selectTextWithCtrlA } from '../../utils/handleTextSelectWithCtrlA'
 import { Theme, withStyles, emphasize } from '@material-ui/core/styles'
@@ -15,51 +15,49 @@ interface Props {
   onClick?: (index: number, element: EventTarget) => void
   classes: any
   contentTypeIndicator?: JSX.Element
+  autoOpen?: boolean
   theme: Theme
+  children: any
 }
 
-interface State {
-  collapsed: boolean
-}
+function HistoryDrawer(props: Props) {
+  const handleCtrlA = selectTextWithCtrlA({ targetSelector: 'pre' })
+  const [expanded, setExpanded] = useState<boolean | undefined>(undefined)
 
-class HistoryDrawer extends React.Component<Props, State> {
-  private handleCtrlA = selectTextWithCtrlA({ targetSelector: 'pre' })
+  const toggle = useCallback(() => {
+    setExpanded(!expanded)
+  }, [expanded])
 
-  constructor(props: any) {
-    super(props)
-    this.state = {
-      collapsed: true,
+  useEffect(() => {
+    if (props.autoOpen && expanded === undefined && props.items.length > 0) {
+      setExpanded(true)
     }
-  }
+  }, [props.autoOpen, expanded, props.items])
 
-  private toggle = () => {
-    this.setState({ collapsed: !this.state.collapsed })
-  }
-
-  private createSelectionHandler = (index: number) => (event: React.MouseEvent) => {
-    this.props.onClick && this.props.onClick(index, event.target)
+  const createSelectionHandler = (index: number) => (event: React.MouseEvent) => {
+    props.onClick && props.onClick(index, event.target)
     event.preventDefault()
     event.stopPropagation()
   }
 
-  public renderHistory() {
+  function renderHistory() {
     const style = (element: HistoryItem) => ({
       backgroundColor: element.selected
-        ? emphasize(this.props.theme.palette.background.default, 0.2)
-        : emphasize(this.props.theme.palette.background.default, 0.07),
+        ? emphasize(props.theme.palette.background.default, 0.2)
+        : emphasize(props.theme.palette.background.default, 0.07),
       margin: '8px',
       padding: '8px 8px 0 8px',
-      cursor: this.props.onClick ? 'pointer' : 'inherit',
+      cursor: props.onClick ? 'pointer' : 'inherit',
     })
 
     const messageStyle: React.CSSProperties = { textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }
-    const elements = this.props.items.map((element, index) => (
+    const elements = props.items.map((element, index) => (
       <div
         key={element.key}
         style={style(element)}
-        onClick={this.createSelectionHandler(index)}
+        onClick={createSelectionHandler(index)}
         tabIndex={0}
-        onKeyDown={this.handleCtrlA}
+        onKeyDown={handleCtrlA}
       >
         <div>
           <i>{element.title}</i>
@@ -72,36 +70,39 @@ class HistoryDrawer extends React.Component<Props, State> {
       </div>
     ))
 
-    const visible = this.props.items.length > 0 && this.state.collapsed
+    const visible = props.items.length > 0 && !expanded
 
     return (
-      <div className={this.props.classes.main}>
-        <div style={{ backgroundColor: emphasize(this.props.theme.palette.background.default, 0.07) }}>
-          <Typography component={'span'} onClick={this.toggle} style={{ cursor: 'pointer', display: 'flex' }}>
+      <div className={props.classes.main}>
+        <div
+          style={{
+            backgroundColor: emphasize(props.theme.palette.background.default, 0.07),
+            borderBottom: expanded ? `1px solid ${emphasize(props.theme.palette.background.default, 0.2)}` : undefined,
+          }}
+        >
+          <Typography component={'span'} onClick={toggle} style={{ cursor: 'pointer', display: 'flex' }}>
             <span style={{ flexGrow: 1 }}>
               <Badge
-                classes={{ badge: this.props.classes.badge }}
+                classes={{ badge: props.classes.badge }}
                 invisible={!visible}
-                badgeContent={this.props.items.length}
+                badgeContent={props.items.length}
                 color="primary"
               >
-                {this.state.collapsed ? '▶ History' : '▼ History'}
+                {expanded ? '▼ History' : '▶ History'}
               </Badge>
             </span>
-            <span>{this.props.contentTypeIndicator}</span>
+            <span>{props.contentTypeIndicator}</span>
           </Typography>
         </div>
         <div style={{ maxHeight: '230px', overflowY: 'scroll' }}>
-          {this.state.collapsed ? null : this.props.children}
-          {this.state.collapsed ? null : elements}
+          {expanded ? props.children : null}
+          {expanded ? elements : null}
         </div>
       </div>
     )
   }
 
-  public render() {
-    return <div style={{ display: 'block', width: '100%' }}>{this.renderHistory()}</div>
-  }
+  return <div style={{ display: 'block', width: '100%' }}>{renderHistory()}</div>
 }
 
 const styles = (theme: Theme) => ({
@@ -112,4 +113,4 @@ const styles = (theme: Theme) => ({
   badge: { right: '-25px' },
 })
 
-export default withStyles(styles, { withTheme: true })(HistoryDrawer)
+export default withStyles(styles, { withTheme: true })(memo(HistoryDrawer))
diff --git a/app/src/components/Sidebar/Publish/Publish.tsx b/app/src/components/Sidebar/Publish/Publish.tsx
index 09be797..2ee9c4d 100644
--- a/app/src/components/Sidebar/Publish/Publish.tsx
+++ b/app/src/components/Sidebar/Publish/Publish.tsx
@@ -70,7 +70,7 @@ function Publish(props: Props) {
 
   return useMemo(
     () => (
-      <div style={{ flexGrow: 1, marginLeft: '8px' }} onKeyDown={handleSubmit}>
+      <div style={{ flexGrow: 1 }} onKeyDown={handleSubmit}>
         <TopicInput />
         <div style={{ width: '100%', display: 'block' }}>
           <EditorMode
diff --git a/app/src/components/Sidebar/Publish/PublishHistory.tsx b/app/src/components/Sidebar/Publish/PublishHistory.tsx
index abd4a38..033b85d 100644
--- a/app/src/components/Sidebar/Publish/PublishHistory.tsx
+++ b/app/src/components/Sidebar/Publish/PublishHistory.tsx
@@ -24,7 +24,7 @@ function PublishHistory(props: { history: Array<Message>; actions: typeof publis
       value: message.payload || '',
     }))
 
-    return <History items={items} onClick={didSelectHistoryEntry} />
+    return <History autoOpen={true} items={items} onClick={didSelectHistoryEntry} />
   }, [props.history])
 }
 
diff --git a/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx b/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx
index 953ae1d..84aa274 100644
--- a/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx
+++ b/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx
@@ -6,7 +6,7 @@ import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
 import { connect } from 'react-redux'
 import { default as ReactResizeDetector } from 'react-resize-detector'
 import { ValueRendererDisplayMode } from '../../../reducers/Settings'
-import { Typography } from '@material-ui/core'
+import { Typography, Fade, Grow } from '@material-ui/core'
 
 interface Props {
   message: q.Message
@@ -67,19 +67,14 @@ class ValueRenderer extends React.Component<Props, State> {
       return
     }
     const value = this.convertMessage(message.value)
-    if (!compare) {
-      return this.renderDiff(value, value)
-    }
-
-    if (!compare.value) {
-      return
-    }
-    const compareStr = this.convertMessage(compare.value)
+    const compareStr = compare && compare.value ? this.convertMessage(compare.value) : undefined
 
     return (
       <div>
         {this.renderDiff(value, value)}
-        {this.renderDiff(compareStr, compareStr, 'selected')}
+        <Fade in={Boolean(compareStr)} timeout={400}>
+          <div>{Boolean(compareStr) ? this.renderDiff(compareStr, compareStr, 'selected') : null}</div>
+        </Fade>
       </div>
     )
   }