@ledvance/base 1.3.27 → 1.3.29

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.3.27",
+  "version": "1.3.29",
   "scripts": {
     "prepublishOnly": "python update-localazy.py"
   },

package/src/api/nativeEventEmitter.ts

@@ -3,7 +3,7 @@ import {
   DeviceInfo,
   GestureControlType,
   NativeProps,
-  setGestrueControlValues,
+  setGestureControlValues,
   setGroupDevices,
   setGroupDps,
   setGroupNativeProps,
@@ -131,7 +131,7 @@ export const addListener = (store) => {
   })
 
   gestrueControlListener = nativeEventEmitter.addListener('LDV_GESTURE_CONTROL_COMMAND', (event: GestureControlType) => {
-    store.dispatch(setGestrueControlValues(event))
+    store.dispatch(setGestureControlValues(event))
   })
 }
 

package/src/components/AdvanceList.tsx

@@ -77,4 +77,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default React.memo(AdvanceList)
+export default AdvanceList

package/src/components/BallDirectionView.tsx

@@ -181,4 +181,4 @@ const BallDirectionView = (props: BallDirectionProps) => {
     </View>)
 }
 
-export default withTheme(BallDirectionView)
+export default withTheme(BallDirectionView) as React.ComponentType<BallDirectionProps>

package/src/components/Card.tsx

@@ -38,4 +38,4 @@ const Card = (props: CardProps) => {
   )
 }
 
-export default withTheme(Card)
+export default withTheme(Card) as React.ComponentType<CardProps>

package/src/components/Cell.tsx

@@ -1,70 +1,78 @@
-import { IconFont, Utils } from 'tuya-panel-kit'
-import { StyleProp, Text, TextStyle, TouchableOpacity, View, ViewStyle } from 'react-native'
+import {IconFont, Utils} from 'tuya-panel-kit'
+import {StyleProp, Text, TextStyle, TouchableOpacity, View, ViewStyle} from 'react-native'
 import React from 'react'
+import ThemeType from "../config/themeType";
 
 const cx = Utils.RatioUtils.convertX
+const {withTheme} = Utils.ThemeUtils
 
 interface CellProps {
-    title: string,
-    value: string,
-    onPress: () => void,
-    style?: StyleProp<ViewStyle>
+  theme?: ThemeType
+  title: string,
+  value: string,
+  onPress: () => void,
+  style?: StyleProp<ViewStyle>
 }
 
