Compare commits

..

21 Commits

Author SHA1 Message Date
46b98316ee fix: add minify mode 2023-05-06 10:42:08 +08:00
7320eaf54d chore: dealing with conflict 2023-05-05 15:52:01 +08:00
ae025850b0 feat: add bunder 2023-05-03 20:09:26 +08:00
febc297d5e feat: add build 2023-05-03 19:43:56 +08:00
5338a2fe92 Merge branch 'main' of github.com:antd-tiny-vue/antd-tiny-vue into main 2023-04-27 11:30:47 +08:00
b486c0ae40 chore: migrate vue3.3 2023-04-27 11:30:19 +08:00
01eb9af46c chore: change 2023-04-20 20:48:57 +08:00
7f296bc378 Merge branch 'main' of github.com:antd-tiny-vue/antd-tiny-vue into main 2023-04-19 10:46:46 +08:00
6096c28669 feat: add loading icon 2023-04-19 08:30:24 +08:00
786877b629 chore: change 2023-04-19 08:16:23 +08:00
4e0a756239 chore: resolve conflict 2023-04-18 15:50:37 +08:00
79210d99c9 chore: change 2023-04-18 15:49:28 +08:00
7bc8ec1094 chore: change docs build 2023-04-17 21:07:30 +08:00
08f17ce876 chore: change postion 2023-04-17 21:03:25 +08:00
fe029c5a0e chore: change docs 2023-04-17 21:03:02 +08:00
0d1e4d3e7c fix: space error 2023-04-17 11:30:22 +08:00
07d0ff0785 chore: change docs 2023-04-17 10:56:09 +08:00
2208af0174 fix: add space children 2023-04-17 10:55:29 +08:00
63ac0cb613 chore: add info 2023-04-17 10:51:11 +08:00
7cead859d1 chore: change info 2023-04-17 10:09:13 +08:00
7ae7f3a878 chore: change packageManger 2023-04-17 09:36:14 +08:00
18 changed files with 2391 additions and 826 deletions

View File

@ -1,3 +1,5 @@
cache cache
.temp .temp
*.log *.log
es
lib

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ node_modules
dist dist
cache cache
.temp .temp
es
lib

View File

@ -0,0 +1,17 @@
<script lang="ts" setup>
import { onMounted, shallowRef } from 'vue'
const comp = shallowRef()
onMounted(async () => {
const { AntdTheme } = await import('vite-plugin-vitepress-demo/theme')
comp.value = AntdTheme
})
</script>
<template>
<ClientOnly>
<component v-bind="$attrs" :is="comp"></component>
</ClientOnly>
</template>
<style scoped></style>

View File

