|
1 | 1 | import { SyntheticEvent } from "react"; |
2 | | -import { ISpaceDefinition, ResizeType, ISpaceStore, OnResizeEnd, EndEvent, MoveEvent } from "./core-types"; |
3 | | -import { throttle } from "./core-utils"; |
| 2 | +import { ISpaceDefinition, ResizeType, ISpaceStore, OnResizeEnd, EndEvent, MoveEvent, Type } from "./core-types"; |
| 3 | +import { coalesce, throttle } from "./core-utils"; |
4 | 4 |
|
5 | 5 | const RESIZE_THROTTLE = 0; |
6 | 6 |
|
@@ -37,31 +37,36 @@ function createAdjuster(resizeType: ResizeType, space: ISpaceDefinition, origina |
37 | 37 | const offset1 = dimensionToAdjust.resized; |
38 | 38 | const offset2 = candidateOppositeDimensionToAdjust.resized; |
39 | 39 |
|
40 | | - // const rect = space.element.getBoundingClientRect(); |
41 | | - // const size = isHorizontal(resizeType) ? rect.width : rect.height; |
42 | | - // const minimumAdjust = coalesce(space.minimumSize, 20)! - size + 0; |
43 | | - // const maximumAdjust = space.maximumSize ? space.maximumSize - size + 0 : undefined; |
| 40 | + const rect = space.element.getBoundingClientRect(); |
| 41 | + const size = isHorizontal(resizeType) ? rect.width : rect.height; |
| 42 | + const minimumAdjust = coalesce(space.minimumSize, 20)! - size + 0; |
| 43 | + const maximumAdjust = space.maximumSize ? space.maximumSize - size + 0 : undefined; |
44 | 44 |
|
45 | 45 | return (currentX: number, currentY: number) => { |
46 | | - const adjustment = (isHorizontal(resizeType) ? originalX : originalY) - (isHorizontal(resizeType) ? currentX : currentY); |
47 | | - |
48 | | - // if (adjustment < minimumAdjust) { |
49 | | - // adjustment = minimumAdjust; |
50 | | - // } else { |
51 | | - // if (typeof maximumAdjust === "number") { |
52 | | - // if (adjustment > maximumAdjust) { |
53 | | - // adjustment = maximumAdjust; |
54 | | - // } |
55 | | - // } |
56 | | - // } |
| 46 | + let adjustment = (isHorizontal(resizeType) ? originalX : originalY) - (isHorizontal(resizeType) ? currentX : currentY); |
| 47 | + let dimensionResized = negater(adjustment); |
| 48 | + |
| 49 | + if (space.type !== Type.Positioned) { |
| 50 | + dimensionResized = Math.max(negater(adjustment), minimumAdjust); |
| 51 | + |
| 52 | + if (dimensionResized < minimumAdjust) { |
| 53 | + dimensionResized = minimumAdjust; |
| 54 | + } |
| 55 | + |
| 56 | + if (typeof maximumAdjust === "number") { |
| 57 | + if (dimensionResized > maximumAdjust) { |
| 58 | + dimensionResized = maximumAdjust; |
| 59 | + } |
| 60 | + } |
| 61 | + } |
57 | 62 |
|
58 | 63 | if (dimensionToAdjust.size !== undefined) { |
59 | 64 | dimensionToAdjust.resized = negater(-adjustment) + offset1; |
60 | 65 | if (candidateOppositeDimensionToAdjust.size) { |
61 | 66 | candidateOppositeDimensionToAdjust.resized = negater(adjustment) + offset2; |
62 | 67 | } |
63 | 68 | } else { |
64 | | - candidateOppositeDimensionToAdjust.resized = negater(adjustment) + offset2; |
| 69 | + candidateOppositeDimensionToAdjust.resized = dimensionResized + offset2; |
65 | 70 | } |
66 | 71 | }; |
67 | 72 | } |
|
0 commit comments