@ably/ui 8.7.0-dev.4e08581 → 8.7.0-dev.52da22c

package/src/core/HeadwayWidget/HeadwayWidget.jsx

@@ -0,0 +1,229 @@
+import PropTypes from "prop-types";
+import React, { useCallback, useEffect, useRef } from "react";
+
+const HeadwayWidgetClassName = "HW_widget_component";
+const HeadwayWidgetSelector = "." + HeadwayWidgetClassName;
+const HeadwayWidgetTriggerClassName = "HW_trigger";
+const HeadwayWidgetTriggerSelector = "." + HeadwayWidgetTriggerClassName;
+
+const HeadwayWidgetTrigger = ({ widgetId, component, children }) => {
+  const Component = component || "div";
+  const className = HeadwayWidgetTriggerClassName + `_${widgetId}`;
+
+  return <Component className={className}>{children}</Component>;
+};
+
+HeadwayWidgetTrigger.defaultProps = {
+  widgetId: "widget-1",
+};
+
+const HeadwayWidget = ({
+  id,
+  account,
+  children,
+  widgetPosition,
+  badgePosition,
+  component,
+  trigger,
+  onWidgetReady,
+  onShowWidget,
+  onShowDetails,
+  onReadMore,
+  onHideWidget,
+  styles,
+  options,
+  translations,
+  ...rest
+}) => {
+  const onWidgetReadyRef = useRef(onWidgetReady);
+  const onShowWidgetRef = useRef(onShowWidget);
+  const onShowDetailsRef = useRef(onShowDetails);
+  const onReadMoreRef = useRef(onReadMore);
+  const onHideWidgetRef = useRef(onHideWidget);
+  const optionsRef = useRef(options);
+  useEffect(() => {
+    onWidgetReadyRef.current = onWidgetReady || (options.callbacks && options.callbacks.onWidgetReady);
+    onShowWidgetRef.current = onShowWidget || (options.callbacks && options.callbacks.onShowWidget);
+    onShowDetailsRef.current = onShowDetails || (options.callbacks && options.callbacks.onShowDetails);
+    onReadMoreRef.current = onReadMore || (options.callbacks && options.callbacks.onReadMore);
+    onHideWidgetRef.current = onHideWidget || (options.callbacks && options.callbacks.onHideWidget);
+    optionsRef.current = options;
+  });
+
+  const handleWidgetReady = useCallback(() => onWidgetReadyRef.current && onWidgetReadyRef.current(), []);
+  const handleShowWidget = useCallback(() => onShowWidgetRef.current && onShowWidgetRef.current(), []);
+  const handleShowDetails = useCallback(() => onShowDetailsRef.current && onShowDetailsRef.current(), []);
+  const handleReadMore = useCallback(() => onReadMoreRef.current && onReadMoreRef.current(), []);
+  const handleHideWidget = useCallback(() => onHideWidgetRef.current && onHideWidgetRef.current(), []);
+
+  const initHeadway = useCallback(() => {
+    const hwConfig = {
+      selector: HeadwayWidgetSelector + `_${id}`,
+      account: account || options.account,
+      trigger: trigger ? HeadwayWidgetSelector + `_${id}` : options.trigger || HeadwayWidgetTriggerSelector + `_${id}`,
+      callbacks: {
+        onWidgetReady: handleWidgetReady,
+        onShowWidget: handleShowWidget,
+        onShowDetails: handleShowDetails,
+        onReadMore: handleReadMore,
+        onHideWidget: handleHideWidget,
+      },
+      translations,
+      widgetPosition,
+      badgePosition,
+      __component: true,
+      styles,
+      ...options,
+    };
+
+    const widget = window.Headway.getNewWidget();
+    widget.init(hwConfig);
+
+    return () => {
+      widget.destroy();
+    };
+  }, [account, trigger, handleWidgetReady, handleShowWidget, handleShowDetails, handleReadMore, handleHideWidget, badgePosition, widgetPosition, translations]);
+
+  useEffect(() => {
+    let destroy;
+    if (window.Headway) {
+      destroy = initHeadway();
+    } else {
+      const head = document.getElementsByTagName("head")[0];
+      const script = document.createElement("script");
+      script.type = "text/javascript";
+      const p = new Promise((resolve) => {
+        script.onload = () => {
+          const d = initHeadway();
+          resolve(d);
+        };
+      });
+
+      destroy = () => {
+        p.then((d) => d());
+      };
+      script.src = "https://cdn.headwayapp.co/widget.js";
+      head.appendChild(script);
+    }
+    return destroy;
+  }, [initHeadway]);
+
+  const Component = component || "div";
+
+  return (
+    <Component className={HeadwayWidgetClassName + `_${id}`} {...rest} style={{ position: "relative", display: "inline-block" }}>
+      {children}
+    </Component>
+  );
+};
+
+export default HeadwayWidget;
+
+HeadwayWidget.propTypes = {
+  /**
+   * account of your Headway.
+   */
+  account: PropTypes.string.isRequired,
+  /**
+   * id of the Widget. It is required if you have more than one widget instance on the page.
+   */
+  id: PropTypes.string,
+  /**
+   * position of a badge
+   */
+  badgePosition: PropTypes.oneOf([
+    "top-left",
+    "top-center",
+    "top-right",
+    "center-left",
+    "center",
+    "center-right",
+    "bottom-left",
+    "bottom-center",
+    "bottom-right",
+  ]),
+  /**
+   * badge relative widget position
+   */
+  widgetPosition: PropTypes.oneOf(["top-left", "top-right", "center-left", "center-right", "bottom-left", "bottom-right"]),
+  /**
+   * callback fired when widget has loaded
+   */
+  onWidgetReady: PropTypes.func,
+  /**
+   * callback fired when widget is shown
+   */
+  onShowWidget: PropTypes.func,
+  /**
+   * callback fired when an item in the widget is clicked
+   */
+  onShowDetails: PropTypes.func,
+  /**
+   * callback fired when user clicks on readMore link
+   */
+  onReadMore: PropTypes.func,
+  /**
+   * callback fired when user closes the widget
+   */
+  onHideWidget: PropTypes.func,
+  /**
+   * Translating the text inside of the widget
+   * */
+  translations: PropTypes.shape({
+    title: PropTypes.string,
+    labels: PropTypes.shape({
+      new: PropTypes.string,
+      update: PropTypes.string,
+      improvement: PropTypes.string,
+    }),
+    readMore: PropTypes.string,
+    footer: PropTypes.string,
+  }),
+  /**
+   * options defined in classic object format. Read more at https://docs.headwayapp.co/widget
+   */
+  options: PropTypes.shape({
+    account: PropTypes.string,
+    callbacks: PropTypes.shape({
+      onWidgetReady: PropTypes.func,
+      onShowWidget: PropTypes.func,
+      onShowDetails: PropTypes.func,
+      onReadMore: PropTypes.func,
+      onHideWidget: PropTypes.func,
+    }),
+    translations: PropTypes.shape({
+      title: PropTypes.string,
+      labels: PropTypes.shape({
+        new: PropTypes.string,
+        update: PropTypes.string,
+        improvement: PropTypes.string,
+      }),
+      readMore: PropTypes.string,
+      footer: PropTypes.string,
+    }),
+    trigger: PropTypes.string,
+  }),
+
+  component: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+  children: PropTypes.node,
+  trigger: PropTypes.string,
+  styles: PropTypes.object,
+};
+
+HeadwayWidget.defaultProps = {
+  account: "",
+  id: "widget-1",
+  badgePosition: "bottom-right",
+  widgetPosition: "bottom-right",
+  styles: {},
+  translations: {},
+  options: {},
+};
+
+HeadwayWidgetTrigger.propTypes = {
+  widgetId: PropTypes.string.isRequired,
+  component: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+  children: PropTypes.node,
+};
+
+export { HeadwayWidgetTrigger };

