Merge pull request #24732 from github/repo-sync

repo sync

components/sidebar/ProductCollapsibleSection.tsx

@@ -1,122 +1,77 @@
 import cx from 'classnames'
-import { useState, SyntheticEvent } from 'react'
-import { ChevronDownIcon } from '@primer/octicons-react'
-import { ActionList } from '@primer/react'
+import { TreeView } from '@primer/react'
 
 import { Link } from 'components/Link'
 import { ProductTreeNode } from 'components/context/MainContext'
 import { EventType, sendEvent } from 'src/events/browser'
-import styles from './SidebarProduct.module.scss'
 
 type SectionProps = {
   routePath: string
   page: ProductTreeNode
   title: string
-  defaultOpen: boolean
 }
 export const ProductCollapsibleSection = (props: SectionProps) => {
-  const { routePath, defaultOpen, title, page } = props
-  const [isOpen, setIsOpen] = useState(defaultOpen)
-
-  const onToggle = (e: SyntheticEvent) => {
-    const newIsOpen = (e.target as HTMLDetailsElement).open
-    setIsOpen(newIsOpen)
-    sendEvent({
-      type: EventType.navigate,
-      navigate_label: `details ${newIsOpen ? 'open' : 'close'}: ${title}`,
-    })
-  }
-
+  const { routePath, page } = props
   // The lowest level page link displayed in the tree
   const renderTerminalPageLink = (page: ProductTreeNode) => {
     const title = page.shortTitle || page.title
-
     const isCurrent = routePath === page.href
+
     return (
-      <ActionList.Item
+      <Link
+        href={page.href}
         key={page.href}
-        data-testid="sidebar-article"
-        data-is-current-page={isCurrent}
-        className={cx(
-          'width-full position-relative',
-          styles.sidebarArticle,
-          isCurrent && ['text-bold', styles.sidebarArticleActive]
-        )}
-        sx={{
-          padding: '2px 0',
-          ':hover': {
-            borderRadius: 0,
-          },
-        }}
+        className={cx('color-fg-default no-underline', isCurrent ? 'text-bold' : '')}
       >
-        <Link
-          href={page.href}
-          className={cx(
-            'd-block pl-6 pr-5 py-1 no-underline width-full',
-            isCurrent ? 'color-fg-accent' : 'color-fg-default'
-          )}
+        <TreeView.Item
+          id={page.href}
+          data-testid="sidebar-article"
+          current={isCurrent}
+          defaultExpanded={isCurrent}
+          onSelect={() => {
+            sendEvent({
+              type: EventType.navigate,
+              navigate_label: `product page navigate to: ${page.href}`,
+            })
+          }}
         >
           {title}
-        </Link>
-      </ActionList.Item>
+        </TreeView.Item>
+      </Link>
     )
   }
 
   return (
-    <details open={defaultOpen} onToggle={onToggle} className="details-reset">
-      <summary className="outline-none">
-        <div className="d-flex flex-justify-between">
-          <div className="pl-4 pr-1 py-2 f5 d-block flex-auto mr-3 color-fg-default no-underline text-bold">
-            {title}
-          </div>
-          <span style={{ marginTop: 7 }} className="flex-shrink-0 pr-3">
-            <ChevronDownIcon className={cx('opacity-60', isOpen && 'rotate-180')} />
-          </span>
-        </div>
-      </summary>
-
-      {
+    <>
+      {/* <!-- some pages have nested child pages (formerly known as a mapTopic) --> */}
+      {page.childPages[0]?.documentType === 'mapTopic' ? (
         <>
-          {/* <!-- some pages have nested child pages (formerly known as a mapTopic) --> */}
-          {page.childPages[0]?.documentType === 'mapTopic' ? (
-            <ul className="list-style-none position-relative">
-              {page.childPages.map((childPage, i) => {
-                const childTitle = childPage.shortTitle || childPage.title
+          {page.childPages.map((childPage, i) => {
+            const childTitle = childPage.shortTitle || childPage.title
+            const isActive = routePath.includes(childPage.href)
+            const isCurrent = routePath === childPage.href
 
-                const isActive = routePath.includes(childPage.href)
-                const isCurrent = routePath === childPage.href
-
-                return (
-                  <li key={childPage.href + i} data-is-current-page={isCurrent}>
-                    <details
-                      open={isActive}
-                      onToggle={(e) => e.stopPropagation()}
-                      className="details-reset"
-                    >
-                      <summary>
-                        <div className={cx('pl-4 pr-5 py-2 no-underline')}>{childTitle}</div>
-                      </summary>
-                      <div data-testid="sidebar-article-group" className="pb-0">
-                        <ActionList variant="full" className="my-2">
-                          {childPage.childPages.map((cp) => {
-                            return renderTerminalPageLink(cp)
-                          })}
-                        </ActionList>
-                      </div>
-                    </details>
-                  </li>
-                )
-              })}
-            </ul>
-          ) : page.childPages[0]?.documentType === 'article' ? (
-            <div data-testid="sidebar-article-group" className="pb-0">
-              <ActionList variant="full" className="my-2">
-                {page.childPages.map(renderTerminalPageLink)}
-              </ActionList>
-            </div>
-          ) : null}
+            return (
+              <div key={childPage.href + i}>
+                <TreeView.Item defaultExpanded={isActive} id={childTitle} current={isCurrent}>
+                  {childTitle}
+                  <TreeView.SubTree data-testid="sidebar-article-group">
+                    {childPage.childPages.map((cp) => {
+                      return renderTerminalPageLink(cp)
+                    })}
+                  </TreeView.SubTree>
+                </TreeView.Item>
+              </div>
+            )
+          })}
         </>
-      }
-    </details>
+      ) : page.childPages[0]?.documentType === 'article' ? (
+        <div data-testid="sidebar-article-group">
+          {page.childPages.map((cp) => {
+            return renderTerminalPageLink(cp)
+          })}
+        </div>
+      ) : null}
+    </>
   )
 }

components/sidebar/RestCollapsibleSection.module.scss

@@ -0,0 +1,14 @@
+.operationWidth {
+  li div div span {
+    white-space: normal !important;
+    padding: 2px;
+  }
+}
+
+.toggleHover {
+  li div div {
+    &:hover {
+      background-color: transparent !important;
+    }
+  }
+}