From 369ba176282e931327bbefe5b2078fd4c37f7a62 Mon Sep 17 00:00:00 2001 From: "Mr.Hope" Date: Thu, 20 Apr 2023 15:18:12 +0800 Subject: [PATCH] fix(plugin-theme-data): remove locale field in useThemeLocaleData, close #1287 --- .../src/client/composables/useThemeLocaleData.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ecosystem/plugin-theme-data/src/client/composables/useThemeLocaleData.ts b/ecosystem/plugin-theme-data/src/client/composables/useThemeLocaleData.ts index 9683c056bd..23a375a22b 100644 --- a/ecosystem/plugin-theme-data/src/client/composables/useThemeLocaleData.ts +++ b/ecosystem/plugin-theme-data/src/client/composables/useThemeLocaleData.ts @@ -26,7 +26,11 @@ export const useThemeLocaleData = < export const resolveThemeLocaleData = ( theme: ThemeData, routeLocale: RouteLocale -): ThemeData => ({ - ...theme, - ...theme.locales?.[routeLocale], -}) +): ThemeData => { + const { locales, ...baseOptions } = theme + + return { + ...baseOptions, + ...locales?.[routeLocale], + } +}