Skip to content

Commit 380e800

Browse files
committed
wip
1 parent 65025cd commit 380e800

File tree

7 files changed

+27
-20
lines changed

7 files changed

+27
-20
lines changed

packages/dflex-utils/src/Box/Box.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { AXIS, Axis } from "../constants";
12
import type { AxesPoint } from "../Point";
2-
import type { Axis, Direction } from "../types";
3+
import type { Direction } from "../types";
34
import AbstractBox from "./AbstractBox";
45

56
/** Four direction instance - clockwise */
@@ -44,7 +45,7 @@ class Box<T> extends AbstractBox<T> {
4445
*/
4546
setByAxis(axis: Axis, x: T, y: T): void {
4647
switch (axis) {
47-
case "x": {
48+
case AXIS.X: {
4849
this.left = x;
4950
this.right = y;
5051
break;
@@ -65,7 +66,7 @@ class Box<T> extends AbstractBox<T> {
6566
*/
6667
setOne(axis: Axis, direction: Direction, value: T): void {
6768
switch (axis) {
68-
case "x": {
69+
case AXIS.X: {
6970
if (direction === -1) {
7071
this.left = value;
7172
} else {
@@ -92,7 +93,7 @@ class Box<T> extends AbstractBox<T> {
9293
*/
9394
getOne(axis: Axis, direction: Direction): T {
9495
switch (axis) {
95-
case "x":
96+
case AXIS.X:
9697
return direction === -1 ? this.left : this.right;
9798
default:
9899
return direction === -1 ? this.top : this.bottom;

packages/dflex-utils/src/Box/BoxBool.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Axis } from "../types";
1+
import { AXIS, Axis } from "../constants";
22
import Box from "./Box";
33

44
class BoxBool extends Box<boolean> {
@@ -26,7 +26,7 @@ class BoxBool extends Box<boolean> {
2626
*/
2727
isOneTruthyByAxis(axis: Axis): boolean {
2828
switch (axis) {
29-
case "x":
29+
case AXIS.X:
3030
return this.left || this.right;
3131
default:
3232
return this.top || this.bottom;

packages/dflex-utils/src/Box/BoxRect.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Axis } from "../types";
1+
import { AXIS, Axis } from "../constants";
22
import BoxNum from "./BoxNum";
33

44
export type BoxRectAbstract = {
@@ -63,7 +63,7 @@ class BoxRect extends BoxNum {
6363
*/
6464
setAxis(axis: Axis, value: number): this {
6565
switch (axis) {
66-
case "x": {
66+
case AXIS.X: {
6767
this.left = value;
6868
this.right = this.width + value;
6969
break;

packages/dflex-utils/src/Threshold/Threshold.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
/* eslint-disable max-classes-per-file */
22
import { PointNum } from "../Point";
33

4-
import type { Dimensions, Axis, Direction } from "../types";
4+
import type { Dimensions, Direction } from "../types";
55

66
import { AbstractBox, BoxBool, BoxRectAbstract } from "../Box";
77

88
import { dirtyAssignBiggestRect } from "../collections";
9+
import { AXIS, Axis } from "../constants";
910

1011
export interface ThresholdPercentages {
1112
/** vertical threshold in percentage from 0-100 */
@@ -198,11 +199,11 @@ class DFlexThreshold {
198199
): boolean {
199200
const { left, right, top, bottom } = this.thresholds[key];
200201

201-
if (axis === "x") {
202+
if (axis === AXIS.X) {
202203
this.isOut[key].setByAxis(axis, startingPos < left, endingPos > right);
203204
}
204205

205-
if (axis === "y") {
206+
if (axis === AXIS.Y) {
206207
this.isOut[key].setByAxis(axis, startingPos < top, endingPos > bottom);
207208
}
208209

@@ -232,7 +233,7 @@ class DFlexThreshold {
232233
const { left, right, top, bottom } = this.thresholds[key];
233234

234235
const is =
235-
axis === "x"
236+
axis === AXIS.X
236237
? direction === -1
237238
? startingPos < left
238239
: endingPos > right

packages/dflex-utils/src/constants.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
export const AXIS = Object.freeze({
2+
X: "x",
3+
Y: "y",
4+
});
5+
6+
export type Axis = (typeof AXIS)[keyof typeof AXIS];
7+
8+
/** Bi-directional Axis. */
9+
export type Axes = Axis | "z";

packages/dflex-utils/src/index.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ export type {
1515
Dimensions,
1616
RectDimensions,
1717
RectBoundaries,
18-
Axes,
19-
Axis,
2018
Direction,
2119
} from "./types";
2220

@@ -35,3 +33,7 @@ export {
3533
export { canUseDOM, getSelection, getParentElm } from "./dom";
3634

3735
export * as featureFlags from "./FeatureFlags";
36+
37+
export { AXIS } from "./constants";
38+
39+
export type { Axes, Axis } from "./constants";

packages/dflex-utils/src/types.ts

-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,3 @@ export interface RectBoundaries {
1616
}
1717

1818
export type Direction = 1 | -1;
19-
20-
/** Single Axis. */
21-
export type Axis = "x" | "y";
22-
23-
/** Bi-directional Axis. */
24-
export type Axes = Axis | "z";

0 commit comments

Comments
 (0)