react-crud-mobile 1.3.86 → 1.3.87

package/package.json

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

package/src/elements/UIElement.tsx

@@ -58,7 +58,6 @@ export default function UIElement(props: ElementType) {
   let crud: Crud = Utils.nvl(props.crud, ctx?.crud);
   let [scope] = useState(ScopeUtils.create({ crud, ...props, theme }));
   let [index, setIndex] = useState(0);
-  let [dialog, setDialog] = useState(null);
   let [error, setError]: string | any = useState(null);
 
   scope.compile(props);
@@ -533,16 +532,14 @@ export default function UIElement(props: ElementType) {
           <UIModal {...props} scope={scope} crud={crud} />
         )}
 
-        {dialog && (
+        {scope.currentDialog?.component && (
           <UIModal
             {...props}
             scope={scope}
-            crud={dialog.crud}
+            crud={scope.currentDialog?.crud}
             open
-            dialog={dialog}
-          >
-            {dialog.component}
-          </UIModal>
+            dialog={scope.currentDialog}
+          />
         )}
 
         {scope.isType('chart') && (
@@ -601,46 +598,42 @@ export default function UIElement(props: ElementType) {
   };
 
   scope.dialogOpen = (args?: MethodType) => {
-    if (!dialog) {
-      let { crud, event } = 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;
-        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 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 = d;
+    let { crud, event } = 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;
+      def.search = crud.parent;
+
+      rowItem = crud.data;
+    } else if (crud.is('search')) {
+      def.parent = crud.parent;
+      def.search = crud;
+    }
 
-        dialog = { component, crud: d };
-        setDialog(dialog);
-      }
+    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();
     }
   };
 

package/src/elements/core/UIModal.tsx

@@ -48,7 +48,7 @@ export default function UIModal({
   };
 
   const onClose = () => {
-    scope.close({ scope, crud: scope.currentDialog, event: {} });
+    scope.close({ scope, crud: scope.currentDialog?.crud, event: {} });
   };
 
   const toggle = vis => {
@@ -92,7 +92,7 @@ export default function UIModal({
 
     main.dialog = d;
 
-    scope.currentDialog = d;
+    scope.currentDialog = { crud: d };
 
     toggle(true);
     scope.update();
@@ -112,7 +112,7 @@ export default function UIModal({
     scope.update();
   };
 
-  let curr = scope.currentDialog;
+  let curr = scope.currentDialog?.crud;
 
   if (!curr) {
     return <></>;
@@ -131,16 +131,16 @@ export default function UIModal({
 
   let color = Utils.nvl(headerStyle.color, 'white');
   let defaults = { color };
-  let key = `${scope.currentDialog.name}-${index}`;
+  let key = `${curr.name}-${index}`;
 
   let Content = () => {
     if (dialog?.component) {
       let Aux = dialog?.component;
 
-      return <Aux crud={scope.currentDialog} />;
+      return <Aux crud={curr} />;
     }
     return (
-      <UIChildren scope={scope} crud={scope.currentDialog}>
+      <UIChildren scope={scope} crud={curr}>
         {props.children}
       </UIChildren>
     );
@@ -167,7 +167,7 @@ export default function UIModal({
           </TouchableOpacity>
           <Text style={style('modalTitle', defaults)}>{label}</Text>
           {!Utils.isEmpty(headerRight) && (
-            <UIChildren scope={scope} crud={scope.currentDialog} transient>
+            <UIChildren scope={scope} crud={curr} transient>
               {headerRight}
             </UIChildren>
           )}