Skip to content

refactor: list #4242

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.

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 1 commit into from
Jun 23, 2021
Merged
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
5 changes: 4 additions & 1 deletion components/_util/hooks/useConfigInject.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { RequiredMark } from '../../form/Form';
import { computed, ComputedRef, inject, UnwrapRef } from 'vue';
import { computed, ComputedRef, inject, UnwrapRef, VNodeChild } from 'vue';
import {
ConfigProviderProps,
defaultConfigProvider,
Expand All @@ -21,13 +21,15 @@ export default (
form?: ComputedRef<{
requiredMark?: RequiredMark;
}>;
renderEmpty?: ComputedRef<(componentName?: string) => VNodeChild | JSX.Element>;
} => {
const configProvider = inject<UnwrapRef<ConfigProviderProps>>(
'configProvider',
defaultConfigProvider,
);
const prefixCls = computed(() => configProvider.getPrefixCls(name, props.prefixCls));
const direction = computed(() => configProvider.direction);
const renderEmpty = computed(() => configProvider.renderEmpty);
const space = computed(() => configProvider.space);
const pageHeader = computed(() => configProvider.pageHeader);
const form = computed(() => configProvider.form);
Expand All @@ -42,5 +44,6 @@ export default (
space,
pageHeader,
form,
renderEmpty,
};
};
200 changes: 73 additions & 127 deletions components/list/Item.tsx
Original file line number Diff line number Diff line change
@@ -1,156 +1,102 @@
import PropTypes from '../_util/vue-types';
import classNames from '../_util/classNames';
import { getComponent, isStringElement, isEmptyElement, getSlot } from '../_util/props-util';
import { isStringElement, isEmptyElement, flattenChildren } from '../_util/props-util';
import { Col } from '../grid';
import { defaultConfigProvider } from '../config-provider';
import { cloneElement } from '../_util/vnode';
import { defineComponent, ExtractPropTypes, FunctionalComponent, inject } from 'vue';
import { defineComponent, inject, ref } from 'vue';
import ItemMeta from './ItemMeta';
import useConfigInject from '../_util/hooks/useConfigInject';
import { ListContextKey } from '.';

export const ListItemProps = {
prefixCls: PropTypes.string,
extra: PropTypes.any,
actions: PropTypes.array,
grid: PropTypes.any,
colStyle: PropTypes.style,
};

export const ListItemMetaProps = {
avatar: PropTypes.any,
description: PropTypes.any,
prefixCls: PropTypes.string,
title: PropTypes.any,
};

export const ListItemMeta: FunctionalComponent<Partial<
ExtractPropTypes<typeof ListItemMetaProps>
>> = (props, { slots }) => {
const configProvider = inject('configProvider', defaultConfigProvider);
const { getPrefixCls } = configProvider;
const { prefixCls: customizePrefixCls } = props;
const prefixCls = getPrefixCls('list', customizePrefixCls);
const avatar = props.avatar || slots.avatar?.();
const title = props.title || slots.title?.();
const description = props.description || slots.description?.();
const content = (
<div class={`${prefixCls}-item-meta-content`}>
{title && <h4 class={`${prefixCls}-item-meta-title`}>{title}</h4>}
{description && <div class={`${prefixCls}-item-meta-description`}>{description}</div>}
</div>
);
return (
<div class={`${prefixCls}-item-meta`}>
{avatar && <div class={`${prefixCls}-item-meta-avatar`}>{avatar}</div>}
{(title || description) && content}
</div>
);
};

Object.assign(ListItemMeta, {
props: ListItemMetaProps,
__ANT_LIST_ITEM_META: true,
displayName: 'AListItemMeta',
});

function getGrid(grid, t) {
return grid[t] && Math.floor(24 / grid[t]);
}

export interface ListContext {
grid?: any;
itemLayout?: string;
}

export default defineComponent({
name: 'AListItem',
inheritAttrs: false,
Meta: ListItemMeta,
Meta: ItemMeta,
props: ListItemProps,
setup() {
const listContext = inject<ListContext>('listContext', {});
const configProvider = inject('configProvider', defaultConfigProvider);
return {
listContext,
configProvider,
};
},
methods: {
isItemContainsTextNodeAndNotSingular() {
const children = getSlot(this) || [];
slots: ['actions', 'extra'],
setup(props, { slots, attrs }) {
const { itemLayout, grid } = inject(ListContextKey, {
grid: ref(),
itemLayout: ref(),
});
const { prefixCls } = useConfigInject('list', props);

const isItemContainsTextNodeAndNotSingular = () => {
const children = slots.default?.() || [];
let result;
children.forEach(element => {
if (isStringElement(element) && !isEmptyElement(element)) {
result = true;
}
});
return result && children.length > 1;
},
};

isFlexMode() {
const extra = getComponent(this, 'extra');
const { itemLayout } = this.listContext;
if (itemLayout === 'vertical') {
const isFlexMode = () => {
const extra = props.extra ?? slots.extra?.();
if (itemLayout.value === 'vertical') {
return !!extra;
}
return !this.isItemContainsTextNodeAndNotSingular();
},
},
render() {
const { grid, itemLayout } = this.listContext;
const { prefixCls: customizePrefixCls, $attrs } = this;
const { class: _className, ...restAttrs } = $attrs;
const getPrefixCls = this.configProvider.getPrefixCls;
const prefixCls = getPrefixCls('list', customizePrefixCls);
const extra = getComponent(this, 'extra');
let actions = getComponent(this, 'actions');
actions = actions && !Array.isArray(actions) ? [actions] : actions;
const actionsContent = actions && actions.length > 0 && (
<ul class={`${prefixCls}-item-action`} key="actions">
{actions.map((action, i) => (
<li key={`${prefixCls}-item-action-${i}`}>
{action}
{i !== actions.length - 1 && <em class={`${prefixCls}-item-action-split`} />}
</li>
))}
</ul>
);
const children = getSlot(this);
const Tag = grid ? 'div' : 'li';
const itemChildren = (
<Tag
{...restAttrs}
class={classNames(`${prefixCls}-item`, _className, {
[`${prefixCls}-item-no-flex`]: !this.isFlexMode(),
})}
>
{itemLayout === 'vertical' && extra
? [
<div class={`${prefixCls}-item-main`} key="content">
{children}
{actionsContent}
</div>,
<div class={`${prefixCls}-item-extra`} key="extra">
{extra}
</div>,
]
: [children, actionsContent, cloneElement(extra, { key: 'extra' })]}
</Tag>
);

const mainContent = grid ? (
<Col
span={getGrid(grid, 'column')}
xs={getGrid(grid, 'xs')}
sm={getGrid(grid, 'sm')}
md={getGrid(grid, 'md')}
lg={getGrid(grid, 'lg')}
xl={getGrid(grid, 'xl')}
xxl={getGrid(grid, 'xxl')}
>
{itemChildren}
</Col>
) : (
itemChildren
);
return !isItemContainsTextNodeAndNotSingular();
};

return mainContent;
return () => {
const { class: className, ...restAttrs } = attrs;
const pre = prefixCls.value;
const extra = props.extra ?? slots.extra?.();
const children = slots.default?.();
let actions = props.actions ?? flattenChildren(slots.actions?.());
actions = actions && !Array.isArray(actions) ? [actions] : actions;
const actionsContent = actions && actions.length > 0 && (
<ul class={`${pre}-item-action`} key="actions">
{actions.map((action, i) => (
<li key={`${pre}-item-action-${i}`}>
{action}
{i !== actions.length - 1 && <em class={`${pre}-item-action-split`} />}
</li>
))}
</ul>
);
const Element = grid.value ? 'div' : 'li';
const itemChildren = (
<Element
{...(restAttrs as any)} // `li` element `onCopy` prop args is not same as `div`
class={classNames(
`${pre}-item`,
{
[`${pre}-item-no-flex`]: !isFlexMode(),
},
className,
)}
>
{itemLayout.value === 'vertical' && extra
? [
<div class={`${pre}-item-main`} key="content">
{children}
{actionsContent}
</div>,
<div class={`${pre}-item-extra`} key="extra">
{extra}
</div>,
]
: [children, actionsContent, cloneElement(extra, { key: 'extra' })]}
</Element>
);
return grid.value ? (
<Col flex={1} style={props.colStyle}>
{itemChildren}
</Col>
) : (
itemChildren
);
};
},
});
43 changes: 43 additions & 0 deletions components/list/ItemMeta.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { defineComponent, ExtractPropTypes } from 'vue';
import useConfigInject from '../_util/hooks/useConfigInject';
import PropTypes from '../_util/vue-types';

export const listItemMetaProps = {
avatar: PropTypes.any,
description: PropTypes.any,
prefixCls: PropTypes.string,
title: PropTypes.any,
};

export type ListItemMetaProps = Partial<ExtractPropTypes<typeof listItemMetaProps>>;

export default defineComponent({
name: 'AListItemMeta',
props: listItemMetaProps,
displayName: 'AListItemMeta', // 兼容历史函数式组件
__ANT_LIST_ITEM_META: true,
slots: ['avatar', 'description', 'title'],
setup(props, { slots }) {
const { prefixCls } = useConfigInject('list', props);
return () => {
const classString = `${prefixCls.value}-item-meta`;
const title = props.title ?? slots.title?.();
const description = props.description ?? slots.description?.();
const avatar = props.avatar ?? slots.avatar?.();
const content = (
<div class={`${prefixCls.value}-item-meta-content`}>
{title && <h4 class={`${prefixCls.value}-item-meta-title`}>{title}</h4>}
{description && (
<div class={`${prefixCls.value}-item-meta-description`}>{description}</div>
)}
</div>
);
return (
<div class={classString}>
{avatar && <div class={`${prefixCls.value}-item-meta-avatar`}>{avatar}</div>}
{(title || description) && content}
</div>
);
};
},
});
Loading