X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Flibraries%2FUniqueId.js;fp=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Flibraries%2FUniqueId.js;h=3e3cd394ed853eaef471f66d122972bf571b349f;hp=8f7344eea205fdbaca71f92d6500ddef5cae9c1a;hb=03156e335275de1dafbc2a816e98006afdf249bf;hpb=f2dc2462571800e62cba969964de621dca09299c

diff --git a/skyquake/plugins/composer/src/src/libraries/UniqueId.js b/skyquake/plugins/composer/src/src/libraries/UniqueId.js
index 8f7344eea..3e3cd394e 100644
--- a/skyquake/plugins/composer/src/src/libraries/UniqueId.js
+++ b/skyquake/plugins/composer/src/src/libraries/UniqueId.js
@@ -45,8 +45,16 @@ export default class UID {
 		return !!UID.from(obj);
 	}
 
-	static assignUniqueId(obj) {
-		return obj[UID.propertyName] = UID.create();
+	static assignUniqueId(obj, uid = null) {
+		if (!obj || /undefined|null/.test(obj)) {
+			return;
+		}
+		uid = uid || UID.create();
+		if (obj.uiState) {
+			obj.uiState[UID.propertyName] = uid;
+		} else {
+			obj[UID.propertyName] = uid;
+		}
 	}
 
 }