package/src/core/HeadwayWidget/index.js

@@ -0,0 +1,5 @@
+import HeadwayWidget, { HeadwayWidgetTrigger } from "./HeadwayWidget";
+
+export default HeadwayWidget;
+
+export { HeadwayWidgetTrigger };

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/MeganavHeadwayPortal.jsx

@@ -0,0 +1,20 @@
+import React, { useEffect, useState } from "react";
+import { createPortal } from "react-dom";
+import HeadwayWidget from "../HeadwayWidget/HeadwayWidget.jsx";
+
+export default function MeganavHeadwayPortal() {
+  const [headwayPortalNodes, setHeadwayPortalNodes] = useState([]);
+
+  useEffect(() => {
+    // Query all the elements with the .headwayPortal class
+    setHeadwayPortalNodes(Array.from(document.querySelectorAll(".headwayPortal")));
+  }, []);
+
+  return (
+    <>
+      {headwayPortalNodes.map((node, index) => {
+        return createPortal(<HeadwayWidget account={"yZ1rmJ"} badgePosition={"center-right"} id={`widget-${index}`} />, node, `headway-${index}`);
+      })}
+    </>
+  );
+}

package/src/core/Meganav/component.css

@@ -7,13 +7,13 @@
     z-index: var(--stacking-context-page-meganav);
 
     @apply fixed top-0 w-full;
