@ably/ui 8.6.0 → 8.7.0-dev.28a63f9

package/core/styles.css

@@ -47,6 +47,8 @@
     --icon-color-glassdoor: #0baa41;
     --icon-color-github: #000000;
     --icon-color-discord: #5865f2;
+    --icon-color-stackoverflow: #f48024;
+    --icon-color-youtube: #ff0000;
 
     --gradient-active-orange: linear-gradient(
       61.2deg,
@@ -467,16 +469,15 @@
   }
 
   .ui-link {
-    @apply visited:text-gui-visited;
+    @apply text-gui-default;
     @apply hover:text-gui-hover active:text-gui-active disabled:text-gui-unavailable;
-    @apply focus:text-gui-focus focus:outline-gui-focus;
-    @apply underline;
+    @apply focus:text-gui-default focus:outline-gui-focus;
+    @apply no-underline;
   }
 
   .ui-link-neutral {
-    @apply visited:text-dark-grey;
     @apply hover:text-dark-grey active:text-cool-black disabled:text-gui-unavailable;
-    @apply focus:text-gui-focus focus:outline-gui-focus-neutral;
+    @apply focus:text-charcoal-grey focus:outline-gui-focus-neutral;
     @apply underline;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ably/ui",
-  "version": "8.6.0",
+  "version": "8.7.0-dev.28a63f9",
   "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",
@@ -34,6 +34,7 @@
     "eslint-plugin-cypress": "^2.11.2",
     "eslint-plugin-react": "^7.21.5",
     "extra-watch-webpack-plugin": "^1.0.3",
+    "find-imports": "^1.1.0",
     "mini-css-extract-plugin": "^1.2.1",
     "null-loader": "^4.0.1",
     "postcss": "^8.1.10",
@@ -42,7 +43,6 @@
     "postcss-import": "^13.0.0",
     "postcss-loader": "^4.0.4",
     "prettier": "^2.3.0",
-    "prop-types": "^15.7.2",
     "svg-spritemap-webpack-plugin": "^3.7.1",
     "tailwindcss": "^2.0.1",
     "tailwindcss-filters": "^3.0.0",
@@ -67,13 +67,13 @@
   "dependencies": {
     "addsearch-js-client": "^0.7.0",
     "array-flat-polyfill": "^1.0.1",
-    "deepmerge": "^4.2.2",
     "dompurify": "^2.2.9",
     "highlight.js": "^10.7.2",
+    "highlightjs-curl": "^1.3.0",
     "js-cookie": "^2.2.1",
-    "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
     "nanoid": "^4.0.0",
+    "prop-types": "^15.7.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "redux": "^4.0.5",

package/src/core/Code/component.css

@@ -1,67 +1 @@
-@import "../fonts/source-code-pro.css";
-
-@layer components {
-  .hljs {
-    background: var(--syntax-black);
-    color: var(--syntax-light-grey);
-  }
-
-  .hljs-emphasis {
-    font-style: italic;
-  }
-
-  .hljs-strong {
-    font-weight: bold;
-  }
-
-  .hljs-comment,
-  .hljs-quote {
-    color: var(--syntax-dark-grey);
-  }
-
-  .hljs-variable,
-  .hljs-template-variable,
-  .hljs-tag,
-  .hljs-name,
-  .hljs-selector-id,
-  .hljs-selector-class,
-  .hljs-regexp,
-  .hljs-deletion {
-    color: var(--syntax-red);
-  }
-
-  .hljs-number,
-  .hljs-built_in,
-  .hljs-literal,
-  .hljs-type,
-  .hljs-params,
-  .hljs-meta,
-  .hljs-link {
-    color: var(--syntax-orange);
-  }
-
-  .hljs-attribute {
-    color: var(--syntax-yellow);
-  }
-
-  .hljs-string,
-  .hljs-symbol,
-  .hljs-bullet,
-  .hljs-addition {
-    color: var(--syntax-green);
-  }
-
-  .hljs-title,
-  .hljs-section {
-    color: var(--syntax-blue);
-  }
-
-  .hljs-keyword,
-  .hljs-selector-tag {
-    color: var(--syntax-lilac);
-  }
-
-  .hljs-subst {
-    color: var(--syntax-mid-grey);
-  }
-}
+@import "../utils/syntax-highlighter.css";

package/src/core/Code/component.js

@@ -1,47 +1,17 @@
 import "./component.css";
-import hljs from "highlight.js/lib/core";
 
-import bash from "highlight.js/lib/languages/bash";
-import cpp from "highlight.js/lib/languages/cpp";
-import csharp from "highlight.js/lib/languages/csharp";
-import dart from "highlight.js/lib/languages/dart";
-import plaintext from "highlight.js/lib/languages/plaintext";
-import go from "highlight.js/lib/languages/go";
-import java from "highlight.js/lib/languages/java";
-import javascript from "highlight.js/lib/languages/javascript";
-import json from "highlight.js/lib/languages/json";
-import objectivec from "highlight.js/lib/languages/objectivec";
-import php from "highlight.js/lib/languages/php";
-import python from "highlight.js/lib/languages/python";
-import ruby from "highlight.js/lib/languages/ruby";
-import swift from "highlight.js/lib/languages/swift";
-import xml from "highlight.js/lib/languages/xml";
+// Note: importing syntax-highlighter here means the component.js file will include
+// all the language dependecies, creating a large a bundle. Prefer using the highlighter serverside.
+import {
+  highlightSnippet,
+  registerDefaultLanguages,
+} from "../utils/syntax-highlighter";
 
-// Supported languages need to be imported here
-// https://github.com/highlightjs/highlight.js/blob/master/SUPPORTED_LANGUAGES.md
-const register = [
-  { label: "", key: "plaintext", module: plaintext },
-  { label: "JS", key: "javascript", module: javascript },
-  { label: "Java", key: "java", module: java },
-  { label: "Ruby", key: "ruby", module: ruby },
-  { label: "Python", key: "python", module: python },
-  { label: "PHP", key: "php", module: php },
-  { label: "Shell", key: "bash", module: bash },
-  { label: "C#", key: "cs", module: csharp },
-  { label: "Go", key: "go", module: go },
-  { label: "HTML", key: "xml", module: xml },
-  { label: "C++", key: "cpp", module: cpp },
-  { label: "Dart", key: "dart", module: dart },
-  { label: "Swift", key: "swift", module: swift },
-  { label: "Objective C", key: "objectivec", module: objectivec },
-  { label: "Node.js", key: "javascript", module: javascript },
-  { label: "JSON", key: "json", module: json },
-];
+import languagesRegistry from "../utils/syntax-highlighter-registry";
 
-// Initialize a sub-set of languages as used
-register.forEach(({ key, module }) => hljs.registerLanguage(key, module));
+registerDefaultLanguages(languagesRegistry);
 
-function convertCodeToHTML(el) {
+function highlightEl(el) {
   if (!el) throw "Missing code element";
 
   const pre = el.querySelector("pre");
@@ -51,14 +21,9 @@ function convertCodeToHTML(el) {
   if (!code || !pre || !language) throw "Malformed code element";
 
   const { innerHTML } = code;
-  const html = hljs.highlight(innerHTML, { language }).value;
+  const html = highlightSnippet(language, innerHTML);
 
   code.innerHTML = html;
 }
 
-function highlight(language, snippet) {
-  return hljs.highlight(snippet, { language }).value;
-}
-
-export { highlight };
-export default convertCodeToHTML;
+export default highlightEl;

package/src/core/Code/component.jsx

@@ -1,12 +1,16 @@
 import React from "react";
 import T from "prop-types";
 
-import "./component.css";
-import { highlight } from "./component.js";
+import "../utils/syntax-highlighter.css";
+import { highlightSnippet, registerDefaultLanguages } from "../utils/syntax-highlighter";
+import languagesRegistry from "../utils/syntax-highlighter-registry";
+
+registerDefaultLanguages(languagesRegistry);
 
 const Code = ({ language, snippet, textSize = "ui-text-code", padding = "p-32", additionalCSS = "" }) => {
-  const HTMLraw = highlight(language, `${snippet}`.trim());
+  const HTMLraw = highlightSnippet(language, `${snippet}`.trim());
   const className = `language-${language} ${textSize}`;
+
   return (
     <div className={`hljs overflow-auto ${padding} ${additionalCSS}`} data-id="code">
       <pre lang={language}>

package/src/core/CustomerLogos/component.html.erb

@@ -1,9 +1,9 @@
 <section class="w-full bg-white">
-  <ul class="py-64 flex flex-row flex-wrap md:flex-nowrap content-between m-auto items-center">
+  <%= tag.ul class: "py-64 flex flex-row flex-wrap md:flex-nowrap content-between m-auto items-center #{@additional_css}" do %>
     <% companies.each do |company| %>
 	    <li class="flex-auto text-center sm:w-1/3 w-1/2">
 	      <%= image_tag company[:logo], alt: "#{company[:label]} logo", class: 'mx-auto' %>
 	    </li>
     <% end %>
-  </ul>
+  <% end %>
 </section>

package/src/core/CustomerLogos/component.jsx

@@ -1,10 +1,10 @@
 import React from "react";
 import T from "prop-types";
 
-const CustomerLogos = ({ companies }) => {
+const CustomerLogos = ({ companies, additionalCss = "" }) => {
   return (
     <section className="w-full bg-white">
-      <ul className="py-64 flex flex-row flex-wrap md:flex-nowrap content-between m-auto items-center">
+      <ul className={`py-64 flex flex-row flex-wrap md:flex-nowrap content-between m-auto items-center ${additionalCss}`}>
         {companies.map((company) => (
           <li key={company.label} className="flex-auto text-center sm:w-1/3 w-1/2">
             <img alt={company.label} src={company.logo} className="mx-auto" />
@@ -22,6 +22,7 @@ CustomerLogos.propTypes = {
       logo: T.string,
     })
   ),
+  additionalCss: T.string,
 };
 
 export default CustomerLogos;

package/src/core/CustomerLogos/component.rb

@@ -5,8 +5,9 @@ module AblyUi
     class CustomerLogos < ViewComponent::Base
       attr_reader :companies
 
-      def initialize(companies:)
+      def initialize(companies:, additional_css: '')
         @companies = companies
+        @additional_css = additional_css
       end
     end
   end

package/src/core/DropdownMenu/component.jsx

@@ -0,0 +1,112 @@
+import React, { createContext, useContext, useState, useEffect, useRef } from "react";
+import T from "prop-types";
+import Icon from "../Icon/component.jsx";
+
+const DropdownMenuContext = createContext();
+
+const DropdownMenu = ({ children }) => {
+  const [isOpen, setOpen] = useState(false);
+  const ref = useRef(null);
+
+  useEffect(() => {
+    const clickHandler = (e) => {
+      if (ref?.current?.contains(e.target)) return;
+      setOpen(false);
+    };
+
+    document.addEventListener("click", clickHandler);
+
+    return () => {
+      document.removeEventListener("click", clickHandler);
+    };
+  }, []);
+
+  return (
+    <DropdownMenuContext.Provider value={{ isOpen, setOpen }}>
+      <div id="dropdown-menu" className="relative" ref={ref}>
+        {children}
+      </div>
+    </DropdownMenuContext.Provider>
+  );
+};
+
+DropdownMenu.propTypes = {
+  children: T.node,
+};
+
+const Trigger = ({ children, additionalTriggerCSS = "" }) => {
+  const { isOpen, setOpen } = useContext(DropdownMenuContext);
+
+  return (
+    <button
+      id="menu-trigger"
+      onClick={() => setOpen(!isOpen)}
+      className={`${additionalTriggerCSS} flex items-center p-8 ml-8 group hover:text-gui-hover hover:bg-light-grey active:text-gui-active focus:text-gui-focus focus:outline-none rounded-lg`}
+    >
+      <span className="leading-normal">{children}</span>
+      <Icon
+        name="icon-gui-disclosure-arrow"
+        color="text-cool-black"
+        size="1.25rem"
+        additionalCSS="transform rotate-90 group-hover:text-gui-hover group-active:text-gui-active group-focus:text-gui-focus"
+      />
+    </button>
+  );
+};
+
+Trigger.propTypes = {
+  children: T.node,
+  additionalTriggerCSS: T.string,
+};
+
+const Content = ({ children, anchorPosition = "right", additionalContentCSS }) => {
+  const { isOpen } = useContext(DropdownMenuContext);
+
+  if (!isOpen) {
+    return null;
+  }
+
+  const anchorPositionClasses = anchorPosition === "right" ? "right-0" : "left-0";
+
+  return (
+    <div
+      id="menu-content"
+      className={`${additionalContentCSS} absolute p-8 z-10 border border-mid-grey bg-white rounded shadow-container ${anchorPositionClasses}`}
+      style={{ minWidth: 275, top: 44 }}
+    >
+      {children}
+    </div>
+  );
+};
+
+Content.propTypes = {
+  children: T.node,
+  anchorPosition: T.string,
+  additionalContentCSS: T.string,
+};
+
+const Link = ({ url, title, subtitle, iconName, children }) => {
+  return (
+    <a href={url} className="menu-link group block p-8 hover:bg-light-grey hover:text-cool-black rounded">
+      <p className="mb-4">
+        {title}
+        {iconName ? <Icon name={iconName} size="1rem" color="text-cool-black" additionalCSS="align-middle ml-8 relative -top-1 -left-4" /> : null}
+      </p>
+      {subtitle ? <p className="text-p3 mb-16 text-dark-grey">{subtitle}</p> : null}
+      {children}
+    </a>
+  );
+};
+
+Link.propTypes = {
+  url: T.string,
+  title: T.string,
+  subtitle: T.string,
+  iconName: T.string,
+  children: T.node,
+};
+
+DropdownMenu.Trigger = Trigger;
+DropdownMenu.Content = Content;
+DropdownMenu.Link = Link;
+export default DropdownMenu;

package/src/core/FeatureFooter/component.html.erb

@@ -29,15 +29,15 @@
           <ul class="relative ml-24 text-p1 font-light leading-8">
             <li>
               <%= render(AblyUi::Core::Icon.new(name: "icon-gui-tick", size: "1.5rem", additional_css: "align-text-bottom")) %>
-              3m messages per month
+              6m messages per month
             </li>
             <li>
               <%= render(AblyUi::Core::Icon.new(name: "icon-gui-tick", size: "1.5rem", additional_css: "align-text-bottom")) %>
-              100 peak connections
+              200 peak connections
             </li>
             <li>
               <%= render(AblyUi::Core::Icon.new(name: "icon-gui-tick", size: "1.5rem", additional_css: "align-text-bottom")) %>
-              100 peak channels
+              200 peak channels
             </li>
             <li>
               <%= render(AblyUi::Core::Icon.new(name: "icon-gui-tick", size: "1.5rem", additional_css: "align-text-bottom")) %>
@@ -46,7 +46,7 @@
           </ul>
         </span>
         <span class="flex-0">
-          <%= link_to 'Start with a free account', abs_url("/sign-up"), class: "ui-btn-secondary self-start mt-24" %>
+          <%= link_to 'Start building', abs_url("/sign-up"), class: "ui-btn-secondary self-start mt-24" %>
         </span>
       </div>
     </div>

package/src/core/Flash/component.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState, useRef } from "react";
 import DOMPurify from "dompurify";
 import T from "prop-types";
+import { nanoid } from "nanoid/non-secure";
 
 import { getRemoteDataStore } from "../remote-data-store";
 import ConnectStateWrapper from "../ConnectStateWrapper/component.jsx";
@@ -50,30 +51,45 @@ const FLASH_TEXT_COLOR = {
 const AUTO_HIDE = ["success", "info", "notice"];
 const AUTO_HIDE_TIME = 8000;
 
-const Flash = ({ type, content }) => {
-  const ref = useRef(null);
-  const [closed, setClosed] = useState(false);
-  const [flashHeight, setFlashHeight] = useState(0);
-  const [triggerEntryAnimation, setTriggerEntryAnimation] = useState(false);
+const useAutoHide = (type, closeFlash) => {
+  const timeoutId = useRef(null);
 
-  useEffect(() => setTriggerEntryAnimation(true), []);
   useEffect(() => {
     if (AUTO_HIDE.includes(type)) {
-      setTimeout(() => {
-        // closeFlash is idempotent, we can call it even if the flash has been already closed
+      timeoutId.current = setTimeout(() => {
         closeFlash();
       }, AUTO_HIDE_TIME);
     }
-  }, [closed]);
+
+    return () => {
+      if (timeoutId.current) {
+        clearTimeout(timeoutId.current);
+      }
+    };
+  }, []);
+};
+
+const Flash = ({ id, type, content, removeFlash }) => {
+  const ref = useRef(null);
+  const [closed, setClosed] = useState(false);
+  const [flashHeight, setFlashHeight] = useState(0);
+  const [triggerEntryAnimation, setTriggerEntryAnimation] = useState(false);
 
   const closeFlash = () => {
     if (ref.current) {
       setFlashHeight(ref.current.getBoundingClientRect().height);
     }
 
-    setTimeout(() => setClosed(true), 0);
+    setClosed(true);
+
+    setTimeout(() => {
+      removeFlash(id);
+    }, 100);
   };
 
+  useEffect(() => setTriggerEntryAnimation(true), []);
+  useAutoHide(type, closeFlash);
+
   const animateEntry = triggerEntryAnimation && !closed;
 
   let style;
@@ -110,10 +126,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>
@@ -125,13 +139,23 @@ Flash.propTypes = {
 };
 
 const Flashes = ({ flashes }) => {
-  const items = flashes?.items || [];
+  const [flashesWithIds, setFlashesWithIds] = useState([]);
+
+  const removeFlash = (flashId) => setFlashesWithIds((items) => items.filter((item) => item.id !== flashId));
+
+  useEffect(() => {
+    setFlashesWithIds((state) => {
+      return [...state, ...(flashes?.items || []).map((flash) => ({ ...flash, id: nanoid(), removed: false }))];
+    });
+  }, [flashes]);
 
   return (
     <div className="ui-flash" data-id={FLASH_DATA_ID}>
-      {items.map((flash) => (
-        <Flash key={flash.type} {...flash} />
-      ))}
+      {flashesWithIds
+        .filter((item) => !item.removed)
+        .map((flash) => (
+          <Flash removeFlash={removeFlash} key={flash.id} {...flash} />
+        ))}
     </div>
   );
 };

package/src/core/Logo/component.html.erb

@@ -1,28 +1,3 @@
-<%= link_to logo_href, class: 'h-32' do %>
-  <%= tag.svg class: ["transition-colors", "text-cool-black"], data: { id: data_id }, width: "108", height: "32", viewBox: "0 0 108 32", xmlns: "http://www.w3.org/2000/svg" do %>
-    <path
-      d="M62.922 24.9786V4.08813H66.6933V11.6512C67.9709 10.435 69.6164 9.76044 71.3538 9.76044C75.4318 9.76044 79.0498 12.8674 79.0498 17.5484C79.0498 22.2293 75.4318 25.3465 71.3538 25.3465C69.5244 25.3465 67.7971 24.6209 66.5094 23.3024V24.9786H62.922ZM75.2785 17.5484C75.2785 14.932 73.4183 13.1025 70.9859 13.1025C68.6148 13.1025 66.7853 14.84 66.6933 17.3644V17.5484C66.6933 20.1648 68.5534 21.9942 70.9859 21.9942C73.4183 21.9942 75.2785 20.1648 75.2785 17.5484ZM80.7975 24.9786V4.08813H84.5688V24.9786H80.7975ZM89.8425 30.3954L92.0399 25.1523L86.0712 10.1284H90.1491L93.9511 20.6247L97.8144 10.1284H101.954L93.8591 30.4056H89.8425V30.3954ZM56.9329 10.1284V12.0191C55.6247 10.5883 53.7952 9.77066 51.9147 9.77066C47.8367 9.77066 44.2187 12.8777 44.2187 17.5586C44.2187 22.2497 47.8367 25.3465 51.9147 25.3465C53.8668 25.3465 55.7166 24.4982 57.0555 22.9754V24.9888H60.3465V10.1284H56.9329ZM56.5649 17.5484C56.5649 20.1341 54.7048 21.9942 52.2724 21.9942C49.8399 21.9942 47.9798 20.1341 47.9798 17.5484C47.9798 14.9626 49.8399 13.1025 52.2724 13.1025C54.6435 13.1025 56.473 14.8706 56.5649 17.3644V17.5484Z"
-      fill="currentColor"
-    />
-    <path d="M19.2858 0L3.14788 29.5369L0 27.3293L14.932 0H19.2858ZM19.5107 0L35.6487 29.5369L38.7965 27.3293L23.8646 0H19.5107Z" fill="url(#<%= gradient_id_0 %>)" />
-    <path d="M35.4238 29.7107L19.3983 17.16L3.37271 29.7107L6.64323 32L19.3983 22.0147L32.1533 32L35.4238 29.7107Z" fill="url(#<%= gradient_id_1 %>)" />
-    <defs>
-      <linearGradient id="<%= gradient_id_0 %>" x1="5.47361" y1="37.4219" x2="32.4603" y2="7.45023" gradientUnits="userSpaceOnUse">
-        <stop stop-color="#FF5416" />
-        <stop offset="0.2535" stop-color="#FF5115" />
-        <stop offset="0.461" stop-color="#FF4712" />
-        <stop offset="0.6523" stop-color="#FF350E" />
-        <stop offset="0.8327" stop-color="#FF1E08" />
-        <stop offset="1" stop-color="#FF0000" />
-      </linearGradient>
-      <linearGradient id="<%= gradient_id_1 %>" x1="10.7084" y1="39.3593" x2="26.6583" y2="21.6452" gradientUnits="userSpaceOnUse">
-        <stop stop-color="#FF5416" />
-        <stop offset="0.2535" stop-color="#FF5115" />
-        <stop offset="0.461" stop-color="#FF4712" />
-        <stop offset="0.6523" stop-color="#FF350E" />
-        <stop offset="0.8327" stop-color="#FF1E08" />
-        <stop offset="1" stop-color="#FF0000" />
-      </linearGradient>
-    </defs>
-  <% end %>
+<%= link_to logo_href, class: 'block', style: "height: 2.125rem", data: { id: data_id }, **additional_link_attrs do %>
+  <%= tag.img src: logo_url, width: "108px", alt: "Ably logo", **additional_img_attrs %>
 <% end %>

package/src/core/Logo/component.jsx

@@ -1,46 +1,10 @@
-import React, { useMemo } from "react";
+import React from "react";
 import T from "prop-types";
-import { nanoid } from "nanoid/non-secure";
-
-const Logo = ({ dataId, href = "/" }) => {
-  // This fixes a bug where if the logo is rendered more than once on the page, and one of the instances
-  // if it is hidden, the other instance will not show the ably shape from the logo.
-
-  // This is because the defs in this SVG reference ids that need to be unique ids. The browser discards the "newer"
-  // linearGradients defined in the other logo, and inherits the `hidden` style from the first.
-  const gradientIds = useMemo(() => [nanoid(), nanoid()], []);
 
+const Logo = ({ dataId, logoUrl, href = "/", additionalImgAttrs, additionalLinkAttrs }) => {
   return (
-    <a href={href} className="h-32">
-      <svg data-id={dataId} className="text-cool-black transition-colors" width="108" height="32" viewBox="0 0 108 32" xmlns="http://www.w3.org/2000/svg">
-        <path
-          d="M62.922 24.9786V4.08813H66.6933V11.6512C67.9709 10.435 69.6164 9.76044 71.3538 9.76044C75.4318 9.76044 79.0498 12.8674 79.0498 17.5484C79.0498 22.2293 75.4318 25.3465 71.3538 25.3465C69.5244 25.3465 67.7971 24.6209 66.5094 23.3024V24.9786H62.922ZM75.2785 17.5484C75.2785 14.932 73.4183 13.1025 70.9859 13.1025C68.6148 13.1025 66.7853 14.84 66.6933 17.3644V17.5484C66.6933 20.1648 68.5534 21.9942 70.9859 21.9942C73.4183 21.9942 75.2785 20.1648 75.2785 17.5484ZM80.7975 24.9786V4.08813H84.5688V24.9786H80.7975ZM89.8425 30.3954L92.0399 25.1523L86.0712 10.1284H90.1491L93.9511 20.6247L97.8144 10.1284H101.954L93.8591 30.4056H89.8425V30.3954ZM56.9329 10.1284V12.0191C55.6247 10.5883 53.7952 9.77066 51.9147 9.77066C47.8367 9.77066 44.2187 12.8777 44.2187 17.5586C44.2187 22.2497 47.8367 25.3465 51.9147 25.3465C53.8668 25.3465 55.7166 24.4982 57.0555 22.9754V24.9888H60.3465V10.1284H56.9329ZM56.5649 17.5484C56.5649 20.1341 54.7048 21.9942 52.2724 21.9942C49.8399 21.9942 47.9798 20.1341 47.9798 17.5484C47.9798 14.9626 49.8399 13.1025 52.2724 13.1025C54.6435 13.1025 56.473 14.8706 56.5649 17.3644V17.5484Z"
-          fill="currentColor"
-        />
-        <path
-          d="M19.2858 0L3.14788 29.5369L0 27.3293L14.932 0H19.2858ZM19.5107 0L35.6487 29.5369L38.7965 27.3293L23.8646 0H19.5107Z"
-          fill={`url(#${gradientIds[0]})`}
-        />
-        <path d="M35.4238 29.7107L19.3983 17.16L3.37271 29.7107L6.64323 32L19.3983 22.0147L32.1533 32L35.4238 29.7107Z" fill={`url(#${gradientIds[1]})`} />
-        <defs>
-          <linearGradient id={gradientIds[0]} x1="5.47361" y1="37.4219" x2="32.4603" y2="7.45023" gradientUnits="userSpaceOnUse">
-            <stop stopColor="#FF5416" />
-            <stop offset="0.2535" stopColor="#FF5115" />
-            <stop offset="0.461" stopColor="#FF4712" />
-            <stop offset="0.6523" stopColor="#FF350E" />
-            <stop offset="0.8327" stopColor="#FF1E08" />
-            <stop offset="1" stopColor="#FF0000" />
-          </linearGradient>
-          <linearGradient id={gradientIds[1]} x1="10.7084" y1="39.3593" x2="26.6583" y2="21.6452" gradientUnits="userSpaceOnUse">
-            <stop stopColor="#FF5416" />
-            <stop offset="0.2535" stopColor="#FF5115" />
-            <stop offset="0.461" stopColor="#FF4712" />
-            <stop offset="0.6523" stopColor="#FF350E" />
-            <stop offset="0.8327" stopColor="#FF1E08" />
-            <stop offset="1" stopColor="#FF0000" />
-          </linearGradient>
-        </defs>
-      </svg>
+    <a href={href} data-id={dataId} className="block" style={{ height: "2.125rem" }} {...additionalLinkAttrs}>
+      <img src={logoUrl} width="108px" alt="Ably logo" {...additionalImgAttrs} />
     </a>
   );
 };
@@ -48,6 +12,9 @@ const Logo = ({ dataId, href = "/" }) => {
 Logo.propTypes = {
   dataId: T.string,
   href: T.string,
+  logoUrl: T.string,
+  additionalImgAttrs: T.object,
+  additionalLinkAttrs: T.object,
 };
 
 export default React.memo(Logo);

package/src/core/Logo/component.rb

@@ -1,17 +1,26 @@
-require 'securerandom'
-
 module AblyUi
   module Core
     class Logo < ViewComponent::Base
       include AblyUi::Core::MeganavConfig
 
-      attr_reader :href, :data_id, :gradient_id_0, :gradient_id_1
+      attr_reader :href,
+                  :logo_url,
+                  :data_id,
+                  :additional_img_attrs,
+                  :additional_link_attrs
 
-      def initialize(data_id: '', href:)
+      def initialize(
+        href:,
+        logo_url:,
+        data_id: '',
+        additional_img_attrs: {},
+        additional_link_attrs: {}
+      )
         @data_id = data_id
         @href = href
-        @gradient_id_0 = "paint_linear_#{SecureRandom.uuid}"
-        @gradient_id_1 = "paint_linear_#{SecureRandom.uuid}"
+        @logo_url = logo_url
+        @additional_img_attrs = additional_img_attrs
+        @additional_link_attrs = additional_link_attrs
       end
 
       def logo_href

package/src/core/Meganav/component.html.erb

@@ -3,7 +3,7 @@
 
   <div class="ui-meganav ui-grid-px">
     <div className="mr-24">
-      <%= render(AblyUi::Core::Logo.new(data_id: "meganav-logo", href: logo_link)) %>
+      <%= render(AblyUi::Core::Logo.new(data_id: "meganav-logo", href: logo_link, logo_url: ably_logo)) %>
     </div>
     <%= render(AblyUi::Core::MeganavItemsDesktop.new(theme_name: @theme_name, url_base: url_base)) %>