Merge pull request #214 from ably/fix-flash-closing-icon

Fix flash closing icon
ably · Sep 22, 2022 · 816d917 · 816d917
2 parents 614c4a5 + c983380
commit 816d917
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 15 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ably-ui (8.2.1.dev.db8f789)
+    ably-ui (8.7.0)
       view_component (>= 2.33, < 2.50)
 
 GEM

diff --git a/lib/ably_ui/version.rb b/lib/ably_ui/version.rb
@@ -1,3 +1,3 @@
 module AblyUi
-  VERSION = '8.2.1.dev.db8f789'
+  VERSION = '8.7.0'
 end
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ably/ui",
-  "version": "8.2.1-dev.db8f789",
+  "version": "8.7.0",
   "description": "Home of the Ably design system library ([design.ably.com](https://design.ably.com)). It provides a showcase, development/test environment and a publishing pipeline for different distributables.",
   "repository": {
     "type": "git",

diff --git a/preview/Gemfile b/preview/Gemfile
@@ -36,7 +36,7 @@ gem 'view_component', '~> 2.33.0', require: 'view_component/engine'
 
 gem 'responders'
 
-gem 'ably-ui', '8.2.1.dev.db8f789', require: 'ably_ui'
+gem 'ably-ui', '8.7.0', require: 'ably_ui'
 
 # https://stackoverflow.com/questions/71191685/visit-psych-nodes-alias-unknown-alias-default-psychbadalias
 gem 'psych', '< 4'

diff --git a/preview/Gemfile.lock b/preview/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ably-ui (8.2.1.dev.db8f789)
+    ably-ui (8.7.0)
       view_component (>= 2.33, < 2.50)
     actioncable (6.0.5.1)
       actionpack (= 6.0.5.1)
@@ -174,7 +174,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  ably-ui (= 8.2.1.dev.db8f789)
+  ably-ui (= 8.7.0)
   bootsnap (>= 1.4.2)
   byebug
   dotenv-rails

diff --git a/preview/package.json b/preview/package.json
@@ -2,7 +2,7 @@
   "name": "preview",
   "private": true,
   "dependencies": {
-    "@ably/ui": "8.2.1-dev.db8f789",
+    "@ably/ui": "8.7.0",
     "@babel/preset-react": "^7.12.5",
     "@rails/ujs": "^6.0.0",
     "@rails/webpacker": "4.3.0",

diff --git a/preview/yarn.lock b/preview/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@ably/ui@8.2.1-dev.db8f789":
-  version "8.2.1-dev.db8f789"
-  resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-8.2.1-dev.db8f789.tgz#5bc377811505f5b6f946ce751fe35683cd12a966"
-  integrity sha512-xo+Y686LMxGCU7fsHQTfpK/8qXW8ih0tj34DKx8F8asYfsV6pQGR351xbUT07vEuuvxDWS6ba8BvSGXrn5J4Zw==
+"@ably/ui@8.7.0":
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/@ably/ui/-/ui-8.7.0.tgz#b4ebfd12eb34cdbbb5b1cbbec911a4a6ec638fef"
+  integrity sha512-7m/v2xbLKCp6qXxDQ6cPewu/160JND6v2YOO8HecBJ/A7/t+PAZ4mNfY4gJtgpIkmYqN9aRC3Phk/LiOWJb86A==
   dependencies:
     addsearch-js-client "^0.7.0"
     array-flat-polyfill "^1.0.1"

diff --git a/src/core/Flash/component.jsx b/src/core/Flash/component.jsx
@@ -110,10 +110,8 @@ const Flash = ({ type, content }) => {
       <div className={`${FLASH_BG_COLOR[type]} p-32 flex align-center rounded shadow-container-subtle`}>
         {withIcons[type] && <Icon name={withIcons[type]} color={iconColor[type]} size="1.5rem" additionalCSS="mr-16 self-baseline" />}
         <p className={`ui-flash-text ${FLASH_TEXT_COLOR[type]}`} dangerouslySetInnerHTML={{ __html: safeContent }} />
-        <button type="button" className="p-0 ml-auto self-start" onClick={closeFlash}>
-          <svg className="h-24 w-24 transition-colors ui-icon-cool-black">
-            <use xlinkHref="#sprite-close"></use>
-          </svg>
+        <button type="button" className="p-0 ml-auto self-start focus:outline-none" onClick={closeFlash}>
+          <Icon name="icon-gui-close" color={iconColor[type]} size="1.5rem" additionalCSS="transition-colors" />
         </button>
       </div>
     </div>