-export default function Cell(props: CellProps) {
-    return (
-        <TouchableOpacity
-            style={[{
-                height: cx(50),
-                paddingHorizontal: cx(24),
-                justifyContent: 'center',
-            }, props.style]}
-            onPress={props.onPress}>
-            <CellContent title={props.title} value={props.value} />
-        </TouchableOpacity>
-    )
-}
+export default withTheme(function Cell(props: CellProps) {
+  return (
+    <TouchableOpacity
+      style={[{
+        height: cx(50),
+        paddingHorizontal: cx(24),
+        justifyContent: 'center',
+        backgroundColor: props.theme?.card.background,
+      }, props.style]}
+      onPress={props.onPress}>
+      <CellContent title={props.title} value={props.value}/>
+    </TouchableOpacity>
+  )
+}) as React.ComponentType<CellProps>
 
 interface CellContentProps {
-    title: string
-    value: string
-    style?: StyleProp<ViewStyle>
-    titleStyle?: StyleProp<TextStyle>
-    valueStyle?: StyleProp<TextStyle>
-    iconStyle?: { color?: any, size?: number }
+  theme?: ThemeType
+  title: string
+  value: string
+  style?: StyleProp<ViewStyle>
+  titleStyle?: StyleProp<TextStyle>
+  valueStyle?: StyleProp<TextStyle>
+  iconStyle?: { color?: any, size?: number }
+}
+
+const CellContentBase = (props: CellContentProps) => {
+  return (
+    <View
+      style={[
+        {flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center'},
+        props.style,
+      ]}>
+      <Text
+        style={[
+          {
+            fontSize: cx(14),
+            color: props.theme?.global.secondFontColor,
+            fontFamily: 'helvetica_neue_lt_std_roman',
+          },
+          props.titleStyle,
+        ]}>{props.title}</Text>
+      <View style={{flexDirection: 'row', alignItems: 'center'}}>
+        <Text style={[
+          {
+            fontSize: cx(14),
+            color: props.theme?.global.secondFontColor,
+            fontFamily: 'helvetica_neue_lt_std_roman',
+          },
+          props.valueStyle,
+        ]}>{props.value}</Text>
+        <View style={{width: cx(4)}}/>
+        <IconFont
+          name="arrow"
+          color={props.iconStyle?.color || props.theme?.global.secondFontColor}
+          size={props.iconStyle?.size || cx(11)}/>
+      </View>
+    </View>
+  )
 }
+const CellContent = withTheme(CellContentBase) as React.ComponentType<CellContentProps>
 
-export function CellContent(props: CellContentProps) {
-    return (
-        <View
-            style={[
-                { flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' },
-                props.style,
-            ]}>
-            <Text
-                style={[
-                    {
-                        fontSize: cx(14),
-                        color: '#444',
-                        fontFamily: 'helvetica_neue_lt_std_roman',
-                    },
-                    props.titleStyle,
-                ]}>{props.title}</Text>
-            <View style={{ flexDirection: 'row', alignItems: 'center' }}>
-                <Text style={[
-                    {
-                        fontSize: cx(14),
-                        color: '#444',
-                        fontFamily: 'helvetica_neue_lt_std_roman',
-                    },
-                    props.valueStyle,
-                ]}>{props.value}</Text>
-                <View style={{ width: cx(4) }} />
-                <IconFont
-                    name="arrow"
-                    color={props.iconStyle?.color || '#444'}
-                    size={props.iconStyle?.size || cx(11)} />
-            </View>
-        </View>
-    )
-}
+export { CellContent };

package/src/components/MoodStripAdjustView.tsx

@@ -125,4 +125,4 @@ const MoodStripAdjustView = (props: MoodStripAdjustViewProps) => {
   )
 }
 
-export default withTheme(MoodStripAdjustView)
+export default withTheme(MoodStripAdjustView) as React.ComponentType<MoodStripAdjustViewProps>

package/src/components/Page.tsx

@@ -70,7 +70,7 @@ const Page = (props: PageProps) => {
 
   return (
     <>
-      <View style={[{ flex: 1, position: 'relative', backgroundColor: props.theme?.global.backgroud }, props.style]}>
+      <View style={[{ flex: 1, position: 'relative', backgroundColor: props.theme?.global.background }, props.style]}>
         <LDVTopBar
           title={props.backText}
           onBackPress={
@@ -106,4 +106,4 @@ const Page = (props: PageProps) => {
   )
 }
 
-export default withTheme(Page)
+export default withTheme(Page) as React.ComponentType<PageProps>

package/src/components/Segmented.tsx

@@ -76,4 +76,4 @@ const Segmented = (props: SegmentedProps) => {
   )
 }
 
-export default withTheme(Segmented)
+export default withTheme(Segmented) as React.ComponentType<SegmentedProps>

package/src/components/TextField.tsx

@@ -13,11 +13,13 @@ interface TextFieldProps extends TextInputProps {
   errorText?: string
   tipIcon?: ImageSourcePropType
   tipColor?: string
+  editable?: boolean
 }
 
 const TextField = (props: TextFieldProps) => {
   const icon = props.tipIcon || res.ic_warning_amber
   const color = props.tipColor || props.theme?.global.warning
+  const editable = props.editable ?? !props.editable
 
   const styles = StyleSheet.create({
     topTip: {
@@ -69,7 +71,7 @@ const TextField = (props: TextFieldProps) => {
       <Text style={[styles.topTip, { opacity: (!!props.value) ? 1 : 0 }]}>{props.placeholder}</Text>
       <View style={styles.textInputGroup}>
         <TextInput{...props} style={styles.textInput} />
-        {!!props.value && props.editable &&
+        {!!props.value && editable &&
             <TouchableOpacity
                 style={styles.iconTouchable}
                 onPress={() => {

package/src/components/ldvSwitch.tsx

@@ -54,4 +54,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default withTheme(LdvSwitch)
+export default withTheme(LdvSwitch) as React.ComponentType<Prop>

package/src/components/ldvTopBar.tsx

@@ -74,4 +74,4 @@ const LDVTopBar = (props: TopBarProps) => {
   )
 }
 
-export default withTheme(LDVTopBar)
+export default withTheme(LDVTopBar) as React.ComponentType<TopBarProps>

package/src/components/weekSelect.tsx

@@ -95,4 +95,4 @@ const WeekSelect = (props) => {
   </View>)
 }
 
-export default withTheme(WeekSelect)
+export default withTheme(WeekSelect) as React.ComponentType<any>

package/src/hooks/Hooks.ts

@@ -1,4 +1,4 @@
-import { useRoute } from '@react-navigation/core'
+import { useRoute, useNavigation } from '@react-navigation/core'
 
 export function createParams<T>(params: T): T {
   return { ...params }
@@ -6,4 +6,10 @@ export function createParams<T>(params: T): T {
 
 export function useParams<T extends any>(): T {
   return useRoute().params as T
-}
+}
+
+export function useCurrentPage(routeName: string): boolean {
+  const navigation = useNavigation()
+  const { index, routes} = navigation.getState()
+  return routeName === routes[index].name
+}