Skip to content

Commit 4fc8bdc

Browse files
Merge branch 'master' of https://github.com/reactjs/reactjs.org into sync-2304fa1a
2 parents ee61fec + 2304fa1 commit 4fc8bdc

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

content/community/conferences.md

-5
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ June 21, 2019 Chicago, Illinois USA
5252

5353
[Website](https://reactloop.com) - [Twitter](https://twitter.com/ReactLoop)
5454

55-
### React Week '19 {#RWNY19}
56-
July 15-21, 2019. New York City, USA
57-
58-
[Website](https://reactweek.nyc) - [Twitter](https://twitter.com/ReactWeek)
59-
6055
### React Rally 2019
6156
August 22-23, 2019. Salt Lake City, USA.
6257

content/community/meetups.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
8888

8989
## Pakistan {#pakistan}
9090
* [Karachi](https://www.facebook.com/groups/902678696597634/)
91+
* [Lahore](https://www.facebook.com/groups/ReactjsLahore/)
9192

9293
## Peru {#peru}
9394
* [Lima](https://www.meetup.com/ReactJS-Peru/)
@@ -130,8 +131,8 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet
130131
* [New York, NY - ReactJS](https://www.meetup.com/NYC-Javascript-React-Group/)
131132
* [New York, NY - React Ladies](https://www.meetup.com/React-Ladies/)
132133
* [New York, NY - React Native](https://www.meetup.com/React-Native-NYC/)
133-
* [New York, NY - ReactNYC](https://www.meetup.com/ReactNYC/)
134134
* [Palo Alto, CA - React Native](https://www.meetup.com/React-Native-Silicon-Valley/)
135+
* [Philadelphia, PA - ReactJS](https://www.meetup.com/RQ-React/)
135136
* [Phoenix, AZ - ReactJS](https://www.meetup.com/ReactJS-Phoenix/)
136137
* [Pittsburgh, PA - ReactJS/React Native](https://www.meetup.com/ReactPgh/)
137138
* [Portland, OR - ReactJS](https://www.meetup.com/Portland-ReactJS/)

content/docs/optimizing-performance.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,6 @@ x === z; // true
430430

431431
In this case, since a new reference is returned when mutating `x`, we can use a reference equality check `(x === y)` to verify that the new value stored in `y` is different than the original value stored in `x`.
432432

433-
Two other libraries that can help use immutable data are [seamless-immutable](https://github.com/rtfeldman/seamless-immutable) and [immutability-helper](https://github.com/kolodny/immutability-helper).
433+
Other libraries that can help use immutable data include [Immer](https://github.com/mweststrate/immer), [immutability-helper](https://github.com/kolodny/immutability-helper), and [seamless-immutable](https://github.com/rtfeldman/seamless-immutable).
434434

435435
Immutable data structures provide you with a cheap way to track changes on objects, which is all we need to implement `shouldComponentUpdate`. This can often provide you with a nice performance boost.

content/docs/reference-glossary.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class Welcome extends React.Component {
122122

123123
A component needs `state` when some data associated with it changes over time. For example, a `Checkbox` component might need `isChecked` in its state, and a `NewsFeed` component might want to keep track of `fetchedPosts` in its state.
124124

125-
The most important difference between `state` and `props` is that `props` are passed from a parent component, but `state` is managed by the component itself. A component cannot change its `props`, but it can change its `state`. To do so, it must call `this.setState()`. Only components defined as classes can have state.
125+
The most important difference between `state` and `props` is that `props` are passed from a parent component, but `state` is managed by the component itself. A component cannot change its `props`, but it can change its `state`.
126126

127127
For each particular piece of changing data, there should be just one component that "owns" it in its state. Don't try to synchronize states of two different components. Instead, [lift it up](/docs/lifting-state-up.html) to their closest shared ancestor, and pass it down as props to both of them.
128128

0 commit comments

Comments
 (0)