Skip to content

outputs will appear as a single textbox, with one scrollbar #8327

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 1, 2019
Merged

outputs will appear as a single textbox, with one scrollbar #8327

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0eafe46
made all outputs a single jsx element
Oct 31, 2019
4c91cc6
fixed a bug, error with mimetype would show
Oct 31, 2019
4b2c59f
removed 1 useless line
Oct 31, 2019
d5c5ce7
removed useless comment
Nov 1, 2019
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
97 changes: 51 additions & 46 deletions src/datascience-ui/interactive-common/cellOutput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,59 +345,64 @@ export class CellOutput extends React.Component<ICellOutputProps> {

// tslint:disable-next-line: max-func-body-length
private renderOutputs(outputs: nbformat.IOutput[]): JSX.Element[] {
return outputs.map(this.renderOutput);
return [this.renderOutput(outputs)];
}

private renderOutput = (output: nbformat.IOutput, index: number): JSX.Element => {
const transformed = this.transformOutput(output);
let mimetype = transformed.mimeType;

// If that worked, use the transform
if (mimetype) {
// Get the matching React.Component for that mimetype
const Transform = transforms[mimetype];

// Create a default set of properties
const style: React.CSSProperties = {
};

// Create a scrollbar style if necessary
if (transformed.renderWithScrollbars && this.props.maxTextSize) {
style.overflowX = 'auto';
style.overflowY = 'auto';
style.maxHeight = `${this.props.maxTextSize}px`;
}

let className = transformed.isText ? 'cell-output-text' : 'cell-output-html';
className = transformed.isError ? `${className} cell-output-error` : className;

// If we are not theming plots then wrap them in a white span
if (transformed.outputSpanClassName) {
return (
<div role='group' key={index} onDoubleClick={transformed.doubleClick} onClick={this.click} className={className} style={style}>
<span className={transformed.outputSpanClassName}>
private renderOutput = (outputs: nbformat.IOutput[]): JSX.Element => {
const buffer: JSX.Element[] = [];
const transformedList = outputs.map(this.transformOutput);

transformedList.forEach(transformed => {
let mimetype = transformed.mimeType;

// If that worked, use the transform
if (mimetype) {
// Get the matching React.Component for that mimetype
const Transform = transforms[mimetype];

let className = transformed.isText ? 'cell-output-text' : 'cell-output-html';
className = transformed.isError ? `${className} cell-output-error` : className;

// If we are not theming plots then wrap them in a white span
if (transformed.outputSpanClassName) {
buffer.push(
<div role='group' onDoubleClick={transformed.doubleClick} onClick={this.click} className={className}>
<span className={transformed.outputSpanClassName}>
{transformed.extraButton}
<Transform data={transformed.data} />
</span>
</div>
);
} else {
buffer.push(
<div role='group' onDoubleClick={transformed.doubleClick} onClick={this.click} className={className}>
{transformed.extraButton}
<Transform data={transformed.data} />
</span>
</div>
);
</div>
);
}
} else {
return (
<div role='group' key={index} onDoubleClick={transformed.doubleClick} onClick={this.click} className={className} style={style}>
{transformed.extraButton}
<Transform data={transformed.data} />
</div>
);
if (transformed.data) {
const keys = Object.keys(transformed.data);
mimetype = keys.length > 0 ? keys[0] : 'unknown';
} else {
mimetype = 'unknown';
}
const str: string = this.getUnknownMimeTypeFormatString().format(mimetype);
buffer.push(<div>{str}</div>);
}
}
});

if (output.data) {
const keys = Object.keys(output.data);
mimetype = keys.length > 0 ? keys[0] : 'unknown';
} else {
mimetype = 'unknown';
// Create a default set of properties
const style: React.CSSProperties = {
};

// Create a scrollbar style if necessary
if (transformedList.some(transformed => transformed.renderWithScrollbars) && this.props.maxTextSize) {
style.overflowY = 'auto';
style.maxHeight = `${this.props.maxTextSize}px`;
}
const str: string = this.getUnknownMimeTypeFormatString().format(mimetype);
return <div key={index}>{str}</div>;

return <div style={style}>{buffer}</div>;
}
}