From 5c9f8981d04e6b50c70b69bfc3c203958d745769 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sat, 26 Oct 2019 13:21:07 -0700 Subject: [PATCH] pass defaults as a param so spread can be used --- src/components/Select.vue | 5 +++-- tests/unit/Selecting.spec.js | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/Select.vue b/src/components/Select.vue index 83c2b8b..7e3c3af 100644 --- a/src/components/Select.vue +++ b/src/components/Select.vue @@ -13,7 +13,7 @@ :deselect="deselect" :multiple="multiple" :disabled="disabled"> - + {{ getOptionLabel(option) }} @@ -313,9 +313,10 @@ * @see https://vuejs.org/v2/guide/class-and-style.html * * @param option {Object|String|Number} An option that has been selected + * @param defaults {Array} Array of default classes ['vs__selected'] * @return {Array|Object|String} Any valid VueJS class binding format. */ - default: option => ['vs__selected'] + default: (option, defaults) => defaults }, /** diff --git a/tests/unit/Selecting.spec.js b/tests/unit/Selecting.spec.js index ae8bbc9..87de71b 100755 --- a/tests/unit/Selecting.spec.js +++ b/tests/unit/Selecting.spec.js @@ -221,10 +221,10 @@ describe("VS - Selecting Values", () => { it("can add a custom class using the getSelectedOptionClasses prop", () => { const Select = mountDefault({ value: 'one', - getSelectedOptionClasses: option => ['vs__selected', `vs__selected--${option}`] + getSelectedOptionClasses: (option, defaults) => [...defaults, `vs__selected--${option}`] }); - - expect(Select. contains('.vs__selected')).toBe(true); + + expect(Select.contains('.vs__selected')).toBe(true); expect(Select. contains('.vs__selected--one')).toBe(true); }); });