Merge remote-tracking branch 'upstream/master' into fix-font-family
This commit is contained in:
@@ -58,13 +58,13 @@ export function RetentionTable({ days = DAYS }) {
|
||||
if (totalDays - rowIndex < day) {
|
||||
return null;
|
||||
}
|
||||
const percentage = records[day]?.percentage;
|
||||
const percentage = records.filter(a => a.day === day)[0]?.percentage;
|
||||
return (
|
||||
<div
|
||||
key={day}
|
||||
className={classNames(styles.cell, { [styles.empty]: !percentage })}
|
||||
>
|
||||
{percentage ? `${percentage.toFixed(2)}%` : ''}
|
||||
{percentage ? `${Number(percentage).toFixed(2)}%` : ''}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
|
||||
@@ -47,7 +47,7 @@ export default function WebsiteChartList({
|
||||
</Button>
|
||||
</Link>
|
||||
</WebsiteHeader>
|
||||
<WebsiteMetricsBar websiteId={id} />
|
||||
<WebsiteMetricsBar websiteId={id} showChange={true} />
|
||||
{showCharts && <WebsiteChart websiteId={id} />}
|
||||
</div>
|
||||
) : null;
|
||||
|
||||
@@ -13,7 +13,7 @@ export default function EventsDataTable({
|
||||
const queryResult = useWebsiteEvents(websiteId);
|
||||
|
||||
return (
|
||||
<DataTable queryResult={queryResult} allowSearch={true}>
|
||||
<DataTable queryResult={queryResult} allowSearch={true} autoFocus={false}>
|
||||
{({ data }) => <EventsTable data={data} />}
|
||||
</DataTable>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user