Skip to content
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
40 changes: 39 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,47 @@
"tslint-plugin-prettier": "^2.1.0",
"tslint-react": "^4.1.0",
"tslint-react-hooks": "^2.2.1",
"typescript": "3.7.4",
"typescript": "4.9.5",
"webpack": "~4.41.5"
},
"resolutions": {
"minimist": "^1.2.8",
"fsevents": "1.2.13",
"pbkdf2": "^3.1.2",
"handlebars": "^4.7.7",
"@babel/traverse": ">=7.23.2",
"sha.js": ">=2.4.12",
"cipher-base": ">=1.0.5",
"json-schema": ">=0.4.0",
"form-data": ">=2.5.4",
"url-parse": ">=1.5.10",
"lodash": ">=4.17.21",
"loader-utils": "^1.4.1",
"elliptic": ">=6.6.1",
"eventsource": ">=1.1.1",
"ejs": ">=3.1.7",
"merge-deep": ">=3.0.3",
"property-expr": ">=2.0.3",
"simple-git": "3.16.0",
"bin-links": "^1.1.6",
"chownr": "^1.1.0",
"marked": "^0.7.0",
"semver-regex": "^3.1.4",
"debug": "^3.2.7",
"qs": "^6.14.2",
"tmp": "^0.2.4",
"npm-user-validate": "^1.0.1",
"node-fetch": "^2.6.1",
"serve-static": "^1.16.0",
"cookie": "^0.7.0",
"send": "^0.19.0",
"es5-ext": "^0.10.63",
"express": "^4.20.0",
"brace-expansion": "^1.1.12",
"min-document": "^2.19.1",
"diff": "^4.0.4",
"ip": "^1.1.9"
},
"lint-staged": {
"*.{ts,tsx}": [
"yarn lint.fix",
Expand Down
8 changes: 7 additions & 1 deletion src/CodeViewer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ const CodeViewer: React.FunctionComponent<ICodeViewerProps> = ({
})}
{...rest}
>
{markup ? markup.map(astToReact()) : value}
{markup
? markup.map((token, index) => {
const element = astToReact()(token, index);

return React.isValidElement(element) ? React.cloneElement(element, { key: index }) : element;
})
: value}
</pre>
);
};
Expand Down
2 changes: 2 additions & 0 deletions src/ScrollContainer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,11 @@ const ScrollContainer = React.forwardRef<ScrollbarRefInstance, IScrollContainer>
},
}}
thumbXProps={{
// @ts-ignore - renderer signature is compatible at runtime but mismatched in types
renderer: thumbRenderer,
}}
thumbYProps={{
// @ts-ignore - renderer signature is compatible at runtime but mismatched in types
renderer: thumbRenderer,
}}
ref={scrollbarCallback}
Expand Down
15 changes: 6 additions & 9 deletions src/styles/tailwind/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14152,6 +14152,7 @@ h3,
h4,
h5,
h6,
hr,
figure,
p,
pre {
Expand Down Expand Up @@ -14229,7 +14230,7 @@ html {
*/

hr {
border-width: 1px;
border-top-width: 1px;
}

/**
Expand All @@ -14250,23 +14251,19 @@ textarea {
resize: vertical;
}

input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
color: #a0aec0;
}

input::-moz-placeholder,
textarea::-moz-placeholder {
input::-moz-placeholder, textarea::-moz-placeholder {
color: #a0aec0;
}

input:-ms-input-placeholder,
textarea:-ms-input-placeholder {
input:-ms-input-placeholder, textarea:-ms-input-placeholder {
color: #a0aec0;
}

input::-ms-input-placeholder,
textarea::-ms-input-placeholder {
input::-ms-input-placeholder, textarea::-ms-input-placeholder {
color: #a0aec0;
}

Expand Down
Loading