@ledvance/base 1.1.21 → 1.1.23

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "scripts": {},
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",

package/src/components/ColorTempAdjustView.tsx

@@ -6,6 +6,7 @@ import LdvPresetView from './ldvPresetView'
 import LdvSlider from './ldvSlider'
 import {Utils} from 'tuya-panel-kit'
 import I18n from '../i18n/index'
+import {cctToColor} from '../utils/cctUtils'
 
 const {convertX: cx} = Utils.RatioUtils
 
@@ -28,7 +29,7 @@ const ColorTempAdjustView = (props: ColorTempAdjustViewProps) => {
               <LdvColorSlider
                   type={'temperature'}
                   title={I18n.getLang('light_sources_tile_main_lighting_shade')}
-                  thumbColor={'white'}
+                  thumbColor={cctToColor(props.colorTemp)}
                   value={props.colorTemp}
                   onValueChange={props.onCCTChange}
                   onSlidingComplete={props.onCCTChangeComplete}/>

package/src/components/FanAdjustView.tsx

@@ -124,7 +124,7 @@ const FanAdjustView = (props: FanAdjustViewProps) => {
               setEnable={props.disinfectChange}
               color={''}
               colorAlpha={1}
-              title={'1'}/>
+              title={I18n.getLang('ceiling_fan_tile_uvc_fan_disinfect')}/>
           <Spacer height={cx(16)}/>
       </>}
     </Card>

package/src/components/LinearGradientLine.tsx

@@ -43,21 +43,20 @@ const LinearGradientLine = (props: LinearGradientLineProps) => {
       state.stops[`${pc}%`] = color
       pc += p
     })
-    console.log('LinearGradientLine colors', JSON.stringify(state.stops))
   }, [props.colors])
 
   return (
-    <View style={[{width, height, overflow: 'hidden'}, props.style]}>
-      <LinearGradient
+    <View style={[{ width, height, overflow: 'hidden' }, props.style]}>
+      {JSON.stringify(state.stops) !== '{}' && <LinearGradient
         gradientId="Gradient"
-        style={{width, height}}
+        style={{ width, height }}
         x1={state.x1}
         y1={state.y1}
         x2={state.x2}
         y2={state.y2}
         stops={state.stops}>
-        <Rect width={width} height={height}/>
-      </LinearGradient>
+        <Rect width={width} height={height} />
+      </LinearGradient>}
     </View>
   )
 }

package/src/components/Page.tsx

@@ -1,5 +1,5 @@
-import React, { PropsWithChildren, useCallback } from 'react'
-import { View, ViewProps } from 'react-native'
+import React, { PropsWithChildren, useCallback, useEffect } from 'react'
+import { BackHandler, View, ViewProps } from 'react-native'
 import LDVTopBar from './ldvTopBar'
 import { useNavigation } from '@react-navigation/native'
 import LdvTopName from './ldvTopName'
@@ -46,18 +46,31 @@ const Page = (props: PageProps) => {
   },
     [props.backDialogTitle, props.backDialogContent, disabled],
   )
+
+  useEffect(() => {
+    if (!!props.showBackDialog) {
+        BackHandler.addEventListener('hardwareBackPress', onBack)
+        return () => {
+            BackHandler.removeEventListener('hardwareBackPress', onBack)
+        }
+    }
+}, [props.showBackDialog, disabled])
+
   return (
     <>
-      <View style={[{ flex: 1 }, props.style]}>
+      <View style={[{ flex: 1, position: 'relative' }, props.style]}>
         <LDVTopBar
           title={props.backText}
-          onBackPress={props.onBackClick || (() => {
-            navigation.goBack()
-          })}
+          onBackPress={
+            !!props.onBackClick ? props.onBackClick :
+                !!props.showBackDialog ? onBack : (() => {
+                    navigation.goBack()
+                })
+          }
           rightButtonIcon={props.rightButtonIcon}
           onRightButtonPress={props.rightButtonIconClick}
         />
-        {props.headlineText &&
+        {(!!props.headlineText) &&
           <LdvTopName
             title={props.headlineText}
             rightIcon={props.headlineIcon}