@activecollab/components 2.0.590 → 2.0.592
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/presentation/__tests__/WhiteboardElbow.test.js +55 -0
- package/dist/cjs/presentation/__tests__/WhiteboardElbow.test.js.map +1 -0
- package/dist/cjs/presentation/whiteboard/elementToolbars.js +18 -18
- package/dist/cjs/presentation/whiteboard/elementToolbars.js.map +1 -1
- package/dist/cjs/presentation/whiteboard/lineElements.js +182 -224
- package/dist/cjs/presentation/whiteboard/lineElements.js.map +1 -1
- package/dist/cjs/presentation/whiteboard/lineInspector.js +1 -1
- package/dist/cjs/presentation/whiteboard/lineInspector.js.map +1 -1
- package/dist/cjs/presentation/whiteboard/lineModel.js +322 -84
- package/dist/cjs/presentation/whiteboard/lineModel.js.map +1 -1
- package/dist/esm/presentation/__tests__/WhiteboardElbow.test.d.ts +2 -0
- package/dist/esm/presentation/__tests__/WhiteboardElbow.test.d.ts.map +1 -0
- package/dist/esm/presentation/__tests__/WhiteboardElbow.test.js +46 -0
- package/dist/esm/presentation/__tests__/WhiteboardElbow.test.js.map +1 -0
- package/dist/esm/presentation/whiteboard/elementToolbars.d.ts.map +1 -1
- package/dist/esm/presentation/whiteboard/elementToolbars.js +8 -8
- package/dist/esm/presentation/whiteboard/elementToolbars.js.map +1 -1
- package/dist/esm/presentation/whiteboard/lineElements.d.ts +7 -4
- package/dist/esm/presentation/whiteboard/lineElements.d.ts.map +1 -1
- package/dist/esm/presentation/whiteboard/lineElements.js +155 -190
- package/dist/esm/presentation/whiteboard/lineElements.js.map +1 -1
- package/dist/esm/presentation/whiteboard/lineInspector.d.ts.map +1 -1
- package/dist/esm/presentation/whiteboard/lineInspector.js +1 -1
- package/dist/esm/presentation/whiteboard/lineInspector.js.map +1 -1
- package/dist/esm/presentation/whiteboard/lineModel.d.ts +29 -11
- package/dist/esm/presentation/whiteboard/lineModel.d.ts.map +1 -1
- package/dist/esm/presentation/whiteboard/lineModel.js +290 -82
- package/dist/esm/presentation/whiteboard/lineModel.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.withLineType = exports.
|
|
6
|
+
exports.withLineType = exports.simplifyPath = exports.segmentAxis = exports.roundedPolylinePath = exports.resolveEndpoints = exports.removeElbowSegment = exports.removeElbowCorner = exports.projectOnSamples = exports.pointAtFraction = exports.optionName = exports.lineGeometry = exports.lineEndGlyph = exports.elbowSegmentAxes = exports.elbowFirstAxis = exports.elbowCorners = exports.elbowAxis = exports.dragElbowSegment = exports.dragElbowCorner = exports.dashArray = exports.constrainAngle = exports.catmullRomSegments = exports.autoElbowRoute = exports.applyElbowRule = exports.anchorPoint = exports.addElbowStep = exports.addCurvedWaypoint = exports.MAX_WAYPOINTS = exports.LineTypeGlyph = exports.LineThicknessGlyph = exports.LinePatternGlyph = exports.LineEndGlyph = exports.LINE_TYPE_OPTIONS = exports.LINE_PATTERN_OPTIONS = exports.LINE_HIT_WIDTH = exports.LINE_END_OPTIONS = exports.LINE_DEFAULT_LENGTH = exports.DEFAULT_LINE_STYLE = exports.DEFAULT_LABEL = exports.CornerRadiusGlyph = exports.ANCHOR_OPTIONS = void 0;
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
8
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
9
9
|
function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
|
|
@@ -12,13 +12,17 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
12
12
|
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
|
|
13
13
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
14
14
|
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
15
|
+
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
16
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
17
|
+
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
18
|
+
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
19
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
20
|
+
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
15
21
|
// mirrors: new-activecollab-front Whiteboards connection `style` (ArrowFormattingToolbar defaults); corner_radius: no payload yet
|
|
16
22
|
|
|
17
23
|
// mirrors: no payload yet
|
|
18
24
|
|
|
19
|
-
// mirrors: no payload yet
|
|
20
|
-
|
|
21
|
-
// mirrors: new-activecollab-front Whiteboards connectionShape (type, start_element_id, end_element_id, start_anchor, end_anchor, style); line fields, waypoints and label: no payload yet
|
|
25
|
+
// mirrors: new-activecollab-front Whiteboards connectionShape (type, start_element_id, end_element_id, start_anchor, end_anchor, style); waypoints: AC task 481540 (one list for Curved and Elbow, elbow waypoints are the corners, at most 20; board coordinates in this mock); label: no payload yet
|
|
22
26
|
|
|
23
27
|
var MAX_WAYPOINTS = exports.MAX_WAYPOINTS = 20;
|
|
24
28
|
var LINE_HIT_WIDTH = exports.LINE_HIT_WIDTH = 10;
|
|
@@ -117,6 +121,7 @@ var DEFAULT_LABEL = exports.DEFAULT_LABEL = {
|
|
|
117
121
|
var dashArray = exports.dashArray = function dashArray(pattern, width) {
|
|
118
122
|
return pattern === "dashed" ? "".concat(width * 4, " ").concat(width * 3) : pattern === "dotted" ? "".concat(width, " ").concat(width * 2) : undefined;
|
|
119
123
|
};
|
|
124
|
+
var EPSILON = 0.0001;
|
|
120
125
|
var distance = function distance(a, b) {
|
|
121
126
|
return Math.hypot(b.x - a.x, b.y - a.y);
|
|
122
127
|
};
|
|
@@ -133,11 +138,25 @@ var midpoint = function midpoint(a, b) {
|
|
|
133
138
|
y: (a.y + b.y) / 2
|
|
134
139
|
};
|
|
135
140
|
};
|
|
141
|
+
var samePoint = function samePoint(a, b) {
|
|
142
|
+
return Math.abs(a.x - b.x) < EPSILON && Math.abs(a.y - b.y) < EPSILON;
|
|
143
|
+
};
|
|
136
144
|
var dedupe = function dedupe(points) {
|
|
137
145
|
return points.filter(function (point, index) {
|
|
138
146
|
return index === 0 || distance(points[index - 1], point) > 0.5;
|
|
139
147
|
});
|
|
140
148
|
};
|
|
149
|
+
var projectOnSegment = function projectOnSegment(a, b, point) {
|
|
150
|
+
var length = distance(a, b);
|
|
151
|
+
if (!length) {
|
|
152
|
+
return a;
|
|
153
|
+
}
|
|
154
|
+
var t = Math.max(0, Math.min(1, ((point.x - a.x) * (b.x - a.x) + (point.y - a.y) * (b.y - a.y)) / (length * length)));
|
|
155
|
+
return {
|
|
156
|
+
x: a.x + (b.x - a.x) * t,
|
|
157
|
+
y: a.y + (b.y - a.y) * t
|
|
158
|
+
};
|
|
159
|
+
};
|
|
141
160
|
var anchorPoint = exports.anchorPoint = function anchorPoint(box, anchor, toward) {
|
|
142
161
|
var cx = box.x + box.width / 2;
|
|
143
162
|
var cy = box.y + box.height / 2;
|
|
@@ -201,6 +220,9 @@ var anchorPoint = exports.anchorPoint = function anchorPoint(box, anchor, toward
|
|
|
201
220
|
}
|
|
202
221
|
}
|
|
203
222
|
};
|
|
223
|
+
var flip = function flip(axis) {
|
|
224
|
+
return axis === "h" ? "v" : "h";
|
|
225
|
+
};
|
|
204
226
|
var elbowAxis = exports.elbowAxis = function elbowAxis(start, end, anchor) {
|
|
205
227
|
if (anchor === "left" || anchor === "right") {
|
|
206
228
|
return "h";
|
|
@@ -210,32 +232,211 @@ var elbowAxis = exports.elbowAxis = function elbowAxis(start, end, anchor) {
|
|
|
210
232
|
}
|
|
211
233
|
return Math.abs(end.x - start.x) >= Math.abs(end.y - start.y) ? "h" : "v";
|
|
212
234
|
};
|
|
213
|
-
var
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
235
|
+
var elbowFirstAxis = exports.elbowFirstAxis = function elbowFirstAxis(start, corners, anchor) {
|
|
236
|
+
var _corners$;
|
|
237
|
+
if (anchor === "left" || anchor === "right") {
|
|
238
|
+
return "h";
|
|
239
|
+
}
|
|
240
|
+
if (anchor === "top" || anchor === "bottom") {
|
|
241
|
+
return "v";
|
|
242
|
+
}
|
|
243
|
+
for (var segment = 1; segment < corners.length; segment += 1) {
|
|
244
|
+
var from = corners[segment - 1];
|
|
245
|
+
var to = corners[segment];
|
|
246
|
+
if (!samePoint(from, to)) {
|
|
247
|
+
var sameY = Math.abs(from.y - to.y) < EPSILON;
|
|
248
|
+
var sameX = Math.abs(from.x - to.x) < EPSILON;
|
|
249
|
+
if (sameY || sameX) {
|
|
250
|
+
var axis = sameY ? "h" : "v";
|
|
251
|
+
return segment % 2 === 0 ? axis : flip(axis);
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
return elbowAxis(start, (_corners$ = corners[0]) !== null && _corners$ !== void 0 ? _corners$ : start);
|
|
256
|
+
};
|
|
257
|
+
var segmentAxis = exports.segmentAxis = function segmentAxis(first, segment) {
|
|
258
|
+
return segment % 2 === 0 ? first : flip(first);
|
|
259
|
+
};
|
|
260
|
+
var applyElbowRule = exports.applyElbowRule = function applyElbowRule(start, end, corners, anchor) {
|
|
261
|
+
if (!corners.length) {
|
|
262
|
+
return [];
|
|
263
|
+
}
|
|
264
|
+
var axis = elbowFirstAxis(start, corners, anchor);
|
|
265
|
+
var previous = start;
|
|
266
|
+
var aligned = corners.map(function (corner) {
|
|
267
|
+
var next = axis === "h" ? {
|
|
268
|
+
x: corner.x,
|
|
269
|
+
y: previous.y
|
|
224
270
|
} : {
|
|
225
|
-
x:
|
|
226
|
-
y:
|
|
271
|
+
x: previous.x,
|
|
272
|
+
y: corner.y
|
|
227
273
|
};
|
|
228
|
-
|
|
274
|
+
previous = next;
|
|
275
|
+
axis = flip(axis);
|
|
276
|
+
return next;
|
|
229
277
|
});
|
|
230
|
-
|
|
231
|
-
|
|
278
|
+
var last = aligned.length - 1;
|
|
279
|
+
aligned[last] = axis === "h" ? {
|
|
280
|
+
x: aligned[last].x,
|
|
232
281
|
y: end.y
|
|
233
282
|
} : {
|
|
234
283
|
x: end.x,
|
|
235
|
-
y:
|
|
284
|
+
y: aligned[last].y
|
|
285
|
+
};
|
|
286
|
+
return aligned;
|
|
287
|
+
};
|
|
288
|
+
var simplifyPath = exports.simplifyPath = function simplifyPath(points) {
|
|
289
|
+
var unique = points.reduce(function (kept, point) {
|
|
290
|
+
return kept.length && samePoint(kept[kept.length - 1], point) ? kept : [...kept, point];
|
|
291
|
+
}, []);
|
|
292
|
+
return unique.filter(function (point, index) {
|
|
293
|
+
if (index === 0 || index === unique.length - 1) {
|
|
294
|
+
return true;
|
|
295
|
+
}
|
|
296
|
+
var before = unique[index - 1];
|
|
297
|
+
var after = unique[index + 1];
|
|
298
|
+
var cross = (point.x - before.x) * (after.y - point.y) - (point.y - before.y) * (after.x - point.x);
|
|
299
|
+
var dot = (point.x - before.x) * (after.x - point.x) + (point.y - before.y) * (after.y - point.y);
|
|
300
|
+
return Math.abs(cross) > EPSILON || dot < 0;
|
|
301
|
+
});
|
|
302
|
+
};
|
|
303
|
+
var autoElbowRoute = exports.autoElbowRoute = function autoElbowRoute(start, end, anchor) {
|
|
304
|
+
var middle = midpoint(start, end);
|
|
305
|
+
return simplifyPath(elbowAxis(start, end, anchor) === "h" ? [start, {
|
|
306
|
+
x: middle.x,
|
|
307
|
+
y: start.y
|
|
308
|
+
}, {
|
|
309
|
+
x: middle.x,
|
|
310
|
+
y: end.y
|
|
311
|
+
}, end] : [start, {
|
|
312
|
+
x: start.x,
|
|
313
|
+
y: middle.y
|
|
314
|
+
}, {
|
|
315
|
+
x: end.x,
|
|
316
|
+
y: middle.y
|
|
317
|
+
}, end]);
|
|
318
|
+
};
|
|
319
|
+
var elbowCorners = exports.elbowCorners = function elbowCorners(line, start, end) {
|
|
320
|
+
return line.waypoints.length ? applyElbowRule(start, end, line.waypoints, line.start_anchor) : autoElbowRoute(start, end, line.start_anchor).slice(1, -1);
|
|
321
|
+
};
|
|
322
|
+
var elbowSegmentAxes = exports.elbowSegmentAxes = function elbowSegmentAxes(frame, corners) {
|
|
323
|
+
var first = elbowFirstAxis(frame.start, corners, frame.anchor);
|
|
324
|
+
return [...corners, frame.end].map(function (_, segment) {
|
|
325
|
+
return segmentAxis(first, segment);
|
|
236
326
|
});
|
|
237
|
-
|
|
238
|
-
|
|
327
|
+
};
|
|
328
|
+
var ruled = function ruled(frame, corners) {
|
|
329
|
+
return applyElbowRule(frame.start, frame.end, corners, frame.anchor);
|
|
330
|
+
};
|
|
331
|
+
var addElbowStep = exports.addElbowStep = function addElbowStep(frame, corners, point) {
|
|
332
|
+
if (corners.length + 2 > MAX_WAYPOINTS) {
|
|
333
|
+
return null;
|
|
334
|
+
}
|
|
335
|
+
var path = [frame.start, ...corners, frame.end];
|
|
336
|
+
var best = 0;
|
|
337
|
+
var bestGap = Infinity;
|
|
338
|
+
var bestPoint = frame.start;
|
|
339
|
+
for (var segment = 0; segment < path.length - 1; segment += 1) {
|
|
340
|
+
var projected = projectOnSegment(path[segment], path[segment + 1], point);
|
|
341
|
+
var gap = distance(projected, point);
|
|
342
|
+
if (gap < bestGap) {
|
|
343
|
+
best = segment;
|
|
344
|
+
bestGap = gap;
|
|
345
|
+
bestPoint = projected;
|
|
346
|
+
}
|
|
347
|
+
}
|
|
348
|
+
return {
|
|
349
|
+
corners: ruled(frame, [...corners.slice(0, best), bestPoint, bestPoint, ...corners.slice(best)]),
|
|
350
|
+
selected: best + 1
|
|
351
|
+
};
|
|
352
|
+
};
|
|
353
|
+
var takeAxis = function takeAxis(corner, axis, from) {
|
|
354
|
+
return axis === "h" ? {
|
|
355
|
+
x: corner.x,
|
|
356
|
+
y: from.y
|
|
357
|
+
} : {
|
|
358
|
+
x: from.x,
|
|
359
|
+
y: corner.y
|
|
360
|
+
};
|
|
361
|
+
};
|
|
362
|
+
var dragElbowCorner = exports.dragElbowCorner = function dragElbowCorner(frame, corners, index, point) {
|
|
363
|
+
var axes = elbowSegmentAxes(frame, corners);
|
|
364
|
+
var last = corners.length - 1;
|
|
365
|
+
var moved = point;
|
|
366
|
+
if (index === 0) {
|
|
367
|
+
moved = axes[0] === "h" ? {
|
|
368
|
+
x: moved.x,
|
|
369
|
+
y: corners[0].y
|
|
370
|
+
} : {
|
|
371
|
+
x: corners[0].x,
|
|
372
|
+
y: moved.y
|
|
373
|
+
};
|
|
374
|
+
}
|
|
375
|
+
if (index === last) {
|
|
376
|
+
moved = axes[last + 1] === "h" ? {
|
|
377
|
+
x: moved.x,
|
|
378
|
+
y: corners[last].y
|
|
379
|
+
} : {
|
|
380
|
+
x: corners[last].x,
|
|
381
|
+
y: moved.y
|
|
382
|
+
};
|
|
383
|
+
}
|
|
384
|
+
return ruled(frame, corners.map(function (corner, at) {
|
|
385
|
+
if (at === index) {
|
|
386
|
+
return moved;
|
|
387
|
+
}
|
|
388
|
+
if (at === index - 1) {
|
|
389
|
+
return takeAxis(corner, axes[index], moved);
|
|
390
|
+
}
|
|
391
|
+
if (at === index + 1) {
|
|
392
|
+
return takeAxis(corner, axes[index + 1], moved);
|
|
393
|
+
}
|
|
394
|
+
return corner;
|
|
395
|
+
}));
|
|
396
|
+
};
|
|
397
|
+
var dragElbowSegment = exports.dragElbowSegment = function dragElbowSegment(frame, corners, index, point) {
|
|
398
|
+
var axis = elbowSegmentAxes(frame, corners)[index + 1];
|
|
399
|
+
return ruled(frame, corners.map(function (corner, at) {
|
|
400
|
+
return at === index || at === index + 1 ? axis === "v" ? {
|
|
401
|
+
x: point.x,
|
|
402
|
+
y: corner.y
|
|
403
|
+
} : {
|
|
404
|
+
x: corner.x,
|
|
405
|
+
y: point.y
|
|
406
|
+
} : corner;
|
|
407
|
+
}));
|
|
408
|
+
};
|
|
409
|
+
var removeElbowCorner = exports.removeElbowCorner = function removeElbowCorner(frame, corners, index) {
|
|
410
|
+
var partner = corners.length === 1 ? index : index === 0 ? 1 : index - 1;
|
|
411
|
+
var next = corners.filter(function (_, at) {
|
|
412
|
+
return at !== index && at !== partner;
|
|
413
|
+
});
|
|
414
|
+
return next.length ? ruled(frame, next) : [];
|
|
415
|
+
};
|
|
416
|
+
var removeElbowSegment = exports.removeElbowSegment = function removeElbowSegment(frame, corners, index) {
|
|
417
|
+
var next = corners.filter(function (_, at) {
|
|
418
|
+
return at !== index && at !== index + 1;
|
|
419
|
+
});
|
|
420
|
+
return next.length ? ruled(frame, next) : [];
|
|
421
|
+
};
|
|
422
|
+
var addCurvedWaypoint = exports.addCurvedWaypoint = function addCurvedWaypoint(start, end, waypoints, point) {
|
|
423
|
+
if (waypoints.length >= MAX_WAYPOINTS) {
|
|
424
|
+
return null;
|
|
425
|
+
}
|
|
426
|
+
var path = [start, ...waypoints, end];
|
|
427
|
+
var best = 0;
|
|
428
|
+
var bestDetour = Infinity;
|
|
429
|
+
for (var index = 0; index < path.length - 1; index += 1) {
|
|
430
|
+
var detour = distance(path[index], point) + distance(point, path[index + 1]) - distance(path[index], path[index + 1]);
|
|
431
|
+
if (detour < bestDetour) {
|
|
432
|
+
best = index;
|
|
433
|
+
bestDetour = detour;
|
|
434
|
+
}
|
|
435
|
+
}
|
|
436
|
+
return {
|
|
437
|
+
waypoints: [...waypoints.slice(0, best), point, ...waypoints.slice(best)],
|
|
438
|
+
selected: best
|
|
439
|
+
};
|
|
239
440
|
};
|
|
240
441
|
var roundedPolylinePath = exports.roundedPolylinePath = function roundedPolylinePath(raw, radius) {
|
|
241
442
|
var points = dedupe(raw);
|
|
@@ -259,23 +460,52 @@ var roundedPolylinePath = exports.roundedPolylinePath = function roundedPolyline
|
|
|
259
460
|
var last = points[points.length - 1];
|
|
260
461
|
return "".concat(d, " L ").concat(last.x, " ").concat(last.y);
|
|
261
462
|
};
|
|
262
|
-
var
|
|
463
|
+
var combine = function combine(terms, divisor) {
|
|
464
|
+
return {
|
|
465
|
+
x: terms.reduce(function (sum, _ref) {
|
|
466
|
+
var _ref2 = _slicedToArray(_ref, 2),
|
|
467
|
+
weight = _ref2[0],
|
|
468
|
+
point = _ref2[1];
|
|
469
|
+
return sum + weight * point.x;
|
|
470
|
+
}, 0) / divisor,
|
|
471
|
+
y: terms.reduce(function (sum, _ref3) {
|
|
472
|
+
var _ref4 = _slicedToArray(_ref3, 2),
|
|
473
|
+
weight = _ref4[0],
|
|
474
|
+
point = _ref4[1];
|
|
475
|
+
return sum + weight * point.y;
|
|
476
|
+
}, 0) / divisor
|
|
477
|
+
};
|
|
478
|
+
};
|
|
479
|
+
var catmullRomSegments = exports.catmullRomSegments = function catmullRomSegments(raw) {
|
|
480
|
+
var points = raw.reduce(function (kept, point) {
|
|
481
|
+
return kept.length && distance(kept[kept.length - 1], point) < EPSILON ? kept : [...kept, point];
|
|
482
|
+
}, []);
|
|
483
|
+
if (points.length <= 2) {
|
|
484
|
+
return [];
|
|
485
|
+
}
|
|
486
|
+
var last = points.length - 1;
|
|
487
|
+
var at = function at(index) {
|
|
488
|
+
if (index < 0) {
|
|
489
|
+
return combine([[2, points[0]], [-1, points[1]]], 1);
|
|
490
|
+
}
|
|
491
|
+
if (index > last) {
|
|
492
|
+
return combine([[2, points[last]], [-1, points[last - 1]]], 1);
|
|
493
|
+
}
|
|
494
|
+
return points[index];
|
|
495
|
+
};
|
|
263
496
|
return points.slice(0, -1).map(function (from, index) {
|
|
264
|
-
var
|
|
265
|
-
var
|
|
266
|
-
var
|
|
267
|
-
var
|
|
497
|
+
var a = at(index - 1);
|
|
498
|
+
var b = from;
|
|
499
|
+
var c = at(index + 1);
|
|
500
|
+
var d = at(index + 2);
|
|
501
|
+
var d1 = Math.sqrt(distance(a, b));
|
|
502
|
+
var d2 = Math.sqrt(distance(b, c));
|
|
503
|
+
var d3 = Math.sqrt(distance(c, d));
|
|
268
504
|
return {
|
|
269
505
|
from,
|
|
270
|
-
c1:
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
},
|
|
274
|
-
c2: {
|
|
275
|
-
x: to.x - (after.x - from.x) / 6,
|
|
276
|
-
y: to.y - (after.y - from.y) / 6
|
|
277
|
-
},
|
|
278
|
-
to
|
|
506
|
+
c1: d1 < EPSILON ? b : combine([[d1 * d1, c], [-d2 * d2, a], [2 * d1 * d1 + 3 * d1 * d2 + d2 * d2, b]], 3 * d1 * (d1 + d2)),
|
|
507
|
+
c2: d3 < EPSILON ? c : combine([[d3 * d3, b], [-d2 * d2, d], [2 * d3 * d3 + 3 * d3 * d2 + d2 * d2, c]], 3 * d3 * (d3 + d2)),
|
|
508
|
+
to: c
|
|
279
509
|
};
|
|
280
510
|
});
|
|
281
511
|
};
|
|
@@ -294,8 +524,8 @@ var angleOf = function angleOf(from, to) {
|
|
|
294
524
|
return Math.atan2(to.y - from.y, to.x - from.x);
|
|
295
525
|
};
|
|
296
526
|
var lineGeometry = exports.lineGeometry = function lineGeometry(line, start, end) {
|
|
297
|
-
|
|
298
|
-
|
|
527
|
+
var segments = line.type === "curved" && line.waypoints.length ? catmullRomSegments([start, ...line.waypoints, end]) : [];
|
|
528
|
+
if (segments.length) {
|
|
299
529
|
var samples = [start];
|
|
300
530
|
var sampleSegments = [0];
|
|
301
531
|
segments.forEach(function (segment, index) {
|
|
@@ -312,25 +542,23 @@ var lineGeometry = exports.lineGeometry = function lineGeometry(line, start, end
|
|
|
312
542
|
}, "M ".concat(start.x, " ").concat(start.y)),
|
|
313
543
|
samples,
|
|
314
544
|
sampleSegments,
|
|
315
|
-
route: [start, ...line.waypoints
|
|
545
|
+
route: [start, ...line.waypoints, end],
|
|
316
546
|
startAngle: angleOf(first.c1, start),
|
|
317
547
|
endAngle: angleOf(last.c2, end)
|
|
318
548
|
};
|
|
319
549
|
}
|
|
320
550
|
if (line.type === "elbow") {
|
|
321
|
-
var
|
|
322
|
-
var route =
|
|
323
|
-
var clean = dedupe(route);
|
|
324
|
-
var _sampleSegments = route.map(function (_, index) {
|
|
325
|
-
return Math.max(0, index - 1);
|
|
326
|
-
});
|
|
551
|
+
var _route$, _route;
|
|
552
|
+
var route = simplifyPath([start, ...elbowCorners(line, start, end), end]);
|
|
327
553
|
return {
|
|
328
554
|
d: roundedPolylinePath(route, line.style.corner_radius),
|
|
329
555
|
samples: route,
|
|
330
|
-
sampleSegments:
|
|
556
|
+
sampleSegments: route.map(function (_, index) {
|
|
557
|
+
return Math.max(0, index - 1);
|
|
558
|
+
}),
|
|
331
559
|
route,
|
|
332
|
-
startAngle: angleOf((
|
|
333
|
-
endAngle: angleOf((
|
|
560
|
+
startAngle: angleOf((_route$ = route[1]) !== null && _route$ !== void 0 ? _route$ : end, start),
|
|
561
|
+
endAngle: angleOf((_route = route[route.length - 2]) !== null && _route !== void 0 ? _route : start, end)
|
|
334
562
|
};
|
|
335
563
|
}
|
|
336
564
|
return {
|
|
@@ -397,37 +625,47 @@ var projectOnSamples = exports.projectOnSamples = function projectOnSamples(samp
|
|
|
397
625
|
point: best.point
|
|
398
626
|
};
|
|
399
627
|
};
|
|
400
|
-
var elbowSegmentIndex = exports.elbowSegmentIndex = function elbowSegmentIndex(route, point) {
|
|
401
|
-
var bestIndex = 0;
|
|
402
|
-
var bestGap = Infinity;
|
|
403
|
-
for (var index = 0; index < route.length - 1; index += 1) {
|
|
404
|
-
var projection = projectOnSamples([route[index], route[index + 1]], [index, index], point);
|
|
405
|
-
var gap = distance(projection.point, point);
|
|
406
|
-
if (gap < bestGap) {
|
|
407
|
-
bestGap = gap;
|
|
408
|
-
bestIndex = index;
|
|
409
|
-
}
|
|
410
|
-
}
|
|
411
|
-
return bestIndex;
|
|
412
|
-
};
|
|
413
628
|
var withLineType = exports.withLineType = function withLineType(line, type, start, end) {
|
|
414
|
-
|
|
629
|
+
var snap = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : function (point) {
|
|
630
|
+
return point;
|
|
631
|
+
};
|
|
632
|
+
if (type === "line" || line.waypoints.length) {
|
|
415
633
|
return _objectSpread(_objectSpread({}, line), {}, {
|
|
416
634
|
type
|
|
417
635
|
});
|
|
418
636
|
}
|
|
419
637
|
var middle = midpoint(start, end);
|
|
420
|
-
var length = distance(start, end)
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
638
|
+
var length = distance(start, end);
|
|
639
|
+
if (type === "curved") {
|
|
640
|
+
var bend = Math.max(24, 0.2 * length);
|
|
641
|
+
return _objectSpread(_objectSpread({}, line), {}, {
|
|
642
|
+
type,
|
|
643
|
+
waypoints: [snap({
|
|
644
|
+
x: middle.x + (length ? (end.y - start.y) / length : 0) * bend,
|
|
645
|
+
y: middle.y - (length ? (end.x - start.x) / length : 1) * bend
|
|
646
|
+
})]
|
|
647
|
+
});
|
|
648
|
+
}
|
|
649
|
+
if (line.kind === "connector") {
|
|
650
|
+
return _objectSpread(_objectSpread({}, line), {}, {
|
|
651
|
+
type
|
|
652
|
+
});
|
|
653
|
+
}
|
|
426
654
|
return _objectSpread(_objectSpread({}, line), {}, {
|
|
427
655
|
type,
|
|
428
|
-
waypoints:
|
|
429
|
-
|
|
430
|
-
|
|
656
|
+
waypoints: elbowAxis(start, end) === "h" ? [{
|
|
657
|
+
x: middle.x,
|
|
658
|
+
y: start.y
|
|
659
|
+
}, {
|
|
660
|
+
x: middle.x,
|
|
661
|
+
y: end.y
|
|
662
|
+
}] : [{
|
|
663
|
+
x: start.x,
|
|
664
|
+
y: middle.y
|
|
665
|
+
}, {
|
|
666
|
+
x: end.x,
|
|
667
|
+
y: middle.y
|
|
668
|
+
}]
|
|
431
669
|
});
|
|
432
670
|
};
|
|
433
671
|
var constrainAngle = exports.constrainAngle = function constrainAngle(from, to) {
|
|
@@ -515,17 +753,17 @@ var TYPE_PATHS = {
|
|
|
515
753
|
};
|
|
516
754
|
|
|
517
755
|
// ds-exception: no line-type glyphs in src/components/Icons — Design System task
|
|
518
|
-
var LineTypeGlyph = exports.LineTypeGlyph = function LineTypeGlyph(
|
|
519
|
-
var type =
|
|
756
|
+
var LineTypeGlyph = exports.LineTypeGlyph = function LineTypeGlyph(_ref5) {
|
|
757
|
+
var type = _ref5.type;
|
|
520
758
|
return /*#__PURE__*/_react.default.createElement("svg", GLYPH_PROPS, /*#__PURE__*/_react.default.createElement("path", {
|
|
521
759
|
d: TYPE_PATHS[type]
|
|
522
760
|
}));
|
|
523
761
|
};
|
|
524
762
|
|
|
525
763
|
// ds-exception: no line-end glyphs in src/components/Icons — Design System task
|
|
526
|
-
var LineEndGlyph = exports.LineEndGlyph = function LineEndGlyph(
|
|
527
|
-
var type =
|
|
528
|
-
side =
|
|
764
|
+
var LineEndGlyph = exports.LineEndGlyph = function LineEndGlyph(_ref6) {
|
|
765
|
+
var type = _ref6.type,
|
|
766
|
+
side = _ref6.side;
|
|
529
767
|
var tip = side === "end" ? {
|
|
530
768
|
x: 17,
|
|
531
769
|
y: 10
|
|
@@ -540,8 +778,8 @@ var LineEndGlyph = exports.LineEndGlyph = function LineEndGlyph(_ref2) {
|
|
|
540
778
|
};
|
|
541
779
|
|
|
542
780
|
// ds-exception: no stroke-pattern glyphs in src/components/Icons — Design System task
|
|
543
|
-
var LinePatternGlyph = exports.LinePatternGlyph = function LinePatternGlyph(
|
|
544
|
-
var pattern =
|
|
781
|
+
var LinePatternGlyph = exports.LinePatternGlyph = function LinePatternGlyph(_ref7) {
|
|
782
|
+
var pattern = _ref7.pattern;
|
|
545
783
|
return /*#__PURE__*/_react.default.createElement("svg", _extends({}, GLYPH_PROPS, {
|
|
546
784
|
strokeWidth: 2,
|
|
547
785
|
strokeLinecap: "butt"
|
|
@@ -552,8 +790,8 @@ var LinePatternGlyph = exports.LinePatternGlyph = function LinePatternGlyph(_ref
|
|
|
552
790
|
};
|
|
553
791
|
|
|
554
792
|
// ds-exception: no stroke-thickness glyphs in src/components/Icons — Design System task
|
|
555
|
-
var LineThicknessGlyph = exports.LineThicknessGlyph = function LineThicknessGlyph(
|
|
556
|
-
var width =
|
|
793
|
+
var LineThicknessGlyph = exports.LineThicknessGlyph = function LineThicknessGlyph(_ref8) {
|
|
794
|
+
var width = _ref8.width;
|
|
557
795
|
return /*#__PURE__*/_react.default.createElement("svg", _extends({}, GLYPH_PROPS, {
|
|
558
796
|
strokeWidth: width
|
|
559
797
|
}), /*#__PURE__*/_react.default.createElement("path", {
|
|
@@ -562,8 +800,8 @@ var LineThicknessGlyph = exports.LineThicknessGlyph = function LineThicknessGlyp
|
|
|
562
800
|
};
|
|
563
801
|
|
|
564
802
|
// ds-exception: no corner-radius glyph in src/components/Icons — Design System task
|
|
565
|
-
var CornerRadiusGlyph = exports.CornerRadiusGlyph = function CornerRadiusGlyph(
|
|
566
|
-
var radius =
|
|
803
|
+
var CornerRadiusGlyph = exports.CornerRadiusGlyph = function CornerRadiusGlyph(_ref9) {
|
|
804
|
+
var radius = _ref9.radius;
|
|
567
805
|
var size = Math.min(10, radius / 4);
|
|
568
806
|
return /*#__PURE__*/_react.default.createElement("svg", GLYPH_PROPS, /*#__PURE__*/_react.default.createElement("path", {
|
|
569
807
|
d: size ? "M4 17 V".concat(4 + size, " A").concat(size, " ").concat(size, " 0 0 1 ").concat(4 + size, " 4 H17") : "M4 17 V4 H17"
|
|
@@ -587,7 +825,7 @@ var resolveEndpoints = exports.resolveEndpoints = function resolveEndpoints(line
|
|
|
587
825
|
var to = line.end_element_id ? boxOf(line.end_element_id) : null;
|
|
588
826
|
var fromCenter = from ? boxCenter(from) : line.start;
|
|
589
827
|
var toCenter = to ? boxCenter(to) : line.end;
|
|
590
|
-
var bends = line.type === "
|
|
828
|
+
var bends = line.type === "line" ? [] : line.waypoints;
|
|
591
829
|
return {
|
|
592
830
|
start: from ? anchorPoint(from, (_line$start_anchor = line.start_anchor) !== null && _line$start_anchor !== void 0 ? _line$start_anchor : "center", (_bends$ = bends[0]) !== null && _bends$ !== void 0 ? _bends$ : toCenter) : line.start,
|
|
593
831
|
end: to ? anchorPoint(to, (_line$end_anchor = line.end_anchor) !== null && _line$end_anchor !== void 0 ? _line$end_anchor : "center", (_bends = bends[bends.length - 1]) !== null && _bends !== void 0 ? _bends : fromCenter) : line.end
|