@design.estate/dees-catalog 3.83.0 → 3.84.0

package/dist_bundle/bundle.js

@@ -164713,6 +164713,37 @@ var FORM_INPUT_TYPES = [
   DeesInputRichtext,
   DeesTable
 ];
+function isBuiltInFormInputElement(child) {
+  return FORM_INPUT_TYPES.includes(child.constructor);
+}
+__name(isBuiltInFormInputElement, "isBuiltInFormInputElement");
+function isExternalFormCompatibleElement(child) {
+  if (isBuiltInFormInputElement(child)) {
+    return false;
+  }
+  const candidate = child;
+  return typeof candidate.key === "string" && typeof candidate.changeSubject?.subscribe === "function" && typeof candidate.getValue === "function" && typeof candidate.setValue === "function";
+}
+__name(isExternalFormCompatibleElement, "isExternalFormCompatibleElement");
+function isFormInputElement(child) {
+  return isBuiltInFormInputElement(child) || isExternalFormCompatibleElement(child);
+}
+__name(isFormInputElement, "isFormInputElement");
+function getFormElementValue(child) {
+  if (isExternalFormCompatibleElement(child)) {
+    return child.getValue();
+  }
+  return child.value;
+}
+__name(getFormElementValue, "getFormElementValue");
+function setFormElementValue(child, value2) {
+  if (isExternalFormCompatibleElement(child)) {
+    child.setValue(value2);
+    return;
+  }
+  child.value = value2;
+}
+__name(setFormElementValue, "setFormElementValue");
 _DeesForm_decorators = [customElement("dees-form")];
 var _DeesForm = class _DeesForm extends (_a43 = DeesElement, _horizontalLayout_dec = [n5({ type: Boolean, reflect: true, attribute: "horizontal-layout" })], _a43) {
   constructor() {
@@ -164732,19 +164763,19 @@ var _DeesForm = class _DeesForm extends (_a43 = DeesElement, _horizontalLayout_d
     this.updateRequiredStatus();
     this.updateChildrenLayoutMode();
     for (const child of formChildren) {
-      child.changeSubject.subscribe(async () => {
+      const childSubscription = child.changeSubject.subscribe(async () => {
         const valueObject = await this.collectFormData();
         this.changeSubject.next(valueObject);
-        console.log(valueObject);
         this.updateRequiredStatus();
       });
+      this.rxSubscriptions.push(childSubscription);
     }
     await this.addBehaviours();
     this.readyDeferred.resolve();
   }
   getFormElements() {
     return Array.from(this.querySelectorAll("*")).filter(
-      (child) => FORM_INPUT_TYPES.includes(child.constructor)
+      (child) => isFormInputElement(child)
     );
   }
   getSubmitButton() {
@@ -164753,10 +164784,9 @@ var _DeesForm = class _DeesForm extends (_a43 = DeesElement, _horizontalLayout_d
     );
   }
   async updateRequiredStatus() {
-    console.log("checking the required status.");
     let requiredOK = true;
     for (const childArg of this.getFormElements()) {
-      if (childArg.required && !childArg.value) {
+      if (childArg.required && !getFormElementValue(childArg)) {
         requiredOK = false;
       }
     }
@@ -164777,7 +164807,7 @@ var _DeesForm = class _DeesForm extends (_a43 = DeesElement, _horizontalLayout_d
         console.log(`form element with label "${child.label}" has no key. skipping.`);
         continue;
       }
-      valueObject[child.key] = child.value;
+      valueObject[child.key] = getFormElementValue(child);
     }
     return valueObject;
   }
@@ -164790,8 +164820,6 @@ var _DeesForm = class _DeesForm extends (_a43 = DeesElement, _horizontalLayout_d
       bubbles: true
     });
     this.dispatchEvent(formDataEvent);
-    console.log("dispatched data:");
-    console.log(valueObject);
   }
   setStatus(visualStateArg, textStateArg) {
     const inputChildren = this.getFormElements();
@@ -164835,14 +164863,14 @@ var _DeesForm = class _DeesForm extends (_a43 = DeesElement, _horizontalLayout_d
   reset() {
     const inputChildren = this.getFormElements();
     for (const inputChild of inputChildren) {
-      inputChild.value = null;
+      setFormElementValue(inputChild, null);
     }
     this.setStatus("normal", "Submit");
   }
   async addBehaviours() {
     this.addEventListener("keydown", (event) => {
       const target = event.target;
-      if (!FORM_INPUT_TYPES.includes(target.constructor)) return;
+      if (!isFormInputElement(target)) return;
       if (event.key === "Enter") {
         const children2 = this.getFormElements();
         const currentIndex = children2.indexOf(target);
@@ -200528,7 +200556,7 @@ init_group_runtime();
 // ts_web/00_commitinfo_data.ts
 var commitinfo = {
   name: "@design.estate/dees-catalog",
-  version: "3.83.0",
+  version: "3.84.0",
   description: "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript."
 };
 export {

package/dist_ts_web/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@design.estate/dees-catalog',
-    version: '3.83.0',
+    version: '3.84.0',
     description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsNkJBQTZCO0lBQ25DLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSxzSkFBc0o7Q0FDcEssQ0FBQSJ9

package/dist_ts_web/elements/00group-form/dees-form/dees-form.d.ts

@@ -19,7 +19,26 @@ import { DeesInputWysiwyg } from '../../00group-input/dees-input-wysiwyg/dees-in
 import { DeesInputRichtext } from '../../00group-input/dees-input-richtext/component.js';
 import { DeesFormSubmit } from '../dees-form-submit/dees-form-submit.js';
 import { DeesTable } from '../../00group-dataview/dees-table/index.js';
-export type TFormInputElement = DeesInputCheckbox | DeesInputCode | DeesInputDatepicker | DeesInputDropdown | DeesInputFileupload | DeesInputIban | DeesInputMultitoggle | DeesInputPhone | DeesInputQuantitySelector | DeesInputRadiogroup | DeesInputText | DeesInputToggle | DeesInputTypelist | DeesInputTags | DeesInputList | DeesInputWysiwyg | DeesInputRichtext | DeesTable<any>;
+export interface IFormCompatibleElement extends HTMLElement {
+    key?: string;
+    label?: string;
+    value?: unknown;
+    required?: boolean;
+    disabled?: boolean;
+    layoutMode?: 'vertical' | 'horizontal' | 'auto';
+    changeSubject?: {
+        subscribe: (callback: (...args: unknown[]) => unknown) => domtools.plugins.smartrx.rxjs.Subscription;
+    };
+    getValue?: () => unknown;
+    setValue?: (value: unknown) => void;
+}
+export type TFormDataValue = string | number | boolean | null | undefined | unknown[] | File[] | {
+    option: string;
+    key: string;
+    payload?: unknown;
+} | Record<string, unknown>;
+export type TFormData = Record<string, TFormDataValue>;
+export type TFormInputElement = DeesInputCheckbox | DeesInputCode | DeesInputDatepicker | DeesInputDropdown | DeesInputFileupload | DeesInputIban | DeesInputMultitoggle | DeesInputPhone | DeesInputQuantitySelector | DeesInputRadiogroup | DeesInputText | DeesInputToggle | DeesInputTypelist | DeesInputTags | DeesInputList | DeesInputWysiwyg | DeesInputRichtext | DeesTable<any> | IFormCompatibleElement;
 declare global {
     interface HTMLElementTagNameMap {
         'dees-form': DeesForm;
@@ -46,13 +65,7 @@ export declare class DeesForm extends DeesElement {
      * collects the form data
      * @returns
      */
-    collectFormData(): Promise<{
-        [key: string]: string | number | boolean | any[] | File[] | {
-            option: string;
-            key: string;
-            payload?: any;
-        };
-    }>;
+    collectFormData(): Promise<TFormData>;
     gatherAndDispatch(): Promise<void>;
     setStatus(visualStateArg: 'normal' | 'pending' | 'error' | 'success', textStateArg: string): void;
     /**

package/dist_ts_web/elements/00group-form/dees-form/dees-form.js

@@ -75,6 +75,35 @@ const FORM_INPUT_TYPES = [
     DeesInputRichtext,
     DeesTable,
 ];
+function isBuiltInFormInputElement(child) {
+    return FORM_INPUT_TYPES.includes(child.constructor);
+}
+function isExternalFormCompatibleElement(child) {
+    if (isBuiltInFormInputElement(child)) {
+        return false;
+    }
+    const candidate = child;
+    return typeof candidate.key === 'string'
+        && typeof candidate.changeSubject?.subscribe === 'function'
+        && typeof candidate.getValue === 'function'
+        && typeof candidate.setValue === 'function';
+}
+function isFormInputElement(child) {
+    return isBuiltInFormInputElement(child) || isExternalFormCompatibleElement(child);
+}
+function getFormElementValue(child) {
+    if (isExternalFormCompatibleElement(child)) {
+        return child.getValue();
+    }
+    return child.value;
+}
+function setFormElementValue(child, value) {
+    if (isExternalFormCompatibleElement(child)) {
+        child.setValue(value);
+        return;
+    }
+    child.value = value;
+}
 let DeesForm = (() => {
     let _classDecorators = [customElement('dees-form')];
     let _classDescriptor;
@@ -132,28 +161,27 @@ let DeesForm = (() => {
             this.updateRequiredStatus();
             this.updateChildrenLayoutMode();
             for (const child of formChildren) {
-                child.changeSubject.subscribe(async () => {
+                const childSubscription = child.changeSubject.subscribe(async () => {
                     const valueObject = await this.collectFormData();
                     this.changeSubject.next(valueObject);
-                    console.log(valueObject);
                     this.updateRequiredStatus();
                 });
+                this.rxSubscriptions.push(childSubscription);
             }
             await this.addBehaviours();
             this.readyDeferred.resolve();
         }
         getFormElements() {
             // Use querySelectorAll('*') to find form inputs nested inside wrapper elements (e.g. <div>)
-            return Array.from(this.querySelectorAll('*')).filter((child) => FORM_INPUT_TYPES.includes(child.constructor));
+            return Array.from(this.querySelectorAll('*')).filter((child) => isFormInputElement(child));
         }
         getSubmitButton() {
             return Array.from(this.querySelectorAll('*')).find((child) => child instanceof DeesFormSubmit);
         }
         async updateRequiredStatus() {
-            console.log('checking the required status.');
             let requiredOK = true;
             for (const childArg of this.getFormElements()) {
-                if (childArg.required && !childArg.value) {
+                if (childArg.required && !getFormElementValue(childArg)) {
                     requiredOK = false;
                 }
             }
@@ -174,7 +202,7 @@ let DeesForm = (() => {
                     console.log(`form element with label "${child.label}" has no key. skipping.`);
                     continue;
                 }
-                valueObject[child.key] = child.value;
+                valueObject[child.key] = getFormElementValue(child);
             }
             return valueObject;
         }
@@ -187,8 +215,6 @@ let DeesForm = (() => {
                 bubbles: true,
             });
             this.dispatchEvent(formDataEvent);
-            console.log('dispatched data:');
-            console.log(valueObject);
         }
         setStatus(visualStateArg, textStateArg) {
             const inputChildren = this.getFormElements();
@@ -233,7 +259,7 @@ let DeesForm = (() => {
         reset() {
             const inputChildren = this.getFormElements();
             for (const inputChild of inputChildren) {
-                inputChild.value = null;
+                setFormElementValue(inputChild, null);
             }
             this.setStatus('normal', 'Submit');
         }
@@ -241,7 +267,7 @@ let DeesForm = (() => {
             // Use event delegation
             this.addEventListener('keydown', (event) => {
                 const target = event.target;
-                if (!FORM_INPUT_TYPES.includes(target.constructor))
+                if (!isFormInputElement(target))
                     return;
                 if (event.key === 'Enter') {
                     const children = this.getFormElements();
@@ -288,4 +314,4 @@ let DeesForm = (() => {
     return DeesForm = _classThis;
 })();
 export { DeesForm };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dees-form.js","sourceRoot":"","sources":["../../../../ts_web/elements/00group-form/dees-form/dees-form.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dees-form.js","sourceRoot":"","sources":["../../../../ts_web/elements/00group-form/dees-form/dees-form.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EACL,aAAa,EACb,IAAI,EACJ,GAAG,EAEH,WAAW,EAEX,QAAQ,GACT,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gEAAgE,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AACvF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gFAAgF,CAAC;AAC3H,OAAO,EAAE,mBAAmB,EAAE,MAAM,oEAAoE,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAE,MAAM,gEAAgE,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sEAAsE,CAAC;AAC5G,OAAO,EAAE,cAAc,EAAE,MAAM,0DAA0D,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,4DAA4D,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,gEAAgE,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8DAA8D,CAAC;AAChG,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,mCAAmC;AACnC,MAAM,gBAAgB,GAAG;IACvB,iBAAiB;IACjB,aAAa;IACb,mBAAmB;IACnB,iBAAiB;IACjB,mBAAmB;IACnB,aAAa;IACb,oBAAoB;IACpB,cAAc;IACd,yBAAyB;IACzB,mBAAmB;IACnB,aAAa;IACb,eAAe;IACf,iBAAiB;IACjB,aAAa;IACb,aAAa;IACb,gBAAgB;IAChB,iBAAiB;IACjB,SAAS;CACV,CAAC;AAsDF,SAAS,yBAAyB,CAAC,KAAc;IAC/C,OAAO,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAkB,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,+BAA+B,CAAC,KAAc;IACrD,IAAI,yBAAyB,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,SAAS,GAAG,KAA+B,CAAC;IAClD,OAAO,OAAO,SAAS,CAAC,GAAG,KAAK,QAAQ;WACnC,OAAO,SAAS,CAAC,aAAa,EAAE,SAAS,KAAK,UAAU;WACxD,OAAO,SAAS,CAAC,QAAQ,KAAK,UAAU;WACxC,OAAO,SAAS,CAAC,QAAQ,KAAK,UAAU,CAAC;AAChD,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,yBAAyB,CAAC,KAAK,CAAC,IAAI,+BAA+B,CAAC,KAAK,CAAC,CAAC;AACpF,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAwB;IACnD,IAAI,+BAA+B,CAAC,KAAgB,CAAC,EAAE,CAAC;QACtD,OAAQ,KAAgC,CAAC,QAAS,EAAoB,CAAC;IACzE,CAAC;IACD,OAAQ,KAAmC,CAAC,KAAK,CAAC;AACpD,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAwB,EAAE,KAAqB;IAC1E,IAAI,+BAA+B,CAAC,KAAgB,CAAC,EAAE,CAAC;QACrD,KAAgC,CAAC,QAAS,CAAC,KAAK,CAAC,CAAC;QACnD,OAAO;IACT,CAAC;IACA,KAAmC,CAAC,KAAK,GAAG,KAAK,CAAC;AACrD,CAAC;IASY,QAAQ;4BADpB,aAAa,CAAC,WAAW,CAAC;;;;sBACG,WAAW;;;;wBAAnB,SAAQ,WAAW;;;;4CAYtC,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,mBAAmB,EAAE,CAAC;YAC3E,qMAAS,gBAAgB,6BAAhB,gBAAgB,2GAAkB;YAb7C,6KAgNC;;;;QA/MQ,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC;QACvB,MAAM,CAAC,UAAU,GAAG,CAAC,MAAM,CAAC,CAAC;QAE7B,IAAI,GAAW,QAAQ,CAAC;QACxB,aAAa,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5D,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAO7D,6FAAqC,KAAK,EAAC;QAL3C;;;WAGG;QAEH,IAAS,gBAAgB,sDAAkB;QAA3C,IAAS,gBAAgB,4DAAkB;QAEpC,MAAM,CAAC,MAAM,GAAG;YACrB,GAAG,CAAA;;;;;;;;;;;;;KAaF;SACF,CAAC;QAEK,MAAM;YACX,OAAO,IAAI,CAAA;;KAEV,CAAC;QACJ,CAAC;QAEM,KAAK,CAAC,YAAY;YACvB,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAC5C,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC5B,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAEhC,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;gBACjC,MAAM,iBAAiB,GAAI,KAAK,CAAC,aAA2C,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;oBAChG,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;oBACjD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACrC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC9B,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC/C,CAAC;YACD,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC3B,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC;QAEM,eAAe;YACpB,4FAA4F;YAC5F,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAC7D,kBAAkB,CAAC,KAAK,CAAC,CACQ,CAAC;QACtC,CAAC;QAEM,eAAe;YACpB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAChD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,cAAc,CACzB,CAAC;QACtB,CAAC;QAEM,KAAK,CAAC,oBAAoB;YAC/B,IAAI,UAAU,GAAG,IAAI,CAAC;YACtB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;gBAC9C,IAAI,QAAQ,CAAC,QAAQ,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACxD,UAAU,GAAG,KAAK,CAAC;gBACrB,CAAC;YACH,CAAC;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAC5C,IAAI,YAAY,EAAE,CAAC;gBACjB,YAAY,CAAC,QAAQ,GAAG,CAAC,UAAU,CAAC;YACtC,CAAC;QACH,CAAC;QAED;;;WAGG;QACI,KAAK,CAAC,eAAe;YAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YACxC,MAAM,WAAW,GAAc,EAAE,CAAC;YAElC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;gBAC7B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;oBACf,OAAO,CAAC,GAAG,CAAC,4BAA4B,KAAK,CAAC,KAAK,yBAAyB,CAAC,CAAC;oBAC9E,SAAS;gBACX,CAAC;gBAED,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACtD,CAAC;YAED,OAAO,WAAW,CAAC;QACrB,CAAC;QAEM,KAAK,CAAC,iBAAiB;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YACjD,MAAM,aAAa,GAAG,IAAI,WAAW,CAAC,UAAU,EAAE;gBAChD,MAAM,EAAE;oBACN,IAAI,EAAE,WAAW;iBAClB;gBACD,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QACpC,CAAC;QAEM,SAAS,CACd,cAA0D,EAC1D,YAAoB;YAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAC5C,IAAI,CAAC,YAAY;gBAAE,OAAO;YAE1B,QAAQ,cAAc,EAAE,CAAC;gBACvB,KAAK,QAAQ;oBACX,YAAY,CAAC,QAAQ,GAAG,KAAK,CAAC;oBAC9B,YAAY,CAAC,MAAM,GAAG,QAAQ,CAAC;oBAC/B,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;wBACvC,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC;oBAC9B,CAAC;oBACD,MAAM;gBACR,KAAK,SAAS;oBACZ,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC7B,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC;oBAChC,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;wBACvC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC7B,CAAC;oBACD,MAAM;gBACR,KAAK,SAAS;oBACZ,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC7B,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC;oBAChC,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;wBACvC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC7B,CAAC;oBACD,MAAM;gBACR,KAAK,OAAO;oBACV,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC7B,YAAY,CAAC,MAAM,GAAG,OAAO,CAAC;oBAC9B,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;wBACvC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC7B,CAAC;oBACD,MAAM;YACV,CAAC;YAED,YAAY,CAAC,IAAI,GAAG,YAAY,CAAC;QACnC,CAAC;QAED;;WAEG;QACH,KAAK;YACH,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAE7C,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;gBACvC,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QAEM,KAAK,CAAC,aAAa;YACxB,uBAAuB;YACvB,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,KAAoB,EAAE,EAAE;gBACxD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAqB,CAAC;gBAC3C,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;oBAAE,OAAO;gBAExC,IAAI,KAAK,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;oBAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;oBACxC,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAa,CAAC,CAAC;oBACrD,IAAI,YAAY,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACvC,QAAQ,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;oBACrC,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,IAAI,EAAE,CAAC;wBACd,IAAI,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC;oBAClC,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED;;WAEG;QACK,wBAAwB;YAC9B,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAC5C,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;gBACjC,IAAI,YAAY,IAAI,KAAK,EAAE,CAAC;oBAC1B,4EAA4E;oBAC3E,KAAa,CAAC,UAAU,GAAG,MAAM,CAAC;gBACrC,CAAC;YACH,CAAC;QACH,CAAC;QAED;;WAEG;QACH,OAAO,CAAC,iBAAmC;YACzC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAEjC,IAAI,iBAAiB,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAClC,CAAC;QACH,CAAC;;;;;;YA/MU,uDAAQ;;;;;SAAR,QAAQ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@design.estate/dees-catalog",
-  "version": "3.83.0",
+  "version": "3.84.0",
   "private": false,
   "description": "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.",
   "main": "dist_ts_web/index.js",

package/ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@design.estate/dees-catalog',
-  version: '3.83.0',
+  version: '3.84.0',
   description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
 }

package/ts_web/elements/00group-form/dees-form/dees-form.ts

@@ -52,6 +52,37 @@ const FORM_INPUT_TYPES = [
   DeesTable,
 ];
 
+export interface IFormCompatibleElement extends HTMLElement {
+  key?: string;
+  label?: string;
+  value?: unknown;
+  required?: boolean;
+  disabled?: boolean;
+  layoutMode?: 'vertical' | 'horizontal' | 'auto';
+  changeSubject?: {
+    subscribe: (callback: (...args: unknown[]) => unknown) => domtools.plugins.smartrx.rxjs.Subscription;
+  };
+  getValue?: () => unknown;
+  setValue?: (value: unknown) => void;
+}
+
+export type TFormDataValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | unknown[]
+  | File[]
+  | { option: string; key: string; payload?: unknown }
+  | Record<string, unknown>;
+
+export type TFormData = Record<string, TFormDataValue>;
+
+type TFormElementChangeSubject = {
+  subscribe: (callback: () => Promise<void>) => domtools.plugins.smartrx.rxjs.Subscription;
+};
+
 export type TFormInputElement =
   | DeesInputCheckbox
   | DeesInputCode
@@ -70,7 +101,42 @@ export type TFormInputElement =
   | DeesInputList
   | DeesInputWysiwyg
   | DeesInputRichtext
-  | DeesTable<any>;
+  | DeesTable<any>
+  | IFormCompatibleElement;
+
+function isBuiltInFormInputElement(child: Element): boolean {
+  return FORM_INPUT_TYPES.includes(child.constructor as any);
+}
+
+function isExternalFormCompatibleElement(child: Element): child is IFormCompatibleElement {
+  if (isBuiltInFormInputElement(child)) {
+    return false;
+  }
+  const candidate = child as IFormCompatibleElement;
+  return typeof candidate.key === 'string'
+    && typeof candidate.changeSubject?.subscribe === 'function'
+    && typeof candidate.getValue === 'function'
+    && typeof candidate.setValue === 'function';
+}
+
+function isFormInputElement(child: Element): child is TFormInputElement {
+  return isBuiltInFormInputElement(child) || isExternalFormCompatibleElement(child);
+}
+
+function getFormElementValue(child: TFormInputElement): TFormDataValue {
+  if (isExternalFormCompatibleElement(child as Element)) {
+    return (child as IFormCompatibleElement).getValue!() as TFormDataValue;
+  }
+  return (child as { value: TFormDataValue }).value;
+}
+
+function setFormElementValue(child: TFormInputElement, value: TFormDataValue): void {
+  if (isExternalFormCompatibleElement(child as Element)) {
+    (child as IFormCompatibleElement).setValue!(value);
+    return;
+  }
+  (child as { value: TFormDataValue }).value = value;
+}
 
 declare global {
   interface HTMLElementTagNameMap {
@@ -123,12 +189,12 @@ export class DeesForm extends DeesElement {
     this.updateChildrenLayoutMode();
 
     for (const child of formChildren) {
-      child.changeSubject.subscribe(async () => {
+      const childSubscription = (child.changeSubject as TFormElementChangeSubject).subscribe(async () => {
         const valueObject = await this.collectFormData();
         this.changeSubject.next(valueObject);
-        console.log(valueObject);
         this.updateRequiredStatus();
       });
+      this.rxSubscriptions.push(childSubscription);
     }
     await this.addBehaviours();
     this.readyDeferred.resolve();
@@ -137,7 +203,7 @@ export class DeesForm extends DeesElement {
   public getFormElements(): Array<TFormInputElement> {
     // Use querySelectorAll('*') to find form inputs nested inside wrapper elements (e.g. <div>)
     return Array.from(this.querySelectorAll('*')).filter((child) =>
-      FORM_INPUT_TYPES.includes(child.constructor as any)
+      isFormInputElement(child)
     ) as unknown as TFormInputElement[];
   }
 
@@ -148,11 +214,9 @@ export class DeesForm extends DeesElement {
   }
 
   public async updateRequiredStatus() {
-    console.log('checking the required status.');
-
     let requiredOK = true;
     for (const childArg of this.getFormElements()) {
-      if (childArg.required && !childArg.value) {
+      if (childArg.required && !getFormElementValue(childArg)) {
         requiredOK = false;
       }
     }
@@ -168,7 +232,7 @@ export class DeesForm extends DeesElement {
    */
   public async collectFormData() {
     const children = this.getFormElements();
-    const valueObject: { [key: string]: string | number | boolean | any[] | File[] | { option: string; key: string; payload?: any } } = {};
+    const valueObject: TFormData = {};
     
     for (const child of children) {
       if (!child.key) {
@@ -176,7 +240,7 @@ export class DeesForm extends DeesElement {
         continue;
       }
       
-      valueObject[child.key] = child.value;
+      valueObject[child.key] = getFormElementValue(child);
     }
     
     return valueObject;
@@ -191,8 +255,6 @@ export class DeesForm extends DeesElement {
       bubbles: true,
     });
     this.dispatchEvent(formDataEvent);
-    console.log('dispatched data:');
-    console.log(valueObject);
   }
 
   public setStatus(
@@ -244,7 +306,7 @@ export class DeesForm extends DeesElement {
     const inputChildren = this.getFormElements();
 
     for (const inputChild of inputChildren) {
-      inputChild.value = null;
+      setFormElementValue(inputChild, null);
     }
     this.setStatus('normal', 'Submit');
   }
@@ -253,7 +315,7 @@ export class DeesForm extends DeesElement {
     // Use event delegation
     this.addEventListener('keydown', (event: KeyboardEvent) => {
       const target = event.target as DeesElement;
-      if (!FORM_INPUT_TYPES.includes(target.constructor as any)) return;
+      if (!isFormInputElement(target)) return;
 
       if (event.key === 'Enter') {
         const children = this.getFormElements();