Skip to content

Commit 4318147

Browse files
authored
refactor(input): remove unnecessary assertions and use?? instead of the ternary operator (#7571)
* refactor: remove unnecessary assertions and use?? instead of the ternary operator * refactor: use?? instead of the ternary operator
1 parent 312bcc5 commit 4318147

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

components/input-number/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const InputNumber = defineComponent({
7272

7373
const mergedSize = computed(() => compactSize.value || size.value);
7474

75-
const mergedValue = shallowRef(props.value === undefined ? props.defaultValue : props.value);
75+
const mergedValue = shallowRef(props.value ?? props.defaultValue);
7676
const focused = shallowRef(false);
7777
watch(
7878
() => props.value,

components/input/Password.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export default defineComponent({
5959
});
6060
const getIcon = (prefixCls: string) => {
6161
const { action, iconRender = slots.iconRender || defaultIconRender } = props;
62-
const iconTrigger = ActionMap[action!] || '';
62+
const iconTrigger = ActionMap[action] || '';
6363
const icon = iconRender(visible.value);
6464
const iconProps = {
6565
[iconTrigger]: onVisibleChange,

components/input/TextArea.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ function setTriggerValue(
3838
let newTriggerValue = triggerValue;
3939
if (isCursorInEnd) {
4040
// 光标在尾部,直接截断
41-
newTriggerValue = fixEmojiLength(triggerValue, maxLength!);
41+
newTriggerValue = fixEmojiLength(triggerValue, maxLength);
4242
} else if (
4343
[...(preValue || '')].length < triggerValue.length &&
44-
[...(triggerValue || '')].length > maxLength!
44+
[...(triggerValue || '')].length > maxLength
4545
) {
4646
// 光标在中间,如果最后的值超过最大值,则采用原先的值
4747
newTriggerValue = preValue;
@@ -58,7 +58,7 @@ export default defineComponent({
5858
const formItemContext = useInjectFormItemContext();
5959
const formItemInputContext = FormItemInputContext.useInject();
6060
const mergedStatus = computed(() => getMergedStatus(formItemInputContext.status, props.status));
61-
const stateValue = shallowRef(props.value === undefined ? props.defaultValue : props.value);
61+
const stateValue = shallowRef(props.value ?? props.defaultValue);
6262
const resizableTextArea = shallowRef();
6363
const mergedValue = shallowRef('');
6464
const { prefixCls, size, direction } = useConfigInject('input', props);
@@ -79,7 +79,7 @@ export default defineComponent({
7979
const onInternalCompositionStart = (e: CompositionEvent) => {
8080
compositing.value = true;
8181
// 拼音输入前保存一份旧值
82-
oldCompositionValueRef.value = mergedValue.value as string;
82+
oldCompositionValueRef.value = mergedValue.value;
8383
// 保存旧的光标位置
8484
oldSelectionStartRef.value = (e.currentTarget as any).selectionStart;
8585
emit('compositionstart', e);
@@ -94,7 +94,7 @@ export default defineComponent({
9494
oldSelectionStartRef.value === oldCompositionValueRef.value?.length;
9595
triggerValue = setTriggerValue(
9696
isCursorInEnd,
97-
oldCompositionValueRef.value as string,
97+
oldCompositionValueRef.value,
9898
triggerValue,
9999
props.maxlength,
100100
);
@@ -177,14 +177,14 @@ export default defineComponent({
177177
// 1. 复制粘贴超过maxlength的情况 2.未超过maxlength的情况
178178
const target = e.target as any;
179179
const isCursorInEnd =
180-
target.selectionStart >= props.maxlength! + 1 ||
180+
target.selectionStart >= props.maxlength + 1 ||
181181
target.selectionStart === triggerValue.length ||
182182
!target.selectionStart;
183183
triggerValue = setTriggerValue(
184184
isCursorInEnd,
185-
mergedValue.value as string,
185+
mergedValue.value,
186186
triggerValue,
187-
props.maxlength!,
187+
props.maxlength,
188188
);
189189
}
190190
resolveOnChange(e.currentTarget as any, e, triggerChange, triggerValue);
@@ -237,7 +237,7 @@ export default defineComponent({
237237
});
238238

239239
watchEffect(() => {
240-
let val = fixControlledValue(stateValue.value) as string;
240+
let val = fixControlledValue(stateValue.value);
241241
if (
242242
!compositing.value &&
243243
hasMaxLength.value &&

components/input/calculateNodeHeight.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ const computedStyleCache: Record<string, NodeType> = {};
4848
let hiddenTextarea: HTMLTextAreaElement;
4949

5050
export function calculateNodeStyling(node: HTMLElement, useCache = false) {
51-
const nodeRef = (node.getAttribute('id') ||
52-
node.getAttribute('data-reactid') ||
53-
node.getAttribute('name')) as string;
51+
const nodeRef =
52+
node.getAttribute('id') || node.getAttribute('data-reactid') || node.getAttribute('name');
5453

5554
if (useCache && computedStyleCache[nodeRef]) {
5655
return computedStyleCache[nodeRef];
@@ -103,7 +102,7 @@ export default function calculateAutoSizeStyle(
103102
// Fix wrap="off" issue
104103
// https://github.com/ant-design/ant-design/issues/6577
105104
if (uiTextNode.getAttribute('wrap')) {
106-
hiddenTextarea.setAttribute('wrap', uiTextNode.getAttribute('wrap') as string);
105+
hiddenTextarea.setAttribute('wrap', uiTextNode.getAttribute('wrap'));
107106
} else {
108107
hiddenTextarea.removeAttribute('wrap');
109108
}

0 commit comments

Comments
 (0)