Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions packages/vuetify/src/components/VFab/VFab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ import { makeLayoutItemProps, useLayoutItem } from '@/composables/layout'
import { makeLocationProps } from '@/composables/location'
import { useProxiedModel } from '@/composables/proxiedModel'
import { useResizeObserver } from '@/composables/resizeObserver'
import { useToggleScope } from '@/composables/toggleScope'
import { makeTransitionProps, MaybeTransition } from '@/composables/transition'

// Utilities
import { computed, ref, shallowRef, toRef, watchEffect } from 'vue'
import { computed, ref, shallowRef, toRef } from 'vue'
import { genericComponent, omit, propsFactory, useRender } from '@/util'

// Types
Expand Down Expand Up @@ -49,7 +48,6 @@ export const VFab = genericComponent()({
setup (props, { slots }) {
const model = useProxiedModel(props, 'modelValue')
const height = shallowRef(56)
const layoutItemStyles = ref()

const { resizeRef } = useResizeObserver(entries => {
if (!entries.length) return
Expand All @@ -70,20 +68,14 @@ export const VFab = genericComponent()({
return props.location?.split(' ')[1] ?? 'end'
})

useToggleScope(() => props.app, () => {
const layout = useLayoutItem({
id: props.name,
order: computed(() => parseInt(props.order, 10)),
position,
layoutSize: computed(() => props.layout ? height.value + 24 : 0),
elementSize: computed(() => height.value + 24),
active: computed(() => props.app && model.value),
absolute: toRef(() => props.absolute),
})

watchEffect(() => {
layoutItemStyles.value = layout.layoutItemStyles.value
})
const { layoutItemStyles } = useLayoutItem({
id: props.name,
order: computed(() => parseInt(props.order, 10)),
position,
layoutSize: computed(() => props.layout ? height.value + 24 : 0),
elementSize: computed(() => height.value + 24),
active: computed(() => props.app && model.value),
absolute: toRef(() => props.absolute),
})

const vFabRef = ref()
Expand All @@ -108,7 +100,7 @@ export const VFab = genericComponent()({
]}
style={[
props.app
? { ...layoutItemStyles.value }
? layoutItemStyles.value
: {
height: props.absolute
? '100%'
Expand Down
27 changes: 9 additions & 18 deletions packages/vuetify/src/components/VFooter/VFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import { useResizeObserver } from '@/composables/resizeObserver'
import { makeRoundedProps, useRounded } from '@/composables/rounded'
import { makeTagProps } from '@/composables/tag'
import { makeThemeProps, provideTheme } from '@/composables/theme'
import { useToggleScope } from '@/composables/toggleScope'

// Utilities
import { computed, ref, shallowRef, toRef, watchEffect } from 'vue'
import { computed, shallowRef, toRef } from 'vue'
import { convertToUnit, genericComponent, propsFactory, useRender } from '@/util'

export const makeVFooterProps = propsFactory({
Expand All @@ -40,8 +39,6 @@ export const VFooter = genericComponent()({
props: makeVFooterProps(),

setup (props, { slots }) {
const layoutItemStyles = ref()

const { themeClasses } = provideTheme(props)
const { backgroundColorClasses, backgroundColorStyles } = useBackgroundColor(() => props.color)
const { borderClasses } = useBorder(props)
Expand All @@ -55,20 +52,14 @@ export const VFooter = genericComponent()({
})
const height = computed(() => props.height === 'auto' ? autoHeight.value : parseInt(props.height, 10))

useToggleScope(() => props.app, () => {
const layout = useLayoutItem({
id: props.name,
order: computed(() => parseInt(props.order, 10)),
position: toRef(() => 'bottom'),
layoutSize: height,
elementSize: computed(() => props.height === 'auto' ? undefined : height.value),
active: toRef(() => props.app),
absolute: toRef(() => props.absolute),
})

watchEffect(() => {
layoutItemStyles.value = layout.layoutItemStyles.value
})
const { layoutItemStyles } = useLayoutItem({
id: props.name,
order: computed(() => parseInt(props.order, 10)),
position: toRef(() => 'bottom'),
layoutSize: height,
elementSize: computed(() => props.height === 'auto' ? undefined : height.value),
active: toRef(() => props.app),
absolute: toRef(() => props.absolute),
})

useRender(() => (
Expand Down
4 changes: 2 additions & 2 deletions packages/vuetify/src/composables/layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export function useLayoutItem (options: {
}) {
const layout = inject(VuetifyLayoutKey)

if (!layout) throw new Error('[Vuetify] Could not find injected layout')
if (!layout && options.active.value) throw new Error('[Vuetify] Could not find injected layout')

const id = options.id ?? `layout-item-${useId()}`

Expand All @@ -126,7 +126,7 @@ export function useLayoutItem (options: {
const {
layoutItemStyles,
layoutItemScrimStyles,
} = layout.register(vm, {
} = layout.register(vm, { // TODO: get styles without registering?
...options,
active: computed(() => isKeptAlive.value ? false : options.active.value),
id,
Expand Down
Loading