Skip to content

Commit 547fa6f

Browse files
committed
Merge branch 'main' into feat/deep-linking-docs-add-swift-appdelegate
2 parents 0148e86 + 9da5746 commit 547fa6f

31 files changed

+869
-899
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<!--
2+
13
# READ ME PLEASE
24
35
> **TL;DR: Make sure to add your changes to versioned docs**
@@ -7,3 +9,5 @@ Thanks for opening a PR!
79
The docs cover several versions of `react-navigation`, and in some cases there are several files (for version 1, version 2 and etc.) that all describe a single page of the docs (eg. "Getting Started").
810
911
Please make sure that the edit you're making in `docs/file-you-edited.md` is also included in the file for the correct version, eg. `/versioned_docs/version-3.x/file-you-edited.md` for version 3. If such file doesn't exist, please create it. :+1:
12+
13+
-->

src/css/custom.css

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,12 @@
8181

8282
--ifm-footer-padding-horizontal: var(--ifm-spacing-horizontal);
8383
--ifm-footer-padding-vertical: var(--ifm-spacing-vertical);
84-
--ifm-tabs-padding-vertical: 0.5rem;
84+
--ifm-tabs-padding-vertical: 0.375rem;
85+
86+
--ifm-alert-shadow: none;
8587
--ifm-alert-border-left-width: 0;
88+
89+
--codeblock-background-color: #f6f8fa;
8690
}
8791

8892
:root[data-theme='dark'] {
@@ -133,6 +137,8 @@
133137
--ifm-home-color-border: #f7f7ff;
134138

135139
--docusaurus-highlighted-code-line-bg: rgba(255, 255, 255, 0.07);
140+
141+
--codeblock-background-color: #282a35;
136142
}
137143

