fix: del + container + handler

src/shared/Actions.js

@@ -274,18 +274,17 @@ export default {
    Del Field
    */
   @action
-  del(partialPath = null) {
-    const path = parser.parsePath(utils.$try(partialPath, this.path));
+  del($path = null) {
+    const isStrict = this.state.options.get('strictDelete', this);
+    const path = parser.parsePath(utils.$try($path, this.path));
+    const container = this.container($path);
     const keys = _.split(path, '.');
     const last = _.last(keys);
-    const isStrict = this.state.options.get('strictDelete', this);
-
-    const container = this.container(path);
 
     if (isStrict && !container.fields.has(last)) {
       const msg = `Key "${last}" not found when trying to delete field`;
-      const $path = _.trim([this.path, path].join('.'), '.');
-      utils.throwError($path, null, msg);
+      const fullpath = _.trim([this.path, path].join('.'), '.');
+      utils.throwError(fullpath, null, msg);
     }
 
     container.fields.delete(last);

src/shared/Utils.js

@@ -41,14 +41,19 @@ export default {
   /**
     Get Container
    */
-  container(path) {
-    const $path = parser.parsePath(utils.$try(path, this.path));
-    const cpath = _.trim($path.replace(new RegExp('[^./]+$'), ''), '.');
-
-    if (!!this.path && _.isNil(path)) {
-      return cpath !== '' ? this.state.form.select(cpath, null, false) : this.state.form;
+  container($path) {
+    const path = parser.parsePath(utils.$try($path, this.path));
+    const cpath = _.trim(path.replace(new RegExp('[^./]+$'), ''), '.');
+
+    if (!!this.path && _.isNil($path)) {
+      return cpath !== ''
+        ? this.state.form.select(cpath, null, false)
+        : this.state.form;
     }
-    return cpath !== '' ? this.select(cpath, null, false) : this;
+
+    return cpath !== ''
+      ? this.select(cpath, null, false)
+      : this;
   },
 
   /**

src/utils.js

@@ -24,21 +24,15 @@ const props = {
   },
 };
 
-const getObservableMapValues = (observableMap) => {
-  if (mobxValues) {
-    return mobxValues(observableMap);
-  }
-
-  return observableMap.values();
-};
-
-const getObservableMapKeys = (observableMap) => {
-  if (mobxValues) {
-    return mobxKeys(observableMap);
-  }
-
-  return observableMap.keys();
-};
+const getObservableMapValues = observableMap =>
+  mobxValues
+    ? mobxValues(observableMap)
+    : observableMap.values();
+
+const getObservableMapKeys = observableMap =>
+  mobxValues
+    ? mobxKeys(observableMap)
+    : observableMap.keys();
 
 const checkObserveItem = change => ({
   key, to, type, exec,

tests/data/forms/fixes/form.o.js

@@ -12,8 +12,18 @@ class NewForm extends Form {
   hooks() {
     return {
       onInit() {
-        this.$('array').add();
+        this.$('array').add(); // 0
+        this.$('array').add(); // 1
+        this.$('array').add(); // 2
+
         this.$('array').del(0);
+
+        const proxy = new Proxy({
+          preventDefault: () => {},
+        }, {});
+
+        this.$('array').onDel(proxy, 1);
+        this.$('array[2]').onDel(proxy);
       },
     };
   }