Skip to content

fix(vc-slick): #6100 - Fix content responsiveness in carousel component slot. #6149

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

Merged
merged 2 commits into from
Dec 15, 2022
Merged

fix(vc-slick): #6100 - Fix content responsiveness in carousel component slot. #6149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e929f5
fix(vc-slick): #6100 - Fix content responsiveness in carousel compone…
cn-wang Dec 9, 2022
356ce48
feat(_util) add deepCloneElement function
cn-wang Dec 12, 2022
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
22 changes: 20 additions & 2 deletions components/_util/vnode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import type { VNode, VNodeProps } from 'vue';
import { cloneVNode } from 'vue';
import warning from './warning';
import type { RefObject } from './createRef';
type NodeProps = Record<string, any> &
Omit<VNodeProps, 'ref'> & { ref?: VNodeProps['ref'] | RefObject };

export function cloneElement<T, U>(
vnode: VNode<T, U> | VNode<T, U>[],
nodeProps: Record<string, any> &
Omit<VNodeProps, 'ref'> & { ref?: VNodeProps['ref'] | RefObject } = {},
nodeProps: NodeProps = {},
override = true,
mergeRef = false,
): VNode<T, U> {
Expand All @@ -29,3 +30,20 @@ export function cloneElement<T, U>(
export function cloneVNodes(vnodes, nodeProps = {}, override = true) {
return vnodes.map(vnode => cloneElement(vnode, nodeProps, override));
}

export function deepCloneElement<T, U>(
vnode: VNode<T, U> | VNode<T, U>[],
nodeProps: NodeProps = {},
override = true,
mergeRef = false,
) {
if (Array.isArray(vnode)) {
return vnode.map(item => deepCloneElement(item, nodeProps, override, mergeRef));
} else {
const cloned = cloneElement(vnode, nodeProps, override, mergeRef);
if (Array.isArray(cloned.children)) {
cloned.children = deepCloneElement(cloned.children as VNode<T, U>[]);
}
return cloned;
}
}
10 changes: 5 additions & 5 deletions components/vc-slick/track.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createVNode } from 'vue';
import classnames from '../_util/classNames';
import { cloneElement } from '../_util/vnode';
import { flattenChildren } from '../_util/props-util';
import { lazyStartIndex, lazyEndIndex, getPreClones } from './utils/innerSliderUtils';
import { deepCloneElement } from '../_util/vnode';

// given specifications/props for a slide, fetch all the classes that need to be applied to the slide
const getSlideClasses = spec => {
Expand Down Expand Up @@ -84,7 +84,6 @@ const renderSlides = function (spec, children) {
const childrenCount = children.length;
const startIndex = lazyStartIndex(spec);
const endIndex = lazyEndIndex(spec);

children.forEach((elem, index) => {
let child;
const childOnClickOptions = {
Expand All @@ -105,7 +104,7 @@ const renderSlides = function (spec, children) {
let slideClasses = getSlideClasses({ ...spec, index });
// push a cloned element of the desired slide
slides.push(
cloneElement(child, {
deepCloneElement(child, {
key: 'original' + getKey(child, index),
tabindex: '-1',
'data-index': index,
Expand All @@ -131,7 +130,7 @@ const renderSlides = function (spec, children) {
}
slideClasses = getSlideClasses({ ...spec, index: key });
preCloneSlides.push(
cloneElement(child, {
deepCloneElement(child, {
key: 'precloned' + getKey(child, key),
class: classnames(slideClasses, slideClass),
tabindex: '-1',
Expand All @@ -155,7 +154,7 @@ const renderSlides = function (spec, children) {
}
slideClasses = getSlideClasses({ ...spec, index: key });
postCloneSlides.push(
cloneElement(child, {
deepCloneElement(child, {
key: 'postcloned' + getKey(child, key),
tabindex: '-1',
'data-index': key,
Expand All @@ -182,6 +181,7 @@ const renderSlides = function (spec, children) {

const Track = (_, { attrs, slots }) => {
const slides = renderSlides(attrs, flattenChildren(slots?.default()));
// const slides = renderSlides(attrs, slots?.default);
const { onMouseenter, onMouseover, onMouseleave } = attrs;
const mouseEvents = { onMouseenter, onMouseover, onMouseleave };
const trackProps = {
Expand Down