Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to preserve whitespace #1105

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Terminal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ export default class Terminal extends Component {
dangerMode={this.props.dangerMode}
className={!line.isEcho ? this.props.messageClassName : /* istanbul ignore next: Covered by interactivity tests */ undefined}
style={!line.isEcho ? this.props.messageStyle : /* istanbul ignore next: Covered by interactivity tests */ undefined}
preserveSpacing={this.props.preserveSpacing}
/>
})
}
Expand Down
6 changes: 5 additions & 1 deletion src/TerminalMessage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,20 @@ import defaults from 'defaults'
import types from './defs/types/TerminalMessage'
import sourceStyles from './defs/styles/TerminalMessage'

import preserveSpaces from './utils/preserveSpaces'

export default class TerminalMessage extends Component {
static propTypes = types

render () {
const { content, style, className } = this.props
const { content, style, className, preserveSpacing } = this.props

const styles = {
message: defaults(style, sourceStyles)
}

content = preserveSpacing ? preserveSpaces(content) : content

return this.props.dangerMode && typeof content === 'string'
? <div className={className} style={styles.message} {...html(content)}/>
: <div className={className} style={styles.message}>{content}</div>
Expand Down
3 changes: 2 additions & 1 deletion src/defs/types/Terminal.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ const optionTypes = {
noEchoBack: PropTypes.bool,
noHistory: PropTypes.bool,
noAutoScroll: PropTypes.bool,
noNewlineParsing: PropTypes.bool
noNewlineParsing: PropTypes.bool,
preserveSpacing: PropTypes.bool
}

const labelTypes = {
Expand Down
3 changes: 2 additions & 1 deletion src/defs/types/TerminalMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ export default {
content: PropTypes.node,
style: PropTypes.object,
className: PropTypes.string,
dangerMode: PropTypes.bool
dangerMode: PropTypes.bool,
preserveSpacing: PropTypes.bool
}
7 changes: 7 additions & 0 deletions src/utils/preserveSpaces.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Returns a string where spacing is honored by html.
* @param {string} stringOutput
*/
export default function renderSpaces(stringOutput) {
return stringOutput.replace(/ /g, '\u00A0');
}