-    @apply antialiased font-sans transition-colors;
+    @apply font-sans antialiased transition-colors;
   }
 
   .ui-meganav {
     height: var(--ui-meganav-height);
 
-    @apply flex justify-between items-center max-w-screen-xl mx-auto;
+    @apply flex items-center justify-between max-w-screen-xl mx-auto;
   }
 
   .ui-meganav-panel,
@@ -22,7 +22,7 @@
     z-index: var(--stacking-context-meganav-dropdown);
 
     @apply absolute left-0 right-0;
-    @apply border-mid-grey border-t shadow-container;
+    @apply border-t border-mid-grey shadow-container;
   }
 
   .ui-meganav-panel {
@@ -35,9 +35,9 @@
     /* Prevents momentum-based scrolling https://devdocs.io/css/-webkit-overflow-scrolling */
     -webkit-overflow-scrolling: auto;
 
-    @apply bg-white pt-16 border-0;
-    @apply border-mid-grey border-t shadow-container;
-    @apply fixed top-64 left-0 right-0 overflow-y-auto;
+    @apply pt-16 bg-white border-0;
+    @apply border-t border-mid-grey shadow-container;
+    @apply fixed left-0 right-0 overflow-y-auto top-64;
   }
 
   .ui-meganav-panel-account {
@@ -51,8 +51,8 @@
   }
 
   .ui-meganav-link {
-    @apply text-menu2 font-medium block;
-    @apply mr-12 lg:mr-24 px-0 py-20;
+    @apply block font-medium text-menu2;
+    @apply px-0 py-20 mr-12 lg:mr-24;
     @apply hover:text-gui-hover focus:text-gui-focus focus:outline-none;
     @apply transition-colors;
   }
@@ -62,18 +62,18 @@
   }
 
   .ui-meganav-mobile-link {
-    @apply p-menu-row relative -left-8 w-extend-8;
-    @apply text-menu2 font-medium block text-cool-black text-left;
+    @apply relative p-menu-row -left-8 w-extend-8;
+    @apply block font-medium text-left text-menu2 text-cool-black;
     @apply flex items-center;
     @apply focus:text-gui-focus focus:outline-none;
   }
 
   .ui-meganav-account-link {
-    @apply block px-8 py-8 hover:bg-light-grey hover:text-gui-hover rounded relative -left-8 text-menu3 w-extend-8 font-light;
+    @apply relative block px-8 py-8 font-light rounded hover:bg-light-grey hover:text-gui-hover -left-8 text-menu3 w-extend-8;
   }
 
   .ui-meganav-content {
-    @apply max-w-screen-xl py-24 lg:py-32 mx-auto;
+    @apply max-w-screen-xl py-24 mx-auto lg:py-32;
     @apply grid grid-cols-1;
     @apply px-24 md:px-32 lg:px-32 xl:px-64;
   }
