Demo_Gen: Default Values Bugfix (#701)

* Adding default values fix * Generation
rust-diplomat · Oct 1, 2024 · f9dfe7a · f9dfe7a
1 parent 32fd9ee
commit f9dfe7a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 30 deletions.
diff --git a/example/demo_gen/demo/rendering/rendering.mjs b/example/demo_gen/demo/rendering/rendering.mjs
diff --git a/feature_tests/demo_gen/demo/rendering/rendering.mjs b/feature_tests/demo_gen/demo/rendering/rendering.mjs
@@ -10,7 +10,7 @@ class ParameterTemplate extends HTMLElement {
     inputElement = null;
 
     static baseTemplate;
-    constructor(options = {}, className, selector, ...args) {
+    constructor(options = {}, className, selector, defaultValue=null, ...args) {
         super();
         generateTemplate(ParameterTemplate, "baseTemplate", "#parameter");
         generateTemplate(className, "template", selector);
@@ -34,6 +34,8 @@ class ParameterTemplate extends HTMLElement {
         if ("defaultValue" in options) {
             this.default = options.defaultValue;
             this.setValue(options.defaultValue);
+        } else {
+            this.default = defaultValue;
         }
     }
 
@@ -61,10 +63,9 @@ class ParameterTemplate extends HTMLElement {
 customElements.define("terminus-param", ParameterTemplate);
 
 class BooleanTemplate extends ParameterTemplate {
-    default = false;
     static template;
     constructor(options) {
-        super(options, BooleanTemplate, "template#boolean");
+        super(options, BooleanTemplate, "template#boolean", false);
     }
 
     getEventValue(event) {
@@ -79,10 +80,9 @@ class BooleanTemplate extends ParameterTemplate {
 customElements.define("terminus-param-boolean", BooleanTemplate);
 
 class NumberTemplate extends ParameterTemplate {
-    default = 0;
     static template;
     constructor(options) {
-        super(options, NumberTemplate, "template#number");
+        super(options, NumberTemplate, "template#number", 0);
     }
 
     getEventValue(event) {
@@ -93,20 +93,18 @@ class NumberTemplate extends ParameterTemplate {
 customElements.define("terminus-param-number", NumberTemplate);
 
 class StringTemplate extends ParameterTemplate {
-    default = "";
     static template;
     constructor(options) {
-        super(options, StringTemplate, "template#string");
+        super(options, StringTemplate, "template#string", "");
     }
 }
 
 customElements.define("terminus-param-string", StringTemplate);
 
 class StringArrayTemplate extends ParameterTemplate {
-    default = [];
     static template;
     constructor(options) {
-        super(options, StringArrayTemplate, "template#string-array");
+        super(options, StringArrayTemplate, "template#string-array", []);
     }
 
     getEventValue(event) {
@@ -136,7 +134,7 @@ class EnumTemplate extends ParameterTemplate {
 
     #enumType;
     constructor(options, enumType) {
-        super(options, EnumTemplate, "template#enum", enumType);
+        super(options, EnumTemplate, "template#enum", null, enumType);
         this.#enumType = enumType;
     }
 

diff --git a/tool/templates/demo_gen/default_renderer/rendering.mjs b/tool/templates/demo_gen/default_renderer/rendering.mjs
@@ -10,7 +10,7 @@ class ParameterTemplate extends HTMLElement {
     inputElement = null;
 
     static baseTemplate;
-    constructor(options = {}, className, selector, ...args) {
+    constructor(options = {}, className, selector, defaultValue=null, ...args) {
         super();
         generateTemplate(ParameterTemplate, "baseTemplate", "#parameter");
         generateTemplate(className, "template", selector);
@@ -34,6 +34,8 @@ class ParameterTemplate extends HTMLElement {
         if ("defaultValue" in options) {
             this.default = options.defaultValue;
             this.setValue(options.defaultValue);
+        } else {
+            this.default = defaultValue;
         }
     }
 
@@ -61,10 +63,9 @@ class ParameterTemplate extends HTMLElement {
 customElements.define("terminus-param", ParameterTemplate);
 
 class BooleanTemplate extends ParameterTemplate {
-    default = false;
     static template;
     constructor(options) {
-        super(options, BooleanTemplate, "template#boolean");
+        super(options, BooleanTemplate, "template#boolean", false);
     }
 
     getEventValue(event) {
@@ -79,10 +80,9 @@ class BooleanTemplate extends ParameterTemplate {
 customElements.define("terminus-param-boolean", BooleanTemplate);
 
 class NumberTemplate extends ParameterTemplate {
-    default = 0;
     static template;
     constructor(options) {
-        super(options, NumberTemplate, "template#number");
+        super(options, NumberTemplate, "template#number", 0);
     }
 
     getEventValue(event) {
@@ -93,20 +93,18 @@ class NumberTemplate extends ParameterTemplate {
 customElements.define("terminus-param-number", NumberTemplate);
 
 class StringTemplate extends ParameterTemplate {
-    default = "";
     static template;
     constructor(options) {
-        super(options, StringTemplate, "template#string");
+        super(options, StringTemplate, "template#string", "");
     }
 }
 
 customElements.define("terminus-param-string", StringTemplate);
 
 class StringArrayTemplate extends ParameterTemplate {
-    default = [];
     static template;
     constructor(options) {
-        super(options, StringArrayTemplate, "template#string-array");
+        super(options, StringArrayTemplate, "template#string-array", []);
     }
 
     getEventValue(event) {
@@ -136,7 +134,7 @@ class EnumTemplate extends ParameterTemplate {
 
     #enumType;
     constructor(options, enumType) {
-        super(options, EnumTemplate, "template#enum", enumType);
+        super(options, EnumTemplate, "template#enum", null, enumType);
         this.#enumType = enumType;
     }