Merge pull request #41 from aeagle/feature/32-resize-events

Added final size to resizeEnd event
aeagle · Oct 20, 2019 · 94cf413 · 94cf413
2 parents 017d086 + 078ad42
commit 94cf413
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 22 deletions.
diff --git a/demo/src/ui-demo/CodeEditor.tsx b/demo/src/ui-demo/CodeEditor.tsx
@@ -81,8 +81,7 @@ const IconPane = () => {
 
 const SideBar : React.FC<{ wide: boolean, visible: boolean }> = (props) => {
 	return (
-		props.visible ?
-		<Space.LeftResizable order={2} className="side-bar" size={props.wide ? 500 : 300} handleSize={2} overlayHandle={false} style={{ backgroundColor: '#252526' }}>
+		<Space.LeftResizable order={2} className="side-bar" size={props.visible ? (props.wide ? 500 : 300) : 0} handleSize={2} overlayHandle={false} style={{ backgroundColor: '#252526' }}>
 			<SideBarPane order={1} title="Open editors" height={200}>
 
 			</SideBarPane>
@@ -92,8 +91,7 @@ const SideBar : React.FC<{ wide: boolean, visible: boolean }> = (props) => {
 			<SideBarPane fill={true} title="Outline">
 
 			</SideBarPane>
-		</Space.LeftResizable> :
-		null
+		</Space.LeftResizable>
 	)
 }
 

diff --git a/demo/src/ui-demo/Scrollable.tsx b/demo/src/ui-demo/Scrollable.tsx
@@ -7,6 +7,7 @@ export const ScrollableDemo = () => {
 	const [ selectedKey, setSelectedKey ] = React.useState('1');
 	const [ html, setHtml ] = React.useState('');
 	const [ loading, setLoading ] = React.useState(true);
+	const [ sidebarSize, setSidebarSize] = React.useState(250);
 
 	React.useEffect(() => {
 		(async () => {
@@ -23,7 +24,7 @@ export const ScrollableDemo = () => {
 			Header
 		</Space.Top>
 		<Space.Fill>
-			<Space.LeftResizable as="aside" size="20%" handleSize={30}>
+			<Space.LeftResizable as="aside" size={sidebarSize} onResizeEnd={(newSize) => { setSidebarSize(newSize);}} handleSize={30}>
 				<Menu defaultSelectedKeys={[ selectedKey ]} onSelect={e => setSelectedKey(e.key)}>
 					<Menu.Item key="1">Menu item 1</Menu.Item>
 					<Menu.Item key="2">Menu item 2</Menu.Item>

diff --git a/react-spaces/package.json b/react-spaces/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-spaces",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "main": "dist/index.js",
   "module": "dist/es/index.js",
   "types": "dist/index.d.ts",

diff --git a/react-spaces/src/Globals/Hooks.ts b/react-spaces/src/Globals/Hooks.ts
@@ -14,7 +14,7 @@ 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;
+	const currentZIndex = props.zIndex || parentContext || 0;
 
 	// Deal with property changes to size / anchoring 
 	React.useEffect(() => {
@@ -147,7 +147,7 @@ export const useSpace = (props: AllProps, divElementRef: React.MutableRefObject<
 	const handleSize = props.handleSize || 5;
 	const overlayHandle = props.overlayHandle !== undefined ? props.overlayHandle : true;
 
-	const resize = applyResize(props, state, setState, parentContext, handleSize);
+	const resize = applyResize(props, state, setState, parentContext, handleSize, divElementRef);
 
 	const innerStyle = 
 		{

diff --git a/react-spaces/src/Globals/Types.ts b/react-spaces/src/Globals/Types.ts
@@ -95,14 +95,18 @@ export interface IResizableProps {
 	handleSize?: number,
 	overlayHandle?: boolean,
 	minimumSize?: number,
-	maximumSize?: number
+	maximumSize?: number,
+	onResizeStart?: () => void,
+	onResizeEnd?: (newSize: number) => void
 }
 
 export const resizableProps = {
 	handleSize: PropTypes.number,
 	overlayHandle: PropTypes.bool,
 	minimumSize: PropTypes.number,
-	maximumSize: PropTypes.number
+	maximumSize: PropTypes.number,
+	onResizeStart: PropTypes.func,
+	onResizeEnd: PropTypes.func
 }
 
 export interface IPositionedProps {

diff --git a/react-spaces/src/Globals/Utils.tsx b/react-spaces/src/Globals/Utils.tsx
@@ -89,7 +89,13 @@ export const createContext = (
 	return context;
 }
 
-export const applyResize = (props: AllProps, state: IState, setState: (stateDelta: Partial<IState>) => void, parentContext: ISpaceContext | null, handleSize: number) => {
+export const applyResize = (
+	props: AllProps, 
+	state: IState, 
+	setState: (stateDelta: Partial<IState>) => void, 
+	parentContext: ISpaceContext | null, 
+	handleSize: number,
+	divElementRef: React.MutableRefObject<HTMLElement | undefined>) => {
 
 	if (parentContext && props.anchor && props.resizable) {
 		const resizeType = AnchorToResizeTypeMap[props.anchor];
@@ -108,6 +114,16 @@ export const applyResize = (props: AllProps, state: IState, setState: (stateDelt
 					onResize={(adjustedSize) => { 
 						setState({ adjustedSize: adjustedSize });
 						parentContext.updateSpaceTakerAdjustedSize(state.id, adjustedSize);
+					}}
+					onResizeStart={() => props.onResizeStart && props.onResizeStart()}
+					onResizeEnd={() => {
+						if (divElementRef.current)
+						{
+							const currentRect = divElementRef.current.getBoundingClientRect();
+							props.onResizeEnd && props.onResizeEnd(
+								resizeType === ResizeType.Left || resizeType === ResizeType.Right ? currentRect.width : currentRect.height
+							);
+						}
 					}} />,
 			resizeType: 
 				resizeType

diff --git a/react-spaces/src/Resizable.tsx b/react-spaces/src/Resizable.tsx
@@ -11,16 +11,18 @@ interface IProps {
 	height?: number,
 	minimumAdjust: number,
 	maximumAdjust?: number,
-	onResize: (adjustedSize: number) => void
+	onResize: (adjustedSize: number) => void,
+	onResizeStart?: () => void,
+	onResizeEnd?: () => void
 }
 
 export const Resizable : React.FC<IProps> = (props) => {
 	const resize = (originalX: number, originalY: number, x: number, y: number) => {
 		const adjustmentX = 
-		Math.min(
-			Math.max(props.type === ResizeType.Left ? originalX - x : x - originalX, props.minimumAdjust),
-			props.maximumAdjust || 999999
-		);
+			Math.min(
+				Math.max(props.type === ResizeType.Left ? originalX - x : x - originalX, props.minimumAdjust),
+				props.maximumAdjust || 999999
+			);
 		const adjustmentY = 
 			Math.min(
 				Math.max(props.type === ResizeType.Top ? originalY - y : y - originalY, props.minimumAdjust),
@@ -36,27 +38,45 @@ export const Resizable : React.FC<IProps> = (props) => {
 	const startTouchResize = (e: React.TouchEvent<HTMLDivElement>) => {
 		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;
+		let resizing = true;
+		let moved = false;
 
-		const touchResize = (e: TouchEvent) => resize(originalTouchX, originalTouchY, e.touches[0].pageX, e.touches[0].pageY);
+		const touchResize = (e: TouchEvent) => resizing && resize(originalTouchX, originalTouchY, e.touches[0].pageX, e.touches[0].pageY);
 		const debouncedTouchResize = debounce<typeof touchResize>(touchResize, 10);
-		const withPreventDefault = (e: TouchEvent) => { e.preventDefault(); e.stopImmediatePropagation(); debouncedTouchResize(e); };
+		const withPreventDefault = (e: TouchEvent) => { moved = true; e.preventDefault(); e.stopImmediatePropagation(); debouncedTouchResize(e); };
+		const removeListener = () => {
+			resizing = false;
+			window.removeEventListener('touchmove', withPreventDefault);
+			window.removeEventListener('touchend', removeListener);
+			moved && props.onResizeEnd && props.onResizeEnd();
+		};
 		window.addEventListener('touchmove', withPreventDefault);
-		window.addEventListener('touchend', () => window.removeEventListener('touchmove', withPreventDefault));
+		window.addEventListener('touchend', removeListener);
 		e.preventDefault();
 		e.stopPropagation();
+		props.onResizeStart && props.onResizeStart();
 	}
 
 	const startResize = (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
 		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;
+		let resizing = true;
+		let moved = false;
 
-		const mouseResize = (e: MouseEvent) => resize(originalMouseX, originalMouseY, e.pageX, e.pageY);
+		const mouseResize = (e: MouseEvent) => resizing && resize(originalMouseX, originalMouseY, e.pageX, e.pageY);
 		const debouncedMouseResize = debounce<typeof mouseResize>(mouseResize, 10);
-		const withPreventDefault = (e: MouseEvent) => { e.preventDefault(); e.stopImmediatePropagation(); debouncedMouseResize(e); };
+		const withPreventDefault = (e: MouseEvent) => { moved = true; e.preventDefault(); e.stopImmediatePropagation(); debouncedMouseResize(e); };
+		const removeListener = () => {
+			resizing = false;
+			window.removeEventListener('mousemove', withPreventDefault);
+			window.removeEventListener('mouseup', removeListener);
+			moved && props.onResizeEnd && props.onResizeEnd();
+		};
 		window.addEventListener('mousemove', withPreventDefault);
-		window.addEventListener('mouseup', () => window.removeEventListener('mousemove', withPreventDefault));
+		window.addEventListener('mouseup', removeListener);
 		e.preventDefault();
 		e.stopPropagation();
+		props.onResizeStart && props.onResizeStart();
 	}
 
 	return (