From f6845a61402b3e44fa64ceff8d613459e086563f Mon Sep 17 00:00:00 2001 From: "Val Erastov (xibyte)" Date: Thu, 19 Mar 2020 01:44:05 -0700 Subject: [PATCH] highlighting items from the wizard on 2d sketch --- .../cad/craft/wizard/components/form/EntityList.jsx | 6 ++++-- .../sketcher/components/SketcherOperationWizard.jsx | 2 ++ web/app/sketcher/viewer2d.js | 11 +++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/web/app/cad/craft/wizard/components/form/EntityList.jsx b/web/app/cad/craft/wizard/components/form/EntityList.jsx index 9d1e9ef5..7b9af5c7 100644 --- a/web/app/cad/craft/wizard/components/form/EntityList.jsx +++ b/web/app/cad/craft/wizard/components/form/EntityList.jsx @@ -20,7 +20,7 @@ export default class EntityList extends React.Component { }; render() { - let {name, label, active, setActive, value, placeholder, readOnly, entityRenderer = e => e} = this.props; + let {name, label, active, setActive, value, placeholder, readOnly, onEntityEnter, onEntityLeave, entityRenderer = e => e} = this.props; if (!Array.isArray(value)) { value = value ? asArray(value) : EMPTY_ARRAY; } @@ -28,7 +28,9 @@ export default class EntityList extends React.Component {
{value.length === 0 ? {placeholder || ''} : - value.map((entity, i) => + value.map((entity, i) => onEntityEnter&&onEntityEnter(entity)} + onMouseLeave={() => onEntityLeave&&onEntityLeave(entity)}> {entityRenderer(entity)} {!readOnly && this.deselect(entity)}> } )} diff --git a/web/app/sketcher/components/SketcherOperationWizard.jsx b/web/app/sketcher/components/SketcherOperationWizard.jsx index b4b111d7..7f1629dc 100644 --- a/web/app/sketcher/components/SketcherOperationWizard.jsx +++ b/web/app/sketcher/components/SketcherOperationWizard.jsx @@ -105,6 +105,8 @@ export default function SketcherOperationWizard({}) { if (field.type === 'selection') { return {viewer.capture('highlight2', [obj], true); viewer.refresh();}} + onEntityLeave={obj => {viewer.withdrawAll('highlight2');viewer.refresh();}} entityRenderer={entityRenderer}/> } })(); diff --git a/web/app/sketcher/viewer2d.js b/web/app/sketcher/viewer2d.js index e754c64a..571e3e04 100644 --- a/web/app/sketcher/viewer2d.js +++ b/web/app/sketcher/viewer2d.js @@ -588,18 +588,21 @@ class Layer { } const CAPTURES = { + highlight2: { + ...Styles.HIGHLIGHT2, + priority: 1 + }, tool: { ...Styles.TOOL_HELPER, - priority: 1 + priority: 2 }, highlight: { ...Styles.HIGHLIGHT, - priority: 2 - + priority: 3 }, selection: { ...Styles.SELECTION, - priority: 3 + priority: 4 }, };