|
@@ -702,6 +702,7 @@ var TimelineElementType;
|
|
TimelineElementType["Timeline"] = "timeline";
|
|
TimelineElementType["Timeline"] = "timeline";
|
|
TimelineElementType["Keyframe"] = "keyframe";
|
|
TimelineElementType["Keyframe"] = "keyframe";
|
|
TimelineElementType["Stripe"] = "stripe";
|
|
TimelineElementType["Stripe"] = "stripe";
|
|
|
|
+ TimelineElementType["Row"] = "row";
|
|
})(TimelineElementType || (TimelineElementType = {}));
|
|
})(TimelineElementType || (TimelineElementType = {}));
|
|
// CONCATENATED MODULE: ./src/enums/timelineEvents.ts
|
|
// CONCATENATED MODULE: ./src/enums/timelineEvents.ts
|
|
var TimelineEvents;
|
|
var TimelineEvents;
|
|
@@ -2763,11 +2764,11 @@ var timeline_Timeline = /*#__PURE__*/function (_TimelineEventsEmitte) {
|
|
|
|
|
|
// filter and sort: Timeline, individual keyframes, stripes (distance).
|
|
// filter and sort: Timeline, individual keyframes, stripes (distance).
|
|
var getPriority = function getPriority(type) {
|
|
var getPriority = function getPriority(type) {
|
|
- if (type === TimelineElementType.Keyframe) {
|
|
|
|
|
|
+ if (type === TimelineElementType.Timeline) {
|
|
return 1;
|
|
return 1;
|
|
- } else if (type === TimelineElementType.Stripe) {
|
|
|
|
|
|
+ } else if (type === TimelineElementType.Keyframe) {
|
|
return 2;
|
|
return 2;
|
|
- } else if (type === TimelineElementType.Timeline) {
|
|
|
|
|
|
+ } else if (type === TimelineElementType.Stripe) {
|
|
return 3;
|
|
return 3;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2787,6 +2788,8 @@ var timeline_Timeline = /*#__PURE__*/function (_TimelineEventsEmitte) {
|
|
if (!_draggable) {
|
|
if (!_draggable) {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
+ } else if (element.type === TimelineElementType.Row) {
|
|
|
|
+ return false;
|
|
}
|
|
}
|
|
|
|
|
|
return true;
|
|
return true;
|
|
@@ -2840,6 +2843,17 @@ var timeline_Timeline = /*#__PURE__*/function (_TimelineEventsEmitte) {
|
|
this.forEachKeyframe(function (keyframe, keyframeIndex, rowModel, rowIndex, isNextRow) {
|
|
this.forEachKeyframe(function (keyframe, keyframeIndex, rowModel, rowIndex, isNextRow) {
|
|
// Check keyframes stripe overlap
|
|
// Check keyframes stripe overlap
|
|
if (isNextRow && rowModel.stripeRect) {
|
|
if (isNextRow && rowModel.stripeRect) {
|
|
|
|
+ var rowOverlapped = TimelineUtils.isOverlap(pos.x, pos.y, rowModel);
|
|
|
|
+
|
|
|
|
+ if (rowOverlapped) {
|
|
|
|
+ var _row = {
|
|
|
|
+ val: _this9.mousePosToVal(pos.x, true),
|
|
|
|
+ type: TimelineElementType.Row,
|
|
|
|
+ row: rowModel.row
|
|
|
|
+ };
|
|
|
|
+ toReturn.push(_row);
|
|
|
|
+ }
|
|
|
|
+
|
|
var keyframesStripeOverlapped = TimelineUtils.isOverlap(pos.x, pos.y, rowModel.stripeRect);
|
|
var keyframesStripeOverlapped = TimelineUtils.isOverlap(pos.x, pos.y, rowModel.stripeRect);
|
|
|
|
|
|
if (keyframesStripeOverlapped) {
|
|
if (keyframesStripeOverlapped) {
|