Skip to content

Commit 8e8440d

Browse files
committed
chore: replace coreui with coreui-utils library, update files
1 parent 0b8375a commit 8e8440d

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

package-lock.json

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"clear_jest": "jest --clearCache"
6565
},
6666
"dependencies": {
67-
"@coreui/coreui": "3.0.0-beta.3",
67+
"@coreui/coreui-utils": "coreui/coreui-utils#ba52b40",
6868
"@coreui/icons": "coreui/coreui-icons#1.0.0-beta.1",
6969
"@coreui/icons-vue": "^1.0.2",
7070
"lodash.clonedeep": "^4.5.0",

src/components/dropdown/CDropdown.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import CLink from '../link/CLink'
3636
import Popper from 'popper.js'
3737
import { mixin as clickaway } from 'vue-clickaway2'
38-
import { deepObjectsMerge } from '@coreui/coreui/dist/js/coreui-utilities'
38+
import { deepObjectsMerge } from '@coreui/coreui-utils/src/index.js'
3939
4040
export default {
4141
name: 'CDropdown',
@@ -60,7 +60,10 @@ export default {
6060
validator: val => ['', 'sm', 'lg'].includes(val)
6161
},
6262
split: Boolean,
63-
offset: Number,
63+
offset: {
64+
type: Number,
65+
default: 0
66+
},
6467
placement: {
6568
type: String,
6669
validator: position => {
@@ -146,7 +149,7 @@ export default {
146149
return {
147150
placement: this.placement,
148151
modifiers: {
149-
offset: { offset: this.offset || 0 },
152+
offset: { offset: this.offset },
150153
flip: { enabled: this.flip }
151154
}
152155
}

src/components/dropdown/tests/CDropdown.spec.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,11 @@ describe(ComponentName, () => {
119119
toggle()
120120
expect(customWrapper.vm.visible).toBe(false)
121121
})
122+
it('generates popper config properly', () => {
123+
const modifiers = () => customWrapper.vm.computedPopperConfig.modifiers
124+
expect(modifiers().offset.offset).toBe(20)
125+
customWrapper.setProps({ popperConfig: {modifiers:{offset:{ offset:22 }}}})
126+
expect(modifiers().offset.offset).toBe(22)
127+
expect(modifiers().flip.enabled).toBe(false)
128+
})
122129
})

0 commit comments

Comments
 (0)