refactor(alert): use composition api (#3654)
* refactor(alert): use composition api * feat: export alert props typepull/3667/head
parent
ab75379f0c
commit
3e90fa6482
|
@ -1,4 +1,4 @@
|
||||||
import { inject, cloneVNode, defineComponent } from 'vue';
|
import { inject, cloneVNode, defineComponent, ref, ExtractPropTypes } from 'vue';
|
||||||
import CloseOutlined from '@ant-design/icons-vue/CloseOutlined';
|
import CloseOutlined from '@ant-design/icons-vue/CloseOutlined';
|
||||||
import CheckCircleOutlined from '@ant-design/icons-vue/CheckCircleOutlined';
|
import CheckCircleOutlined from '@ant-design/icons-vue/CheckCircleOutlined';
|
||||||
import ExclamationCircleOutlined from '@ant-design/icons-vue/ExclamationCircleOutlined';
|
import ExclamationCircleOutlined from '@ant-design/icons-vue/ExclamationCircleOutlined';
|
||||||
|
@ -9,15 +9,18 @@ import ExclamationCircleFilled from '@ant-design/icons-vue/ExclamationCircleFill
|
||||||
import InfoCircleFilled from '@ant-design/icons-vue/InfoCircleFilled';
|
import InfoCircleFilled from '@ant-design/icons-vue/InfoCircleFilled';
|
||||||
import CloseCircleFilled from '@ant-design/icons-vue/CloseCircleFilled';
|
import CloseCircleFilled from '@ant-design/icons-vue/CloseCircleFilled';
|
||||||
import classNames from '../_util/classNames';
|
import classNames from '../_util/classNames';
|
||||||
import BaseMixin from '../_util/BaseMixin';
|
|
||||||
import PropTypes from '../_util/vue-types';
|
import PropTypes from '../_util/vue-types';
|
||||||
import { getTransitionProps, Transition } from '../_util/transition';
|
import { getTransitionProps, Transition } from '../_util/transition';
|
||||||
import { getComponent, isValidElement, findDOMNode } from '../_util/props-util';
|
import { isValidElement } from '../_util/props-util';
|
||||||
import { defaultConfigProvider } from '../config-provider';
|
import { defaultConfigProvider } from '../config-provider';
|
||||||
import { tuple, withInstall } from '../_util/type';
|
import { tuple, withInstall } from '../_util/type';
|
||||||
|
|
||||||
function noop() {}
|
function noop() {}
|
||||||
|
|
||||||
|
function getDefaultSlot(slots: Record<string, any>, props: Record<string, any>, prop: string) {
|
||||||
|
return slots[prop]?.() ?? props[prop];
|
||||||
|
}
|
||||||
|
|
||||||
const iconMapFilled = {
|
const iconMapFilled = {
|
||||||
success: CheckCircleFilled,
|
success: CheckCircleFilled,
|
||||||
info: InfoCircleFilled,
|
info: InfoCircleFilled,
|
||||||
|
@ -32,11 +35,15 @@ const iconMapOutlined = {
|
||||||
warning: ExclamationCircleOutlined,
|
warning: ExclamationCircleOutlined,
|
||||||
};
|
};
|
||||||
|
|
||||||
export const AlertProps = {
|
const AlertTypes = tuple('success', 'info', 'warning', 'error');
|
||||||
|
|
||||||
|
export type AlertType = typeof AlertTypes[number];
|
||||||
|
|
||||||
|
const alertProps = () => ({
|
||||||
/**
|
/**
|
||||||
* Type of Alert styles, options: `success`, `info`, `warning`, `error`
|
* Type of Alert styles, options: `success`, `info`, `warning`, `error`
|
||||||
*/
|
*/
|
||||||
type: PropTypes.oneOf(tuple('success', 'info', 'warning', 'error')),
|
type: PropTypes.oneOf(AlertTypes),
|
||||||
/** Whether Alert can be closed */
|
/** Whether Alert can be closed */
|
||||||
closable: PropTypes.looseBool,
|
closable: PropTypes.looseBool,
|
||||||
/** Close text to show */
|
/** Close text to show */
|
||||||
|
@ -55,58 +62,53 @@ export const AlertProps = {
|
||||||
banner: PropTypes.looseBool,
|
banner: PropTypes.looseBool,
|
||||||
icon: PropTypes.VNodeChild,
|
icon: PropTypes.VNodeChild,
|
||||||
onClose: PropTypes.VNodeChild,
|
onClose: PropTypes.VNodeChild,
|
||||||
};
|
});
|
||||||
|
|
||||||
|
export type AlertProps = Partial<ExtractPropTypes<ReturnType<typeof alertProps>>>;
|
||||||
|
|
||||||
const Alert = defineComponent({
|
const Alert = defineComponent({
|
||||||
name: 'AAlert',
|
name: 'AAlert',
|
||||||
mixins: [BaseMixin],
|
props: alertProps(),
|
||||||
inheritAttrs: false,
|
inheritAttrs: false,
|
||||||
props: AlertProps,
|
|
||||||
emits: ['close'],
|
emits: ['close'],
|
||||||
setup() {
|
setup(props, { slots, emit, attrs }) {
|
||||||
return {
|
const configProvider = inject('configProvider', defaultConfigProvider);
|
||||||
configProvider: inject('configProvider', defaultConfigProvider),
|
const closing = ref(false);
|
||||||
};
|
const closed = ref(false);
|
||||||
},
|
const alertNode = ref();
|
||||||
data() {
|
|
||||||
return {
|
const handleClose = (e: MouseEvent) => {
|
||||||
closing: false,
|
|
||||||
closed: false,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
handleClose(e: Event) {
|
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
const dom = findDOMNode(this);
|
|
||||||
|
const dom = alertNode.value;
|
||||||
|
|
||||||
dom.style.height = `${dom.offsetHeight}px`;
|
dom.style.height = `${dom.offsetHeight}px`;
|
||||||
// Magic code
|
// Magic code
|
||||||
// 重复一次后才能正确设置 height
|
// 重复一次后才能正确设置 height
|
||||||
dom.style.height = `${dom.offsetHeight}px`;
|
dom.style.height = `${dom.offsetHeight}px`;
|
||||||
|
|
||||||
this.setState({
|
closing.value = true;
|
||||||
closing: true,
|
emit('close', e);
|
||||||
});
|
};
|
||||||
this.$emit('close', e);
|
|
||||||
},
|
|
||||||
animationEnd() {
|
|
||||||
this.setState({
|
|
||||||
closing: false,
|
|
||||||
closed: true,
|
|
||||||
});
|
|
||||||
this.afterClose();
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
render() {
|
const animationEnd = () => {
|
||||||
const { prefixCls: customizePrefixCls, banner, closing, closed, $attrs } = this;
|
closing.value = false;
|
||||||
const { getPrefixCls } = this.configProvider;
|
closed.value = true;
|
||||||
|
props.afterClose?.();
|
||||||
|
};
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
const { prefixCls: customizePrefixCls, banner } = props;
|
||||||
|
const { getPrefixCls } = configProvider;
|
||||||
const prefixCls = getPrefixCls('alert', customizePrefixCls);
|
const prefixCls = getPrefixCls('alert', customizePrefixCls);
|
||||||
|
|
||||||
let { closable, type, showIcon } = this;
|
let { closable, type, showIcon } = props;
|
||||||
const closeText = getComponent(this, 'closeText');
|
|
||||||
const description = getComponent(this, 'description');
|
const closeText = getDefaultSlot(slots, props, 'closeText');
|
||||||
const message = getComponent(this, 'message');
|
const description = getDefaultSlot(slots, props, 'description');
|
||||||
const icon = getComponent(this, 'icon');
|
const message = getDefaultSlot(slots, props, 'message');
|
||||||
|
const icon = getDefaultSlot(slots, props, 'icon');
|
||||||
|
|
||||||
// banner模式默认有 Icon
|
// banner模式默认有 Icon
|
||||||
showIcon = banner && showIcon === undefined ? true : showIcon;
|
showIcon = banner && showIcon === undefined ? true : showIcon;
|
||||||
// banner模式默认为警告
|
// banner模式默认为警告
|
||||||
|
@ -121,7 +123,7 @@ const Alert = defineComponent({
|
||||||
|
|
||||||
const alertCls = classNames(prefixCls, {
|
const alertCls = classNames(prefixCls, {
|
||||||
[`${prefixCls}-${type}`]: true,
|
[`${prefixCls}-${type}`]: true,
|
||||||
[`${prefixCls}-closing`]: closing,
|
[`${prefixCls}-closing`]: closing.value,
|
||||||
[`${prefixCls}-with-description`]: !!description,
|
[`${prefixCls}-with-description`]: !!description,
|
||||||
[`${prefixCls}-no-icon`]: !showIcon,
|
[`${prefixCls}-no-icon`]: !showIcon,
|
||||||
[`${prefixCls}-banner`]: !!banner,
|
[`${prefixCls}-banner`]: !!banner,
|
||||||
|
@ -129,13 +131,12 @@ const Alert = defineComponent({
|
||||||
});
|
});
|
||||||
|
|
||||||
const closeIcon = closable ? (
|
const closeIcon = closable ? (
|
||||||
<button
|
<button type="button" onClick={handleClose} class={`${prefixCls}-close-icon`} tabindex={0}>
|
||||||
type="button"
|
{closeText ? (
|
||||||
onClick={this.handleClose}
|
<span class={`${prefixCls}-close-text`}>{closeText}</span>
|
||||||
class={`${prefixCls}-close-icon`}
|
) : (
|
||||||
tabindex={0}
|
<CloseOutlined />
|
||||||
>
|
)}
|
||||||
{closeText ? <span class={`${prefixCls}-close-text`}>{closeText}</span> : <CloseOutlined />}
|
|
||||||
</button>
|
</button>
|
||||||
) : null;
|
) : null;
|
||||||
|
|
||||||
|
@ -147,15 +148,20 @@ const Alert = defineComponent({
|
||||||
) : (
|
) : (
|
||||||
<span class={`${prefixCls}-icon`}>{icon}</span>
|
<span class={`${prefixCls}-icon`}>{icon}</span>
|
||||||
))) || <IconType class={`${prefixCls}-icon`} />;
|
))) || <IconType class={`${prefixCls}-icon`} />;
|
||||||
// h(iconType, { class: `${prefixCls}-icon` });
|
|
||||||
|
|
||||||
const transitionProps = getTransitionProps(`${prefixCls}-slide-up`, {
|
const transitionProps = getTransitionProps(`${prefixCls}-slide-up`, {
|
||||||
appear: false,
|
appear: false,
|
||||||
onAfterLeave: this.animationEnd,
|
onAfterLeave: animationEnd,
|
||||||
});
|
});
|
||||||
return closed ? null : (
|
return closed.value ? null : (
|
||||||
<Transition {...transitionProps}>
|
<Transition {...transitionProps}>
|
||||||
<div {...$attrs} v-show={!closing} class={[$attrs.class, alertCls]} data-show={!closing}>
|
<div
|
||||||
|
{...attrs}
|
||||||
|
v-show={!closing.value}
|
||||||
|
class={[attrs.class, alertCls]}
|
||||||
|
data-show={!closing.value}
|
||||||
|
ref={alertNode}
|
||||||
|
>
|
||||||
{showIcon ? iconNode : null}
|
{showIcon ? iconNode : null}
|
||||||
<span class={`${prefixCls}-message`}>{message}</span>
|
<span class={`${prefixCls}-message`}>{message}</span>
|
||||||
<span class={`${prefixCls}-description`}>{description}</span>
|
<span class={`${prefixCls}-description`}>{description}</span>
|
||||||
|
@ -163,6 +169,7 @@ const Alert = defineComponent({
|
||||||
</div>
|
</div>
|
||||||
</Transition>
|
</Transition>
|
||||||
);
|
);
|
||||||
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue