From d57e4783082625b980f7757f73446f3172b0d6cd Mon Sep 17 00:00:00 2001
From: Beth Legesse <legessebl@gmail.com>
Date: Wed, 18 May 2022 16:27:45 -0500
Subject: [PATCH 1/7] add an optional prop to TreeNavSubMenu

---
 src/Components/TreeNav/TreeNavSubMenu.tsx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Components/TreeNav/TreeNavSubMenu.tsx b/src/Components/TreeNav/TreeNavSubMenu.tsx
index 217b6814..b5a75daa 100644
--- a/src/Components/TreeNav/TreeNavSubMenu.tsx
+++ b/src/Components/TreeNav/TreeNavSubMenu.tsx
@@ -10,18 +10,25 @@ import {
 } from '../../Types'
 import {Popover} from '../Popover'
 
-export type TreeNavSubMenuProps = StandardFunctionProps
+export interface HelpBarProp {
+  helpBar?: boolean
+}
+
+export type TreeNavSubMenuProps = StandardFunctionProps & HelpBarProp
 
 export type TreeNavSubMenuRef = HTMLDivElement
 
 export const TreeNavSubMenu = forwardRef<
   TreeNavSubMenuRef,
   TreeNavSubMenuProps
->(({id, style, testID = 'tree-nav--sub-menu', className, children}, ref) => {
+>(({id, style, testID = 'tree-nav--sub-menu', className, children, helpBar}, ref) => {
   const navMenuHeaderClass = classnames('cf-tree-nav--sub-menu', {
     [`${className}`]: className,
   })
-
+  let popoverPosition = PopoverPosition.ToTheRightTop
+  if (helpBar) {
+    popoverPosition = PopoverPosition.ToTheRight
+  }
   const triggerRef = useRef<HTMLButtonElement>(null)
 
   return (
@@ -39,7 +46,7 @@ export const TreeNavSubMenu = forwardRef<
           hideEvent={PopoverInteraction.Hover}
           showEvent={PopoverInteraction.Hover}
           triggerRef={triggerRef}
-          position={PopoverPosition.ToTheRightTop}
+          position={popoverPosition}
           className="cf-popover__nav"
           distanceFromTrigger={4}
         />

From 6355eef7da0515ebe2b7047b24ceb31d0ebd6453 Mon Sep 17 00:00:00 2001
From: Beth Legesse <legessebl@gmail.com>
Date: Wed, 18 May 2022 16:34:11 -0500
Subject: [PATCH 2/7] prettier

---
 src/Components/TreeNav/TreeNavSubMenu.tsx | 85 ++++++++++++-----------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/src/Components/TreeNav/TreeNavSubMenu.tsx b/src/Components/TreeNav/TreeNavSubMenu.tsx
index b5a75daa..64ef8eae 100644
--- a/src/Components/TreeNav/TreeNavSubMenu.tsx
+++ b/src/Components/TreeNav/TreeNavSubMenu.tsx
@@ -21,47 +21,52 @@ export type TreeNavSubMenuRef = HTMLDivElement
 export const TreeNavSubMenu = forwardRef<
   TreeNavSubMenuRef,
   TreeNavSubMenuProps
->(({id, style, testID = 'tree-nav--sub-menu', className, children, helpBar}, ref) => {
-  const navMenuHeaderClass = classnames('cf-tree-nav--sub-menu', {
-    [`${className}`]: className,
-  })
-  let popoverPosition = PopoverPosition.ToTheRightTop
-  if (helpBar) {
-    popoverPosition = PopoverPosition.ToTheRight
-  }
-  const triggerRef = useRef<HTMLButtonElement>(null)
+>(
+  (
+    {id, style, testID = 'tree-nav--sub-menu', className, children, helpBar},
+    ref
+  ) => {
+    const navMenuHeaderClass = classnames('cf-tree-nav--sub-menu', {
+      [`${className}`]: className,
+    })
+    let popoverPosition = PopoverPosition.ToTheRightTop
+    if (helpBar) {
+      popoverPosition = PopoverPosition.ToTheRight
+    }
+    const triggerRef = useRef<HTMLButtonElement>(null)
 
-  return (
-    <>
-      <button
-        type="button"
-        className="cf-tree-nav--sub-menu-trigger"
-        ref={triggerRef}
-        aria-label="Show sub menu"
-      />
-      {triggerRef && (
-        <Popover
-          enableDefaultStyles={true}
-          contents={onHide => <div onClick={onHide}>{children}</div>}
-          hideEvent={PopoverInteraction.Hover}
-          showEvent={PopoverInteraction.Hover}
-          triggerRef={triggerRef}
-          position={popoverPosition}
-          className="cf-popover__nav"
-          distanceFromTrigger={4}
+    return (
+      <>
+        <button
+          type="button"
+          className="cf-tree-nav--sub-menu-trigger"
+          ref={triggerRef}
+          aria-label="Show sub menu"
         />
-      )}
-      <div
-        id={id}
-        ref={ref}
-        style={style}
-        className={navMenuHeaderClass}
-        data-testid={testID}
-      >
-        {children}
-      </div>
-    </>
-  )
-})
+        {triggerRef && (
+          <Popover
+            enableDefaultStyles={true}
+            contents={onHide => <div onClick={onHide}>{children}</div>}
+            hideEvent={PopoverInteraction.Hover}
+            showEvent={PopoverInteraction.Hover}
+            triggerRef={triggerRef}
+            position={popoverPosition}
+            className="cf-popover__nav"
+            distanceFromTrigger={4}
+          />
+        )}
+        <div
+          id={id}
+          ref={ref}
+          style={style}
+          className={navMenuHeaderClass}
+          data-testid={testID}
+        >
+          {children}
+        </div>
+      </>
+    )
+  }
+)
 
 TreeNavSubMenu.displayName = 'TreeNavSubMenu'

From 3f705765fe164d6fd8e1ac8c4c9ecec28e703765 Mon Sep 17 00:00:00 2001
From: Beth Legesse <legessebl@gmail.com>
Date: Thu, 19 May 2022 12:19:16 -0500
Subject: [PATCH 3/7] allow TreeNavSubMenu to pass value of popover position

---
 src/Components/TreeNav/TreeNavSubMenu.tsx | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Components/TreeNav/TreeNavSubMenu.tsx b/src/Components/TreeNav/TreeNavSubMenu.tsx
index 64ef8eae..3caa3476 100644
--- a/src/Components/TreeNav/TreeNavSubMenu.tsx
+++ b/src/Components/TreeNav/TreeNavSubMenu.tsx
@@ -10,11 +10,11 @@ import {
 } from '../../Types'
 import {Popover} from '../Popover'
 
-export interface HelpBarProp {
-  helpBar?: boolean
+export interface OptionalProp {
+  position?: PopoverPosition
 }
 
-export type TreeNavSubMenuProps = StandardFunctionProps & HelpBarProp
+export type TreeNavSubMenuProps = StandardFunctionProps & OptionalProp
 
 export type TreeNavSubMenuRef = HTMLDivElement
 
@@ -23,16 +23,20 @@ export const TreeNavSubMenu = forwardRef<
   TreeNavSubMenuProps
 >(
   (
-    {id, style, testID = 'tree-nav--sub-menu', className, children, helpBar},
+    {
+      id,
+      style,
+      testID = 'tree-nav--sub-menu',
+      className,
+      children,
+      position = PopoverPosition.ToTheRightTop,
+    },
     ref
   ) => {
     const navMenuHeaderClass = classnames('cf-tree-nav--sub-menu', {
       [`${className}`]: className,
     })
-    let popoverPosition = PopoverPosition.ToTheRightTop
-    if (helpBar) {
-      popoverPosition = PopoverPosition.ToTheRight
-    }
+
     const triggerRef = useRef<HTMLButtonElement>(null)
 
     return (
@@ -50,7 +54,7 @@ export const TreeNavSubMenu = forwardRef<
             hideEvent={PopoverInteraction.Hover}
             showEvent={PopoverInteraction.Hover}
             triggerRef={triggerRef}
-            position={popoverPosition}
+            position={position}
             className="cf-popover__nav"
             distanceFromTrigger={4}
           />

From 9cd3956c70b37e4320ae5df9a8fda9287e1a63e0 Mon Sep 17 00:00:00 2001
From: Beth Legesse <legessebl@gmail.com>
Date: Thu, 19 May 2022 12:35:39 -0500
Subject: [PATCH 4/7] updated version to 4.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aa5746f3..880a55bc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@influxdata/clockface",
-  "version": "4.0.2",
+  "version": "4.2.0",
   "license": "MIT",
   "main": "dist/index.js",
   "style": "dist/index.css",

From 06cbe00333798463d887eeb079b3176e784d36ff Mon Sep 17 00:00:00 2001
From: Beth Legesse <legessebl@gmail.com>
Date: Thu, 19 May 2022 12:36:22 -0500
Subject: [PATCH 5/7] update CHANGELOG.md

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70ec5065..588f87e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### 4.2.0 (2022-05-19)
+
+- [768](https://github.com/influxdata/clockface/pull/768): Added optional property to TreeNavSubMenu
+
 ### 4.0.2 (2022-04-21)
 
 - [767](https://github.com/influxdata/clockface/pull/767): Fixed Form Element text size (14px too small for Proxima Nova)
@@ -34,7 +38,7 @@
 
 ### 3.8.0 (2022-03-31)
 
-- [752](https://github.com/influxdata/clockface/pull/752): Added Icon for Bulk Action Deselection 
+- [752](https://github.com/influxdata/clockface/pull/752): Added Icon for Bulk Action Deselection
 
 ### 3.7.0 (2022-03-31)
 
@@ -51,6 +55,7 @@
 ### 3.5.1 (2022-03-11)
 
 - [744](https://github.com/influxdata/clockface/pull/744): FormValidationElement bug fix
+
 ### 3.5.0 (2022-03-10)
 
 - [740](https://github.com/influxdata/clockface/pull/740): Added input functionality to the PaginationNav

From 421615d6ad94de8066582aac4f2226af2e1bac72 Mon Sep 17 00:00:00 2001
From: Beth Legesse <legessebl@gmail.com>
Date: Thu, 19 May 2022 12:40:47 -0500
Subject: [PATCH 6/7] prettier

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 364d3c20..1691dc6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 4.2.0 (2022-05-19)
 
 - [768](https://github.com/influxdata/clockface/pull/768): Added optional property to TreeNavSubMenu
+
 ### 4.1.0 (2022-05-19)
 
 - [769](https://github.com/influxdata/clockface/pull/769): Selectable resource card for Bulk Actions

From 91cd6c7dbf68ccdfae67a9f936932aea077479ae Mon Sep 17 00:00:00 2001
From: Beth Legesse <legessebl@gmail.com>
Date: Fri, 20 May 2022 09:18:15 -0500
Subject: [PATCH 7/7] update changelog date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1691dc6f..f5bd7af7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-### 4.2.0 (2022-05-19)
+### 4.2.0 (2022-05-20)
 
 - [768](https://github.com/influxdata/clockface/pull/768): Added optional property to TreeNavSubMenu