@afeefa/vue-app 0.0.291 → 0.0.293

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.291
+0.0.293

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.291",
+  "version": "0.0.293",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src/components/ADraggableCheckboxGroup.vue

@@ -5,40 +5,38 @@
     </v-label>
 
     <a-row vertical>
-      <div
-        v-for="(option, index) in options_"
-        :key="option.itemValue"
-        class="draggable-checkbox"
-        :class="{ 'dragging': draggedIndex === index, 'drag-over': dragOverIndex === index }"
-        @dragover="onDragOver(index, $event)"
-        @dragleave="onDragLeave"
-        @drop="onDrop(index, $event)"
+      <draggable
+        v-model="options_"
+        handle=".drag-handle"
+        ghost-class="ghost"
+        @end="onDragEnd"
       >
-        <div class="checkbox-container">
-          <div
-            class="drag-handle"
-            :draggable="true"
-            @dragstart="onDragStart(index, $event)"
-            @dragend="onDragEnd"
-          >
-            <a-icon
-              size="1.5rem"
-              :icon="{icon: '$dragIcon', color: '#CCCCCC'}"
-            />
+        <div
+          v-for="option in options_"
+          :key="option.itemValue"
+          class="draggable-checkbox"
+        >
+          <div class="checkbox-container">
+            <div class="drag-handle">
+              <a-icon
+                size="1.5rem"
+                :icon="{icon: '$dragIcon', color: '#CCCCCC'}"
+              />
+            </div>
+
+            <a-checkbox
+              :label="option.itemText"
+              :value="isChecked(option.itemValue)"
+              hide-details
+              @input="checked(option.itemValue, $event)"
+            >
+              <template #label>
+                <div v-html="option.itemText" />
+              </template>
+            </a-checkbox>
           </div>
-
-          <a-checkbox
-            :label="option.itemText"
-            :value="isChecked(option.itemValue)"
-            hide-details
-            @input="checked(option.itemValue, $event)"
-          >
-            <template #label>
-              <div v-html="option.itemText" />
-            </template>
-          </a-checkbox>
         </div>
-      </div>
+      </draggable>
     </a-row>
 
     <div
@@ -53,17 +51,19 @@
 
 <script>
 import { Component, Vue, Watch, Inject } from '@a-vue'
