fix: 处理冲突

uiwjs · May 4, 2023 · bda1f5b · bda1f5b
2 parents ad9a921 + d1745d0
commit bda1f5b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 131 deletions.
diff --git a/example/base/package.json b/example/base/package.json
@@ -34,4 +34,4 @@
   "jest": {
     "preset": "react-native"
   }
-}
+}
diff --git a/example/examples/package.json b/example/examples/package.json
@@ -23,8 +23,7 @@
     "react-native-image-viewing": "~0.2.2",
     "react-native-safe-area-context": "~4.3.1",
     "react-native-screens": "~3.15.0",
-    "react-native-svg": "13.9.0",
-    "react-native-reanimated":"3.1.0"
+    "react-native-svg": "13.9.0"
   },
   "devDependencies": {
     "@babel/core": "~7.20.7",
@@ -54,4 +53,4 @@
       "node"
     ]
   }
-}
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -65,9 +65,7 @@
     "prop-types": "15.7.2",
     "react-native-gesture-handler": "2.8.0",
     "react-native-root-siblings": "4.1.1",
-    "react-native-svg": "13.9.0",
-    "react-native-safe-area-context":"4.5.1",
-    "react-native-reanimated":"3.1.0"
+    "react-native-svg": "13.9.0"
   },
   "peerDependencies": {
     "react": ">=16.9.0",
@@ -81,4 +79,4 @@
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}
diff --git a/packages/core/src/ImageHeader/AnimateHeader.tsx b/packages/core/src/ImageHeader/AnimateHeader.tsx
diff --git a/packages/core/src/ImageHeader/index.tsx b/packages/core/src/ImageHeader/index.tsx
@@ -8,7 +8,6 @@ import Flex from '../Flex';
 import Icon from '../Icon';
 import WingBlank from '../WingBlank';
 import helpers from './helpers';
-// import AnimateHeader from './AnimateHeader';
 
 const { px, isIOS } = helpers;
 export type ImageHeaderProps = PropsWithChildren<{
@@ -97,6 +96,3 @@ const ImageHeader: FC<ImageHeaderProps> = (props) => {
   );
 };
 export default ImageHeader;
-// ImageHeader.displayName = 'ImageHeader';
-
-// export default Object.assign(ImageHeader, { AnimateHeader });
diff --git a/packages/core/src/Picker/components/WheelPicker/WheelPickerItem.tsx b/packages/core/src/Picker/components/WheelPicker/WheelPickerItem.tsx
@@ -49,8 +49,9 @@ function WheelPickerItem({ textStyle, style, visibleRest, height, option, index,
     </Animated.View>
   );
 }
-export default memo(WheelPickerItem, () => true);
-
+export default memo(WheelPickerItem, (prevProps, nextProps) => {
+  return prevProps.option === nextProps.option;
+});
 const styles = StyleSheet.create({
   option: {
     alignItems: 'center',

diff --git a/packages/react-native-image-picker/package.json b/packages/react-native-image-picker/package.json
@@ -21,7 +21,7 @@
     "src",
     "README.md"
   ],
-  "publishConfig":{
+  "publishConfig": {
     "access": "public"
   },
   "dependencies": {
@@ -50,4 +50,4 @@
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}
diff --git a/website/package.json b/website/package.json
@@ -76,4 +76,4 @@
       "last 1 safari version"
     ]
   }
-}
+}