classcard-ui 0.2.492 → 0.2.495

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "classcard-ui",
-  "version": "0.2.492",
+  "version": "0.2.495",
   "main": "dist/classcard-ui.umd.min.js",
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/CButtonGroup/CButtonGroup.vue

@@ -1,22 +1,26 @@
 <template>
   <div>
-    <span class="-ml-px relative block sm:shadow-sm sm:hidden">
-      <div>
+    <span class="relative -ml-px block sm:hidden sm:shadow-sm">
+      <div v-if="!hideDropdown">
         <button
           @click="showButtons = !showButtons"
           type="button"
-          class="relative inline-flex items-center px-2 py-2 rounded-md border border-gray-300 bg-white text-sm font-medium text-gray-900 hover:bg-gray-50 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-600 focus:border-blue-600 sm:rounded-md sm:px-3"
+          class="focus:ring-blue-600 focus:border-blue-600 relative inline-flex items-center rounded-md border border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-900 hover:bg-gray-50 focus:z-10 focus:outline-none focus:ring-1 sm:rounded-md sm:px-3"
           id="menu-3"
           aria-expanded="false"
           aria-haspopup="true"
         >
           <span class="">{{ buttonObject[0].label }}</span>
-          <c-icon type="solid" name="chevron-down" class="h-5 w-5 ml-2"></c-icon>
+          <c-icon
+            type="solid"
+            name="chevron-down"
+            class="ml-2 h-5 w-5"
+          ></c-icon>
         </button>
       </div>
       <div
         v-show="showButtons"
-        class="origin-top-right absolute mt-2 w-full z-10 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5 focus:outline-none"
+        class="absolute z-10 mt-2 w-full origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
         role="menu"
         aria-orientation="vertical"
       >
@@ -40,14 +44,15 @@
         </div>
       </div>
     </span>
-    <span class="relative z-0 inline-flex rounded-md hidden sm:block">
+    <span class="z-0 relative inline-flex hidden rounded-md sm:block">
       <button
         v-for="(button, index) in buttonObject"
         v-bind:key="button.label"
         type="button"
-        class="relative inline-flex items-center px-2 py-2 border-r border-l border-t border-b border-gray-300 bg-white text-sm font-medium text-gray-700 hover:bg-gray-50 focus:z-10 focus:outline-none focus:ring-1 focus:ring-indigo-500 focus:border-indigo-500"
+        class="relative inline-flex items-center border-r border-l border-t border-b border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500"
         :class="{
-          'rounded-r-md border-l-0 border-r rounded-l-none': index == buttonObject.length - 1,
+          'rounded-r-md rounded-l-none border-l-0 border-r':
+            index == buttonObject.length - 1,
           'rounded-l-md': index == 0,
           'border-r-0': index == 0 && buttonObject.length != 2,
           'px-4': button.label,
@@ -80,6 +85,10 @@ export default {
       type: Array,
       required: true,
     },
+    hideDropdownIcon: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -88,11 +97,11 @@ export default {
   },
   methods: {
     handleEvent(function_name) {
-      if(function_name) function_name()
+      if (function_name) function_name();
     },
     buttonAction(event, value) {
       this.$emit("onClick", value);
-    }
+    },
   },
 };
 </script>

package/src/components/CSelect/CSelect.vue

@@ -212,10 +212,7 @@ export default {
   data() {
     return {
       toggleDropdown: false,
-      selectedValue:
-        this.value !== null && this.value.option
-          ? this.value.option
-          : this.value,
+      selectedValue: null,
       showSelectedValue: false,
       showFocus: false,
       selectSearch: null,
@@ -271,13 +268,19 @@ export default {
   watch: {
     value() {
       this.selectedValue =
-        this.value !== null && this.value.option
-          ? this.value.option
+        this.value !== null && this.value[this.renderOptionName]
+          ? this.value[this.renderOptionName]
           : this.value;
     },
     options() {
       this.renderOptions = this.options;
     },
   },
+  mounted() {
+    this.selectedValue =
+      this.value !== null && this.value[this.renderOptionName]
+        ? this.value[this.renderOptionName]
+        : this.value;
+  },
 };
 </script>