Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc978d04

Browse files
committed
Merge branch 'main' into directives-unmount-fix
2 parents1133bd4 +a5c0ad5 commitc978d04

File tree

58 files changed

+3086
-1658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3086
-1658
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
Several quick start options are available:
4545

46-
-[Download the latest release](https://github.com/coreui/coreui-vue/archive/v4.2.0.zip)
46+
-[Download the latest release](https://github.com/coreui/coreui-vue/archive/v4.3.0.zip)
4747
- Clone the repo:`git clone https://github.com/coreui/coreui-vue.git`
4848
- Install with[npm](https://www.npmjs.com/):`npm install @coreui/vue`
4949
- Install with[yarn](https://yarnpkg.com/):`yarn add @coreui/vue`

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"packages/*"
55
],
66
"useWorkspaces":true,
7-
"version":"4.2.0"
7+
"version":"4.3.0"
88
}

‎package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121
},
2222
"devDependencies": {
2323
"@types/jest":"^27.4.1",
24-
"@typescript-eslint/eslint-plugin":"^5.15.0",
25-
"@typescript-eslint/parser":"^5.15.0",
26-
"@vue/compiler-sfc":"^3.2.31",
24+
"@typescript-eslint/eslint-plugin":"^5.19.0",
25+
"@typescript-eslint/parser":"^5.19.0",
26+
"@vue/compiler-sfc":"^3.2.33",
2727
"@vue/eslint-config-prettier":"^7.0.0",
2828
"@vue/eslint-config-typescript":"^10.0.0",
29-
"eslint":"8.11.0",
29+
"eslint":"8.13.0",
3030
"eslint-plugin-prettier":"^4.0.0",
31-
"eslint-plugin-vue":"^8.5.0",
31+
"eslint-plugin-vue":"^8.6.0",
3232
"jest":"^27.5.1",
3333
"jest-canvas-mock":"^2.3.1",
3434
"lerna":"^4.0.0",
35-
"prettier":"^2.6.0",
36-
"ts-jest":"^27.1.3",
35+
"prettier":"^2.6.2",
36+
"ts-jest":"^27.1.4",
3737
"vue-jest":"^5.0.0-0"
3838
}
3939
}

