Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(VCarousel): fix carousel direction props #17587

Merged
merged 3 commits into from
Jul 11, 2023
Merged

fix(VCarousel): fix carousel direction props #17587

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82290d3
fix(VCarousel): fix carousel direction props
SonTT19 Jun 12, 2023
8725b9d
fix(VCarousel): use filterProps to transfer props
SonTT19 Jun 16, 2023
3ffb68f
fix(VCarousel): remove default direction for carousel
SonTT19 Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
152 changes: 77 additions & 75 deletions packages/vuetify/src/components/VCarousel/VCarousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,81 +95,83 @@ export const VCarousel = genericComponent<VCarouselSlots>()({
window.requestAnimationFrame(startTimeout)
}

useRender(() => (
<VWindow
ref={ windowRef }
v-model={ model.value }
class={[
'v-carousel',
{
'v-carousel--hide-delimiter-background': props.hideDelimiterBackground,
'v-carousel--vertical-delimiters': props.verticalDelimiters,
},
props.class,
]}
style={[
{ height: convertToUnit(props.height) },
props.style,
]}
continuous
mandatory="force"
showArrows={ props.showArrows }
>
{{
default: slots.default,
additional: ({ group }: { group: GroupProvide }) => (
<>
{ !props.hideDelimiters && (
<div
class="v-carousel__controls"
style={{
left: props.verticalDelimiters === 'left' && props.verticalDelimiters ? 0 : 'auto',
right: props.verticalDelimiters === 'right' ? 0 : 'auto',
}}
>
{ group.items.value.length > 0 && (
<VDefaultsProvider
defaults={{
VBtn: {
color: props.color,
icon: props.delimiterIcon,
size: 'x-small',
variant: 'text',
},
}}
scoped
>
{ group.items.value.map((item, index) => {
const props = {
id: `carousel-item-${item.id}`,
'aria-label': t('$vuetify.carousel.ariaLabel.delimiter', index + 1, group.items.value.length),
class: [group.isSelected(item.id) && 'v-btn--active'],
onClick: () => group.select(item.id, true),
}

return slots.item
? slots.item({ props, item })
: (<VBtn { ...item } { ...props } />)
})}
</VDefaultsProvider>
)}
</div>
)}

{ props.progress && (
<VProgressLinear
class="v-carousel__progress"
color={ typeof props.progress === 'string' ? props.progress : undefined }
modelValue={ (group.getItemIndex(model.value) + 1) / group.items.value.length * 100 }
/>
)}
</>
),
prev: slots.prev,
next: slots.next,
}}
</VWindow>
))
useRender(() => {
const [windowProps] = VWindow.filterProps(props)

return (
<VWindow
ref={ windowRef }
{ ...windowProps }
johnleider marked this conversation as resolved.
Show resolved Hide resolved
v-model={ model.value }
class={[
'v-carousel',
{
'v-carousel--hide-delimiter-background': props.hideDelimiterBackground,
'v-carousel--vertical-delimiters': props.verticalDelimiters,
},
props.class,
]}
style={[
{ height: convertToUnit(props.height) },
props.style,
]}
>
{{
default: slots.default,
additional: ({ group }: { group: GroupProvide }) => (
<>
{ !props.hideDelimiters && (
<div
class="v-carousel__controls"
style={{
left: props.verticalDelimiters === 'left' && props.verticalDelimiters ? 0 : 'auto',
right: props.verticalDelimiters === 'right' ? 0 : 'auto',
}}
>
{ group.items.value.length > 0 && (
<VDefaultsProvider
defaults={{
VBtn: {
color: props.color,
icon: props.delimiterIcon,
size: 'x-small',
variant: 'text',
},
}}
scoped
>
{ group.items.value.map((item, index) => {
const props = {
id: `carousel-item-${item.id}`,
'aria-label': t('$vuetify.carousel.ariaLabel.delimiter', index + 1, group.items.value.length),
class: [group.isSelected(item.id) && 'v-btn--active'],
onClick: () => group.select(item.id, true),
}

return slots.item
? slots.item({ props, item })
: (<VBtn { ...item } { ...props } />)
})}
</VDefaultsProvider>
)}
</div>
)}

{ props.progress && (
<VProgressLinear
class="v-carousel__progress"
color={ typeof props.progress === 'string' ? props.progress : undefined }
modelValue={ (group.getItemIndex(model.value) + 1) / group.items.value.length * 100 }
/>
)}
</>
),
prev: slots.prev,
next: slots.next,
}}
</VWindow>
)
})

return {}
},
Expand Down