react-crud-mobile 1.3.66 → 1.3.68

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.66",
+  "version": "1.3.68",
   "license": "MIT",
   "description": "Uma biblioteca de componentes para React Native",
   "main": "dist/index.js",

package/src/elements/UIElement.tsx

@@ -333,16 +333,30 @@ export default function UIElement(props: ElementType) {
     return true;
   };
 
-  let Tag: any = View;
+  let isTouch =
+    !scope.isType('input', 'grid', 'list', 'order', 'repeat') && original.click;
   let custom: any = {};
 
-  if (!scope.isType('input', 'grid', 'list', 'repeat') && original.click) {
-    Tag = TouchableHighlight;
-
+  if (isTouch) {
     custom.underlayColor = 'transparent';
     custom.onPress = onClick;
   }
 
+  let Tag = (props: any) => {
+    let Aux: any = View;
+
+    if (isTouch) {
+      Aux = TouchableHighlight;
+    }
+
+    if (scope.isType('dialog', 'order')) {
+      console.log('dialogggg');
+      return <>{props.children}</>;
+    }
+
+    return <Aux {...props} />;
+  };
+
   let Inner = () => {
     return (
       <>
@@ -509,7 +523,13 @@ export default function UIElement(props: ElementType) {
         {scope.isType('list', 'repeat') && (
           <UIList {...props} scope={scope} crud={crud} />
         )}
+        {scope.isType('order') && (
+          <UIOrder {...props} scope={scope} crud={crud} />
+        )}
 
+        {scope.isType('dialog') && (
+          <UIModal {...props} scope={scope} crud={crud} />
+        )}
         {scope.isType('chart') && (
           <ElChart {...props} scope={scope} crud={crud} />
         )}
@@ -521,10 +541,6 @@ export default function UIElement(props: ElementType) {
           <UIView {...props} scope={scope} crud={crud} />
         )}
 
-        {scope.isType('dialog') && (
-          <UIModal {...props} scope={scope} crud={crud} />
-        )}
-
         {isShowChild() && (
           <UIChildren
             {...props}
@@ -569,27 +585,13 @@ export default function UIElement(props: ElementType) {
     return <>{props.children}</>;
   };
 
-  let Decorate = (props: any) => {
-    if (scope.isType('order')) {
-      return <UIOrder {...props} scope={scope} crud={crud} />;
-    }
-
-    return (
-      <Tag ref={ref} style={getStyle()} {...custom}>
-        {props.children}
-      </Tag>
-    );
-  };
-
   return (
     <CrudContext.Provider value={{ crud, theme }}>
-      <Decorate>
-        <Tag ref={ref} style={getStyle()} {...custom}>
-          <Card>
-            <Container />
-          </Card>
-        </Tag>
-      </Decorate>
+      <Tag ref={ref} style={getStyle()} {...custom}>
+        <Card>
+          <Container />
+        </Card>
+      </Tag>
     </CrudContext.Provider>
   );
 }