Skip to content

Commit 92d92ba

Browse files
committed
chore(textarea): remove extra demo, adjust word count and maxlength when allowInputOverMax is true
1 parent 179d1f4 commit 92d92ba

File tree

14 files changed

+11
-56
lines changed

14 files changed

+11
-56
lines changed

src/textarea/__test__/demo.test.js

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,7 @@
55
import path from 'path';
66
import simulate from 'miniprogram-simulate';
77

8-
const mapper = [
9-
'allowInputOverMax',
10-
'autosize',
11-
'base',
12-
'card',
13-
'custom',
14-
'disabled',
15-
'label',
16-
'maxcharacter',
17-
'maxlength',
18-
'readonly',
19-
];
8+
const mapper = ['autosize', 'base', 'card', 'custom', 'disabled', 'label', 'maxcharacter', 'maxlength'];
209

2110
describe('Textarea', () => {
2211
mapper.forEach((demoName) => {

src/textarea/__test__/index.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ describe('textarea', () => {
143143
cursor: undefined,
144144
});
145145

146-
$textarea.dispatchEvent('textarea', { detail: { value: 'textarea用于567' } });
146+
$textarea.dispatchEvent('input', { detail: { value: 'textarea用于567' } });
147147
await simulate.sleep(0);
148148
expect(component.instance.data.count).toBe(15);
149149
});

src/textarea/_example/allowInputOverMax/index.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/textarea/_example/allowInputOverMax/index.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/textarea/_example/allowInputOverMax/index.wxml

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/textarea/_example/allowInputOverMax/index.wxss

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/textarea/_example/readonly/index.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/textarea/_example/readonly/index.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/textarea/_example/readonly/index.wxml

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/textarea/_example/readonly/index.wxss

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/textarea/_example/textarea.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
"label": "./label",
66
"autosize": "./autosize",
77
"disabled": "./disabled",
8-
"readonly": "./readonly",
98
"maxcharacter": "./maxcharacter",
109
"maxlength": "./maxlength",
11-
"allow-input-over-max": "./allowInputOverMax",
1210
"card": "./card",
1311
"custom": "./custom"
1412
}

src/textarea/_example/textarea.wxml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,9 @@
2222
<t-demo>
2323
<maxcharacter />
2424
</t-demo>
25-
<t-demo desc="允许输入超出最大字符个数限制">
26-
<allow-input-over-max />
27-
</t-demo>
2825
<t-demo title="02 组件状态" desc="禁用状态">
2926
<disabled />
3027
</t-demo>
31-
<t-demo desc="只读状态">
32-
<readonly />
33-
</t-demo>
3428
<t-demo title="03 组件样式" desc="卡片样式">
3529
<card />
3630
</t-demo>

src/textarea/textarea.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,19 @@ export default class Textarea extends SuperComponent {
6262

6363
calculateValue(value, maxcharacter, maxlength) {
6464
const { allowInputOverMax } = this.properties;
65-
if (!allowInputOverMax && maxcharacter > 0 && !Number.isNaN(maxcharacter)) {
66-
const { length, characters } = getCharacterLength('maxcharacter', value, maxcharacter);
65+
if (maxcharacter > 0 && !Number.isNaN(maxcharacter)) {
66+
const { length, characters } = getCharacterLength(
67+
'maxcharacter',
68+
value,
69+
allowInputOverMax ? Infinity : maxcharacter,
70+
);
6771
return {
6872
value: characters,
6973
count: length,
7074
};
7175
}
72-
if (!allowInputOverMax && maxlength > 0 && !Number.isNaN(maxlength)) {
73-
const { length, characters } = getCharacterLength('maxlength', value, maxlength);
76+
if (maxlength > 0 && !Number.isNaN(maxlength)) {
77+
const { length, characters } = getCharacterLength('maxlength', value, allowInputOverMax ? Infinity : maxlength);
7478
return {
7579
value: characters,
7680
count: length,

src/textarea/textarea.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<textarea
1414
class="{{classPrefix}}__wrapper-inner {{disabled? prefix + '-is-disabled' : ''}} {{prefix}}-class-textarea"
1515
style="{{this.textareaStyle(autosize)}}"
16-
maxlength="{{!allowInputOverMax && maxlength}}"
16+
maxlength="{{allowInputOverMax ? -1 : maxlength}}"
1717
disabled="{{disabled || readonly}}"
1818
placeholder="{{placeholder}}"
1919
placeholder-class="{{classPrefix}}__placeholder"

0 commit comments

Comments
 (0)