@leafer/core 2.1.2 → 2.1.4
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/lib/core.cjs +53 -47
- package/lib/core.esm.js +53 -47
- package/lib/core.esm.min.js +1 -1
- package/lib/core.esm.min.js.map +1 -1
- package/lib/core.min.cjs +1 -1
- package/lib/core.min.cjs.map +1 -1
- package/package.json +17 -17
- package/src/index.ts +1 -1
- package/types/index.d.ts +1 -1
package/lib/core.cjs
CHANGED
|
@@ -3041,6 +3041,7 @@ const PathConvert = {
|
|
|
3041
3041
|
current.length = PathCommandLengthMap[char];
|
|
3042
3042
|
current.index = 0;
|
|
3043
3043
|
pushData(data, current.name);
|
|
3044
|
+
if (char === "m") current.name = PathCommandMap["l"]; else if (char === "M") current.name = PathCommandMap["L"];
|
|
3044
3045
|
if (!needConvert && convertCommand[char]) needConvert = true;
|
|
3045
3046
|
} else {
|
|
3046
3047
|
if (char === "-" || char === "+") {
|
|
@@ -3073,10 +3074,9 @@ const PathConvert = {
|
|
|
3073
3074
|
old[i + 2] += y;
|
|
3074
3075
|
|
|
3075
3076
|
case M$4:
|
|
3076
|
-
x = old[i + 1];
|
|
3077
|
-
y = old[i + 2];
|
|
3078
|
-
|
|
3079
|
-
startY = y;
|
|
3077
|
+
x = startX = old[i + 1];
|
|
3078
|
+
y = startY = old[i + 2];
|
|
3079
|
+
data.push(M$4, x, y);
|
|
3080
3080
|
i += 3;
|
|
3081
3081
|
break;
|
|
3082
3082
|
|
|
@@ -3118,8 +3118,8 @@ const PathConvert = {
|
|
|
3118
3118
|
|
|
3119
3119
|
case S:
|
|
3120
3120
|
smooth = lastCommand === C$3 || lastCommand === S;
|
|
3121
|
-
x1 = smooth ? x * 2 - controlX :
|
|
3122
|
-
y1 = smooth ? y * 2 - controlY :
|
|
3121
|
+
x1 = smooth ? x * 2 - controlX : x;
|
|
3122
|
+
y1 = smooth ? y * 2 - controlY : y;
|
|
3123
3123
|
controlX = old[i + 1];
|
|
3124
3124
|
controlY = old[i + 2];
|
|
3125
3125
|
x = old[i + 3];
|
|
@@ -3153,8 +3153,8 @@ const PathConvert = {
|
|
|
3153
3153
|
|
|
3154
3154
|
case T:
|
|
3155
3155
|
smooth = lastCommand === Q$3 || lastCommand === T;
|
|
3156
|
-
controlX = smooth ? x * 2 - controlX :
|
|
3157
|
-
controlY = smooth ? y * 2 - controlY :
|
|
3156
|
+
controlX = smooth ? x * 2 - controlX : x;
|
|
3157
|
+
controlY = smooth ? y * 2 - controlY : y;
|
|
3158
3158
|
curveMode ? quadraticCurveTo$1(data, x, y, controlX, controlY, old[i + 1], old[i + 2]) : data.push(Q$3, controlX, controlY, old[i + 1], old[i + 2]);
|
|
3159
3159
|
x = old[i + 1];
|
|
3160
3160
|
y = old[i + 2];
|
|
@@ -4859,10 +4859,10 @@ const LeafHelper = {
|
|
|
4859
4859
|
y: y
|
|
4860
4860
|
}, transition) : (t.x = x, t.y = y);
|
|
4861
4861
|
},
|
|
4862
|
-
zoomOfWorld(t, origin, scaleX, scaleY, resize, transition) {
|
|
4863
|
-
L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize, transition);
|
|
4862
|
+
zoomOfWorld(t, origin, scaleX, scaleY, resize, transition, boundsType) {
|
|
4863
|
+
L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize, transition, boundsType);
|
|
4864
4864
|
},
|
|
4865
|
-
zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize, transition) {
|
|
4865
|
+
zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize, transition, boundsType) {
|
|
4866
4866
|
const o = t.__localMatrix;
|
|
4867
4867
|
if (!isNumber(scaleY)) {
|
|
4868
4868
|
if (scaleY) transition = scaleY;
|
|
@@ -4871,7 +4871,7 @@ const LeafHelper = {
|
|
|
4871
4871
|
copy$3(matrix, o);
|
|
4872
4872
|
scaleOfOuter(matrix, origin, scaleX, scaleY);
|
|
4873
4873
|
if (L.hasHighPosition(t)) {
|
|
4874
|
-
L.setTransform(t, matrix, resize, transition);
|
|
4874
|
+
L.setTransform(t, matrix, resize, transition, boundsType);
|
|
4875
4875
|
} else {
|
|
4876
4876
|
const x = t.x + matrix.e - o.e, y = t.y + matrix.f - o.f;
|
|
4877
4877
|
if (transition && !resize) t.animate({
|
|
@@ -4879,7 +4879,7 @@ const LeafHelper = {
|
|
|
4879
4879
|
y: y,
|
|
4880
4880
|
scaleX: t.scaleX * scaleX,
|
|
4881
4881
|
scaleY: t.scaleY * scaleY
|
|
4882
|
-
}, transition); else t.x = x, t.y = y, t.scaleResize(scaleX, scaleY, resize !== true);
|
|
4882
|
+
}, transition); else t.x = x, t.y = y, t.scaleResize(scaleX, scaleY, resize !== true, boundsType);
|
|
4883
4883
|
}
|
|
4884
4884
|
},
|
|
4885
4885
|
rotateOfWorld(t, origin, angle, transition) {
|
|
@@ -4903,18 +4903,18 @@ const LeafHelper = {
|
|
|
4903
4903
|
skewOfOuter(matrix, origin, skewX, skewY);
|
|
4904
4904
|
L.setTransform(t, matrix, resize, transition);
|
|
4905
4905
|
},
|
|
4906
|
-
transformWorld(t, transform, resize, transition) {
|
|
4906
|
+
transformWorld(t, transform, resize, transition, boundsType) {
|
|
4907
4907
|
copy$3(matrix, t.worldTransform);
|
|
4908
4908
|
multiplyParent$2(matrix, transform);
|
|
4909
4909
|
if (t.parent) divideParent(matrix, t.parent.scrollWorldTransform);
|
|
4910
|
-
L.setTransform(t, matrix, resize, transition);
|
|
4910
|
+
L.setTransform(t, matrix, resize, transition, boundsType);
|
|
4911
4911
|
},
|
|
4912
|
-
transform(t, transform, resize, transition) {
|
|
4912
|
+
transform(t, transform, resize, transition, boundsType) {
|
|
4913
4913
|
copy$3(matrix, t.localTransform);
|
|
4914
4914
|
multiplyParent$2(matrix, transform);
|
|
4915
|
-
L.setTransform(t, matrix, resize, transition);
|
|
4915
|
+
L.setTransform(t, matrix, resize, transition, boundsType);
|
|
4916
4916
|
},
|
|
4917
|
-
setTransform(t, transform, resize, transition) {
|
|
4917
|
+
setTransform(t, transform, resize, transition, boundsType) {
|
|
4918
4918
|
const data = t.__, originPoint = data.origin && L.getInnerOrigin(t, data.origin);
|
|
4919
4919
|
const layout = getLayout(transform, originPoint, data.around && L.getInnerOrigin(t, data.around));
|
|
4920
4920
|
if (L.hasOffset(t)) {
|
|
@@ -4930,7 +4930,7 @@ const LeafHelper = {
|
|
|
4930
4930
|
PointHelper.move(layout, originPoint.x - changedPoint.x, originPoint.y - changedPoint.y);
|
|
4931
4931
|
}
|
|
4932
4932
|
t.set(layout);
|
|
4933
|
-
t.scaleResize(scaleX, scaleY, false);
|
|
4933
|
+
t.scaleResize(scaleX, scaleY, false, boundsType);
|
|
4934
4934
|
} else t.set(layout, transition);
|
|
4935
4935
|
},
|
|
4936
4936
|
getFlipTransform(t, axis) {
|
|
@@ -6077,39 +6077,45 @@ const LeafBounds = {
|
|
|
6077
6077
|
this.__updateRenderPath();
|
|
6078
6078
|
this.__updateBoxBounds();
|
|
6079
6079
|
layout.resized = "inner";
|
|
6080
|
-
if (data.__strokeGeometry) data.__strokeGeometry = undefined;
|
|
6081
6080
|
}
|
|
6082
6081
|
if (layout.localBoxChanged) {
|
|
6083
6082
|
if (this.__local) this.__updateLocalBoxBounds();
|
|
6084
6083
|
layout.localBoxChanged = undefined;
|
|
6085
|
-
if (layout.strokeSpread) layout.strokeChanged = true;
|
|
6086
|
-
if (layout.renderSpread) layout.renderChanged = true;
|
|
6084
|
+
if (layout.strokeSpread && !layout.strokeChanged) layout.strokeChanged = layout.boxChanged ? true : 2;
|
|
6085
|
+
if (layout.renderSpread && !layout.renderChanged) layout.renderChanged = layout.boxChanged ? true : 2;
|
|
6087
6086
|
if (this.parent) this.parent.__layout.boxChange();
|
|
6088
6087
|
}
|
|
6089
6088
|
layout.boxChanged = undefined;
|
|
6090
6089
|
if (layout.strokeChanged) {
|
|
6091
|
-
layout.
|
|
6092
|
-
if (layout.strokeSpread) {
|
|
6093
|
-
if (layout.strokeBounds === layout.boxBounds) layout.spreadStroke();
|
|
6094
|
-
this.__updateStrokeBounds();
|
|
6090
|
+
if (layout.strokeChanged === 2) {
|
|
6095
6091
|
this.__updateLocalStrokeBounds();
|
|
6096
6092
|
} else {
|
|
6097
|
-
layout.
|
|
6093
|
+
layout.strokeSpread = this.__updateStrokeSpread();
|
|
6094
|
+
if (layout.strokeSpread) {
|
|
6095
|
+
if (layout.strokeBounds === layout.boxBounds) layout.spreadStroke();
|
|
6096
|
+
this.__updateStrokeBounds();
|
|
6097
|
+
this.__updateLocalStrokeBounds();
|
|
6098
|
+
} else {
|
|
6099
|
+
layout.spreadStrokeCancel();
|
|
6100
|
+
}
|
|
6101
|
+
layout.resized = "inner";
|
|
6102
|
+
if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true;
|
|
6098
6103
|
}
|
|
6099
6104
|
layout.strokeChanged = undefined;
|
|
6100
|
-
if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true;
|
|
6101
6105
|
if (this.parent) this.parent.__layout.strokeChange();
|
|
6102
|
-
layout.resized = "inner";
|
|
6103
|
-
if (data.__strokeGeometry) data.__strokeGeometry = undefined;
|
|
6104
6106
|
}
|
|
6105
6107
|
if (layout.renderChanged) {
|
|
6106
|
-
layout.
|
|
6107
|
-
if (layout.renderSpread) {
|
|
6108
|
-
if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) layout.spreadRender();
|
|
6109
|
-
this.__updateRenderBounds();
|
|
6108
|
+
if (layout.renderChanged === 2) {
|
|
6110
6109
|
this.__updateLocalRenderBounds();
|
|
6111
6110
|
} else {
|
|
6112
|
-
layout.
|
|
6111
|
+
layout.renderSpread = this.__updateRenderSpread();
|
|
6112
|
+
if (layout.renderSpread) {
|
|
6113
|
+
if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) layout.spreadRender();
|
|
6114
|
+
this.__updateRenderBounds();
|
|
6115
|
+
this.__updateLocalRenderBounds();
|
|
6116
|
+
} else {
|
|
6117
|
+
layout.spreadRenderCancel();
|
|
6118
|
+
}
|
|
6113
6119
|
}
|
|
6114
6120
|
layout.renderChanged = undefined;
|
|
6115
6121
|
if (this.parent) this.parent.__layout.renderChange();
|
|
@@ -6663,11 +6669,11 @@ exports.Leaf = class Leaf {
|
|
|
6663
6669
|
const layer = this.leafer ? this.leafer.zoomLayer : this;
|
|
6664
6670
|
return layer.getWorldPoint(page, relative, distance, change);
|
|
6665
6671
|
}
|
|
6666
|
-
setTransform(matrix, resize, transition) {
|
|
6667
|
-
setTransform(this, matrix, resize, transition);
|
|
6672
|
+
setTransform(matrix, resize, transition, boundsType) {
|
|
6673
|
+
setTransform(this, matrix, resize, transition, boundsType);
|
|
6668
6674
|
}
|
|
6669
|
-
transform(matrix, resize, transition) {
|
|
6670
|
-
transform(this, matrix, resize, transition);
|
|
6675
|
+
transform(matrix, resize, transition, boundsType) {
|
|
6676
|
+
transform(this, matrix, resize, transition, boundsType);
|
|
6671
6677
|
}
|
|
6672
6678
|
move(x, y, transition) {
|
|
6673
6679
|
moveLocal(this, x, y, transition);
|
|
@@ -6675,8 +6681,8 @@ exports.Leaf = class Leaf {
|
|
|
6675
6681
|
moveInner(x, y, transition) {
|
|
6676
6682
|
moveWorld(this, x, y, true, transition);
|
|
6677
6683
|
}
|
|
6678
|
-
scaleOf(origin, scaleX, scaleY, resize, transition) {
|
|
6679
|
-
zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition);
|
|
6684
|
+
scaleOf(origin, scaleX, scaleY, resize, transition, boundsType) {
|
|
6685
|
+
zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition, boundsType);
|
|
6680
6686
|
}
|
|
6681
6687
|
rotateOf(origin, rotation, transition) {
|
|
6682
6688
|
rotateOfLocal(this, getLocalOrigin(this, origin), rotation, transition);
|
|
@@ -6684,14 +6690,14 @@ exports.Leaf = class Leaf {
|
|
|
6684
6690
|
skewOf(origin, skewX, skewY, resize, transition) {
|
|
6685
6691
|
skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize, transition);
|
|
6686
6692
|
}
|
|
6687
|
-
transformWorld(worldTransform, resize, transition) {
|
|
6688
|
-
transformWorld(this, worldTransform, resize, transition);
|
|
6693
|
+
transformWorld(worldTransform, resize, transition, boundsType) {
|
|
6694
|
+
transformWorld(this, worldTransform, resize, transition, boundsType);
|
|
6689
6695
|
}
|
|
6690
6696
|
moveWorld(x, y, transition) {
|
|
6691
6697
|
moveWorld(this, x, y, false, transition);
|
|
6692
6698
|
}
|
|
6693
|
-
scaleOfWorld(worldOrigin, scaleX, scaleY, resize, transition) {
|
|
6694
|
-
zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition);
|
|
6699
|
+
scaleOfWorld(worldOrigin, scaleX, scaleY, resize, transition, boundsType) {
|
|
6700
|
+
zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition, boundsType);
|
|
6695
6701
|
}
|
|
6696
6702
|
rotateOfWorld(worldOrigin, rotation) {
|
|
6697
6703
|
rotateOfWorld(this, worldOrigin, rotation);
|
|
@@ -6702,7 +6708,7 @@ exports.Leaf = class Leaf {
|
|
|
6702
6708
|
flip(axis, transition) {
|
|
6703
6709
|
transform(this, getFlipTransform(this, axis), false, transition);
|
|
6704
6710
|
}
|
|
6705
|
-
scaleResize(scaleX, scaleY = scaleX, _noResize) {
|
|
6711
|
+
scaleResize(scaleX, scaleY = scaleX, _noResize, _boundsType) {
|
|
6706
6712
|
this.scaleX *= scaleX;
|
|
6707
6713
|
this.scaleY *= scaleY;
|
|
6708
6714
|
}
|
|
@@ -7077,7 +7083,7 @@ class LeafLevelList {
|
|
|
7077
7083
|
}
|
|
7078
7084
|
}
|
|
7079
7085
|
|
|
7080
|
-
const version = "2.1.
|
|
7086
|
+
const version = "2.1.4";
|
|
7081
7087
|
|
|
7082
7088
|
exports.AlignHelper = AlignHelper;
|
|
7083
7089
|
|
package/lib/core.esm.js
CHANGED
|
@@ -3039,6 +3039,7 @@ const PathConvert = {
|
|
|
3039
3039
|
current.length = PathCommandLengthMap[char];
|
|
3040
3040
|
current.index = 0;
|
|
3041
3041
|
pushData(data, current.name);
|
|
3042
|
+
if (char === "m") current.name = PathCommandMap["l"]; else if (char === "M") current.name = PathCommandMap["L"];
|
|
3042
3043
|
if (!needConvert && convertCommand[char]) needConvert = true;
|
|
3043
3044
|
} else {
|
|
3044
3045
|
if (char === "-" || char === "+") {
|
|
@@ -3071,10 +3072,9 @@ const PathConvert = {
|
|
|
3071
3072
|
old[i + 2] += y;
|
|
3072
3073
|
|
|
3073
3074
|
case M$4:
|
|
3074
|
-
x = old[i + 1];
|
|
3075
|
-
y = old[i + 2];
|
|
3076
|
-
|
|
3077
|
-
startY = y;
|
|
3075
|
+
x = startX = old[i + 1];
|
|
3076
|
+
y = startY = old[i + 2];
|
|
3077
|
+
data.push(M$4, x, y);
|
|
3078
3078
|
i += 3;
|
|
3079
3079
|
break;
|
|
3080
3080
|
|
|
@@ -3116,8 +3116,8 @@ const PathConvert = {
|
|
|
3116
3116
|
|
|
3117
3117
|
case S:
|
|
3118
3118
|
smooth = lastCommand === C$3 || lastCommand === S;
|
|
3119
|
-
x1 = smooth ? x * 2 - controlX :
|
|
3120
|
-
y1 = smooth ? y * 2 - controlY :
|
|
3119
|
+
x1 = smooth ? x * 2 - controlX : x;
|
|
3120
|
+
y1 = smooth ? y * 2 - controlY : y;
|
|
3121
3121
|
controlX = old[i + 1];
|
|
3122
3122
|
controlY = old[i + 2];
|
|
3123
3123
|
x = old[i + 3];
|
|
@@ -3151,8 +3151,8 @@ const PathConvert = {
|
|
|
3151
3151
|
|
|
3152
3152
|
case T:
|
|
3153
3153
|
smooth = lastCommand === Q$3 || lastCommand === T;
|
|
3154
|
-
controlX = smooth ? x * 2 - controlX :
|
|
3155
|
-
controlY = smooth ? y * 2 - controlY :
|
|
3154
|
+
controlX = smooth ? x * 2 - controlX : x;
|
|
3155
|
+
controlY = smooth ? y * 2 - controlY : y;
|
|
3156
3156
|
curveMode ? quadraticCurveTo$1(data, x, y, controlX, controlY, old[i + 1], old[i + 2]) : data.push(Q$3, controlX, controlY, old[i + 1], old[i + 2]);
|
|
3157
3157
|
x = old[i + 1];
|
|
3158
3158
|
y = old[i + 2];
|
|
@@ -4857,10 +4857,10 @@ const LeafHelper = {
|
|
|
4857
4857
|
y: y
|
|
4858
4858
|
}, transition) : (t.x = x, t.y = y);
|
|
4859
4859
|
},
|
|
4860
|
-
zoomOfWorld(t, origin, scaleX, scaleY, resize, transition) {
|
|
4861
|
-
L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize, transition);
|
|
4860
|
+
zoomOfWorld(t, origin, scaleX, scaleY, resize, transition, boundsType) {
|
|
4861
|
+
L.zoomOfLocal(t, getTempLocal(t, origin), scaleX, scaleY, resize, transition, boundsType);
|
|
4862
4862
|
},
|
|
4863
|
-
zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize, transition) {
|
|
4863
|
+
zoomOfLocal(t, origin, scaleX, scaleY = scaleX, resize, transition, boundsType) {
|
|
4864
4864
|
const o = t.__localMatrix;
|
|
4865
4865
|
if (!isNumber(scaleY)) {
|
|
4866
4866
|
if (scaleY) transition = scaleY;
|
|
@@ -4869,7 +4869,7 @@ const LeafHelper = {
|
|
|
4869
4869
|
copy$3(matrix, o);
|
|
4870
4870
|
scaleOfOuter(matrix, origin, scaleX, scaleY);
|
|
4871
4871
|
if (L.hasHighPosition(t)) {
|
|
4872
|
-
L.setTransform(t, matrix, resize, transition);
|
|
4872
|
+
L.setTransform(t, matrix, resize, transition, boundsType);
|
|
4873
4873
|
} else {
|
|
4874
4874
|
const x = t.x + matrix.e - o.e, y = t.y + matrix.f - o.f;
|
|
4875
4875
|
if (transition && !resize) t.animate({
|
|
@@ -4877,7 +4877,7 @@ const LeafHelper = {
|
|
|
4877
4877
|
y: y,
|
|
4878
4878
|
scaleX: t.scaleX * scaleX,
|
|
4879
4879
|
scaleY: t.scaleY * scaleY
|
|
4880
|
-
}, transition); else t.x = x, t.y = y, t.scaleResize(scaleX, scaleY, resize !== true);
|
|
4880
|
+
}, transition); else t.x = x, t.y = y, t.scaleResize(scaleX, scaleY, resize !== true, boundsType);
|
|
4881
4881
|
}
|
|
4882
4882
|
},
|
|
4883
4883
|
rotateOfWorld(t, origin, angle, transition) {
|
|
@@ -4901,18 +4901,18 @@ const LeafHelper = {
|
|
|
4901
4901
|
skewOfOuter(matrix, origin, skewX, skewY);
|
|
4902
4902
|
L.setTransform(t, matrix, resize, transition);
|
|
4903
4903
|
},
|
|
4904
|
-
transformWorld(t, transform, resize, transition) {
|
|
4904
|
+
transformWorld(t, transform, resize, transition, boundsType) {
|
|
4905
4905
|
copy$3(matrix, t.worldTransform);
|
|
4906
4906
|
multiplyParent$2(matrix, transform);
|
|
4907
4907
|
if (t.parent) divideParent(matrix, t.parent.scrollWorldTransform);
|
|
4908
|
-
L.setTransform(t, matrix, resize, transition);
|
|
4908
|
+
L.setTransform(t, matrix, resize, transition, boundsType);
|
|
4909
4909
|
},
|
|
4910
|
-
transform(t, transform, resize, transition) {
|
|
4910
|
+
transform(t, transform, resize, transition, boundsType) {
|
|
4911
4911
|
copy$3(matrix, t.localTransform);
|
|
4912
4912
|
multiplyParent$2(matrix, transform);
|
|
4913
|
-
L.setTransform(t, matrix, resize, transition);
|
|
4913
|
+
L.setTransform(t, matrix, resize, transition, boundsType);
|
|
4914
4914
|
},
|
|
4915
|
-
setTransform(t, transform, resize, transition) {
|
|
4915
|
+
setTransform(t, transform, resize, transition, boundsType) {
|
|
4916
4916
|
const data = t.__, originPoint = data.origin && L.getInnerOrigin(t, data.origin);
|
|
4917
4917
|
const layout = getLayout(transform, originPoint, data.around && L.getInnerOrigin(t, data.around));
|
|
4918
4918
|
if (L.hasOffset(t)) {
|
|
@@ -4928,7 +4928,7 @@ const LeafHelper = {
|
|
|
4928
4928
|
PointHelper.move(layout, originPoint.x - changedPoint.x, originPoint.y - changedPoint.y);
|
|
4929
4929
|
}
|
|
4930
4930
|
t.set(layout);
|
|
4931
|
-
t.scaleResize(scaleX, scaleY, false);
|
|
4931
|
+
t.scaleResize(scaleX, scaleY, false, boundsType);
|
|
4932
4932
|
} else t.set(layout, transition);
|
|
4933
4933
|
},
|
|
4934
4934
|
getFlipTransform(t, axis) {
|
|
@@ -6075,39 +6075,45 @@ const LeafBounds = {
|
|
|
6075
6075
|
this.__updateRenderPath();
|
|
6076
6076
|
this.__updateBoxBounds();
|
|
6077
6077
|
layout.resized = "inner";
|
|
6078
|
-
if (data.__strokeGeometry) data.__strokeGeometry = undefined;
|
|
6079
6078
|
}
|
|
6080
6079
|
if (layout.localBoxChanged) {
|
|
6081
6080
|
if (this.__local) this.__updateLocalBoxBounds();
|
|
6082
6081
|
layout.localBoxChanged = undefined;
|
|
6083
|
-
if (layout.strokeSpread) layout.strokeChanged = true;
|
|
6084
|
-
if (layout.renderSpread) layout.renderChanged = true;
|
|
6082
|
+
if (layout.strokeSpread && !layout.strokeChanged) layout.strokeChanged = layout.boxChanged ? true : 2;
|
|
6083
|
+
if (layout.renderSpread && !layout.renderChanged) layout.renderChanged = layout.boxChanged ? true : 2;
|
|
6085
6084
|
if (this.parent) this.parent.__layout.boxChange();
|
|
6086
6085
|
}
|
|
6087
6086
|
layout.boxChanged = undefined;
|
|
6088
6087
|
if (layout.strokeChanged) {
|
|
6089
|
-
layout.
|
|
6090
|
-
if (layout.strokeSpread) {
|
|
6091
|
-
if (layout.strokeBounds === layout.boxBounds) layout.spreadStroke();
|
|
6092
|
-
this.__updateStrokeBounds();
|
|
6088
|
+
if (layout.strokeChanged === 2) {
|
|
6093
6089
|
this.__updateLocalStrokeBounds();
|
|
6094
6090
|
} else {
|
|
6095
|
-
layout.
|
|
6091
|
+
layout.strokeSpread = this.__updateStrokeSpread();
|
|
6092
|
+
if (layout.strokeSpread) {
|
|
6093
|
+
if (layout.strokeBounds === layout.boxBounds) layout.spreadStroke();
|
|
6094
|
+
this.__updateStrokeBounds();
|
|
6095
|
+
this.__updateLocalStrokeBounds();
|
|
6096
|
+
} else {
|
|
6097
|
+
layout.spreadStrokeCancel();
|
|
6098
|
+
}
|
|
6099
|
+
layout.resized = "inner";
|
|
6100
|
+
if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true;
|
|
6096
6101
|
}
|
|
6097
6102
|
layout.strokeChanged = undefined;
|
|
6098
|
-
if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true;
|
|
6099
6103
|
if (this.parent) this.parent.__layout.strokeChange();
|
|
6100
|
-
layout.resized = "inner";
|
|
6101
|
-
if (data.__strokeGeometry) data.__strokeGeometry = undefined;
|
|
6102
6104
|
}
|
|
6103
6105
|
if (layout.renderChanged) {
|
|
6104
|
-
layout.
|
|
6105
|
-
if (layout.renderSpread) {
|
|
6106
|
-
if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) layout.spreadRender();
|
|
6107
|
-
this.__updateRenderBounds();
|
|
6106
|
+
if (layout.renderChanged === 2) {
|
|
6108
6107
|
this.__updateLocalRenderBounds();
|
|
6109
6108
|
} else {
|
|
6110
|
-
layout.
|
|
6109
|
+
layout.renderSpread = this.__updateRenderSpread();
|
|
6110
|
+
if (layout.renderSpread) {
|
|
6111
|
+
if (layout.renderBounds === layout.boxBounds || layout.renderBounds === layout.strokeBounds) layout.spreadRender();
|
|
6112
|
+
this.__updateRenderBounds();
|
|
6113
|
+
this.__updateLocalRenderBounds();
|
|
6114
|
+
} else {
|
|
6115
|
+
layout.spreadRenderCancel();
|
|
6116
|
+
}
|
|
6111
6117
|
}
|
|
6112
6118
|
layout.renderChanged = undefined;
|
|
6113
6119
|
if (this.parent) this.parent.__layout.renderChange();
|
|
@@ -6661,11 +6667,11 @@ let Leaf = class Leaf {
|
|
|
6661
6667
|
const layer = this.leafer ? this.leafer.zoomLayer : this;
|
|
6662
6668
|
return layer.getWorldPoint(page, relative, distance, change);
|
|
6663
6669
|
}
|
|
6664
|
-
setTransform(matrix, resize, transition) {
|
|
6665
|
-
setTransform(this, matrix, resize, transition);
|
|
6670
|
+
setTransform(matrix, resize, transition, boundsType) {
|
|
6671
|
+
setTransform(this, matrix, resize, transition, boundsType);
|
|
6666
6672
|
}
|
|
6667
|
-
transform(matrix, resize, transition) {
|
|
6668
|
-
transform(this, matrix, resize, transition);
|
|
6673
|
+
transform(matrix, resize, transition, boundsType) {
|
|
6674
|
+
transform(this, matrix, resize, transition, boundsType);
|
|
6669
6675
|
}
|
|
6670
6676
|
move(x, y, transition) {
|
|
6671
6677
|
moveLocal(this, x, y, transition);
|
|
@@ -6673,8 +6679,8 @@ let Leaf = class Leaf {
|
|
|
6673
6679
|
moveInner(x, y, transition) {
|
|
6674
6680
|
moveWorld(this, x, y, true, transition);
|
|
6675
6681
|
}
|
|
6676
|
-
scaleOf(origin, scaleX, scaleY, resize, transition) {
|
|
6677
|
-
zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition);
|
|
6682
|
+
scaleOf(origin, scaleX, scaleY, resize, transition, boundsType) {
|
|
6683
|
+
zoomOfLocal(this, getLocalOrigin(this, origin), scaleX, scaleY, resize, transition, boundsType);
|
|
6678
6684
|
}
|
|
6679
6685
|
rotateOf(origin, rotation, transition) {
|
|
6680
6686
|
rotateOfLocal(this, getLocalOrigin(this, origin), rotation, transition);
|
|
@@ -6682,14 +6688,14 @@ let Leaf = class Leaf {
|
|
|
6682
6688
|
skewOf(origin, skewX, skewY, resize, transition) {
|
|
6683
6689
|
skewOfLocal(this, getLocalOrigin(this, origin), skewX, skewY, resize, transition);
|
|
6684
6690
|
}
|
|
6685
|
-
transformWorld(worldTransform, resize, transition) {
|
|
6686
|
-
transformWorld(this, worldTransform, resize, transition);
|
|
6691
|
+
transformWorld(worldTransform, resize, transition, boundsType) {
|
|
6692
|
+
transformWorld(this, worldTransform, resize, transition, boundsType);
|
|
6687
6693
|
}
|
|
6688
6694
|
moveWorld(x, y, transition) {
|
|
6689
6695
|
moveWorld(this, x, y, false, transition);
|
|
6690
6696
|
}
|
|
6691
|
-
scaleOfWorld(worldOrigin, scaleX, scaleY, resize, transition) {
|
|
6692
|
-
zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition);
|
|
6697
|
+
scaleOfWorld(worldOrigin, scaleX, scaleY, resize, transition, boundsType) {
|
|
6698
|
+
zoomOfWorld(this, worldOrigin, scaleX, scaleY, resize, transition, boundsType);
|
|
6693
6699
|
}
|
|
6694
6700
|
rotateOfWorld(worldOrigin, rotation) {
|
|
6695
6701
|
rotateOfWorld(this, worldOrigin, rotation);
|
|
@@ -6700,7 +6706,7 @@ let Leaf = class Leaf {
|
|
|
6700
6706
|
flip(axis, transition) {
|
|
6701
6707
|
transform(this, getFlipTransform(this, axis), false, transition);
|
|
6702
6708
|
}
|
|
6703
|
-
scaleResize(scaleX, scaleY = scaleX, _noResize) {
|
|
6709
|
+
scaleResize(scaleX, scaleY = scaleX, _noResize, _boundsType) {
|
|
6704
6710
|
this.scaleX *= scaleX;
|
|
6705
6711
|
this.scaleY *= scaleY;
|
|
6706
6712
|
}
|
|
@@ -7075,6 +7081,6 @@ class LeafLevelList {
|
|
|
7075
7081
|
}
|
|
7076
7082
|
}
|
|
7077
7083
|
|
|
7078
|
-
const version = "2.1.
|
|
7084
|
+
const version = "2.1.4";
|
|
7079
7085
|
|
|
7080
7086
|
export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Branch, BranchHelper, BranchRender, CanvasManager, ChildEvent, Creator, DataHelper, Debug, Direction4, Direction9, EllipseHelper, Event, EventCreator, Eventer, FileHelper, FourNumberHelper, ImageEvent, ImageManager, IncrementId, LayoutEvent, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, LeaferCanvasBase, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, MathHelper, Matrix, MatrixHelper, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Platform, Plugin, Point, PointHelper, PropertyEvent, RectHelper, RenderEvent, ResizeEvent, Resource, Run, StringNumberMap, TaskItem, TaskProcessor, TwoPointBoundsHelper, UICreator, UnitConvertHelper, WaitHelper, WatchEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds, tempMatrix, tempPoint$2 as tempPoint, tryToNumber, useModule, version, visibleType };
|