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.

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

Jump to bottom

fix: highlight code scroll console error (#7497) #7519

Merged
merged 9 commits into from
Oct 5, 2021
Merged

fix: highlight code scroll console error (#7497) #7519

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c4c72ec
fix: highlight code scroll console error (#7497)
kristina-kovacikova Sep 21, 2021
4af47d7
revert: change in package-lock.json
kristina-kovacikova Sep 23, 2021
f18ca09
Merge branch 'master' into bug/7497-console-error-on-scroll
kristina-kovacikova Sep 23, 2021
eec504c
fix: add condition in componentwillunmount (#7497)
kristina-kovacikova Sep 23, 2021
3b068f1
Merge: branch 'bug/7497-console-error-on-scroll' of https://github.co…
kristina-kovacikova Sep 23, 2021
f7a8432
fix: 7497 - refactor the code to reduce duplicity
kristina-kovacikova Oct 4, 2021
110c206
Merge branch 'master' into bug/7497-console-error-on-scroll
kristina-kovacikova Oct 5, 2021
538fe3a
Update src/core/components/highlight-code.jsx
kristina-kovacikova Oct 5, 2021
cbf133b
Update src/core/components/highlight-code.jsx
kristina-kovacikova Oct 5, 2021
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
14 changes: 12 additions & 2 deletions src/core/components/highlight-code.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ export default class HighlightCode extends Component {
}
}

componentDidMount() {
if (this.syntaxHighlighter) this.syntaxHighlighter.addEventListener("mousewheel", this.preventYScrollingBeyondElement, { passive: false })
char0n marked this conversation as resolved.
Show resolved Hide resolved
if (this.pre) this.pre.addEventListener("mousewheel", this.preventYScrollingBeyondElement, { passive: false })
}

componentWillUnmount() {
if (this.syntaxHighlighter) this.syntaxHighlighter.removeEventListener("mousewheel", this.preventYScrollingBeyondElement)
if (this.pre) this.pre.removeEventListener("mousewheel", this.preventYScrollingBeyondElement)
}

render () {
let { value, className, downloadable, getConfigs, canCopy, language } = this.props

Expand All @@ -48,14 +58,14 @@ export default class HighlightCode extends Component {

const codeBlock = get(config, "syntaxHighlight.activated")
? <SyntaxHighlighter
ref={elem => this.syntaxHighlighter = elem}
language={language}
className={className + " microlight"}
onWheel={this.preventYScrollingBeyondElement}
style={getStyle(get(config, "syntaxHighlight.theme"))}
>
{value}
</SyntaxHighlighter>
: <pre onWheel={this.preventYScrollingBeyondElement} className={className + " microlight"}>{value}</pre>
: <pre ref={elem => this.pre = elem} className={className + " microlight"}>{value}</pre>

return (
<div className="highlight-code">
Expand Down