stickyflow 0.11.3 → 0.12.0

package/dist/interaction/index.js

@@ -1,5 +1,5 @@
-import { screenRectOf, Emitter, resolveOwner, isCameraGesture, pointerUserPoint, clearAlignmentGuides, updateAlignmentGuides, pxPerUnit, findOwnerNode, isPrimary, SVG_NAMESPACE, isTextLabel, findSnapCandidateBounds, symbolDeclaredBounds, updateQuickDuplicateBubbles, isometricGeometryOf, updateHalo, axisArrowPlacements, updateAxisArrowGroup, PATH_HALO_ATTR, findAllOwnerNodes, findIsometricApexCandidates, DERIVED_HEIGHT_ROLES, resizeHandlePositions, ISO_HALO_ATTR, ISO_DUPLICATE_BUBBLES_ATTR, pathGeometryOf } from '../chunk-BFQWCOEC.js';
-import { sflToCanvasState, isIsometricObject, rgbToHex, parseHexRgb, rgbToHsv, tokenizeSource, roundedOrthogonalPathData, seriesLabelOffsetXProp, seriesLabelOffsetYProp, radarVertexPoint, AXIS_SIN, AXIS_COS, freeformPathData, CORNER_RADIUS_ATTR, isometricFaces, roundedPolygonPath, isometricTopFaceCenter, calculateLinkRoute, pointAtPort, roundedBarPath, barShapePath, formatBarLabel, LABEL_WIDTH, LEADER_INSET, clipSegmentToRect, radarValueAtPoint, radarSeriesPath, hsvToRgb, estimateTextWidth, wrapText, personLabelArea, isometricFaceCenter, PATH_POINT_INDEX_ATTR, linePathData, barLabelSize, BAR_LABEL, pillPath, getLineMidpoint, labelGapDash, pillCornerRadius, SQUARE_CORNER_ATTR, cornersRoundedRectPath, localShapePath, relativeOffsetOnRectangleSide, edgePointToward, SYMBOL_POINTS_ATTR, SYMBOL_TENSION_ATTR } from '../chunk-G6IW2IX3.js';
+import { screenRectOf, Emitter, resolveOwner, isCameraGesture, pointerUserPoint, clearAlignmentGuides, updateAlignmentGuides, pxPerUnit, findOwnerNode, isPrimary, SVG_NAMESPACE, isTextLabel, findSnapCandidateBounds, symbolDeclaredBounds, updateQuickDuplicateBubbles, isometricGeometryOf, updateHalo, axisArrowPlacements, updateAxisArrowGroup, PATH_HALO_ATTR, findAllOwnerNodes, findIsometricApexCandidates, DERIVED_HEIGHT_ROLES, resizeHandlePositions, ISO_HALO_ATTR, ISO_DUPLICATE_BUBBLES_ATTR, pathGeometryOf } from '../chunk-FYSJMUJI.js';
+import { sflToCanvasState, isIsometricObject, rgbToHex, parseHexRgb, rgbToHsv, tokenizeSource, roundedOrthogonalPathData, seriesLabelOffsetXProp, seriesLabelOffsetYProp, radarVertexPoint, AXIS_SIN, AXIS_COS, freeformPathData, CORNER_RADIUS_ATTR, isometricFaces, roundedPolygonPath, isometricTopFaceCenter, calculateLinkRoute, pointAtPort, roundedBarPath, barShapePath, formatBarLabel, LABEL_WIDTH, LEADER_INSET, clipSegmentToRect, radarValueAtPoint, radarSeriesPath, hsvToRgb, estimateTextWidth, wrapText, personLabelArea, isometricFaceCenter, PATH_POINT_INDEX_ATTR, linePathData, barLabelSize, BAR_LABEL, pillPath, getLineMidpoint, labelGapDash, pillCornerRadius, SQUARE_CORNER_ATTR, cornersRoundedRectPath, localShapePath, relativeOffsetOnRectangleSide, edgePointToward, SYMBOL_POINTS_ATTR, SYMBOL_TENSION_ATTR } from '../chunk-4SXXMOXR.js';
 
 // src/runtime/interaction/chartValue/coordinates.ts
 function pointerUserY(svg, event) {
@@ -6477,7 +6477,7 @@ function braceDelta(masked) {
 }
 
 // src/runtime/interaction/sflPatch/scan/blocks.ts
-var OWNER_HEADER = /^\s*(Entity|Shape|Text|Image|Container|Chart|Path|Link|Isometric|Widget|Component|Connection|Shader)\s+([A-Za-z_][A-Za-z0-9_]*)\b/;
+var OWNER_HEADER = /^\s*(Entity|Shape|Text|Image|Container|Screen|Chart|Path|Link|Isometric|Widget|Component|Connection|Shader)\s+([A-Za-z_][A-Za-z0-9_]*)\b/;
 var VALID_IDENT = /^[A-Za-z_][A-Za-z0-9_]*$/;
 function blockEndIn(masked, startLine) {
   let depth = 0;
@@ -6949,6 +6949,42 @@ function outermostRemovalRanges(ranges) {
 }
 
 // src/runtime/interaction/sflPatch/canvasObjectPatch/remove.ts
+var GROUP_HEADER = /^\s*Group\s+([A-Za-z_][A-Za-z0-9_]*)\b/;
+var CHILD_BLOCK = /^\s*[A-Z][A-Za-z]*\s+[A-Za-z_]/;
+function enclosingGroups(lines, line) {
+  const masked = maskLines(lines);
+  if (masked === null) {
+    return [];
+  }
+  const open = [];
+  for (let i = 0; i < line; i++) {
+    const delta = braceDelta(masked[i]);
+    if (delta > 0) {
+      const group = masked[i].match(GROUP_HEADER);
+      open.push(group ? group[1] : null);
+      for (let extra = 1; extra < delta; extra++) {
+        open.push(null);
+      }
+    } else {
+      open.splice(open.length + delta, -delta);
+    }
+  }
+  return open.filter((name) => name !== null).reverse();
+}
+function removeEmptiedGroups(lines, groups) {
+  for (const name of groups) {
+    const masked = maskLines(lines);
+    const start = masked?.findIndex((line) => line.match(GROUP_HEADER)?.[1] === name) ?? -1;
+    if (!masked || start < 0) {
+      return;
+    }
+    const end = blockEndLine(lines, start);
+    if (masked.slice(start + 1, end).some((line) => CHILD_BLOCK.test(line))) {
+      return;
+    }
+    lines.splice(start, end - start + 1);
+  }
+}
 function removeCanvasObject(sfl, id, options = {}) {
   const lines = sfl.split("\n");
   const canvasObjectRange = findOwnerBlock(lines, id);
@@ -6964,6 +7000,7 @@ function removeCanvasObject(sfl, id, options = {}) {
     }
     return sfl;
   }
+  const groups = enclosingGroups(lines, canvasObjectRange.start);
   const ranges = [canvasObjectRange];
   if (options.alsoRemoveLinks ?? true) {
     ranges.push(...findReferencingLinkRanges(lines, id));
@@ -6972,6 +7009,7 @@ function removeCanvasObject(sfl, id, options = {}) {
   for (const range of removalRanges) {
     lines.splice(range.start, range.end - range.start + 1);
   }
+  removeEmptiedGroups(lines, groups);
   return lines.join("\n");
 }