Skip to content

Commit 45bd548

Browse files
authored
Merge branch 'main' into fix-import-error
2 parents a15fc84 + 309bd5a commit 45bd548

File tree

48 files changed

+79
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+79
-78
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@maintainers

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ Follow the links below to find out more about this project.
6969
- [Documentation](https://reactpy.dev/)
7070
- [GitHub Discussions](https://github.com/reactive-python/reactpy/discussions)
7171
- [Discord](https://discord.gg/uNb5P4hA9X)
72-
- [Contributor Guide](https://reactpy.dev/docs/developing-reactpy/contributor-guide.html)
72+
- [Contributor Guide](https://reactpy.dev/docs/about/contributor-guide.html)
7373
- [Code of Conduct](https://github.com/reactive-python/reactpy/blob/main/CODE_OF_CONDUCT.md)

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
We provide two main ways to run the docs. Both use
44
[`nox`](https://pypi.org/project/nox/):
55

6-
- `nox -s docs` - displayes the docs and rebuilds when files are modified.
6+
- `nox -s docs` - displays the docs and rebuilds when files are modified.
77
- `nox -s docs-in-docker` - builds a docker image and runs the docs from there.
88

99
If any changes to the core of the documentation are made (i.e. to non-`*.rst` files),

docs/source/_custom_js/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function triggerIfInViewport(element, callback) {
8686
},
8787
{
8888
root: null,
89-
threshold: 0.1, // set offset 0.1 means trigger if atleast 10% of element in viewport
89+
threshold: 0.1, // set offset 0.1 means trigger if at least 10% of element in viewport
9090
},
9191
);
9292

docs/source/about/changelog.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ v1.0.0-a4
6262

6363
**Deprecated**
6464

65-
- :pull:`919` - Declaration of keys via keywork arguments in standard elements. A script
65+
- :pull:`919` - Declaration of keys via keyword arguments in standard elements. A script
6666
has been added to automatically convert old usages where possible.
6767

6868

@@ -590,7 +590,7 @@ v0.35.2
590590
This release includes several bug fixes. The most significant of which is the ability to
591591
change the type of an element in the try (i.e. to and from being a component) without
592592
getting an error. Originally the errors were introduced because it was though changing
593-
element type would not be desireable. This was not the case though - swapping types
593+
element type would not be desirable. This was not the case though - swapping types
594594
turns out to be quite common and useful.
595595

596596
**Closed Issues**

docs/source/guides/adding-interactivity/components-with-state/_examples/adding_state_variable/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
{
4545
"name": "Terracotta Army",
4646
"artist": "Unknown Artist",
47-
"description": "The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consited of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.",
47+
"description": "The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.",
4848
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/2015-09-22-081415_-_Terrakotta-Armee%2C_Grosse_Halle.jpg/1920px-2015-09-22-081415_-_Terrakotta-Armee%2C_Grosse_Halle.jpg",
4949
"alt": "12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor."
5050
},

docs/source/guides/adding-interactivity/components-with-state/_examples/isolated_state/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
{
4545
"name": "Terracotta Army",
4646
"artist": "Unknown Artist",
47-
"description": "The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consited of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.",
47+
"description": "The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.",
4848
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/2015-09-22-081415_-_Terrakotta-Armee%2C_Grosse_Halle.jpg/1920px-2015-09-22-081415_-_Terrakotta-Armee%2C_Grosse_Halle.jpg",
4949
"alt": "12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor."
5050
},

docs/source/guides/adding-interactivity/components-with-state/_examples/multiple_state_variables/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
{
4545
"name": "Terracotta Army",
4646
"artist": "Unknown Artist",
47-
"description": "The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consited of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.",
47+
"description": "The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.",
4848
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/2015-09-22-081415_-_Terrakotta-Armee%2C_Grosse_Halle.jpg/1920px-2015-09-22-081415_-_Terrakotta-Armee%2C_Grosse_Halle.jpg",
4949
"alt": "12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor."
5050
},

docs/source/guides/adding-interactivity/components-with-state/_examples/when_variables_are_not_enough/data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
{
4545
"name": "Terracotta Army",
4646
"artist": "Unknown Artist",
47-
"description": "The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consited of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.",
47+
"description": "The Terracotta Army is a collection of terracotta sculptures depicting the armies of Qin Shi Huang, the first Emperor of China. The army consisted of more than 8,000 soldiers, 130 chariots with 520 horses, and 150 cavalry horses.",
4848
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/9/9a/2015-09-22-081415_-_Terrakotta-Armee%2C_Grosse_Halle.jpg/1920px-2015-09-22-081415_-_Terrakotta-Armee%2C_Grosse_Halle.jpg",
4949
"alt": "12 terracotta sculptures of solemn warriors, each with a unique facial expression and armor."
5050
},

docs/source/guides/adding-interactivity/dangers-of-mutability/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ Removing Set Items
531531
s.difference_update(values)
532532
s -= values # "in-place" operators mutate!
533533
534-
s.symetric_difference_update(values)
534+
s.symmetric_difference_update(values)
535535
s ^= values # "in-place" operators mutate!
536536
537537
s.intersection_update(values)
@@ -547,7 +547,7 @@ Removing Set Items
547547
s.difference(values)
548548
s - values
549549
550-
s.symetric_difference(values)
550+
s.symmetric_difference(values)
551551
s ^ values
552552
553553
s.intersection(values)

0 commit comments

Comments
 (0)