@@ -29,6 +29,19 @@ export const Space: React.FC<ISpaceProps> = (props) => {
2929 onTouchEnd,
3030 children,
3131 } = props ;
32+
33+ const events = {
34+ onClick : onClick ,
35+ onDoubleClick : onDoubleClick ,
36+ onMouseDown : onMouseDown ,
37+ onMouseEnter : onMouseEnter ,
38+ onMouseLeave : onMouseLeave ,
39+ onMouseMove : onMouseMove ,
40+ onTouchStart : onTouchStart ,
41+ onTouchMove : onTouchMove ,
42+ onTouchEnd : onTouchEnd ,
43+ } ;
44+
3245 const { space, domRect, elementRef, resizeHandles } = useSpace ( props ) ;
3346
3447 React . useEffect ( ( ) => {
@@ -37,15 +50,9 @@ export const Space: React.FC<ISpaceProps> = (props) => {
3750
3851 const userClasses = className ? className . split ( " " ) . map ( ( c ) => c . trim ( ) ) : [ ] ;
3952
40- const outerClasses = [
41- ...[
42- "spaces-space" ,
43- //props.scrollable ? (isResizable(props) ? "scrollable" : "scrollable-a") : undefined,
44- space . children . find ( ( s ) => s . resizing ) ? " spaces-resizing" : undefined ,
45- ] ,
46- //...(isResizable(props) && props.scrollable ? userClasses.map((c) => `${c}-container`) : userClasses),
47- ...userClasses ,
48- ] . filter ( ( c ) => c ) ;
53+ const outerClasses = [ ...[ "spaces-space" , space . children . find ( ( s ) => s . resizing ) ? "spaces-resizing" : undefined ] , ...userClasses ] . filter (
54+ ( c ) => c ,
55+ ) ;
4956
5057 const centeredContent = applyCentering ( children , props . centerContent ) ;
5158
@@ -54,30 +61,24 @@ export const Space: React.FC<ISpaceProps> = (props) => {
5461 { React . createElement (
5562 props . as || "div" ,
5663 {
57- id : space . id ,
58- ref : elementRef ,
59- style : style ,
60- className : outerClasses . join ( " " ) ,
61- onClick : onClick ,
62- onDoubleClick : onDoubleClick ,
63- onMouseDown : onMouseDown ,
64- onMouseEnter : onMouseEnter ,
65- onMouseLeave : onMouseLeave ,
66- onMouseMove : onMouseMove ,
67- onTouchStart : onTouchStart ,
68- onTouchMove : onTouchMove ,
69- onTouchEnd : onTouchEnd ,
64+ ...{
65+ id : space . id ,
66+ ref : elementRef ,
67+ className : outerClasses . join ( " " ) ,
68+ style : style ,
69+ } ,
70+ ...events ,
7071 } ,
71- < ParentContext . Provider value = { space . id } >
72- < LayerContext . Provider value = { undefined } >
73- < DOMRectContext . Provider value = { domRect } >
74- { resizeHandles . map ( ( r ) => (
75- < div { ... r } / >
76- ) ) }
77- { centeredContent }
78- </ DOMRectContext . Provider >
79- </ LayerContext . Provider >
80- </ ParentContext . Provider > ,
72+ < >
73+ { resizeHandles . map ( ( r ) => (
74+ < div { ... r } / >
75+ ) ) }
76+ < ParentContext . Provider value = { space . id } >
77+ < LayerContext . Provider value = { undefined } >
78+ < DOMRectContext . Provider value = { domRect } > { centeredContent } </ DOMRectContext . Provider >
79+ </ LayerContext . Provider >
80+ </ ParentContext . Provider >
81+ </ > ,
8182 ) }
8283 </ >
8384 ) ;
0 commit comments