Rename renderedRowRange to visibleRowRange

We only render visible rows now, so this makes more sense.
This commit is contained in:
Nathan Sobo
2014-05-12 15:38:12 -06:00
parent e44027b186
commit 01622140e3
4 changed files with 16 additions and 16 deletions

View File

@@ -33,7 +33,7 @@ EditorComponent = React.createClass
maxLineNumberDigits = editor.getScreenLineCount().toString().length
if @isMounted()
renderedRowRange = editor.getVisibleRowRange()
visibleRowRange = editor.getVisibleRowRange()
scrollHeight = editor.getScrollHeight()
scrollWidth = editor.getScrollWidth()
scrollTop = editor.getScrollTop()
@@ -49,14 +49,14 @@ EditorComponent = React.createClass
div className: className, style: {fontSize, lineHeight, fontFamily}, tabIndex: -1,
GutterComponent {
editor, renderedRowRange, maxLineNumberDigits, scrollTop, scrollHeight,
editor, visibleRowRange, maxLineNumberDigits, scrollTop, scrollHeight,
lineHeight: lineHeightInPixels, fontSize, fontFamily, @pendingChanges,
width: @gutterWidth, onWidthChanged: @onGutterWidthChanged
}
EditorScrollViewComponent {
ref: 'scrollView', editor, fontSize, fontFamily, showIndentGuide
lineHeight: lineHeightInPixels, renderedRowRange, @pendingChanges
lineHeight: lineHeightInPixels, visibleRowRange, @pendingChanges
scrollTop, scrollLeft, @scrollingVertically, @cursorsMoved,
cursorBlinkPeriod, cursorBlinkResumeDelay, @onInputFocused, @onInputBlurred
}

View File

@@ -17,7 +17,7 @@ EditorScrollViewComponent = React.createClass
render: ->
{editor, fontSize, fontFamily, lineHeight, showIndentGuide} = @props
{renderedRowRange, pendingChanges, scrollTop, scrollLeft, scrollingVertically} = @props
{visibleRowRange, pendingChanges, scrollTop, scrollLeft, scrollingVertically} = @props
{cursorBlinkPeriod, cursorBlinkResumeDelay, cursorsMoved, onInputFocused, onInputBlurred} = @props
if @isMounted()
@@ -36,7 +36,7 @@ EditorScrollViewComponent = React.createClass
CursorsComponent({editor, scrollTop, scrollLeft, cursorsMoved, cursorBlinkPeriod, cursorBlinkResumeDelay})
LinesComponent {
ref: 'lines', editor, fontSize, fontFamily, lineHeight, showIndentGuide,
renderedRowRange, pendingChanges, scrollTop, scrollLeft, scrollingVertically
visibleRowRange, pendingChanges, scrollTop, scrollLeft, scrollingVertically
}
div className: 'underlayer',
SelectionsComponent({editor, scrollTop, scrollLeft})

View File

@@ -21,8 +21,8 @@ GutterComponent = React.createClass
@renderLineNumberForMeasurement()
renderLineNumbers: ->
{editor, renderedRowRange, lineOverdraw, scrollTop, lineHeight, showIndentGuide} = @props
[startRow, endRow] = renderedRowRange
{editor, visibleRowRange, lineOverdraw, scrollTop, lineHeight, showIndentGuide} = @props
[startRow, endRow] = visibleRowRange
maxLineNumberDigits = @getMaxLineNumberDigits()
scrollOffset = -scrollTop % lineHeight
wrapCount = 0
@@ -56,11 +56,11 @@ GutterComponent = React.createClass
# non-zero-delta change to the screen lines has occurred within the current
# visible row range.
shouldComponentUpdate: (newProps) ->
return true unless isEqualForProperties(newProps, @props, 'renderedRowRange', 'scrollTop', 'lineHeight', 'fontSize')
return true unless isEqualForProperties(newProps, @props, 'visibleRowRange', 'scrollTop', 'lineHeight', 'fontSize')
{renderedRowRange, pendingChanges} = newProps
{visibleRowRange, pendingChanges} = newProps
for change in pendingChanges when change.screenDelta > 0 or change.bufferDelta > 0
return true unless change.end <= renderedRowRange.start or renderedRowRange.end <= change.start
return true unless change.end <= visibleRowRange.start or visibleRowRange.end <= change.start
false

View File

@@ -12,8 +12,8 @@ LinesComponent = React.createClass
render: ->
if @isMounted()
{editor, renderedRowRange, scrollTop, scrollLeft, lineHeight, showIndentGuide} = @props
[startRow, endRow] = renderedRowRange
{editor, visibleRowRange, scrollTop, scrollLeft, lineHeight, showIndentGuide} = @props
[startRow, endRow] = visibleRowRange
verticalScrollOffset = -scrollTop % lineHeight
horizontalScrollOffset = -scrollLeft
@@ -31,11 +31,11 @@ LinesComponent = React.createClass
@measureLineHeightAndCharWidth()
shouldComponentUpdate: (newProps) ->
return true unless isEqualForProperties(newProps, @props, 'renderedRowRange', 'fontSize', 'fontFamily', 'lineHeight', 'scrollTop', 'scrollLeft', 'showIndentGuide', 'scrollingVertically')
return true unless isEqualForProperties(newProps, @props, 'visibleRowRange', 'fontSize', 'fontFamily', 'lineHeight', 'scrollTop', 'scrollLeft', 'showIndentGuide', 'scrollingVertically')
{renderedRowRange, pendingChanges} = newProps
{visibleRowRange, pendingChanges} = newProps
for change in pendingChanges
return true unless change.end <= renderedRowRange.start or renderedRowRange.end <= change.start
return true unless change.end <= visibleRowRange.start or visibleRowRange.end <= change.start
false
@@ -56,7 +56,7 @@ LinesComponent = React.createClass
editor.setDefaultCharWidth(charWidth)
measureCharactersInNewLines: ->
[visibleStartRow, visibleEndRow] = @props.renderedRowRange
[visibleStartRow, visibleEndRow] = @props.visibleRowRange
node = @getDOMNode()
for tokenizedLine, i in @props.editor.linesForScreenRows(visibleStartRow, visibleEndRow - 1)