Merge branch 'dev' of https://github.com/uiwjs/react-native-uiw into dev

uiwjs · Apr 6, 2023 · c5a8d4c · c5a8d4c
2 parents ca54fbc + 66e2cf3
commit c5a8d4c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/build_ios_app.yml b/.github/workflows/build_ios_app.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - run: yarn install
       - run: npm run build

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
 
       - run: yarn install
       - run: npm run build

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -76,6 +76,6 @@
     "@babel/preset-typescript": "~7.18.6"
   },
   "engines": {
-    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+    "node": ">=16.0.0"
   }
 }
diff --git a/packages/core/src/Tabs/TabsItem.tsx b/packages/core/src/Tabs/TabsItem.tsx
@@ -42,7 +42,7 @@ export interface TabsItemProps {
 }
 
 function TabsItem(props: TabsItemProps) {
-  const { activeColor, icon, index, value, onChange, defaultColor, children } = props;
+  const { activeColor, icon, index, value, onChange, defaultColor } = props;
   const opacity = useRef(new Animated.Value(0)).current;
 
   useEffect(() => {

diff --git a/packages/core/src/Tabs/index.tsx b/packages/core/src/Tabs/index.tsx
@@ -1,6 +1,7 @@
 import React, { useRef, useEffect, useState } from 'react';
-import { StyleSheet, SafeAreaView, StatusBar, ScrollView, ViewProps, View, ViewStyle, Dimensions } from 'react-native';
-
+import { StyleSheet, SafeAreaView, ScrollView, ViewProps, View, ViewStyle, Dimensions } from 'react-native';
+import { useTheme } from '@shopify/restyle';
+import { Theme } from '../theme';
 import Item from './TabsItem';
 
 export interface TabsProps extends ViewProps {
@@ -15,7 +16,15 @@ export interface TabsProps extends ViewProps {
 }
 
 function Tabs(props: TabsProps) {
-  const { style, children, onChange, activeColor, value, defaultColor = '#035bb6' } = props;
+  const theme = useTheme<Theme>();
+  const {
+    style,
+    children,
+    onChange,
+    activeColor,
+    value,
+    defaultColor = theme.colors.primary_background || '#3578e5',
+  } = props;
   const scrollViewRef = useRef<ScrollView>(null);
   const [scrollViewWidth, setScrollViewWidth] = useState<number>(Dimensions.get('window').width);
 

diff --git a/packages/core/src/index.tsx b/packages/core/src/index.tsx
@@ -1,5 +1,6 @@
 import theme from './theme';
 import ThemeProvider from './theme-provider';
+import type { Theme } from './theme';
 
 export { default as Avatar } from './Avatar';
 export * from './Avatar';
@@ -159,3 +160,4 @@ export * from './Typography/Em';
 export * from './Typography/RnText';
 
 export { theme, ThemeProvider };
+export type { Theme };