From ca502d4fdd24a7f5813de80e08488795b1fc060b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Domenet?=
 <49250187+sdomenet@users.noreply.github.com>
Date: Fri, 12 Apr 2019 17:48:46 +0200
Subject: [PATCH 1/2] fix(text-field): Fixed asterisk color where it stays in
 error color even after input is resolved (#4576)

---
 packages/mdc-textfield/_mixins.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/mdc-textfield/_mixins.scss b/packages/mdc-textfield/_mixins.scss
index 73ea7b98228..9badcbc6eeb 100644
--- a/packages/mdc-textfield/_mixins.scss
+++ b/packages/mdc-textfield/_mixins.scss
@@ -159,6 +159,10 @@
   @include mdc-text-field-helper-text-validation-color($mdc-text-field-error);
   @include mdc-text-field-caret-color($mdc-text-field-error);
 
+  @include mdc-required-text-field-label-asterisk_ {
+    @include mdc-theme-prop(color, $mdc-text-field-error);
+  }
+
   &.mdc-text-field--with-trailing-icon {
     &:not(.mdc-text-field--with-leading-icon) {
       @include mdc-text-field-icon-color($mdc-text-field-error);
@@ -178,7 +182,7 @@
   @include mdc-text-field-label-color($mdc-text-field-focused-label-color);
 
   @include mdc-required-text-field-label-asterisk_ {
-    @include mdc-theme-prop(color, $mdc-text-field-error);
+    @include mdc-theme-prop(color, $mdc-text-field-focused-label-color);
   }
 
   + .mdc-text-field-helper-line .mdc-text-field-helper-text:not(.mdc-text-field-helper-text--validation-msg) {

From 6d9c0cc43b7ab5f820bec2c95410b31a396d7587 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Fri, 12 Apr 2019 19:32:51 +0200
Subject: [PATCH 2/2] chore: Upgraded focus-trap in dialog & drawer that
 improves performance (#4546)

---
 packages/mdc-dialog/package-lock.json | 18 ++++++++++--------
 packages/mdc-dialog/package.json      |  2 +-
 packages/mdc-drawer/package-lock.json | 18 ++++++++++--------
 packages/mdc-drawer/package.json      |  2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/packages/mdc-dialog/package-lock.json b/packages/mdc-dialog/package-lock.json
index b7a836a5d91..37df41a5da0 100644
--- a/packages/mdc-dialog/package-lock.json
+++ b/packages/mdc-dialog/package-lock.json
@@ -1,20 +1,22 @@
 {
-  "requires": true,
+  "name": "@material/dialog",
+  "version": "1.1.0",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
     "focus-trap": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-4.0.2.tgz",
-      "integrity": "sha512-HtLjfAK7Hp2qbBtLS6wEznID1mPT+48ZnP2nkHzgjpL4kroYHg0CdqJ5cTXk+UO5znAxF5fRUkhdyfgrhh8Lzw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-5.0.0.tgz",
+      "integrity": "sha512-ECigB+4yoFBIpzQ0uO+ReM1yU4I4pVxuRSe2W24ElcWo4nJLRCb6amo2wLYEaPXgZ/mt0sSAW0ZNYkgiMrz4fQ==",
       "requires": {
-        "tabbable": "^3.1.2",
+        "tabbable": "^4.0.0",
         "xtend": "^4.0.1"
       }
     },
     "tabbable": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-3.1.2.tgz",
-      "integrity": "sha512-wjB6puVXTYO0BSFtCmWQubA/KIn7Xvajw0x0l6eJUudMG/EAiJvIUnyNX6xO4NpGrJ16lbD0eUseB9WxW0vlpQ=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
+      "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
     },
     "tslib": {
       "version": "1.9.3",
diff --git a/packages/mdc-dialog/package.json b/packages/mdc-dialog/package.json
index 61873a6ba7c..585dea965c1 100644
--- a/packages/mdc-dialog/package.json
+++ b/packages/mdc-dialog/package.json
@@ -28,7 +28,7 @@
     "@material/shape": "^1.1.1",
     "@material/theme": "^1.1.0",
     "@material/typography": "^1.0.0",
-    "focus-trap": "^4.0.2",
+    "focus-trap": "^5.0.0",
     "tslib": "^1.9.3"
   },
   "publishConfig": {
diff --git a/packages/mdc-drawer/package-lock.json b/packages/mdc-drawer/package-lock.json
index b7a836a5d91..870f193e8da 100644
--- a/packages/mdc-drawer/package-lock.json
+++ b/packages/mdc-drawer/package-lock.json
@@ -1,20 +1,22 @@
 {
-  "requires": true,
+  "name": "@material/drawer",
+  "version": "1.1.0",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
     "focus-trap": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-4.0.2.tgz",
-      "integrity": "sha512-HtLjfAK7Hp2qbBtLS6wEznID1mPT+48ZnP2nkHzgjpL4kroYHg0CdqJ5cTXk+UO5znAxF5fRUkhdyfgrhh8Lzw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-5.0.0.tgz",
+      "integrity": "sha512-ECigB+4yoFBIpzQ0uO+ReM1yU4I4pVxuRSe2W24ElcWo4nJLRCb6amo2wLYEaPXgZ/mt0sSAW0ZNYkgiMrz4fQ==",
       "requires": {
-        "tabbable": "^3.1.2",
+        "tabbable": "^4.0.0",
         "xtend": "^4.0.1"
       }
     },
     "tabbable": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-3.1.2.tgz",
-      "integrity": "sha512-wjB6puVXTYO0BSFtCmWQubA/KIn7Xvajw0x0l6eJUudMG/EAiJvIUnyNX6xO4NpGrJ16lbD0eUseB9WxW0vlpQ=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-4.0.0.tgz",
+      "integrity": "sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ=="
     },
     "tslib": {
       "version": "1.9.3",
diff --git a/packages/mdc-drawer/package.json b/packages/mdc-drawer/package.json
index 6c83cb40711..d9107b0745c 100644
--- a/packages/mdc-drawer/package.json
+++ b/packages/mdc-drawer/package.json
@@ -27,7 +27,7 @@
     "@material/shape": "^1.1.1",
     "@material/theme": "^1.1.0",
     "@material/typography": "^1.0.0",
-    "focus-trap": "^4.0.2",
+    "focus-trap": "^5.0.0",
     "tslib": "^1.9.3"
   }
 }