@eohjsc/react-native-smart-city 0.4.97 → 0.4.98

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.4.97",
+  "version": "0.4.98",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/ActionGroup/OnOffTemplate/index.js

@@ -53,15 +53,17 @@ const OnOffTemplate = memo(({ item = {}, doAction, sensor = {} }) => {
 
   const [isOn, setIsOn] = useState(false);
   const [tempIsOn, setTempIsOn] = useState(getIsOnValue());
+  const [timeoutId, setTimeoutId] = useState();
 
   const updateStatusFromPusher = useCallback(() => {
-    setTimeout(() => {
+    const timeout = setTimeout(() => {
       setTempIsOn(temp);
-    }, 3000);
+    }, 7000);
+    setTimeoutId(timeout);
   }, []);
 
   const triggerAction = useCallback(async () => {
-    const action_data = isOn ? action_off_data : action_on_data;
+    const action_data = tempIsOn ? action_off_data : action_on_data;
     if (!action_data) {
       return;
     }
@@ -76,8 +78,9 @@ const OnOffTemplate = memo(({ item = {}, doAction, sensor = {} }) => {
         config_value: isOn ? 0 : 1,
       };
     }
-    setTempIsOn((prev) => !prev);
+    clearTimeout(timeoutId);
     await doAction(action_data, data);
+    setTempIsOn((prev) => !prev);
     updateStatusFromPusher(); // todo Bang read about this magic
 
     if (
@@ -88,15 +91,17 @@ const OnOffTemplate = memo(({ item = {}, doAction, sensor = {} }) => {
       watchMultiConfigs([config]);
     }
   }, [
-    isOn,
+    tempIsOn,
     action_off_data,
     action_on_data,
-    device_type,
-    is_managed_by_backend,
     allow_config_store_value,
     config,
+    device_type,
+    timeoutId,
     doAction,
     updateStatusFromPusher,
+    is_managed_by_backend,
+    isOn,
   ]);
 
   useUnwatchLGDeviceConfigControl(sensor, [config]);

package/src/commons/ActionGroup/TextBoxTemplate.js

@@ -10,9 +10,11 @@ import styles from './TextBoxTemplateStyle';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import _TextInput from '../Form/TextInput';
 import AccessibilityLabel from '../../configs/AccessibilityLabel';
+import useKeyboardAnimated from '../../hooks/Explore/useKeyboardAnimated';
 
 const TextBoxTemplate = ({ item, doAction, isWidgetOrder }) => {
   const t = useTranslations();
+  const transY = useKeyboardAnimated();
   const { label, configuration } = item;
   const { action_data, config } = configuration;
   const [configValues] = useConfigGlobalState('configValues');
@@ -53,6 +55,7 @@ const TextBoxTemplate = ({ item, doAction, isWidgetOrder }) => {
           rightButtonTitle={stateAlert.rightButton}
           rightButtonClick={onDone}
           rightDisabled={!value}
+          transY={transY}
         >
           <_TextInput
             wrapStyle={styles.wrapInputStyle}

package/src/commons/OneTapTemplate/SliderRangeActionTemplate.js

@@ -20,8 +20,8 @@ const SliderRangeActionTemplate = ({ device, item, onSelectAction }) => {
   const [configValues] = useConfigGlobalState('configValues');
   const [value, setValue] = useState();
 
-  const onInputChange = (value) => {
-    setValue(value);
+  const onInputChange = (e) => {
+    setValue(e);
   };
 
   useEffect(() => {
@@ -30,7 +30,7 @@ const SliderRangeActionTemplate = ({ device, item, onSelectAction }) => {
   }, [configValues, config]);
 
   const onPressDone = useCallback(() => {
-    let actionData = { value: value };
+    let actionData = { value: parseFloat(value) };
     setValue(value);
     onSelectAction &&
       onSelectAction({

package/src/commons/OneTapTemplate/__test__/SliderRangeActionTemplate.test.js

@@ -64,7 +64,7 @@ describe('Test SliderRangeActionTemplate', () => {
     });
     expect(mockOnSelectAction).toHaveBeenCalledWith({
       action: 'b498234c-6c1a-452d-a1d1-87a314c20528',
-      data: { value: '123' },
+      data: { value: 123 },
       index: undefined,
       template: 'slider_range_template',
     });