From 9d47b91f68616f998322bae9422105148ba7ac13 Mon Sep 17 00:00:00 2001
From: apalanevich <spalanevich@mail.ru>
Date: Sun, 25 Apr 2021 15:07:57 +0300
Subject: [PATCH] fix(uip-setting): fix adding extra whitespace when changing
 value

---
 src/settings/setting/bool-setting/bool-setting.ts     |  5 +++--
 src/settings/setting/select-setting/select-setting.ts | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/settings/setting/bool-setting/bool-setting.ts b/src/settings/setting/bool-setting/bool-setting.ts
index 14fa2129..3b8bb281 100644
--- a/src/settings/setting/bool-setting/bool-setting.ts
+++ b/src/settings/setting/bool-setting/bool-setting.ts
@@ -23,10 +23,11 @@ export class UIPBoolSetting extends UIPSetting {
     }
 
     const val = this.getDisplayedValue() as (string | false);
-    const valRegex = new RegExp(/\b/.source + this.value + /\b/.source);
+    const valRegex = new RegExp(` ?${this.value} ?`);
 
     model.transformAttribute(this.target, this.attribute, attrValue => {
-      return attrValue === null ? val || null : attrValue.replace(valRegex, '') + ` ${val || ''}`;
+      console.log(attrValue?.replace(valRegex, ''));
+      return attrValue === null ? val || null : attrValue.replace(valRegex, '') + `${val ? ' ' + val : ''}`;
     });
   }
 
diff --git a/src/settings/setting/select-setting/select-setting.ts b/src/settings/setting/select-setting/select-setting.ts
index 3f81dd12..7cb226b7 100644
--- a/src/settings/setting/select-setting/select-setting.ts
+++ b/src/settings/setting/select-setting/select-setting.ts
@@ -29,7 +29,6 @@ export class UIPSelectSetting extends UIPSetting {
     select.multiple = this.multiple;
     select.addEventListener('change', () => {
       select.remove(this.values.indexOf(UIPSelectSetting.inconsistentState.value));
-      this.$field.update();
     });
 
     this.$field.appendChild(select);
@@ -42,11 +41,11 @@ export class UIPSelectSetting extends UIPSetting {
     }
 
     const val = this.getDisplayedValue();
-    const optRegex = (opt: string) => new RegExp(/\b/.source + opt + /\b/.source);
+    const optRegex = (opt: string) => new RegExp(` ?${opt} ?`);
 
     model.transformAttribute(this.target, this.attribute, attrValue => {
       return attrValue === null ? val || null : this.values.reduce((outStr, option) =>
-        outStr.replace(optRegex(option), ''), attrValue) + ` ${val}`;
+        outStr.replace(optRegex(option), ''), attrValue) + `${val ? ' ' + val : ''}`;
     });
   }
 
@@ -84,17 +83,18 @@ export class UIPSelectSetting extends UIPSetting {
 
   protected setInconsistency(): void {
     this.reset();
-    this.$field.$select.remove(this.values.indexOf(UIPSelectSetting.inconsistentState.value));
 
     const inconsistentOption = new Option(UIPSelectSetting.inconsistentState.text,
       UIPSelectSetting.inconsistentState.value, false, true);
     inconsistentOption.disabled = true;
 
-    this.$field.$select.add(inconsistentOption);
+    this.$field.$select.add(inconsistentOption, 0);
+    this.$field.update();
   }
 
   protected reset(): void {
     this.$field.options.forEach(opt => opt.selected = false);
+    this.$field.$select.remove(this.values.indexOf(UIPSelectSetting.inconsistentState.value));
   }
 
   protected isValid(): boolean {