fix resolve conflict

Author: ff

packages/core/src/Button/index.tsx

@@ -123,9 +123,9 @@ export default class ButtonView<T> extends React.Component<ButtonProps> {
       sizeStyle = styles[size];
     }
     let boxStyle = {};
-    const stylKey = `${size}Box` as keyof typeof styles;
-    if (size && styles[stylKey]) {
-      boxStyle = styles[stylKey];
+    const styleKey = `${size}Box` as keyof typeof styles;
+    if (size && styles[styleKey]) {
+      boxStyle = styles[styleKey];
     }
     if (!children) {
       return null;

test-ci/package.json

@@ -19,29 +19,29 @@
     "@react-native-community/eslint-config": "^2.0.0",
     "@testing-library/react-native": "^11.5.0",
     "@tsconfig/react-native": "^2.0.2",
-    "@types/color": "~3.0.3",
     "@types/jest": "^26.0.23",
-    "@types/lodash": "4.14.172",
     "@types/react": "^18.0.21",
     "@types/react-native": "^0.70.6",
     "@types/react-test-renderer": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
+    "babel-jest": "^26.6.3",
+    "eslint": "^7.32.0",
+    "jest": "^26.6.3",
+    "metro-react-native-babel-preset": "0.72.3",
+    "react-test-renderer": "18.1.0",
+    "typescript": "^4.8.3",
+    "@types/color": "~3.0.3",
+    "@types/lodash": "4.14.172",
     "@uiw/icons": "2.5.3",
     "@validator.tool/hook": "2.2.4",
     "ahooks": "2.10.14",
-    "babel-jest": "^26.6.3",
     "color": "4.2.3",
-    "eslint": "^7.32.0",
-    "jest": "^26.6.3",
     "lodash": "4.17.21",
-    "metro-react-native-babel-preset": "0.72.3",
     "prop-types": "15.7.2",
     "react-native-gesture-handler": "2.8.0",
     "react-native-root-siblings": "4.1.1",
-    "react-native-svg": "12.1.1",
-    "react-test-renderer": "18.1.0",
-    "typescript": "^4.8.3"
+    "react-native-svg": "12.1.1"
   },
   "jest": {
     "preset": "react-native",
@@ -54,4 +54,4 @@
       "node"
     ]
   }
-}
+}