138144
h1 {
@@ -388,15 +394,37 @@ p {
388394
}
389395

390396
.tabs__item {
391-
border-bottom: 1px solid var(--ifm-toc-border-color);
397+
border-bottom: 2px solid var(--ifm-toc-border-color);
392398
border-bottom-left-radius: 0;
393399
border-bottom-right-radius: 0;
394400
}
395401

396402
.tabs__item--active,
397403
.tabs__item--active:hover {
398404
border-bottom-color: var(--ifm-tabs-color-active-border);
399-
background-color: var(--ifm-menu-color-background-active);
405+
}
406+
407+
.tabs-container:has(
408+
> .margin-top--md > [role='tabpanel'] > .theme-code-block:only-child
409+
):not(:has(> .margin-top--md > [role='tabpanel'] > :nth-child(2))) {
410+
background-color: var(--codeblock-background-color);
411+
border-radius: var(--ifm-code-border-radius);
412+
413+
& > .margin-top--md {
414+
margin-top: 0 !important;
415+
}
416+
417+
& > .tabs {
418+
box-shadow: inset 0 -2px 0 var(--ifm-toc-border-color);
419+
}
420+
421+
& > .tabs > .tabs__item {
422+
border-top-right-radius: 0;
423+
}
424+
425+
& > .tabs > .tabs__item:not(:first-child) {
426+
border-top-left-radius: 0;
427+
}
400428
}
401429

402430
.col:has(.table-of-contents) {
@@ -475,6 +503,10 @@ samp {
475503
display: none;
476504
}
477505

506+
.theme-code-block {
507+
box-shadow: none !important;
508+
}
509+
478510
.theme-code-block:has(+ .snack-sample-link) {
479511
margin-bottom: 0;
480512
border-bottom-left-radius: 0;
@@ -488,17 +520,15 @@ samp {
488520
margin-top: 0;
489521
margin-bottom: var(--ifm-leading);
490522
padding: calc(var(--ifm-pre-padding) / 2) var(--ifm-pre-padding);
491-
background-color: #f6f8fa;
523+
background-color: var(--codeblock-background-color);
492524
border-top-width: 1px;
493525
border-top-style: solid;
494526
border-top-color: var(--ifm-color-gray-200);
495527
border-bottom-left-radius: var(--ifm-pre-border-radius);
496528
border-bottom-right-radius: var(--ifm-pre-border-radius);
497-
box-shadow: var(--ifm-global-shadow-lw);
498529
}
499530

500531
[data-theme='dark'] .theme-code-block + .snack-sample-link {
501-
background-color: #282a35;
502532
border-top-color: rgba(255, 255, 255, 0.07);
503533
}
504534

src/data/sponsors.js

Lines changed: 44 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,193 +1,72 @@
11
export default [
22
{
3-
avatarUrl:
4-
'https://avatars.githubusercontent.com/u/9664363?u=a4a9e93dc4305c91ced38b83d4c08186f7254b04&v=4',
5-
username: 'EvanBacon',
6-
name: 'Evan Bacon',
3+
"avatarUrl": "https://avatars.githubusercontent.com/u/360412?u=15e7b90eb91a3d2b410f7f47461862cb793398ff&v=4",
4+
"username": "jyc",
5+
"name": null
76
},
87
{
9-
avatarUrl: 'https://avatars.githubusercontent.com/u/306134?v=4',
10-
username: 'wcandillon',
11-
name: 'William Candillon',
8+
"avatarUrl": "https://avatars.githubusercontent.com/u/1257695?u=e142a0ae6314aa8b462e664db429d926b31bf978&v=4",
9+
"username": "karszawa",
10+
"name": "Hiroaki KARASAWA"
1211
},
1312
{
14-
avatarUrl: 'https://avatars.githubusercontent.com/u/476779?v=4',
15-
username: 'Expensify',
16-
name: 'Expensify, Inc',
13+
"avatarUrl": "https://avatars.githubusercontent.com/u/1629785?u=f91613c118bb1fcf442a71008dff1cd5f9b30411&v=4",
14+
"username": "JonnyBurger",
15+
"name": "Jonny Burger"
1716
},
1817
{
19-
avatarUrl:
20-
'https://avatars.githubusercontent.com/u/916690?u=66482eb2c5bb755553afbcfa219dcacc42fc487a&v=4',
21-
username: 'benevbright',
22-
name: 'Bright Lee',
18+
"avatarUrl": "https://avatars.githubusercontent.com/u/2443340?v=4",
19+
"username": "toyokumo",
20+
"name": "TOYOKUMO"
2321
},
2422
{
25-
avatarUrl:
26-
'https://avatars.githubusercontent.com/u/980234?u=59bb4c6ac0a23b53225bb2235b69c72a960ba83f&v=4',
27-
username: 'simoncar',
28-
name: 'Simoncar',
23+
"avatarUrl": "https://avatars.githubusercontent.com/u/4328772?u=c4e0fd72bd7cdb3751166c8ade8ef253e6f5ba67&v=4",
24+
"username": "itsrifat",
25+
"name": "Moinul Hossain"
2926
},
3027
{
31-
avatarUrl:
32-
'https://avatars.githubusercontent.com/u/1057756?u=15c3cdff1c715ac27bbc63ccb8f0a1c27eeb3784&v=4',
33-
username: 'zhigang1992',
34-
name: 'Zhigang Fang',
28+
"avatarUrl": "https://avatars.githubusercontent.com/u/6936373?u=4edd14e6636c45d10ac6a3eecb4b3ffa6cc2bf5c&v=4",
29+
"username": "Naturalclar",
30+
"name": "Jesse Katsumata"
3531
},
3632
{
37-
avatarUrl:
38-
'https://avatars.githubusercontent.com/u/1257695?u=e142a0ae6314aa8b462e664db429d926b31bf978&v=4',
39-
username: 'karszawa',
40-
name: 'Hiroaki KARASAWA',
33+
"avatarUrl": "https://avatars.githubusercontent.com/u/7029942?u=5eb1fed31f05fe97bcb07227268165c4028cc662&v=4",
34+
"username": "radko93",
35+
"name": "Radek Czemerys"
4136
},
4237
{
43-
avatarUrl:
44-
'https://avatars.githubusercontent.com/u/1566403?u=3df07e2ae72e89a3a3509ba6c2f927115b5f38aa&v=4',
45-
username: 'vonovak',
46-
name: 'Vojtech Novak',
38+
"avatarUrl": "https://avatars.githubusercontent.com/u/7910545?u=95ae2c2a40b5f6f63f05fce29ee7c01622019c76&v=4",
39+
"username": "UdaySravanK",
40+
"name": "Uday Sravan K"
4741
},
4842
{
49-
avatarUrl:
50-
'https://avatars.githubusercontent.com/u/1629785?u=12eb94da6070d00fc924761ce06e3a428d01b7e9&v=4',
51-
username: 'JonnyBurger',
52-
name: 'Jonny Burger',
43+
"avatarUrl": "https://avatars.githubusercontent.com/u/9664363?u=46ba6d5fbd29729df2950b845c9ca2cd085a1c2b&v=4",
44+
"username": "EvanBacon",
45+
"name": "Evan Bacon"
5346
},
5447
{
55-
avatarUrl:
56-
'https://avatars.githubusercontent.com/u/1764217?u=f36737d852ffcc50b87e809474faa27eb2ce130a&v=4',
57-
username: 'markholland',
58-
name: 'Mark Holland',
48+
"avatarUrl": "https://avatars.githubusercontent.com/u/12868063?u=c6afaa685373053ab058c7899e2afe806920b038&v=4",
49+
"username": "monkey0722",
50+
"name": "Taku Kobachi"
5951
},
6052
{
61-
avatarUrl:
62-
'https://avatars.githubusercontent.com/u/3584560?u=f54bd481e956c6b3fe88a15f466ff9a3973e4b35&v=4',
63-
username: 'hetmann',
64-
name: 'Hetmann W. Iohan',
53+
"avatarUrl": "https://avatars.githubusercontent.com/u/15199031?u=5a82dcb32237282ff576c0446567a1e2fe49b868&v=4",
54+
"username": "mrousavy",
55+
"name": "Marc Rousavy"
6556
},
6657
{
67-
avatarUrl:
68-
'https://avatars.githubusercontent.com/u/4328772?u=c4e0fd72bd7cdb3751166c8ade8ef253e6f5ba67&v=4',
69-
username: 'itsrifat',
70-
name: 'Moinul Hossain',
58+
"avatarUrl": "https://avatars.githubusercontent.com/u/23122214?u=7b3231a177e5d661d55b2cee88ea69e1713eb695&v=4",
59+
"username": "sayurimizuguchi",
60+
"name": "Sayuri Mizuguchi"
7161
},
7262
{
73-
avatarUrl:
74-
'https://avatars.githubusercontent.com/u/4376835?u=0cf5324a78dd4140ef71943048dedac328be68b9&v=4',
75-
username: 'lnmunhoz',
76-
name: 'Lucas N. Munhoz',
63+
"avatarUrl": "https://avatars.githubusercontent.com/u/79333934?u=d18e4c6a4e063534d6fd7e77e0d51c367c91cfa0&v=4",
64+
"username": "finanzguru",
65+
"name": "Finanzguru"
7766
},
7867
{
79-
avatarUrl: 'https://avatars.githubusercontent.com/u/5605177?v=4',
80-
username: 'Razorholt',
81-
name: null,
82-
},
83-
{
84-
avatarUrl:
85-
'https://avatars.githubusercontent.com/u/5967956?u=f7f5ed6b6b399c2953fd0e3be0512c378e9f76c4&v=4',
86-
username: 'codinsonn',
87-
name: 'Thorr Stevens',
88-
},
89-
{
90-
avatarUrl:
91-
'https://avatars.githubusercontent.com/u/6457344?u=47e100289441b7f4681a7809202ff683886e4f5e&v=4',
92-
username: 'ryo-rm',
93-
name: 'ryo kishida',
94-
},
95-
{
96-
avatarUrl:
97-
'https://avatars.githubusercontent.com/u/6936373?u=4edd14e6636c45d10ac6a3eecb4b3ffa6cc2bf5c&v=4',
98-
username: 'Naturalclar',
99-
name: 'Jesse Katsumata',
100-
},
101-
{
102-
avatarUrl:
103-
'https://avatars.githubusercontent.com/u/7029942?u=5eb1fed31f05fe97bcb07227268165c4028cc662&v=4',
104-
username: 'radko93',
105-
name: 'Radek Czemerys',
106-
},
107-
{
108-
avatarUrl: 'https://avatars.githubusercontent.com/u/12504344?v=4',
109-
username: 'expo',
110-
name: 'Expo',
111-
},
112-
{
113-
avatarUrl: 'https://avatars.githubusercontent.com/u/13601619?v=4',
114-
username: 'itiden',
115-
name: 'Itiden',
116-
},
117-
{
118-
avatarUrl:
119-
'https://avatars.githubusercontent.com/u/14099522?u=965e74751a9db0f40a30ace9cd0cb1f82eaf1412&v=4',
120-
username: 'aCanalez',
121-
name: 'Alexi Canales',
122-
},
123-
{
124-
avatarUrl:
125-
'https://avatars.githubusercontent.com/u/15199031?u=46da50e88594eb284cf249485f202d5d43d474d1&v=4',
126-
username: 'mrousavy',
127-
name: 'Marc Rousavy',
128-
},
129-
{
130-
avatarUrl:
131-
'https://avatars.githubusercontent.com/u/17621507?u=0ee7f26191d430f4fc0672cef92c2759d948bbb5&v=4',
132-
username: 'dsznajder',
133-
name: 'Damian Sznajder',
134-
},
135-
{
136-
avatarUrl:
137-
'https://avatars.githubusercontent.com/u/21980965?u=5a571092a83cb71508c60a9c86ab2520fde8a68e&v=4',
138-
username: 'jarvisluong',
139-
name: 'Jarvis Luong',
140-
},
141-
{
142-
avatarUrl:
143-
'https://avatars.githubusercontent.com/u/26326015?u=33a1afbe11e8f6b962c6267606d59c2b2ef94716&v=4',
144-
username: 'bang9',
145-
name: 'Hyungu Kang | Airen',
146-
},
147-
{
148-
avatarUrl:
149-
'https://avatars.githubusercontent.com/u/27461460?u=b5860875e26d33fd70fd210f4ea74f81cdf9d99b&v=4',
150-
username: 'hyochan',
151-
name: 'Hyo',
152-
},
153-
{
154-
avatarUrl: 'https://avatars.githubusercontent.com/u/30735054?v=4',
155-
username: 'endearhq',
156-
name: 'Endear',
157-
},
158-
{
159-
avatarUrl:
160-
'https://avatars.githubusercontent.com/u/33361399?u=6180514361e35ae42e2401431555c82cc63adda9&v=4',
161-
username: 'oliverloops',
162-
name: 'Oliver Lopez ',
163-
},
164-
{
165-
avatarUrl:
166-
'https://avatars.githubusercontent.com/u/34658847?u=17fd3603d012d068c060039bcf009095055290a1&v=4',
167-
username: 'RatebSeirawan',
168-
name: 'Rateb Seirawan',
169-
},
170-
{
171-
avatarUrl:
172-
'https://avatars.githubusercontent.com/u/36824170?u=6f56fa2998ffba6b5a3908c79e2ef9331bad502a&v=4',
173-
username: 'luism3861',
174-
name: 'Luis Medina Huerta',
175-
},
176-
{
177-
avatarUrl:
178-
'https://avatars.githubusercontent.com/u/45317893?u=253e6eabcb23a5361e93a064914c9b8d136ac888&v=4',
179-
username: 'GandresCoello18',
180-
name: 'Andres Coello',
181-
},
182-
{
183-
avatarUrl:
184-
'https://avatars.githubusercontent.com/u/46625943?u=63c9ed9017c34900df8b5ae2ed455ec4c82ef8aa&v=4',
185-
username: 'bowen9284',
186-
name: 'Matt Bowen',
187-
},
188-
{
189-
avatarUrl: 'https://avatars.githubusercontent.com/u/49920282?v=4',
190-
username: 'reactrondev',
191-
name: 'Reactron',
192-
},
193-
];
68+
"avatarUrl": "https://avatars.githubusercontent.com/u/140319444?v=4",
69+
"username": "jupli-apps",
70+
"name": "Jupli"
71+
}
72+
]

src/pages/home/Sponsors/index.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import React from 'react';
2-
31
import sponsors from '../../../data/sponsors';
42
import styles from './styles.module.css';
53

@@ -8,15 +6,14 @@ export default function Sponsors() {
86
<section className={styles.wrapper}>
97
<div className={styles.container}>
108
<p>
11-
React Navigation is built by <a href="https://expo.dev">Expo</a>,{' '}
12-
<a href="https://swmansion.com/">Software Mansion</a>, and{' '}
13-
<a href="https://www.callstack.com/">Callstack</a>, with contributions
14-
from the{' '}
9+
React Navigation relies on the support from the community. Thanks to{' '}
10+
<a href="https://swmansion.com/">Software Mansion</a>,{' '}
11+
<a href="https://www.callstack.com/">Callstack</a>,{' '}
12+
<a href="https://expo.dev">Expo</a>, and our amazing{' '}
1513
<a href="https://github.com/react-navigation/react-navigation/graphs/contributors">
16-
community
14+
contributors
1715
</a>{' '}
18-
and{' '}
19-
<a href="https://github.com/sponsors/react-navigation">sponsors</a>:
16+
& <a href="https://github.com/sponsors/react-navigation">sponsors</a>:
2017
</p>
2118
<div className={styles.sponsorsContainer}>
2219
{sponsors.map((sponsor) => (

versioned_docs/version-4.x/contributing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ And here are a few helpful resources to aid in getting started:
3232
You can't write code without writing the occasional bug. Especially as React Navigation is moving quickly, bugs happen. When you think you've found one here's what to do:
3333

3434
1. Search the existing issues for one like what you're seeing. If you see one, add a 👍 reaction (please no +1 comments). Read through the comments and see if you can provide any more valuable information to the thread
35-
2. If there are no other issues like yours then create a new one. Be sure to follow the [issue template](https://github.com/react-navigation/react-navigation/blob/4.x/.github/ISSUE_TEMPLATE.md).
35+
2. If there are no other issues like yours then create a new one. Be sure to follow the [issue template](https://github.com/react-navigation/react-navigation/blob/v4.1.1/.github/ISSUE_TEMPLATE/bug_report.md).
3636

3737
Creating a high quality reproduction is critical. Without it we likely can't fix the bug and, in an ideal situation, you'll find out that it's not actually a bug of the library but simply done incorrectly in your project. Instant bug fix!
3838

@@ -93,15 +93,15 @@ The libdef (located at `flow/react-navigation.js`) will need to be updated such
9393

9494
### Issue Template
9595

96-
Before submitting an issue, please take a look at the [issue template](https://github.com/react-navigation/react-navigation/blob/4.x/.github/ISSUE_TEMPLATE.md) and follow it. This is in place to help everyone better understand the issue you're having and reduce the back and forth to get the necessary information.
96+
Before submitting an issue, please take a look at the [issue template](https://github.com/react-navigation/react-navigation/blob/v4.1.1/.github/ISSUE_TEMPLATE/bug_report.md) and follow it. This is in place to help everyone better understand the issue you're having and reduce the back and forth to get the necessary information.
9797

9898
Yes, it takes time and effort to complete the issue template. But that's the only way to ask high quality questions that actually get responses.
9999

100100
Would you rather take 1 minute to create an incomplete issue report and wait months to get any sort of response? Or would you rather take 20 minutes to fill out a high quality issue report, with all the necessary elements, and get a response in days? It's also a respectful thing to do for anyone willing to take the time to review your issue.
101101

102102
### Pull Request Template
103103

104-
Much like the issue template, the [pull request template](https://github.com/react-navigation/react-navigation/blob/4.x/.github/PULL_REQUEST_TEMPLATE.md) lays out instructions to ensure your pull request gets reviewed in a timely manner and reduces the back and forth. Make sure to look it over before you start writing any code.
104+
Much like the issue template, the [pull request template](https://github.com/react-navigation/react-navigation/blob/v4.1.1/.github/PULL_REQUEST_TEMPLATE.md) lays out instructions to ensure your pull request gets reviewed in a timely manner and reduces the back and forth. Make sure to look it over before you start writing any code.
105105

106106
### Forking the Repository
107107

0 commit comments

Comments
 (0)