Measurement and Snapping Managers. Правим расхождения при отображении расстояний до объектов.

Author: Alexander

src/editor/measurement-manager/index.ts

@@ -12,7 +12,11 @@ import {
   shouldIgnoreObject
 } from '../utils/object-filter'
 import { drawGuideLabel } from '../utils/render-utils'
-import { resolveDisplayDistance } from '../utils/distance'
+import {
+  MAX_DISPLAY_DISTANCE_DIFF,
+  resolveCommonDisplayDistance,
+  resolveDisplayDistance
+} from '../utils/distance'
 import {
   MEASUREMENT_COLOR,
   MEASUREMENT_LINE_WIDTH
@@ -491,21 +495,23 @@ export default class MeasurementManager {
     currentGap: number
     oppositeGaps: Array<number | null>
   }): number | null {
-    const currentDisplay = resolveDisplayDistance({ distance: currentGap })
     let bestCommonDistance: number | null = null
     let bestDiff = Number.POSITIVE_INFINITY
 
     for (const oppositeGap of oppositeGaps) {
       if (oppositeGap === null) continue
 
-      const oppositeDisplay = resolveDisplayDistance({ distance: oppositeGap })
-      const displayDiff = Math.abs(currentDisplay - oppositeDisplay)
-      if (displayDiff > 1 || displayDiff >= bestDiff) continue
-
-      bestDiff = displayDiff
-      bestCommonDistance = resolveDisplayDistance({
-        distance: (currentGap + oppositeGap) / 2
+      const {
+        displayDistanceDiff,
+        commonDisplayDistance
+      } = resolveCommonDisplayDistance({
+        firstDistance: currentGap,
+        secondDistance: oppositeGap
       })
+      if (displayDistanceDiff > MAX_DISPLAY_DISTANCE_DIFF || displayDistanceDiff >= bestDiff) continue
+
+      bestDiff = displayDistanceDiff
+      bestCommonDistance = commonDisplayDistance
     }
 
     return bestCommonDistance
@@ -610,7 +616,7 @@ export default class MeasurementManager {
     const overlapStart = Math.max(a.top ?? 0, b.top ?? 0)
     const overlapEnd = Math.min(a.bottom ?? 0, b.bottom ?? 0)
 
-    return overlapEnd >= overlapStart
+    return overlapEnd > overlapStart
   }
 
   /**
@@ -626,7 +632,7 @@ export default class MeasurementManager {
     const overlapStart = Math.max(a.left ?? 0, b.left ?? 0)
     const overlapEnd = Math.min(a.right ?? 0, b.right ?? 0)
 
-    return overlapEnd >= overlapStart
+    return overlapEnd > overlapStart
   }
 
   /**

src/editor/snapping-manager/calculations.ts

@@ -1,5 +1,8 @@
 import { MOVE_SNAP_STEP } from './constants'
-import { resolveDisplayDistance } from '../utils/distance'
+import {
+  MAX_DISPLAY_DISTANCE_DIFF,
+  resolveCommonDisplayDistance
+} from '../utils/distance'
 import type {
   AnchorBuckets,
   Bounds,
@@ -316,12 +319,14 @@ const resolveCenteredEqualSpacing = ({
     const gapBefore = adjustedStart - beforeEdge
     const gapAfter = afterEdge - adjustedEnd
 
-    const beforeDistance = resolveDisplayDistance({ distance: gapBefore })
-    const afterDistance = resolveDisplayDistance({ distance: gapAfter })
-    const distanceDiff = Math.abs(beforeDistance - afterDistance)
-    if (distanceDiff > 1) continue
-
-    const commonDistance = Math.max(beforeDistance, afterDistance)
+    const {
+      displayDistanceDiff: distanceDiff,
+      commonDisplayDistance: commonDistance
+    } = resolveCommonDisplayDistance({
+      firstDistance: gapBefore,
+      secondDistance: gapAfter
+    })
+    if (distanceDiff > MAX_DISPLAY_DISTANCE_DIFF) continue
 
     const nearestDiff = Math.max(
       Math.abs(gapBefore - targetGap),
@@ -357,13 +362,18 @@ const resolveGuideDisplayDistance = ({
   currentGap: number
   referenceGap: number
 }): number => {
-  const currentDisplay = resolveDisplayDistance({ distance: currentGap })
-  const referenceDisplay = resolveDisplayDistance({ distance: referenceGap })
-  const displayDiff = Math.abs(currentDisplay - referenceDisplay)
+  const {
+    secondDisplayDistance: referenceDisplay,
+    displayDistanceDiff,
+    commonDisplayDistance
+  } = resolveCommonDisplayDistance({
+    firstDistance: currentGap,
+    secondDistance: referenceGap
+  })
 
-  if (displayDiff > 1) return referenceDisplay
+  if (displayDistanceDiff > MAX_DISPLAY_DISTANCE_DIFF) return referenceDisplay
 
-  return Math.max(currentDisplay, referenceDisplay)
+  return commonDisplayDistance
 }
 
 /**

src/editor/utils/distance.ts

@@ -13,3 +13,39 @@ export const resolveDisplayDistance = ({
 
   return Math.floor(normalizedDistance + epsilon)
 }
+
+/**
+ * Максимально допустимая разница между display-расстояниями,
+ * при которой их можно считать эквивалентными для UI.
+ */
+export const MAX_DISPLAY_DISTANCE_DIFF = 1
+
+export type CommonDisplayDistance = {
+  firstDisplayDistance: number
+  secondDisplayDistance: number
+  displayDistanceDiff: number
+  commonDisplayDistance: number
+}
+
+/**
+ * Сравнивает два расстояния в display-пикселях и возвращает общее значение для интерфейса.
+ */
+export const resolveCommonDisplayDistance = ({
+  firstDistance,
+  secondDistance
+}: {
+  firstDistance: number
+  secondDistance: number
+}): CommonDisplayDistance => {
+  const firstDisplayDistance = resolveDisplayDistance({ distance: firstDistance })
+  const secondDisplayDistance = resolveDisplayDistance({ distance: secondDistance })
+  const displayDistanceDiff = Math.abs(firstDisplayDistance - secondDisplayDistance)
+  const commonDisplayDistance = Math.max(firstDisplayDistance, secondDisplayDistance)
+
+  return {
+    firstDisplayDistance,
+    secondDisplayDistance,
+    displayDistanceDiff,
+    commonDisplayDistance
+  }
+}