Commit 4be487f

committed

Support '%'for width and height

1 parent 29cc3ed commit 4be487fCopy full SHA for 4be487f

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@ export default class Example extends Component {`
`17`	`17`	`<ResizableAndMovable`
`18`	`18`	`x={this.state.x}`
`19`	`19`	`y={this.state.y}`
`20`		`- width={200}`
`21`		`- height={200}`
	`20`	`+ width={'50%'}`
	`21`	`+ height={'50%'}`
`22`	`22`	`style={style}`
`23`	`23`	`minWidth={200}`
`24`	`24`	`minHeight={200}`
`25`		`- maxWidth={300}`
	`25`	`+ maxWidth={1000}`
`26`	`26`	`maxHeight={300}`
`27`	`27`	`onResizeStart={(dir, e) => console.log('resize start')}`
`28`	`28`	`onResize={(dir, size, rect) => console.log(size)}`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,6 @@ export default class ResizableAndMovable extends Component {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`onDrag(e, ui) {`
`153`		`- console.dir(ui)`
`154`	`153`	`if (this.isResizing) return;`
`155`	`154`	`this.setState({ x: ui.position.left, y: ui.position.top });`
`156`	`155`	`this.props.onDrag(e, ui);`
`@@ -185,11 +184,11 @@ export default class ResizableAndMovable extends Component {`
`185`	`184`	`>`
`186`	`185`	`<div`
`187`	`186`	`style={{`
`188`		- width: `${width}px`,
`189`		- height: `${height}px`,
	`187`	`+ width,`
	`188`	`+ height,`
`190`	`189`	`cursor: 'move',`
`191`	`190`	`position: 'absolute',`
`192`		- zIndex: `${zIndex}`,
	`191`	`+ zIndex,`
`193`	`192`	`}}`
`194`	`193`	`>`
`195`	`194`	`<Resizable`
`@@ -200,8 +199,8 @@ export default class ResizableAndMovable extends Component {`
`200`	`199`	`onResizeStart={this.onResizeStart}`
`201`	`200`	`onResize={this.onResize}`
`202`	`201`	`onResizeStop={this.onResizeStop}`
`203`		`- width={width}`
`204`		`- height={height}`
	`202`	`+ width="100%"`
	`203`	`+ height="100%"`
`205`	`204`	`minWidth={minWidth}`
`206`	`205`	`minHeight={minHeight}`
`207`	`206`	`maxWidth={maxWidth}`

Comments

(0)