bump(react): 15.3.x, warning removal, thread-sharing tweaks

This commit is contained in:
Ben Gotow 2016-09-20 17:28:50 -07:00
parent 0709b33c91
commit 18f7a8d463
6 changed files with 27 additions and 15 deletions

View file

@ -33,11 +33,11 @@ subject = (subj) ->
else if subj.split(/([\uD800-\uDBFF][\uDC00-\uDFFF])/g).length > 1 else if subj.split(/([\uD800-\uDBFF][\uDC00-\uDFFF])/g).length > 1
subjComponents = [] subjComponents = []
subjParts = subj.split /([\uD800-\uDBFF][\uDC00-\uDFFF])/g subjParts = subj.split /([\uD800-\uDBFF][\uDC00-\uDFFF])/g
for part in subjParts for part, idx in subjParts
if part.match /([\uD800-\uDBFF][\uDC00-\uDFFF])/g if part.match /([\uD800-\uDBFF][\uDC00-\uDFFF])/g
subjComponents.push <span className="emoji">{part}</span> subjComponents.push <span className="emoji" key={idx}>{part}</span>
else else
subjComponents.push <span>{part}</span> subjComponents.push <span key={idx}>{part}</span>
return subjComponents return subjComponents
else else
return subj return subj

View file

@ -57,11 +57,11 @@
"proxyquire": "1.3.1", "proxyquire": "1.3.1",
"q": "^1.0.1", "q": "^1.0.1",
"raven": "0.7.2", "raven": "0.7.2",
"react": "^15.0.2", "react": "^15.3.2",
"react-addons-css-transition-group": "^15.0.1", "react-addons-css-transition-group": "^15.3.0",
"react-addons-perf": "^15.0.1", "react-addons-perf": "^15.3.0",
"react-addons-test-utils": "^15.0.1", "react-addons-test-utils": "^15.3.0",
"react-dom": "^15.0.1", "react-dom": "^15.3.0",
"reflux": "0.1.13", "reflux": "0.1.13",
"request": "^2.53", "request": "^2.53",
"request-progress": "^0.3", "request-progress": "^0.3",

View file

@ -29,8 +29,15 @@ Section: Component Kit
class EventedIFrame extends React.Component class EventedIFrame extends React.Component
@displayName = 'EventedIFrame' @displayName = 'EventedIFrame'
@propTypes =
searchable: React.PropTypes.bool
onResize: React.PropTypes.func
render: => render: =>
<iframe seamless="seamless" {...@props} /> otherProps = Utils.fastOmit(@props, Object.keys(@constructor.propTypes))
return (
<iframe seamless="seamless" {...otherProps} />
)
componentDidMount: => componentDidMount: =>
if @props.searchable if @props.searchable

View file

@ -34,20 +34,19 @@ class ListTabularItem extends React.Component
@_columnCache ?= @_columns() @_columnCache ?= @_columns()
<SwipeContainer {...props} onClick={@_onClick} style={position:'absolute', top: @props.metrics.top, width:'100%', height:@props.metrics.height}> <SwipeContainer {...props} onClick={@_onClick} style={position:'absolute', top: @props.metrics.top, width:'100%', height:@props.metrics.height}>
<div className={className} style={height:@props.metrics.height}> <div className={className} style={height: @props.metrics.height}>
{@_columnCache} {@_columnCache}
</div> </div>
</SwipeContainer> </SwipeContainer>
_columns: => _columns: =>
names = {} names = {}
for column in (@props.columns ? []) (@props.columns ? []).map (column) =>
if names[column.name] if names[column.name]
console.warn("ListTabular: Columns do not have distinct names, will cause React error! `#{column.name}` twice.") console.warn("ListTabular: Columns do not have distinct names, will cause React error! `#{column.name}` twice.")
names[column.name] = true names[column.name] = true
<div key={column.name} <div key={column.name}
displayName={column.name}
style={{flex: column.flex, width: column.width}} style={{flex: column.flex, width: column.width}}
className="list-column list-column-#{column.name}"> className="list-column list-column-#{column.name}">
{column.resolver(@props.item, @)} {column.resolver(@props.item, @)}

View file

@ -158,7 +158,7 @@ class ListTabular extends React.Component
@setState(@buildStateForRange(start: rangeStart, end: rangeEnd)) @setState(@buildStateForRange(start: rangeStart, end: rangeEnd))
render: => render: =>
otherProps = Utils.fastOmit(@props, Object.keys(@constructor.propTypes)) {onDragStart, onDragEnd, draggable} = @props
innerStyles = innerStyles =
height: @state.count * @props.itemHeight height: @state.count * @props.itemHeight
@ -173,7 +173,13 @@ class ListTabular extends React.Component
onScroll={@onScroll} onScroll={@onScroll}
tabIndex="-1" tabIndex="-1"
scrollTooltipComponent={@props.scrollTooltipComponent}> scrollTooltipComponent={@props.scrollTooltipComponent}>
<div className="list-rows" style={innerStyles} {...otherProps}> <div
className="list-rows"
style={innerStyles}
onDragStart={onDragStart}
onDragEnd={onDragEnd}
draggable={draggable}
>
{@_rows()} {@_rows()}
</div> </div>
</ScrollRegion> </ScrollRegion>

@ -1 +1 @@
Subproject commit c8b2710d990efe6630e708f5fcbb725a5acc1909 Subproject commit 45756b80645edcedfa7d015dcff8a26bcb521ec0