From c3a8275ebf33010e26c0ac111b3bf414e2f221e2 Mon Sep 17 00:00:00 2001 From: luopei <285258675@qq.com> Date: Sun, 31 Jul 2022 18:20:16 +0800 Subject: [PATCH] feat(Space): add new component space (#10857) * feat(Space): add new component space * feat(Space): improve functions,documents and add test --- packages/vant/src/space/README.md | 132 ++++++++++++++++++ packages/vant/src/space/README.zh-CN.md | 143 ++++++++++++++++++++ packages/vant/src/space/Space.tsx | 121 +++++++++++++++++ packages/vant/src/space/demo/index.vue | 99 ++++++++++++++ packages/vant/src/space/index.less | 38 ++++++ packages/vant/src/space/index.ts | 12 ++ packages/vant/src/space/test/index.spec.tsx | 133 ++++++++++++++++++ packages/vant/vant.config.mjs | 8 ++ 8 files changed, 686 insertions(+) create mode 100644 packages/vant/src/space/README.md create mode 100644 packages/vant/src/space/README.zh-CN.md create mode 100644 packages/vant/src/space/Space.tsx create mode 100644 packages/vant/src/space/demo/index.vue create mode 100644 packages/vant/src/space/index.less create mode 100644 packages/vant/src/space/index.ts create mode 100644 packages/vant/src/space/test/index.spec.tsx diff --git a/packages/vant/src/space/README.md b/packages/vant/src/space/README.md new file mode 100644 index 000000000..43e72b9f8 --- /dev/null +++ b/packages/vant/src/space/README.md @@ -0,0 +1,132 @@ +# Space + +### Intro + +Set the spacing between elements. + +### Install + +Register component globally via `app.use`, refer to [Component Registration](#/en-US/advanced-usage#zu-jian-zhu-ce) for more registration ways. + +```js +import { createApp } from 'vue'; +import { Space } from 'vant'; + +const app = createApp(); +app.use(Space); +``` + +## Usage + +### Basic Usage + +```html + + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + +``` + +### Vertical Arrangement + +```html + + 按钮 + 按钮 + 按钮 + +``` + +### Size + +```html + + small + 默认 + large + + + 按钮 + 按钮 + 按钮 + +``` + +```js +import { SpaceSize } from '../Space'; +const size = ref < SpaceSize > ''; +``` + +### Alignment + +```html + + start + center + end + baseline + +
+ +
Space
+ 按钮 +
+
标题
+
内容
+
+ +``` + +```js +import { SpaceAlign } from '../Space'; +const align = ref < SpaceAlign > 'center'; +``` + +### Wrap + +```html + + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + +``` + +## API + +### Props + +| Attribute | Description | Type | Default | +| --- | --- | --- | --- | +| direction | Spacing direction | _vertical \| horizontal_ | `horizontal` | +| align | Spacing alignment | _start \| end \| center \| baseline_ | - | +| size | Spacing size, For example, 20px 2em, the default unit is px, supports array form, and sets horizontal and vertical spacing | _number \| string \| number[] \| string[]_ | `8px` | +| wrap | Whether to wrap lines automatically is only applicable to horizontal arrangement | boolean | `false` | +| fill | Whether to fill the whole line | boolean | `false` | + +### Slots + +| Name | Description | +| ------- | ------------ | +| default | Default slot | + +### Types + +The component exports the following type definitions: + +```ts +import type { SpaceProps, SpaceSize, SpaceAlign } from 'vant'; +``` diff --git a/packages/vant/src/space/README.zh-CN.md b/packages/vant/src/space/README.zh-CN.md new file mode 100644 index 000000000..233f6f0d4 --- /dev/null +++ b/packages/vant/src/space/README.zh-CN.md @@ -0,0 +1,143 @@ +# Space 间距 + +### 介绍 + +设置元素之间的间距。 + +### 引入 + +通过以下方式来全局注册组件，更多注册方式请参考[组件注册](#/zh-CN/advanced-usage#zu-jian-zhu-ce)。 + +```js +import { createApp } from 'vue'; +import { Space } from 'vant'; + +const app = createApp(); +app.use(Space); +``` + +## 代码演示 + +### 基础用法 + +间距组件的基本用法。 + +```html + + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + +``` + +### 垂直排列 + +可以设置垂直方向排列的间距。 + +```html + + 按钮 + 按钮 + 按钮 + +``` + +### 尺寸 + +通过调整 `size` 的值来控制间距的大小。 +通过 `size` 控制组件大小, small, large, 分别对应 `8px`, `16px`的间距. 默认的间距大小为 `12px`。 + +```html + + small + 默认 + large + + + 按钮 + 按钮 + 按钮 + +``` + +```js +import { SpaceSize } from '../Space'; +const size = ref < SpaceSize > ''; +``` + +### 对齐方式 + +通过调整 `align` 的值来设置对齐方式, 分别为 `start`, `center` ,`end` ,`baseline，在水平模式下默认为` center。 + +```html + + start + center + end + baseline + +
+ +
Space
+ 按钮 +
+
标题
+
内容
+
+ +``` + +```js +import { SpaceAlign } from '../Space'; +const align = ref < SpaceAlign > 'center'; +``` + +### 自动换行 + +在水平模式下, 通过控制`wrap`来控制是否自动换行。 + +```html + + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + 按钮 + +``` + +## API + +### Props + +| 参数 | 说明 | 类型 | 默认值 | +| --- | --- | --- | --- | +| direction | 间距方向 | _vertical \| horizontal_ | `horizontal` | +| align | 对齐方式 | _start \| end \| center \| baseline_ | - | +| size | 间距大小，如 20px 2em，默认单位为 px，支持数组形式，设置横向和纵向间距 | _number \| string \| number[] \| string[]_ | `8px` | +| wrap | 是否自动换行，仅适用于水平方向排列 | boolean | `false` | +| fill | 是否充满整行 | boolean | `false` | + +### Slots + +| 名称 | 说明 | +| ------- | ------------ | +| default | 间距组件内容 | + +### 类型定义 + +组件导出以下类型定义： + +```js +import type { SpaceProps, SpaceSize, SpaceAlign } from 'vant'; +``` diff --git a/packages/vant/src/space/Space.tsx b/packages/vant/src/space/Space.tsx new file mode 100644 index 000000000..fab571e78 --- /dev/null +++ b/packages/vant/src/space/Space.tsx @@ -0,0 +1,121 @@ +import { + computed, + CSSProperties, + defineComponent, + ExtractPropTypes, + Fragment, + PropType, + type VNode, +} from 'vue'; +import { createNamespace } from '../utils'; + +const [name, bem] = createNamespace('space'); + +export type SpaceSize = number | string; +export type SpaceAlign = 'start' | 'end' | 'center' | 'baseline'; + +const spaceProps = { + align: String as PropType, + direction: { + type: String as PropType<'vertical' | 'horizontal'>, + default: 'horizontal', + }, + size: { + type: [Number, String, Array] as PropType< + number | string | [SpaceSize, SpaceSize] + >, + default: 8, + }, + wrap: Boolean, + fill: Boolean, +}; + +export type SpaceProps = ExtractPropTypes; + +function filterEmpty(children: VNode[] = []) { + const nodes: VNode[] = []; + children.forEach((child) => { + if (Array.isArray(child)) { + nodes.push(...child); + } else if (child.type === Fragment) { + nodes.push(...filterEmpty(child.children as VNode[])); + } else { + nodes.push(child); + } + }); + return nodes.filter( + (c) => + !( + c && + ((typeof Comment !== 'undefined' && c.type === Comment) || + (c.type === Fragment && c.children?.length === 0) || + (c.type === Text && (c.children as string).trim() === '')) + ) + ); +} + +export default defineComponent({ + name, + props: spaceProps, + setup(props, { slots }) { + const mergedAlign = computed( + () => props.align ?? (props.direction === 'horizontal' ? 'center' : '') + ); + + const getMargin = (size: SpaceSize) => { + if (typeof size === 'number') { + return size + 'px'; + } + return size; + }; + const getMarginStyle = (isLast: boolean): CSSProperties => { + const style: CSSProperties = {}; + + const marginRight = `${getMargin( + Array.isArray(props.size) ? props.size[0] : props.size + )}`; + const marginBottom = `${getMargin( + Array.isArray(props.size) ? props.size[1] : props.size + )}`; + + if (isLast) { + return props.wrap ? { marginBottom } : {}; + } + + if (props.direction === 'horizontal') { + style.marginRight = marginRight; + } + if (props.direction === 'vertical' || props.wrap) { + style.marginBottom = marginBottom; + } + + return style; + }; + + return () => { + const children = filterEmpty(slots.default?.()); + return ( +
+ {children.map((c, i) => ( +
+ {c} +
+ ))} +
+ ); + }; + }, +}); diff --git a/packages/vant/src/space/demo/index.vue b/packages/vant/src/space/demo/index.vue new file mode 100644 index 000000000..0af9fa88e --- /dev/null +++ b/packages/vant/src/space/demo/index.vue @@ -0,0 +1,99 @@ + + + diff --git a/packages/vant/src/space/index.less b/packages/vant/src/space/index.less new file mode 100644 index 000000000..d301e4e21 --- /dev/null +++ b/packages/vant/src/space/index.less @@ -0,0 +1,38 @@ +.van-space { + display: inline-flex; + + &--horizontal { + .van-space-item { + display: flex; + align-items: center; + } + } + + &--vertical { + flex-direction: column; + } + + &--align-baseline { + align-items: baseline; + } + + &--align-start { + align-items: flex-start; + } + + &--align-end { + align-items: flex-end; + } + + &--align-center { + align-items: center; + } + + &--wrap { + flex-wrap: wrap; + } + + &--fill { + display: flex; + } +} diff --git a/packages/vant/src/space/index.ts b/packages/vant/src/space/index.ts new file mode 100644 index 000000000..39d4bf285 --- /dev/null +++ b/packages/vant/src/space/index.ts @@ -0,0 +1,12 @@ +import { withInstall } from '../utils'; +import _Space from './Space'; + +export const Space = withInstall(_Space); +export default Space; +export type { SpaceProps, SpaceSize, SpaceAlign } from './Space'; + +declare module 'vue' { + export interface GlobalComponents { + VanSpace: typeof Space; + } +} diff --git a/packages/vant/src/space/test/index.spec.tsx b/packages/vant/src/space/test/index.spec.tsx new file mode 100644 index 000000000..15b298aa2 --- /dev/null +++ b/packages/vant/src/space/test/index.spec.tsx @@ -0,0 +1,133 @@ +import { mount } from '../../../test'; +import { Space } from '..'; +import { Button } from '../../button'; + +test('should render space', async () => { + const wrapper = mount({ + render() { + return ( + + + + + + ); + }, + }); + const items = wrapper.findAll('.van-space-item'); + expect(items[0].style.marginRight).toBe('8px'); + expect(items[1].style.marginRight).toBe('8px'); + expect(items[2].style.marginRight).toBe(''); +}); + +test('should render vertical', async () => { + const wrapper = mount({ + render() { + return ( + + + + + + ); + }, + }); + const space = wrapper.find('.van-space'); + const items = wrapper.findAll('.van-space-item'); + expect(space.classes()).toContain('van-space--vertical'); + expect(items[0].style.marginBottom).toBe('8px'); + expect(items[1].style.marginBottom).toBe('8px'); + expect(items[2].style.marginBottom).toBe(''); +}); + +test('should render size 20px', async () => { + const wrapper = mount({ + render() { + return ( + + + + + + ); + }, + }); + const items = wrapper.findAll('.van-space-item'); + expect(items[0].style.marginRight).toBe('20px'); + expect(items[1].style.marginRight).toBe('20px'); + expect(items[2].style.marginRight).toBe(''); +}); + +test('should render align start', async () => { + const wrapper = mount({ + render() { + return ( + + + + + + ); + }, + }); + const space = wrapper.find('.van-space'); + expect(space.classes()).toContain('van-space--align-start'); +}); + +test('should render wrap', async () => { + const wrapper = mount({ + render() { + return ( + + + + + + + + + + + + ); + }, + }); + const space = wrapper.find('.van-space'); + expect(space.classes()).toContain('van-space--wrap'); +}); diff --git a/packages/vant/vant.config.mjs b/packages/vant/vant.config.mjs index 2b4207fc4..7e127b6ab 100644 --- a/packages/vant/vant.config.mjs +++ b/packages/vant/vant.config.mjs @@ -120,6 +120,10 @@ export default { path: 'popup', title: 'Popup 弹出层', }, + { + path: 'space', + title: 'Space 间距', + }, { path: 'style', title: 'Style 内置样式', @@ -528,6 +532,10 @@ export default { path: 'popup', title: 'Popup', }, + { + path: 'space', + title: 'Space', + }, { path: 'style', title: 'Built-in style',