fix(Tree):自适应高度调整

panbibi · panbibi · commit b58042a5579c · 2023-04-17T17:47:41.000+08:00
diff --git a/example/examples/src/routes/ActionSheet/index.tsx b/example/examples/src/routes/ActionSheet/index.tsx
@@ -33,7 +33,7 @@ export default class Index extends Component<IndexProps, IndexState> {
       <Container>
         <Layout>
           <Header title={title} description={description} />
-          <Body>
+          <Body style={{paddingLeft: 16, paddingRight: 16}}>
             <View style={styles.divider} />
             <Button onPress={this.onOpen}>打开 ActionSheet</Button>
             <ActionSheet
diff --git a/packages/core/src/Calendar/show.tsx b/packages/core/src/Calendar/show.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
-import { View, Text, ViewProps, StyleSheet } from 'react-native';
+import { View, ViewProps, StyleSheet } from 'react-native';
 // import Icon from '../Icon';
+import Text from '../Typography/Text';
 
 export interface ShowProps extends ViewProps {
   iconColor?: string;
diff --git a/packages/core/src/Tree/components/useTree.ts b/packages/core/src/Tree/components/useTree.ts
@@ -1,12 +1,11 @@
 import { useEffect, useRef, useState } from 'react';
 import { useLatest } from '../../utils/hooks';
-import { deviceHeight } from '../util';
 import { EntityNode, EventDataNode, FlattenNode, TreeProps } from '../type';
 import { arrAdd, arrDel, conductCheck, flattenTreeData, getTreeNodeLevel } from '../util';
 
 export function useTree(props: TreeProps) {
   const {
-    height = deviceHeight,
+    height,
     treeData = [],
     disabled = false,
     onExpand,
diff --git a/packages/core/src/Tree/util.ts b/packages/core/src/Tree/util.ts
@@ -243,29 +243,3 @@ export function conductCheck(
   }
   return [];
 }
-
-const { width, height } = Dimensions.get('window');
-
-/** design based on iphone6 */
-const defaultPixelRatio = 1;
-const designWidth = 375;
-const designHeight = 667;
-
-// px转换成dp
-const dpWidth = designWidth / defaultPixelRatio;
-const dpHeight = designHeight / defaultPixelRatio;
-
-//获取缩放比例
-const scale = Math.min(height / dpHeight, width / dpWidth);
-
-export const deviceWidth = width;
-export const deviceHeight = height;
-export const ONE_PIXEL = StyleSheet.hairlineWidth;
-
-/**
- * 适配屏幕大小和像素密度的公共方法
- * @param size 设计稿大小
- */
-export const px = (size: number) => {
-  return PixelRatio.roundToNearestPixel(size * scale);
-};
