From 42951359e25ff9e3517fb8598908e0b78e1f4d94 Mon Sep 17 00:00:00 2001
From: Haider Alshamma <haidera@nulogy.com>
Date: Tue, 31 Oct 2023 17:42:02 -0400
Subject: [PATCH] feat: add helpText to the Sidebar

- Add a helpText and a renderHelpText props to the Sidebar component.
---
 src/Layout/Sidebar.story.tsx | 63 ++++++++++++++++++++++++++++++++++++
 src/Layout/Sidebar.tsx       | 55 ++++++++++++++++++++-----------
 2 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/src/Layout/Sidebar.story.tsx b/src/Layout/Sidebar.story.tsx
index a2fb6d5d6..fa8e88faf 100644
--- a/src/Layout/Sidebar.story.tsx
+++ b/src/Layout/Sidebar.story.tsx
@@ -11,6 +11,11 @@ import {
   Select,
   PrimaryButton,
   Box,
+  Textarea,
+  Text,
+  Flex,
+  Button,
+  Heading3,
 } from "..";
 
 const primaryMenu = [
@@ -439,3 +444,61 @@ export const WithDifferentWidths = () => {
     </Sidebar>
   );
 };
+
+export const WithHelpText = () => {
+  const [helpText, setHelpText] = useState(
+    "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus tempor lacus nec finibus egestas."
+  );
+
+  return (
+    <Sidebar hideCloseButton top={0} height="100%" isOpen title="With help text" helpText={helpText}>
+      <Textarea
+        value={helpText}
+        labelText="Help Text"
+        placeholder="Enter some text..."
+        onChange={(event) => {
+          setHelpText(event.target.value);
+        }}
+      />
+    </Sidebar>
+  );
+};
+export const WithOtherElementsInHelpText = () => {
+  return (
+    <Sidebar
+      hideCloseButton
+      top={0}
+      height="100%"
+      isOpen
+      title="With help text"
+      helpText={
+        <>
+          Carry over remaining quantity to a future PO line item.{" "}
+          <Link underline={false} href="/">
+            Learn more
+          </Link>{" "}
+        </>
+      }
+    ></Sidebar>
+  );
+};
+
+export const WithARenderedHelpText = () => {
+  return (
+    <Sidebar
+      hideCloseButton
+      top={0}
+      height="100%"
+      isOpen
+      title="With help text"
+      renderHelpText={() => (
+        <Heading3 color="red" fontWeight="bold">
+          This is a custom help text{" "}
+          <Link href="/" underline={false}>
+            Learn more
+          </Link>
+        </Heading3>
+      )}
+    ></Sidebar>
+  );
+};
diff --git a/src/Layout/Sidebar.tsx b/src/Layout/Sidebar.tsx
index 1b778e255..e0de15e69 100644
--- a/src/Layout/Sidebar.tsx
+++ b/src/Layout/Sidebar.tsx
@@ -4,10 +4,11 @@ import { useTranslation } from "react-i18next";
 import { Box } from "../Box";
 import { Flex } from "../Flex";
 import { IconicButton } from "../Button";
-import { Heading3 } from "../Type";
+import { Heading3, Text } from "../Type";
 import { AnimatedBoxProps, AnimatedBox } from "../Box/Box";
 import { NAVBAR_HEIGHT } from "../BrandedNavBar/NavBar";
 import { PreventBodyElementScrolling } from "../utils";
+import { Divider } from "../Divider";
 
 type PredefinedSidebarWidth = "xs" | "s" | "m" | "l" | "xl";
 
@@ -41,6 +42,8 @@ type SidebarProps = Omit<AnimatedBoxProps, "width"> & {
   disableScroll?: boolean;
   hideCloseButton?: boolean;
   width?: SidebarWidth;
+  helpText?: React.ReactNode;
+  renderHelpText?: () => React.ReactNode;
 };
 
 const focusFirstElement = () => {
@@ -69,7 +72,7 @@ const SidebarOverlay = ({ transitionDuration, top, transparent, zIndex = 799 as
   />
 );
 function Sidebar({
-  p = "x3",
+  p = "x2",
   width = "xs",
   children,
   onClose,
@@ -87,6 +90,8 @@ function Sidebar({
   disableScroll = true,
   hideCloseButton = false,
   zIndex = "sidebar" as any,
+  helpText,
+  renderHelpText,
   ...props
 }: SidebarProps) {
   const closeButton = useRef(null);
@@ -191,24 +196,36 @@ function Sidebar({
           flexDirection="column"
           style={{ overflowBehaviour: "contain" } as any}
         >
-          <Flex justifyContent="space-between" alignItems="flex-start" pb="x3">
-            {title && (
-              <Flex alignItems="center" height="100%">
-                <Heading3 mb={0}>{title}</Heading3>
+          <Flex flexDirection="column" pb="x3">
+            <Flex flexDirection="column" pb="x2">
+              <Flex justifyContent="space-between" alignItems="flex-start">
+                {title && (
+                  <Flex alignItems="center" height="100%">
+                    <Heading3 mb={0}>{title}</Heading3>
+                  </Flex>
+                )}
+                {!hideCloseButton && (
+                  <Box marginLeft="x2">
+                    <IconicButton
+                      type="button"
+                      ref={closeButton}
+                      icon="close"
+                      onClick={onClose}
+                      data-testid={closeButtonTestId}
+                      aria-label={closeButtonAriaLabel || t("close")}
+                    />
+                  </Box>
+                )}
               </Flex>
-            )}
-            {!hideCloseButton && (
-              <Box marginLeft="x2">
-                <IconicButton
-                  type="button"
-                  ref={closeButton}
-                  icon="close"
-                  onClick={onClose}
-                  data-testid={closeButtonTestId}
-                  aria-label={closeButtonAriaLabel || t("close")}
-                />
-              </Box>
-            )}
+              {renderHelpText
+                ? renderHelpText()
+                : helpText && (
+                    <Text pt="x1" color="midGrey">
+                      {helpText}
+                    </Text>
+                  )}
+            </Flex>
+            <Divider m="0 -8px" width="calc(100% + 16px)" />
           </Flex>
           <AnimatedBox
             variants={childVariants}