refactor(VWindow): tuning pass (#15244)

vuetifyjs · Jun 23, 2022 · daccd1b · daccd1b
1 parent ed02b09
commit daccd1b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 578 deletions.
diff --git a/packages/vuetify/src/components/VWindow/VWindow.tsx b/packages/vuetify/src/components/VWindow/VWindow.tsx
@@ -4,26 +4,26 @@ import './VWindow.sass'
 // Components
 import { VBtn } from '@/components/VBtn'
 
+// Directives
+import { Touch } from '@/directives/touch'
+
 // Composables
 import { makeTagProps } from '@/composables/tag'
 import { makeThemeProps, provideTheme } from '@/composables/theme'
 import { useGroup } from '@/composables/group'
 import { useLocale } from '@/composables/locale'
 import { useRtl } from '@/composables/rtl'
 
-// Directives
-import { Touch } from '@/directives/touch'
-
 // Utilities
 import { computed, provide, ref, watch } from 'vue'
 import { genericComponent, useRender } from '@/util'
 
 // Types
 import type { ComputedRef, InjectionKey, PropType, Ref } from 'vue'
 import type { GroupItemProvide, GroupProvide } from '@/composables/group'
-import type { TouchHandlers } from '@/directives/touch'
-import type { MakeSlots } from '@/util'
 import type { IconValue } from '@/composables/icons'
+import type { MakeSlots } from '@/util'
+import type { TouchHandlers } from '@/directives/touch'
 
 type WindowProvide = {
   transition: ComputedRef<undefined | string>

diff --git a/packages/vuetify/src/components/VWindow/VWindowItem.tsx b/packages/vuetify/src/components/VWindow/VWindowItem.tsx
@@ -1,15 +1,15 @@
+// Directives
+import Touch from '@/directives/touch'
+
 // Composables
 import { makeGroupItemProps, useGroupItem } from '@/composables/group'
 import { makeLazyProps, useLazy } from '@/composables/lazy'
 import { MaybeTransition } from '@/composables/transition'
 import { useSsrBoot } from '@/composables/ssrBoot'
 
-// Directives
-import Touch from '@/directives/touch'
-
 // Utilities
 import { computed, inject, nextTick, ref } from 'vue'
-import { convertToUnit, defineComponent } from '@/util'
+import { convertToUnit, defineComponent, useRender } from '@/util'
 import { VWindowGroupSymbol, VWindowSymbol } from './VWindow'
 
 export const VWindowItem = defineComponent({
@@ -28,8 +28,9 @@ export const VWindowItem = defineComponent({
       type: [Boolean, String],
       default: undefined,
     },
-    ...makeLazyProps(),
+
     ...makeGroupItemProps(),
+    ...makeLazyProps(),
   },
 
   setup (props, { slots }) {
@@ -114,21 +115,21 @@ export const VWindowItem = defineComponent({
 
     const { hasContent } = useLazy(props, groupItem.isSelected)
 
-    return () => {
-      return (
-        <MaybeTransition transition={ isBooted.value && transition.value } >
-          <div
-            class={[
-              'v-window-item',
-              groupItem.selectedClass.value,
-            ]}
-            v-show={ groupItem.isSelected.value }
-          >
-            { hasContent.value && slots.default?.() }
-          </div>
-        </MaybeTransition>
-      )
-    }
+    useRender(() => (
+      <MaybeTransition transition={ isBooted.value && transition.value } >
+        <div
+          class={[
+            'v-window-item',
+            groupItem.selectedClass.value,
+          ]}
+          v-show={ groupItem.isSelected.value }
+        >
+          { hasContent.value && slots.default?.() }
+        </div>
+      </MaybeTransition>
+    ))
+
+    return {}
   },
 })