Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Switch segments from the segment pill menu (#6728)
Sanne de Vries8edd748415e0
diff --git a/assets/js/dashboard/nav-menu/filters-bar.test.tsx b/assets/js/dashboard/nav-menu/filters-bar.test.tsxindex 1109a02227..0794fe95d8 100644--- a/assets/js/dashboard/nav-menu/filters-bar.test.tsx+++ b/assets/js/dashboard/nav-menu/filters-bar.test.tsx@@ -1,5 +1,5 @@import React, { ComponentProps } from 'react'-import { render, screen } from '../../../test-utils'+import { render, screen, within } from '../../../test-utils'import userEvent from '@testing-library/user-event'import { TestContextProviders } from '../../../test-utils/app-context-providers'import { FiltersBar } from './filters-bar'@@ -316,3 +316,58 @@ test('shows Add filter, Save and Cancel in segment edit mode', async () => {expect(screen.queryByRole('link', { name: action })).not.toBeInTheDocument()}})++describe('segment switch', () => {+ const segments = [+ makeSegment(),+ { ...makeSegment({ name: 'Windows users' }), id: 2 }+ ]++ test('the segment title opens a list of segments to switch to', async () => {+ renderFiltersBar({+ searchRecord: {+ filters: [+ ['is', 'segment', [1]],+ ['is', 'page', ['/blog']]+ ],+ labels: { [formatSegmentIdAsLabelKey(1)]: 'Mac users' }+ },+ preloaded: { segments }+ })++ await userEvent.click(+ screen.getByRole('button', { name: 'Segment is Mac users' })+ )+ await userEvent.click(screen.getByRole('button', { name: /^Mac users/ }))++ const list = screen.getByRole('group', { name: 'Switch segment' })+ expect(+ within(list).getByRole('link', { name: /Mac users/ })+ ).toHaveAttribute('aria-current', 'true')++ await userEvent.click(+ within(list).getByRole('link', { name: /Windows users/ })+ )+ expect(+ screen.getByRole('button', { name: 'Segment is Windows users' })+ ).toBeVisible()+ expect(+ screen.getByRole('link', { hidden: false, name: 'Page is /blog' })+ ).toBeVisible()+ })++ test('the segment title is static when there is no other segment', async () => {+ renderFiltersBar({+ searchRecord: getSegmentFilterSearch(segments[0]),+ preloaded: { segments: [segments[0]] }+ })++ await userEvent.click(+ screen.getByRole('button', { name: 'Segment is Mac users' })+ )+ expect(screen.getByTitle('Mac users')).toBeVisible()+ expect(+ screen.queryByRole('button', { name: /^Mac users/ })+ ).not.toBeInTheDocument()+ })+})diff --git a/assets/js/dashboard/nav-menu/segments/segment-pill-menu.tsx b/assets/js/dashboard/nav-menu/segments/segment-pill-menu.tsxindex 9f02d7202c..c0d2cb96b8 100644--- a/assets/js/dashboard/nav-menu/segments/segment-pill-menu.tsx+++ b/assets/js/dashboard/nav-menu/segments/segment-pill-menu.tsx@@ -22,8 +22,10 @@ import {submenuIconClassName as iconClassName,useSubmenu} from '../submenu'+import { SegmentsSubmenu, useListableSegments } from './segments-submenu'const VIEW_FILTERS_LABEL = 'View filters'+const SWITCH_SEGMENT_LABEL = 'Switch segment'const deleteClassName = classNames(popover.items.classNames.navigationLink,@@ -56,6 +58,22 @@ const SegmentFilters = ({ segment }: { segment: SavedSegments[number] }) => (</>)+const SegmentTitle = ({ segment }: { segment: SavedSegments[number] }) => {+ const user = useUserContext()+ return (+ <div className="flex flex-col flex-1 min-w-0 gap-y-0.5 font-semibold">+ <span className="truncate" title={segment.name}>+ {segment.name}+ </span>+ <SegmentAuthorship+ className={popover.items.classNames.description}+ segment={segment}+ showOnlyPublicData={!user.loggedIn || user.role === Role.public}+ />+ </div>+ )+}+export const SegmentPillMenu = ({segment,closeMenu@@ -65,40 +83,54 @@ export const SegmentPillMenu = ({}) => {const user = useUserContext()const { setModal } = useRoutelessModalsContext()- const submenu = useSubmenu<'filters'>()+ const listableSegments = useListableSegments()+ const submenu = useSubmenu<'switch' | 'filters'>()const canEdit = canExpandSegment({ segment, user })const canDuplicate = canSeeSaveAsSegmentAction({ user })+ const canSwitch =+ listableSegments.visible &&+ listableSegments.segments.some((s) => s.id !== segment.id)+ const switchOpen = submenu.openKey === 'switch'const filtersOpen = submenu.openKey === 'filters'- if (filtersOpen && !submenu.besideMenu) {+ const switchBody = (+ <SegmentsSubmenu closeList={closeMenu} selectedId={segment.id} />+ )+ const filtersBody = <SegmentFilters segment={segment} />++ if ((switchOpen || filtersOpen) && !submenu.besideMenu) {return (- <SubmenuInPlace submenu={submenu} label={VIEW_FILTERS_LABEL}>- <SegmentFilters segment={segment} />+ <SubmenuInPlace+ submenu={submenu}+ label={switchOpen ? SWITCH_SEGMENT_LABEL : VIEW_FILTERS_LABEL}+ >+ {switchOpen ? switchBody : filtersBody}</SubmenuInPlace>)}return (- <div- className="flex flex-col gap-y-0.5"- onMouseLeave={submenu.scheduleClose}- onKeyDown={submenu.handleEscape}- >- <div- className={classNames(- popover.items.classNames.staticRow,- 'flex flex-col gap-y-0.5 font-semibold'- )}- >- <span className="truncate" title={segment.name}>- {segment.name}- </span>- <SegmentAuthorship- className={popover.items.classNames.description}- segment={segment}- showOnlyPublicData={!user.loggedIn || user.role === Role.public}- />- </div>+ <div className="flex flex-col gap-y-0.5" onKeyDown={submenu.handleEscape}>+ {canSwitch ? (+ <>+ <SubmenuRow+ expanded={switchOpen}+ submenuId={submenu.submenuId}+ onOpen={(anchor) => submenu.openWith('switch', anchor)}+ >+ <SegmentTitle segment={segment} />+ </SubmenuRow>+ {switchOpen && (+ <SubmenuPanel submenu={submenu} label={SWITCH_SEGMENT_LABEL}>+ {switchBody}+ </SubmenuPanel>+ )}+ </>+ ) : (+ <div className={popover.items.classNames.staticRow}>+ <SegmentTitle segment={segment} />+ </div>+ )}<MenuSeparator /><SubmenuRowlabel={VIEW_FILTERS_LABEL}@@ -109,7 +141,7 @@ export const SegmentPillMenu = ({/>{filtersOpen && (<SubmenuPanel submenu={submenu} label={VIEW_FILTERS_LABEL}>- <SegmentFilters segment={segment} />+ {filtersBody}</SubmenuPanel>)}{canEdit && (diff --git a/assets/js/dashboard/nav-menu/segments/segments-submenu.tsx b/assets/js/dashboard/nav-menu/segments/segments-submenu.tsxindex 9544a852cd..1b4b4a2078 100644--- a/assets/js/dashboard/nav-menu/segments/segments-submenu.tsx+++ b/assets/js/dashboard/nav-menu/segments/segments-submenu.tsx@@ -47,7 +47,13 @@ export const useListableSegments = (): {}}-export const SegmentsSubmenu = ({ closeList }: { closeList: () => void }) => {+export const SegmentsSubmenu = ({+ closeList,+ selectedId+}: {+ closeList: () => void+ selectedId?: number | string+}) => {const user = useUserContext()const site = useSiteContext()const { segments } = useListableSegments()@@ -88,6 +94,7 @@ export const SegmentsSubmenu = ({ closeList }: { closeList: () => void }) => {<SegmentLinkkey={segment.id}segment={segment}+ selected={String(segment.id) === String(selectedId)}showAuthorship={showAuthorship}showOnlyPublicData={isPublicListQuery}closeList={closeList}@@ -113,11 +120,13 @@ export const SegmentsSubmenu = ({ closeList }: { closeList: () => void }) => {const SegmentLink = ({segment,+ selected,showAuthorship,showOnlyPublicData,closeList}: {segment: SavedSegment | SavedSegmentPublic+ selected: booleanshowAuthorship: booleanshowOnlyPublicData: booleancloseList: () => void@@ -130,7 +139,12 @@ const SegmentLink = ({return (<AppNavigationLink- className={popover.items.classNames.iconRow}+ className={classNames(+ popover.items.classNames.iconRow,+ popover.items.classNames.selectedOption+ )}+ data-selected={selected}+ aria-current={selected || undefined}onClick={closeList}search={getSearchToSetSegmentFilter({ id, name })}>diff --git a/assets/js/dashboard/nav-menu/submenu.tsx b/assets/js/dashboard/nav-menu/submenu.tsxindex a113430b6f..c7c4e980df 100644--- a/assets/js/dashboard/nav-menu/submenu.tsx+++ b/assets/js/dashboard/nav-menu/submenu.tsx@@ -115,19 +115,20 @@ export function useSubmenu<K extends string>() {type Submenu = ReturnType<typeof useSubmenu>+type SubmenuRowContent =+ | { label: string; Icon: ComponentType<{ className?: string }> }+ | { children: ReactNode }+export const SubmenuRow = ({- label,- Icon,expanded,submenuId,- onOpen+ onOpen,+ ...content}: {- label: string- Icon: ComponentType<{ className?: string }>expanded: booleansubmenuId: stringonOpen: (anchor: HTMLElement) => void-}) => {+} & SubmenuRowContent) => {const handleOpen = useCallback((event: React.SyntheticEvent<HTMLButtonElement>) =>onOpen(event.currentTarget),@@ -156,8 +157,16 @@ export const SubmenuRow = ({onMouseEnter={handleHoverOrFocus}onFocus={handleHoverOrFocus}>- <Icon className={submenuIconClassName} />- <span className={popover.items.classNames.label}>{label}</span>+ {'children' in content ? (+ content.children+ ) : (+ <>+ <content.Icon className={submenuIconClassName} />+ <span className={popover.items.classNames.label}>+ {content.label}+ </span>+ </>+ )}<ChevronRightIcon className={submenuIconClassName} /></button>)