refactor: replement deprecated fields (#7519)

Author: extclp

antd-tools/generator-types/src/index.ts

@@ -21,13 +21,13 @@ async function readMarkdown(options: Options): Promise<Map<String, VueTag>> {
       return formatter(mdParser(fileContent), componentName, kebabComponentName, options.tagPrefix);
     })
     .filter(item => item) as VueTag[][];
-  const tags: Map<String, VueTag> = new Map();
+  const tags = new Map<String, VueTag>();
   flatMap(data, item => item).forEach(mergedTag => mergeTag(tags, mergedTag));
   return tags;
 }
 
 function readTypings(options: Options): Map<String, VueTag> {
-  const tags: Map<String, VueTag> = new Map();
+  const tags = new Map<String, VueTag>();
   const fileContent = readFileSync(options.typingsPath, 'utf-8');
   fileContent
     .split('\n')
@@ -61,7 +61,7 @@ function mergeTag(tags: Map<String, VueTag>, mergedTag: VueTag) {
 
 function mergeTags(mergedTagsArr: Map<String, VueTag>[]): VueTag[] {
   if (mergedTagsArr.length === 1) return [...mergedTagsArr[0].values()];
-  const tags: Map<String, VueTag> = new Map();
+  const tags = new Map<String, VueTag>();
   if (mergedTagsArr.length === 0) return [];
   mergedTagsArr.forEach(mergedTags => {
     mergedTags.forEach(mergedTag => mergeTag(tags, mergedTag));

antd-tools/generator-types/src/parser.ts

@@ -21,7 +21,7 @@ export type Articals = Artical[];
 function readLine(input: string) {
   const end = input.indexOf('\n');
 
-  return input.substr(0, end !== -1 ? end : input.length);
+  return input.substring(0, end !== -1 ? end : input.length);
 }
 
 function splitTableLine(line: string) {
@@ -47,7 +47,7 @@ function tableParse(input: string) {
   };
 
   while (start < end) {
-    const target = input.substr(start);
+    const target = input.substring(start);
     const line = readLine(target);
 
     if (!/^\|/.test(target)) {
@@ -79,7 +79,7 @@ export function mdParser(input: string): Articals {
   const end = input.length;
 
   while (start < end) {
-    const target = input.substr(start);
+    const target = input.substring(start);
 
     let match;
     if ((match = TITLE_REG.exec(target))) {
@@ -91,7 +91,7 @@ export function mdParser(input: string): Articals {
 
       start += match.index + match[0].length;
     } else if ((match = TABLE_REG.exec(target))) {
-      const { table, usedLength } = tableParse(target.substr(match.index));
+      const { table, usedLength } = tableParse(target.substring(match.index));
       artical.push({
         type: 'table',
         table,

antd-tools/getTSCommonConfig.js

@@ -1,15 +1,14 @@
 'use strict';
 
 const fs = require('fs');
-const assign = require('object-assign');
 const { getProjectPath } = require('./utils/projectHelper');
 
 module.exports = function () {
   let my = {};
   if (fs.existsSync(getProjectPath('tsconfig.json'))) {
     my = require(getProjectPath('tsconfig.json'));
   }
-  return assign(
+  return Object.assign(
     {
       noUnusedParameters: true,
       noUnusedLocals: true,

components/_util/getScroll.ts

@@ -12,7 +12,7 @@ export default function getScroll(
   const method = top ? 'scrollTop' : 'scrollLeft';
   let result = 0;
   if (isWindow(target)) {
-    result = target[top ? 'pageYOffset' : 'pageXOffset'];
+    result = target[top ? 'scrollY' : 'scrollX'];
   } else if (target instanceof Document) {
     result = target.documentElement[method];
   } else if (target instanceof HTMLElement) {

components/_util/scrollTo.ts

@@ -22,8 +22,8 @@ export default function scrollTo(y: number, options: ScrollToOptions = {}) {
     const time = timestamp - startTime;
     const nextScrollTop = easeInOutCubic(time > duration ? duration : time, scrollTop, y, duration);
     if (isWindow(container)) {
-      (container as Window).scrollTo(window.pageXOffset, nextScrollTop);
-    } else if (container instanceof Document || container.constructor.name === 'HTMLDocument') {
+      (container as Window).scrollTo(window.scrollX, nextScrollTop);
+    } else if (container instanceof Document) {
       (container as Document).documentElement.scrollTop = nextScrollTop;
     } else {
       (container as HTMLElement).scrollTop = nextScrollTop;

components/_util/triggerEvent.ts

@@ -41,7 +41,7 @@ export default defineComponent({
       });
     });
     const triggerUpdate = ref(Symbol());
-    const registeredValuesMap = ref<Map<Symbol, string>>(new Map());
+    const registeredValuesMap = ref(new Map<Symbol, string>());
     const cancelValue = (id: Symbol) => {
       registeredValuesMap.value.delete(id);
       triggerUpdate.value = Symbol();

components/checkbox/Group.tsx

@@ -112,7 +112,7 @@ export default defineComponent({
         return !override;
       }),
     );
-    const store = shallowRef<Map<string, StoreMenuInfo>>(new Map());
+    const store = shallowRef(new Map<string, StoreMenuInfo>());
     const siderCollapsed = inject(SiderCollapsedKey, ref(undefined));
     const inlineCollapsed = computed(() => {
       if (siderCollapsed.value !== undefined) {

components/menu/src/Menu.tsx

@@ -116,7 +116,7 @@ function convertItemsToNodes(
 export default function useItems(props: MenuProps) {
   const itemsNodes = shallowRef([]);
   const hasItmes = shallowRef(false);
-  const store = shallowRef<Map<string, StoreMenuInfo>>(new Map());
+  const store = shallowRef(new Map<string, StoreMenuInfo>());
   watch(
     () => props.items,
     () => {

components/menu/src/hooks/useItems.tsx

@@ -1,5 +1,5 @@
 function getScroll(w: Window) {
-  let ret = w.pageXOffset;
+  let ret = w.scrollX;
   const method = 'scrollLeft';
   if (typeof ret !== 'number') {
     const d = w.document;