@gisce/ooui 2.28.0 → 2.29.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "2.28.0",
+  "version": "2.29.0-alpha.1",
   "engines": {
     "node": "20.5.0"
   },

package/src/Field.ts

@@ -147,6 +147,11 @@ class Field extends Widget {
     super.readOnly = value;
   }
 
+  _raw_props: any;
+  get raw_props(): any {
+    return this._raw_props;
+  }
+
   constructor(props: any) {
     super(props);
 
@@ -154,6 +159,7 @@ class Field extends Widget {
     this._activated = true;
 
     if (props) {
+      this._raw_props = props;
       if (props.name) {
         this._id = props.name;
       }

package/src/Tag.ts

@@ -7,6 +7,10 @@ class Tag extends Selection {
   get colors(): any | "auto" {
     return this._parsedWidgetProps.colors || {};
   }
+
+  get colorField(): string | null {
+    return this._parsedWidgetProps?.colorField || null;
+  }
 }
 
 export default Tag;

package/src/helpers/attributeParser.ts

@@ -278,15 +278,6 @@ const evaluateAttributes = ({
   fallbackMode?: boolean;
 }) => {
   let finalTagAttributes = {};
-  let oldTagAttributes = {};
-  if (tagAttributes.attrs) {
-    oldTagAttributes = parseAttributes({
-      attrs: tagAttributes.attrs,
-      values,
-      fields,
-      widgetType,
-    });
-  }
 
   if (tagAttributes.json_attrs) {
     try {
@@ -298,13 +289,23 @@ const evaluateAttributes = ({
       });
     } catch (error) {
       if (fallbackMode && tagAttributes.attrs) {
-        finalTagAttributes = oldTagAttributes;
+        finalTagAttributes = parseAttributes({
+          attrs: tagAttributes.attrs,
+          values,
+          fields,
+          widgetType,
+        });
       } else {
         throw error;
       }
     }
   } else if (tagAttributes.attrs) {
-    finalTagAttributes = oldTagAttributes;
+    finalTagAttributes = parseAttributes({
+      attrs: tagAttributes.attrs,
+      values,
+      fields,
+      widgetType,
+    });
   }
 
   return {

package/src/spec/Tag.spec.ts

@@ -44,4 +44,26 @@ describe("A Tag widget", () => {
       expect(widget.colors).toStrictEqual("auto");
     });
   });
+
+  describe("colorField property", () => {
+    it("should have default colorField to null", () => {
+      const widgetFactory = new WidgetFactory();
+      const props = {
+        name: "status",
+      };
+      const widget = widgetFactory.createWidget("tag", props);
+
+      expect(widget.colorField).toBeNull();
+    });
+    it("should parse colorField property", () => {
+      const widgetFactory = new WidgetFactory();
+      const props = {
+        name: "status",
+        widget_props: '{"colorField": "color"}',
+      };
+      const widget = widgetFactory.createWidget("tag", props);
+
+      expect(widget.colorField).toBe("color");
+    });
+  });
 });