@eohjsc/react-native-smart-city 0.4.77 → 0.4.78

package/package.json

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

package/src/commons/SubUnit/DeviceTemplate/ConfigAndEvaluation/ConfigAndEvaluation.js

@@ -1,6 +1,6 @@
 import React, { memo } from 'react';
 import styles from '../styles/ConfigValueStyles';
-import { View } from 'react-native';
+import { Platform, View } from 'react-native';
 import Text from '../../../Text';
 import LastUpdatedText from '../../../Device/LastUpdatedText';
 import { EvaluationConfigWrapper } from '../EvaluationOverConfig/EvaluationOverConfig';
@@ -17,7 +17,13 @@ const ConfigAndEvaluationDisplay = memo(
             <IconComponent icon={icon_kit || icon} />
           </View>
           <View style={styles.rowTop}>
-            <Text semibold>
+            <Text
+              numberOfLines={1}
+              semibold
+              style={
+                Platform.OS === 'ios' ? styles.iosStyle : styles.androidStyle
+              }
+            >
               {stationItem?.configuration?.config_data?.name}
             </Text>
           </View>

package/src/commons/SubUnit/DeviceTemplate/ConfigValue/ConfigValue.js

@@ -1,6 +1,6 @@
 import React, { memo, useMemo } from 'react';
 import styles from '../styles/ConfigValueStyles';
-import { View } from 'react-native';
+import { Platform, View } from 'react-native';
 import Text from '../../../Text';
 import { useConfigGlobalState } from '../../../../iot/states';
 import { useWatchConfigs } from '../../../../hooks/IoT';
@@ -25,7 +25,15 @@ const ConfigValue = ({ device, stationItem }) => {
           <IconComponent icon={icon_kit || icon} />
         </View>
         <View style={styles.rowTop}>
-          <Text semibold>{stationItem?.configuration?.config_data?.name}</Text>
+          <Text
+            numberOfLines={1}
+            semibold
+            style={
+              Platform.OS === 'ios' ? styles.iosStyle : styles.androidStyle
+            }
+          >
+            {stationItem?.configuration?.config_data?.name}
+          </Text>
         </View>
         <View style={styles.rowBottom}>
           <Text style={styles.textValue} bold>

package/src/commons/SubUnit/DeviceTemplate/DeviceTemplate.js

@@ -3,18 +3,14 @@ import { getTemplate } from './';
 import ItemDeviceWrapper from '../../Device/ItemDeviceWrapper';
 
 export const DeviceTemplate = memo(
-  ({ device, stationItem, unit, station, index }) => {
+  ({ device, stationItem, unit, station, key }) => {
     const Template = getTemplate(stationItem);
     if (!Template) {
       return null;
     }
     return (
       <ItemDeviceWrapper device={device} unit={unit} station={station}>
-        <Template.Display
-          device={device}
-          stationItem={stationItem}
-          index={index}
-        />
+        <Template.Display device={device} stationItem={stationItem} key={key} />
       </ItemDeviceWrapper>
     );
   }

package/src/commons/SubUnit/DeviceTemplate/EvaluationOverConfig/EvaluationOverConfig.js

@@ -1,6 +1,6 @@
 import React, { memo, useMemo } from 'react';
 import styles from '../styles/ConfigValueStyles';
-import { View } from 'react-native';
+import { Platform, View } from 'react-native';
 import Text from '../../../Text';
 import { useConfigGlobalState } from '../../../../iot/states';
 import {
@@ -54,7 +54,13 @@ const EvaluationOverConfigDisplay = memo(
             <IconComponent icon={icon_kit || icon} />
           </View>
           <View style={styles.rowTop}>
-            <Text semibold>
+            <Text
+              numberOfLines={1}
+              semibold
+              style={
+                Platform.OS === 'ios' ? styles.iosStyle : styles.androidStyle
+              }
+            >
               {stationItem?.configuration?.config_data?.name}
             </Text>
           </View>

package/src/commons/SubUnit/DeviceTemplate/styles/ConfigValueStyles.js

@@ -32,4 +32,14 @@ export default StyleSheet.create({
   marginTop10: {
     marginTop: 10,
   },
+  iosStyle: {
+    fontSize: 14,
+    lineHeight: 22,
+  },
+  androidStyle: {
+    fontSize: 14,
+    lineHeight: 22,
+    includeFontPadding: false,
+    marginBottom: 8,
+  },
 });

package/src/commons/SubUnit/ShortDetail.js

@@ -106,13 +106,12 @@ const ShortDetailSubUnit = ({ unit, station, isOwner }) => {
     });
   };
 
-  const renderSubUnitItem = (device, stationItem, index) => {
+  const renderSubUnitItem = (device, stationItem) => {
     return (
       <DeviceTemplate
         device={device}
         stationItem={stationItem}
-        index={index}
-        key={index}
+        key={`device-template-${stationItem.id}`}
         unit={unit}
         station={station}
       />
@@ -126,7 +125,7 @@ const ShortDetailSubUnit = ({ unit, station, isOwner }) => {
 
     return station.devices
       .map((device, index) => {
-        const displays = [];
+        let displays = [];
         if (device.device_type === DEVICE_TYPE.HANET) {
           displays.push(
             <ItemHanetDevice
@@ -157,7 +156,7 @@ const ShortDetailSubUnit = ({ unit, station, isOwner }) => {
             />
           );
         }
-        if (device.station_items) {
+        if (device.station_items?.length) {
           displays.push(
             ...device.station_items.map(renderSubUnitItem.bind(device, device))
           );