react-crud-mobile 1.3.92 → 1.3.95

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.92",
+  "version": "1.3.95",
   "license": "MIT",
   "description": "Uma biblioteca de componentes para React Native",
   "main": "dist/index.js",
@@ -45,7 +45,7 @@
     "@react-native-vector-icons/ionicons": "^7.4.0",
     "@react-native-vector-icons/material-icons": "^0.0.1",
     "react": "19.0.0",
-    "react-crud-utils": "^0.1.372",
+    "react-crud-utils": "^0.1.376",
     "react-dom": "19.0.0",
     "react-native": "0.79.2",
     "react-native-draggable-flatlist": "^4.0.3",

package/src/elements/UIElement.tsx

@@ -598,13 +598,14 @@ export default function UIElement(props: ElementType) {
     return <>{props.children}</>;
   };
 
-  scope.dialogOpen = (args?: MethodType) => {
-    let { crud, event } = args;
+  scope.dialogShow = (args?: MethodType) => {
+    let main = ViewUtils.getCrud('view');
+    let parent = main.dialog;
+    let { crud } = args;
     let name = scope.getName('modal');
     let edit = args.edit === true;
     let def: any = {};
     let rowItem = null;
-    let main = ViewUtils.getCrud('view');
 
     if (crud.is('row')) {
       def.parent = crud.parent.parent;
@@ -617,25 +618,38 @@ export default function UIElement(props: ElementType) {
     }
 
     let data = Utils.nvl(args.item, rowItem, {});
-    let component = event?.component;
-
-    if (component) {
-      let d = CrudUtils.create('dialog', {
-        parent: crud,
-        root: crud,
-        name,
-        dialog: main.dialog,
-        data,
-        edit,
-        scope,
-        ...def,
-      });
-
-      main.dialog = d;
-
-      scope.currentDialog = { component, crud: d };
-      scope.update();
+
+    let d = CrudUtils.create('dialog', {
+      parent: crud,
+      root: crud,
+      name,
+      data,
+      edit,
+      scope,
+      ...def,
+    });
+
+    let dialog = { crud: d, parent };
+
+    main.dialog = dialog;
+    scope.toggleDialog(true);
+    scope.currentDialog = dialog;
+
+    scope.update();
+  };
+
+  scope.dialogHide = (args?: MethodType) => {
+    let main = ViewUtils.getCrud('view');
+    let old = scope.currentDialog;
+
+    main.dialog = Utils.nvl(old.parent, null);
+    scope.currentDialog = null;
+
+    if (main.dialog?.crud?.scope) {
+      main.dialog?.crud.scope.update();
     }
+    scope.toggleDialog(false);
+    scope.update();
   };
 
   return (

package/src/elements/core/UIModal.tsx

@@ -33,7 +33,6 @@ export default function UIModal({
 }: UIModalType) {
   let [modalVisible, setModalVisible] = useState(open === true);
   let [index, setIndex] = useState(0);
-  let main = ViewUtils.getCrud('view');
   //v6
 
   const label = scope.getLabel();
@@ -51,7 +50,7 @@ export default function UIModal({
     scope.close({ scope, crud: scope.currentDialog?.crud, event: {} });
   };
 
-  const toggle = vis => {
+  scope.toggleDialog = vis => {
     modalVisible = vis;
     setModalVisible(modalVisible);
   };
@@ -60,65 +59,14 @@ export default function UIModal({
     setIndex(++index);
   };
 
-  scope.dialogShow = (args?: MethodType) => {
-    let { crud } = args;
-    let name = scope.getName('modal');
-    let edit = args.edit === true;
-    let def: any = {};
-    let rowItem = null;
-
-    if (crud.is('row')) {
-      def.parent = crud.parent.parent;
-      def.search = crud.parent;
-
-      rowItem = crud.data;
-    } else if (crud.is('search')) {
-      def.parent = crud.parent;
-      def.search = crud;
-    }
-
-    let data = Utils.nvl(args.item, rowItem, {});
-
-    let d = CrudUtils.create('dialog', {
-      parent: crud,
-      root: crud,
-      name,
-      dialog: main.dialog,
-      data,
-      edit,
-      scope,
-      ...def,
-    });
-
-    main.dialog = d;
-
-    scope.currentDialog = { crud: d };
-
-    toggle(true);
-    scope.update();
-  };
-
-  scope.dialogHide = (args?: MethodType) => {
-    let old = scope.currentDialog?.crud;
-
-    main.dialog = Utils.nvl(old.dialog, null);
-    scope.currentDialog = null;
-
-    toggle(false);
-
-    if (main.dialog?.scope) {
-      main.dialog.scope.update();
-    }
-    scope.update();
-  };
-
   let curr = scope.currentDialog?.crud;
+  let main = ViewUtils.getCrud('view');
 
   if (!curr) {
     return <></>;
   }
 
-  if (curr.uuid !== main.dialog?.uuid) {
+  if (curr.uuid !== main.dialog?.crud?.uuid) {
     return <></>;
   }