@ -10,20 +10,19 @@ const baseSrc = fileURLToPath(new URL('./', import.meta.url))
export default defineConfig({ export default defineConfig({
rewrites: getRewrites(), rewrites: getRewrites(),
mpa: true,
lang: 'en-US', lang: 'en-US',
ignoreDeadLinks: true, ignoreDeadLinks: true,
locales: { locales: {
'zh-CN': { 'zh-CN': {
lang: 'zh-CN', lang: 'zh-CN',
title: 'vue3组件库站点', title: 'Antd Tiny Vue',
label: '简体中文', label: '简体中文',
description: 'vue3组件库站点', description: 'vue3组件库站点',
themeConfig: getZhCNConfig() themeConfig: getZhCNConfig()
}, },
root: { root: {
lang: 'en-US', lang: 'en-US',
title: 'vue3 component library site', title: 'Antd Tiny Vue',
label: 'English', label: 'English',
description: 'vue3 component library site', description: 'vue3 component library site',
themeConfig: getEnUSConfig() themeConfig: getEnUSConfig()

View File

@ -1,15 +1,18 @@
import type { Theme } from 'vitepress' import type { Theme } from 'vitepress'
// eslint-disable-next-line import/no-named-as-default // eslint-disable-next-line import/no-named-as-default
import DefaultTheme from 'vitepress/theme' import DefaultTheme from 'vitepress/theme'
import { AntdTheme } from 'vite-plugin-vitepress-demo/theme' import AntdTheme from '../components/demo.vue'
// @ts-expect-error this is a local module // import { AntdTheme } from 'vite-plugin-vitepress-demo/theme'
import Antd from 'antd-tiny-vue'
export default { export default {
...DefaultTheme, ...DefaultTheme,
enhanceApp(ctx) { async enhanceApp(ctx) {
DefaultTheme.enhanceApp?.(ctx) DefaultTheme.enhanceApp?.(ctx)
ctx.app.component('Demo', AntdTheme) ctx.app.component('Demo', AntdTheme)
ctx.app.use(Antd) // @ts-expect-error this is a local module
if (!import.meta.env.SSR) {
// @ts-expect-error this is a local module
const Antd = (await import('antd-tiny-vue')).default
ctx.app.use(Antd)
}
} }
} as Theme } as Theme

View File

@ -1,9 +1,26 @@
// import type { VNode, VNodeChild } from 'vue'
// import { isString } from '@v-c/utils'
import { Text } from 'vue'
import type { VNode } from 'vue'
const rxTwoCNChar = /^[\u4E00-\u9FA5]{2}$/ const rxTwoCNChar = /^[\u4E00-\u9FA5]{2}$/
export const isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar) export const isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar)
export function isUnBorderedButtonType(type?: ButtonType) { export function isUnBorderedButtonType(type?: ButtonType) {
return type === 'text' || type === 'link' return type === 'text' || type === 'link'
} }
export const spaceChildren = (child: VNode, needInserted: boolean) => {
const SPACE = needInserted ? ' ' : ''
if (child.type === Text) {
let text = (child.children as string).trim()
if (isTwoCNChar(text)) {
text = text.split('').join(SPACE)
}
return <span>{text}</span>
}
return child
}
// //
// function splitCNCharsBySpace(child: VNodeChild , needInserted: boolean) { // function splitCNCharsBySpace(child: VNodeChild , needInserted: boolean) {
// if (child === null || child === undefined) { // if (child === null || child === undefined) {
@ -33,7 +50,6 @@ export function isUnBorderedButtonType(type?: ButtonType) {
// //
// return child; // return child;
// } // }
//
// export function spaceChildren(children: React.ReactNode, needInserted: boolean) { // export function spaceChildren(children: React.ReactNode, needInserted: boolean) {
// let isPrevChildPure: boolean = false; // let isPrevChildPure: boolean = false;
// const childList: React.ReactNode[] = []; // const childList: React.ReactNode[] = [];
@ -57,7 +73,14 @@ export function isUnBorderedButtonType(type?: ButtonType) {
// ); // );
// } // }
const ButtonTypes = ['default', 'primary', 'ghost', 'dashed', 'link', 'text'] as const const ButtonTypes = [
'default',
'primary',
'ghost',
'dashed',
'link',
'text'
] as const
export type ButtonType = (typeof ButtonTypes)[number] export type ButtonType = (typeof ButtonTypes)[number]
const ButtonShapes = ['default', 'circle', 'round'] as const const ButtonShapes = ['default', 'circle', 'round'] as const

View File

@ -16,7 +16,12 @@ import { useCompactItemContext } from '../space/compact'
import useStyle from './style' import useStyle from './style'
import type { ButtonProps, LoadingConfigType } from './interface' import type { ButtonProps, LoadingConfigType } from './interface'
import { buttonProps } from './interface' import { buttonProps } from './interface'
import { isTwoCNChar, isUnBorderedButtonType } from './button-helper' import {
isTwoCNChar,
isUnBorderedButtonType,
spaceChildren
} from './button-helper'
import LoadingIcon from './loading-icon'
type Loading = number | boolean type Loading = number | boolean
function getLoadingConfig(loading: ButtonProps['loading']): LoadingConfigType { function getLoadingConfig(loading: ButtonProps['loading']): LoadingConfigType {
@ -58,8 +63,8 @@ const Button = defineComponent({
small: 'sm', small: 'sm',
middle: undefined middle: undefined
} }
const sizeFullname = compactSize?.value || size.value const sizeFullName = compactSize?.value || size.value
return sizeClassNameMap[sizeFullname] return sizeClassNameMap[sizeFullName]
}) })
const disabled = useDisabled(props) const disabled = useDisabled(props)
const buttonRef = shallowRef<HTMLButtonElement | null>(null) const buttonRef = shallowRef<HTMLButtonElement | null>(null)
@ -73,6 +78,23 @@ const Button = defineComponent({
) )
const [hasTwoCNChar, setHasTwoCNChar] = useState(false) const [hasTwoCNChar, setHasTwoCNChar] = useState(false)
let isNeedInserted = false
const fixTwoCNChar = () => {
// FIXME: for HOC usage like <FormatMessage />
if (!buttonRef.value || autoInsertSpaceInButton.value === false) {
return
}
const buttonText = buttonRef.value.textContent
if (isNeedInserted && isTwoCNChar(buttonText as string)) {
if (!hasTwoCNChar.value) {
setHasTwoCNChar(true)
}
} else if (hasTwoCNChar.value) {
setHasTwoCNChar(false)
}
}
let delayTimer: number | null = null let delayTimer: number | null = null
onMounted(() => { onMounted(() => {
@ -84,7 +106,6 @@ const Button = defineComponent({
} else { } else {
setLoading(loadingOrDelay.value.loading) setLoading(loadingOrDelay.value.loading)
} }
// fixTwoCNChar()
}) })
function cleanupTimer() { function cleanupTimer() {
@ -127,29 +148,11 @@ const Button = defineComponent({
return () => { return () => {
const { shape, rootClassName, ghost, type, block, danger } = props const { shape, rootClassName, ghost, type, block, danger } = props
const icon = getSlotsProps(slots, props, 'icon') const icon = getSlotsProps(slots, props, 'icon')
const children = filterEmpty(slots.default?.()) const children = filterEmpty(slots.default?.() as any)
const isNeedInserted = () => { isNeedInserted =
return ( children.length === 1 &&
children.length === 1 && !slots.icon &&
!slots.icon && !isUnBorderedButtonType(props.type)
isUnBorderedButtonType(props.type)
)
}
const fixTwoCNChar = () => {
// FIXME: for HOC usage like <FormatMessage />
if (!buttonRef.value || autoInsertSpaceInButton.value === false) {
return
}
const buttonText = buttonRef.value.textContent
if (isNeedInserted() && isTwoCNChar(buttonText as string)) {
if (!hasTwoCNChar) {
setHasTwoCNChar(true)
}
} else if (hasTwoCNChar) {
setHasTwoCNChar(false)
}
}
fixTwoCNChar() fixTwoCNChar()
showError() showError()
const iconType = innerLoading.value ? 'loading' : icon const iconType = innerLoading.value ? 'loading' : icon
@ -181,8 +184,22 @@ const Button = defineComponent({
compactItemClassnames.value, compactItemClassnames.value,
rootClassName rootClassName
) )
const iconNode = icon && !innerLoading.value ? icon?.() : <>L</> const iconNode =
icon &&
(!innerLoading.value ? (
icon?.()
) : (
<LoadingIcon
existIcon={!!icon}
prefixCls={prefixCls.value}
loading={!!innerLoading.value}
/>
))
const kids =
children || children === 0
? spaceChildren(children[0] as any, isNeedInserted && autoInsertSpace)
: undefined
if (attrs.href !== undefined) { if (attrs.href !== undefined) {
return wrapSSR( return wrapSSR(
<a <a
@ -193,13 +210,19 @@ const Button = defineComponent({
ref={buttonRef} ref={buttonRef}
> >
{iconNode} {iconNode}
{children} {kids}
</a> </a>
) )
} }
let buttonNode = ( let buttonNode = (
<button {...attrs} onClick={handleClick} class={classes}> <button
{children} {...attrs}
onClick={handleClick}
class={classes}
ref={buttonRef}
>
{iconNode}
{kids}
</button> </button>
) )

View File

@ -0,0 +1,67 @@
import { Transition, defineComponent, nextTick } from 'vue'
import { booleanType, someType, stringType } from '@v-c/utils'
import LoadingOutlined from '@ant-design/icons-vue/LoadingOutlined'
export interface LoadingIconProps {
prefixCls: string
existIcon: boolean
loading?: boolean | object
}
export const loadingIconProps = {
prefixCls: stringType(),
existIcon: booleanType(),
loading: someType<boolean | object>([Boolean, Object])
}
const getCollapsedWidth = (el: Element) => {
const node: HTMLElement = el as HTMLElement
if (node) {
node.style.width = '0'
node.style.opacity = '0'
node.style.transform = 'scale(0)'
}
}
const getRealWidth = (el: Element) => {
const node: HTMLElement = el as HTMLElement
nextTick(() => {
if (node) {
node.style.width = `${node.scrollWidth}px`
node.style.opacity = '1'
node.style.transform = 'scale(1)'
}
}).then()
}
const LoadingIcon = defineComponent({
name: 'LoadingIcon',
props: loadingIconProps,
setup(props) {
return () => {
const { loading, existIcon, prefixCls } = props
const visible = !!loading
if (existIcon) {
return (
<span class={`${prefixCls}-loading-icon`}>
<LoadingOutlined />
</span>
)
}
return (
<Transition
name={`${prefixCls}-loading-icon-motion`}
onBeforeEnter={getCollapsedWidth}
onEnter={getRealWidth}
>
{visible ? (
<span class={`${prefixCls}-loading-icon`}>
<LoadingOutlined />
</span>
) : null}
</Transition>
)
}
}
})
export default LoadingIcon

View File

@ -16,9 +16,10 @@ export interface ButtonToken extends FullToken<'Button'> {
} }
// ============================== Shared ============================== // ============================== Shared ==============================
const genSharedButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token): CSSObject => { const genSharedButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token
): CSSObject => {
const { componentCls, iconCls } = token const { componentCls, iconCls } = token
return { return {
[componentCls]: { [componentCls]: {
outline: 'none', outline: 'none',
@ -60,25 +61,8 @@ const genSharedButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token): CSS
}, },
// Special styles for Primary Button // Special styles for Primary Button
[`&-compact-item${componentCls}-primary`]: { [`&-compact-item${componentCls}-primary`]: {
[`&:not([disabled]) + ${componentCls}-compact-item${componentCls}-primary:not([disabled])`]: { [`&:not([disabled]) + ${componentCls}-compact-item${componentCls}-primary:not([disabled])`]:
position: 'relative', {
'&:before': {
position: 'absolute',
top: -token.lineWidth,
insetInlineStart: -token.lineWidth,
display: 'inline-block',
width: token.lineWidth,
height: `calc(100% + ${token.lineWidth * 2}px)`,
backgroundColor: token.colorPrimaryHover,
content: '""'
}
}
},
// Special styles for Primary Button
'&-compact-vertical-item': {
[`&${componentCls}-primary`]: {
[`&:not([disabled]) + ${componentCls}-compact-vertical-item${componentCls}-primary:not([disabled])`]: {
position: 'relative', position: 'relative',
'&:before': { '&:before': {
@ -86,19 +70,41 @@ const genSharedButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token): CSS
top: -token.lineWidth, top: -token.lineWidth,
insetInlineStart: -token.lineWidth, insetInlineStart: -token.lineWidth,
display: 'inline-block', display: 'inline-block',
width: `calc(100% + ${token.lineWidth * 2}px)`, width: token.lineWidth,
height: token.lineWidth, height: `calc(100% + ${token.lineWidth * 2}px)`,
backgroundColor: token.colorPrimaryHover, backgroundColor: token.colorPrimaryHover,
content: '""' content: '""'
} }
} }
},
// Special styles for Primary Button
'&-compact-vertical-item': {
[`&${componentCls}-primary`]: {
[`&:not([disabled]) + ${componentCls}-compact-vertical-item${componentCls}-primary:not([disabled])`]:
{
position: 'relative',
'&:before': {
position: 'absolute',
top: -token.lineWidth,
insetInlineStart: -token.lineWidth,
display: 'inline-block',
width: `calc(100% + ${token.lineWidth * 2}px)`,
height: token.lineWidth,
backgroundColor: token.colorPrimaryHover,
content: '""'
}
}
} }
} }
} }
} }
} }
const genHoverActiveButtonStyle = (hoverStyle: CSSObject, activeStyle: CSSObject): CSSObject => ({ const genHoverActiveButtonStyle = (
hoverStyle: CSSObject,
activeStyle: CSSObject
): CSSObject => ({
'&:not(:disabled)': { '&:not(:disabled)': {
'&:hover': hoverStyle, '&:hover': hoverStyle,
'&:active': activeStyle '&:active': activeStyle
@ -106,21 +112,23 @@ const genHoverActiveButtonStyle = (hoverStyle: CSSObject, activeStyle: CSSObject
}) })
// ============================== Shape =============================== // ============================== Shape ===============================
const genCircleButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genCircleButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token
) => ({
minWidth: token.controlHeight, minWidth: token.controlHeight,
paddingInlineStart: 0, paddingInlineStart: 0,
paddingInlineEnd: 0, paddingInlineEnd: 0,
borderRadius: '50%' borderRadius: '50%'
}) })
const genRoundButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genRoundButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => ({
borderRadius: token.controlHeight, borderRadius: token.controlHeight,
paddingInlineStart: token.controlHeight / 2, paddingInlineStart: token.controlHeight / 2,
paddingInlineEnd: token.controlHeight / 2 paddingInlineEnd: token.controlHeight / 2
}) })
// =============================== Type =============================== // =============================== Type ===============================
const genDisabledStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genDisabledStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => ({
cursor: 'not-allowed', cursor: 'not-allowed',
borderColor: token.colorBorder, borderColor: token.colorBorder,
color: token.colorTextDisabled, color: token.colorTextDisabled,
@ -162,17 +170,21 @@ const genGhostButtonStyle = (
} }
}) })
const genSolidDisabledButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genSolidDisabledButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token
) => ({
'&:disabled': { '&:disabled': {
...genDisabledStyle(token) ...genDisabledStyle(token)
} }
}) })
const genSolidButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genSolidButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => ({
...genSolidDisabledButtonStyle(token) ...genSolidDisabledButtonStyle(token)
}) })
const genPureDisabledButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genPureDisabledButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token
) => ({
'&:disabled': { '&:disabled': {
cursor: 'not-allowed', cursor: 'not-allowed',
color: token.colorTextDisabled color: token.colorTextDisabled
@ -180,7 +192,9 @@ const genPureDisabledButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token
}) })
// Type: Default // Type: Default
const genDefaultButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genDefaultButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token
) => ({
...genSolidButtonStyle(token), ...genSolidButtonStyle(token),
backgroundColor: token.colorBgContainer, backgroundColor: token.colorBgContainer,
@ -199,7 +213,13 @@ const genDefaultButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({
} }
), ),
...genGhostButtonStyle(token.componentCls, token.colorBgContainer, token.colorBgContainer, token.colorTextDisabled, token.colorBorder), ...genGhostButtonStyle(
token.componentCls,
token.colorBgContainer,
token.colorBgContainer,
token.colorTextDisabled,
token.colorBorder
),
[`&${token.componentCls}-dangerous`]: { [`&${token.componentCls}-dangerous`]: {
color: token.colorError, color: token.colorError,
@ -216,13 +236,21 @@ const genDefaultButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({
} }
), ),
...genGhostButtonStyle(token.componentCls, token.colorError, token.colorError, token.colorTextDisabled, token.colorBorder), ...genGhostButtonStyle(
token.componentCls,
token.colorError,
token.colorError,
token.colorTextDisabled,
token.colorBorder
),
...genSolidDisabledButtonStyle(token) ...genSolidDisabledButtonStyle(token)
} }
}) })
// Type: Primary // Type: Primary
const genPrimaryButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genPrimaryButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token
) => ({
...genSolidButtonStyle(token), ...genSolidButtonStyle(token),
color: token.colorTextLightSolid, color: token.colorTextLightSolid,
@ -290,13 +318,15 @@ const genPrimaryButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({
}) })
// Type: Dashed // Type: Dashed
const genDashedButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genDashedButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token
) => ({
...genDefaultButtonStyle(token), ...genDefaultButtonStyle(token),
borderStyle: 'dashed' borderStyle: 'dashed'
}) })
// Type: Link // Type: Link
const genLinkButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genLinkButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => ({
color: token.colorLink, color: token.colorLink,
...genHoverActiveButtonStyle( ...genHoverActiveButtonStyle(
@ -327,7 +357,7 @@ const genLinkButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({
}) })
// Type: Text // Type: Text
const genTextButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genTextButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => ({
...genHoverActiveButtonStyle( ...genHoverActiveButtonStyle(
{ {
color: token.colorText, color: token.colorText,
@ -359,14 +389,16 @@ const genTextButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({
}) })
// Href and Disabled // Href and Disabled
const genDisabledButtonStyle: GenerateStyle<ButtonToken, CSSObject> = token => ({ const genDisabledButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (
token
) => ({
...genDisabledStyle(token), ...genDisabledStyle(token),
[`&${token.componentCls}:hover`]: { [`&${token.componentCls}:hover`]: {
...genDisabledStyle(token) ...genDisabledStyle(token)
} }
}) })
const genTypeButtonStyle: GenerateStyle<ButtonToken> = token => { const genTypeButtonStyle: GenerateStyle<ButtonToken> = (token) => {
const { componentCls } = token const { componentCls } = token
return { return {
@ -380,10 +412,25 @@ const genTypeButtonStyle: GenerateStyle<ButtonToken> = token => {
} }
// =============================== Size =============================== // =============================== Size ===============================
const genSizeButtonStyle = (token: ButtonToken, sizePrefixCls = ''): CSSInterpolation => { const genSizeButtonStyle = (
const { componentCls, iconCls, controlHeight, fontSize, lineHeight, lineWidth, borderRadius, buttonPaddingHorizontal } = token token: ButtonToken,
sizePrefixCls = ''
): CSSInterpolation => {
const {
componentCls,
iconCls,
controlHeight,
fontSize,
lineHeight,
lineWidth,
borderRadius,
buttonPaddingHorizontal
} = token
const paddingVertical = Math.max(0, (controlHeight - fontSize * lineHeight) / 2 - lineWidth) const paddingVertical = Math.max(
0,
(controlHeight - fontSize * lineHeight) / 2 - lineWidth
)
const paddingHorizontal = buttonPaddingHorizontal - lineWidth const paddingHorizontal = buttonPaddingHorizontal - lineWidth
const iconOnlyCls = `${componentCls}-icon-only` const iconOnlyCls = `${componentCls}-icon-only`
@ -427,17 +474,20 @@ const genSizeButtonStyle = (token: ButtonToken, sizePrefixCls = ''): CSSInterpol
// Shape - patch prefixCls again to override solid border radius style // Shape - patch prefixCls again to override solid border radius style
{ {
[`${componentCls}${componentCls}-circle${sizePrefixCls}`]: genCircleButtonStyle(token) [`${componentCls}${componentCls}-circle${sizePrefixCls}`]:
genCircleButtonStyle(token)
}, },
{ {
[`${componentCls}${componentCls}-round${sizePrefixCls}`]: genRoundButtonStyle(token) [`${componentCls}${componentCls}-round${sizePrefixCls}`]:
genRoundButtonStyle(token)
} }
] ]
} }
const genSizeBaseButtonStyle: GenerateStyle<ButtonToken> = token => genSizeButtonStyle(token) const genSizeBaseButtonStyle: GenerateStyle<ButtonToken> = (token) =>
genSizeButtonStyle(token)
const genSizeSmallButtonStyle: GenerateStyle<ButtonToken> = token => { const genSizeSmallButtonStyle: GenerateStyle<ButtonToken> = (token) => {
const smallToken = mergeToken<ButtonToken>(token, { const smallToken = mergeToken<ButtonToken>(token, {
controlHeight: token.controlHeightSM, controlHeight: token.controlHeightSM,
padding: token.paddingXS, padding: token.paddingXS,
@ -448,7 +498,7 @@ const genSizeSmallButtonStyle: GenerateStyle<ButtonToken> = token => {
return genSizeButtonStyle(smallToken, `${token.componentCls}-sm`) return genSizeButtonStyle(smallToken, `${token.componentCls}-sm`)
} }
const genSizeLargeButtonStyle: GenerateStyle<ButtonToken> = token => { const genSizeLargeButtonStyle: GenerateStyle<ButtonToken> = (token) => {
const largeToken = mergeToken<ButtonToken>(token, { const largeToken = mergeToken<ButtonToken>(token, {
controlHeight: token.controlHeightLG, controlHeight: token.controlHeightLG,
fontSize: token.fontSizeLG, fontSize: token.fontSizeLG,
@ -458,7 +508,7 @@ const genSizeLargeButtonStyle: GenerateStyle<ButtonToken> = token => {
return genSizeButtonStyle(largeToken, `${token.componentCls}-lg`) return genSizeButtonStyle(largeToken, `${token.componentCls}-lg`)
} }
const genBlockButtonStyle: GenerateStyle<ButtonToken> = token => { const genBlockButtonStyle: GenerateStyle<ButtonToken> = (token) => {
const { componentCls } = token const { componentCls } = token
return { return {
[componentCls]: { [componentCls]: {
@ -470,7 +520,7 @@ const genBlockButtonStyle: GenerateStyle<ButtonToken> = token => {
} }
// ============================== Export ============================== // ============================== Export ==============================
export default genComponentStyleHook('Button', token => { export default genComponentStyleHook('Button', (token) => {
const { controlTmpOutline, paddingContentHorizontal } = token const { controlTmpOutline, paddingContentHorizontal } = token
const buttonToken = mergeToken<ButtonToken>(token, { const buttonToken = mergeToken<ButtonToken>(token, {

View File

@ -1,8 +1,20 @@
import { booleanType, createInjectionState, functionType, objectType, someType, stringType } from '@v-c/utils' import {
booleanType,
createInjectionState,
functionType,
objectType,
someType,
stringType
} from '@v-c/utils'
import type { ExtractPropTypes } from 'vue' import type { ExtractPropTypes } from 'vue'
import { computed } from 'vue' import { computed } from 'vue'
import type { DerivativeFunc } from '@antd-tiny-vue/cssinjs' import type { DerivativeFunc } from '@antd-tiny-vue/cssinjs'
import type { AliasToken, MapToken, OverrideToken, SeedToken } from '../theme/interface' import type {
AliasToken,
MapToken,
OverrideToken,
SeedToken
} from '../theme/interface'
import type { RenderEmptyHandler } from './default-render-empty' import type { RenderEmptyHandler } from './default-render-empty'
import type { ConfigProviderProps } from './index' import type { ConfigProviderProps } from './index'
@ -34,7 +46,10 @@ export interface ThemeConfig {
} }
export const defaultIconPrefixCls = 'anticon' export const defaultIconPrefixCls = 'anticon'
const defaultGetPrefixCls = (suffixCls?: string, customizePrefixCls?: string) => { const defaultGetPrefixCls = (
suffixCls?: string,
customizePrefixCls?: string
) => {
if (customizePrefixCls) return customizePrefixCls if (customizePrefixCls) return customizePrefixCls
return suffixCls ? `ant-${suffixCls}` : 'ant' return suffixCls ? `ant-${suffixCls}` : 'ant'
@ -82,11 +97,16 @@ const configState = (props: ConfigProviderProps) => {
const getPrefixCls = (suffixCls?: string, customizePrefixCls?: string) => { const getPrefixCls = (suffixCls?: string, customizePrefixCls?: string) => {
const { prefixCls, getPrefixCls } = props const { prefixCls, getPrefixCls } = props
if (customizePrefixCls) return customizePrefixCls if (customizePrefixCls) return customizePrefixCls
const mergedPrefixCls = prefixCls || getPrefixCls?.('') || defaultGetPrefixCls('') const mergedPrefixCls =
prefixCls || getPrefixCls?.('') || defaultGetPrefixCls('')
return suffixCls ? `${mergedPrefixCls}-${suffixCls}` : mergedPrefixCls return suffixCls ? `${mergedPrefixCls}-${suffixCls}` : mergedPrefixCls
} }
const iconPrefixCls = computed(() => props?.iconPrefixCls ?? defaultIconPrefixCls) const iconPrefixCls = computed(
const shouldWrapSSR = computed(() => iconPrefixCls.value !== defaultIconPrefixCls) () => props?.iconPrefixCls ?? defaultIconPrefixCls
)
const shouldWrapSSR = computed(
() => iconPrefixCls.value !== defaultIconPrefixCls
)
const csp = computed(() => props?.csp) const csp = computed(() => props?.csp)
const componentSize = computed(() => props?.componentSize) const componentSize = computed(() => props?.componentSize)
const componentDisabled = computed(() => props?.componentDisabled) const componentDisabled = computed(() => props?.componentDisabled)
@ -103,7 +123,8 @@ const configState = (props: ConfigProviderProps) => {
direction direction
} }
} }
const [useProviderConfigProvide, useProviderConfigInject] = createInjectionState(configState) const [useProviderConfigProvide, useProviderConfigInject] =
createInjectionState(configState)
export { useProviderConfigProvide } export { useProviderConfigProvide }
export const useProviderConfigState = (): ReturnType<typeof configState> => { export const useProviderConfigState = (): ReturnType<typeof configState> => {
@ -115,7 +136,7 @@ export const useProviderConfigState = (): ReturnType<typeof configState> => {
componentSize: computed(() => undefined), componentSize: computed(() => undefined),
componentDisabled: computed(() => false), componentDisabled: computed(() => false),
direction: computed(() => undefined), direction: computed(() => undefined),
autoInsertSpaceInButton: computed(() => undefined) autoInsertSpaceInButton: computed(() => true)
} as any) } as any)
) )
} }

View File

@ -84,7 +84,7 @@ const Space = defineComponent({
return () => { return () => {
const { align, direction, rootClassName, split, wrap } = props const { align, direction, rootClassName, split, wrap } = props
const childNodes = filterEmpty(slots.default?.()) const childNodes = filterEmpty(slots.default?.() as any)
const mergedAlign = const mergedAlign =
align === undefined && direction === 'horizontal' ? 'center' : align align === undefined && direction === 'horizontal' ? 'center' : align
const cn = classNames( const cn = classNames(

View File

@ -1,7 +1,9 @@
import type { AliasToken, GenerateStyle } from '../../theme/internal' import type { AliasToken, GenerateStyle } from '../../theme/internal'
import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook' import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook'
const genCollapseMotion: GenerateStyle<TokenWithCommonCls<AliasToken>> = token => ({ const genCollapseMotion: GenerateStyle<TokenWithCommonCls<AliasToken>> = (
token
) => ({
[token.componentCls]: { [token.componentCls]: {
// For common/openAnimation // For common/openAnimation
[`${token.antCls}-motion-collapse-legacy`]: { [`${token.antCls}-motion-collapse-legacy`]: {

View File

@ -1,7 +1,12 @@
import { generate } from '@ant-design/colors' import { generate } from '@ant-design/colors'
import genControlHeight from '../shared/genControlHeight' import genControlHeight from '../shared/genControlHeight'
import genSizeMapToken from '../shared/genSizeMapToken' import genSizeMapToken from '../shared/genSizeMapToken'
import type { ColorPalettes, MapToken, PresetColorType, SeedToken } from '../../interface' import type {
ColorPalettes,
MapToken,
PresetColorType,
SeedToken
} from '../../interface'
import { defaultPresetColors } from '../seed' import { defaultPresetColors } from '../seed'
import genColorMapToken from '../shared/genColorMapToken' import genColorMapToken from '../shared/genColorMapToken'
import genCommonMapToken from '../shared/genCommonMapToken' import genCommonMapToken from '../shared/genCommonMapToken'
@ -10,7 +15,8 @@ import { generateColorPalettes, generateNeutralColorPalettes } from './colors'
export default function derivative(token: SeedToken): MapToken { export default function derivative(token: SeedToken): MapToken {
const colorPalettes = Object.keys(defaultPresetColors) const colorPalettes = Object.keys(defaultPresetColors)
.map((colorKey: keyof PresetColorType) => { .map((value) => {
const colorKey = value as keyof PresetColorType
const colors = generate(token[colorKey]) const colors = generate(token[colorKey])
return new Array(10).fill(1).reduce((prev, _, i) => { return new Array(10).fill(1).reduce((prev, _, i) => {

View File

@ -1,6 +1,7 @@
{ {
"name": "antd-tiny-vue", "name": "antd-tiny-vue",
"version": "1.0.0", "version": "1.0.0",
"packageManager": "pnpm@8.2.0",
"description": "this is a tiny antd components for vue3", "description": "this is a tiny antd components for vue3",
"keywords": [ "keywords": [
"antd", "antd",
@ -12,39 +13,53 @@
], ],
"license": "MIT", "license": "MIT",
"author": "aibayanyu", "author": "aibayanyu",
"main": "dist/index.js", "main": "lib/index.js",
"module": "es/index.js",
"types": "lib/index.d.ts",
"files": [
"lib",
"es",
"dist",
"README.md"
],
"scripts": { "scripts": {
"test": "vitest", "test": "vitest",
"prepare": "husky install", "prepare": "husky install",
"dev": "vitepress dev", "dev": "vitepress dev",
"build:site": "vitepress build", "build:site": "vitepress build",
"build:lib": "vite build --config vite.build.config.ts",
"build:umd": "vite build --config vite.bundle.config.ts",
"copy:css": "cpx \"components/style/*.css\" dist",
"preview": "vitepress preview" "preview": "vitepress preview"
}, },
"dependencies": { "dependencies": {
"@ant-design/colors": "^7.0.0", "@ant-design/colors": "^7.0.0",
"@antd-tiny-vue/cssinjs": "^0.0.4", "@ant-design/icons-vue": "^6.1.0",
"@antd-tiny-vue/cssinjs": "0.0.8",
"@ctrl/tinycolor": "^3.6.0", "@ctrl/tinycolor": "^3.6.0",
"@v-c/utils": "^0.0.19", "@v-c/utils": "^0.0.22",
"@vueuse/core": "^9.13.0", "@vueuse/core": "^9.13.0",
"vue": "^3.2.47" "vue": "^3.3.0-beta.2"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^17.5.0", "@commitlint/cli": "^17.5.0",
"@commitlint/config-conventional": "^17.4.4", "@commitlint/config-conventional": "^17.4.4",
"@mistjs/eslint-config-vue-jsx": "^0.0.7", "@mistjs/eslint-config-vue-jsx": "^0.0.7",
"@mistjs/tsconfig": "^1.0.0", "@mistjs/tsconfig": "^1.1.1",
"@mistjs/tsconfig-vue": "^0.0.3", "@mistjs/tsconfig-vue": "^1.1.2",
"@types/node": "^18.15.10", "@types/node": "^18.15.10",
"@vitejs/plugin-vue-jsx": "^3.0.1", "@vitejs/plugin-vue-jsx": "^3.0.1",
"cpx": "^1.5.0",
"eslint": "^8.36.0", "eslint": "^8.36.0",
"husky": "^8.0.3", "husky": "^8.0.3",
"lint-staged": "^13.2.0", "lint-staged": "^13.2.0",
"prettier": "^2.8.7", "prettier": "^2.8.7",
"typescript": "^4.9.5", "typescript": "^5.0.4",
"unbuild": "^1.1.2", "unbuild": "^1.1.2",
"vite": "^4.2.1", "vite": "^4.3.3",
"vite-plugin-vitepress-demo": "2.0.0-beta.28", "vite-plugin-dts": "^2.3.0",
"vitepress": "1.0.0-alpha.69", "vite-plugin-vitepress-demo": "2.0.0-beta.29",
"vitepress": "1.0.0-alpha.74",
"vitest": "^0.28.5" "vitest": "^0.28.5"
}, },
"pnpm": { "pnpm": {
@ -52,6 +67,9 @@
"ignoreMissing": [ "ignoreMissing": [
"@algolia/client-search" "@algolia/client-search"
] ]
},
"overrides": {
"vue": "3.3.0-beta.2"
} }
}, },
"lint-staged": { "lint-staged": {

2693
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,6 @@
{ {
"extends": "@mistjs/tsconfig-vue" "extends": "@mistjs/tsconfig-vue",
"compilerOptions": {
"moduleResolution": "bundler"
}
} }

47
vite.build.config.ts Normal file
View File

@ -0,0 +1,47 @@
import { defineConfig } from 'vite'
import vueJsx from '@vitejs/plugin-vue-jsx'
import dts from 'vite-plugin-dts'
export default defineConfig({
plugins: [
vueJsx(),
dts({
outputDir: ['es', 'lib'],
include: ['components/**/*.ts', 'components/**/*.tsx']
})
],
build: {
minify: false,
rollupOptions: {
external: [
'@ant-design/colors',
/^@ant-design\/icons-vue/,
'@antd-tiny-vue/cssinjs',
'@ctrl/tinycolor',
'@v-c/utils',
'@vueuse/core',
'vue'
],
output: [
{
format: 'es',
dir: 'es',
entryFileNames: '[name].js',
preserveModules: true,
preserveModulesRoot: 'components'
},
{
format: 'cjs',
dir: 'lib',
entryFileNames: '[name].js',
preserveModules: true,
preserveModulesRoot: 'components',
exports: 'named'
}
]
},
lib: {
entry: 'components/index.ts',
formats: ['es', 'cjs']
}
}
})

13
vite.bundle.config.ts Normal file
View File

@ -0,0 +1,13 @@
import { defineConfig } from 'vite'
import vueJsx from '@vitejs/plugin-vue-jsx'
export default defineConfig({
plugins: [vueJsx()],
build: {
lib: {
entry: 'components/index.ts',
name: 'Antd',
fileName: () => `antd.js`,
formats: ['umd']
}
}
})