From 32a5db034ba66c5d7a4d6902352aa86e3eb90145 Mon Sep 17 00:00:00 2001 From: Gregor Adams Date: Tue, 26 Nov 2019 21:44:34 +0100 Subject: [PATCH 1/4] docs: Unify identifiers in "useImperativeHandle" example (#2590) The example was using `inputRef` while the description used `fancyInputRef`. This was irritating. --- content/docs/hooks-reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/hooks-reference.md b/content/docs/hooks-reference.md index 852ae4833..38b740aad 100644 --- a/content/docs/hooks-reference.md +++ b/content/docs/hooks-reference.md @@ -450,7 +450,7 @@ function FancyInput(props, ref) { FancyInput = forwardRef(FancyInput); ``` -In this example, a parent component that renders `` would be able to call `fancyInputRef.current.focus()`. +In this example, a parent component that renders `` would be able to call `inputRef.current.focus()`. ### `useLayoutEffect` {#uselayouteffect} From a46ed600865ded850df8bbbfb3a1749951a9393c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=C3=A4mecke?= Date: Thu, 28 Nov 2019 20:12:42 +0100 Subject: [PATCH 2/4] Add React Cologne to meetups (#2595) --- content/community/meetups.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/meetups.md b/content/community/meetups.md index 296032a4d..eb89b2f04 100644 --- a/content/community/meetups.md +++ b/content/community/meetups.md @@ -61,6 +61,7 @@ Do you have a local React.js meetup? Add it here! (Please keep the list alphabet * [Paris](https://www.meetup.com/ReactJS-Paris/) ## Germany {#germany} +* [Cologne](https://www.meetup.com/React-Cologne/) * [Düsseldorf](https://www.meetup.com/de-DE/ReactJS-Meetup-Dusseldorf/) * [Hamburg](https://www.meetup.com/Hamburg-React-js-Meetup/) * [Karlsruhe](https://www.meetup.com/react_ka/) From e0a0ec3dad47804d0b41d4a7bb81841638dc79dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=C3=A4mecke?= Date: Thu, 28 Nov 2019 20:14:48 +0100 Subject: [PATCH 3/4] Add React Barcamp Cologne 2020 to Conferences (#2594) * Add React Barcamp Cologne 2020 to Conferences * Update conferences.md Co-authored-by: Alexey Pyltsyn --- content/community/conferences.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/content/community/conferences.md b/content/community/conferences.md index ab0659194..da45b90fa 100644 --- a/content/community/conferences.md +++ b/content/community/conferences.md @@ -22,6 +22,11 @@ December 6, 2019 in Berlin, Germany [Website](https://reactday.berlin) - [Twitter](https://twitter.com/reactdayberlin) - [Facebook](https://www.facebook.com/reactdayberlin/) - [Videos](https://www.youtube.com/reactdayberlin) +### React Barcamp Cologne 2020 {#react-barcamp-cologne-2020} +February 1-2, 2020 in Cologne, Germany + +[Website](https://react-barcamp.de/) - [Twitter](https://twitter.com/ReactBarcamp) - [Facebook](https://www.facebook.com/reactbarcamp) + ### ReactConf AU 2020 {#reactconfau} February 27 & 28, 2020 in Sydney, Australia From aa4a27db1db14d2c6c91faa92d44369c635dd496 Mon Sep 17 00:00:00 2001 From: Jakub Drozdek Date: Tue, 3 Dec 2019 00:35:28 +0100 Subject: [PATCH 4/4] Resolve merge conflicts --- content/docs/hooks-reference.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/content/docs/hooks-reference.md b/content/docs/hooks-reference.md index 504d987e4..b154a66d7 100644 --- a/content/docs/hooks-reference.md +++ b/content/docs/hooks-reference.md @@ -450,11 +450,7 @@ function FancyInput(props, ref) { FancyInput = forwardRef(FancyInput); ``` -<<<<<<< HEAD -W tym przykładzie komponent rodzica, który renderuje `` będzie w stanie wywołać `fancyInputRef.current.focus()`. -======= -In this example, a parent component that renders `` would be able to call `inputRef.current.focus()`. ->>>>>>> e0a0ec3dad47804d0b41d4a7bb81841638dc79dd +W tym przykładzie komponent rodzica, który renderuje `` będzie w stanie wywołać `inputRef.current.focus()`. ### `useLayoutEffect` {#uselayouteffect}