quasar-ui-danx 0.0.9 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "author": "Dan <dan@flytedesk.com>",
   "description": "DanX Vue / Quasar component library",
   "license": "MIT",

package/src/components/DragAndDrop/listDragAndDrop.ts

@@ -7,231 +7,231 @@ import { DragAndDrop } from "./dragAndDrop";
  * @class
  */
 export class ListDragAndDrop extends DragAndDrop {
-  listPosition = 0;
-  cursorPosition = 0;
-  initialPosition = 0;
-  onPositionChangeCb = null;
-  onDragPositionChangeCb = null;
-  placeholder = null;
-
-  constructor(options = {}) {
-    super({
-      showPlaceholder: true,
-      ...options,
-    });
-  }
-
-  /**
-   * Callback that fires after dragging has ended and the list position has changed from the original
-   * @param cb
-   * @returns {ListDragAndDrop}
-   */
-  onPositionChange(cb) {
-    this.onPositionChangeCb = cb;
-    return this;
-  }
-
-  /**
-   * Callback that fires while dragging the element when the cursor's position has changed in the list
-   * @param cb
-   * @returns {ListDragAndDrop}
-   */
-  onDragPositionChange(cb) {
-    this.onDragPositionChangeCb = cb;
-    return this;
-  }
-
-  /**
-   * Start listening for drag events and prepare an element for drag/drop
-   * @param e
-   * @param data
-   */
-  dragStart(e, data) {
-    super.dragStart(e, data);
-
-    if (this.currentDropZone) {
-      this.listPosition = this.getListPosition(e.target);
-      this.initialPosition = this.listPosition;
-      this.updateScrollPosition();
+    listPosition = 0;
+    cursorPosition = 0;
+    initialPosition = 0;
+    onPositionChangeCb = null;
+    onDragPositionChangeCb = null;
+    placeholder = null;
+
+    constructor(options = {}) {
+        super({
+            showPlaceholder: true,
+            ...options,
+        });
     }
-  }
-
-  /**
-   * When dragging has ended, check for list position changes and fire the onPositionChange callback if it has
-   */
-  dragEnd(e) {
-    const draggableData = this.draggableData;
-    this.placeholder.remove();
-    super.dragEnd(e);
-
-    // If our list position has changed, trigger the drop callback
-    if (this.listPosition !== this.initialPosition) {
-      this.onPositionChangeCb &&
-      this.onPositionChangeCb(this.listPosition, this.initialPosition, draggableData);
+
+    /**
+     * Callback that fires after dragging has ended and the list position has changed from the original
+     * @param cb
+     * @returns {ListDragAndDrop}
+     */
+    onPositionChange(cb) {
+        this.onPositionChangeCb = cb;
+        return this;
     }
-  }
-
-  /**
-   * The dragging element is moving
-   * @param e
-   */
-  dragOver(e) {
-    super.dragOver(e);
-    this.updateListPosition(e);
-  }
-
-  /**
-   * Notify if the targeted position of the cursor is different from the current position
-   * @param e
-   */
-  updateListPosition(e) {
-    const prevPosition = this.listPosition;
-    const newPosition = this.getListPositionOfPoint({
-      x: e.clientX,
-      y: e.clientY,
-    });
-
-    // If the cursor position has changed, we should update the rendering and see if our actual list position has
-    // changed
-    if (this.cursorPosition !== newPosition) {
-      this.cursorPosition = newPosition;
-      this.listPosition =
-        this.initialPosition < this.cursorPosition
-          ? this.cursorPosition - 1
-          : this.cursorPosition;
-      if (this.options.showPlaceholder) {
-        this.renderPlaceholder();
-      }
-
-      // The position has changed, trigger the callback
-      if (this.listPosition !== prevPosition) {
-        this.onDragPositionChangeCb &&
-        this.onDragPositionChangeCb(this.listPosition, this.draggableData);
-      }
+
+    /**
+     * Callback that fires while dragging the element when the cursor's position has changed in the list
+     * @param cb
+     * @returns {ListDragAndDrop}
+     */
+    onDragPositionChange(cb) {
+        this.onDragPositionChangeCb = cb;
+        return this;
     }
-  }
-
-  /**
-   * Find the numeric position of the element in the children of the list
-   * @returns {Number|null}
-   * @param item
-   */
-  getListPosition(item) {
-    let index = 0;
-    for (const child of this.getChildren()) {
-      if (child === item) {
-        return index;
-      }
-      index++;
+
+    /**
+     * Start listening for drag events and prepare an element for drag/drop
+     * @param e
+     * @param data
+     */
+    dragStart(e, data) {
+        super.dragStart(e, data);
+
+        if (this.currentDropZone) {
+            this.listPosition = this.getListPosition(e.target);
+            this.initialPosition = this.listPosition;
+            this.updateScrollPosition();
+        }
     }
 
-    return null;
-  }
-
-  /**
-   * Get all the children of the current drop zone, excluding the placeholder
-   * @returns {*}
-   */
-  getChildren() {
-    return [...this.currentDropZone.children].filter(
-      (c) => c.className.match(/drag-placeholder/) === null
-    );
-  }
-
-  /**
-   * Find the element at the current cursor position in the given drop zone
-   * @param point
-   * @returns {null}
-   */
-  getListPositionOfPoint(point) {
-    let index = 0;
-    const children = this.getChildren();
-
-    while (index < children.length) {
-      const rect = children[index].getBoundingClientRect();
-      if (this.isVertical()) {
-        if (point.y < rect.top + rect.height / 2) {
-          break;
+    /**
+     * When dragging has ended, check for list position changes and fire the onPositionChange callback if it has
+     */
+    dragEnd(e) {
+        const draggableData = this.draggableData;
+        this.placeholder?.remove();
+        super.dragEnd(e);
+
+        // If our list position has changed, trigger the drop callback
+        if (this.listPosition !== this.initialPosition) {
+            this.onPositionChangeCb &&
+            this.onPositionChangeCb(this.listPosition, this.initialPosition, draggableData);
         }
-      } else {
-        if (point.x < rect.left + rect.width / 2) {
-          break;
+    }
+
+    /**
+     * The dragging element is moving
+     * @param e
+     */
+    dragOver(e) {
+        super.dragOver(e);
+        this.updateListPosition(e);
+    }
+
+    /**
+     * Notify if the targeted position of the cursor is different from the current position
+     * @param e
+     */
+    updateListPosition(e) {
+        const prevPosition = this.listPosition;
+        const newPosition = this.getListPositionOfPoint({
+            x: e.clientX,
+            y: e.clientY,
+        });
+
+        // If the cursor position has changed, we should update the rendering and see if our actual list position has
+        // changed
+        if (this.cursorPosition !== newPosition) {
+            this.cursorPosition = newPosition;
+            this.listPosition =
+                this.initialPosition < this.cursorPosition
+                    ? this.cursorPosition - 1
+                    : this.cursorPosition;
+            if (this.options.showPlaceholder) {
+                this.renderPlaceholder();
+            }
+
+            // The position has changed, trigger the callback
+            if (this.listPosition !== prevPosition) {
+                this.onDragPositionChangeCb &&
+                this.onDragPositionChangeCb(this.listPosition, this.draggableData);
+            }
         }
-      }
-      index++;
     }
 
-    return index;
-  }
-
-  /**
-   * Updates the scroll position while dragging an element so a user can navigate a longer list while dragging
-   */
-  updateScrollPosition() {
-    if (this.currentDropZone) {
-      const rect = this.currentDropZone.getBoundingClientRect();
-      const threshold = 100;
-      let velocity = 0;
-      const velocityFn = (x) => x * 5;
-      const cursorPos = this.isVertical() ? this.cursorY : this.cursorX;
-      const rectStart = this.isVertical() ? rect.top : rect.left;
-      const rectEnd = this.isVertical() ? rect.bottom : rect.right;
-      const beforeDiff = rectStart + threshold - cursorPos;
-      const afterDiff = cursorPos - (rectEnd - threshold);
-
-      if (beforeDiff > 0) {
-        velocity = -velocityFn(beforeDiff);
-      } else if (afterDiff > 0) {
-        velocity = velocityFn(afterDiff);
-      }
-
-      if (velocity) {
-        if (this.isVertical()) {
-          this.currentDropZone.scrollTo({
-            top: this.currentDropZone.scrollTop + velocity,
-            behavior: "smooth",
-          });
-        } else {
-          this.currentDropZone.scrollTo({
-            left: this.currentDropZone.scrollLeft + velocity,
-            behavior: "smooth",
-          });
+    /**
+     * Find the numeric position of the element in the children of the list
+     * @returns {Number|null}
+     * @param item
+     */
+    getListPosition(item) {
+        let index = 0;
+        for (const child of this.getChildren()) {
+            if (child === item) {
+                return index;
+            }
+            index++;
         }
-      }
 
-      setTimeout(() => this.updateScrollPosition(), 500);
+        return null;
+    }
+
+    /**
+     * Get all the children of the current drop zone, excluding the placeholder
+     * @returns {*}
+     */
+    getChildren() {
+        return [...this.currentDropZone.children].filter(
+            (c) => c.className.match(/drag-placeholder/) === null
+        );
     }
-  }
-
-  /**
-   * Render a placeholder element at the given position (in between the elements)
-   */
-  renderPlaceholder() {
-    if (!this.placeholder) {
-      this.placeholder = document.createElement("div");
-      this.placeholder.classList.add("drag-placeholder");
+
+    /**
+     * Find the element at the current cursor position in the given drop zone
+     * @param point
+     * @returns {null}
+     */
+    getListPositionOfPoint(point) {
+        let index = 0;
+        const children = this.getChildren();
+
+        while (index < children.length) {
+            const rect = children[index].getBoundingClientRect();
+            if (this.isVertical()) {
+                if (point.y < rect.top + rect.height / 2) {
+                    break;
+                }
+            } else {
+                if (point.x < rect.left + rect.width / 2) {
+                    break;
+                }
+            }
+            index++;
+        }
+
+        return index;
     }
 
-    // Make sure the placeholder is oriented correctly
-    if (this.isVertical()) {
-      this.placeholder.classList.add("direction-vertical");
-      this.placeholder.classList.remove("direction-horizontal");
-      this.placeholder.style.height = undefined;
-    } else {
-      this.placeholder.classList.add("direction-horizontal");
-      this.placeholder.classList.remove("direction-vertical");
-      this.placeholder.style.height =
-        this.currentDropZone.getBoundingClientRect().height + "px";
+    /**
+     * Updates the scroll position while dragging an element so a user can navigate a longer list while dragging
+     */
+    updateScrollPosition() {
+        if (this.currentDropZone) {
+            const rect = this.currentDropZone.getBoundingClientRect();
+            const threshold = 100;
+            let velocity = 0;
+            const velocityFn = (x) => x * 5;
+            const cursorPos = this.isVertical() ? this.cursorY : this.cursorX;
+            const rectStart = this.isVertical() ? rect.top : rect.left;
+            const rectEnd = this.isVertical() ? rect.bottom : rect.right;
+            const beforeDiff = rectStart + threshold - cursorPos;
+            const afterDiff = cursorPos - (rectEnd - threshold);
+
+            if (beforeDiff > 0) {
+                velocity = -velocityFn(beforeDiff);
+            } else if (afterDiff > 0) {
+                velocity = velocityFn(afterDiff);
+            }
+
+            if (velocity) {
+                if (this.isVertical()) {
+                    this.currentDropZone.scrollTo({
+                        top: this.currentDropZone.scrollTop + velocity,
+                        behavior: "smooth",
+                    });
+                } else {
+                    this.currentDropZone.scrollTo({
+                        left: this.currentDropZone.scrollLeft + velocity,
+                        behavior: "smooth",
+                    });
+                }
+            }
+
+            setTimeout(() => this.updateScrollPosition(), 500);
+        }
     }
 
-    const children = this.getChildren();
-    if (this.cursorPosition < children.length) {
-      this.currentDropZone.insertBefore(
-        this.placeholder,
-        children[this.cursorPosition]
-      );
-    } else {
-      this.currentDropZone.appendChild(this.placeholder);
+    /**
+     * Render a placeholder element at the given position (in between the elements)
+     */
+    renderPlaceholder() {
+        if (!this.placeholder) {
+            this.placeholder = document.createElement("div");
+            this.placeholder.classList.add("drag-placeholder");
+        }
+
+        // Make sure the placeholder is oriented correctly
+        if (this.isVertical()) {
+            this.placeholder.classList.add("direction-vertical");
+            this.placeholder.classList.remove("direction-horizontal");
+            this.placeholder.style.height = undefined;
+        } else {
+            this.placeholder.classList.add("direction-horizontal");
+            this.placeholder.classList.remove("direction-vertical");
+            this.placeholder.style.height =
+                this.currentDropZone.getBoundingClientRect().height + "px";
+        }
+
+        const children = this.getChildren();
+        if (this.cursorPosition < children.length) {
+            this.currentDropZone.insertBefore(
+                this.placeholder,
+                children[this.cursorPosition]
+            );
+        } else {
+            this.currentDropZone.appendChild(this.placeholder);
+        }
     }
-  }
 }

package/src/components/Utility/SvgImg.vue

@@ -1,15 +1,17 @@
 <template>
   <img
-      v-if="typeof svg === 'string'"
-      :src="svg"
+      v-if="isString"
+      :src="resolvedSvg"
       :alt="alt"
   />
-  <component :is="svg" v-else />
+  <component :is="resolvedSvg" v-else />
 </template>
 <script setup>
-defineProps({
+import { computed } from "vue";
+
+const props = defineProps({
   svg: {
-    type: [String, Object],
+    type: [String, Object, Function],
     required: true
   },
   alt: {
@@ -17,4 +19,7 @@ defineProps({
     default: ""
   }
 });
+
+const resolvedSvg = computed(() => props.svg.default ? props.svg.default : props.svg);
+const isString = computed(() => typeof resolvedSvg.value === "string");
 </script>