fix: by comments

altai-ui · May 16, 2022 · 2f11b8f · 2f11b8f
1 parent 3957900
commit 2f11b8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/qComponents/QButton/index.ts b/src/qComponents/QButton/index.ts
@@ -15,6 +15,5 @@ export type {
   QButtonPropDisabled,
   QButtonPropAutofocus,
   QButtonPropCircle,
-  QButtonPropFullWidth,
-  QButtonInstance
+  QButtonPropFullWidth
 } from './src/types';
diff --git a/src/qComponents/QButton/src/QButton.vue b/src/qComponents/QButton/src/QButton.vue
@@ -11,7 +11,7 @@
       class="q-icon-reverse"
     />
     <span
-      v-if="icon && !isLoading"
+      v-else-if="icon"
       :class="icon"
     />
     <span
@@ -46,6 +46,10 @@ import type {
   QButtonInstance
 } from './types';
 
+const defaultPropTypeValue = 'default';
+const defaultPropThemeValue = 'primary';
+const defaultPropSizeValue = 'medium';
+
 export default /* #__PURE__ */ defineComponent({
   name: 'QButton',
 
@@ -54,13 +58,13 @@ export default /* #__PURE__ */ defineComponent({
   props: {
     type: {
       type: String as PropType<QButtonPropType>,
-      default: 'default',
+      default: defaultPropTypeValue,
       validator: validateArray<QButtonPropType>(['default', 'icon'])
     },
 
     theme: {
       type: String as PropType<QButtonPropTheme>,
-      default: 'primary',
+      default: defaultPropThemeValue,
       validator: validateArray<QButtonPropTheme>([
         'primary',
         'secondary',
@@ -70,7 +74,7 @@ export default /* #__PURE__ */ defineComponent({
 
     size: {
       type: String as PropType<QButtonPropSize>,
-      default: 'medium',
+      default: defaultPropSizeValue,
       validator: validateArray<QButtonPropSize>(['small', 'medium'])
     },
 
@@ -147,9 +151,9 @@ export default /* #__PURE__ */ defineComponent({
 
     const classList = computed<ClassValue[]>(() => {
       const classes: ClassValue[] = Object.entries({
-        theme: props.theme,
-        type: props.type,
-        size: props.size
+        theme: props.theme ?? defaultPropThemeValue,
+        type: props.type ?? defaultPropTypeValue,
+        size: props.size ?? defaultPropSizeValue
       })
         .filter(([, value]) => Boolean(value))
         .map(([key, value]) => `q-button_${key}_${value}`);