From f027ca8ca061df9b7483bb3c5d8070434a0af11a Mon Sep 17 00:00:00 2001 From: "li.li" Date: Wed, 12 Aug 2015 11:32:07 +0800 Subject: [PATCH] update component api docs --- docs/docs/ref-02-component-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/ref-02-component-api.md b/docs/docs/ref-02-component-api.md index 16ca124f95..aaf04c7d8d 100644 --- a/docs/docs/ref-02-component-api.md +++ b/docs/docs/ref-02-component-api.md @@ -16,7 +16,7 @@ Instances of a React Component are created internally in React when rendering. T ```javascript setState(function|object nextState[, function callback]) ``` -Merges nextState with the current state. This is the primary method you use to trigger UI updates from event handlers and server request callbacks. +Performs a shallow merge of nextState into current state. This is the primary method you use to trigger UI updates from event handlers and server request callbacks. The first argument can be an object (containing zero or more keys to update) or a function (of state and props) that returns an object containing keys to update.