watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 15:17:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Updated theme handling.

Browse source
This commit is contained in:
Mike Cao 2025-04-01 22:58:38 -05:00
parent c71e9b5707
commit 34a8fa100c
10 changed files with 57 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/metrics/PageviewsChart.tsx
View file

@ -1,7 +1,9 @@
import { useMemo } from 'react';
import { useTheme } from '@umami/react-zen';
import { BarChart, BarChartProps } from '@/components/charts/BarChart';
import { useLocale, useTheme, useMessages } from '@/components/hooks';
import { useLocale, useMessages } from '@/components/hooks';
import { renderDateLabels } from '@/lib/charts';
import { getThemeColors } from '@/lib/colors';
export interface PageviewsChartProps extends BarChartProps {
data: {
@ -25,7 +27,8 @@ export function PageviewsChart({
...props
}: PageviewsChartProps) {
const { formatMessage, labels } = useMessages();
const { colors } = useTheme();
const { theme } = useTheme();
const { colors } = getThemeColors(theme);
const { locale } = useLocale();
const chartData = useMemo(() => {

7
src/components/metrics/WorldMap.tsx
View file

@ -1,4 +1,4 @@
import { FloatingTooltip, Column } from '@umami/react-zen';
import { FloatingTooltip, Column, useTheme } from '@umami/react-zen';
import { useState, useMemo, HTMLAttributes } from 'react';
import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps';
import classNames from 'classnames';
@ -6,7 +6,6 @@ import { colord } from 'colord';
import { ISO_COUNTRIES, MAP_FILE } from '@/lib/constants';
import {
useDateRange,
useTheme,
useWebsiteMetricsQuery,
useCountryNames,
useLocale,
@ -15,6 +14,7 @@ import {
import { formatLongNumber } from '@/lib/format';
import { percentFilter } from '@/lib/filters';
import styles from './WorldMap.module.css';
import { getThemeColors } from '@/lib/colors';
export function WorldMap({
websiteId,
@ -27,7 +27,8 @@ export function WorldMap({
className?: string;
} & HTMLAttributes<HTMLDivElement>) {
const [tooltip, setTooltipPopup] = useState();
const { theme, colors } = useTheme();
const { theme } = useTheme();
const { colors } = getThemeColors(theme);
const { locale } = useLocale();
const { formatMessage, labels } = useMessages();
const { countryNames } = useCountryNames(locale);