clean up and document
This commit is contained in:
parent
b2fcee3037
commit
404718c776
4 changed files with 68 additions and 151 deletions
|
@ -1,3 +1,48 @@
|
|||
/*
|
||||
* This React component is a long way from perfect, but it's a start for
|
||||
* handling custom layouts.
|
||||
*
|
||||
* There are a few reasons that (at least in my opinion) implementing this is non-trivial:
|
||||
*
|
||||
* 1) React re-render vs DOM updates
|
||||
*
|
||||
* For performance reasons, we can't re-render with React when the user drags a
|
||||
* pattern part (or rotates it). It would kill performance.
|
||||
* So, we don't re-render with React upon dragging/rotating, but instead manipulate
|
||||
* the DOM directly.
|
||||
*
|
||||
* So far so good, but of course we don't want a pattern that's only correctly laid
|
||||
* out in the DOM. We want to update the pattern gist so that the new layout is stored.
|
||||
* For this, we re-render with React on the end of the drag (or rotate).
|
||||
*
|
||||
* Handling this balance between DOM updates and React re-renders is a first contributing
|
||||
* factor to why this component is non-trivial
|
||||
*
|
||||
* 2) SVG vs DOM coordinates
|
||||
*
|
||||
* When we drag or rotate with the mouse, all the events are giving us coordinates of
|
||||
* where the mouse is in the DOM.
|
||||
*
|
||||
* The layout uses coordinates from the embedded SVG which are completely different.
|
||||
*
|
||||
* We run `getScreenCTM().inverse()` on the svg element to pass to `matrixTransform` on a `DOMPointReadOnly` for dom to svg space conversions.
|
||||
*
|
||||
* 3) Part-level transforms
|
||||
*
|
||||
* All parts use their center as the transform-origin to simplify transforms, especially flipping and rotating.
|
||||
*
|
||||
* 4) Bounding box
|
||||
*
|
||||
* We use `getBoundingClientRect` rather than `getBBox` because it provides more data and factors in the transforms.
|
||||
* We then use our `domToSvg` function to move the points back into the SVG space.
|
||||
*
|
||||
*
|
||||
* Known issues
|
||||
* - currently none
|
||||
*
|
||||
* I've sort of left it at this because I'm starting to wonder if we should perhaps re-think
|
||||
* how custom layouts are supported in the core. And I would like to discuss this with the core team.
|
||||
*/
|
||||
import Path from '../../draft/path'
|
||||
import Point from '../../draft/point'
|
||||
import Snippet from '../../draft/snippet'
|
||||
|
@ -8,6 +53,7 @@ import { drag } from 'd3-drag'
|
|||
import { select } from 'd3-selection'
|
||||
import { useRef, useState, useEffect} from 'react'
|
||||
|
||||
/** buttons for manipulating the part */
|
||||
const Buttons = ({ transform, flip, rotate, setRotate, resetPart }) => {
|
||||
const letter = 'F'
|
||||
const style = { style: {fill: 'white', fontSize: 18, fontWeight: 'bold', textAnchor: 'middle'} }
|
||||
|
@ -34,27 +80,6 @@ const Buttons = ({ transform, flip, rotate, setRotate, resetPart }) => {
|
|||
)
|
||||
}
|
||||
|
||||
const generateTransform = (x, y, rot, flipX, flipY, part) => {
|
||||
// const center = {
|
||||
// x: part.topLeft.x + (part.bottomRight.x - part.topLeft.x)/2,
|
||||
// y: part.topLeft.y + (part.bottomRight.y - part.topLeft.y)/2,
|
||||
// }
|
||||
// const dx = part.topLeft.x - center.x
|
||||
// const dy = part.topLeft.y - center.y
|
||||
const transforms = [`translate(${x},${y})`]
|
||||
if (flipX) transforms.push(
|
||||
'scale(-1, 1)',
|
||||
)
|
||||
if (flipY) transforms.push(
|
||||
'scale(1, -1)',
|
||||
)
|
||||
if (rot) transforms.push(
|
||||
`rotate(${rot}, ${center.x}, ${center.y})`
|
||||
)
|
||||
|
||||
return transforms.join(' ')
|
||||
}
|
||||
|
||||
const Part = props => {
|
||||
const { layout, gist, name, part} = props
|
||||
|
||||
|
@ -87,29 +112,33 @@ const Part = props => {
|
|||
let translateY = partLayout.move.y
|
||||
let partRotation = partLayout.rotate || 0;
|
||||
let rotation = partRotation;
|
||||
let flipX = partLayout.flipX ? true : false
|
||||
let flipY = partLayout.flipY ? true : false
|
||||
// let partRect
|
||||
let flipX = !!partLayout.flipX
|
||||
let flipY = !!partLayout.flipY
|
||||
|
||||
const center = {
|
||||
x: part.topLeft.x + (part.bottomRight.x - part.topLeft.x)/2,
|
||||
y: part.topLeft.y + (part.bottomRight.y - part.topLeft.y)/2,
|
||||
}
|
||||
|
||||
/** get the delta rotation from the start of the drag event to now */
|
||||
const getRotation = (event) => angle(center, event.subject) - angle(center, { x:event.x, y: event.y });
|
||||
|
||||
const handleDrag = drag()
|
||||
// subject allows us to save data from the start of the event to use throughout event handing
|
||||
.subject(function(event) {
|
||||
return rotate ? { x: event.x, y: event.y } : {x: translateX, y: translateY}
|
||||
})
|
||||
.on('start', function(event) {
|
||||
// partRect = partRef.current.getBoundingClientRect()
|
||||
return rotate ?
|
||||
// if we're rotating, the subject is the mouse position
|
||||
{ x: event.x, y: event.y } :
|
||||
// if we're moving, the subject is the part's x,y coordinates
|
||||
{x: translateX, y: translateY}
|
||||
})
|
||||
.on('drag', function(event) {
|
||||
if (rotate) {
|
||||
let newRotation = getRotation(event);
|
||||
// reverse the rotation direction one time per flip. if we're flipped both directions, rotation will be positive again
|
||||
if (flipX) newRotation *= -1
|
||||
if (flipY) newRotation *= -1
|
||||
|
||||
rotation = partRotation + newRotation
|
||||
}
|
||||
else {
|
||||
|
@ -117,14 +146,16 @@ const Part = props => {
|
|||
translateY = event.y
|
||||
}
|
||||
|
||||
// get the transform attributes
|
||||
const transforms = generatePartTransform(translateX, translateY, rotation, flipX, flipY, part);
|
||||
console.log(transforms)
|
||||
|
||||
const me = select(this);
|
||||
for (var t in transforms) {
|
||||
me.attr(t, transforms[t])
|
||||
}
|
||||
})
|
||||
.on('end', function(event) {
|
||||
// save to gist
|
||||
updateLayout()
|
||||
})
|
||||
|
||||
|
@ -140,8 +171,13 @@ const Part = props => {
|
|||
}
|
||||
const updateLayout = () => {
|
||||
const partRect = partRef.current.getBoundingClientRect();
|
||||
const tl = {x: partRect.left, y: partRect.top};
|
||||
const br = {x: partRect.right, y: partRect.bottom};
|
||||
const matrix = partRef.current.ownerSVGElement.getScreenCTM().inverse();
|
||||
|
||||
const domToSvg = (point) => DOMPointReadOnly.fromPoint(point).matrixTransform(matrix)
|
||||
|
||||
// include the new top left and bottom right to ease calculating the pattern width and height
|
||||
const tl = domToSvg({x: partRect.left, y: partRect.top});
|
||||
const br = domToSvg({x: partRect.right, y: partRect.bottom});
|
||||
|
||||
props.updateLayout(name, {
|
||||
move: {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue