@ledvance/base 1.2.14 → 1.2.15

package/package.json

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

package/src/components/CircularProgress.d.ts

@@ -0,0 +1,8 @@
+import { ViewProps } from 'react-native';
+import { PropsWithChildren } from 'react';
+export interface CircularProgressProps extends PropsWithChildren<ViewProps> {
+    progress: number;
+    size: number;
+    strokeWidth: number;
+}
+export declare function CircularProgress(props: CircularProgressProps): JSX.Element;

package/src/components/CircularProgress.tsx

@@ -0,0 +1,43 @@
+import { View, ViewProps } from 'react-native'
+import { Progress } from 'tuya-panel-kit'
+import React, { PropsWithChildren } from 'react'
+
+export interface CircularProgressProps extends PropsWithChildren<ViewProps> {
+  progress: number
+  size: number
+  strokeWidth: number
+}
+
+export function CircularProgress(props: CircularProgressProps) {
+  return <Progress
+    foreColor={{
+      '0%': '#f60',
+      '100%': '#f60',
+    }}
+    style={[{ width: props.size, height: props.size }, props.style]}
+    disabled={true}
+    needMaxCircle={true}
+    thumbRadius={Math.trunc(props.strokeWidth / 2)}
+    thumbStroke={'#f60'}
+    thumbFill={'#f60'}
+    thumbStrokeWidth={0}
+    scaleHeight={props.strokeWidth}
+    value={props.progress}
+    startDegree={270}
+    andDegree={360}
+    renderCenterView={
+      <View
+        style={{
+          position: 'absolute',
+          width: props.size - props.strokeWidth,
+          height: props.size - props.strokeWidth,
+          marginStart: props.strokeWidth,
+          marginTop: props.strokeWidth,
+          flexDirection: 'row',
+          justifyContent: 'center',
+          alignItems: 'center',
+        }}>
+        {props.children}
+      </View>
+    }/>
+}

package/src/models/modules/NativePropsSlice.tsx

@@ -50,7 +50,7 @@ const initialState: NativeProps = {
   timeSchedule: false,
   energieverbrauch: {},
   moods: [],
-  groupDevices: []
+  groupDevices: [],
 }
 
 // energy generation
@@ -108,9 +108,9 @@ const nativePropsSlice = createSlice({
     setMoods(state, action: PayloadAction<any>) {
       state.moods = action.payload
     },
-    setGroupDevices(state, action: PayloadAction<any>){
+    setGroupDevices(state, action: PayloadAction<any>) {
       state.groupDevices = action.payload
-    }
+    },
   },
 })
 
@@ -221,7 +221,7 @@ const useMoods = (): [any[], (v: any[]) => void] => {
   return [dps, setMoodsFn]
 }
 
-const useGroupDevices = (): [any[], (v: any[]) => void] =>{
+const useGroupDevices = (): [any[], (v: any[]) => void] => {
   const dps = useSelector(store => store.ldvModules.groupDevices)
   const dispatch = useDispatch()
   const setGroupDevicesFn = (value: any[]) => {
@@ -275,9 +275,16 @@ export function useGroupConfigFeature<GC, GCPT extends PropertyValueTypes<GC>>
 (key: keyof GC, dpKey?: string): [GCPT | undefined, (value: GCPT, dpValue: any, extraDps?: any, extraConfig?: any) => Promise<Result<any>>] {
   const [groupConfig, setGroupConfig] = useGroupConfig<GC>()
   const setGroupConfigFeature = async (value: GCPT, dpValue: any, extraDps?: any, extraConfig?: any) => {
+    const sendDpKey = !!dpKey ? dpKey : GlobalParams.dpSchemaMap[snakeCase(key as string)]?.dp
+
+    const sendDps = {}
+    if (sendDpKey) {
+      sendDps[sendDpKey] = dpValue
+    }
+
     return await setGroupConfig(
       {
-        [!!dpKey ? dpKey : GlobalParams.dpSchemaMap[snakeCase(key as string)].dp]: dpValue,
+        ...sendDps,
         ...(extraDps || {}),
       },
       {