From 941dbda5be0bf7b77cfaaae7f844415c2cf8d76a Mon Sep 17 00:00:00 2001 From: haoxin Date: Wed, 17 Feb 2016 10:55:49 +0800 Subject: [PATCH] TableRow: fix behavior for custom render --- src/TableRow.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/TableRow.jsx b/src/TableRow.jsx index b35b6c2c7..aab41e448 100644 --- a/src/TableRow.jsx +++ b/src/TableRow.jsx @@ -55,9 +55,17 @@ const TableRow = React.createClass({ } if (render) { - text = render(text, record, index) || {}; + text = render(text, record, index); + if (text == null) { + text = {} + } + tdProps = text.props || {}; + if (typeof text === 'number' || typeof text === 'boolean') { + text = String(text) + } + if (typeof text !== 'string' && !React.isValidElement(text) && 'children' in text) { text = text.children; }