From dd46d9785bfb571533435045cdb24b7083d04c66 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 30 Nov 2021 17:13:06 +0100
Subject: [PATCH] Join composite properties

---
 src/style_manager/model/Property.js          |  6 +++---
 src/style_manager/model/PropertyComposite.js | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/style_manager/model/Property.js b/src/style_manager/model/Property.js
index db48f83e6..615a5f76f 100644
--- a/src/style_manager/model/Property.js
+++ b/src/style_manager/model/Property.js
@@ -263,11 +263,11 @@ export default class Property extends Model {
    */
   getDefaultValue() {
     const def = this.get('default');
-    return !isUndefined(def) ? def : this.get('defaults');
+    return `${!isUndefined(def) ? def : this.get('defaults')}`;
   }
 
-  __getFullValue() {
-    return this.getFullValue();
+  __getFullValue({ withDefault } = {}) {
+    return !this.hasValue() && withDefault ? this.getDefaultValue() : this.getFullValue();
   }
 
   /**
diff --git a/src/style_manager/model/PropertyComposite.js b/src/style_manager/model/PropertyComposite.js
index d90d6ef52..6ad4580e4 100644
--- a/src/style_manager/model/PropertyComposite.js
+++ b/src/style_manager/model/PropertyComposite.js
@@ -1,3 +1,4 @@
+import { isString } from 'underscore';
 import Property from './Property';
 
 export default Property.extend({
@@ -17,8 +18,11 @@ export default Property.extend({
     // Array of sub properties
     properties: [],
 
-    // Separator between properties
+    // Separator to use to split property values (only for not detached properties)
     separator: ' ',
+
+    // Separator to use to join property values (only for not detached properties)
+    join: null,
   },
 
   initialize(props = {}, opts = {}) {
@@ -45,10 +49,17 @@ export default Property.extend({
   __getFullValue() {
     if (this.get('detached')) return '';
     // TODO custom build of the value (eg. toValue({ values }), toStyle({ values, name }) )
+    // const values = this.getValues();
 
     return this.getProperties()
-      .map(p => p.__getFullValue())
-      .join(this.get('separator'));
+      .map(p => p.__getFullValue({ withDefault: 1 }))
+      .filter(Boolean)
+      .join(this.__getJoin());
+  },
+
+  __getJoin() {
+    const join = this.get('join');
+    return isString(join) ? join : this.get('separator');
   },
 
   /**
@@ -60,8 +71,7 @@ export default Property.extend({
   getValues({ byName } = {}) {
     return this.getProperties().reduce((res, prop) => {
       const key = byName ? prop.getName() : prop.getId();
-      const value = prop.hasValue() ? prop.__getFullValue() : prop.getDefaultValue();
-      res[key] = `${value}`;
+      res[key] = `${prop.__getFullValue({ withDefault: 1 })}`;
       return res;
     }, {});
   },