Skip to content

Commit

Permalink
fix(space): slots is not reactive (#2372)
Browse files Browse the repository at this point in the history
* fix(space): slots is not reactive

* chore: update snapshot
  • Loading branch information
uyarn authored Apr 27, 2023
1 parent 2c25dd1 commit d714210
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ exports[`InputNumber > :props > :disabled, function can not be call 1`] = `
class="t-input__inner"
disabled="disabled"
placeholder="请输入"
title=""
type="text"
unselectable="off"
/>
Expand Down
1 change: 1 addition & 0 deletions src/input/__tests__/__snapshots__/index.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ exports[`Input > :props > :disabled 1`] = `
class="t-input__inner"
disabled="disabled"
placeholder="请输入"
title=""
type="text"
unselectable="off"
/>
Expand Down
5 changes: 3 additions & 2 deletions src/input/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ export default mixins(getConfigReceiverMixins<InputInstance, InputConfig>('input
[`${this.componentName}--suffix`]: suffixIcon || suffixContent,
},
];

const inputTextValue = this.composingRef ? this.composingRefValue : this.inputValue;
const inputNode = (
<div
class={classes}
Expand All @@ -512,8 +512,9 @@ export default mixins(getConfigReceiverMixins<InputInstance, InputConfig>('input
on={inputEvents}
ref="inputRef"
class={`${this.componentName}__inner`}
value={this.composingRef ? this.composingRefValue : this.inputValue}
value={inputTextValue}
onInput={this.handleInput}
title={this.disabled ? inputTextValue : undefined}
/>
)}
{this.autoWidth && (
Expand Down
1 change: 1 addition & 0 deletions src/select/__tests__/__snapshots__/index.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ exports[`Select > :props > :disabled 1`] = `
disabled="disabled"
placeholder="请选择"
readonly="readonly"
title=""
type="text"
unselectable="on"
/>
Expand Down
12 changes: 3 additions & 9 deletions src/space/space.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default defineComponent({

props: { ...props },

setup(props, { slots }) {
setup(props) {
const COMPONENT_NAME = usePrefixClass('space');

const renderStyle = computed(() => {
Expand Down Expand Up @@ -47,21 +47,15 @@ export default defineComponent({
COMPONENT_NAME,
spaceClassNames,
renderStyle,
slots,
};
},
render() {
const {
COMPONENT_NAME, spaceClassNames, renderStyle, slots,
} = this;

const children = slots.default?.().filter((child) => child.tag !== undefined || child.text) || [];
const { COMPONENT_NAME, spaceClassNames, renderStyle } = this;
const children = this.$slots.default?.filter((child) => child.tag !== undefined || child.text) || [];
const childCount = children?.length;

const renderChildren = () => children.map((child, index) => {
const separatorNode = renderTNodeJSX(this, 'separator');
const showSeparator = index + 1 !== childCount && separatorNode;

return [
<div class={`${COMPONENT_NAME}-item`}>{child}</div>,
showSeparator ? <div class={`${COMPONENT_NAME}-item-separator`}>{separatorNode}</div> : null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ exports[`TreeSelect > :props > :disabled 1`] = `
disabled="disabled"
placeholder="请选择"
readonly="readonly"
title=""
type="text"
unselectable="on"
/>
Expand Down
19 changes: 19 additions & 0 deletions test/snap/__snapshots__/csr.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1846,6 +1846,7 @@ exports[`csr snapshot test > csr test ./src/auto-complete/_example/status.vue 1`
class="t-input__inner"
disabled="disabled"
placeholder="请输入关键词搜索"
title="第一个默认联想词"
type="text"
unselectable="off"
/>
Expand Down Expand Up @@ -22539,6 +22540,7 @@ exports[`csr snapshot test > csr test ./src/cascader/_example/disabled.vue 1`] =
disabled="disabled"
placeholder="请选择"
readonly="readonly"
title="选项一 / 子选项一"
type="text"
unselectable="on"
/>
Expand Down Expand Up @@ -31251,6 +31253,7 @@ exports[`csr snapshot test > csr test ./src/color-picker/_example/status-disable
class="t-input__inner"
disabled="disabled"
placeholder="请输入"
title="red"
type="text"
unselectable="off"
/>
Expand Down Expand Up @@ -31399,6 +31402,7 @@ exports[`csr snapshot test > csr test ./src/color-picker/_example/status-readonl
disabled="disabled"
placeholder="请选择"
readonly="readonly"
title="RGB"
type="text"
unselectable="on"
/>
Expand Down Expand Up @@ -31451,6 +31455,7 @@ exports[`csr snapshot test > csr test ./src/color-picker/_example/status-readonl
class="t-input__inner"
disabled="disabled"
placeholder="请输入"
title="0"
type="text"
unselectable="off"
/>
Expand All @@ -31477,6 +31482,7 @@ exports[`csr snapshot test > csr test ./src/color-picker/_example/status-readonl
class="t-input__inner"
disabled="disabled"
placeholder="请输入"
title="82"
type="text"
unselectable="off"
/>
Expand All @@ -31503,6 +31509,7 @@ exports[`csr snapshot test > csr test ./src/color-picker/_example/status-readonl
class="t-input__inner"
disabled="disabled"
placeholder="请输入"
title="217"
type="text"
unselectable="off"
/>
Expand Down Expand Up @@ -50524,6 +50531,7 @@ exports[`csr snapshot test > csr test ./src/form/_example/disabled.vue 1`] = `
disabled="disabled"
placeholder="请选择寄件地址"
readonly="readonly"
title=""
type="text"
unselectable="on"
/>
Expand Down Expand Up @@ -50590,6 +50598,7 @@ exports[`csr snapshot test > csr test ./src/form/_example/disabled.vue 1`] = `
disabled="disabled"
placeholder="请选择收件地址"
readonly="readonly"
title=""
type="text"
unselectable="on"
/>
Expand Down Expand Up @@ -50660,6 +50669,7 @@ exports[`csr snapshot test > csr test ./src/form/_example/disabled.vue 1`] = `
disabled="disabled"
placeholder="请选择日期"
readonly="readonly"
title=""
type="text"
unselectable="on"
/>
Expand Down Expand Up @@ -50957,6 +50967,7 @@ exports[`csr snapshot test > csr test ./src/form/_example/disabled.vue 1`] = `
class="t-input__inner"
disabled="disabled"
placeholder="分数值"
title=""
type="text"
unselectable="off"
/>
Expand Down Expand Up @@ -62244,6 +62255,7 @@ exports[`csr snapshot test > csr test ./src/input/_example/status.vue 1`] = `
class="t-input__inner"
disabled="disabled"
placeholder="请输入"
title="禁用状态"
type="text"
unselectable="off"
/>
Expand Down Expand Up @@ -63579,6 +63591,7 @@ exports[`csr snapshot test > csr test ./src/input-number/_example/disabled.vue 1
class="t-input__inner"
disabled="disabled"
placeholder="请输入"
title="3"
type="text"
unselectable="off"
/>
Expand Down Expand Up @@ -76478,6 +76491,7 @@ exports[`csr snapshot test > csr test ./src/pagination/_example/disabled.vue 1`]
disabled="disabled"
placeholder="请选择"
readonly="readonly"
title="5 条/页"
type="text"
unselectable="on"
/>
Expand Down Expand Up @@ -86434,6 +86448,7 @@ exports[`csr snapshot test > csr test ./src/select/_example/disabled.vue 1`] = `
class="t-input__inner"
disabled="disabled"
placeholder="-请选择-"
title=""
type="text"
unselectable="off"
/>
Expand Down Expand Up @@ -88090,6 +88105,7 @@ exports[`csr snapshot test > csr test ./src/select/_example/status.vue 1`] = `
disabled="disabled"
placeholder="请选择云解决方案"
readonly="readonly"
title=""
type="text"
unselectable="on"
/>
Expand Down Expand Up @@ -89856,6 +89872,7 @@ exports[`csr snapshot test > csr test ./src/select-input/_example/status.vue 1`]
disabled="disabled"
placeholder="Please Select"
readonly="readonly"
title="TDesign"
type="text"
unselectable="on"
/>
Expand Down Expand Up @@ -134071,6 +134088,7 @@ exports[`csr snapshot test > csr test ./src/tag-input/_example/status.vue 1`] =
class="t-input__inner"
disabled="disabled"
placeholder=""
title=""
type="text"
unselectable="off"
/>
Expand Down Expand Up @@ -135305,6 +135323,7 @@ exports[`csr snapshot test > csr test ./src/time-picker/_example/disabled.vue 1`
disabled="disabled"
placeholder=""
readonly="readonly"
title="11:12:10"
type="text"
unselectable="on"
/>
Expand Down
Loading

0 comments on commit d714210

Please sign in to comment.