@qrvey/utils 1.17.0 → 1.18.0

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.17.0*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.18.0*
 
 > Helper, Utils for all Qrvey Projects
 

package/dist/cjs/elements/helpers/gridStrategy.js

@@ -17,10 +17,12 @@ const applyDynamicSizeStrategies = {
 };
 const recalculateStrategies = {
     fixed: (elements, currentElements, canvasWidth, device, options) => {
-        const isSorted = !currentElements.length;
+        const { newElements, scopeElements } = (0, element_1.normalizeElements)(currentElements, device, interfaces_1.VemPositionType.FIXED);
+        const elementsToCalculate = [...newElements, ...elements];
+        const isSorted = !scopeElements.length;
         const changedElements = (options.allowCopy
-            ? (0, element_1.copyDesktopPositionToDevice)(elements, device, interfaces_1.VemPositionType.FIXED)
-            : elements);
+            ? (0, element_1.copyDesktopPositionToDevice)(elementsToCalculate, device, interfaces_1.VemPositionType.FIXED)
+            : elementsToCalculate);
         const orderedElements = isSorted
             ? (0, fixed_1.sortElementsFromReferencePoint)(changedElements, options.sort, {
                 x: 0,
@@ -28,18 +30,20 @@ const recalculateStrategies = {
             })
             : changedElements;
         return options.keepPosition
-            ? (0, fixed_1.recalculatePreservingPositions)(orderedElements, currentElements, device, canvasWidth, options.canvasHeight)
-            : (0, fixed_1.findFixedAvailablePositions)(canvasWidth, orderedElements, currentElements, device, false, false, options?.canvasHeight);
+            ? (0, fixed_1.recalculatePreservingPositions)(orderedElements, scopeElements, device, canvasWidth, options.canvasHeight)
+            : (0, fixed_1.findFixedAvailablePositions)(canvasWidth, orderedElements, scopeElements, device, false, false, options?.canvasHeight);
     },
     responsive: (elements, currentElements, canvasWidth, device, options) => {
-        const isSorted = !currentElements.length;
+        const { scopeElements, newElements } = (0, element_1.normalizeElements)(currentElements, device, interfaces_1.VemPositionType.RESPONSIVE);
+        const elementsToCalculate = [...newElements, ...elements];
+        const isSorted = !scopeElements.length;
         const changedElements = (options.allowCopy
-            ? (0, element_1.copyDesktopPositionToDevice)(elements, device, interfaces_1.VemPositionType.RESPONSIVE)
-            : elements);
+            ? (0, element_1.copyDesktopPositionToDevice)(elementsToCalculate, device, interfaces_1.VemPositionType.RESPONSIVE)
+            : elementsToCalculate);
         const orderedElements = isSorted
             ? (0, responsive_1.sortResponsiveElements)(changedElements, options.sort)
             : changedElements;
-        return (0, responsive_1.findResponsiveAvailablePositions)(canvasWidth, orderedElements, currentElements, device);
+        return (0, responsive_1.findResponsiveAvailablePositions)(canvasWidth, orderedElements, scopeElements, device);
     },
 };
 const calculateCanvasHeightStrategies = {

package/dist/cjs/elements/utils/element.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyDesktopPositionToDevice = void 0;
+exports.normalizeElements = exports.copyDesktopPositionToDevice = void 0;
 const position_1 = require("./position");
 const ICanvasGrid_1 = require("../interfaces/ICanvasGrid");
 const IVemPosition_1 = require("../interfaces/IVemPosition");
@@ -16,7 +16,7 @@ const copyDesktopPositionToDevice = (elements, newCanvasDevice, canvasType) => {
         },
     };
     return elements.map((element) => {
-        if (!element.position[canvasType]?.[newCanvasDevice]) {
+        if (!hasPositionForDevice(element, newCanvasDevice, canvasType)) {
             const desktopViewPosition = element.position[canvasType][ICanvasGrid_1.CanvasDevice.DESKTOP];
             const newDevicePosition = {
                 ...desktopViewPosition,
@@ -29,3 +29,24 @@ const copyDesktopPositionToDevice = (elements, newCanvasDevice, canvasType) => {
     });
 };
 exports.copyDesktopPositionToDevice = copyDesktopPositionToDevice;
+const normalizeElements = (elements, newCanvasDevice, canvasType) => {
+    const withPosition = [];
+    const withoutPosition = [];
+    for (const element of elements) {
+        if (hasPositionForDevice(element, newCanvasDevice, canvasType)) {
+            withPosition.push(element);
+        }
+        else {
+            withoutPosition.push(element);
+        }
+    }
+    const newElements = (0, exports.copyDesktopPositionToDevice)(withoutPosition, newCanvasDevice, canvasType);
+    return {
+        scopeElements: withPosition,
+        newElements,
+    };
+};
+exports.normalizeElements = normalizeElements;
+const hasPositionForDevice = (element, device, canvasType) => {
+    return !!element.position[canvasType]?.[device];
+};

package/dist/cjs/filters/services/UChartApi.js

@@ -106,14 +106,14 @@ class UChartApi {
         : 1000;
     static _getSortOption = (column) => {
         let sortBy = "CATEGORY";
-        let sortDirection = (0, isNumericalColumn_1.isNumericalColumn)(column) ? "DESC" : "ASC";
+        let sortDirection = "ASC";
         if (!(0, isEmpty_1.isEmpty)(column.sorting)) {
             sortBy = (0, get_1._get)(column.sorting, "sortBy");
             sortDirection = (0, get_1._get)(column.sorting, "order");
             if (sortBy == null)
                 sortBy = "VALUE";
             if (sortDirection == null)
-                sortDirection = "DESC";
+                sortDirection = "ASC";
         }
         return { by: sortBy, direction: sortDirection };
     };

package/dist/cjs/filters/services/UChartPaginationApi.js

@@ -123,14 +123,14 @@ class UChartPaginationApi {
         : 1000;
     static _getSortOption = (column) => {
         let by = "CATEGORY";
-        let direction = (0, isNumericalColumn_1.isNumericalColumn)(column) ? "DESC" : "ASC";
+        let direction = "ASC";
         if (!(0, isEmpty_1.isEmpty)(column.sorting)) {
             by = (0, get_1._get)(column.sorting, "sortBy");
             direction = (0, get_1._get)(column.sorting, "order");
             if (by == null)
                 by = "VALUE";
             if (direction == null)
-                direction = "DESC";
+                direction = "ASC";
         }
         return { by, direction };
     };

package/dist/elements/helpers/gridStrategy.js

@@ -1,7 +1,7 @@
 import { findFixedAvailablePositions, getFixedGridElementsBottomLimit, recalculatePreservingPositions, sortElementsFromReferencePoint, updateFixedElementDimensions, } from "./fixed";
 import { findResponsiveAvailablePositions, getResponsiveGridElementsBottomLimit, sortResponsiveElements, updateResponsiveElementDimensions, } from "./responsive";
 import { CanvasDevice, VemPositionType, } from "../interfaces";
-import { copyDesktopPositionToDevice } from "../utils/element";
+import { copyDesktopPositionToDevice, normalizeElements, } from "../utils/element";
 const applyDynamicSizeStrategies = {
     fixed: (containerItem, scopeElements, device) => {
         return updateFixedElementDimensions(containerItem, device, scopeElements);
@@ -12,10 +12,12 @@ const applyDynamicSizeStrategies = {
 };
 const recalculateStrategies = {
     fixed: (elements, currentElements, canvasWidth, device, options) => {
-        const isSorted = !currentElements.length;
+        const { newElements, scopeElements } = normalizeElements(currentElements, device, VemPositionType.FIXED);
+        const elementsToCalculate = [...newElements, ...elements];
+        const isSorted = !scopeElements.length;
         const changedElements = (options.allowCopy
-            ? copyDesktopPositionToDevice(elements, device, VemPositionType.FIXED)
-            : elements);
+            ? copyDesktopPositionToDevice(elementsToCalculate, device, VemPositionType.FIXED)
+            : elementsToCalculate);
         const orderedElements = isSorted
             ? sortElementsFromReferencePoint(changedElements, options.sort, {
                 x: 0,
@@ -23,18 +25,20 @@ const recalculateStrategies = {
             })
             : changedElements;
         return options.keepPosition
-            ? recalculatePreservingPositions(orderedElements, currentElements, device, canvasWidth, options.canvasHeight)
-            : findFixedAvailablePositions(canvasWidth, orderedElements, currentElements, device, false, false, options?.canvasHeight);
+            ? recalculatePreservingPositions(orderedElements, scopeElements, device, canvasWidth, options.canvasHeight)
+            : findFixedAvailablePositions(canvasWidth, orderedElements, scopeElements, device, false, false, options?.canvasHeight);
     },
     responsive: (elements, currentElements, canvasWidth, device, options) => {
-        const isSorted = !currentElements.length;
+        const { scopeElements, newElements } = normalizeElements(currentElements, device, VemPositionType.RESPONSIVE);
+        const elementsToCalculate = [...newElements, ...elements];
+        const isSorted = !scopeElements.length;
         const changedElements = (options.allowCopy
-            ? copyDesktopPositionToDevice(elements, device, VemPositionType.RESPONSIVE)
-            : elements);
+            ? copyDesktopPositionToDevice(elementsToCalculate, device, VemPositionType.RESPONSIVE)
+            : elementsToCalculate);
         const orderedElements = isSorted
             ? sortResponsiveElements(changedElements, options.sort)
             : changedElements;
-        return findResponsiveAvailablePositions(canvasWidth, orderedElements, currentElements, device);
+        return findResponsiveAvailablePositions(canvasWidth, orderedElements, scopeElements, device);
     },
 };
 const calculateCanvasHeightStrategies = {

package/dist/elements/utils/element.d.ts

@@ -2,3 +2,7 @@ import { CanvasDevice } from "../interfaces/ICanvasGrid";
 import { Vem } from "../interfaces/IVemCore";
 import { VemPositionType } from "../interfaces/IVemPosition";
 export declare const copyDesktopPositionToDevice: (elements: Vem[], newCanvasDevice: CanvasDevice, canvasType: VemPositionType) => Vem[];
+export declare const normalizeElements: (elements: Vem[], newCanvasDevice: CanvasDevice, canvasType: VemPositionType) => {
+    scopeElements: Vem[];
+    newElements: Vem[];
+};

package/dist/elements/utils/element.js

@@ -13,7 +13,7 @@ export const copyDesktopPositionToDevice = (elements, newCanvasDevice, canvasTyp
         },
     };
     return elements.map((element) => {
-        if (!element.position[canvasType]?.[newCanvasDevice]) {
+        if (!hasPositionForDevice(element, newCanvasDevice, canvasType)) {
             const desktopViewPosition = element.position[canvasType][CanvasDevice.DESKTOP];
             const newDevicePosition = {
                 ...desktopViewPosition,
@@ -25,3 +25,23 @@ export const copyDesktopPositionToDevice = (elements, newCanvasDevice, canvasTyp
         return element;
     });
 };
+export const normalizeElements = (elements, newCanvasDevice, canvasType) => {
+    const withPosition = [];
+    const withoutPosition = [];
+    for (const element of elements) {
+        if (hasPositionForDevice(element, newCanvasDevice, canvasType)) {
+            withPosition.push(element);
+        }
+        else {
+            withoutPosition.push(element);
+        }
+    }
+    const newElements = copyDesktopPositionToDevice(withoutPosition, newCanvasDevice, canvasType);
+    return {
+        scopeElements: withPosition,
+        newElements,
+    };
+};
+const hasPositionForDevice = (element, device, canvasType) => {
+    return !!element.position[canvasType]?.[device];
+};

package/dist/filters/services/UChartApi.js

@@ -102,14 +102,14 @@ export class UChartApi {
         : 1000;
     static _getSortOption = (column) => {
         let sortBy = "CATEGORY";
-        let sortDirection = isNumericalColumn(column) ? "DESC" : "ASC";
+        let sortDirection = "ASC";
         if (!isEmpty(column.sorting)) {
             sortBy = _get(column.sorting, "sortBy");
             sortDirection = _get(column.sorting, "order");
             if (sortBy == null)
                 sortBy = "VALUE";
             if (sortDirection == null)
-                sortDirection = "DESC";
+                sortDirection = "ASC";
         }
         return { by: sortBy, direction: sortDirection };
     };

package/dist/filters/services/UChartPaginationApi.js

@@ -119,14 +119,14 @@ export class UChartPaginationApi {
         : 1000;
     static _getSortOption = (column) => {
         let by = "CATEGORY";
-        let direction = isNumericalColumn(column) ? "DESC" : "ASC";
+        let direction = "ASC";
         if (!isEmpty(column.sorting)) {
             by = _get(column.sorting, "sortBy");
             direction = _get(column.sorting, "order");
             if (by == null)
                 by = "VALUE";
             if (direction == null)
-                direction = "DESC";
+                direction = "ASC";
         }
         return { by, direction };
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/cjs/index.js",