Commit afea8eff authored by Matija Obreza's avatar Matija Obreza
Browse files

Using typescript@2.6.2

- typescript@2.7.1 buggy, does not tslint correctly
parent 513015ac
......@@ -15245,9 +15245,9 @@
"dev": true
},
"typescript": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.1.tgz",
"integrity": "sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw==",
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",
"integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=",
"dev": true
},
"ua-parser-js": {
......
......@@ -171,7 +171,7 @@ const DescriptorCard = ({complete = true, compact, descriptor, classes, classNam
) }
/>
<CardContent>
{ descriptor.description && <Markdown className="mb-20" rows={ textRows } source={ descriptor.description }/> }
{ descriptor.description && <Markdown className="mb-20" rows={ displayPref.textRows } source={ descriptor.description }/> }
{ descriptor.key && <div className="font-bold">This is a key descriptor for access and utilization of PGR.</div> }
<Grid container spacing={ 0 }>
<Grid item xs={ 12 }>
......
......@@ -27,11 +27,11 @@ class MarkdownField extends OriginalMarkdownField {
this.resumeReactUpdate = this.resumeReactUpdate.bind(this);
}
private stopReactUpdate = (e) => {
private stopReactUpdate = () => {
console.log('Stopping React updates');
this.noReactUpdates = true;
}
private resumeReactUpdate = (e) => {
private resumeReactUpdate = () => {
console.log('Resuming React updates');
this.noReactUpdates = false;
}
......@@ -58,7 +58,7 @@ class MarkdownField extends OriginalMarkdownField {
const { input } = this.props;
e.preventDefault();
// console.log('Dropped', e.dataTransfer);
const { dataTransfer: { items, files }, target } = e;
const { dataTransfer: { items, files } } = e;
// console.log('Dropped', e.dataTransfer, items, target);
......@@ -78,7 +78,7 @@ class MarkdownField extends OriginalMarkdownField {
}
private dataPasted = async (e) => {
const { clipboardData: { types, files, items }, target } = e;
const { clipboardData: { files } } = e;
// console.log('Pasted', e.clipboardData, types, files, items);
if (files.length) {
......
......@@ -11,7 +11,7 @@ interface IMarkdownTextProps extends React.HTMLProps<HTMLElement> {
function Markdown({source, rows, style, className, basic}: IMarkdownTextProps) {
if (source) {
const mdStyle: string = rows ? { maxHeight: `${rows + 1.5}rem`, overflow: 'hidden', marginBottom: '.5rem' } : {};
const mdStyle: object = rows ? { maxHeight: `${rows + 1.5}rem`, overflow: 'hidden', marginBottom: '.5rem' } : {};
if (basic) {
// the 'markdown-basic' className is used to render the div as inline-block
......@@ -32,7 +32,7 @@ function Markdown({source, rows, style, className, basic}: IMarkdownTextProps) {
} else {
return (
<div style={ { ...style, ...mdStyle } } className={ `${className ? className : ''}` }>
<MarkdownComponent skipHtml style={ mdStyle } className="markdown" source={ source } />
<MarkdownComponent skipHtml className="markdown" source={ source } />
</div>
);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment