chore: type support vue@3.2.35

tangjinzhou · tangjinzhou · commit 13e1db0bc444 · 2022-05-21T10:56:28.000+08:00
diff --git a/components/alert/index.tsx b/components/alert/index.tsx
@@ -168,7 +168,7 @@ const Alert = defineComponent({
           <div
             role="alert"
             {...attrs}
-            style={[attrs.style, motionStyle.value]}
+            style={[attrs.style as CSSProperties, motionStyle.value]}
             v-show={!closing.value}
             class={[attrs.class, alertCls]}
             data-show={!closing.value}
diff --git a/components/avatar/Avatar.tsx b/components/avatar/Avatar.tsx
@@ -203,7 +203,7 @@ const Avatar = defineComponent({
           {...attrs}
           ref={avatarNodeRef}
           class={classString}
-          style={[sizeStyle, responsiveSizeStyle(!!icon), attrs.style]}
+          style={[sizeStyle, responsiveSizeStyle(!!icon), attrs.style as CSSProperties]}
         >
           {childrenToRender}
         </span>
diff --git a/components/avatar/Group.tsx b/components/avatar/Group.tsx
@@ -71,14 +71,14 @@ const Group = defineComponent({
           </Popover>,
         );
         return (
-          <div {...attrs} class={cls} style={attrs.style}>
+          <div {...attrs} class={cls} style={attrs.style as CSSProperties}>
             {childrenShow}
           </div>
         );
       }
 
       return (
-        <div {...attrs} class={cls} style={attrs.style}>
+        <div {...attrs} class={cls} style={attrs.style as CSSProperties}>
           {childrenWithProps}
         </div>
       );
diff --git a/components/breadcrumb/BreadcrumbItem.tsx b/components/breadcrumb/BreadcrumbItem.tsx
@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue';
+import type { CSSProperties, ExtractPropTypes, PropType } from 'vue';
 import { defineComponent } from 'vue';
 import PropTypes from '../_util/vue-types';
 import { getPropsSlot } from '../_util/props-util';
@@ -66,7 +66,7 @@ export default defineComponent({
       link = renderBreadcrumbNode(link, prefixCls.value);
       if (children) {
         return (
-          <span class={cls} style={style}>
+          <span class={cls} style={style as CSSProperties}>
             {link}
             {separator && <span class={`${prefixCls.value}-separator`}>{separator}</span>}
           </span>
diff --git a/components/carousel/index.tsx b/components/carousel/index.tsx
@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType } from 'vue';
+import type { CSSProperties, ExtractPropTypes, PropType } from 'vue';
 import { ref, computed, watchEffect, defineComponent } from 'vue';
 import PropTypes from '../_util/vue-types';
 import warning from '../_util/warning';
@@ -127,7 +127,7 @@ const Carousel = defineComponent({
         [`${cls}`]: !!cls,
       });
       return (
-        <div class={className} style={style}>
+        <div class={className} style={style as CSSProperties}>
           <SlickCarousel
             ref={slickRef}
             {...props}
diff --git a/components/checkbox/Checkbox.tsx b/components/checkbox/Checkbox.tsx
@@ -1,3 +1,4 @@
+import type { CSSProperties } from 'vue';
 import { watchEffect, onMounted, defineComponent, inject, onBeforeUnmount, ref } from 'vue';
 import classNames from '../_util/classNames';
 import VcCheckbox from '../vc-checkbox/Checkbox';
@@ -93,7 +94,7 @@ export default defineComponent({
       return (
         <label
           class={classString}
-          style={style}
+          style={style as CSSProperties}
           onMouseenter={onMouseenter as EventHandler}
           onMouseleave={onMouseleave as EventHandler}
         >
diff --git a/components/collapse/Collapse.tsx b/components/collapse/Collapse.tsx
@@ -8,7 +8,7 @@ import { cloneElement } from '../_util/vnode';
 import type { CollapsibleType } from './commonProps';
 import { collapseProps } from './commonProps';
 import { getDataAndAriaProps } from '../_util/util';
-import type { ExtractPropTypes } from 'vue';
+import type { CSSProperties, ExtractPropTypes } from 'vue';
 import { computed, defineComponent, ref, watch } from 'vue';
 import RightOutlined from '@ant-design/icons-vue/RightOutlined';
 import firstNotUndefined from '../_util/firstNotUndefined';
@@ -173,7 +173,7 @@ export default defineComponent({
         <div
           class={collapseClassName}
           {...getDataAndAriaProps(attrs)}
-          style={attrs.style}
+          style={attrs.style as CSSProperties}
           role={accordion ? 'tablist' : null}
         >
           {getItems()}
diff --git a/components/dropdown/dropdown-button.tsx b/components/dropdown/dropdown-button.tsx
@@ -1,4 +1,4 @@
-import type { ExtractPropTypes } from 'vue';
+import type { ExtractPropTypes, HTMLAttributes } from 'vue';
 import { defineComponent } from 'vue';
 import Button from '../button';
 import classNames from '../_util/classNames';
@@ -54,7 +54,7 @@ export default defineComponent({
         onClick,
         'onUpdate:visible': _updateVisible,
         ...restProps
-      } = { ...props, ...attrs };
+      } = { ...props, ...attrs } as DropdownButtonProps & HTMLAttributes;
 
       const dropdownProps = {
         align,
diff --git a/components/input-number/index.tsx b/components/input-number/index.tsx
@@ -94,7 +94,7 @@ const InputNumber = defineComponent({
         prefix = slots.prefix?.(),
         valueModifiers = {},
         ...others
-      } = { ...(attrs as HTMLAttributes), ...props };
+      } = { ...attrs, ...props } as InputNumberProps & HTMLAttributes;
 
       const preCls = prefixCls.value;
 
diff --git a/components/input/ClearableLabeledInput.tsx b/components/input/ClearableLabeledInput.tsx
@@ -2,7 +2,7 @@ import classNames from '../_util/classNames';
 import CloseCircleFilled from '@ant-design/icons-vue/CloseCircleFilled';
 import PropTypes from '../_util/vue-types';
 import { cloneElement } from '../_util/vnode';
-import type { PropType, VNode } from 'vue';
+import type { CSSProperties, PropType, VNode } from 'vue';
 import { ref, defineComponent } from 'vue';
 import { tuple } from '../_util/type';
 import type { Direction, SizeType } from '../config-provider';
@@ -121,7 +121,7 @@ export default defineComponent({
         <span
           ref={containerRef}
           class={affixWrapperCls}
-          style={attrs.style}
+          style={attrs.style as CSSProperties}
           onMouseup={onInputMouseUp}
           hidden={hidden}
         >
@@ -173,7 +173,7 @@ export default defineComponent({
       // Need another wrapper for changing display:table to display:inline-block
       // and put style prop in wrapper
       return (
-        <span class={mergedGroupClassName} style={attrs.style} hidden={hidden}>
+        <span class={mergedGroupClassName} style={attrs.style as CSSProperties} hidden={hidden}>
           <span class={mergedWrapperClassName}>
             {addonBeforeNode}
             {cloneElement(labeledElement, { style: null })}
@@ -209,7 +209,7 @@ export default defineComponent({
         },
       );
       return (
-        <span class={affixWrapperCls} style={attrs.style} hidden={hidden}>
+        <span class={affixWrapperCls} style={attrs.style as CSSProperties} hidden={hidden}>
           {cloneElement(element, {
             style: null,
             value,
diff --git a/components/input/ResizableTextArea.tsx b/components/input/ResizableTextArea.tsx
@@ -125,6 +125,9 @@ const ResizableTextArea = defineComponent({
       if (!textareaProps.autofocus) {
         delete textareaProps.autofocus;
       }
+      if (textareaProps.rows === 0) {
+        delete textareaProps.rows;
+      }
       return (
         <ResizeObserver onResize={handleResize} disabled={!(autoSize || autosize)}>
           {withDirectives((<textarea {...textareaProps} ref={textAreaRef} />) as VNode, [
diff --git a/components/input/TextArea.tsx b/components/input/TextArea.tsx
@@ -1,3 +1,4 @@
+import type { CSSProperties } from 'vue';
 import {
   computed,
   defineComponent,
@@ -281,7 +282,7 @@ export default defineComponent({
               `${prefixCls.value}-textarea-show-count`,
               customClass,
             )}
-            style={style}
+            style={style as CSSProperties}
             data-count={typeof dataCount !== 'object' ? dataCount : undefined}
           >
             {textareaNode}
diff --git a/components/layout/Sider.tsx b/components/layout/Sider.tsx
@@ -194,7 +194,7 @@ export default defineComponent({
             )
           : null;
       const divStyle = [
-        attrs.style,
+        attrs.style as CSSProperties,
         {
           flex: `0 0 ${siderWidth}`,
           maxWidth: siderWidth, // Fix width transition bug in IE11
diff --git a/components/menu/src/Menu.tsx b/components/menu/src/Menu.tsx
@@ -323,7 +323,7 @@ export default defineComponent({
       const storeValue = store.value;
       eventKeys.forEach(eventKey => {
         const { key, childrenEventKeys } = storeValue[eventKey];
-        keys.push(key, ...getChildrenKeys(childrenEventKeys));
+        keys.push(key, ...getChildrenKeys(unref(childrenEventKeys)));
       });
       return keys;
     };
@@ -345,7 +345,7 @@ export default defineComponent({
         newOpenKeys.push(key);
       } else if (mergedMode.value !== 'inline') {
         // We need find all related popup to close
-        const subPathKeys = getChildrenKeys(childrenEventKeys);
+        const subPathKeys = getChildrenKeys(unref(childrenEventKeys));
         newOpenKeys = uniq(newOpenKeys.filter(k => !subPathKeys.includes(k)));
       }
 
diff --git a/components/menu/src/hooks/useMenuContext.ts b/components/menu/src/hooks/useMenuContext.ts
@@ -1,5 +1,5 @@
 import type { Key } from '../../../_util/type';
-import type { ComputedRef, InjectionKey, PropType, Ref, UnwrapRef } from 'vue';
+import type { ComputedRef, InjectionKey, PropType, Ref } from 'vue';
 import { defineComponent, inject, provide, toRef } from 'vue';
 import type {
   BuiltinPlacements,
@@ -21,7 +21,7 @@ export interface StoreMenuInfo {
 export interface MenuContextProps {
   isRootMenu: Ref<boolean>;
 
-  store: Ref<Record<string, UnwrapRef<StoreMenuInfo>>>;
+  store: Ref<Record<string, StoreMenuInfo>>;
   registerMenuInfo: (key: string, info: StoreMenuInfo) => void;
   unRegisterMenuInfo: (key: string) => void;
   prefixCls: ComputedRef<string>;
diff --git a/components/rate/index.tsx b/components/rate/index.tsx
@@ -1,4 +1,4 @@
-import type { ExtractPropTypes, PropType, VNode } from 'vue';
+import type { CSSProperties, ExtractPropTypes, PropType, VNode } from 'vue';
 import { watch, defineComponent, ref, reactive, onMounted } from 'vue';
 import { initDefaultProps, getPropsSlot, findDOMNode } from '../_util/props-util';
 import { withInstall } from '../_util/type';
@@ -230,7 +230,7 @@ const Rate = defineComponent({
           {...attrs}
           id={id}
           class={rateClassName}
-          style={style}
+          style={style as CSSProperties}
           onMouseleave={disabled ? null : onMouseLeave}
           tabindex={disabled ? -1 : tabindex}
           onFocus={disabled ? null : onFocus}
diff --git a/components/table/Table.tsx b/components/table/Table.tsx
@@ -34,7 +34,7 @@ import scrollTo from '../_util/scrollTo';
 import defaultLocale from '../locale/en_US';
 import type { SizeType } from '../config-provider';
 import devWarning from '../vc-util/devWarning';
-import type { PropType } from 'vue';
+import type { CSSProperties, PropType } from 'vue';
 import { nextTick, reactive, ref, computed, defineComponent, toRef, watchEffect, watch } from 'vue';
 import type { DefaultRecordType } from '../vc-table/interface';
 import useBreakpoint from '../_util/hooks/useBreakpoint';
@@ -636,7 +636,7 @@ const InteralTable = defineComponent<
       );
       const tableProps = omit(props, ['columns']);
       return (
-        <div class={wrapperClassNames} style={attrs.style}>
+        <div class={wrapperClassNames} style={attrs.style as CSSProperties}>
           <Spin spinning={false} {...spinProps}>
             {topPaginationNode}
             <RcTable
diff --git a/components/tabs/src/TabNavList/AddButton.tsx b/components/tabs/src/TabNavList/AddButton.tsx
@@ -1,4 +1,4 @@
-import type { PropType } from 'vue';
+import type { CSSProperties, PropType } from 'vue';
 import { defineComponent, ref } from 'vue';
 import type { EditableConfig, TabsLocale } from '../interface';
 
@@ -32,7 +32,7 @@ export default defineComponent({
           ref={domRef}
           type="button"
           class={`${prefixCls}-nav-add`}
-          style={attrs.style}
+          style={attrs.style as CSSProperties}
           aria-label={locale?.addAriaLabel || 'Add tab'}
           onClick={event => {
             editable.onEdit('add', {
diff --git a/components/tabs/src/TabNavList/OperationNode.tsx b/components/tabs/src/TabNavList/OperationNode.tsx
@@ -224,7 +224,10 @@ export default defineComponent({
       );
 
       return (
-        <div class={classNames(`${prefixCls}-nav-operations`, attrs.class)} style={attrs.style}>
+        <div
+          class={classNames(`${prefixCls}-nav-operations`, attrs.class)}
+          style={attrs.style as CSSProperties}
+        >
           {moreNode}
           <AddButton prefixCls={prefixCls} locale={locale} editable={editable} />
         </div>
diff --git a/components/tabs/src/TabNavList/TabNode.tsx b/components/tabs/src/TabNavList/TabNode.tsx
@@ -1,5 +1,5 @@
 import type { Tab, EditableConfig } from '../interface';
-import type { PropType } from 'vue';
+import type { CSSProperties, PropType } from 'vue';
 import { defineComponent, computed, ref } from 'vue';
 import type { FocusEventHandler } from '../../../_util/EventInterface';
 import KeyCode from '../../../_util/KeyCode';
@@ -88,7 +88,7 @@ export default defineComponent({
             [`${tabPrefix}-active`]: active,
             [`${tabPrefix}-disabled`]: disabled,
           })}
-          style={attrs.style}
+          style={attrs.style as CSSProperties}
           onClick={onInternalClick}
         >
           {/* Primary Tab Button */}
diff --git a/components/tabs/src/TabNavList/index.tsx b/components/tabs/src/TabNavList/index.tsx
@@ -464,7 +464,7 @@ export default defineComponent({
         <div
           role="tablist"
           class={classNames(`${pre}-nav`, className)}
-          style={style}
+          style={style as CSSProperties}
           onKeydown={() => {
             // No need animation when use keyboard
             doLockAnimation();
diff --git a/components/tabs/src/TabPanelList/TabPane.tsx b/components/tabs/src/TabPanelList/TabPane.tsx
@@ -63,7 +63,7 @@ export default defineComponent({
           tabindex={active ? 0 : -1}
           aria-labelledby={id && `${id}-tab-${tabKey}`}
           aria-hidden={!active}
-          style={[mergedStyle.value, attrs.style]}
+          style={[mergedStyle.value, attrs.style as CSSProperties]}
           class={[`${prefixCls}-tabpane`, active && `${prefixCls}-tabpane-active`, attrs.class]}
         >
           {(active || visited.value || forceRender) && slots.default?.()}
diff --git a/components/transfer/index.tsx b/components/transfer/index.tsx
@@ -344,7 +344,7 @@ const Transfer = defineComponent({
       const rightTitle =
         (titles && titles[1]) ?? slots.rightTitle?.() ?? (locale.titles || ['', ''])[1];
       return (
-        <div class={cls} style={style} id={id}>
+        <div class={cls} style={style as CSSProperties} id={id}>
           <List
             key="leftList"
             prefixCls={`${prefixCls.value}-list`}
diff --git a/components/transfer/list.tsx b/components/transfer/list.tsx
@@ -7,7 +7,7 @@ import Menu from '../menu';
 import Dropdown from '../dropdown';
 import Search from './search';
 import ListBody from './ListBody';
-import type { VNode, VNodeTypes, ExtractPropTypes, PropType } from 'vue';
+import type { VNode, VNodeTypes, ExtractPropTypes, PropType, CSSProperties } from 'vue';
 import { watchEffect, computed, defineComponent, ref } from 'vue';
 import type { RadioChangeEvent } from '../radio/interface';
 import type { TransferDirection, TransferItem } from './index';
@@ -388,7 +388,7 @@ export default defineComponent({
       );
 
       return (
-        <div class={listCls} style={attrs.style}>
+        <div class={listCls} style={attrs.style as CSSProperties}>
           <div class={`${prefixCls}-header`}>
             {showSelectAll ? (
               <>
diff --git a/components/upload/Upload.tsx b/components/upload/Upload.tsx
@@ -383,7 +383,7 @@ export default defineComponent({
               onDrop={onFileDrop}
               onDragover={onFileDrop}
               onDragleave={onFileDrop}
-              style={attrs.style}
+              style={attrs.style as CSSProperties}
             >
               <VcUpload
                 {...rcUploadProps}
diff --git a/components/upload/UploadList/ListItem.tsx b/components/upload/UploadList/ListItem.tsx
@@ -266,7 +266,7 @@ export default defineComponent({
         );
 
       return (
-        <div class={listContainerNameClass} style={style} ref={ref}>
+        <div class={listContainerNameClass} style={style as CSSProperties} ref={ref}>
           {itemRender
             ? itemRender({
                 originNode: item,
diff --git a/components/vc-dialog/Content.tsx b/components/vc-dialog/Content.tsx
@@ -137,7 +137,7 @@ export default defineComponent({
               v-show={visible}
               key="dialog-element"
               role="document"
-              style={[contentStyleRef.value, attrs.style]}
+              style={[contentStyleRef.value, attrs.style as CSSProperties]}
               class={[prefixCls, attrs.class]}
               onMousedown={onMousedown}
               onMouseup={onMouseup}
diff --git a/components/vc-mentions/src/Mentions.tsx b/components/vc-mentions/src/Mentions.tsx
@@ -1,4 +1,4 @@
-import type { ExtractPropTypes } from 'vue';
+import type { CSSProperties, ExtractPropTypes } from 'vue';
 import {
   toRef,
   watchEffect,
@@ -278,7 +278,7 @@ export default defineComponent({
         onPressenter: onPressEnter,
       };
       return (
-        <div class={classNames(prefixCls, className)} style={style}>
+        <div class={classNames(prefixCls, className)} style={style as CSSProperties}>
           {withDirectives(<textarea ref={textarea} {...textareaProps} />, [[antInputDirective]])}
           {measuring && (
             <div ref={measure} class={`${prefixCls}-measure`}>
diff --git a/components/vc-notification/Notice.tsx b/components/vc-notification/Notice.tsx
diff --git a/components/vc-notification/Notification.tsx b/components/vc-notification/Notification.tsx
diff --git a/components/vc-pagination/Pager.tsx b/components/vc-pagination/Pager.tsx
diff --git a/components/vc-picker/Picker.tsx b/components/vc-picker/Picker.tsx
diff --git a/components/vc-picker/PickerPanel.tsx b/components/vc-picker/PickerPanel.tsx
diff --git a/components/vc-slider/src/Handle.tsx b/components/vc-slider/src/Handle.tsx
diff --git a/components/vc-table/Table.tsx b/components/vc-table/Table.tsx
diff --git a/components/vc-tree/TreeNode.tsx b/components/vc-tree/TreeNode.tsx
diff --git a/components/vc-trigger/Popup/PopupInner.tsx b/components/vc-trigger/Popup/PopupInner.tsx
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ const Avatar = defineComponent({`
`203`	`203`	`{...attrs}`
`204`	`204`	`ref={avatarNodeRef}`
`205`	`205`	`class={classString}`
`206`		`- style={[sizeStyle, responsiveSizeStyle(!!icon), attrs.style]}`
	`206`	`+ style={[sizeStyle, responsiveSizeStyle(!!icon), attrs.style as CSSProperties]}`
`207`	`207`	`>`
`208`	`208`	`{childrenToRender}`
`209`	`209`	`</span>`