@@ -81,27 +81,27 @@
   /* This is implemented not as padding so we can change the color of just this space, while keeping the grid
      as close to the designs as possible */
   .ui-meganav-content-spacer {
-    @apply hidden md:block md:w-32 lg:w-32 xl:w-64 self-stretch flex-shrink-0 flex-grow-0;
+    @apply self-stretch flex-grow-0 flex-shrink-0 hidden md:block md:w-32 lg:w-32 xl:w-64;
   }
 
   .ui-meganav-media {
-    @apply block px-8 py-8 hover:bg-light-grey rounded relative -left-8 w-extend-8;
+    @apply relative block px-8 py-8 rounded hover:bg-light-grey -left-8 w-extend-8;
   }
 
   .ui-meganav-media-with-image {
     grid-template-columns: max-content 1fr;
     grid-template-rows: min-content 1fr;
 
-    @apply block px-8 py-8 hover:bg-light-grey rounded relative -left-8 w-extend-8;
-    @apply grid gap-x-8;
+    @apply relative block px-8 py-8 rounded hover:bg-light-grey -left-8 w-extend-8;
+    @apply grid gap-x-16;
   }
 
   .ui-meganav-media-heading {
-    @apply text-menu3 text-cool-black font-medium group-hover:text-gui-hover group-focus:text-gui-focus;
+    @apply font-medium text-menu3 text-cool-black group-hover:text-gui-hover group-focus:text-gui-focus;
   }
 
   .ui-meganav-media-copy {
-    @apply text-p3 text-dark-grey font-light;
+    @apply font-light text-p3 text-dark-grey;
   }
 
   .ui-meganav-overline {
@@ -112,3 +112,44 @@
     @apply my-0 text-mid-grey;
   }
 }
+
+.HW_badge {
+  width: 1.25rem !important;
+  height: 1.25rem !important;
+  display: flex !important;
+  justify-content: center !important;
+  align-items: center !important;
+  font-size: 14px !important;
+  top: 2px !important;
+  left: 20px !important;
+  transition: none !important;
+  pointer-events: none !important;
+}
+
+.HW_animated {
+  animation: none !important;
+}
+
+.invisible .HW_badge {
+  visibility: hidden !important;
+  display: none !important;
+}
+
+.invisible .HW_frame {
+  visibility: hidden !important;
+  display: none !important;
+}
+
+.HW_badge_cont.HW_visible {
+  display: block !important;
+}
+
+.HW_badge_cont {
+  visibility: unset !important;
+  display: none !important;
+  pointer-events: none !important;
+}
+
+[class^="HW_widget_component_widget-"] {
+  pointer-events: none !important;
+}

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)) %>
 

package/src/core/Meganav/component.json

@@ -29,8 +29,8 @@
     }
   },
   "panels": [
-    { "label": "Platform", "shortLabel": "Platform", "id": "platform-panel", "component": "MeganavContentPlatform" },
-    { "label": "Use Cases & Solutions", "shortLabel": "Use Cases", "id": "use-cases-panel", "component": "MeganavContentUseCases" },
+    { "label": "Products", "shortLabel": "Products", "id": "products-panel", "component": "MeganavContentProducts" },
+    { "label": "Solutions", "shortLabel": "Solutions", "id": "use-cases-panel", "component": "MeganavContentUseCases" },
     { "label": "Company", "shortLabel": "Company", "id": "company-panel", "component": "MeganavContentCompany" },
     { "label": "Developers", "shortLabel": "Developers", "id": "developers-panel", "component": "MeganavContentDevelopers" }
   ]

package/src/core/Meganav/component.jsx

@@ -1,30 +1,32 @@
-import React, { useEffect, useState } from "react";
 import T from "prop-types";
+import React, { useEffect, useState } from "react";
 
 import { connectState } from "../remote-data-store";
 import { selectSessionData } from "../remote-session-data";
 
 import Logo from "../Logo/component.jsx";
 
-import MeganavScripts from "./component.js";
 import MeganavItemsDesktop from "../MeganavItemsDesktop/component.jsx";
-import MeganavItemsSignedIn from "../MeganavItemsSignedIn/component.jsx";
 import MeganavItemsMobile from "../MeganavItemsMobile/component.jsx";
+import MeganavItemsSignedIn from "../MeganavItemsSignedIn/component.jsx";
 import Notice from "../Notice/component.jsx";
-import MeganavData from "./component.json";
 import _absUrl from "../url-base";
+import MeganavScripts from "./component.js";
+import MeganavData from "./component.json";
 
-import MeganavContentPlatform from "../MeganavContentPlatform/component.jsx";
-import MeganavContentUseCases from "../MeganavContentUseCases/component.jsx";
 import MeganavContentCompany from "../MeganavContentCompany/component.jsx";
 import MeganavContentDevelopers from "../MeganavContentDevelopers/component.jsx";
