diff --git a/src/app/(main)/websites/[websiteId]/journeys/Journey.module.css b/src/app/(main)/websites/[websiteId]/journeys/Journey.module.css index 3164829f..df293bc1 100644 --- a/src/app/(main)/websites/[websiteId]/journeys/Journey.module.css +++ b/src/app/(main)/websites/[websiteId]/journeys/Journey.module.css @@ -33,7 +33,6 @@ justify-content: flex-start; gap: 10px; width: 100%; - height: 60px; } .visitors { diff --git a/src/app/(main)/websites/[websiteId]/journeys/Journey.tsx b/src/app/(main)/websites/[websiteId]/journeys/Journey.tsx index 0b7f2bbb..8cff3207 100644 --- a/src/app/(main)/websites/[websiteId]/journeys/Journey.tsx +++ b/src/app/(main)/websites/[websiteId]/journeys/Journey.tsx @@ -1,5 +1,5 @@ import { useMemo, useState } from 'react'; -import { TooltipTrigger, Tooltip, Focusable, Icon, Text, Row } from '@umami/react-zen'; +import { TooltipTrigger, Tooltip, Focusable, Icon, Text, Row, Column } from '@umami/react-zen'; import { firstBy } from 'thenby'; import classNames from 'classnames'; import { useEscapeKey, useMessages, useResultQuery } from '@/components/hooks'; @@ -169,8 +169,7 @@ export function Journey({
- {columns.map((column, columnIndex) => { - const dropOffPercent = `${~~column.dropOff}%`; + {columns.map(({ visitorCount, nodes }, columnIndex) => { return (
{columnIndex + 1}
-
- {formatLongNumber(column.visitorCount)} {formatMessage(labels.visitors)} -
-
- {columnIndex > 0 &&
{dropOffPercent}
} +
+ {formatLongNumber(visitorCount)} {formatMessage(labels.visitors)}
- {column.nodes.map( + {nodes.map( ({ name, totalCount, @@ -208,6 +204,13 @@ export function Journey({ : selectedCount : totalCount; + const remaining = + columnIndex > 0 + ? Math.round((nodeCount / columns[columnIndex - 1]?.visitorCount) * 100) + : 0; + + const dropped = 100 - remaining; + return (
{name}
- +
{formatLongNumber(nodeCount)}
- - {dropOffPercent} + + + {`${dropped}% ${formatMessage(labels.dropoff)}`} + + + + {`${remaining}% ${formatMessage(labels.conversion)}`} + +
diff --git a/src/components/common/Panel.tsx b/src/components/common/Panel.tsx index 5a7e8fb0..d979bbca 100644 --- a/src/components/common/Panel.tsx +++ b/src/components/common/Panel.tsx @@ -21,6 +21,7 @@ const fullscreenStyles = { height: '100%', top: 0, left: 0, + border: 'none', zIndex: 9999, } as any; diff --git a/src/components/input/MenuButton.tsx b/src/components/input/MenuButton.tsx index 3b769e16..e3e3a3b5 100644 --- a/src/components/input/MenuButton.tsx +++ b/src/components/input/MenuButton.tsx @@ -15,7 +15,7 @@ export function MenuButton({ return ( -