feat: 增强 bem resize (ws, wn, es, en)

This commit is contained in:
yingkong.lz 2021-01-23 21:06:32 +08:00
parent 212bfbded8
commit ac051241d2
3 changed files with 138 additions and 41 deletions

View File

@ -82,7 +82,7 @@ export class BoxResizingForNode extends Component<{ host: BuiltinSimulatorHost;
const { node } = this.props; const { node } = this.props;
const { designer } = this.host; const { designer } = this.host;
if (!instances || instances.length < 1) { if (!instances || instances.length < 1 || this.dragging) {
return null; return null;
} }
return ( return (
@ -114,9 +114,15 @@ export class BoxResizingInstance extends Component<{
// private outline: any; // private outline: any;
private willUnbind: () => any; private willUnbind: () => any;
private outlineRight: any; // outline of eight direction
private outlineN: any;
private outlineLeft: any; private outlineE: any;
private outlineS: any;
private outlineW: any;
private outlineNE: any;
private outlineNW: any;
private outlineSE: any;
private outlineSW: any;
private dragEngine: DragResizeEngine; private dragEngine: DragResizeEngine;
@ -204,29 +210,33 @@ export class BoxResizingInstance extends Component<{
this.willUnbind(); this.willUnbind();
} }
if (!this.outlineRight && !this.outlineLeft) { if (
!this.outlineN &&
!this.outlineE &&
!this.outlineS &&
!this.outlineW &&
!this.outlineNE &&
!this.outlineNW &&
!this.outlineSE &&
!this.outlineSW
) {
return; return;
} }
const unBind: any[] = []; const unBind: any[] = [];
const node = this.props.observed.node;
unBind.push( unBind.push(
this.dragEngine.from(this.outlineRight, 'e', () => { ...[
// if (!this.hoveringLine.hasOutline()) { this.dragEngine.from(this.outlineN, 'n', () => node),
// return null; this.dragEngine.from(this.outlineE, 'e', () => node),
// } this.dragEngine.from(this.outlineS, 's', () => node),
// return this.hoveringLine.getCurrentNode(); this.dragEngine.from(this.outlineW, 'w', () => node),
return this.props.observed.node; this.dragEngine.from(this.outlineNE, 'ne', () => node),
}), this.dragEngine.from(this.outlineNW, 'nw', () => node),
); this.dragEngine.from(this.outlineSE, 'se', () => node),
unBind.push( this.dragEngine.from(this.outlineSW, 'sw', () => node),
this.dragEngine.from(this.outlineLeft, 'w', () => { ],
return this.props.observed.node;
// if (!this.hoveringLine.hasOutline()) {
// return null;
// }
// return this.hoveringLine.getCurrentNode();
}),
); );
this.willUnbind = () => { this.willUnbind = () => {
@ -252,29 +262,36 @@ export class BoxResizingInstance extends Component<{
triggerVisible = metaData.experimental.getResizingHandlers(node); triggerVisible = metaData.experimental.getResizingHandlers(node);
} }
const className = classNames('lc-borders lc-resize-box'); const baseSideClass = 'lc-borders lc-resize-side';
const baseCornerClass = 'lc-borders lc-resize-corner';
return ( return (
<div> <div>
{triggerVisible.includes('w') && ( {triggerVisible.includes('n') && (
<div <div
ref={(ref) => { ref={(ref) => { this.outlineN = ref; }}
this.outlineLeft = ref; className={classNames(baseSideClass, 'n')}
}}
className={className}
style={{ style={{
height: offsetHeight, height: 20,
transform: `translate(${offsetLeft - 10}px, ${offsetTop}px)`, transform: `translate(${offsetLeft}px, ${offsetTop - 10}px)`,
width: 20, width: offsetWidth,
}}
/>
)}
{triggerVisible.includes('ne') && (
<div
ref={(ref) => { this.outlineNE = ref; }}
className={classNames(baseCornerClass, 'ne')}
style={{
transform: `translate(${offsetLeft + offsetWidth - 5}px, ${offsetTop - 3}px)`,
cursor: 'nesw-resize',
}} }}
/> />
)} )}
{triggerVisible.includes('e') && ( {triggerVisible.includes('e') && (
<div <div
className={className} className={classNames(baseSideClass, 'e')}
ref={(ref) => { ref={(ref) => { this.outlineE = ref; }}
this.outlineRight = ref;
}}
style={{ style={{
height: offsetHeight, height: offsetHeight,
transform: `translate(${offsetLeft + offsetWidth - 10}px, ${offsetTop}px)`, transform: `translate(${offsetLeft + offsetWidth - 10}px, ${offsetTop}px)`,
@ -282,6 +299,58 @@ export class BoxResizingInstance extends Component<{
}} }}
/> />
)} )}
{triggerVisible.includes('se') && (
<div
ref={(ref) => { this.outlineSE = ref; }}
className={classNames(baseCornerClass, 'se')}
style={{
transform: `translate(${offsetLeft + offsetWidth - 5}px, ${offsetTop + offsetHeight - 5}px)`,
cursor: 'nwse-resize',
}}
/>
)}
{triggerVisible.includes('s') && (
<div
ref={(ref) => { this.outlineS = ref; }}
className={classNames(baseSideClass, 's')}
style={{
height: 20,
transform: `translate(${offsetLeft}px, ${offsetTop + offsetHeight - 10}px)`,
width: offsetWidth,
}}
/>
)}
{triggerVisible.includes('sw') && (
<div
ref={(ref) => { this.outlineSW = ref; }}
className={classNames(baseCornerClass, 'sw')}
style={{
transform: `translate(${offsetLeft - 3}px, ${offsetTop + offsetHeight - 5}px)`,
cursor: 'nesw-resize',
}}
/>
)}
{triggerVisible.includes('w') && (
<div
ref={(ref) => { this.outlineW = ref; }}
className={classNames(baseSideClass, 'w')}
style={{
height: offsetHeight,
transform: `translate(${offsetLeft - 10}px, ${offsetTop}px)`,
width: 20,
}}
/>
)}
{triggerVisible.includes('nw') && (
<div
ref={(ref) => { this.outlineNW = ref; }}
className={classNames(baseCornerClass, 'nw')}
style={{
transform: `translate(${offsetLeft - 3}px, ${offsetTop - 3}px)`,
cursor: 'nwse-resize',
}}
/>
)}
</div> </div>
); );
} }

View File

@ -49,10 +49,19 @@
} }
} }
&.lc-resize-box { &.lc-resize-corner {
display: inline-block;
width: 8px;
height: 8px;
border: 1px solid #197aff;
background: #fff;
pointer-events: auto;
z-index: 2;
}
&.lc-resize-side {
border-width: 0; border-width: 0;
z-index: 1; z-index: 1;
cursor: ew-resize;
pointer-events: auto; pointer-events: auto;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -61,13 +70,32 @@
&:after { &:after {
content: ""; content: "";
display: block; display: block;
height: calc(100% - 20px); border: 1px solid #197aff;
min-height: 50%; background: #fff;
width: 4px; // background: #738397;
background: #738397;
border-radius: 2px; border-radius: 2px;
// animation: flashing 1.5s infinite linear; // animation: flashing 1.5s infinite linear;
} }
&.e,
&.w {
cursor: ew-resize;
&:after {
width: 4px;
// height: calc(100% - 20px);
min-height: 50%;
}
}
&.n,
&.s {
cursor: ns-resize;
&:after {
// width: calc(100% - 20px);
min-width: 50%;
height: 4px;
}
}
} }
// &&-hovering { // &&-hovering {

View File

@ -741,7 +741,7 @@ export function upgradeMetadata(oldConfig: OldPrototypeConfig) {
if (canResizing) { if (canResizing) {
// TODO: enhance // TODO: enhance
experimental.getResizingHandlers = (currentNode: any) => { experimental.getResizingHandlers = (currentNode: any) => {
const directs = ['n', 'w', 's', 'e']; const directs = ['n', 'e', 's', 'w', 'ne', 'nw', 'se', 'sw'];
if (canResizing === true) { if (canResizing === true) {
return directs; return directs;
} }