+import MeganavContentProducts from "../MeganavContentProducts/component.jsx";
+import MeganavContentUseCases from "../MeganavContentUseCases/component.jsx";
 import MeganavSearch from "../MeganavSearch/component.jsx";
 
+import MeganavHeadwayPortal from "./MeganavHeadwayPortal.jsx";
+
 const SignIn = ({ sessionState, theme, loginLink, absUrl }) => {
   return sessionState.signedIn ? (
     <MeganavItemsSignedIn absUrl={absUrl} sessionState={sessionState} theme={theme} />
   ) : (
-    <ul className="hidden md:flex items-center">
+    <ul className="items-center hidden md:flex">
       <li className="ui-meganav-item">
         <a href={absUrl("/contact")} className={`ui-meganav-link ${theme.textColor}`} data-id="meganav-link">
           Contact us
@@ -58,10 +60,10 @@ SignIn.propTypes = {
 const SignInPlaceholder = () => <div />;
 
 const panels = {
-  MeganavContentPlatform: MeganavContentPlatform,
-  MeganavContentUseCases: MeganavContentUseCases,
-  MeganavContentCompany: MeganavContentCompany,
-  MeganavContentDevelopers: MeganavContentDevelopers,
+  MeganavContentProducts,
+  MeganavContentUseCases,
+  MeganavContentCompany,
+  MeganavContentDevelopers,
 };
 
 export default function Meganav({ paths, themeName = "white", notice, loginLink = "/login", urlBase, addSearchApiKey }) {
@@ -86,7 +88,7 @@ export default function Meganav({ paths, themeName = "white", notice, loginLink
       {notice && <Notice {...notice.props} config={notice.config} />}
       <div className="ui-meganav ui-grid-px">
         <div className="mr-24">
-          <Logo dataId="meganav-logo" href={urlBase} />
+          <Logo dataId="meganav-logo" href={urlBase} logoUrl={paths.logo} />
         </div>
 
         <MeganavItemsDesktop panels={panels} paths={paths} theme={theme} absUrl={absUrl} />
@@ -95,6 +97,8 @@ export default function Meganav({ paths, themeName = "white", notice, loginLink
         {sessionState ? <SignIn sessionState={sessionState} theme={theme} loginLink={loginLink} absUrl={absUrl} /> : <SignInPlaceholder />}
 
         <MeganavItemsMobile panels={panels} sessionState={sessionState || {}} paths={paths} theme={theme} loginLink={loginLink} absUrl={absUrl} />
+
+        <MeganavHeadwayPortal />
       </div>
     </nav>
   );

package/src/core/Meganav/component.rb

@@ -6,6 +6,7 @@ module AblyUi
     class Meganav < ViewComponent::Base
       include MeganavConfig
       include Util
+      include SharedAssets
       attr_reader :options, :login_link, :logo_link, :url_base
 
       renders_one :notice, AblyUi::Core::Notice
@@ -29,14 +30,14 @@ module AblyUi
       def panels
         [
           {
-            label: 'Platform',
-            short_label: 'Platform',
-            id: 'platform-panel',
-            class: 'AblyUi::Core::MeganavContentPlatform'
+            label: 'Products',
+            short_label: 'Products',
+            id: 'products-panel',
+            class: 'AblyUi::Core::MeganavContentProducts'
           },
           {
-            label: 'Use Cases & Solutions',
-            short_label: 'Use Cases',
+            label: 'Solutions',
+            short_label: 'Solutions',
             id: 'use-cases-panel',
             class: 'AblyUi::Core::MeganavContentUseCases'
           },

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

@@ -72,6 +72,15 @@
             </div>
           <% end %>
         </li>
+        <li>
+          <%= link_to abs_url("/events"), class: "ui-meganav-media-with-image group" do %>
+            <%= render(AblyUi::Core::Icon.new(name: "icon-display-events-col", size: "2.5rem")) %>
+            <div class="flex flex-col justify-center">
+              <p class="ui-meganav-media-heading">Events</p>
+              <p class="ui-meganav-media-copy">Join Ably at upcoming events.</p>
+            </div>
+          <% end %>
+        </li>
       </ul>
     </div>