Skip to content

Commit

Permalink
Merge pull request #914 from LittlehorseXie/feat/tagInput_excessTagsD…
Browse files Browse the repository at this point in the history
…isplayType

feat(taginput): excessTagsDisplayType 默认值更为 break-line
  • Loading branch information
carolin913 authored Jun 23, 2022
2 parents b35a940 + b3ed232 commit 67d0d97
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 41 deletions.
8 changes: 4 additions & 4 deletions src/collapse/__tests__/__snapshots__/collapse.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ exports[`base.jsx 1`] = `
style="width: 80%;"
>
<div
class="t-input__wrap t-tag-input"
class="t-input__wrap t-tag-input t-tag-input--break-line"
value=""
>
<div
Expand Down Expand Up @@ -483,7 +483,7 @@ exports[`icon.jsx 1`] = `
style="width: 80%;"
>
<div
class="t-input__wrap t-tag-input"
class="t-input__wrap t-tag-input t-tag-input--break-line"
value=""
>
<div
Expand Down Expand Up @@ -748,7 +748,7 @@ exports[`mutex.jsx 1`] = `
style="width: 80%;"
>
<div
class="t-input__wrap t-tag-input"
class="t-input__wrap t-tag-input t-tag-input--break-line"
value=""
>
<div
Expand Down Expand Up @@ -936,7 +936,7 @@ exports[`other.jsx 1`] = `
style="width: 80%;"
>
<div
class="t-input__wrap t-tag-input"
class="t-input__wrap t-tag-input t-tag-input--break-line"
value=""
>
<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ exports[`text.jsx 1`] = `
class="t-input-adornment t-input-adornment--append"
>
<div
class="t-input__wrap t-tag-input"
class="t-input__wrap t-tag-input t-tag-input--break-line"
value=""
>
<div
Expand Down
12 changes: 6 additions & 6 deletions src/select/__tests__/__snapshots__/select.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ exports[`collapsed.jsx 1`] = `
class="t-popup__reference t-select t-select-input t-select-input--multiple"
>
<div
class="t-input__wrap t-tag-input t-tag-input__with-suffix-icon"
class="t-input__wrap t-tag-input t-tag-input--break-line t-tag-input__with-suffix-icon"
value=""
>
<div
Expand Down Expand Up @@ -251,7 +251,7 @@ exports[`custom-selected.jsx 1`] = `
class="t-popup__reference t-select t-select-input t-select-input--multiple"
>
<div
class="t-input__wrap t-tag-input t-tag-input__with-suffix-icon"
class="t-input__wrap t-tag-input t-tag-input--break-line t-tag-input__with-suffix-icon"
value=""
>
<div
Expand Down Expand Up @@ -517,7 +517,7 @@ exports[`keys.jsx 1`] = `
class="t-popup__reference t-select t-select-input t-select-input--multiple"
>
<div
class="t-input__wrap t-tag-input t-tag-input__with-suffix-icon"
class="t-input__wrap t-tag-input t-tag-input--break-line t-tag-input__with-suffix-icon"
value=""
>
<div
Expand Down Expand Up @@ -685,7 +685,7 @@ exports[`label-in-value.jsx 1`] = `
class="t-popup__reference t-select t-select-input t-select-input--multiple"
>
<div
class="t-input__wrap t-tag-input t-tag-input__with-suffix-icon"
class="t-input__wrap t-tag-input t-tag-input--break-line t-tag-input__with-suffix-icon"
value=""
>
<div
Expand Down Expand Up @@ -757,7 +757,7 @@ exports[`max.jsx 1`] = `
class="t-popup__reference t-select t-select-input t-select-input--multiple"
>
<div
class="t-input__wrap t-tag-input t-tag-input__with-suffix-icon"
class="t-input__wrap t-tag-input t-tag-input--break-line t-tag-input__with-suffix-icon"
value=""
>
<div
Expand Down Expand Up @@ -828,7 +828,7 @@ exports[`multiple.jsx 1`] = `
class="t-popup__reference t-select t-select-input t-select-input--multiple"
>
<div
class="t-input__wrap t-tag-input t-tag-input__with-suffix-icon"
class="t-input__wrap t-tag-input t-tag-input--break-line t-tag-input__with-suffix-icon"
value=""
>
<div
Expand Down
7 changes: 4 additions & 3 deletions src/tag-input/_example/excess.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ export default function TagInputExcessExample() {
const [tags, setTags] = useState(['Vue', 'React']);
return (
<div className="tdesign-demo-block-column" style={{ width: '80%' }}>
{/* <!-- 标签数量超出时,滚动显示,默认情况 --> */}
{/* <!-- 标签数量超出时,滚动显示 --> */}
<TagInput
value={tags}
onChange={setTags}
label="Scroll: "
excessTagsDisplayType="scroll"
placeholder="请输入"
clearable
/>

{/* <!-- 标签数量超出时,换行显示 --> */}
{/* <!-- 标签数量超出时,换行显示,默认情况 --> */}
<TagInput
value={tags}
onChange={setTags}
Expand All @@ -24,5 +25,5 @@ export default function TagInputExcessExample() {
clearable
/>
</div>
)
);
}
2 changes: 1 addition & 1 deletion src/tag-input/_usage/props.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{
"name": "excessTagsDisplayType",
"type": "enum",
"defaultValue": "scroll",
"defaultValue": "break-line",
"options": [
{
"label": "scroll",
Expand Down
2 changes: 1 addition & 1 deletion src/tag-input/defaultProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const tagInputDefaultProps: TdTagInputProps = {
autoWidth: false,
clearable: false,
dragSort: false,
excessTagsDisplayType: 'scroll',
excessTagsDisplayType: 'break-line',
minCollapsedNum: 0,
placeholder: undefined,
readonly: false,
Expand Down
2 changes: 1 addition & 1 deletion src/tag-input/tag-input.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ clearable | Boolean | false | 是否可清空 | N
collapsedItems | TElement | - | 标签过多的情况下,折叠项内容,默认为 `+N`。如果需要悬浮就显示其他内容,可以使用 collapsedItems 自定义。`value` 表示标签值,`collapsedTags` 表示折叠标签值,`count` 表示总标签数量。TS 类型:`TNode<{ value: TagInputValue; collapsedTags: TagInputValue; count: number }>`[通用类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/common.ts) | N
disabled | Boolean | false | 是否禁用标签输入框 | N
dragSort | Boolean | false | 拖拽调整标签顺序 | N
excessTagsDisplayType | String | scroll | 标签超出时的呈现方式,有两种:横向滚动显示 和 换行显示。可选项:scroll/break-line | N
excessTagsDisplayType | String | break-line | 标签超出时的呈现方式,有两种:横向滚动显示 和 换行显示。可选项:scroll/break-line | N
inputProps | Object | - | 透传 Input 输入框组件全部属性。TS 类型:`InputProps`[Input API Documents](./input?tab=api)[详细类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/tag-input/type.ts) | N
inputValue | String / Number | '' | 输入框的值。TS 类型:`InputValue`[Input API Documents](./input?tab=api)[详细类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/tag-input/type.ts) | N
defaultInputValue | String / Number | '' | 输入框的值。非受控属性。TS 类型:`InputValue`[Input API Documents](./input?tab=api)[详细类型定义](https://github.com/Tencent/tdesign-react/blob/develop/src/tag-input/type.ts) | N
Expand Down
48 changes: 24 additions & 24 deletions test/ssr/__snapshots__/ssr.test.js.snap

Large diffs are not rendered by default.

0 comments on commit 67d0d97

Please sign in to comment.