From 004fa1ebcb29a3b5e523523d80ad8fccd4b1c03e Mon Sep 17 00:00:00 2001
From: Dafitra <42286100+AnOrdinaryPeople@users.noreply.github.com>
Date: Wed, 27 Nov 2024 16:35:12 +0700
Subject: [PATCH] refactor(App): remove default locale handling (#2760)

---
 src/runtime/components/App.vue       | 7 +++----
 src/runtime/composables/useLocale.ts | 3 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/runtime/components/App.vue b/src/runtime/components/App.vue
index e3ae90e8..c1f216ad 100644
--- a/src/runtime/components/App.vue
+++ b/src/runtime/components/App.vue
@@ -3,7 +3,6 @@ import type { ConfigProviderProps, TooltipProviderProps } from 'radix-vue'
 import { localeContextInjectionKey } from '../composables/useLocale'
 import { extendDevtoolsMeta } from '../composables/extendDevtoolsMeta'
 import type { ToasterProps, Locale } from '../types'
-import { en } from '../locale'
 
 export interface AppProps extends Omit<ConfigProviderProps, 'useId' | 'dir'> {
   tooltip?: TooltipProviderProps
@@ -23,7 +22,7 @@ extendDevtoolsMeta({ ignore: true })
 </script>
 
 <script setup lang="ts">
-import { toRef, useId, provide, computed } from 'vue'
+import { toRef, useId, provide } from 'vue'
 import { ConfigProvider, TooltipProvider, useForwardProps } from 'radix-vue'
 import { reactivePick } from '@vueuse/core'
 import UToaster from './Toaster.vue'
@@ -37,12 +36,12 @@ const configProviderProps = useForwardProps(reactivePick(props, 'scrollBody'))
 const tooltipProps = toRef(() => props.tooltip)
 const toasterProps = toRef(() => props.toaster)
 
-const locale = computed(() => props.locale || en)
+const locale = toRef(() => props.locale)
 provide(localeContextInjectionKey, locale)
 </script>
 
 <template>
-  <ConfigProvider :use-id="() => (useId() as string)" :dir="locale.dir" v-bind="configProviderProps">
+  <ConfigProvider :use-id="() => (useId() as string)" :dir="locale?.dir" v-bind="configProviderProps">
     <TooltipProvider v-bind="tooltipProps">
       <UToaster v-if="toaster !== null" v-bind="toasterProps">
         <slot />
diff --git a/src/runtime/composables/useLocale.ts b/src/runtime/composables/useLocale.ts
index 61e7b5df..f78b7c56 100644
--- a/src/runtime/composables/useLocale.ts
+++ b/src/runtime/composables/useLocale.ts
@@ -10,9 +10,6 @@ export const localeContextInjectionKey: InjectionKey<Ref<Locale | undefined>> =
 const _useLocale = (localeOverrides?: Ref<Locale | undefined>) => {
   const locale = localeOverrides || inject(localeContextInjectionKey, ref())!
 
-  /**
-   * If for some reason the developer does not use `UApp`, we get the language back just in case.
-   */
   return buildLocaleContext(computed(() => locale.value || en))
 }