@gedit/utils
Advanced tools
Comparing version 0.1.53 to 0.1.54
@@ -43,3 +43,3 @@ import { SchemaDecoration } from './schema'; | ||
function getDelta(oldTransform: TransformSchema, newTransform: TransformSchema): TransformSchema; | ||
function mergeDelta(oldTransform: TransformSchema, newTransformDelta: TransformSchema): TransformSchema; | ||
function mergeDelta(oldTransform: TransformSchema, newTransformDelta: TransformSchema, toFixedNum?: number): TransformSchema; | ||
function is(obj: object): obj is TransformSchema; | ||
@@ -46,0 +46,0 @@ } |
@@ -106,23 +106,25 @@ "use strict"; | ||
TransformSchema.getDelta = getDelta; | ||
function mergeDelta(oldTransform, newTransformDelta) { | ||
function mergeDelta(oldTransform, newTransformDelta, toFixedNum) { | ||
var toFixed = toFixedNum !== undefined ? function (v) { return Math.round(v * 100) / 100; } : function (v) { return v; }; | ||
return { | ||
position: { | ||
x: newTransformDelta.position.x + oldTransform.position.x, | ||
y: newTransformDelta.position.y + oldTransform.position.y, | ||
x: toFixed(newTransformDelta.position.x + oldTransform.position.x), | ||
y: toFixed(newTransformDelta.position.y + oldTransform.position.y), | ||
}, | ||
size: { | ||
width: newTransformDelta.size.width + oldTransform.size.width, | ||
height: newTransformDelta.size.height + oldTransform.size.height, | ||
width: toFixed(newTransformDelta.size.width + oldTransform.size.width), | ||
height: toFixed(newTransformDelta.size.height + oldTransform.size.height), | ||
locked: oldTransform.size.locked, | ||
}, | ||
origin: { | ||
x: newTransformDelta.origin.x + oldTransform.origin.x, | ||
y: newTransformDelta.origin.y + oldTransform.origin.y, | ||
x: toFixed(newTransformDelta.origin.x + oldTransform.origin.x), | ||
y: toFixed(newTransformDelta.origin.y + oldTransform.origin.y), | ||
}, | ||
scale: { | ||
x: newTransformDelta.scale.x + oldTransform.scale.x, | ||
y: newTransformDelta.scale.y + oldTransform.scale.y, | ||
x: toFixed(newTransformDelta.scale.x + oldTransform.scale.x), | ||
y: toFixed(newTransformDelta.scale.y + oldTransform.scale.y), | ||
}, | ||
skew: { | ||
x: newTransformDelta.skew.x + oldTransform.skew.x, | ||
y: newTransformDelta.skew.y + oldTransform.skew.y, | ||
x: toFixed(newTransformDelta.skew.x + oldTransform.skew.x), | ||
y: toFixed(newTransformDelta.skew.y + oldTransform.skew.y), | ||
}, | ||
@@ -129,0 +131,0 @@ rotation: newTransformDelta.rotation + oldTransform.rotation, |
{ | ||
"name": "@gedit/utils", | ||
"version": "0.1.53", | ||
"version": "0.1.54", | ||
"license": "MIT", | ||
@@ -32,3 +32,3 @@ "main": "lib/common/index", | ||
}, | ||
"gitHead": "4f2bbfcabcf4e839d28b1b919c4278ea8b65ad00" | ||
"gitHead": "d3f88764de52d4497c40d8182f6cb525b0af64fc" | ||
} |
@@ -145,23 +145,25 @@ import { Schema, SchemaDecoration } from './schema'; | ||
export function mergeDelta(oldTransform: TransformSchema, newTransformDelta: TransformSchema): TransformSchema { | ||
export function mergeDelta(oldTransform: TransformSchema, newTransformDelta: TransformSchema, toFixedNum?: number): TransformSchema { | ||
const toFixed = toFixedNum !== undefined ? (v: number) => Math.round(v * 100) / 100 : (v: number) => v; | ||
return { | ||
position: { | ||
x: newTransformDelta.position.x + oldTransform.position.x, | ||
y: newTransformDelta.position.y + oldTransform.position.y, | ||
x: toFixed(newTransformDelta.position.x + oldTransform.position.x), | ||
y: toFixed(newTransformDelta.position.y + oldTransform.position.y), | ||
}, | ||
size: { | ||
width: newTransformDelta.size.width + oldTransform.size.width, | ||
height: newTransformDelta.size.height + oldTransform.size.height, | ||
width: toFixed(newTransformDelta.size.width + oldTransform.size.width), | ||
height: toFixed(newTransformDelta.size.height + oldTransform.size.height), | ||
locked: oldTransform.size.locked, | ||
}, | ||
origin: { | ||
x: newTransformDelta.origin.x + oldTransform.origin.x, | ||
y: newTransformDelta.origin.y + oldTransform.origin.y, | ||
x: toFixed(newTransformDelta.origin.x + oldTransform.origin.x), | ||
y: toFixed(newTransformDelta.origin.y + oldTransform.origin.y), | ||
}, | ||
scale: { | ||
x: newTransformDelta.scale.x + oldTransform.scale.x, | ||
y: newTransformDelta.scale.y + oldTransform.scale.y, | ||
x: toFixed(newTransformDelta.scale.x + oldTransform.scale.x), | ||
y: toFixed(newTransformDelta.scale.y + oldTransform.scale.y), | ||
}, | ||
skew: { | ||
x: newTransformDelta.skew.x + oldTransform.skew.x, | ||
y: newTransformDelta.skew.y + oldTransform.skew.y, | ||
x: toFixed(newTransformDelta.skew.x + oldTransform.skew.x), | ||
y: toFixed(newTransformDelta.skew.y + oldTransform.skew.y), | ||
}, | ||
@@ -168,0 +170,0 @@ rotation: newTransformDelta.rotation + oldTransform.rotation, |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Unidentified License
License(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.
Found 2 instances in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Unidentified License
License(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.
Found 2 instances in 1 package
542393
10263