Skip to content

Fix/29 adjusted size after props update #40

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
merged 2 commits into from
Oct 17, 2019
Merged

Fix/29 adjusted size after props update #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdfe576
Ensure adjusted size is reset after size prop change
aeagle Oct 16, 2019
1fffb02
Removed debugging statement
aeagle Oct 16, 2019
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
11 changes: 7 additions & 4 deletions react-spaces/src/Globals/Hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ export const useSpace = (props: AllProps, divElementRef: React.MutableRefObject<

const setState = (stateDelta: Partial<IState>) => changeState(prev => ({...prev, ...stateDelta}));

const parentContext = React.useContext(SpaceContext);
const currentZIndex = props.zIndex || React.useContext(SpaceLayerContext) || 0;

// Deal with property changes to size / anchoring
React.useEffect(() => {
setState({
Expand All @@ -25,7 +28,11 @@ export const useSpace = (props: AllProps, divElementRef: React.MutableRefObject<
width: isHorizontalSpace(props) ? props.anchorSize || 0 : props.width,
height: isVerticalSpace(props) ? props.anchorSize || 0 : props.height,
debug: props.debug !== undefined ? props.debug : false,
adjustedSize: 0
})
if (parentContext) {
parentContext.updateSpaceTakerAdjustedSize(state.id, 0);
}
}, [ props.zIndex, props.left, props.top, props.bottom, props.right, props.width, props.height, props.anchor, props.anchorSize, props.debug ]);

// Setup / cleanup
Expand Down Expand Up @@ -58,9 +65,6 @@ export const useSpace = (props: AllProps, divElementRef: React.MutableRefObject<
}
})

const parentContext = React.useContext(SpaceContext);
const currentZIndex = props.zIndex || React.useContext(SpaceLayerContext) || 0;

const outerStyle = {
left: (state.left !== undefined ? `calc(${getSizeString(state.left || 0)}${state.adjustedLeft ? ` + ${state.adjustedLeft}px` : ``})` : undefined),
top: (state.top !== undefined ? `calc(${getSizeString(state.top || 0)}${state.adjustedTop ? ` + ${state.adjustedTop}px` : ``})` : undefined),
Expand All @@ -73,7 +77,6 @@ export const useSpace = (props: AllProps, divElementRef: React.MutableRefObject<

if (parentContext) {
onRemove.current = () => {
console.log(`Removing ${state.id}`);
parentContext.removeSpaceTaker(state.id);
}

Expand Down
5 changes: 3 additions & 2 deletions react-spaces/src/Globals/Utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ export const applyResize = (props: AllProps, state: IState, setState: (stateDelt

return {
resizeHandle:
<Resizable
type={resizeType}
<Resizable
type={resizeType}
adjustedSize={state.adjustedSize}
width={resizeHandleWidth}
height={resizeHandleHeight}
minimumAdjust={ (props.minimumSize || 20) - (state.parsedSize || 0) }
Expand Down
14 changes: 6 additions & 8 deletions react-spaces/src/Resizable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export enum ResizeType {

interface IProps {
type: ResizeType,
adjustedSize: number,
width?: number,
height?: number,
minimumAdjust: number,
Expand All @@ -19,8 +20,6 @@ interface IProps {
}

export const Resizable : React.FC<IProps> = (props) => {
const [ adjustedSize, setAdjustedSize ] = React.useState(0);

const resize = (originalX: number, originalY: number, x: number, y: number) => {
const adjustmentX =
Math.min(
Expand All @@ -34,15 +33,14 @@ export const Resizable : React.FC<IProps> = (props) => {
);
const adjustment = props.type === ResizeType.Left || props.type === ResizeType.Right ? adjustmentX : adjustmentY;

if (adjustment !== adjustedSize) {
setAdjustedSize(adjustment);
if (adjustment !== props.adjustedSize) {
props.onResize(adjustment);
}
}

const startTouchResize = (e: React.TouchEvent<HTMLDivElement>) => {
const originalTouchX = props.type === ResizeType.Left ? e.touches[0].pageX + adjustedSize : e.touches[0].pageX - adjustedSize;
const originalTouchY = props.type === ResizeType.Top ? e.touches[0].pageY + adjustedSize : e.touches[0].pageY - adjustedSize;
const originalTouchX = props.type === ResizeType.Left ? e.touches[0].pageX + props.adjustedSize : e.touches[0].pageX - props.adjustedSize;
const originalTouchY = props.type === ResizeType.Top ? e.touches[0].pageY + props.adjustedSize : e.touches[0].pageY - props.adjustedSize;

const touchResize = (e: TouchEvent) => resize(originalTouchX, originalTouchY, e.touches[0].pageX, e.touches[0].pageY);
const debouncedTouchResize = debounce<typeof touchResize>(touchResize, 10);
Expand All @@ -54,8 +52,8 @@ export const Resizable : React.FC<IProps> = (props) => {
}

const startResize = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
const originalMouseX = props.type === ResizeType.Left ? e.pageX + adjustedSize : e.pageX - adjustedSize;
const originalMouseY = props.type === ResizeType.Top ? e.pageY + adjustedSize : e.pageY - adjustedSize;
const originalMouseX = props.type === ResizeType.Left ? e.pageX + props.adjustedSize : e.pageX - props.adjustedSize;
const originalMouseY = props.type === ResizeType.Top ? e.pageY + props.adjustedSize : e.pageY - props.adjustedSize;

const mouseResize = (e: MouseEvent) => resize(originalMouseX, originalMouseY, e.pageX, e.pageY);
const debouncedMouseResize = debounce<typeof mouseResize>(mouseResize, 10);
Expand Down