github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15338 from atom/ns-hide-extra-lines-to-measure

Browse Source 
Hide off-screen lines when we render them for measurement
This commit is contained in:
Nathan Sobo
2017-08-16 10:45:29 -06:00
committed by GitHub
parent da2c3fb56b c398fe66c9
commit b9421f721e
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spec/text-editor-component-spec.js
View File

@@ -3765,6 +3765,22 @@ describe('TextEditorComponent', () => {
component.screenPositionForPixelPosition({top: 800, left: 1})
await updatePromise
})
it('does not shift cursors downward or render off-screen content when measuring off-screen lines (regression)', async () => {
const {component, element, editor} = buildComponent({rowsPerTile: 2, autoHeight: false})
await setEditorHeightInLines(component, 3)
const {top, left} = component.pixelPositionForScreenPosition({row: 12, column: 1})
expect(element.querySelector('.cursor').getBoundingClientRect().top).toBe(component.refs.lineTiles.getBoundingClientRect().top)
expect(element.querySelector('.line[data-screen-row="12"]').style.visibility).toBe('hidden')
// Ensure previously measured off screen lines don't have any weird
// styling when they come on screen in the next frame
await setEditorHeightInLines(component, 13)
const previouslyMeasuredLineElement = element.querySelector('.line[data-screen-row="12"]')
expect(previouslyMeasuredLineElement.style.display).toBe('')
expect(previouslyMeasuredLineElement.style.visibility).toBe('')
})
})
describe('screenPositionForPixelPosition', () => {

8
src/text-editor-component.js
View File

@@ -618,6 +618,7 @@ class TextEditorComponent {
if (screenRow < startRow || screenRow >= endRow) {
children.push($(LineComponent, {
key: 'extra-' + screenLine.id,
hidden: true,
screenLine,
screenRow,
displayLayer: this.props.model.displayLayer,
@@ -3863,11 +3864,16 @@ class LineComponent {
}
appendContents () {
const {displayLayer, nodePool, screenLine, textDecorations, textNodesByScreenLineId} = this.props
const {displayLayer, nodePool, hidden, screenLine, textDecorations, textNodesByScreenLineId} = this.props
const textNodes = []
textNodesByScreenLineId.set(screenLine.id, textNodes)
if (hidden) {
this.element.style.position = 'absolute'
this.element.style.visibility = 'hidden'
}
const {lineText, tags} = screenLine
let openScopeNode = nodePool.getElement('SPAN', null, null)
this.element.appendChild(openScopeNode)