Skip to content

Replace some logical OR by nullish coalescing operators #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elchininet merged 1 commit into from
Dec 20, 2024
Merged

Replace some logical OR by nullish coalescing operators #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions src/@classes/abstract/IsometricDraggableAbstract/IsometricDraggableAbstract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
IsometricDraggableProps,
Drag,
Boundaries,
Bounds,
ClientCoords
} from './types';

Expand Down Expand Up @@ -102,24 +103,31 @@ export abstract class IsometricDraggableAbstract extends IsometricElementAbstrac
);
}

private getBoundOrMaximum(prop: 'right' | 'left' | 'top'): Bounds {
if (this.bounds) {
return this.bounds[prop] ?? [ ...NO_LIMITS ];
}
return [ ...NO_LIMITS ];
}

private getRight(value: number): number {
const bounds = this._bounds && this._bounds.right || NO_LIMITS;
const bounds = this.getBoundOrMaximum('right');
return this.betweenBounds(
this._dragStore.right + value / this.data.scale,
bounds
);
}

private getLeft(value: number): number {
const bounds = this._bounds && this._bounds.left || NO_LIMITS;
const bounds = this.getBoundOrMaximum('left');
return this.betweenBounds(
this._dragStore.left + value / this.data.scale,
bounds,
);
}

private getTop(value: number): number {
const bounds = this._bounds && this._bounds.top || NO_LIMITS;
const bounds = this.getBoundOrMaximum('top');
return this.betweenBounds(
this._dragStore.top + value / this.data.scale,
bounds
Expand Down Expand Up @@ -149,9 +157,9 @@ export abstract class IsometricDraggableAbstract extends IsometricElementAbstrac
{
cancelable: eventType === DRAG_EVENT.DRAG,
detail: {
right: this._coords.right || this.right,
left: this._coords.left || this.left,
top: this._coords.top || this.top
right: this._coords.right ?? this.right,
left: this._coords.left ?? this.left,
top: this._coords.top ?? this.top
}
}
);
Expand Down Expand Up @@ -318,9 +326,9 @@ export abstract class IsometricDraggableAbstract extends IsometricElementAbstrac

public set bounds(value: Boundaries) {
this._bounds = value;
const boundsRight = this._bounds && this._bounds.right || NO_LIMITS;
const boundsLeft = this._bounds && this._bounds.left || NO_LIMITS;
const boundsTop = this._bounds && this._bounds.top || NO_LIMITS;
const boundsRight = this.getBoundOrMaximum('right');
const boundsLeft = this.getBoundOrMaximum('left');
const boundsTop = this.getBoundOrMaximum('top');
this.right = this.betweenBounds(this.right, boundsRight);
this.left = this.betweenBounds(this.left, boundsLeft);
this.top = this.betweenBounds(this.top, boundsTop);
Expand Down
14 changes: 7 additions & 7 deletions src/@classes/abstract/IsometricStarPolygonAbstract/IsometricStarPolygonAbstract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ export abstract class IsometricStarPolygonAbstract extends IsometricShapeAbstrac
protected _halfSector: number;

protected getCommands(args?: GetStarPolygonAbstractPathArguments): CommandPoint[] {
const right = args?.right || this.right;
const left = args?.left || this.left;
const top = args?.top || this.top;
const radius = args?.radius || this.radius;
const points = args?.points || this._points;
const density = args?.density || this._density;
const rotation = args?.rotation || this.rotation;
const right = args?.right ?? this.right;
const left = args?.left ?? this.left;
const top = args?.top ?? this.top;
const radius = args?.radius ?? this.radius;
const points = args?.points ?? this._points;
const density = args?.density ?? this._density;
const rotation = args?.rotation ?? this.rotation;
const coordinates = this.get2DCoordinates(
radius,
points,
Expand Down
8 changes: 4 additions & 4 deletions src/@classes/public/IsometricCircle/IsometricCircle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ export class IsometricCircle extends IsometricShapeAbstract {
private _radius: number;

protected getCommands(args?: GetCirclePathArguments): CommandPoint[] {
const right = args?.right || this.right;
const left = args?.left || this.left;
const top = args?.top || this.top;
const radius = args?.radius || this.radius;
const right = args?.right ?? this.right;
const left = args?.left ?? this.left;
const top = args?.top ?? this.top;
const radius = args?.radius ?? this.radius;
const commands: CommandPoint[] = [];
switch(this.planeView) {
case PlaneView.FRONT:
Expand Down
10 changes: 5 additions & 5 deletions src/@classes/public/IsometricRectangle/IsometricRectangle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ export class IsometricRectangle extends IsometricShapeAbstract {
private _height: number;

protected getCommands(args?: GetRectanglePathArguments): CommandPoint[] {
const right = args?.right || this.right;
const left = args?.left || this.left;
const top = args?.top || this.top;
const width = args?.width || this.width;
const height = args?.height || this.height;
const right = args?.right ?? this.right;
const left = args?.left ?? this.left;
const top = args?.top ?? this.top;
const width = args?.width ?? this.width;
const height = args?.height ?? this.height;
const commands: LinePoint[] = [ {command: Command.move, point: {r: 0, l: 0, t: 0}} ];
switch(this.planeView) {
case PlaneView.FRONT:
Expand Down