From d923cc8b7a8f9c9a5ee1341d01e2c48009b5cc56 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Thu, 4 Mar 2021 15:07:12 +0800 Subject: [PATCH 1/4] fix(grid): test failed due to jsdom window.matchMedia --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 62760aed5..b4ab3dec8 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "treemate": "^0.2.4", "vdirs": "^0.0.3", "vfonts": "^0.0.1", - "vooks": "^0.1.2", + "vooks": "^0.1.3", "vue": "^3.0.7", "vue-router": "^4.0.3", "vueuc": "^0.2.6" From 6e567711a1418d7975ad7cd86a1f8cc287872802 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Thu, 4 Mar 2021 15:26:14 +0800 Subject: [PATCH 2/4] 2.0.0-rc.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b4ab3dec8..67e94c03d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "naive-ui", - "version": "2.0.0-rc.4", + "version": "2.0.0-rc.5", "description": "A Vue UI Framework. Caring About Styles, Themed, Batteries Included, Not Rather Slow.", "main": "lib/index.js", "module": "es/index.js", From 3f322004855b90cb79fc777c50c5449875734865 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Thu, 4 Mar 2021 16:14:29 +0800 Subject: [PATCH 3/4] fix: type errors due to vue 3.0.7's regression https://github.com/vuejs/vue-next/issues/3357 --- src/input/src/Input.tsx | 5 ++++- src/radio/src/RadioGroup.ts | 5 ++++- src/transfer/src/Transfer.tsx | 5 ++++- src/version.ts | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/input/src/Input.tsx b/src/input/src/Input.tsx index d8e064869..2abf36c62 100644 --- a/src/input/src/Input.tsx +++ b/src/input/src/Input.tsx @@ -46,7 +46,10 @@ export default defineComponent({ type: Boolean, default: false }, - size: String as PropType, + size: { + type: String as PropType, + default: undefined + }, rows: { type: [Number, String] as PropType, default: 3 diff --git a/src/radio/src/RadioGroup.ts b/src/radio/src/RadioGroup.ts index 7963556b3..32fd28e9d 100644 --- a/src/radio/src/RadioGroup.ts +++ b/src/radio/src/RadioGroup.ts @@ -104,7 +104,10 @@ export default defineComponent({ type: [String, Number] as PropType, default: null }, - size: String as PropType<'small' | 'medium' | 'large'>, + size: { + type: String as PropType<'small' | 'medium' | 'large' | undefined>, + default: undefined + }, disabled: { type: Boolean, default: false diff --git a/src/transfer/src/Transfer.tsx b/src/transfer/src/Transfer.tsx index 0a28a6869..c998d4a1a 100644 --- a/src/transfer/src/Transfer.tsx +++ b/src/transfer/src/Transfer.tsx @@ -71,7 +71,10 @@ export default defineComponent({ .indexOf(('' + pattern).toLowerCase()) } }, - size: String as PropType<'small' | 'medium' | 'large'>, + size: { + type: String as PropType<'small' | 'medium' | 'large' | undefined>, + default: undefined + }, // eslint-disable-next-line vue/prop-name-casing 'onUpdate:value': [Function, Array] as PropType>, onUpdateValue: [Function, Array] as PropType>, diff --git a/src/version.ts b/src/version.ts index 394a54178..35384d810 100644 --- a/src/version.ts +++ b/src/version.ts @@ -1 +1 @@ -export default '2.0.0-rc.4' +export default '2.0.0-rc.5' From 437b8fad3dffaf1ef426c24f2c9c0710aac2b5e7 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Thu, 4 Mar 2021 16:16:12 +0800 Subject: [PATCH 4/4] 2.0.0-rc.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67e94c03d..b71bd0f6e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "naive-ui", - "version": "2.0.0-rc.5", + "version": "2.0.0-rc.6", "description": "A Vue UI Framework. Caring About Styles, Themed, Batteries Included, Not Rather Slow.", "main": "lib/index.js", "module": "es/index.js",