fix(cdk:utils): fix useControlledProp defaultValue behavior (#1090)

IDuxFE · Aug 26, 2022 · 0ac224c · 0ac224c
1 parent 1fe3d76
commit 0ac224c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/packages/cdk/utils/src/composable.ts b/packages/cdk/utils/src/composable.ts
@@ -63,22 +63,22 @@ export function useControlledProp<T, K extends keyof T>(props: T, key: K): [Comp
 export function useControlledProp<T, K extends keyof T>(
   props: T,
   key: K,
-  defaultOrFactory: T[K] | (() => T[K]),
+  defaultOrFactory: Exclude<T[K], undefined> | (() => Exclude<T[K], undefined>),
 ): [ComputedRef<Exclude<T[K], undefined>>, (value: Exclude<T[K], undefined>) => void]
 export function useControlledProp<T, K extends keyof T>(
   props: T,
   key: K,
-  defaultOrFactory?: T[K] | (() => T[K]),
+  defaultOrFactory?: Exclude<T[K], undefined> | (() => Exclude<T[K], undefined>),
 ): [ComputedRef<T[K]>, (value: T[K]) => void] {
-  const defaultValue = props[key] ?? (isFunction(defaultOrFactory) ? defaultOrFactory() : defaultOrFactory)
-  const tempProp = shallowRef(defaultValue)
+  const defaultValue = (isFunction(defaultOrFactory) ? defaultOrFactory() : defaultOrFactory)!
+  const tempProp = shallowRef(props[key])
 
   watch(
     () => props[key],
     value => (tempProp.value = value),
   )
 
-  const state = computed(() => props[key] ?? tempProp.value!)
+  const state = computed(() => props[key] ?? tempProp.value ?? defaultValue)
 
   const setState = (value: T[K]) => {
     if (value !== toRaw(state.value)) {

diff --git a/packages/site/src/main.ts b/packages/site/src/main.ts
@@ -27,15 +27,17 @@ const router = createRouter({
 })
 
 // fix: vscode link policy
-router.beforeEach(router => {
-  const redirectedFrom = router.redirectedFrom
+router.beforeEach(route => {
+  const redirectedFrom = route.redirectedFrom
   if (
     redirectedFrom &&
     redirectedFrom.path.indexOf('%23') &&
-    router.fullPath.replace('#', '%23') !== redirectedFrom.path
+    route.fullPath.replace('#', '%23') !== redirectedFrom.path
   ) {
     return redirectedFrom.fullPath.replace('%23', '#')
   }
+
+  return
 })
 
 createApp(App).use(router).use(IduxInstall).mount('#app')