Fix syntax errors in DimensionLayer + fix possible bug in canvas where scale doesnt work for SelfDimensionMargins
This commit is contained in:
parent
9e9a5f3f52
commit
2772cc3e24
2 changed files with 6 additions and 6 deletions
|
@ -7,7 +7,8 @@ import {
|
||||||
SHOW_BORROWER_DIMENSIONS,
|
SHOW_BORROWER_DIMENSIONS,
|
||||||
SHOW_CHILDREN_DIMENSIONS,
|
SHOW_CHILDREN_DIMENSIONS,
|
||||||
DIMENSION_MARGIN,
|
DIMENSION_MARGIN,
|
||||||
SHOW_SELF_MARGINS_DIMENSIONS, DEFAULT_DIMENSION_SYMBOL_STYLE
|
SHOW_SELF_MARGINS_DIMENSIONS,
|
||||||
|
DEFAULT_DIMENSION_SYMBOL_STYLE
|
||||||
} from '../../utils/default';
|
} from '../../utils/default';
|
||||||
import { FindContainerById, MakeRecursionDFSIterator, Pairwise } from '../../utils/itertools';
|
import { FindContainerById, MakeRecursionDFSIterator, Pairwise } from '../../utils/itertools';
|
||||||
import { TransformX, TransformY } from '../../utils/svg';
|
import { TransformX, TransformY } from '../../utils/svg';
|
||||||
|
@ -45,7 +46,7 @@ export function AddContainerDimensions(
|
||||||
dimMapped,
|
dimMapped,
|
||||||
container.properties.dimensionOptions.selfMarginsDimensions.positions,
|
container.properties.dimensionOptions.selfMarginsDimensions.positions,
|
||||||
AddHorizontalSelfMarginsDimension,
|
AddHorizontalSelfMarginsDimension,
|
||||||
AddVerticalSelfMarginDimension,
|
AddVerticalSelfMarginsDimension,
|
||||||
[
|
[
|
||||||
container,
|
container,
|
||||||
currentTransform,
|
currentTransform,
|
||||||
|
@ -474,7 +475,6 @@ function AddHorizontalSelfMarginsDimension(
|
||||||
yDim: number,
|
yDim: number,
|
||||||
container: IContainerModel,
|
container: IContainerModel,
|
||||||
currentTransform: [number, number],
|
currentTransform: [number, number],
|
||||||
dimensions: React.ReactNode[],
|
|
||||||
scale: number
|
scale: number
|
||||||
): void {
|
): void {
|
||||||
const style = container.properties.dimensionOptions.selfMarginsDimensions;
|
const style = container.properties.dimensionOptions.selfMarginsDimensions;
|
||||||
|
@ -520,7 +520,7 @@ function AddHorizontalSelfMarginsDimension(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function AddVerticalSelfMarginDimension(
|
function AddVerticalSelfMarginsDimension(
|
||||||
ctx: CanvasRenderingContext2D,
|
ctx: CanvasRenderingContext2D,
|
||||||
xDim: number,
|
xDim: number,
|
||||||
isRight: boolean,
|
isRight: boolean,
|
||||||
|
|
|
@ -99,7 +99,7 @@ function Dimensions({ containers, symbols, root, scale }: IDimensionLayerProps):
|
||||||
dimMapped,
|
dimMapped,
|
||||||
container.properties.dimensionOptions.selfMarginsDimensions.positions,
|
container.properties.dimensionOptions.selfMarginsDimensions.positions,
|
||||||
AddHorizontalSelfMarginsDimension,
|
AddHorizontalSelfMarginsDimension,
|
||||||
AddVerticalSelfMarginDimension,
|
AddVerticalSelfMarginsDimension,
|
||||||
[
|
[
|
||||||
container,
|
container,
|
||||||
currentTransform,
|
currentTransform,
|
||||||
|
@ -611,7 +611,7 @@ function AddHorizontalSelfMarginsDimension(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function AddVerticalSelfMarginDimension(
|
function AddVerticalSelfMarginsDimension(
|
||||||
xDim: number,
|
xDim: number,
|
||||||
isRight: boolean,
|
isRight: boolean,
|
||||||
container: IContainerModel,
|
container: IContainerModel,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue