Merge pull request #590 from fkhadra/next

release 7.0.4
fkhadra · Apr 23, 2021 · e36d468 · e36d468
2 parents 7ec5040 + 8586b23
commit e36d468
Show file tree

Hide file tree

Showing 6 changed files with 1,249 additions and 566 deletions.
diff --git a/example/yarn.lock b/example/yarn.lock
@@ -1282,10 +1282,10 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.9"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
-  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
@@ -1333,7 +1333,7 @@ brfs@^1.2.0:
     static-module "^2.2.0"
     through2 "^2.0.0"
 
-brorand@^1.0.1:
+brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -2210,17 +2210,17 @@ electron-to-chromium@^1.3.341:
   integrity sha512-uEb2zs6EJ6OZIqaMsCSliYVgzE/f7/s1fLWqtvRtHg/v5KBF2xds974fUnyatfxIDgkqzQVwFtam5KExqywx0Q==
 
 elliptic@^6.0.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
-  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
   dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
     hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -2715,7 +2715,7 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -2847,7 +2847,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -3420,7 +3420,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
@@ -5545,9 +5545,9 @@ xtend@^4.0.0, xtend@~4.0.1:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
 
 yargs-parser@^15.0.0:
   version "15.0.1"

diff --git a/scss/_toast.scss b/scss/_toast.scss
@@ -38,6 +38,7 @@
   }
   &-body {
     margin: auto 0;
+    flex: 1 1 auto;
     padding: 6px;
   }
 }
@@ -50,5 +51,6 @@
 @media #{$rt-mobile} {
   .#{$rt-namespace}__toast {
     margin-bottom: 0;
+    border-radius: 0;
   }
 }
diff --git a/src/components/ProgressBar.tsx b/src/components/ProgressBar.tsx
@@ -119,6 +119,8 @@ export function ProgressBar({
   return (
     <div
       role="progressbar"
+      aria-hidden={hide ? 'true' : 'false'}
+      aria-label="notification timer"
       className={classNames}
       style={style}
       {...animationEvent}

diff --git a/src/hooks/useToastContainer.ts b/src/hooks/useToastContainer.ts
@@ -94,12 +94,8 @@ export function useToastContainer(props: ToastContainerProps) {
   }
 
   function clearWaitingQueue({ containerId }: ClearWaitingQueueParams) {
-    const { limit, enableMultiContainer } = instance.props;
-    if (
-      limit &&
-      (!containerId ||
-        (instance.containerId === containerId && enableMultiContainer))
-    ) {
+    const { limit } = instance.props;
+    if (limit && (!containerId || instance.containerId === containerId)) {
       toastCount -= queue.length;
       queue = [];
     }

diff --git a/test/components/__snapshots__/ProgressBar.test.tsx.snap b/test/components/__snapshots__/ProgressBar.test.tsx.snap
@@ -3,6 +3,8 @@
 exports[`ProgressBar Should be able to hide the progress bar 1`] = `
 <div>
   <div
+    aria-hidden="true"
+    aria-label="notification timer"
     class="Toastify__progress-bar Toastify__progress-bar--animated Toastify__progress-bar--default"
     role="progressbar"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 0;"
@@ -13,6 +15,8 @@ exports[`ProgressBar Should be able to hide the progress bar 1`] = `
 exports[`ProgressBar Should be able to pause animation 1`] = `
 <div>
   <div
+    aria-hidden="false"
+    aria-label="notification timer"
     class="Toastify__progress-bar Toastify__progress-bar--animated Toastify__progress-bar--default"
     role="progressbar"
     style="animation-duration: 5000ms; animation-play-state: paused; opacity: 1;"
@@ -23,6 +27,8 @@ exports[`ProgressBar Should be able to pause animation 1`] = `
 exports[`ProgressBar Should render controlled progress bar 1`] = `
 <div>
   <div
+    aria-hidden="false"
+    aria-label="notification timer"
     class="Toastify__progress-bar Toastify__progress-bar--controlled Toastify__progress-bar--default"
     role="progressbar"
     style="animation-duration: 5000ms; animation-play-state: running; opacity: 1; transform: scaleX(0.7);"