StringBuilder and Combobox2 fixes (#180)

* this PR does following fixes - fix copy and paste - update value when using with formik - fix Combobox2 and make a new build - fix #178
TykTechnologies · Feb 2, 2021 · 8985606 · 8985606
1 parent 3863b8d
commit 8985606
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/lib/tyk-ui.js b/lib/tyk-ui.js
diff --git a/lib/tyk-ui.js.map b/lib/tyk-ui.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tyk-technologies/tyk-ui",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Tyk UI - ui reusable components",
   "main": "lib/index.js",
   "scripts": {

diff --git a/src/form/components/Combobox2/index.js b/src/form/components/Combobox2/index.js
@@ -398,11 +398,11 @@ function Combobox2(props) {
   ].join(' ');
   return (
     <div
-      className={getCssClasses()}
       ref={rootRef}
       tabIndex={disabled ? '-1' : '0'}
       onClickCapture={onClickCapture}
       {...restProps}
+      className={getCssClasses()}
     >
       {label && (
         <label style={{ flexBasis: labelwidth || 'auto' }}>{label}</label>

diff --git a/src/form/components/StringBuilder/index.js b/src/form/components/StringBuilder/index.js
@@ -61,11 +61,9 @@ const StringBuilder = (props) => {
   }, [tokenValue]);
 
   useEffect(() => {
-    if (invalidTokenRegex) {
-      const tempVal = invalidTokenRegex ? value.replaceAll(invalidTokenRegex, '  $&      ') : value;
-      setTokenValue(tempVal);
-      setTokenString(stringToTokenString(tempVal, options));
-    }
+    const tempVal = invalidTokenRegex ? value.replaceAll(invalidTokenRegex, '  $&      ') : value;
+    setTokenValue(tempVal);
+    setTokenString(stringToTokenString(tempVal, options));
   }, [value]);
 
   /**

diff --git a/src/form/components/StringBuilder/js/string-input.js b/src/form/components/StringBuilder/js/string-input.js
@@ -156,6 +156,7 @@ const StringInput = ({
   };
 
   const handlePasteEvent = (e) => {
+    e.preventDefault();
     const { clipboardData } = e;
     const { selectionStart, selectionEnd } = e.target;
     setIsPasteEvent(true);