Merge pull request #25 from mallik-svmx/UI-3113

UI-3113: DateTime field space is not calculated correctly when default value MM/DD/YY
predixdesignsystem · Jan 31, 2019 · a797a4b · a797a4b
2 parents ecf0c1b + 42b08b1
commit a797a4b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,4 +1,8 @@
-v3.3.3
+v3.2.4
+==================
+* Fixed DateTime field spacing issue when default value MM/DD/YY on Edge and Firefox.
+
+v3.2.3
 ==================
 * Fixed regression in px-icon sizes.
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "px-datetime-common",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "main": [
     "px-datetime-common.html"
   ],
@@ -60,4 +60,4 @@
     }
   },
   "license": "Apache-2.0"
-}
+}
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "px-datetime-common",
   "author": "General Electric",
   "description": "A Px component",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "private": false,
   "extName": null,
   "repository": {

diff --git a/px-datetime-entry-cell.html b/px-datetime-entry-cell.html
@@ -249,7 +249,8 @@
         length = ctx.measureText(this.$$('.datetime-entry-input').value.toUpperCase()).width + 1;
       }
       else {
-        length = ctx.measureText(this.$$('.datetime-entry-input').placeholder).width;
+        // the extra width is needed for the placeholder ONLY on Edge and Firefox
+        length = ctx.measureText(this.$$('.datetime-entry-input').placeholder).width + 2;
       }
       length = Math.ceil(length);
       this.$$('.datetime-entry-input').style['width'] = length + 'px';

diff --git a/test/px-datetime-entry-tests.js b/test/px-datetime-entry-tests.js
@@ -1016,7 +1016,8 @@ suite('px-datetime-entry-cell empty', function () {
     MockInteractions.pressAndReleaseKeyOn(cells[0], 40, [], 'ArrowDown');
 
     expect(theInput[0].value)
-      .to.eventuallyEqual('59', {within: 1000, every: 100}, done);
+      .to.eventuallyEqual('59', {within: 1000, every: 100});
+      done();
     });
   });