@ledvance/base 1.2.3 → 1.2.5

package/package.json

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

package/src/components/Page.tsx

@@ -1,8 +1,8 @@
-import React, {PropsWithChildren, useCallback, useEffect} from 'react'
-import {BackHandler, 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 {Dialog, Toast} from 'tuya-panel-kit'
+import { useNavigation } from '@react-navigation/native'
+import { Dialog, Toast } from 'tuya-panel-kit'
 import I18n from '@i18n'
 import LdvTopName from './ldvTopName'
 
@@ -38,14 +38,14 @@ const Page = (props: PageProps) => {
         subTitle: props.backDialogContent || '',
         cancelText: I18n.getLang('cancel_dialog_delete_item_sleepschedule_answer_no_text'),
         confirmText: I18n.getLang('cancel_dialog_delete_item_sleepschedule_answer_yes_text'),
-        onConfirm: (_, {close}) => {
+        onConfirm: (_, { close }) => {
           close()
           navigation.goBack()
         },
-        motionConfig:{
+        motionConfig: {
           hideDuration: 0,
-          showDuration: 100
-        }
+          showDuration: 100,
+        },
       })
       return true
     },
@@ -63,7 +63,7 @@ const Page = (props: PageProps) => {
 
   return (
     <>
-      <View style={[{flex: 1, position: 'relative'}, props.style]}>
+      <View style={[{ flex: 1, position: 'relative' }, props.style]}>
         <LDVTopBar
           title={props.backText}
           onBackPress={
@@ -77,16 +77,17 @@ const Page = (props: PageProps) => {
           onRightButtonPress={props.rightButtonIconClick}
           rightButtonDisabled={disabled}/>
         {(!!props.headlineText) &&
-            <LdvTopName
-                title={props.headlineText}
-                rightIcon={props.headlineIcon}
-                rightIconClick={props.onHeadlineIconClick}
-                showGreenery={props.showGreenery}
-                greeneryIcon={props.greeneryIcon}/>}
+          <LdvTopName
+            title={props.headlineText}
+            rightIcon={props.headlineIcon}
+            rightIconClick={props.onHeadlineIconClick}
+            showGreenery={props.showGreenery}
+            greeneryIcon={props.greeneryIcon}/>}
         {props.children}
       </View>
       {!!props.loading && <Toast.Loading
-        show={!!props.loading}
+        style={{ zIndex: 999, elevation: 10 }}
+        show={props.loading}
         onFinish={() => {
 
         }}/>}

package/src/models/modules/NativePropsSlice.d.ts

@@ -51,7 +51,7 @@ export declare function useGroupConfig<T>(): [T, (dps: any, newConfig: T) => Pro
  * @param dpKey
  */
 export declare 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>>];
-export declare function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(featureKey: keyof GC, defValue: T, valueMapToDpValue?: (v: T) => any, extraDps?: any, extraConfig?: any): [T, (value: T) => Promise<Result<any>>];
+export declare function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(featureKey: keyof GC, defValue: T, valueMapToDpValue?: (v: T) => any, getExtraDps?: (v: T) => any, getExtraConfig?: (v: T) => any): [T, (value: T) => Promise<Result<any>>];
 export declare const useFanMaxSpeed: () => 3 | 20;
 export declare const isUVCFanDevice: () => boolean;
 export declare const ldvModules: import("@reduxjs/toolkit").Reducer<NativeProps, import("@reduxjs/toolkit").AnyAction>;

package/src/models/modules/NativePropsSlice.tsx

@@ -276,10 +276,18 @@ export function useGroupConfigFeature<GC, GCPT extends PropertyValueTypes<GC>>
   return [groupConfig[key] as (GCPT | undefined), setGroupConfigFeature]
 }
 
-export function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(featureKey: keyof GC, defValue: T, valueMapToDpValue?: (v: T) => any, extraDps?: any, extraConfig?: any): [T, (value: T) => Promise<Result<any>>] {
+export function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(
+  featureKey: keyof GC,
+  defValue: T,
+  valueMapToDpValue?: (v: T) => any,
+  getExtraDps?: (v: T) => any,
+  getExtraConfig?: (v: T) => any,
+): [T, (value: T) => Promise<Result<any>>] {
   const [featureHook, setFH] = useGroupConfigFeature<GC, T>(featureKey)
   const setFeatureHook = useCallback(async (value: T) => {
     const dpValue = valueMapToDpValue ? valueMapToDpValue(value) : value
+    const extraDps = getExtraDps ? getExtraDps(value) : undefined
+    const extraConfig = getExtraConfig ? getExtraConfig(value) : undefined
     return await setFH(value, dpValue, extraDps, extraConfig)
   }, [setFH])
   return [featureHook || defValue, setFeatureHook]