From a558e455bd2c87f4b8a175dabbcfe41f77cd1938 Mon Sep 17 00:00:00 2001 From: Robin Pokorny Date: Tue, 24 Sep 2019 19:26:37 +0200 Subject: [PATCH 01/14] Use correct meetup link for React Berlin (#2366) --- content/community/meetups.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/community/meetups.md b/content/community/meetups.md index ebc3ed296..a08e096ca 100644 --- a/content/community/meetups.md +++ b/content/community/meetups.md @@ -58,7 +58,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [Karlsruhe](https://www.meetup.com/react_ka/) * [Kiel](https://www.meetup.com/Kiel-React-Native-Meetup/) * [Munich](https://www.meetup.com/ReactJS-Meetup-Munich/) -* [React Berlin](https://www.meetup.com/React-Berlin/) +* [React Berlin](https://www.meetup.com/React-Open-Source/) * [React.JS Girls Berlin](https://www.meetup.com/ReactJS-Girls-Berlin/) ## Greece {#greece} From 5cdb85b5e58acedf6078d3398bdbd3b85d74798b Mon Sep 17 00:00:00 2001 From: Mojtaba Izadmehr Date: Tue, 24 Sep 2019 20:54:26 +0200 Subject: [PATCH 02/14] Add doc for context displayaName (#2367) * Add doc for context displayaName * Add highlight for js doc * Fix context display name link * Fix context displayName comment --- content/docs/context.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/content/docs/context.md b/content/docs/context.md index e7bb925c7..5b4592c2f 100644 --- a/content/docs/context.md +++ b/content/docs/context.md @@ -15,6 +15,7 @@ In a typical React application, data is passed top-down (parent to child) via pr - [Context.Provider](#contextprovider) - [Class.contextType](#classcontexttype) - [Context.Consumer](#contextconsumer) + - [Context.displayName](#contextdisplayname) - [Examples](#examples) - [Dynamic Context](#dynamic-context) - [Updating Context from a Nested Component](#updating-context-from-a-nested-component) @@ -196,6 +197,20 @@ Requires a [function as a child](/docs/render-props.html#using-props-other-than- > > For more information about the 'function as a child' pattern, see [render props](/docs/render-props.html). +### `Context.displayName` {#contextdisplayname} + +Context object accepts a `displayName` string property. React DevTools uses this string to determine what to display for the context. + +For example, the following component will appear as MyContext in the DevTools: + +```js{2} +const MyContext = React.createContext(/* some value */); +MyContext.displayName = 'MyDisplayName'; + + // "MyDisplayName.Provider" in DevTools + // "MyDisplayName.Consumer" in DevTools +``` + ## Examples {#examples} ### Dynamic Context {#dynamic-context} From db0dc83473e0c562f01a04f7e8c1084b513d5a9c Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Wed, 25 Sep 2019 11:07:36 -0700 Subject: [PATCH 03/14] Update Versioning FAQ (#2368) * Update Versioning FAQ Includes a new section describing our approach to minor releases, and why they don't always include new features. * Brian's edits * Delete the adverb --- content/docs/faq-versioning.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/content/docs/faq-versioning.md b/content/docs/faq-versioning.md index b51ea4895..ab45ddf74 100644 --- a/content/docs/faq-versioning.md +++ b/content/docs/faq-versioning.md @@ -10,12 +10,14 @@ React follows [semantic versioning (semver)](https://semver.org/) principles. That means that with a version number **x.y.z**: +* When releasing **critical bug fixes**, we make a **patch release** by changing the **z** number (ex: 15.6.2 to 15.6.3). +* When releasing **new features** or **non-critical fixes**, we make a **minor release** by changing the **y** number (ex: 15.6.2 to 15.7.0). * When releasing **breaking changes**, we make a **major release** by changing the **x** number (ex: 15.6.2 to 16.0.0). -* When releasing **new features**, we make a **minor release** by changing the **y** number (ex: 15.6.2 to 15.7.0). -* When releasing **bug fixes**, we make a **patch release** by changing the **z** number (ex: 15.6.2 to 15.6.3). Major releases can also contain new features, and any release can include bug fixes. +Minor releases are the most common type of release. + ### Breaking Changes {#breaking-changes} Breaking changes are inconvenient for everyone, so we try to minimize the number of major releases – for example, React 15 was released in April 2016 and React 16 was released in September 2017; React 17 isn't expected until 2019. @@ -46,3 +48,17 @@ In general, we *don't* bump the major version number for changes to: This policy is designed to be pragmatic: certainly, we don't want to cause headaches for you. If we bumped the major version for all of these changes, we would end up releasing more major versions and ultimately causing more versioning pain for the community. It would also mean that we can't make progress in improving React as fast as we'd like. That said, if we expect that a change on this list will cause broad problems in the community, we will still do our best to provide a gradual migration path. + +### If a Minor Release Includes No New Features, Why Isn't It a Patch? {#minors-versus-patches} + +It's possible that a minor release will not include new features. [This is allowed by semver](https://semver.org/#spec-item-7), which states **"[a minor version] MAY be incremented if substantial new functionality or improvements are introduced within the private code. It MAY include patch level changes."** + +However, it does raise the question of why these releases aren't versioned as patches instead. + +The answer is that any change to React (or other software) carries some risk of breaking in unexpected ways. Imagine a scenario where a patch release that fixes one bug accidentally introduces a different bug. This would not only be disruptive to developers, but also harm their confidence in future patch releases. It's especially regrettable if the original fix is for a bug that is rarely encountered in practice. + +We have a pretty good track record for keeping React releases free of bugs, but patch releases have an even higher bar for reliability because most developers assume they can be adopted without adverse consequences. + +For these reasons, we reserve patch releases only for the most critical bugs and security vulnerabilities. + +If a release includes non-essential changes — such as internal refactors, changes to implementation details, performance improvements, or minor bugfixes — we will bump the minor version even when there are no new features. From fc038ea7e3735fe42b5a80ce801cefb314e0ba7a Mon Sep 17 00:00:00 2001 From: Jordan Nelson <43352922+jnsencha@users.noreply.github.com> Date: Wed, 25 Sep 2019 11:42:10 -0700 Subject: [PATCH 04/14] Add React UI Tools to Fee Components List (#2353) * Add React UI Tools to Fee Components List : * Update tools-ui-components.md Co-authored-by: Alexey Pyltsyn --- content/community/tools-ui-components.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/tools-ui-components.md b/content/community/tools-ui-components.md index 5799712a7..238160075 100644 --- a/content/community/tools-ui-components.md +++ b/content/community/tools-ui-components.md @@ -79,3 +79,4 @@ permalink: community/ui-components.html * **[jQWidgets React components](https://www.jqwidgets.com/react/)**: Enterprise Ready 70+ UI Components. * **[KendoReact](https://www.telerik.com/kendo-react-ui/)**: UI for React Developers. * **[Mobiscroll React UI Components](https://mobiscroll.com/react)** Mobile UI Controls for the Productive React Developer. +* **[React UI Toolkit](https://react-ui-tools.com/)**: 115+ professionally maintainted UI components ranging from a robust grid to charts and more. Try for FREE and build React apps faster. From 36651d721a0f9456898014770dd25d283b59f86d Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Wed, 25 Sep 2019 14:05:53 -0700 Subject: [PATCH 05/14] Update outdated info in contributing doc (#2369) The sections on branch organization and versioning were outdated. I also added a section on feature flags. --- content/docs/how-to-contribute.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/content/docs/how-to-contribute.md b/content/docs/how-to-contribute.md index c9cb1a7f6..cd5bd0c55 100644 --- a/content/docs/how-to-contribute.md +++ b/content/docs/how-to-contribute.md @@ -19,19 +19,25 @@ Facebook has adopted the [Contributor Covenant](https://www.contributor-covenant All work on React happens directly on [GitHub](https://github.com/facebook/react). Both core team members and external contributors send pull requests which go through the same review process. +### Semantic Versioning {#semantic-versioning} + +React follows [semantic versioning](https://semver.org/). We release patch versions for critical bugfixes, minor versions for new features or non-essential changes, and major versions for any breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance. Learn more about our commitment to stability and incremental migration in [our versioning policy](https://reactjs.org/docs/faq-versioning.html). + +Every significant change is documented in the [changelog file](https://github.com/facebook/react/blob/master/CHANGELOG.md). + ### Branch Organization {#branch-organization} -We will do our best to keep the [`master` branch](https://github.com/facebook/react/tree/master) in good shape, with tests passing at all times. But in order to move fast, we will make API changes that your application might not be compatible with. We recommend that you use [the latest stable version of React](/versions.html). +Submit all changes directly to the [`master branch`](https://github.com/facebook/react/tree/master). We don't use separate branches for development or for upcoming releases. We do our best to keep `master` in good shape, with all tests passing. -If you send a pull request, please do it against the `master` branch. We maintain stable branches for major versions separately but we don't accept pull requests to them directly. Instead, we cherry-pick non-breaking changes from master to the latest stable major version. +Code that lands in `master` must be compatible with the latest stable release. It may contain additional features, but no breaking changes. We should be able to release a new minor version from the tip of `master` at any time. -### Semantic Versioning {#semantic-versioning} +### Feature Flags {#feature-flags} -React follows [semantic versioning](https://semver.org/). We release patch versions for bugfixes, minor versions for new features, and major versions for any breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance. +To keep the `master` branch in a releasable state, breaking changes and experimental features must be gated behind a feature flag. -We tag every pull request with a label marking whether the change should go in the next [patch](https://github.com/facebook/react/pulls?q=is:open+is:pr+label:semver-patch), [minor](https://github.com/facebook/react/pulls?q=is:open+is:pr+label:semver-minor), or a [major](https://github.com/facebook/react/pulls?q=is:open+is:pr+label:semver-major) version. We release new patch versions every few weeks, minor versions every few months, and major versions one or two times a year. +Feature flags are defined in [`packages/shared/ReactFeatureFlags.js`](https://github.com/facebook/react/blob/master/packages/shared/ReactFeatureFlags.js). Some builds of React may enable different sets of feature flags; for example, the React Native build may be configured differently than React DOM. These flags are found in [`packages/shared/forks`](https://github.com/facebook/react/tree/master/packages/shared/forks). Feature flags are statically typed by Flow, so you can run `yarn flow` to confirm that you've updated all the necessary files. -Every significant change is documented in the [changelog file](https://github.com/facebook/react/blob/master/CHANGELOG.md). +React's build system will strip out disabled feature branches before publishing. A continuous integration job runs on every commit to check for changes in bundle size. You can use the change in size as a signal that a feature was gated correctly. ### Bugs {#bugs} From 569f2e2d0a9c2c96ddc76a30b407fe77d0bfce92 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Thu, 26 Sep 2019 14:04:48 -0400 Subject: [PATCH 06/14] Use vanity URL for Reactiflux (#2372) --- content/community/support.md | 2 +- content/footerNav.yml | 2 +- content/tutorial/tutorial.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/community/support.md b/content/community/support.md index c392b86a1..cb31a529b 100644 --- a/content/community/support.md +++ b/content/community/support.md @@ -26,7 +26,7 @@ Each community consists of many thousands of React users. * [DEV's React community](https://dev.to/t/react) * [Hashnode's React community](https://hashnode.com/n/reactjs) -* [Reactiflux online chat](https://discord.gg/0ZcbPKXt5bZjGY5n) +* [Reactiflux online chat](https://discord.gg/reactiflux) * [Reddit's React community](https://www.reddit.com/r/reactjs/) * [Spectrum's React community](https://spectrum.chat/react) diff --git a/content/footerNav.yml b/content/footerNav.yml index f4a6728dc..179a6e2db 100644 --- a/content/footerNav.yml +++ b/content/footerNav.yml @@ -30,7 +30,7 @@ channels: to: https://reactjs.org/community/support.html#popular-discussion-forums external: true - title: Reactiflux Chat - to: https://discord.gg/0ZcbPKXt5bZjGY5n + to: https://discord.gg/reactiflux external: true - title: DEV Community to: https://dev.to/t/react diff --git a/content/tutorial/tutorial.md b/content/tutorial/tutorial.md index 466cc6a5b..e90f8ae8f 100644 --- a/content/tutorial/tutorial.md +++ b/content/tutorial/tutorial.md @@ -118,7 +118,7 @@ We recommend following [these instructions](https://babeljs.io/docs/editors/) to ### Help, I'm Stuck! {#help-im-stuck} -If you get stuck, check out the [community support resources](/community/support.html). In particular, [Reactiflux Chat](https://discord.gg/0ZcbPKXt5bZjGY5n) is a great way to get help quickly. If you don't receive an answer, or if you remain stuck, please file an issue, and we'll help you out. +If you get stuck, check out the [community support resources](/community/support.html). In particular, [Reactiflux Chat](https://discord.gg/reactiflux) is a great way to get help quickly. If you don't receive an answer, or if you remain stuck, please file an issue, and we'll help you out. ## Overview {#overview} From 9705d2796be2c951163ebaffa90d263990e24149 Mon Sep 17 00:00:00 2001 From: Michael Lustig Date: Thu, 26 Sep 2019 14:06:42 -0400 Subject: [PATCH 07/14] Fix error (#2370) --- content/docs/context.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/context.md b/content/docs/context.md index 5b4592c2f..b16c5d7c2 100644 --- a/content/docs/context.md +++ b/content/docs/context.md @@ -201,7 +201,7 @@ Requires a [function as a child](/docs/render-props.html#using-props-other-than- Context object accepts a `displayName` string property. React DevTools uses this string to determine what to display for the context. -For example, the following component will appear as MyContext in the DevTools: +For example, the following component will appear as MyDisplayName in the DevTools: ```js{2} const MyContext = React.createContext(/* some value */); From 855bd6d893b68540d8e9afa010a211332a137080 Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Fri, 27 Sep 2019 14:00:02 -0700 Subject: [PATCH 08/14] Update for 16.10 (#2373) --- content/versions.yml | 2 ++ package.json | 4 ++-- src/site-constants.js | 2 +- yarn.lock | 26 +++++++++++++------------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/content/versions.yml b/content/versions.yml index 8d1f92abb..41a2bed4f 100644 --- a/content/versions.yml +++ b/content/versions.yml @@ -1,3 +1,5 @@ +- title: '16.10' + changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#16100-september-27-2019 - title: '16.9' changelog: https://github.com/facebook/react/blob/master/CHANGELOG.md#1690-august-8-2019 - title: '16.8' diff --git a/package.json b/package.json index b22d19551..573fb3665 100644 --- a/package.json +++ b/package.json @@ -47,8 +47,8 @@ "normalize.css": "^8.0.0", "prettier": "^1.7.4", "prismjs": "^1.15.0", - "react": "^16.9.0", - "react-dom": "^16.9.0", + "react": "^16.10.0", + "react-dom": "^16.10.0", "react-helmet": "^5.2.0", "react-live": "1.8.0-0", "remarkable": "^1.7.1", diff --git a/src/site-constants.js b/src/site-constants.js index f109e71bb..fa55681e1 100644 --- a/src/site-constants.js +++ b/src/site-constants.js @@ -8,7 +8,7 @@ // NOTE: We can't just use `location.toString()` because when we are rendering // the SSR part in node.js we won't have a proper location. const urlRoot = 'https://reactjs.org'; -const version = '16.9.0'; +const version = '16.10.0'; const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js'; export {babelURL, urlRoot, version}; diff --git a/yarn.lock b/yarn.lock index 480594945..622ba4828 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10241,15 +10241,15 @@ react-dev-utils@^4.2.1: strip-ansi "3.0.1" text-table "0.2.0" -react-dom@^16.9.0: - version "16.9.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962" - integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ== +react-dom@^16.10.0: + version "16.10.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.0.tgz#319356767b5c044f3c016eef28518ef7726dce84" + integrity sha512-0QJQUFrKG04hB/1lWyUs/FOd1qNseKGRQI+JBRsADIqVAFxYObhZ2zsVQKjt+nVSCmi8KA0sL52RLwwWuXQtOw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.15.0" + scheduler "^0.16.0" react-error-overlay@^3.0.0: version "3.0.0" @@ -10303,10 +10303,10 @@ react-side-effect@^1.1.0: exenv "^1.2.1" shallowequal "^1.0.1" -react@^16.9.0: - version "16.9.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa" - integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w== +react@^16.10.0: + version "16.10.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.10.0.tgz#95c41e8fc1c706e174deef54b663b5ab94c8ee32" + integrity sha512-lc37bD3j6ZWJRso/a1rrFu6CO1qOf30ZadUDBi1c5RHA1lBSWA8x2MGABB6Oikk+RfmgC+kAT+XegL0eD1ecKg== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -11019,10 +11019,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -scheduler@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e" - integrity sha512-xAefmSfN6jqAa7Kuq7LIJY0bwAPG3xlCj0HMEBQk1lxYiDKZscY2xJ5U/61ZTrYbmNQbXa+gc7czPkVo11tnCg== +scheduler@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.0.tgz#cc8914b79c5c1cfa16714cb1ddc4cbd2c7513efa" + integrity sha512-Jq59uCXQzi71B562VEjuDgvsgfTfkLDvdjNhA7hamN/fKBxecXIEFF24Zu4OVrnAz9NJJ8twa9X16Zp4b0P/xQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" From 0a88bc00f4efd67e842e703a31da0f0fbc19c989 Mon Sep 17 00:00:00 2001 From: imed jaberi <43971542+3imed-jaberi@users.noreply.github.com> Date: Fri, 27 Sep 2019 22:19:30 +0100 Subject: [PATCH 09/14] update bengali status .. (#2371) --- content/languages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/languages.yml b/content/languages.yml index ace96a985..499c8ea4a 100644 --- a/content/languages.yml +++ b/content/languages.yml @@ -22,7 +22,7 @@ - name: Bengali translated_name: বাংলা code: bn - status: 0 + status: 1 - name: Catalan translated_name: Català code: ca From 51925ada773dc34c08c836b278ab1bd0fcab38c1 Mon Sep 17 00:00:00 2001 From: Erasmo Bellumat Date: Mon, 30 Sep 2019 09:54:42 -0300 Subject: [PATCH 10/14] Added Vila Velha React Meetup in Brazil (#2375) Added Vila Velha React Meetup in Brazil --- content/community/meetups.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/meetups.md b/content/community/meetups.md index a08e096ca..62fdfa7d2 100644 --- a/content/community/meetups.md +++ b/content/community/meetups.md @@ -25,6 +25,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [Joinville](https://www.meetup.com/pt-BR/React-Joinville/) * [Rio de Janeiro](https://www.meetup.com/pt-BR/React-Rio-de-Janeiro/) * [São Paulo](https://www.meetup.com/pt-BR/ReactJS-SP/) +* [Vila Velha](https://www.meetup.com/pt-BR/React-ES/) ## Bolivia {#bolivia} * [Bolivia](https://www.meetup.com/ReactBolivia/) From 647b639259919f96e9b667bf41ec16621e1b84dc Mon Sep 17 00:00:00 2001 From: "Bouwe K. Westerdijk" Date: Mon, 30 Sep 2019 14:56:32 +0200 Subject: [PATCH 11/14] React Router also supports hooks now (#2374) --- content/docs/hooks-faq.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/docs/hooks-faq.md b/content/docs/hooks-faq.md index 0869e4234..d2c297d0e 100644 --- a/content/docs/hooks-faq.md +++ b/content/docs/hooks-faq.md @@ -109,7 +109,9 @@ You can continue to use the exact same APIs as you always have; they'll continue React Redux since v7.1.0 [supports Hooks API](https://react-redux.js.org/api/hooks) and exposes hooks like `useDispatch` or `useSelector`. -Libraries like React Router might support hooks in the future. +React Router [supports hooks](https://reacttraining.com/react-router/web/api/Hooks) since v5.1. + +Other libraries might support hooks in the future too. ### Do Hooks work with static typing? {#do-hooks-work-with-static-typing} From 5fd71d1b835d8ed750b6d09ba3213bb446862413 Mon Sep 17 00:00:00 2001 From: Taehwan Noh Date: Thu, 3 Oct 2019 14:13:12 +0900 Subject: [PATCH 12/14] Resolve merge conflict Related to 855bd6d --- src/site-constants.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/site-constants.js b/src/site-constants.js index 5adaea807..96a1cec28 100644 --- a/src/site-constants.js +++ b/src/site-constants.js @@ -7,13 +7,8 @@ // NOTE: We can't just use `location.toString()` because when we are rendering // the SSR part in node.js we won't have a proper location. -<<<<<<< HEAD const urlRoot = 'https://ko.reactjs.org'; -const version = '16.9.0'; -======= -const urlRoot = 'https://reactjs.org'; const version = '16.10.0'; ->>>>>>> 647b639259919f96e9b667bf41ec16621e1b84dc const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js'; export {babelURL, urlRoot, version}; From 86aaa7e1b57cf32149bb20aa7c4a0daa4161f70a Mon Sep 17 00:00:00 2001 From: Taehwan Noh Date: Thu, 3 Oct 2019 14:14:33 +0900 Subject: [PATCH 13/14] Resolve merge conflict Related to 569f2e2 --- content/tutorial/tutorial.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/content/tutorial/tutorial.md b/content/tutorial/tutorial.md index 27f60cf5f..565741255 100644 --- a/content/tutorial/tutorial.md +++ b/content/tutorial/tutorial.md @@ -120,11 +120,7 @@ import './index.css'; ### 도움이 필요할 때! {#help-im-stuck} -<<<<<<< HEAD -막히는 부분이 생겼다면 [커뮤니티에서 지원하는 자료](/community/support.html)를 확인해보세요. 특히 [Reactiflux Chat](https://discord.gg/0ZcbPKXt5bZjGY5n)은 빠르게 도움을 받을 수 있는 좋은 방법입니다. 원하는 답을 얻지 못하거나 계속 막힌 상태라면 이슈를 제출해주세요. 우리가 도와드리겠습니다. -======= -If you get stuck, check out the [community support resources](/community/support.html). In particular, [Reactiflux Chat](https://discord.gg/reactiflux) is a great way to get help quickly. If you don't receive an answer, or if you remain stuck, please file an issue, and we'll help you out. ->>>>>>> 647b639259919f96e9b667bf41ec16621e1b84dc +막히는 부분이 생겼다면 [커뮤니티에서 지원하는 자료](/community/support.html)를 확인해보세요. 특히 [Reactiflux Chat](https://discord.gg/reactiflux)은 빠르게 도움을 받을 수 있는 좋은 방법입니다. 원하는 답을 얻지 못하거나 계속 막힌 상태라면 이슈를 제출해주세요. 우리가 도와드리겠습니다. ## 개요 {#overview} From 6a115486c3bd366ed0b4a0f626013cf1bd68c786 Mon Sep 17 00:00:00 2001 From: Taehwan Noh Date: Thu, 3 Oct 2019 14:35:24 +0900 Subject: [PATCH 14/14] Resolve merge conflict Related to 5cdb85b, 9705d27 --- content/docs/context.md | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/content/docs/context.md b/content/docs/context.md index 3a948357f..80d505664 100644 --- a/content/docs/context.md +++ b/content/docs/context.md @@ -15,22 +15,13 @@ context를 이용하면 단계마다 일일이 props를 넘겨주지 않고도 - [Context.Provider](#contextprovider) - [Class.contextType](#classcontexttype) - [Context.Consumer](#contextconsumer) -<<<<<<< HEAD + - [Context.displayName](#contextdisplayname) - [예시](#examples) - [값이 변하는 context](#dynamic-context) - [하위 컴포넌트에서 context 업데이트하기](#updating-context-from-a-nested-component) - [여러 context 구독하기](#consuming-multiple-contexts) - [주의사항](#caveats) - [예전 API](#legacy-api) -======= - - [Context.displayName](#contextdisplayname) -- [Examples](#examples) - - [Dynamic Context](#dynamic-context) - - [Updating Context from a Nested Component](#updating-context-from-a-nested-component) - - [Consuming Multiple Contexts](#consuming-multiple-contexts) -- [Caveats](#caveats) -- [Legacy API](#legacy-api) ->>>>>>> 647b639259919f96e9b667bf41ec16621e1b84dc ## 언제 context를 써야 할까 {#when-to-use-context} @@ -204,14 +195,11 @@ Context.Consumer의 자식은 [함수](/docs/render-props.html#using-props-other > >함수를 자식으로 받는 패턴에 대해서는 [render props](/docs/render-props.html)을 참조하세요. -<<<<<<< HEAD -## 예시 {#examples} -======= ### `Context.displayName` {#contextdisplayname} -Context object accepts a `displayName` string property. React DevTools uses this string to determine what to display for the context. +Context 객체는 `displayName` 문자열 속성을 설정할 수 있습니다. React 개발자 도구는 이 문자열을 사용해서 context를 어떻게 보여줄 지 결정합니다. -For example, the following component will appear as MyDisplayName in the DevTools: +예를 들어, 아래 컴포넌트는 개발자 도구에 MyDisplayName로 표시됩니다. ```js{2} const MyContext = React.createContext(/* some value */); @@ -221,8 +209,7 @@ MyContext.displayName = 'MyDisplayName'; // "MyDisplayName.Consumer" in DevTools ``` -## Examples {#examples} ->>>>>>> 647b639259919f96e9b667bf41ec16621e1b84dc +## 예시 {#examples} ### 값이 변하는 context {#dynamic-context}