@lv-x-software-house/x_view 1.2.8-dev.16 → 1.2.8-dev.18

package/dist/index.js

@@ -16211,51 +16211,33 @@ function XViewScene({
       return null;
     };
     Object.values(nodeObjects).forEach((mesh) => {
-      const dateProp = mesh.userData.Date;
+      var _a2;
+      const dateProp = mesh.userData.Date || ((_a2 = (mesh.userData.properties || []).find(
+        (p) => {
+          var _a3;
+          return ((_a3 = p.name) == null ? void 0 : _a3.toLowerCase()) === "data";
+        }
+      )) == null ? void 0 : _a2.value);
       let nodeInfo = { mesh, type: "point", label: "", isUndated: true };
       if (dateProp) {
-        if (dateProp.date) {
-          const date = parseDate2(dateProp.date);
-          if (date) {
-            nodeInfo.startDate = date;
-            nodeInfo.endDate = date;
-            nodeInfo.label = dateProp.date;
-            nodeInfo.isUndated = false;
-            allTimePoints.add(date.getTime());
-          }
-        } else if (dateProp.year) {
-          const year = parseInt(dateProp.year, 10);
-          if (!isNaN(year)) {
-            const date = new Date(year, 0, 1);
-            nodeInfo.startDate = date;
-            nodeInfo.endDate = date;
-            nodeInfo.label = String(year);
-            nodeInfo.isUndated = false;
-            allTimePoints.add(date.getTime());
-          }
-        } else if (dateProp.date_interval && dateProp.date_interval.start) {
-          const startYear = parseInt(dateProp.date_interval.start, 10);
-          const endYear = parseInt(dateProp.date_interval.end, 10) || startYear;
-          if (!isNaN(startYear)) {
-            const startDate = new Date(startYear, 0, 1);
-            const endDate = new Date(endYear, 11, 31);
-            nodeInfo.type = "interval";
-            nodeInfo.startDate = startDate;
-            nodeInfo.endDate = endDate;
-            nodeInfo.label = `${startYear} - ${endYear}`;
-            nodeInfo.isUndated = false;
-            allTimePoints.add(startDate.getTime());
-            allTimePoints.add(endDate.getTime());
-          }
+        const info = parseDateProp(dateProp);
+        if (!info.isUndated) {
+          nodeInfo.startDate = info.startDate;
+          nodeInfo.endDate = info.endDate;
+          nodeInfo.label = info.label;
+          nodeInfo.type = info.type;
+          nodeInfo.isUndated = false;
+          allTimePoints.add(info.startDate.getTime());
+          if (info.endDate) allTimePoints.add(info.endDate.getTime());
         }
       }
       timelineNodes.push(nodeInfo);
     });
     if (timelineNodes.length === 0) return;
-    const sortedTimePoints = Array.from(allTimePoints).sort((a, b) => a - b);
-    const maxTimeIndex = sortedTimePoints.length - 1;
+    const sortedTimePoints2 = Array.from(allTimePoints).sort((a, b) => a - b);
+    const maxTimeIndex = sortedTimePoints2.length - 1;
     const timeToYMap = new Map(
-      sortedTimePoints.map((time, index) => [
+      sortedTimePoints2.map((time, index) => [
         time,
         (index - maxTimeIndex) * TIMELINE_LAYER_SPACING_Y
       ])
@@ -16374,50 +16356,34 @@ function XViewScene({
       return null;
     };
     versionMeshes.forEach((mesh) => {
-      const dateProp = mesh.userData.Date;
-      if (!dateProp) return;
-      let nodeInfo = { mesh, type: "point", label: "" };
-      if (dateProp.date) {
-        const date = parseDate2(dateProp.date);
-        if (date) {
-          nodeInfo.startDate = date;
-          nodeInfo.endDate = date;
-          nodeInfo.label = dateProp.date;
-          allTimePoints.add(date.getTime());
-          timelineNodes.push(nodeInfo);
-        }
-      } else if (dateProp.year) {
-        const year = parseInt(dateProp.year, 10);
-        if (!isNaN(year)) {
-          const date = new Date(year, 0, 1);
-          nodeInfo.startDate = date;
-          nodeInfo.endDate = date;
-          nodeInfo.label = String(year);
-          allTimePoints.add(date.getTime());
-          timelineNodes.push(nodeInfo);
-        }
-      } else if (dateProp.date_interval && dateProp.date_interval.start) {
-        const startYear = parseInt(dateProp.date_interval.start, 10);
-        const endYear = parseInt(dateProp.date_interval.end, 10) || startYear;
-        if (!isNaN(startYear)) {
-          const startDate = new Date(startYear, 0, 1);
-          const endDate = new Date(endYear, 11, 31);
-          nodeInfo.type = "interval";
-          nodeInfo.startDate = startDate;
-          nodeInfo.endDate = endDate;
-          nodeInfo.label = `${startYear} - ${endYear}`;
-          allTimePoints.add(startDate.getTime());
-          allTimePoints.add(endDate.getTime());
-          timelineNodes.push(nodeInfo);
+      var _a2;
+      const dateProp = mesh.userData.Date || ((_a2 = (mesh.userData.properties || []).find(
+        (p) => {
+          var _a3;
+          return ((_a3 = p.name) == null ? void 0 : _a3.toLowerCase()) === "data";
         }
+      )) == null ? void 0 : _a2.value);
+      if (!dateProp) return;
+      const info = parseDateProp(dateProp);
+      if (!info.isUndated) {
+        const nodeInfo = {
+          mesh,
+          type: info.type,
+          startDate: info.startDate,
+          endDate: info.endDate,
+          label: info.label
+        };
+        allTimePoints.add(info.startDate.getTime());
+        if (info.endDate) allTimePoints.add(info.endDate.getTime());
+        timelineNodes.push(nodeInfo);
       }
     });
     if (timelineNodes.length === 0) return;
-    const sortedTimePoints = Array.from(allTimePoints).sort((a, b) => a - b);
+    const maxTimeIndex = sortedTimePoints.length - 1;
     const timeToYMap = new Map(
       sortedTimePoints.map((time, index) => [
         time,
-        index * TIMELINE_LAYER_SPACING_Y
+        (index - maxTimeIndex) * TIMELINE_LAYER_SPACING_Y
       ])
     );
     timelineNodes.sort(
@@ -16425,11 +16391,27 @@ function XViewScene({
     );
     const baseX = sourceMesh.position.x + TIMELINE_NODE_SPACING_X;
     const baseY = sourceMesh.position.y;
-    const maxNodeIndex = timelineNodes.length - 1;
-    timelineNodes.forEach((node, index) => {
+    const columns = [];
+    timelineNodes.forEach((node) => {
       const { mesh, type, startDate, endDate, label } = node;
-      const y = baseY + (index - maxNodeIndex) * TIMELINE_LAYER_SPACING_Y;
-      const versionTween = new import_tween2.Tween(mesh.position).to({ x: baseX, y, z: 0 }, 1500).easing(import_tween2.Easing.Cubic.InOut);
+      const startY = timeToYMap.get(startDate.getTime());
+      const endY = timeToYMap.get(endDate.getTime()) || startY;
+      let foundColumn = false;
+      for (let i = 0; i < columns.length; i++) {
+        if (columns[i].endY < startY) {
+          node.columnIndex = i;
+          columns[i].endY = endY;
+          foundColumn = true;
+          break;
+        }
+      }
+      if (!foundColumn) {
+        node.columnIndex = columns.length;
+        columns.push({ endY });
+      }
+      const x = baseX + node.columnIndex * TIMELINE_NODE_SPACING_X;
+      const y = baseY + startY;
+      const versionTween = new import_tween2.Tween(mesh.position).to({ x, y, z: 0 }, 1500).easing(import_tween2.Easing.Cubic.InOut);
       tweenGroup.add(versionTween);
       versionTween.start();
       if (!mesh.getObjectByName("questDateLabel")) {
@@ -16797,11 +16779,11 @@ function XViewScene({
           }
         }
       });
-      const sortedTimePoints = Array.from(allActiveTimePoints).sort(
+      const sortedTimePoints2 = Array.from(allActiveTimePoints).sort(
         (a, b) => a - b
       );
       const timeToYMap = /* @__PURE__ */ new Map();
-      sortedTimePoints.forEach((ms, idx) => {
+      sortedTimePoints2.forEach((ms, idx) => {
         timeToYMap.set(ms, idx * TIMELINE_LAYER_SPACING_Y);
       });
       const startX = -((QUEST_STATUS_ORDER.length - 1) * QUEST_LENS_COLUMN_SPACING) / 2;
@@ -16820,7 +16802,7 @@ function XViewScene({
           if (!timeInfo.isUndated) {
             nodeY = timeToYMap.get(timeInfo.startDate.getTime());
           } else {
-            const undatedOffset = sortedTimePoints.length > 0 ? sortedTimePoints.length * 5 : 0;
+            const undatedOffset = sortedTimePoints2.length > 0 ? sortedTimePoints2.length * 5 : 0;
             nodeY = -40 - rowIndex * QUEST_LENS_ROW_SPACING - undatedOffset;
           }
           const posKey = `${statusName}_${nodeY}`;
@@ -16903,7 +16885,7 @@ function XViewScene({
           if (!timeInfo.isUndated) {
             targetY = timeToYMap.get(timeInfo.startDate.getTime());
           } else {
-            const undatedOffset = sortedTimePoints.length > 0 ? sortedTimePoints.length * 5 : 0;
+            const undatedOffset = sortedTimePoints2.length > 0 ? sortedTimePoints2.length * 5 : 0;
             targetY = -40 - rowIndex * QUEST_LENS_ROW_SPACING - undatedOffset;
           }
           const posKey = `${statusName}_${targetY}`;

package/dist/index.mjs

@@ -16274,51 +16274,33 @@ function XViewScene({
       return null;
     };
     Object.values(nodeObjects).forEach((mesh) => {
-      const dateProp = mesh.userData.Date;
+      var _a2;
+      const dateProp = mesh.userData.Date || ((_a2 = (mesh.userData.properties || []).find(
+        (p) => {
+          var _a3;
+          return ((_a3 = p.name) == null ? void 0 : _a3.toLowerCase()) === "data";
+        }
+      )) == null ? void 0 : _a2.value);
       let nodeInfo = { mesh, type: "point", label: "", isUndated: true };
       if (dateProp) {
-        if (dateProp.date) {
-          const date = parseDate2(dateProp.date);
-          if (date) {
-            nodeInfo.startDate = date;
-            nodeInfo.endDate = date;
-            nodeInfo.label = dateProp.date;
-            nodeInfo.isUndated = false;
-            allTimePoints.add(date.getTime());
-          }
-        } else if (dateProp.year) {
-          const year = parseInt(dateProp.year, 10);
-          if (!isNaN(year)) {
-            const date = new Date(year, 0, 1);
-            nodeInfo.startDate = date;
-            nodeInfo.endDate = date;
-            nodeInfo.label = String(year);
-            nodeInfo.isUndated = false;
-            allTimePoints.add(date.getTime());
-          }
-        } else if (dateProp.date_interval && dateProp.date_interval.start) {
-          const startYear = parseInt(dateProp.date_interval.start, 10);
-          const endYear = parseInt(dateProp.date_interval.end, 10) || startYear;
-          if (!isNaN(startYear)) {
-            const startDate = new Date(startYear, 0, 1);
-            const endDate = new Date(endYear, 11, 31);
-            nodeInfo.type = "interval";
-            nodeInfo.startDate = startDate;
-            nodeInfo.endDate = endDate;
-            nodeInfo.label = `${startYear} - ${endYear}`;
-            nodeInfo.isUndated = false;
-            allTimePoints.add(startDate.getTime());
-            allTimePoints.add(endDate.getTime());
-          }
+        const info = parseDateProp(dateProp);
+        if (!info.isUndated) {
+          nodeInfo.startDate = info.startDate;
+          nodeInfo.endDate = info.endDate;
+          nodeInfo.label = info.label;
+          nodeInfo.type = info.type;
+          nodeInfo.isUndated = false;
+          allTimePoints.add(info.startDate.getTime());
+          if (info.endDate) allTimePoints.add(info.endDate.getTime());
         }
       }
       timelineNodes.push(nodeInfo);
     });
     if (timelineNodes.length === 0) return;
-    const sortedTimePoints = Array.from(allTimePoints).sort((a, b) => a - b);
-    const maxTimeIndex = sortedTimePoints.length - 1;
+    const sortedTimePoints2 = Array.from(allTimePoints).sort((a, b) => a - b);
+    const maxTimeIndex = sortedTimePoints2.length - 1;
     const timeToYMap = new Map(
-      sortedTimePoints.map((time, index) => [
+      sortedTimePoints2.map((time, index) => [
         time,
         (index - maxTimeIndex) * TIMELINE_LAYER_SPACING_Y
       ])
@@ -16437,50 +16419,34 @@ function XViewScene({
       return null;
     };
     versionMeshes.forEach((mesh) => {
-      const dateProp = mesh.userData.Date;
-      if (!dateProp) return;
-      let nodeInfo = { mesh, type: "point", label: "" };
-      if (dateProp.date) {
-        const date = parseDate2(dateProp.date);
-        if (date) {
-          nodeInfo.startDate = date;
-          nodeInfo.endDate = date;
-          nodeInfo.label = dateProp.date;
-          allTimePoints.add(date.getTime());
-          timelineNodes.push(nodeInfo);
-        }
-      } else if (dateProp.year) {
-        const year = parseInt(dateProp.year, 10);
-        if (!isNaN(year)) {
-          const date = new Date(year, 0, 1);
-          nodeInfo.startDate = date;
-          nodeInfo.endDate = date;
-          nodeInfo.label = String(year);
-          allTimePoints.add(date.getTime());
-          timelineNodes.push(nodeInfo);
-        }
-      } else if (dateProp.date_interval && dateProp.date_interval.start) {
-        const startYear = parseInt(dateProp.date_interval.start, 10);
-        const endYear = parseInt(dateProp.date_interval.end, 10) || startYear;
-        if (!isNaN(startYear)) {
-          const startDate = new Date(startYear, 0, 1);
-          const endDate = new Date(endYear, 11, 31);
-          nodeInfo.type = "interval";
-          nodeInfo.startDate = startDate;
-          nodeInfo.endDate = endDate;
-          nodeInfo.label = `${startYear} - ${endYear}`;
-          allTimePoints.add(startDate.getTime());
-          allTimePoints.add(endDate.getTime());
-          timelineNodes.push(nodeInfo);
+      var _a2;
+      const dateProp = mesh.userData.Date || ((_a2 = (mesh.userData.properties || []).find(
+        (p) => {
+          var _a3;
+          return ((_a3 = p.name) == null ? void 0 : _a3.toLowerCase()) === "data";
         }
+      )) == null ? void 0 : _a2.value);
+      if (!dateProp) return;
+      const info = parseDateProp(dateProp);
+      if (!info.isUndated) {
+        const nodeInfo = {
+          mesh,
+          type: info.type,
+          startDate: info.startDate,
+          endDate: info.endDate,
+          label: info.label
+        };
+        allTimePoints.add(info.startDate.getTime());
+        if (info.endDate) allTimePoints.add(info.endDate.getTime());
+        timelineNodes.push(nodeInfo);
       }
     });
     if (timelineNodes.length === 0) return;
-    const sortedTimePoints = Array.from(allTimePoints).sort((a, b) => a - b);
+    const maxTimeIndex = sortedTimePoints.length - 1;
     const timeToYMap = new Map(
       sortedTimePoints.map((time, index) => [
         time,
-        index * TIMELINE_LAYER_SPACING_Y
+        (index - maxTimeIndex) * TIMELINE_LAYER_SPACING_Y
       ])
     );
     timelineNodes.sort(
@@ -16488,11 +16454,27 @@ function XViewScene({
     );
     const baseX = sourceMesh.position.x + TIMELINE_NODE_SPACING_X;
     const baseY = sourceMesh.position.y;
-    const maxNodeIndex = timelineNodes.length - 1;
-    timelineNodes.forEach((node, index) => {
+    const columns = [];
+    timelineNodes.forEach((node) => {
       const { mesh, type, startDate, endDate, label } = node;
-      const y = baseY + (index - maxNodeIndex) * TIMELINE_LAYER_SPACING_Y;
-      const versionTween = new Tween2(mesh.position).to({ x: baseX, y, z: 0 }, 1500).easing(Easing2.Cubic.InOut);
+      const startY = timeToYMap.get(startDate.getTime());
+      const endY = timeToYMap.get(endDate.getTime()) || startY;
+      let foundColumn = false;
+      for (let i = 0; i < columns.length; i++) {
+        if (columns[i].endY < startY) {
+          node.columnIndex = i;
+          columns[i].endY = endY;
+          foundColumn = true;
+          break;
+        }
+      }
+      if (!foundColumn) {
+        node.columnIndex = columns.length;
+        columns.push({ endY });
+      }
+      const x = baseX + node.columnIndex * TIMELINE_NODE_SPACING_X;
+      const y = baseY + startY;
+      const versionTween = new Tween2(mesh.position).to({ x, y, z: 0 }, 1500).easing(Easing2.Cubic.InOut);
       tweenGroup.add(versionTween);
       versionTween.start();
       if (!mesh.getObjectByName("questDateLabel")) {
@@ -16860,11 +16842,11 @@ function XViewScene({
           }
         }
       });
-      const sortedTimePoints = Array.from(allActiveTimePoints).sort(
+      const sortedTimePoints2 = Array.from(allActiveTimePoints).sort(
         (a, b) => a - b
       );
       const timeToYMap = /* @__PURE__ */ new Map();
-      sortedTimePoints.forEach((ms, idx) => {
+      sortedTimePoints2.forEach((ms, idx) => {
         timeToYMap.set(ms, idx * TIMELINE_LAYER_SPACING_Y);
       });
       const startX = -((QUEST_STATUS_ORDER.length - 1) * QUEST_LENS_COLUMN_SPACING) / 2;
@@ -16883,7 +16865,7 @@ function XViewScene({
           if (!timeInfo.isUndated) {
             nodeY = timeToYMap.get(timeInfo.startDate.getTime());
           } else {
-            const undatedOffset = sortedTimePoints.length > 0 ? sortedTimePoints.length * 5 : 0;
+            const undatedOffset = sortedTimePoints2.length > 0 ? sortedTimePoints2.length * 5 : 0;
             nodeY = -40 - rowIndex * QUEST_LENS_ROW_SPACING - undatedOffset;
           }
           const posKey = `${statusName}_${nodeY}`;
@@ -16966,7 +16948,7 @@ function XViewScene({
           if (!timeInfo.isUndated) {
             targetY = timeToYMap.get(timeInfo.startDate.getTime());
           } else {
-            const undatedOffset = sortedTimePoints.length > 0 ? sortedTimePoints.length * 5 : 0;
+            const undatedOffset = sortedTimePoints2.length > 0 ? sortedTimePoints2.length * 5 : 0;
             targetY = -40 - rowIndex * QUEST_LENS_ROW_SPACING - undatedOffset;
           }
           const posKey = `${statusName}_${targetY}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lv-x-software-house/x_view",
-  "version": "1.2.8-dev.16",
+  "version": "1.2.8-dev.18",
   "description": "Pacote privado contendo os componentes e lógica de renderização 3D do X View.",
   "author": "iv.x - Engenharia de Software - ivxsoftwarehouse@gmail.com",
   "license": "UNLICENSED",