diff --git a/app/src/components/Sidebar/HistoryDrawer.tsx b/app/src/components/Sidebar/HistoryDrawer.tsx index 1919490..e296cb5 100644 --- a/app/src/components/Sidebar/HistoryDrawer.tsx +++ b/app/src/components/Sidebar/HistoryDrawer.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { Badge, Typography } from '@material-ui/core' import { selectTextWithCtrlA } from '../../utils/handleTextSelectWithCtrlA' -import { Theme, withStyles } from '@material-ui/core/styles' +import { Theme, withStyles, emphasize } from '@material-ui/core/styles' interface HistoryItem { key: string @@ -45,8 +45,8 @@ class HistoryDrawer extends React.Component { public renderHistory() { const style = (element: HistoryItem) => ({ backgroundColor: element.selected - ? this.props.theme.palette.action.selected - : this.props.theme.palette.action.hover, + ? emphasize(this.props.theme.palette.background.default, 0.2) + : emphasize(this.props.theme.palette.background.default, 0.07), margin: '8px', padding: '8px 8px 0 8px', cursor: this.props.onClick ? 'pointer' : 'inherit', @@ -76,17 +76,19 @@ class HistoryDrawer extends React.Component { return (
- - - {this.state.collapsed ? '▶ History' : '▼ History'} - -
{this.state.collapsed ? this.props.contentTypeIndicator : null}
-
+
+ + + {this.state.collapsed ? '▶ History' : '▼ History'} + +
{this.state.collapsed ? this.props.contentTypeIndicator : null}
+
+
{this.state.collapsed ? null : this.props.children} {this.state.collapsed ? null : elements} @@ -102,7 +104,7 @@ class HistoryDrawer extends React.Component { const styles = (theme: Theme) => ({ main: { - backgroundColor: 'rgba(170, 170, 170, 0.2)', + backgroundColor: theme.palette.background.default, marginTop: '16px', }, badge: { right: '-25px' }, diff --git a/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx b/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx index 9996f62..48c4c17 100644 --- a/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx +++ b/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx @@ -41,7 +41,7 @@ function ValuePanel(props: Props) { } return ( -
+
diff --git a/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx b/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx index 8a65db4..ec6f559 100644 --- a/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx +++ b/app/src/components/Sidebar/ValueRenderer/ValueRenderer.tsx @@ -6,6 +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' interface Props { message: q.Message @@ -55,8 +56,32 @@ class ValueRenderer extends React.Component { return this.renderDiff(value, compare) } + private renderRawMode(message: q.Message, compare?: q.Message) { + if (!message.value) { + return + } + const value = Base64Message.toUnicodeString(message.value) + if (!compare) { + return this.renderDiff(value, value) + } + + if (!compare.value) { + return + } + const compareStr = Base64Message.toUnicodeString(compare.value) + + return ( +
+ selected + {this.renderDiff(compareStr, compareStr)} + current + {this.renderDiff(value, value)} +
+ ) + } + public render() { - return
{this.renderValue()}
+ return
{this.renderValue()}
} public renderValue() { @@ -65,6 +90,7 @@ class ValueRenderer extends React.Component { const previousMessage = previousMessages[previousMessages.length - 2] let compareMessage = compareWith || previousMessage || message if (renderMode === 'raw') { + return this.renderRawMode(message, compareWith) compareMessage = message } if (!message.value) {