{"files":[{"status":"M","path":"docs\/docs\/tutorial.md"}],"body":"Reordered 'Using Props' before 'Component Properties'","commit":{"authoredAt":"2015-02-09T10:08:44-08:00","authorEmail":"paul@oshannessy.com","authorName":"Paul O’Shannessy","subject":"Merge pull request #2968 from ClimbsRocks\/patch-5","shortRevision":"cb833710af","revision":"cb833710af0b5bfa181580abf342a93d45419df1"},"parents":["a6a64d1ed47f02f446fb3b632c357fe7763ddda0","0903120ad1f5e95d2b3a5c11a6f4f963e726147c"],"patch":"diff --git a\/docs\/docs\/tutorial.md b\/docs\/docs\/tutorial.md\nindex dcf92f9fc9..3b4d8b2b0b 100644\n--- a\/docs\/docs\/tutorial.md\n+++ b\/docs\/docs\/tutorial.md\n@@ -166,47 +166,47 @@ var CommentBox = React.createClass({\n \n Notice how we're mixing HTML tags and components we've built. HTML components are regular React components, just like the ones you define, with one difference. The JSX compiler will automatically rewrite HTML tags to `React.createElement(tagName)` expressions and leave everything else alone. This is to prevent the pollution of the global namespace.\n \n-### Component Properties\n+### Using props\n \n-Let's create our third component, `Comment`. We will want to pass it the author name and comment text so we can reuse the same code for each unique comment. First let's add some comments to the `CommentList`:\n+Let's create the `Comment` component, which will depend on data passed in from it's parent. Data passed in from a parent component is available as a 'property' on the child component. These 'properties' are accessed through `this.props`. Using props we will be able to read the data passed to the `Comment` from the `CommentList`, and render some markup:\n \n-```javascript{6-7}\n+```javascript\n \/\/ tutorial4.js\n-var CommentList = React.createClass({\n+var Comment = React.createClass({\n render: function() {\n return (\n-

\n- This is one comment<\/Comment>\n- This is *another* comment<\/Comment>\n+

\n+

\n+ {this.props.author}\n+ <\/h2>\n+ {this.props.children}\n <\/div>\n );\n }\n });\n ```\n \n-Note that we have passed some data from the parent `CommentList` component to the child `Comment` components. For example, we passed Pete Hunt (via an attribute) and This is one comment (via an XML-like child node) to the first `Comment`. Data passed from parent to children components is called props, short for properties.\n+By surrounding a JavaScript expression in braces inside JSX (as either an attribute or child), you can drop text or React components into the tree. We access named attributes passed to the component as keys on `this.props` and any nested elements as `this.props.children`.\n \n-### Using props\n+### Component Properties\n \n-Let's create the Comment component. Using props we will be able to read the data passed to it from the `CommentList`, and render some markup:\n+Now that we have defined the `Comment` component, we will want to pass it the author name and comment text. This allows us to reuse the same code for each unique comment. Now let's add some comments within our `CommentList`:\n \n-```javascript\n+```javascript{6-7}\n \/\/ tutorial5.js\n-var Comment = React.createClass({\n+var CommentList = React.createClass({\n render: function() {\n return (\n-
\n-
\n- {this.props.author}\n- <\/h2>\n- {this.props.children}\n+
\n+ This is one comment<\/Comment>\n+ This is another comment<\/Comment>\n <\/div>\n );\n }\n });\n ```\n \n-By surrounding a JavaScript expression in braces inside JSX (as either an attribute or child), you can drop text or React components into the tree. We access named attributes passed to the component as keys on `this.props` and any nested elements as `this.props.children`.\n+Note that we have passed some data from the parent `CommentList` component to the child `Comment` components. For example, we passed Pete Hunt (via an attribute) and This is one comment (via an XML-like child node) to the first `Comment`. As noted above, the `Comment` component will access these 'properties' through `this.props.author`, and `this.props.children`.\n \n ### Adding Markdown\n \n"}

dillon1000/react

Files changed