Skip to content

Commit d32bfa4

Browse files
ChenlingasMxChenlingasMx
committed
fix:pull @uiw/react-native master
2 parents 27cbd6d + 147e328 commit d32bfa4

File tree

14 files changed

+98
-36
lines changed

14 files changed

+98
-36
lines changed

‎example/base/App.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*/
88

99
import React from 'react';
10-
import type {Node} from 'react';
1110
import {
1211
SafeAreaView,
1312
ScrollView,
@@ -26,7 +25,7 @@ import {
2625
ReloadInstructions,
2726
} from 'react-native/Libraries/NewAppScreen';
2827

29-
const Section = ({children, title}): Node => {
28+
const Section = ({children, title}) => {
3029
const isDarkMode = useColorScheme() === 'dark';
3130
return (
3231
<View style={styles.sectionContainer}>
@@ -52,7 +51,7 @@ const Section = ({children, title}): Node => {
5251
);
5352
};
5453

55-
const App: () => Node = () => {
54+
const App = () => {
5655
const isDarkMode = useColorScheme() === 'dark';
5756

5857
const backgroundStyle = {

‎example/base/README.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
https://medium.com/@huntie/a-concise-guide-to-configuring-react-native-with-yarn-workspaces-d7efa71b6906
1+
Base Example
22

3-
https://gist.github.com/huntie/85ea491763b444bfa1bdc8e997fc2765#file-package-json-L12-L21
3+
```bash
4+
cd ios
5+
6+
pod install && cd ..
7+
8+
npm run ios
9+
```

‎example/base/ios/AwesomeProject.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎example/base/ios/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ SPEC CHECKSUMS:
449449
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
450450
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
451451
FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
452-
FBReactNativeSpec: 530c73e3d695cdd6f15574118a53a9b7b23fd36c
452+
FBReactNativeSpec: 3c8b727e8d4352e56f6ffb6336123f162f54993d
453453
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
454454
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
455455
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c

‎example/base/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@example/base",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"private": true,
55
"scripts": {
66
"android": "react-native run-android",
@@ -10,8 +10,10 @@
1010
"lint": "eslint ."
1111
},
1212
"dependencies": {
13+
"@uiw/react-native": "^2.0.3",
1314
"react": "17.0.1",
14-
"react-native": "0.64.2"
15+
"react-native": "0.64.2",
16+
"react-native-svg": "12.1.1"
1517
},
1618
"devDependencies": {
1719
"@babel/core": "7.14.8",

‎lerna.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
{
2-
"version": "1.0.0",
3-
"packages": ["example/*", "packages/*", "website"],
2+
"version": "2.0.3",
3+
"packages": [
4+
"example/*",
5+
"packages/*",
6+
"website"
7+
],
48
"npmClient": "yarn",
5-
"npmClientArgs": ["--production", "--no-optional"],
9+
"npmClientArgs": [
10+
"--production",
11+
"--no-optional"
12+
],
613
"useWorkspaces": true
714
}

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@uiw/react-native",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"description": "UIW for React Native",
55
"main": "lib/index.js",
66
"scripts": {},

‎packages/docs/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"name": "@uiw/react-native-doc",
3-
"version": "2.0.2",
4-
"files": ["doc"]
3+
"version": "2.0.3",
4+
"files": [
5+
"doc"
6+
]
57
}

‎website/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "website",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"description": "Documentation site for React Native UIW.",
55
"private": true,
66
"scripts": {
@@ -13,20 +13,20 @@
1313
},
1414
"license": "MIT",
1515
"dependencies": {
16-
"@uiw/reset.css": "1.0.4",
17-
"@uiw/react-native": "2.0.2",
18-
"@uiw/react-code-preview": "1.11.13",
19-
"@uiw/react-markdown-preview": "3.1.3",
2016
"@rematch/core": "2.0.1",
2117
"@rematch/loading": "2.0.1",
22-
"rehype-attr": "1.4.1",
18+
"@uiw/react-code-preview": "1.11.13",
19+
"@uiw/react-markdown-preview": "3.1.3",
20+
"@uiw/react-native": "^2.0.3",
21+
"@uiw/reset.css": "1.0.4",
2322
"react": "17.0.2",
2423
"react-dom": "17.0.2",
2524
"react-dynamic-loadable": "3.0.0",
26-
"react-redux": "7.2.4",
2725
"react-native": "0.64.2",
2826
"react-native-web": "0.17.1",
27+
"react-redux": "7.2.4",
2928
"react-router-dom": "5.2.0",
29+
"rehype-attr": "1.4.1",
3030
"uiw": "4.7.16"
3131
},
3232
"devDependencies": {

‎website/src/component/Contributors/index.module.less‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@
1414

1515
.avatar {
1616
padding-left: 12px;
17+
display: inline-flex;
1718
a {
1819
display: flex;
20+
& + a {
21+
margin-left: 5px;
22+
}
1923
}
2024
img {
2125
width: 21px;
26+
border-radius: 3px;
2227
}
2328
}

0 commit comments

Comments
 (0)