react-crud-mobile 1.0.607 → 1.0.608

package/src/elements/core/UIList.tsx

@@ -1,10 +1,9 @@
-import React, { useState } from 'react';
-import { ChildType, ComponentUtils, ScopeUtils, Utils } from 'react-crud-utils';
+import React from 'react';
+import { ChildType, ComponentUtils, Utils } from 'react-crud-utils';
 import { StyleSheet, Text, TouchableHighlight, View } from 'react-native';
 import UIListRow from './UIListRow';
 import UI from '../UI';
 import { Ionicons } from '@expo/vector-icons';
-import UIChildren from '../UIChildren';
 
 export default function UIList(props: ChildType) {
   const scope = props.scope;
@@ -17,10 +16,24 @@ export default function UIList(props: ChildType) {
   const add = ComponentUtils.getDefine(props, 'add');
   const hideAddWhenEmpty = original.hideAddWhenEmpty;
 
+  const onClick = (item: any) => {
+    scope.call('click', { value: item, item, edit: true });
+  };
+
   const getStyle = (key: string, extra?: any) => {
     return scope.getStyle(key, { ...extra, ...styles[key] });
   };
 
+  const getRowStyle = (extra?: any) => {
+    let row = getStyle('row', {});
+
+    if (cols > 0) {
+      row.width = rowWidth;
+    }
+
+    return row;
+  };
+
   const getContainerStyle = (extra?: any) => {
     let row = getStyle('container', {});
 
@@ -70,36 +83,11 @@ export default function UIList(props: ChildType) {
     return <>{empty}</>;
   };
 
-  let RowItem = ({ item, index }) => {
-    const name = `${scope.key('row', index)}`;
-    const row = {
-      parent: scope,
-      name,
-      crud: scope.crud,
-      index,
-      type: 'row',
-      data: item,
-    };
-
-    let [rowScope] = useState(ScopeUtils.create(row));
-    const getRowStyle = (extra?: any) => {
-      let row = scope.getStyle('row', { ...extra, ...styles.row });
-
-      if (cols > 0) {
-        row.width = rowWidth;
-      }
-
-      return row;
-    };
-
-    const onClick = (item: any) => {
-      scope.call('click', { value: item, item, edit: true });
-    };
-
+  let RowItem = ({ item, index, children }) => {
     if (!original.click) {
       return (
         <View key={`k-${index}`} style={getRowStyle()}>
-          <UIChildren scope={rowScope}>{props.children}</UIChildren>
+          {children}
         </View>
       );
     }
@@ -113,7 +101,7 @@ export default function UIList(props: ChildType) {
           onClick(item);
         }}
       >
-        <UIChildren scope={rowScope}>{props.children}</UIChildren>
+        {children}
       </TouchableHighlight>
     );
   };
@@ -131,7 +119,11 @@ export default function UIList(props: ChildType) {
       <View style={getContainerStyle()}>
         <Empty />
         {items.map((item: any, i: number) => (
-          <RowItem index={i} item={item} />
+          <RowItem index={i} item={item}>
+            <UIListRow scope={scope} item={item} index={i}>
+              {props.children}
+            </UIListRow>
+          </RowItem>
         ))}
         {isShowAdd() && <>{add}</>}
       </View>

package/src/elements/core/UIListRow.tsx

@@ -8,7 +8,19 @@ interface UIListRowType extends ChildType {
 }
 
 export default function UIListRow(props: UIListRowType) {
-  const scope = props.scope;
+  const parent = props.scope;
+  const item = props.item;
+  const index = props.index;
+  const name = `${parent.key('row', index)}`;
+  const row = {
+    parent,
+    name,
+    crud: parent.crud,
+    index,
+    type: 'row',
+    data: item,
+  };
+  let [scope] = useState(ScopeUtils.create(row));
 
   return (
     <>