Skip to content

Commit f8b2980

Browse files
committed
Fixed falsey defaults
1 parent b4a0efe commit f8b2980

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

react-spaces/src/Globals/Hooks.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ export const useSpace = (props: AllProps, divElementRef: React.MutableRefObject<
141141
props.anchor && parentContext.registerSpaceTaker({
142142
id: state.id,
143143
zIndex: currentZIndex,
144-
order: props.order || 1,
144+
order: props.order === undefined ? 1 : props.order,
145145
anchorType: props.anchor,
146146
size: props.anchorSize || 0,
147147
adjustedSize: 0
148148
});
149149
}
150150

151151
const currentContext = createContext(state, setState, parentContext, currentZIndex);
152-
const handleSize = props.handleSize || 5;
152+
const handleSize = props.handleSize === undefined ? 5 : props.handleSize;
153153
const overlayHandle = props.overlayHandle !== undefined ? props.overlayHandle : true;
154154

155155
const resize = applyResize(props, state, setState, parentContext, handleSize, divElementRef);

react-spaces/src/Globals/Utils.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ export const applyResize = (
106106

107107
if (parentContext && props.anchor && props.resizable) {
108108
const resizeType = AnchorToResizeTypeMap[props.anchor];
109-
const resizeHandleWidth = resizeType === ResizeType.Left || resizeType === ResizeType.Right ? props.handleSize || 5 : undefined;
110-
const resizeHandleHeight = resizeType === ResizeType.Top || resizeType === ResizeType.Bottom ? props.handleSize || 5 : undefined;
109+
const resizeHandleWidth = resizeType === ResizeType.Left || resizeType === ResizeType.Right ? handleSize : undefined;
110+
const resizeHandleHeight = resizeType === ResizeType.Top || resizeType === ResizeType.Bottom ? handleSize : undefined;
111111

112112
return {
113113
resizeHandle:
@@ -116,7 +116,7 @@ export const applyResize = (
116116
adjustedSize={state.adjustedSize}
117117
width={resizeHandleWidth}
118118
height={resizeHandleHeight}
119-
minimumAdjust={ (props.minimumSize || 20) - (state.parsedSize || 0) }
119+
minimumAdjust={ (props.minimumSize === undefined ? 20 : props.minimumSize) - (state.parsedSize || 0) }
120120
maximumAdjust={ props.maximumSize ? (props.maximumSize - (state.parsedSize || 0)) : undefined }
121121
onResize={(adjustedSize) => {
122122
setState({ adjustedSize: adjustedSize });
@@ -128,7 +128,7 @@ export const applyResize = (
128128
{
129129
const currentRect = divElementRef.current.getBoundingClientRect();
130130
props.onResizeEnd && props.onResizeEnd(
131-
resizeType === ResizeType.Left || resizeType === ResizeType.Right ? currentRect.width : currentRect.height
131+
Math.floor(resizeType === ResizeType.Left || resizeType === ResizeType.Right ? currentRect.width : currentRect.height)
132132
);
133133
}
134134
}} />,

react-spaces/src/Resizable.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@ export const Resizable : React.FC<IProps> = (props) => {
2323
const adjustmentX =
2424
Math.min(
2525
Math.max(props.type === ResizeType.Left ? originalX - x : x - originalX, props.minimumAdjust),
26-
props.maximumAdjust || 999999
26+
props.maximumAdjust === undefined ? 999999 : props.maximumAdjust
2727
);
2828
const adjustmentY =
2929
Math.min(
3030
Math.max(props.type === ResizeType.Top ? originalY - y : y - originalY, props.minimumAdjust),
31-
props.maximumAdjust || 999999
31+
props.maximumAdjust === undefined ? 999999 : props.maximumAdjust
3232
);
33-
const adjustment = props.type === ResizeType.Left || props.type === ResizeType.Right ? adjustmentX : adjustmentY;
33+
34+
const adjustment = props.type === ResizeType.Left || props.type === ResizeType.Right ? adjustmentX : adjustmentY;
3435

3536
if (adjustment !== props.adjustedSize) {
3637
props.onResize(adjustment);
@@ -96,5 +97,7 @@ Resizable.propTypes = {
9697
height: PropTypes.number,
9798
minimumAdjust: PropTypes.number.isRequired,
9899
maximumAdjust: PropTypes.number,
99-
onResize: PropTypes.any
100+
onResize: PropTypes.any,
101+
onResizeStart: PropTypes.func,
102+
onResizeEnd: PropTypes.func
100103
}

0 commit comments

Comments
 (0)