+import draggable from 'vuedraggable'
 
 @Component({
-  props: ['value', 'options', 'validator']
+  props: ['value', 'options', 'validator'],
+  components: {
+    draggable
+  }
 })
 export default class ACheckboxGroup extends Vue {
   value_ = []
   options_ = []
   errorMessages = []
   hasError = false
-  draggedIndex = null
-  dragOverIndex = null
 
   @Inject({ from: 'form', default: null }) form
 
@@ -130,86 +130,24 @@ export default class ACheckboxGroup extends Vue {
     return !this.errorMessages.length
   }
 
-  onDragStart (index, event) {
-    this.draggedIndex = index
-    event.dataTransfer.effectAllowed = 'move'
-    event.dataTransfer.setData('text/html', event.target)
-
-    // Set the entire checkbox container as the drag image
-    const checkboxContainer = event.target.closest('.draggable-checkbox')
-    if (checkboxContainer) {
-      event.dataTransfer.setDragImage(checkboxContainer, 0, 0)
-    }
-  }
-
-  onDragEnd () {
-    this.draggedIndex = null
-    this.dragOverIndex = null
-
+  onDragEnd (evt) {
     this.$emit('orderChanged', this.options_)
   }
-
-  onDragOver (index, event) {
-    event.preventDefault()
-    event.stopPropagation()
-    event.dataTransfer.dropEffect = 'move'
-    this.dragOverIndex = index
-  }
-
-  onDragLeave (event) {
-    // Only clear dragOverIndex if we're actually leaving the draggable-checkbox container
-    const rect = event.currentTarget.getBoundingClientRect()
-    const x = event.clientX
-    const y = event.clientY
-
-    if (x < rect.left || x > rect.right || y < rect.top || y > rect.bottom) {
-      this.dragOverIndex = null
-    }
-  }
-
-  onDrop (index, event) {
-    event.preventDefault()
-
-    if (this.draggedIndex !== null && this.draggedIndex !== index) {
-      // Create a copy of the options array
-      const newOptions = [...this.options_]
-
-      // Remove the dragged item
-      const draggedItem = newOptions.splice(this.draggedIndex, 1)[0]
-
-      // Insert it at the new position
-      newOptions.splice(index, 0, draggedItem)
-
-      // Update the options
-      this.options_ = newOptions
-
-      // Emit an event to notify parent component about the reorder
-      this.$emit('reorder', newOptions)
-    }
-
-    this.draggedIndex = null
-    this.dragOverIndex = null
-  }
 }
 </script>
 
 <style scoped>
 .draggable-checkbox {
   transition: all .2s ease;
-  border-radius: 4px;
-  padding: 2px;
+  padding: 0 5px 0 0;
 }
 
 .draggable-checkbox:hover {
   background-color: rgba(0, 0, 0, .04);
 }
 
-.draggable-checkbox.dragging {
+.ghost {
   opacity: .5;
-  transform: scale(.95);
-}
-
-.draggable-checkbox.drag-over {
   background-color: rgba(25, 118, 210, .1);
   border: 2px dashed rgba(25, 118, 210, .3);
 }
@@ -221,30 +159,11 @@ export default class ACheckboxGroup extends Vue {
 
 .drag-handle {
   cursor: grab;
-  color: rgba(0, 0, 0, .54);
   transition: all .2s ease;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 20px;
   height: 20px;
 }
 
-.drag-handle:hover {
-  background-color: rgba(0, 0, 0, .08);
-  color: rgba(0, 0, 0, .87);
-}
-
 .drag-handle:active {
   cursor: grabbing;
 }
-
-.draggable-checkbox .v-input--checkbox {
-  pointer-events: auto;
-  flex: 1;
-}
-
-.draggable-checkbox .v-input__slot {
-  cursor: pointer;
-}
 </style>

package/src/components/ATabs.vue

@@ -1,10 +1,13 @@
 <template>
   <div>
-    <div :class="['menuContainer', {first}]">
+    <div
+      v-if="countTabs > 1 || !hideSingle"
+      :class="['menuContainer', {first}]"
+    >
       <div class="menu">
         <div
           v-for="(title, index) in titles"
-          :key="index"
+          :key="title + '-' + index"
           :class="['label', {selected: index === currentIndex}]"
           @click="setTab(index)"
         >
@@ -30,21 +33,33 @@
 </template>
 
 <script>
-import { Component, Vue } from '@a-vue'
+import { Component, Vue, Watch } from '@a-vue'
 
 @Component({
-  props: ['beforeChange', {first: false}]
+  props: ['beforeChange', {first: false, hideSingle: false}]
 })
 export default class ATabs extends Vue {
   titles = []
   icons = []
   currentIndex = 0
+  countTabs = 0
 
   mounted () {
-    this.titles = this.$children.map(c => c.title)
-    this.icons = this.$children.map(c => c.icon)
+    this.countTabs = this.getCountTabs()
+  }
 
-    this.$children[this.currentIndex].show()
+  updated () {
+    this.countTabs = this.getCountTabs()
+  }
+
+  @Watch('countTabs')
+  countTabsChanged (oldt, newt) {
+    this.$nextTick(() => {
+      this.titles = this.$children.map(c => c.title).filter(t => t)
+      this.icons = this.$children.map(c => c.icon).filter(i => i)
+
+      this.setTab(0)
+    })
   }
 
   async setTab (index) {
@@ -56,7 +71,7 @@ export default class ATabs extends Vue {
     }
 
     this.currentIndex = index
-    const tabs = this.$slots.default.map(s => s.componentInstance)
+    const tabs = this.$slots.default.map(s => s.componentInstance).filter(i => i)
     tabs.forEach((tab, i) => {
       if (i === this.currentIndex) {
         tab.show()
@@ -65,6 +80,10 @@ export default class ATabs extends Vue {
       }
     })
   }
+
+  getCountTabs () {
+    return this.$slots.default.filter(s => !!s.tag).length // removed slot has vm.tag === undefined
+  }
 }
 </script>
 

package/src-admin/styles.scss

@@ -65,6 +65,10 @@ html {
 
 .theme--light.v-btn.v-btn--has-bg {
   background-color: #E9E9E9;
+
+  &.theme--light.v-btn.v-btn--disabled.v-btn--has-bg {
+    background-color: #CCCCCC !important;
+  }
 }
 
 .theme--light.v-btn:focus::before {