Skip to content

Commit 593f2ba

Browse files
author
huyi
committed
Merge branch 'dev' of github.com:uiwjs/react-native-uiw into dev
2 parents 5841927 + e09d62e commit 593f2ba

File tree

25 files changed

+410
-136
lines changed

25 files changed

+410
-136
lines changed

‎example/examples/ios/Podfile.lock

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ PODS:
284284
- React-jsinspector (0.69.7)
285285
- React-logger (0.69.7):
286286
- glog
287+
- react-native-cameraroll (5.3.1):
288+
- React-Core
289+
- react-native-image-picker (5.3.1):
290+
- React-Core
287291
- react-native-safe-area-context (4.3.4):
288292
- RCT-Folly
289293
- RCTRequired
@@ -413,6 +417,8 @@ DEPENDENCIES:
413417
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
414418
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
415419
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
420+
- "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
421+
- react-native-image-picker (from `../node_modules/react-native-image-picker`)
416422
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
417423
- React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
418424
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
@@ -489,6 +495,10 @@ EXTERNAL SOURCES:
489495
:path: "../node_modules/react-native/ReactCommon/jsinspector"
490496
React-logger:
491497
:path: "../node_modules/react-native/ReactCommon/logger"
498+
react-native-cameraroll:
499+
:path: "../node_modules/@react-native-camera-roll/camera-roll"
500+
react-native-image-picker:
501+
:path: "../node_modules/react-native-image-picker"
492502
react-native-safe-area-context:
493503
:path: "../node_modules/react-native-safe-area-context"
494504
React-perflogger:
@@ -559,6 +569,8 @@ SPEC CHECKSUMS:
559569
React-jsiexecutor: a73bec0218ba959fc92f811b581ad6c2270c6b6f
560570
React-jsinspector: 8134ee22182b8dd98dc0973db6266c398103ce6c
561571
React-logger: 1e7ac909607ee65fd5c4d8bea8c6e644f66b8843
572+
react-native-cameraroll: f3050460fe1708378698c16686bfaa5f34099be2
573+
react-native-image-picker: ec9b713e248760bfa0f879f0715391de4651a7cb
562574
react-native-safe-area-context: dfe5aa13bee37a0c7e8059d14f72ffc076d120e9
563575
React-perflogger: 8e832d4e21fdfa613033c76d58d7e617341e804b
564576
React-RCTActionSheet: 9ca778182a9523991bff6381045885b6e808bb73
@@ -580,6 +592,6 @@ SPEC CHECKSUMS:
580592
Yoga: 0b84a956f7393ef1f37f3bb213c516184e4a689d
581593
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
582594

583-
PODFILE CHECKSUM: 36745b97236db17730b2d687b78fe071003a4a52
595+
PODFILE CHECKSUM: d4d2826c3f25f928be9b489778a443d49118b6c5
584596

585597
COCOAPODS: 1.11.3

‎example/examples/src/routes.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,8 @@ export const stackPageData: Routes[] = [
446446
name: 'Tree',
447447
component: require('./routes/Tree').default,
448448
params: {
449-
title: 'Tree 树形展示',
450-
description: '树形展示',
449+
title: 'Tree 树形控件',
450+
description: '树形控件',
451451
},
452452
},
453453
{

‎example/examples/src/routes/ActionSheet/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default class Index extends Component<IndexProps, IndexState> {
3333
<Container>
3434
<Layout>
3535
<Header title={title} description={description} />
36-
<Body>
36+
<Body style={{paddingLeft: 16, paddingRight: 16}}>
3737
<View style={styles.divider} />
3838
<Button onPress={this.onOpen}>打开 ActionSheet</Button>
3939
<ActionSheet

‎example/examples/src/routes/Modal/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, {Component} from 'react';
2-
import {View, Text, SafeAreaView} from 'react-native';
3-
import {Modal, Button, Radio} from '@uiw/react-native';
2+
import {View, SafeAreaView} from 'react-native';
3+
import {Modal, Button, Radio, Text} from '@uiw/react-native';
44
import Layout, {Container} from '../../Layout';
55
import {ComProps} from '../../routes';
66

‎example/examples/src/routes/Tree/index.tsx

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
import React from 'react';
2-
import {Tree, DragDrawer, Icon} from '@uiw/react-native';
2+
import {View, ScrollView} from 'react-native';
3+
import {Tree, Button, Text, Modal} from '@uiw/react-native';
34
import {ComProps} from '../../routes';
45
import Layout, {Container} from '../../Layout';
5-
const {Header, Body} = Layout;
6+
const {Header, Body, Card} = Layout;
67

78
export interface TreeViewProps extends ComProps {}
89

910
export default class TreeDemo extends React.Component<TreeViewProps> {
11+
state = {
12+
visible: false,
13+
value: undefined,
14+
};
1015
render() {
1116
const {route} = this.props;
1217
const description = route.params.description;
@@ -57,13 +62,17 @@ export default class TreeDemo extends React.Component<TreeViewProps> {
5762
<Header title={title} description={description} />
5863
<React.Fragment>
5964
<Body style={{paddingLeft: 16, paddingRight: 16}}>
60-
<Tree
61-
treeData={option}
62-
defaultExpandAll
63-
onCheck={e => {
64-
console.log(e);
65-
}}
66-
/>
65+
<Card title="基本使用">
66+
<Button onPress={() => this.setState({visible: true})}>打开</Button>
67+
<Modal visible={this.state.visible} placement="bottom" onClosed={() => this.setState({visible: false})}>
68+
<ScrollView style={{height: 500}}>
69+
<Tree treeData={option} defaultExpandAll />
70+
</ScrollView>
71+
</Modal>
72+
</Card>
73+
<Card title="树形选择">
74+
<Tree treeData={option} defaultExpandAll />
75+
</Card>
6776
</Body>
6877
</React.Fragment>
6978
</Layout>

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"lib:watch:test": "lerna exec --scope @uiw/react-native -- tsbb watch --disable-babel-option --no-esm --cjs ../../test-ci/src/lib",
2222
"test": "cd ./test-ci && npm run test",
2323
"⬆️⬆️⬆️⬆️⬆️ test-ci ⬆️⬆️⬆️⬆️⬆️": "▲▲▲▲▲ example::base ▲▲▲▲▲",
24-
"watch": "npm run lib:watch & npm run lib:watch:base & npm run lib:watch:examples & npm run lib:watch:test && npm run watch:doc & npm run lib:watch:image-picker & npm run lib:watch:examples:image-picker & npm run lib:watch:base:image-picker",
25-
"build": "npm run lib:build && npm run lib:build:base && npm run lib:build:examples && npm run lib:build:test && npm run build:doc & npm run lib:build:image-picker & npm run lib:build:examples:image-picker & npm run lib:build:base:image-picker",
24+
"watch": "npm run lib:watch & npm run lib:watch:base & npm run lib:watch:examples & npm run lib:watch:test & npm run watch:doc & npm run lib:watch:image-picker & npm run lib:watch:examples:image-picker & npm run lib:watch:base:image-picker",
25+
"build": "npm run lib:build && npm run lib:build:base && npm run lib:build:examples && npm run lib:build:test && npm run build:doc && npm run lib:build:image-picker && npm run lib:build:examples:image-picker && npm run lib:build:base:image-picker",
2626
">>>>>>>": ">>>>>>>",
2727
"lib:build": "lerna exec --scope @uiw/react-native -- tsbb build --disable-babel-option --no-esm",
2828
"lib:watch": "lerna exec --scope @uiw/react-native -- tsbb watch --disable-babel-option --no-esm",
@@ -65,7 +65,7 @@
6565
"typescript": "^4.7.4"
6666
},
6767
"resolutions": {
68-
"react":"18.0.0",
68+
"react": "18.0.0",
6969
"react-dom": "18.0.0"
7070
},
7171
"workspaces": {

‎packages/core/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ yarn add @uiw/react-native react-native-svg@12.1.1 react-native-root-siblings@4.
5050

5151
```jsx
5252
//...其他import
53-
import { ThemeProvider } from '@td-design/react-native';
53+
import { ThemeProvider } from '@uiw/react-native';
5454

5555
const App = () => {
5656
return <ThemeProvider>{/** 其他Provider */}</ThemeProvider>;

‎packages/core/src/ActionSheet/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Theme } from '../theme';
77
import { useTheme } from '@shopify/restyle';
88

99
let MainWidth = Dimensions.get('window').width;
10-
1110
export interface DividerStyle {
1211
itemDivider?: StyleProp<ViewStyle>;
1312
actionDivider?: StyleProp<ViewStyle>;

‎packages/core/src/Calendar/show.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
2-
import { View, Text, ViewProps, StyleSheet } from 'react-native';
2+
import { View, ViewProps, StyleSheet } from 'react-native';
33
// import Icon from '../Icon';
4+
import Text from '../Typography/Text';
45

56
export interface ShowProps extends ViewProps {
67
iconColor?: string;

‎packages/core/src/Ellipsis/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { Text, TextProps } from 'react-native';
3+
import { TextProps } from 'react-native';
4+
import Text from '../Typography/Text';
45

56
export interface EllipsisProps extends TextProps {
67
children?: React.ReactNode;

0 commit comments

Comments
 (0)