ifx:pull master

ChenlingasMx · ChenlingasMx · commit 916e625c1430 · 2021-10-16T10:42:09.000+08:00
diff --git a/example/base/package.json b/example/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@example/base",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -10,7 +10,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@uiw/react-native": "2.10.0",
+    "@uiw/react-native": "2.10.1",
     "react": "17.0.2",
     "react-native": "0.65.1",
     "react-native-svg": "12.1.1"
diff --git a/example/examples/package.json b/example/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "examples",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -14,7 +14,7 @@
     "@react-native-picker/picker": "2.1.0",
     "@react-navigation/native": "6.0.4",
     "@react-navigation/stack": "6.0.9",
-    "@uiw/react-native": "2.10.0",
+    "@uiw/react-native": "2.10.1",
     "react": "17.0.2",
     "react-native": "0.65.1",
     "react-native-gesture-handler": "1.10.3",
diff --git a/example/examples/src/routes/Rating/index.tsx b/example/examples/src/routes/Rating/index.tsx
@@ -35,8 +35,10 @@ export default class Index extends Component<IndexProps, IndexState> {
             <Rating
               defaultRating={2}
               resultRating={10}
-              icon={[<Icon name="star-off" />, <Icon name="star-on" />]}
-              // icon={["star-off", "star-on"]}
+              icon={{
+                unactived: <Icon name="star-off" />,
+                actived: <Icon name="star-on" />,
+              }}
               onPress={console.log}
             />
             <View style={styles.divider} />
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.10.0",
+  "version": "2.10.1",
   "packages": ["example/*", "packages/*", "website"],
   "npmClient": "yarn",
   "npmClientArgs": ["--production", "--no-optional"],
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uiw/react-native",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "UIW for React Native",
   "homepage": "https://uiwjs.github.io/react-native-uiw/",
   "main": "lib/index.js",
diff --git a/packages/core/src/Drawer/README.md b/packages/core/src/Drawer/README.md
@@ -57,7 +57,7 @@ function Demo() {
 ## 注意事项 - 抽屉高度是页面有效高度
 
 ```jsx
-import { Fragment } from 'react';
+import { Fragment, useState } from 'react';
 import { View, Text, SafeAreaView } from 'react-native';
 import { Drawer, Button } from '@uiw/react-native';
 
@@ -101,7 +101,7 @@ export default () => {
 
 
 // 在使用组件页面
-import { Fragment } from 'react';
+import { Fragment, useState } from 'react';
 import { View, Text, SafeAreaView } from 'react-native';
 import { Drawer, Button } from '@uiw/react-native';
 import {RootSiblingPortal} from 'react-native-root-siblings';
diff --git a/packages/core/src/Rating/README.md b/packages/core/src/Rating/README.md
@@ -57,8 +57,11 @@ export interface RatingProps {
   size?: number;
   /** icon 颜色 */
   color?: string;
-  /** [未选中, 已选中] */
-  icon?: icoType;
+  /** actived 激活 unactived 未激活 */
+  icon?: {
+    actived?: TabsItemIconTypes,
+    unactived?: TabsItemIconTypes
+  };
   /**
    * void
    * @param score type: number 选中几个
diff --git a/packages/core/src/Rating/index.tsx b/packages/core/src/Rating/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, StyleSheet, Text, TouchableOpacity } from 'react-native';
+import { View, StyleSheet, TouchableOpacity } from 'react-native';
 
 import Icon, { IconsName } from '../Icon';
 import { TabsItemIconTypes } from '../Tabs/TabsItem';
@@ -14,8 +14,11 @@ export interface RatingProps {
   size?: number;
   /** icon 颜色 */
   color?: string;
-  /** [未选中, 已选中] */
-  icon?: icoType;
+  /** actived 激活 unactived 未激活 */
+  icon?: {
+    actived?: TabsItemIconTypes;
+    unactived?: TabsItemIconTypes;
+  };
   /**
    * void
    * @param score type: number 得到几分
@@ -35,8 +38,8 @@ export interface RatingState {
 export default class Rating extends React.Component<RatingProps, RatingState> {
   constructor(props: RatingProps) {
     super(props);
-    let start = (props.icon && props.icon[0]) || 'star-off';
-    let end = (props.icon && props.icon[1]) || 'star-on';
+    let start = (props.icon && props.icon.unactived) || 'star-off';
+    let end = (props.icon && props.icon.actived) || 'star-on';
     this.state = {
       defaultRating: props.defaultRating || 0,
       resultRating: props.resultRating || 5,
diff --git a/packages/core/src/SegmentedControl/README.md b/packages/core/src/SegmentedControl/README.md
@@ -85,4 +85,3 @@ function Demo() {
 |------|------|-----|------|
 | `actived` | 激活 | String | `#fff` |
 | `unactived` | 未激活 | String | `color` |
-```ts
diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uiw/react-native-doc",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "license": "MIT",
   "homepage": "https://uiwjs.github.io/react-native-uiw/",
   "repository": {
diff --git a/website/package.json b/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "website",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "Documentation site for React Native UIW.",
   "private": true,
   "scripts": {
@@ -17,7 +17,7 @@
     "@rematch/loading": "2.1.1",
     "@uiw/react-code-preview": "2.1.4",
     "@uiw/react-markdown-preview": "3.4.0",
-    "@uiw/react-native": "2.10.0",
+    "@uiw/react-native": "2.10.1",
     "@uiw/react-native-template": "2.1.4",
     "@uiw/reset.css": "1.0.5",
     "react": "17.0.2",
diff --git a/website/src/pages/components/table/index.tsx b/website/src/pages/components/table/index.tsx
@@ -0,0 +1,11 @@
+import Markdown, { importAll } from '../../../component/Markdown';
+
+export default class Page extends Markdown {
+  path = '/packages/core/src/Table/README.md';
+  getMarkdown = async () => {
+    const md = await import('@uiw/react-native/lib/Table/README.md');
+    // 支持 markdown 中，相对于当前 index.tsx 相对路径引入图片资源
+    importAll((require as any).context('./', true, /\.(png|gif|jpg|svg)$/), this.imageFiles);
+    return md.default || md;
+  };
+}
diff --git a/website/src/routes/menus.ts b/website/src/routes/menus.ts
@@ -9,6 +9,7 @@ export const componentMenus: MenuData[] = [
   { divider: true, name: 'Layout' },
   { path: '/components/divider', name: 'Divider 分割线' },
   { path: '/components/flex', name: 'Flex 布局' },
+  { path: '/components/table', name: 'Table 表格' },
   { path: '/components/spacing', name: 'Spacing 间距' },
   { path: '/components/winblank', name: 'WingBlank 两翼留白' },
   { divider: true, name: 'Navigation' },
diff --git a/website/src/routes/router.tsx b/website/src/routes/router.tsx
@@ -78,6 +78,9 @@ export const getRouterData = {
   '/components/flex': {
     component: dynamicWrapper([], () => import('../pages/components/flex')),
   },
+  '/components/table': {
+    component: dynamicWrapper([], () => import('../pages/components/table')),
+  },
   '/components/spacing': {
     component: dynamicWrapper([], () => import('../pages/components/spacing')),
   },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "2.10.0",`
	`2`	`+ "version": "2.10.1",`
`3`	`3`	`"packages": ["example/", "packages/", "website"],`
`4`	`4`	`"npmClient": "yarn",`
`5`	`5`	`"npmClientArgs": ["--production", "--no-optional"],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@uiw/react-native",`
`3`		`- "version": "2.10.0",`
	`3`	`+ "version": "2.10.1",`
`4`	`4`	`"description": "UIW for React Native",`
`5`	`5`	`"homepage": "https://uiwjs.github.io/react-native-uiw/",`
`6`	`6`	`"main": "lib/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@uiw/react-native-doc",`
`3`		`- "version": "2.10.0",`
	`3`	`+ "version": "2.10.1",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"homepage": "https://uiwjs.github.io/react-native-uiw/",`
`6`	`6`	`"repository": {`