Skip to content

TOC: Scrolling: Fixed TOC links and scrolling #3318

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
Rokt33r merged 4 commits into from
Nov 21, 2019
Merged

TOC: Scrolling: Fixed TOC links and scrolling #3318

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7164c04
TOC: Scrolling: Fixed TOC links and scrolling
shmolf Oct 26, 2019
8eee3d4
Merge branch 'master' of https://github.com/shmolf/Boostnote into toc…
shmolf Nov 5, 2019
44ecd44
Remove overcomplicated solution for scrollbar styling.
hikerpig Nov 6, 2019
5645782
Merge pull request #1 from hikerpig/feature/betterScrollStyle
shmolf Nov 6, 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
15 changes: 9 additions & 6 deletions browser/components/MarkdownPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ const CSS_FILES = [
* @param {String} opts.theme
* @param {Boolean} [opts.lineNumber] Should show line number
* @param {Boolean} [opts.scrollPastEnd]
* @param {Boolean} [opts.optimizeOverflowScroll] Should tweak body style to optimize overflow scrollbar display
* @param {Boolean} [opts.allowCustomCSS] Should add custom css
* @param {String} [opts.customCSS] Will be added to bottom, only if `opts.allowCustomCSS` is truthy
* @returns {String}
Expand All @@ -62,7 +61,6 @@ function buildStyle (opts) {
codeBlockFontFamily,
lineNumber,
scrollPastEnd,
optimizeOverflowScroll,
theme,
allowCustomCSS,
customCSS
Expand Down Expand Up @@ -107,7 +105,6 @@ body {
box-sizing: border-box;
`
: ''}
${optimizeOverflowScroll ? 'height: 100%;' : ''}
}
@media print {
body {
Expand Down Expand Up @@ -183,6 +180,10 @@ const scrollBarStyle = `
::-webkit-scrollbar-thumb {
background-color: rgba(0, 0, 0, 0.15);
}

::-webkit-scrollbar-track-piece {
background-color: inherit;
}
`
const scrollBarDarkStyle = `
::-webkit-scrollbar {
Expand All @@ -192,6 +193,10 @@ const scrollBarDarkStyle = `
::-webkit-scrollbar-thumb {
background-color: rgba(0, 0, 0, 0.3);
}

::-webkit-scrollbar-track-piece {
background-color: inherit;
}
`

const OSX = global.process.platform === 'darwin'
Expand Down Expand Up @@ -679,12 +684,10 @@ export default class MarkdownPreview extends React.Component {
codeBlockFontFamily,
lineNumber,
scrollPastEnd,
optimizeOverflowScroll: true,
theme,
allowCustomCSS,
customCSS
})
this.getWindow().document.documentElement.style.overflowY = 'hidden'
}

getCodeThemeLink (name) {
Expand Down Expand Up @@ -1066,7 +1069,7 @@ export default class MarkdownPreview extends React.Component {
if (posOfHash > -1) {
const extractedId = linkHash.slice(posOfHash + 1)
const targetId = mdurl.encode(extractedId)
const targetElement = this.refs.root.contentWindow.document.getElementById(
const targetElement = this.getWindow().document.getElementById(
targetId
)

Expand Down