Siklos/svg-layout-designer-react
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove Number() calls
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse source
This commit is contained in:
Siklos 2022-08-15 22:57:08 +02:00
parent dd2079b975
commit 3c164581ce
7 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Components/Editor/Behaviors/AnchorBehaviors.ts
View file

@ -49,7 +49,7 @@ function getOverlappingContainers(
containers: IContainerModel[]
): IContainerModel[] {
const min1 = container.properties.x;
const max1 = container.properties.x + Number(container.properties.width);
const max1 = container.properties.x + container.properties.width;
const overlappingContainers: IContainerModel[] = [];
for (const other of containers) {
if (other === container) {
@ -57,7 +57,7 @@ function getOverlappingContainers(
}
const min2 = other.properties.x;
const max2 = other.properties.x + Number(other.properties.width);
const max2 = other.properties.x + other.properties.width;
const isOverlapping = Math.min(max1, max2) - Math.max(min1, min2) > 0;
if (!isOverlapping) {

24
src/Components/Editor/Behaviors/RigidBodyBehaviors.ts
View file

@ -42,8 +42,8 @@ function constraintBodyInsideParent(
}
const parentProperties = container.parent.properties;
const parentWidth = Number(parentProperties.width);
const parentHeight = Number(parentProperties.height);
const parentWidth = parentProperties.width;
const parentHeight = parentProperties.height;
return constraintBodyInsideSpace(container, 0, 0, parentWidth, parentHeight);
}
@ -66,10 +66,10 @@ function constraintBodyInsideSpace(
height: number
): IContainerModel {
const containerProperties = container.properties;
const containerX = Number(containerProperties.x);
const containerY = Number(containerProperties.y);
const containerWidth = Number(containerProperties.width);
const containerHeight = Number(containerProperties.height);
const containerX = containerProperties.x;
const containerY = containerProperties.y;
const containerWidth = containerProperties.width;
const containerHeight = containerProperties.height;
// Check size bigger than parent
const isBodyLargerThanParent = containerWidth > width;
@ -121,8 +121,8 @@ export function constraintBodyInsideUnallocatedWidth(
// Get the available spaces of the parent
const availableWidths = getAvailableWidths(container.parent, container);
const containerX = Number(container.properties.x);
const containerWidth = Number(container.properties.width);
const containerX = container.properties.x;
const containerWidth = container.properties.width;
// Check if there is still some space
if (availableWidths.length === 0) {
@ -177,7 +177,7 @@ export function constraintBodyInsideUnallocatedWidth(
availableWidthFound.x,
0,
availableWidthFound.width,
Number(container.parent.properties.height)
container.parent.properties.height
);
}
@ -197,7 +197,7 @@ function getAvailableWidths(
// Initialize the first size pointer
// which takes full width of the available space
const x = 0;
const width = Number(container.properties.width);
const width = container.properties.width;
let unallocatedSpaces: ISizePointer[] = [{ x, width }];
// We will only uses containers that also are rigid or are anchors
@ -211,7 +211,7 @@ function getAvailableWidths(
continue;
}
const childX = child.properties.x;
const childWidth = Number(child.properties.width);
const childWidth = child.properties.width;
// get the space of the child that is inside the parent
let newUnallocatedSpace: ISizePointer[] = [];
@ -309,4 +309,4 @@ function getAvailableWidthsTwoLines(
const isFitting = (
container: IContainerModel,
sizePointer: ISizePointer
): boolean => Number(container.properties.width) <= sizePointer.width;
): boolean => container.properties.width <= sizePointer.width;

8
src/Components/Editor/ContainerOperations.ts
View file

@ -266,13 +266,13 @@ function ApplyAddMethod(index: number, containerConfig: IAvailableContainer, par
if (lastChild !== undefined) {
const [transformedX] = transformPosition(
Number(lastChild.properties.x),
Number(lastChild.properties.y),
Number(lastChild.properties.width),
lastChild.properties.x,
lastChild.properties.y,
lastChild.properties.width,
lastChild.properties.XPositionReference
);
x += transformedX + Number(lastChild.properties.width);
x += transformedX + lastChild.properties.width;
}
}
return x;

4
src/Components/Editor/Editor.tsx
View file

@ -133,8 +133,8 @@ const Editor: React.FunctionComponent<IEditorProps> = (props) => {
LoadState={(move) => setHistoryCurrentStep(move)}
/>
<SVG
width={Number(current.MainContainer?.properties.width)}
height={Number(current.MainContainer?.properties.height)}
width={current.MainContainer?.properties.width}
height={current.MainContainer?.properties.height}
selected={current.SelectedContainer}
>
{ current.MainContainer }

18
src/Components/SVG/Elements/Container.tsx
View file

@ -15,13 +15,13 @@ interface IContainerProps {
*/
export const Container: React.FC<IContainerProps> = (props: IContainerProps) => {
const containersElements = props.model.children.map(child => <Container key={`container-${child.properties.id}`} model={child} />);
const xText = Number(props.model.properties.width) / 2;
const yText = Number(props.model.properties.height) / 2;
const xText = props.model.properties.width / 2;
const yText = props.model.properties.height / 2;
const [transformedX, transformedY] = transformPosition(
Number(props.model.properties.x),
Number(props.model.properties.y),
Number(props.model.properties.width),
props.model.properties.x,
props.model.properties.y,
props.model.properties.width,
props.model.properties.XPositionReference
);
const transform = `translate(${transformedX}, ${transformedY})`;
@ -48,7 +48,7 @@ export const Container: React.FC<IContainerProps> = (props: IContainerProps) =>
const dimensionMargin = DIMENSION_MARGIN * (depth + 1);
const id = `dim-${props.model.properties.id}`;
const xStart: number = 0;
const xEnd = Number(props.model.properties.width);
const xEnd = props.model.properties.width;
const y = -dimensionMargin;
const strokeWidth = 1;
const text = (props.model.properties.width ?? 0).toString();
@ -112,20 +112,20 @@ function GetChildrenDimensionProps(props: IContainerProps, dimensionMargin: numb
const lastChild = props.model.children[props.model.children.length - 1];
let xChildrenStart = lastChild.properties.x;
let xChildrenEnd = lastChild.properties.x + Number(lastChild.properties.width);
let xChildrenEnd = lastChild.properties.x + lastChild.properties.width;
for (let i = props.model.children.length - 2; i >= 0; i--) {
const child = props.model.children[i];
const left = child.properties.x;
if (left < xChildrenStart) {
xChildrenStart = left;
}
const right = child.properties.x + Number(child.properties.width);
const right = child.properties.x + child.properties.width;
if (right > xChildrenEnd) {
xChildrenEnd = right;
}
}
const yChildren = Number(props.model.properties.height) + dimensionMargin;
const yChildren = props.model.properties.height + dimensionMargin;
const textChildren = (xChildrenEnd - xChildrenStart).toString();
return { childrenId, xChildrenStart, xChildrenEnd, yChildren, textChildren };
}

2
src/Components/SVG/Elements/Selector.tsx
View file

@ -19,7 +19,7 @@ export const Selector: React.FC<ISelectorProps> = (props) => {
const [transformedX, transformedY] = transformPosition(
x,
y,
Number(props.selected.properties.width),
props.selected.properties.width,
props.selected.properties.XPositionReference
);
const [width, height] = [

8
src/utils/itertools.ts
View file

@ -43,12 +43,12 @@ export function getDepth(parent: IContainerModel): number {
* @returns The absolute position of the container
*/
export function getAbsolutePosition(container: IContainerModel): [number, number] {
let x = Number(container.properties.x);
let y = Number(container.properties.y);
let x = container.properties.x;
let y = container.properties.y;
let current = container.parent;
while (current != null) {
x += Number(current.properties.x);
y += Number(current.properties.y);
x += current.properties.x;
y += current.properties.y;
current = current.parent;
}
return [x, y];