fix(Progress) 优化Progress组件示例展示和解决test报错

hy · hy · commit 0bfdf774662b · 2023-04-17T14:02:13.000+08:00
diff --git a/example/examples/src/routes/Progress/index.tsx b/example/examples/src/routes/Progress/index.tsx
@@ -26,9 +26,9 @@ const ProgressDemo = (props: any) => {
       <Header title={title} description={description} />
       <Body style={{ paddingLeft: 16, paddingRight: 16 }}>
         <Card title="基础实例">
-          <Progress type='circle' />
+          <Progress type='circle' value={60} />
           <Spacing />
-          <Progress type='line' />
+          <Progress type='line' value={60} />
         </Card>
         <Card title="自定义值">
           <Progress type='circle' value={val} />
@@ -38,28 +38,28 @@ const ProgressDemo = (props: any) => {
           <Button onPress={() => onPress()} >你点我呀！</Button>
         </Card>
         <Card title="自定义渐变色">
-          <Progress type='circle' color={['#FFD080', 'red']} />
+          <Progress type='circle' color={['#FFD080', 'red']} value={80} />
           <Spacing />
-          <Progress type='line' color={['#FFD080', 'red']} />
+          <Progress type='line' color={['red', '#FFD080',]} value={80} />
         </Card>
         <Card title="设置大小">
-          <Progress type='circle' width={60} left='6.5%' />
+          <Progress type='circle' width={60} left='6.5%' value={10} />
           <Spacing />
-          <Progress type='circle' width={80} left='8.5%' />
+          <Progress type='circle' width={80} left='8.5%' value={20} />
           <Spacing />
-          <Progress type='line' width={60} />
+          <Progress type='line' width={60} value={40} />
           <Spacing />
-          <Progress type='line' width={80} />
+          <Progress type='line' width={80} value={60} />
         </Card>
         <Card title="是否显示单位">
-          <Progress type='circle' showUnit={false} left='12.5%' />
+          <Progress type='circle' showUnit={false} left='13%' value={20} />
           <Spacing />
-          <Progress type='line' showUnit={false} />
+          <Progress type='line' showUnit={false} value={40} />
         </Card>
         <Card title="自定义单色">
-          <Progress type='circle' color='#FFD080' />
+          <Progress type='circle' color='#FFD080' value={50} />
           <Spacing />
-          <Progress type='line' color='#FFD080' />
+          <Progress type='line' color='#FFD080' value={60} />
         </Card>
         <Card title="自定义背景色">
           <Progress type='circle' bgColor="#FFD080" value={5} />
diff --git a/test-ci/src/__tests__/progress.tsx b/test-ci/src/__tests__/progress.tsx
@@ -5,29 +5,12 @@
 import 'react-native';
 import React from 'react';
 import Progress from '../lib/Progress';
-// Note: test renderer must be required after react-native.
 import renderer from 'react-test-renderer';
-import { run } from '../lib/Progress/svg';
 
 it('Progress', () => {
   const component = renderer.create(
-    <Progress
-      progress={30}
-      position="fixed"
-      progressColor="#108ee9"
-      animation={{ duration: 1000 }}
-      xml={run}
-      iconShow={true}
-      size={25}
-      progressShow={true}
-    />,
+    <Progress type='line' value={60} />,
   );
-  expect(component.root.props.progress).toBe(30);
-  expect(component.root.props.position).toBe('fixed');
-  expect(component.root.props.progressColor).toBe('#108ee9');
-  expect(component.root.props.animation.duration).toBe(1000);
-  expect(component.root.props.iconShow).toBeTruthy();
-  expect(component.root.props.xml).toStrictEqual(run);
-  expect(component.root.props.size).toBe(25);
-  expect(component.root.props.progressShow).toBeTruthy();
+  expect(component.root.props.type).toBe('line');
+  expect(component.root.props.value).toBe(60);
 });