‎packages/coreui-vue-chartjs/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@
3636
},
3737
"devDependencies": {
3838
"@coreui/chartjs":"^3.0.0",
39-
"@rollup/plugin-commonjs":"^21.0.2",
40-
"@rollup/plugin-node-resolve":"^13.1.3",
41-
"@rollup/plugin-typescript":"^8.3.1",
42-
"@types/lodash":"^4.14.180",
43-
"@vue/test-utils":"^2.0.0-rc.17",
39+
"@rollup/plugin-commonjs":"^21.1.0",
40+
"@rollup/plugin-node-resolve":"^13.2.1",
41+
"@rollup/plugin-typescript":"^8.3.2",
42+
"@types/lodash":"^4.14.181",
43+
"@vue/test-utils":"^2.0.0-rc.20",
4444
"chart.js":"^3.7.1",
4545
"lodash":"^4.17.21",
46-
"rollup":"^2.70.1",
46+
"rollup":"^2.70.2",
4747
"rollup-plugin-peer-deps-external":"^2.2.4",
4848
"rollup-plugin-vue":"^6.0.0",
49-
"typescript":"^4.6.2",
50-
"vue":"^3.2.31",
49+
"typescript":"^4.6.3",
50+
"vue":"^3.2.33",
5151
"vue-types":"^4.1.1"
5252
},
5353
"peerDependencies": {

‎packages/coreui-vue-chartjs/src/CChart.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const CChart = defineComponent({
8383
/**
8484
* Chart.js chart type.
8585
*
86-
*@type{'line' | 'bar' | 'radar' | 'doughnut' | 'polarArea' | 'bubble' | 'pie' | 'scatter'}
86+
*@type 'line' | 'bar' | 'radar' | 'doughnut' | 'polarArea' | 'bubble' | 'pie' | 'scatter'
8787
*/
8888
type:{
8989
type:StringasPropType<ChartType>,

‎packages/coreui-vue/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
Several quick start options are available:
4545

46-
-[Download the latest release](https://github.com/coreui/coreui-vue/archive/v4.2.0.zip)
46+
-[Download the latest release](https://github.com/coreui/coreui-vue/archive/v4.3.0.zip)
4747
- Clone the repo:`git clone https://github.com/coreui/coreui-vue.git`
4848
- Install with[npm](https://www.npmjs.com/):`npm install @coreui/vue`
4949
- Install with[yarn](https://yarnpkg.com/):`yarn add @coreui/vue`

‎packages/coreui-vue/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"@coreui/vue",
3-
"version":"4.2.0",
3+
"version":"4.3.0",
44
"description":"UI Components Library for Vue.js",
55
"keywords": [
66
"vue",
@@ -34,22 +34,22 @@
3434
"build":"rollup -c"
3535
},
3636
"config": {
37-
"version_short":"4.1"
37+
"version_short":"4.3"
3838
},
3939
"devDependencies": {
40-
"@popperjs/core":"^2.11.4",
41-
"@rollup/plugin-commonjs":"^21.0.2",
42-
"@rollup/plugin-node-resolve":"^13.1.3",
43-
"@rollup/plugin-typescript":"^8.3.1",
44-
"@vue/test-utils":"^2.0.0-rc.17",
45-
"rollup":"^2.70.1",
40+
"@popperjs/core":"^2.11.5",
41+
"@rollup/plugin-commonjs":"^21.1.0",
42+
"@rollup/plugin-node-resolve":"^13.2.1",
43+
"@rollup/plugin-typescript":"^8.3.2",
44+
"@vue/test-utils":"^2.0.0-rc.20",
45+
"rollup":"^2.70.2",
4646
"rollup-plugin-vue":"^6.0.0",
47-
"typescript":"^4.6.2",
48-
"vue":"^3.2.31",
47+
"typescript":"^4.6.3",
48+
"vue":"^3.2.33",
4949
"vue-types":"^4.1.1"
5050
},
5151
"peerDependencies": {
52-
"@coreui/coreui":"^4.1.0",
52+
"@coreui/coreui":"^4.1.3",
5353
"vue":"^3.2.21"
5454
},
5555
"standard": {

‎packages/coreui-vue/src/components/backdrop/CBackdrop.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import{defineComponent,h,RendererElement,Transition}from'vue'
22

3+
import{executeAfterTransition}from'./../../utils/transition'
4+
35
constCBackdrop=defineComponent({
46
name:'CBackdrop',
57
props:{
@@ -16,24 +18,24 @@ const CBackdrop = defineComponent({
1618
consthandleBeforeEnter=(el:RendererElement)=>{
1719
el.classList.remove('d-none')
1820
}
21+
1922
consthandleEnter=(el:RendererElement,done:()=>void)=>{
20-
el.addEventListener('transitionend',()=>{
21-
done()
22-
})
23+
executeAfterTransition(()=>done(),elasHTMLElement)
2324
setTimeout(()=>{
2425
el.style.visibility='visible'
2526
el.classList.add('show')
2627
},1)
2728
}
29+
2830
consthandleLeave=(el:RendererElement,done:()=>void)=>{
29-
el.addEventListener('transitionend',()=>{
30-
done()
31-
})
31+
executeAfterTransition(()=>done(),elasHTMLElement)
3232
el.classList.remove('show')
3333
}
34+
3435
consthandleAfterLeave=(el:RendererElement)=>{
3536
el.classList.add('d-none')
3637
}
38+
3739
return()=>
3840
h(
3941
Transition,

‎packages/coreui-vue/src/components/button/CButton.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ export const CButton = defineComponent({
9595
'click',
9696
],
9797
setup(props,{ emit, slots}){
98-
consthandleClick=()=>{
98+
consthandleClick=(event:Event)=>{
9999
if(props.disabled){
100100
return
101101
}
102102

103-
emit('click')
103+
emit('click',event)
104104
}
105105
return()=>
106106
h(

‎packages/coreui-vue/src/components/collapse/CCollapse.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import{defineComponent,h,Transition,ref,RendererElement,withDirectives}from'vue'
2+
23
import{vVisible}from'../../directives/v-c-visible'
4+
import{executeAfterTransition}from'./../../utils/transition'
35

46
constCCollapse=defineComponent({
57
name:'CCollapse',
@@ -39,10 +41,9 @@ const CCollapse = defineComponent({
3941

4042
consthandleEnter=(el:RendererElement,done:()=>void)=>{
4143
emit('show')
42-
el.addEventListener('transitionend',()=>{
43-
done()
44-
})
44+
// collapsing.value = true
4545
setTimeout(()=>{
46+
executeAfterTransition(()=>done(),elasHTMLElement)
4647
if(props.horizontal){
4748
el.style.width=`${el.scrollWidth}px`
4849
return
@@ -69,10 +70,8 @@ const CCollapse = defineComponent({
6970

7071
consthandleLeave=(el:RendererElement,done:()=>void)=>{
7172
emit('hide')
72-
el.addEventListener('transitionend',()=>{
73-
done()
74-
})
7573
setTimeout(()=>{
74+
executeAfterTransition(()=>done(),elasHTMLElement)
7675
if(props.horizontal){
7776
el.style.width='0px'
7877
return

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp