feat: sync changes from v2 to v2-develop (#150)

Co-authored-by: ecarreras <[email protected]>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "2.21.0",
+  "version": "2.22.0",
   "engines": {
     "node": "20.5.0"
   },

src/Field.ts

@@ -117,14 +117,6 @@ class Field extends Widget {
     this._selectionValues = value;
   }
 
-  /**
-   * Base type of the field
-   */
-  _fieldType: string = "";
-  get fieldType(): string {
-    return this._fieldType;
-  }
-
   constructor(props: any) {
     super(props);
 
@@ -136,10 +128,6 @@ class Field extends Widget {
         this._id = props.name;
       }
 
-      if (props.type) {
-        this._fieldType = props.fieldsWidgetType;
-      }
-
       if (props.activated) {
         this._activated = props.activated;
       }

src/Widget.ts

@@ -115,6 +115,14 @@ abstract class Widget {
     this._isFunction = value;
   }
 
+  /**
+   * Base type of the field
+   */
+  _fieldType: string = "";
+  get fieldType(): string {
+    return this._fieldType;
+  }
+
   constructor(props?: any) {
     this._colspan = Widget._defaultColspan;
     this._invisible = false;
@@ -160,6 +168,9 @@ abstract class Widget {
           this._domain = replaceEntities(props.domain);
         }
       }
+      if (props.type) {
+        this._fieldType = props.fieldsWidgetType;
+      }
       if (props.widget_props) {
         if (typeof props.widget_props === "string") {
           try {