@ledvance/base 1.1.71 → 1.1.72

package/package.json

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

package/src/components/LampAdjustView.tsx

@@ -11,21 +11,17 @@ import I18n from '../i18n/index'
 const {convertX: cx} = Utils.RatioUtils
 
 interface LampConfigViewProps extends ColorAdjustViewProps, ColorTempAdjustViewProps {
-  isRGBWLamp: boolean
-  isRGBLamp: boolean
-  isOnlyRGBLamp: boolean
-  isTWLamp: boolean
-  isDIMLamp: boolean
   isColorMode: boolean
+  isSupportColor: boolean
   setIsColorMode: (isColorMode: boolean) => void
 }
 
 const LampAdjustView = (props: LampConfigViewProps) => {
 
   const state = useReactive({
-    hasSegmentControl: props.isRGBWLamp || props.isRGBLamp,
+    hasSegmentControl: props.isSupportColor && (props.isSupportBrightness || props.isSupportTemperature),
   })
-
+  
   return (
     <View>
       {state.hasSegmentControl &&
@@ -36,7 +32,7 @@ const LampAdjustView = (props: LampConfigViewProps) => {
               isFirst={props.isColorMode}
               setIsFirst={props.setIsColorMode}/>
       }
-      {(props.isOnlyRGBLamp || (state.hasSegmentControl && props.isColorMode)) &&
+      {((state.hasSegmentControl && props.isColorMode) || (!state.hasSegmentControl && props.isSupportColor)) &&
           <>
             {state.hasSegmentControl && <Spacer height={cx(10)}/>}
               <ColorAdjustView
@@ -50,7 +46,7 @@ const LampAdjustView = (props: LampConfigViewProps) => {
               <Spacer/>
           </>
       }
-      {(props.isTWLamp || props.isDIMLamp || (!props.isColorMode)) &&
+      {((state.hasSegmentControl && !props.isColorMode) || (!state.hasSegmentControl && (props.isSupportBrightness || props.isSupportTemperature))) &&
           <>
             {state.hasSegmentControl && <Spacer height={cx(10)}/>}
               <ColorTempAdjustView

package/src/components/ldvPickerView.tsx

@@ -1,12 +1,10 @@
-import React from 'react'
+import React, { useMemo } from 'react'
 import {StyleProp, StyleSheet, Text, View, ViewStyle} from 'react-native'
 import {Picker, Utils} from 'tuya-panel-kit'
 import _ from 'lodash'
 
 const {convertX} = Utils.RatioUtils
 
-const hours = _.times(24, (n) => _.padStart(n.toString(), 2, '0'))
-const minutes = _.times(60, (n) => _.padStart(n.toString(), 2, '0'))
 const pickerTheme = {
   fontSize: 20,
 }
@@ -18,12 +16,14 @@ interface LdvPickerViewProps {
   setMinute: (string) => void,
   style?: StyleProp<ViewStyle> | undefined,
   unit?: string[]
+  minutesStep?: number
 }
 
 const LdvPickerView = (props: LdvPickerViewProps) => {
 
-  const {hour, minute, unit, setHour, setMinute} = props
-
+  const {hour, minute, unit, setHour, setMinute, minutesStep = 1} = props
+  const hours = useMemo(() => _.times(24, (n) => _.padStart(n.toString(), 2, '0')), [])
+  const minutes = useMemo(() => _.times(60 / minutesStep, (n) => _.padStart((n * minutesStep).toString(), 2, '0')) , [props.minutesStep])
   return (
     <View style={[styles.pickerContainer, props.style]}>
       <View style={styles.picContainer}>