@eohjsc/react-native-smart-city 0.4.89 → 0.4.90

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/src/screens/Automate/AddNewAction/SetupScriptDelay.js +22 -20
  3. package/src/screens/Automate/AddNewAction/SetupScriptNotify.js +28 -27
  4. package/src/screens/Automate/AddNewAction/Styles/SetupScriptNotifyStyles.js +1 -0
  5. package/src/screens/Automate/AddNewAction/__test__/SetupScriptDelay.test.js +5 -0
  6. package/src/screens/Automate/AddNewAction/__test__/SetupScriptNotify.test.js +7 -0
  7. package/src/screens/Automate/ScriptDetail/index.js +8 -6
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@eohjsc/react-native-smart-city",
3
3
  "title": "React Native Smart Home",
4
- "version": "0.4.89",
4
+ "version": "0.4.90",
5
5
  "description": "TODO",
6
6
  "main": "index.js",
7
7
  "files": [
package/src/screens/Automate/AddNewAction/SetupScriptDelay.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import React, { useCallback, useMemo, useState } from 'react';
2
- import { View } from 'react-native';
2
+ import { Keyboard, TouchableWithoutFeedback, View } from 'react-native';
3
3
  import { useNavigation } from '@react-navigation/native';
4
4
  import styles from './Styles/SetupScriptDelayStyles';
5
5
  import { HeaderCustom } from '../../../commons';
@@ -55,25 +55,27 @@ const SetupScriptDelay = ({ route }) => {
55
55
  return (
56
56
  <View style={styles.wrap}>
57
57
  <HeaderCustom isShowClose onClose={goBack} title={t('wait')} />
58
- <View style={styles.container}>
59
- <_TextInput
60
- label={t('set_timeout_seconds')}
61
- placeholder={t('maximum_3600_seconds')}
62
- keyboardType="numeric"
63
- textInputStyle={styles.inputNumber}
64
- value={delay}
65
- onChange={onChangeTitle}
66
- maxLength={4}
67
- accessibilityLabel={AccessibilityLabel.AUTOMATE_INPUT_DELAY}
68
- autoFocus
69
- />
70
- <BottomButtonView
71
- style={styles.bottomButtonView}
72
- mainTitle={t('save')}
73
- onPressMain={onNext}
74
- typeMain={canSave ? 'primary' : 'disabled'}
75
- />
76
- </View>
58
+ <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
59
+ <View style={styles.container}>
60
+ <_TextInput
61
+ label={t('set_timeout_seconds')}
62
+ placeholder={t('maximum_3600_seconds')}
63
+ keyboardType="numeric"
64
+ textInputStyle={styles.inputNumber}
65
+ value={delay}
66
+ onChange={onChangeTitle}
67
+ maxLength={4}
68
+ accessibilityLabel={AccessibilityLabel.AUTOMATE_INPUT_DELAY}
69
+ autoFocus
70
+ />
71
+ <BottomButtonView
72
+ style={styles.bottomButtonView}
73
+ mainTitle={t('save')}
74
+ onPressMain={onNext}
75
+ typeMain={canSave ? 'primary' : 'disabled'}
76
+ />
77
+ </View>
78
+ </TouchableWithoutFeedback>
77
79
  </View>
78
80
  );
79
81
  };
package/src/screens/Automate/AddNewAction/SetupScriptNotify.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import React, { useCallback, useMemo, useState } from 'react';
2
- import { View } from 'react-native';
2
+ import { Keyboard, TouchableWithoutFeedback, View } from 'react-native';
3
3
  import { useNavigation } from '@react-navigation/native';
4
4
  import styles from './Styles/SetupScriptNotifyStyles';
5
5
  import { HeaderCustom } from '../../../commons';
@@ -59,32 +59,33 @@ const SetupScriptNotify = ({ route }) => {
59
59
  return (
60
60
  <View style={styles.wrap}>
61
61
  <HeaderCustom isShowClose onClose={goBack} title={t('notification')} />
62
- <View style={styles.container}>
63
- <_TextInput
64
- placeholder={t('title_notification')}
65
- onChange={onChangeTitle}
66
- textInputStyle={styles.textTitle}
67
- value={notify?.title}
68
- accessibilityLabel={AccessibilityLabel.AUTOMATE_TITLE_NOTIFY}
69
- autoFocus
70
- />
71
- <_TextInput
72
- placeholder={t('message_notification')}
73
- onChange={onChangeMessage}
74
- textInputStyle={styles.textMessage}
75
- value={notify?.message}
76
- accessibilityLabel={AccessibilityLabel.AUTOMATE_MESSAGE_NOTIFY}
77
- multiline={true}
78
- maxLength={255}
79
- />
80
-
81
- <BottomButtonView
82
- style={styles.bottomButtonView}
83
- mainTitle={t('save')}
84
- onPressMain={onNext}
85
- typeMain={canSave ? 'primary' : 'disabled'}
86
- />
87
- </View>
62
+ <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
63
+ <View style={styles.container}>
64
+ <_TextInput
65
+ placeholder={t('title_notification')}
66
+ onChange={onChangeTitle}
67
+ textInputStyle={styles.textTitle}
68
+ value={notify?.title}
69
+ accessibilityLabel={AccessibilityLabel.AUTOMATE_TITLE_NOTIFY}
70
+ autoFocus
71
+ />
72
+ <_TextInput
73
+ placeholder={t('message_notification')}
74
+ onChange={onChangeMessage}
75
+ textInputStyle={styles.textMessage}
76
+ value={notify?.message}
77
+ accessibilityLabel={AccessibilityLabel.AUTOMATE_MESSAGE_NOTIFY}
78
+ multiline={true}
79
+ maxLength={255}
80
+ />
81
+ <BottomButtonView
82
+ style={styles.bottomButtonView}
83
+ mainTitle={t('save')}
84
+ onPressMain={onNext}
85
+ typeMain={canSave ? 'primary' : 'disabled'}
86
+ />
87
+ </View>
88
+ </TouchableWithoutFeedback>
88
89
  </View>
89
90
  );
90
91
  };
package/src/screens/Automate/AddNewAction/Styles/SetupScriptNotifyStyles.js CHANGED
@@ -21,6 +21,7 @@ export default StyleSheet.create({
21
21
  },
22
22
  textMessage: {
23
23
  height: 500,
24
+ textAlignVertical: 'top',
24
25
  borderWidth: 1,
25
26
  borderColor: Colors.Gray4,
26
27
  borderStyle: 'solid',
package/src/screens/Automate/AddNewAction/__test__/SetupScriptDelay.test.js CHANGED
@@ -11,6 +11,7 @@ import _TextInput from '../../../../commons/Form/TextInput';
11
11
  import BottomButtonView from '../../../../commons/BottomButtonView';
12
12
  import { ToastBottomHelper } from '../../../../utils/Utils';
13
13
  import SetupScriptDelay from '../SetupScriptDelay';
14
+ import { TouchableWithoutFeedback } from 'react-native';
14
15
 
15
16
  const mock = new MockAdapter(api.axiosInstance);
16
17
 
@@ -55,6 +56,10 @@ describe('Test SetupScriptDelay', () => {
55
56
  inputs[0].props.onChange('u');
56
57
  });
57
58
  expect(button.props.typeMain).toEqual('disabled');
59
+ const touchable = instance.findAllByType(TouchableWithoutFeedback);
60
+ await act(async () => {
61
+ touchable[0].props.onPress();
62
+ });
58
63
  await act(async () => {
59
64
  inputs[0].props.onChange('0');
60
65
  });
package/src/screens/Automate/AddNewAction/__test__/SetupScriptNotify.test.js CHANGED
@@ -11,6 +11,7 @@ import SetupScriptNotify from '../SetupScriptNotify';
11
11
  import _TextInput from '../../../../commons/Form/TextInput';
12
12
  import BottomButtonView from '../../../../commons/BottomButtonView';
13
13
  import { ToastBottomHelper } from '../../../../utils/Utils';
14
+ import { TouchableWithoutFeedback } from 'react-native';
14
15
 
15
16
  const mock = new MockAdapter(api.axiosInstance);
16
17
 
@@ -53,6 +54,12 @@ describe('Test SetupScriptNotify', () => {
53
54
 
54
55
  await act(async () => {
55
56
  inputs[0].props.onChange('Title');
57
+ });
58
+ const touchable = instance.findAllByType(TouchableWithoutFeedback);
59
+ await act(async () => {
60
+ touchable[0].props.onPress();
61
+ });
62
+ await act(async () => {
56
63
  inputs[1].props.onChange('Message');
57
64
  });
58
65
  const button = instance.findByType(BottomButtonView);
package/src/screens/Automate/ScriptDetail/index.js CHANGED
@@ -218,12 +218,14 @@ const ScriptDetail = ({ route }) => {
218
218
  onGoBack={goBack}
219
219
  >
220
220
  <View style={styles.wrapContent}>
221
- <View style={styles.row}>
222
- <Text type="H3" semibold>
223
- {t('enable_this_script')}
224
- </Text>
225
- <Switch checked={enableScript} onChange={onChangeSwitch} />
226
- </View>
221
+ {!!can_edit && !!enableScript && (
222
+ <View style={styles.row}>
223
+ <Text type="H3" semibold>
224
+ {t('enable_this_script')}
225
+ </Text>
226
+ <Switch checked={enableScript} onChange={onChangeSwitch} />
227
+ </View>
228
+ )}
227
229
  <Text type="H3" semibold>
228
230
  {t('how_to_start')}
229
231
  </Text>