implab/implabjs-djx Commit - r140:515d1b83ebdf

fixed undefined value when no checkboxes are selected in _FormMixin.

cin -

r140:515d1b83ebdf v1.9.0-rc4 default

parent child

Context file:

r140:515d1b83ebdf

Collapse all files

djx/src/main/ts/form/_FormMixin.ts +15 -8

               */
              const _obj = (v: unknown) => (typeof v === "object" && v !== null ? v : {}) as Record<string, unknown>;
+             type MergeHint = "array" | "append" | "unset";
              /** Combines the values
               *
               * @param prev The previous value, `undefined` if none
               * @param value The new value to store
               * @param hint The hint how to combine values
               */
-             const _combine = (prev: unknown, value: unknown, hint?: string) =>
+             const _combine = (prev: unknown, value: unknown, hint?: MergeHint) =>
                  // write the value as an array and append new values to it
                  hint === "array" ? prev === undefined ? [value] : ([] as unknown[]).concat(prev, value) :
                      // write the value as is and convert it the array when new values are appended
                  [prop, ...rest]: string[],
                  obj: Record<string, unknown>,
                  value: unknown,
-                 hint?: string
+                 hint?: MergeHint
              ): unknown => ({
                  ...obj,
                  [prop]: rest.length > 0 ?
               * @param hint The hint how to store the value. The valid values are:
               *   `array`, `append`, `unset`.
               */
-             const _assign = (name: string, obj: object, value: unknown, hint?: string) =>
+             const _assign = (name: string, obj: object, value: unknown, hint?: MergeHint) =>
                  _merge(name.split("."), _obj(obj), value, hint) as object;
              @djclass
                              }
                          }
                      });
+                     // Note: no need to call this._set("value", ...) as the child updates will trigger onChange events
+                     // which I am monitoring.
                  }
                  _getValueAttr() {
                                              return { name, value };
                                          } else {
                                              // give radio widgets a default of null
-                                             return { name, value: null, hint: "unset" };
+                                             return { name, value: null, hint: "unset" as const};
                                          }
                                      } else {
                                          // checkbox/toggle button
-                                         if (value !== false)
-                                             return { name, value, hint: "array" };
+                                         return value !== false ?
+                                             { name, value, hint: "array" as const} :
+                                             // empty array when no checkboxes are selected
+                                             { name, value: [], hint: "unset" as const };
                                      }
                                  } else {
-                                     return { name, value, hint: "append" };
+                                     return { name, value, hint: "append" as const};
                                  }
                              }
                              return {};
                          }
                          this._onChangeDelayTimer = this.defer(() => {
                              this._onChangeDelayTimer = { remove: () => { } };
-                             this._set("value", this.get("value"));
+                             this._set("value", this._getValueAttr());
                          }, 10);
                      }
                  }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages