@buerli.io/react-cad 0.8.0 → 0.9.0-beta.1

package/build/components/UI/CAD/ModelTree/FeatureList/utils.d.ts

@@ -1,3 +1,3 @@
 import { DrawingID, ObjectID } from '@buerli.io/core';
-export declare function useFeaturesIds(drawingId: DrawingID, curNodeId: ObjectID): ObjectID[];
-export declare function getFeaturesIds(drawingId: DrawingID, curNodeId: ObjectID): ObjectID[];
+export declare function useFeaturesIds(drawingId: DrawingID, curInstanceId: ObjectID): ObjectID[];
+export declare function getFeaturesIds(drawingId: DrawingID, curInstanceId: ObjectID): ObjectID[];

package/build/components/UI/CAD/ModelTree/ModelTreeHeader.d.ts

@@ -5,7 +5,7 @@ import './ModelTreeHeader.css';
  * The model tree header.
  *
  * Responsibility:
- * - Show name of current node
+ * - Show name of current instance
  * - Show back button
  * - Show assembly node menu
  *      - Provide convert to template functionality

package/build/components/UI/CAD/hooks/index.d.ts

@@ -1,4 +1,4 @@
-export { useCurrentNode } from './useCurrentNode';
+export { useCurrentInstance } from './useCurrentInstance';
 export { useCurrentProduct } from './useCurrentProduct';
 export { EditMode, useEditMode } from './useEditMode';
 export { useHasPending } from './useHasPending';

package/build/components/UI/CAD/hooks/useCurrentInstance.d.ts

@@ -0,0 +1,2 @@
+import { DrawingID } from '@buerli.io/core';
+export declare const useCurrentInstance: (drawingId: DrawingID) => import("@buerli.io/core").IStructureObject | undefined;

package/build/components/UI/CAD/hooks/useObjectDetails.d.ts

@@ -6,7 +6,7 @@ declare type ObjectDetails = {
     isAssemblyNode?: boolean;
     isRoot?: boolean;
     isCurrProd?: boolean;
-    isCurrNode?: boolean;
+    isCurrInstance?: boolean;
 };
 export declare const useObjectDetails: (drawingId: DrawingID, objectId: ObjectID) => ObjectDetails;
 export {};

package/build/components/utils/CompValidation/validators/CSysDisplayValidator.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { DrawingID } from '@buerli.io/core';
 /**
- * Validator for CSysDisplay component. Checks drawing and currentNode existance.
+ * Validator for CSysDisplay component. Checks drawing and currentInstance existance.
  *
  * @param drawingId
  * @returns

package/build/components/utils/CompValidation/verifiers.d.ts

@@ -23,7 +23,7 @@ declare type Warning = {
 export declare type Warnings = Record<string, Warning | null>;
 export declare function useDrawingVerifier(drawingId: DrawingID, warnings: Warnings): void;
 export declare function useCurProductVerifier(drawingId: DrawingID, warnings: Warnings): void;
-export declare function useCurNodeVerifier(drawingId: DrawingID, warnings: Warnings): void;
+export declare function useCurInstanceVerifier(drawingId: DrawingID, warnings: Warnings): void;
 export declare function useRootVerifier(drawingId: DrawingID, warnings: Warnings): void;
 export declare function useRootOrProdVerifier(drawingId: DrawingID, warnings: Warnings): void;
 export declare function usePluginObjVerifier(drawingId: DrawingID, pluginId: PluginID, warnings: Warnings): void;

package/build/index.cjs.js

@@ -1145,16 +1145,16 @@ const appApi = (set, get) => ({
       }
       set(state => {
         let res = [];
-        const curNode = core.api.getState().drawing.refs[drawingId].structure.currentNode;
+        const curInstance = core.api.getState().drawing.refs[drawingId].structure.currentInstance;
         res = state.assemblyTree.prodStack;
-        curNode && res.push(curNode);
+        curInstance && res.push(curInstance);
         return _objectSpread$r(_objectSpread$r({}, state), {}, {
           assemblyTree: {
             prodStack: [...res]
           }
         });
       });
-      classcad.ccAPI.assemblyBuilder.setCurrentNode(drawingId, objId).catch(console.warn);
+      classcad.ccAPI.assemblyBuilder.setCurrentInstance(drawingId, objId).catch(console.warn);
     },
     goBack: drawingId => {
       const prodStack = get().assemblyTree.prodStack;
@@ -1171,7 +1171,7 @@ const appApi = (set, get) => ({
           }
         });
       });
-      classcad.ccAPI.assemblyBuilder.setCurrentNode(drawingId, prevProd).catch(console.warn);
+      classcad.ccAPI.assemblyBuilder.setCurrentInstance(drawingId, prevProd).catch(console.warn);
     },
     clearProdStack: () => {
       set(state => _objectSpread$r(_objectSpread$r({}, state), {}, {
@@ -1975,21 +1975,21 @@ function useCurProductVerifier(drawingId, warnings) {
     warnings['currentProduct'] = null;
   }
 }
-function useCurNodeVerifier(drawingId, warnings) {
-  const currNodeId = useDrawingCCId(drawingId, d => {
+function useCurInstanceVerifier(drawingId, warnings) {
+  const currInstanceId = useDrawingCCId(drawingId, d => {
     var _d$structure3;
-    return d == null ? void 0 : (_d$structure3 = d.structure) == null ? void 0 : _d$structure3.currentNode;
+    return d == null ? void 0 : (_d$structure3 = d.structure) == null ? void 0 : _d$structure3.currentInstance;
   });
-  const currNodeExists = react.useDrawing(drawingId, d => {
+  const currInstanceExists = react.useDrawing(drawingId, d => {
     var _d$structure4;
-    return Boolean(d == null ? void 0 : (_d$structure4 = d.structure) == null ? void 0 : _d$structure4.tree[currNodeId]);
+    return Boolean(d == null ? void 0 : (_d$structure4 = d.structure) == null ? void 0 : _d$structure4.tree[currInstanceId]);
   });
-  if (!currNodeExists) {
-    warnings['currentNode'] = {
-      caption: 'CurrentNode is not defined or corresponding object does not exist in the tree.'
+  if (!currInstanceExists) {
+    warnings['currentInstance'] = {
+      caption: 'currentInstance is not defined or corresponding object does not exist in the tree.'
     };
   } else {
-    warnings['currentNode'] = null;
+    warnings['currentInstance'] = null;
   }
 }
 function useRootVerifier(drawingId, warnings) {
@@ -7541,7 +7541,8 @@ const MergedWrapper = ({
     React.createElement(drei.Merged, {
       meshes: [cylMesh, sphereMesh, arcMesh],
       limit: limit,
-      raycast: null
+      raycast: null,
+      frustumCulled: false
     }, (Cylinder, Sphere, Arc) => /*#__PURE__*/React.createElement(InstancedGeometry, {
       cylinder: Cylinder,
       sphere: Sphere,
@@ -12294,10 +12295,10 @@ const useOverrideGeometryColor = (name, priority, values, solidIds) => {
   }, [addOverride, removeOverride, name, priority, values, solidIds]);
 };
 
-const useCurrentNode = drawingId => {
-  const currNodeId = useDrawingCCId(drawingId, d => d.structure.currentNode);
-  const currNode = react.useDrawing(drawingId, d => d.structure.tree[currNodeId]);
-  return currNode;
+const useCurrentInstance = drawingId => {
+  const currInstanceId = useDrawingCCId(drawingId, d => d.structure.currentInstance);
+  const currInstance = react.useDrawing(drawingId, d => d.structure.tree[currInstanceId]);
+  return currInstance;
 };
 
 const useCurrentProduct = drawingId => {
@@ -12435,7 +12436,7 @@ function useMenuItems$4(drawingId, featureId, isActive, setEditName) {
 const useObjectDetails = (drawingId, objectId) => {
   const rootId = react.useDrawing(drawingId, d => d.structure.root);
   const currProdId = useDrawingCCId(drawingId, d => d.structure.currentProduct);
-  const currNodeId = useDrawingCCId(drawingId, d => d.structure.currentNode);
+  const currInstanceId = useDrawingCCId(drawingId, d => d.structure.currentInstance);
   return React.useMemo(() => {
     const drawing = core.getDrawing(drawingId);
     if (drawing) {
@@ -12450,20 +12451,20 @@ const useObjectDetails = (drawingId, objectId) => {
         const isAssembyNode = classcad.ccUtils.base.isA(objClass, classcad.CCClasses.IProductReference) || classcad.ccUtils.base.isA(objClass, classcad.CCClasses.CCAssemblyRoot);
         const isRoot = objectId === rootId;
         const isCurrProd = objectId === currProdId;
-        const isCurrNode = objectId === currNodeId;
+        const isCurrInstance = objectId === currInstanceId;
         return {
           isPart,
           isAssembly,
           isAssembyNode,
           isRoot,
           isCurrProd,
-          isCurrNode,
+          isCurrInstance,
           obj
         };
       }
     }
     return {};
-  }, [currNodeId, currProdId, drawingId, objectId, rootId]);
+  }, [currInstanceId, currProdId, drawingId, objectId, rootId]);
 };
 
 const useRollbackBar = (drawingId, partId) => {
@@ -12949,6 +12950,9 @@ const HandlerIcon = styled(RadioButtonImpl)`
     -webkit-box-shadow: none !important;
     box-shadow: none !important;
   }
+  ::before {
+    display: none !important;
+  }
 `;
 const HandlerRadioGroup = styled(RadioGroupImpl)`
   ${props => props.width && styled.css`
@@ -12959,6 +12963,15 @@ const HandlerRadioGroup = styled(RadioGroupImpl)`
   padding: 0px ${props => props.sidepadding || 1 - props.iconmargin}px;
   .ant-radio-button-wrapper {
     margin: ${props => props.iconmargin}px !important;
+    &:hover {
+      border-color: rgb(30, 144, 255);
+    }
+  }
+  .ant-radio-button-wrapper-checked {
+    border: 3px solid;
+    padding: 0px !important;
+    margin: ${props => props.iconmargin}px !important;
+    transition: border-color 0s;
   }
 `;
 const HButton = _ref => {
@@ -16792,7 +16805,7 @@ const Root$9 = ({
 };
 
 const getMatePath = (drawingId, prRefId) => {
-  var _tree$currentNode$mem, _tree$currentNode$mem2;
+  var _tree$currentInstance, _tree$currentInstance2;
   const drawing = core.getDrawing(drawingId);
   if (!drawing) {
     return [];
@@ -16809,8 +16822,8 @@ const getMatePath = (drawingId, prRefId) => {
     var _tree$id$members, _tree$id$members$prod;
     return ((_tree$id$members = tree[id].members) == null ? void 0 : (_tree$id$members$prod = _tree$id$members.productRef) == null ? void 0 : _tree$id$members$prod.value) || id;
   });
-  const currentNode = drawing.structure.currentNode;
-  const currentProduct = currentNode && (((_tree$currentNode$mem = tree[currentNode].members) == null ? void 0 : (_tree$currentNode$mem2 = _tree$currentNode$mem.productRef) == null ? void 0 : _tree$currentNode$mem2.value) || currentNode);
+  const currentInstance = drawing.structure.currentInstance;
+  const currentProduct = currentInstance && (((_tree$currentInstance = tree[currentInstance].members) == null ? void 0 : (_tree$currentInstance2 = _tree$currentInstance.productRef) == null ? void 0 : _tree$currentInstance2.value) || currentInstance);
   const pathLength = currentProduct && path.indexOf(currentProduct);
   if (pathLength && pathLength !== -1) {
     path.splice(pathLength);
@@ -16819,7 +16832,7 @@ const getMatePath = (drawingId, prRefId) => {
 };
 
 /**
- * Validator for CSysDisplay component. Checks drawing and currentNode existance.
+ * Validator for CSysDisplay component. Checks drawing and currentInstance existance.
  *
  * @param drawingId
  * @returns
@@ -16830,24 +16843,24 @@ const CSysDisplayValidator = ({
 }) => {
   const warnings = {};
   useDrawingVerifier(drawingId, warnings);
-  useCurNodeVerifier(drawingId, warnings);
+  useCurInstanceVerifier(drawingId, warnings);
   return /*#__PURE__*/React.createElement(ErrorBoundary, {
     warnings: warnings
   }, children);
 };
 
-function useFeaturesIds(drawingId, curNodeId) {
+function useFeaturesIds(drawingId, curInstanceId) {
   const curClass = react.useDrawing(drawingId, d => {
     var _d$structure$tree$cur;
-    return (_d$structure$tree$cur = d.structure.tree[curNodeId]) == null ? void 0 : _d$structure$tree$cur.class;
+    return (_d$structure$tree$cur = d.structure.tree[curInstanceId]) == null ? void 0 : _d$structure$tree$cur.class;
   }) || '';
   const prodId = useDrawingCCId(drawingId, d => {
     if (classcad.ccUtils.base.isA(curClass, classcad.CCClasses.IProductReference)) {
-      var _node$members;
-      const node = d.structure.tree[curNodeId];
-      return (_node$members = node.members) == null ? void 0 : _node$members.productId.value;
+      var _instance$members;
+      const instance = d.structure.tree[curInstanceId];
+      return (_instance$members = instance.members) == null ? void 0 : _instance$members.productId.value;
     }
-    return curNodeId;
+    return curInstanceId;
   });
   const opSeqId = useOperationSequence(drawingId, prodId) || NOCCID;
   const opSeqChildren = useDrawingArr(drawingId, d => {
@@ -16861,11 +16874,11 @@ function useFeaturesIds(drawingId, curNodeId) {
   });
   return featureIds;
 }
-function getFeaturesIds(drawingId, curNodeId) {
-  var _tree$curNodeId$membe, _tree$prodId, _tree$opSeqId;
+function getFeaturesIds(drawingId, curInstanceId) {
+  var _tree$curInstanceId$m, _tree$prodId, _tree$opSeqId;
   const tree = core.getDrawing(drawingId).structure.tree;
-  const curClass = tree[curNodeId].class;
-  const prodId = classcad.ccUtils.base.isA(curClass, classcad.CCClasses.IProductReference) ? ((_tree$curNodeId$membe = tree[curNodeId].members) == null ? void 0 : _tree$curNodeId$membe.productId.value) || NOCCID : curNodeId;
+  const curClass = tree[curInstanceId].class;
+  const prodId = classcad.ccUtils.base.isA(curClass, classcad.CCClasses.IProductReference) ? ((_tree$curInstanceId$m = tree[curInstanceId].members) == null ? void 0 : _tree$curInstanceId$m.productId.value) || NOCCID : curInstanceId;
   const prodChildren = ((_tree$prodId = tree[prodId]) == null ? void 0 : _tree$prodId.children) || [];
   const opSeqId = prodChildren.find(id => {
     var _tree$id;
@@ -16988,14 +17001,14 @@ const CSysWrapper = ({
     isSelected,
     isActive
   } = userData;
-  const currentNode = react.useDrawing(drawingId, drawing => drawing.structure.currentNode);
+  const currentInstance = react.useDrawing(drawingId, drawing => drawing.structure.currentInstance);
   const matrix = useCsysMatrix(drawingId, csysId, flip, reoriented);
   const activeColor = getHighlightedColor(false, false, false, true);
   const onPointerMove_ = React.useCallback(() => onPointerMove && onPointerMove(csysId, matePath), [onPointerMove, matePath, csysId]);
   const onPointerOut_ = React.useCallback(() => onPointerOut && onPointerOut(csysId, matePath), [onPointerOut, matePath, csysId]);
   return /*#__PURE__*/React.createElement(react.GlobalTransform, {
     drawingId: drawingId,
-    objectId: currentNode
+    objectId: currentInstance
   }, /*#__PURE__*/React.createElement(MatePathTransform, {
     drawingId: drawingId,
     matePath: matePath
@@ -17037,9 +17050,9 @@ const getActiveReference = (drawingId, matePath, activeRefs) => {
     return undefined;
   }
   const root = drawing.structure.root;
-  const currentNode = drawing.structure.currentNode;
+  const currentInstance = drawing.structure.currentInstance;
   const tree = drawing.structure.tree;
-  const pathET = currentNode === root ? [...matePath] : [...matePath, currentNode];
+  const pathET = currentInstance === root ? [...matePath] : [...matePath, currentInstance];
   pathET.reverse();
   pathET.forEach((id, idx) => {
     if (idx === 0) {
@@ -17080,8 +17093,8 @@ const CSysDisplayImpl = ({
 }) => {
   // If we are in part mode, the products array contains the id of the CC_Part and no product references!
   // TODO: Split the products array into `products` and `productRefs` in the drawing state.
-  const currentNode = useDrawingCCId(drawingId, drawing => drawing.structure.currentNode);
-  const rigidSets = useDrawingArr(drawingId, drawing => drawing.structure.tree[currentNode].children);
+  const currentInstance = useDrawingCCId(drawingId, drawing => drawing.structure.currentInstance);
+  const rigidSets = useDrawingArr(drawingId, drawing => drawing.structure.tree[currentInstance].children);
   const productIds = react.useDrawing(drawingId, drawing => drawing.structure.products);
   const selectors = react.useDrawing(drawingId, drawing => drawing.selection.refs);
   const activeSelector = react.useDrawing(drawingId, drawing => drawing.selection.active && drawing.selection.refs[drawing.selection.active]);
@@ -17093,11 +17106,11 @@ const CSysDisplayImpl = ({
   const prevHoveredIdRef = React.useRef(undefined);
   const displayTimers = React.useRef({});
   const activeProducts = React.useMemo(() => {
-    if (!currentNode || !productIds) {
+    if (!currentInstance || !productIds) {
       return [];
     }
-    return productIds.filter(id => getAncestors(drawingId, id).indexOf(currentNode) !== -1);
-  }, [drawingId, currentNode, productIds]);
+    return productIds.filter(id => getAncestors(drawingId, id).indexOf(currentInstance) !== -1);
+  }, [drawingId, currentInstance, productIds]);
   React.useEffect(() => {
     if (prevHoveredIdRef.current !== undefined) {
       const prevHoveredId = prevHoveredIdRef.current;
@@ -19111,10 +19124,10 @@ function useMenuItems$2(drawingId, pluginId, prodId, setEditName) {
         caption: 'add',
         icon: /*#__PURE__*/React.createElement(icons.PlusSquareOutlined, null),
         callback: () => {
-          const curNodeId = core.getDrawing(drawingId).structure.currentNode;
-          classcad.ccAPI.assemblyBuilder.addNodes(drawingId, [{
-            referenceId: prodId,
-            ownerId: curNodeId,
+          const curInstanceId = core.getDrawing(drawingId).structure.currentInstance;
+          classcad.ccAPI.assemblyBuilder.addInstances(drawingId, [{
+            productId: prodId,
+            ownerId: curInstanceId,
             transformation: [{
               x: 0,
               y: 0,
@@ -19579,22 +19592,22 @@ const ViewImpl = ({
   drawingId,
   pluginId
 }) => {
-  const currNodeId = react.useDrawing(drawingId, d => d.structure.currentNode);
+  const currInstanceId = react.useDrawing(drawingId, d => d.structure.currentInstance);
   const prodId = react.usePlugin(drawingId, pluginId, p => p.state.product);
   const [pos, setPos] = React.useState(new THREE__namespace.Vector3());
   const onClick = React.useCallback(e => {
     if (e.delta > 1) return;
     const run = async () => {
       const drawing = core.getDrawing(drawingId);
-      if (drawing && prodId && currNodeId && pos) {
+      if (drawing && prodId && currInstanceId && pos) {
         const pos1 = {
           x: pos.x,
           y: pos.y,
           z: pos.z
         };
-        classcad.ccAPI.assemblyBuilder.addNodes(drawingId, [{
-          referenceId: prodId,
-          ownerId: currNodeId,
+        classcad.ccAPI.assemblyBuilder.addInstances(drawingId, [{
+          productId: prodId,
+          ownerId: currInstanceId,
           transformation: [pos1, {
             x: 1,
             y: 0,
@@ -19608,7 +19621,7 @@ const ViewImpl = ({
       }
     };
     run();
-  }, [drawingId, prodId, currNodeId, pos]);
+  }, [drawingId, prodId, currInstanceId, pos]);
   const onPointerMove = React.useCallback(e => {
     setPos(() => e.point.clone());
   }, []);
@@ -19911,11 +19924,20 @@ const PluginGeometryBounds = ({
           }
         case classcad.CCClasses.CCSketch:
           {
-            var _obj$members3;
-            const sketchBB = (_obj$members3 = obj.members) == null ? void 0 : _obj$members3.boundingBox;
-            const [min, max] = sketchBB.members.map(memb => convertToVector(memb));
-            bb_.expandByPoint(min);
-            bb_.expandByPoint(max);
+            // consider sketch bb only if sketch geometry exists
+            if (obj.children && obj.children.length > 0) {
+              var _obj$members3;
+              const sketchBB = (_obj$members3 = obj.members) == null ? void 0 : _obj$members3.boundingBox;
+              const [min, max] = sketchBB.members.map(memb => convertToVector(memb));
+              // apply sketch's transformation
+              if (obj.coordinateSystem) {
+                const matrix4 = core.MathUtils.convertToMatrix4(obj.coordinateSystem);
+                min.applyMatrix4(matrix4);
+                max.applyMatrix4(matrix4);
+              }
+              bb_.expandByPoint(min);
+              bb_.expandByPoint(max);
+            }
             break;
           }
       }
@@ -19995,11 +20017,11 @@ const SelectedMateObj = ({
   reoriented,
   opacity
 }) => {
-  const currentNode = react.useDrawing(drawingId, drawing => drawing.structure.currentNode);
+  const currentInstance = react.useDrawing(drawingId, drawing => drawing.structure.currentInstance);
   const matrix = useCsysMatrix(drawingId, csysId, flip, reoriented);
   return /*#__PURE__*/React.createElement(react.GlobalTransform, {
     drawingId: drawingId,
-    objectId: currentNode
+    objectId: currentInstance
   }, /*#__PURE__*/React.createElement(MatePathTransform, {
     drawingId: drawingId,
     matePath: matePath
@@ -20875,27 +20897,27 @@ const Outline = /*#__PURE__*/React.forwardRef(function Outline(_ref, forwardRef)
 });
 
 const useVisibleSolids = drawingId => {
-  const curNodeId = react.useDrawing(drawingId, d => d.structure.currentNode);
+  const curInstanceId = react.useDrawing(drawingId, d => d.structure.currentInstance);
   const curProdId = react.useDrawing(drawingId, d => d.structure.currentProduct);
   const solidsIds = useDrawingArr(drawingId, d => {
     var _d$structure$tree$cur;
     return (_d$structure$tree$cur = d.structure.tree[curProdId]) == null ? void 0 : _d$structure$tree$cur.solids;
   });
 
-  // This useDrawing is used ONLY for reactiveness, since we don't want to react to all the tree changes, and reacting to current node's children changes should be enough
+  // This useDrawing is used ONLY for reactiveness, since we don't want to react to all the tree changes, and reacting to current instance's children changes should be enough
   react.useDrawing(drawingId, d => {
     var _d$structure$tree$cur2;
-    return (_d$structure$tree$cur2 = d.structure.tree[curNodeId]) == null ? void 0 : _d$structure$tree$cur2.children;
+    return (_d$structure$tree$cur2 = d.structure.tree[curInstanceId]) == null ? void 0 : _d$structure$tree$cur2.children;
   });
   const tree = core.getDrawing(drawingId).structure.tree;
-  const descendants = curNodeId ? getDescendants(tree, curNodeId) : [];
+  const descendants = curInstanceId ? getDescendants(tree, curInstanceId) : [];
   const partDescendants = descendants.filter((id, i) => {
-    var _node$members, _node$members$product;
-    const node = tree[id];
-    if (node && !classcad.ccUtils.base.isA(node.class, classcad.CCClasses.IProductReference)) {
+    var _instance$members, _instance$members$pro;
+    const instance = tree[id];
+    if (instance && !classcad.ccUtils.base.isA(instance.class, classcad.CCClasses.IProductReference)) {
       return false;
     }
-    const product = tree[(_node$members = node.members) == null ? void 0 : (_node$members$product = _node$members.productId) == null ? void 0 : _node$members$product.value];
+    const product = tree[(_instance$members = instance.members) == null ? void 0 : (_instance$members$pro = _instance$members.productId) == null ? void 0 : _instance$members$pro.value];
     if (product && !classcad.ccUtils.base.isA(product.class, classcad.CCClasses.CCPart)) {
       return false;
     }
@@ -20906,9 +20928,9 @@ const useVisibleSolids = drawingId => {
   });
   let solids = [];
   partDescendants.forEach(id => {
-    var _node$members2, _node$members2$produc;
-    const node = tree[id];
-    const product = tree[(_node$members2 = node.members) == null ? void 0 : (_node$members2$produc = _node$members2.productId) == null ? void 0 : _node$members2$produc.value];
+    var _instance$members2, _instance$members2$pr;
+    const instance = tree[id];
+    const product = tree[(_instance$members2 = instance.members) == null ? void 0 : (_instance$members2$pr = _instance$members2.productId) == null ? void 0 : _instance$members2$pr.value];
     const solids_ = product == null ? void 0 : product.solids;
     solids_ && solids.push(...solids_);
   });
@@ -20943,9 +20965,9 @@ const getMateRefIds = (drawingId, constrId) => {
   if (pRefIds.length === 0) {
     return;
   }
-  const curNodeId = drawing.structure.currentNode;
-  const curNode = tree[curNodeId];
-  const curRefIds = (curNode == null ? void 0 : curNode.instances) || (curNode == null ? void 0 : curNode.children) || [];
+  const curInstanceId = drawing.structure.currentInstance;
+  const curInstance = tree[curInstanceId];
+  const curRefIds = (curInstance == null ? void 0 : curInstance.instances) || (curInstance == null ? void 0 : curInstance.children) || [];
   const mateRefIds = [];
   curRefIds.forEach(id => {
     var _tree$id$members, _tree$id$members$prod;
@@ -21092,10 +21114,10 @@ const Constraint = ({
   }, [drawingId, constraintId]);
   const onMouseEnter = React.useCallback(() => {
     const setHovered = core.getDrawing(drawingId).api.interaction.setHovered;
-    const curNodeId = core.getDrawing(drawingId).structure.currentNode;
+    const curInstanceId = core.getDrawing(drawingId).structure.currentInstance;
     setHovered(core.createInfo({
       objectId: constraintId,
-      prodRefId: curNodeId
+      prodRefId: curInstanceId
     }));
   }, [drawingId, constraintId]);
   const onMouseLeave = React.useCallback(() => {
@@ -22808,7 +22830,7 @@ const fileTypes = ['ofb', 'stp', 'stl'];
  * The model tree header.
  *
  * Responsibility:
- * - Show name of current node
+ * - Show name of current instance
  * - Show back button
  * - Show assembly node menu
  *      - Provide convert to template functionality
@@ -22821,11 +22843,11 @@ const ModelTreeHeader = ({
   const pStackNotEmpty = useCADStore(s => s.assemblyTree.prodStack.length) !== 0;
   const mode = useEditMode(drawingId);
   const currProd = useCurrentProduct(drawingId);
-  const currNode = useCurrentNode(drawingId);
-  const objDetails = useObjectDetails(drawingId, (currNode == null ? void 0 : currNode.id) || NOCCID);
+  const currInstance = useCurrentInstance(drawingId);
+  const objDetails = useObjectDetails(drawingId, (currInstance == null ? void 0 : currInstance.id) || NOCCID);
   const showBackBtn = React.useMemo(() => pStackNotEmpty || !objDetails.isRoot && (objDetails.isAssemblyNode || objDetails.isAssembly), [objDetails.isAssembly, objDetails.isAssemblyNode, objDetails.isRoot, pStackNotEmpty]);
   const isFeatureActive = react.useDrawing(drawingId, d => d.plugin.active.feature !== null) || false;
-  const name = currProd ? currProd.name : currNode ? currNode.name : '';
+  const name = currProd ? currProd.name : currInstance ? currInstance.name : '';
   const [rename, setRename] = React.useState(false);
   const [showNameChoice, setShowNameChoice] = React.useState(false);
   const enableProductManagement = React.useCallback(enabled => {
@@ -22836,7 +22858,7 @@ const ModelTreeHeader = ({
       drawing.api.plugin.setActiveGlobal(plugId, enabled);
     }
   }, [drawingId]);
-  const toExportId = (currNode == null ? void 0 : currNode.id) || (currProd == null ? void 0 : currProd.id);
+  const toExportId = (currInstance == null ? void 0 : currInstance.id) || (currProd == null ? void 0 : currProd.id);
   const exportNode = React.useCallback((type = 'ofb') => toExportId && FileUtils.exportNode(drawingId, toExportId, type), [drawingId, toExportId]);
 
   // Disable the ProductManagement plugin on unmount
@@ -22962,10 +22984,10 @@ const ModelTreeImpl = ({
   drawingId
 }) => {
   const mode = useEditMode(drawingId);
-  const currNode = useCurrentNode(drawingId);
+  const currInstance = useCurrentInstance(drawingId);
   const children = useDrawingArr(drawingId, d => {
     var _d$structure$tree;
-    return (_d$structure$tree = d.structure.tree[(currNode == null ? void 0 : currNode.id) || NOCCID]) == null ? void 0 : _d$structure$tree.children;
+    return (_d$structure$tree = d.structure.tree[(currInstance == null ? void 0 : currInstance.id) || NOCCID]) == null ? void 0 : _d$structure$tree.children;
   });
   return /*#__PURE__*/React.createElement("div", {
     style: {
@@ -23374,7 +23396,7 @@ const Solid = ({
   const onClick = React.useCallback(e => {
     var _drawing$structure$tr;
     const drawing = core.getDrawing(drawingId);
-    const curNodeId = drawing.structure.currentNode;
+    const curInstanceId = drawing.structure.currentInstance;
     const curProdId = drawing.structure.currentProduct;
     const selId = drawing.selection.active;
     if (selId) {
@@ -23405,21 +23427,21 @@ const Solid = ({
       objectId,
       graphicId: solidId,
       containerId: solidId,
-      prodRefId: isPart ? curProdId : curNodeId
+      prodRefId: isPart ? curProdId : curInstanceId
     }), multi);
   }, [drawingId, solidId]);
   const onMouseEnter = React.useCallback(() => {
     var _getDrawing$structure;
     const setHovered = core.getDrawing(drawingId).api.interaction.setHovered;
     const objectId = core.getDrawing(drawingId).geometry.cache[solidId].container.ownerId;
-    const curNodeId = core.getDrawing(drawingId).structure.currentNode;
+    const curInstanceId = core.getDrawing(drawingId).structure.currentInstance;
     const curProdId = core.getDrawing(drawingId).structure.currentProduct;
     const isPart = classcad.ccUtils.base.isA(((_getDrawing$structure = core.getDrawing(drawingId).structure.tree[curProdId]) == null ? void 0 : _getDrawing$structure.class) || '', classcad.CCClasses.CCPart);
     setHovered(core.createInfo({
       objectId,
       graphicId: solidId,
       containerId: solidId,
-      prodRefId: isPart ? curProdId : curNodeId
+      prodRefId: isPart ? curProdId : curInstanceId
     }));
   }, [drawingId, solidId]);
   const onMouseLeave = React.useCallback(() => {
@@ -23662,20 +23684,20 @@ const PartModeCmds = (drawingId, rootId) => {
       icon: /*#__PURE__*/React.createElement(Icon, {
         url: img$I
       }),
-      callback: wrapper(() => featureApi.createExtrusion(drawingId, rootId))
+      callback: wrapper(() => featureApi.createFeature(drawingId, rootId, classcad.CCClasses.CCExtrusion, 'Extrusion'))
     }, {
       label: 'Revolve',
       icon: /*#__PURE__*/React.createElement(Icon, {
         url: img$H
       }),
-      callback: wrapper(() => featureApi.createRevolve(drawingId, rootId))
+      callback: wrapper(() => featureApi.createFeature(drawingId, rootId, classcad.CCClasses.CCRevolve, 'Revolve'))
     }],
     Boolean: {
       label: 'Boolean',
       icon: /*#__PURE__*/React.createElement(Icon, {
         url: img$m
       }),
-      callback: wrapper(() => featureApi.createBooleanOperation(drawingId, rootId))
+      callback: wrapper(() => featureApi.createFeature(drawingId, rootId, classcad.CCClasses.CCUnion, 'Union'))
     },
     Slice: [{
       label: 'Slice',

package/build/index.js

@@ -1122,16 +1122,16 @@ const appApi = (set, get) => ({
       }
       set(state => {
         let res = [];
-        const curNode = api.getState().drawing.refs[drawingId].structure.currentNode;
+        const curInstance = api.getState().drawing.refs[drawingId].structure.currentInstance;
         res = state.assemblyTree.prodStack;
-        curNode && res.push(curNode);
+        curInstance && res.push(curInstance);
         return _objectSpread$r(_objectSpread$r({}, state), {}, {
           assemblyTree: {
             prodStack: [...res]
           }
         });
       });
-      ccAPI.assemblyBuilder.setCurrentNode(drawingId, objId).catch(console.warn);
+      ccAPI.assemblyBuilder.setCurrentInstance(drawingId, objId).catch(console.warn);
     },
     goBack: drawingId => {
       const prodStack = get().assemblyTree.prodStack;
@@ -1148,7 +1148,7 @@ const appApi = (set, get) => ({
           }
         });
       });
-      ccAPI.assemblyBuilder.setCurrentNode(drawingId, prevProd).catch(console.warn);
+      ccAPI.assemblyBuilder.setCurrentInstance(drawingId, prevProd).catch(console.warn);
     },
     clearProdStack: () => {
       set(state => _objectSpread$r(_objectSpread$r({}, state), {}, {
@@ -1952,21 +1952,21 @@ function useCurProductVerifier(drawingId, warnings) {
     warnings['currentProduct'] = null;
   }
 }
-function useCurNodeVerifier(drawingId, warnings) {
-  const currNodeId = useDrawingCCId(drawingId, d => {
+function useCurInstanceVerifier(drawingId, warnings) {
+  const currInstanceId = useDrawingCCId(drawingId, d => {
     var _d$structure3;
-    return d == null ? void 0 : (_d$structure3 = d.structure) == null ? void 0 : _d$structure3.currentNode;
+    return d == null ? void 0 : (_d$structure3 = d.structure) == null ? void 0 : _d$structure3.currentInstance;
   });
-  const currNodeExists = useDrawing(drawingId, d => {
+  const currInstanceExists = useDrawing(drawingId, d => {
     var _d$structure4;
-    return Boolean(d == null ? void 0 : (_d$structure4 = d.structure) == null ? void 0 : _d$structure4.tree[currNodeId]);
+    return Boolean(d == null ? void 0 : (_d$structure4 = d.structure) == null ? void 0 : _d$structure4.tree[currInstanceId]);
   });
-  if (!currNodeExists) {
-    warnings['currentNode'] = {
-      caption: 'CurrentNode is not defined or corresponding object does not exist in the tree.'
+  if (!currInstanceExists) {
+    warnings['currentInstance'] = {
+      caption: 'currentInstance is not defined or corresponding object does not exist in the tree.'
     };
   } else {
-    warnings['currentNode'] = null;
+    warnings['currentInstance'] = null;
   }
 }
 function useRootVerifier(drawingId, warnings) {
@@ -7518,7 +7518,8 @@ const MergedWrapper = ({
     React__default.createElement(Merged, {
       meshes: [cylMesh, sphereMesh, arcMesh],
       limit: limit,
-      raycast: null
+      raycast: null,
+      frustumCulled: false
     }, (Cylinder, Sphere, Arc) => /*#__PURE__*/React__default.createElement(InstancedGeometry, {
       cylinder: Cylinder,
       sphere: Sphere,
@@ -12271,10 +12272,10 @@ const useOverrideGeometryColor = (name, priority, values, solidIds) => {
   }, [addOverride, removeOverride, name, priority, values, solidIds]);
 };
 
-const useCurrentNode = drawingId => {
-  const currNodeId = useDrawingCCId(drawingId, d => d.structure.currentNode);
-  const currNode = useDrawing(drawingId, d => d.structure.tree[currNodeId]);
-  return currNode;
+const useCurrentInstance = drawingId => {
+  const currInstanceId = useDrawingCCId(drawingId, d => d.structure.currentInstance);
+  const currInstance = useDrawing(drawingId, d => d.structure.tree[currInstanceId]);
+  return currInstance;
 };
 
 const useCurrentProduct = drawingId => {
@@ -12412,7 +12413,7 @@ function useMenuItems$4(drawingId, featureId, isActive, setEditName) {
 const useObjectDetails = (drawingId, objectId) => {
   const rootId = useDrawing(drawingId, d => d.structure.root);
   const currProdId = useDrawingCCId(drawingId, d => d.structure.currentProduct);
-  const currNodeId = useDrawingCCId(drawingId, d => d.structure.currentNode);
+  const currInstanceId = useDrawingCCId(drawingId, d => d.structure.currentInstance);
   return React__default.useMemo(() => {
     const drawing = getDrawing(drawingId);
     if (drawing) {
@@ -12427,20 +12428,20 @@ const useObjectDetails = (drawingId, objectId) => {
         const isAssembyNode = ccUtils.base.isA(objClass, CCClasses.IProductReference) || ccUtils.base.isA(objClass, CCClasses.CCAssemblyRoot);
         const isRoot = objectId === rootId;
         const isCurrProd = objectId === currProdId;
-        const isCurrNode = objectId === currNodeId;
+        const isCurrInstance = objectId === currInstanceId;
         return {
           isPart,
           isAssembly,
           isAssembyNode,
           isRoot,
           isCurrProd,
-          isCurrNode,
+          isCurrInstance,
           obj
         };
       }
     }
     return {};
-  }, [currNodeId, currProdId, drawingId, objectId, rootId]);
+  }, [currInstanceId, currProdId, drawingId, objectId, rootId]);
 };
 
 const useRollbackBar = (drawingId, partId) => {
@@ -12926,6 +12927,9 @@ const HandlerIcon = styled(RadioButtonImpl)`
     -webkit-box-shadow: none !important;
     box-shadow: none !important;
   }
+  ::before {
+    display: none !important;
+  }
 `;
 const HandlerRadioGroup = styled(RadioGroupImpl)`
   ${props => props.width && css`
@@ -12936,6 +12940,15 @@ const HandlerRadioGroup = styled(RadioGroupImpl)`
   padding: 0px ${props => props.sidepadding || 1 - props.iconmargin}px;
   .ant-radio-button-wrapper {
     margin: ${props => props.iconmargin}px !important;
+    &:hover {
+      border-color: rgb(30, 144, 255);
+    }
+  }
+  .ant-radio-button-wrapper-checked {
+    border: 3px solid;
+    padding: 0px !important;
+    margin: ${props => props.iconmargin}px !important;
+    transition: border-color 0s;
   }
 `;
 const HButton = _ref => {
@@ -16769,7 +16782,7 @@ const Root$9 = ({
 };
 
 const getMatePath = (drawingId, prRefId) => {
-  var _tree$currentNode$mem, _tree$currentNode$mem2;
+  var _tree$currentInstance, _tree$currentInstance2;
   const drawing = getDrawing(drawingId);
   if (!drawing) {
     return [];
@@ -16786,8 +16799,8 @@ const getMatePath = (drawingId, prRefId) => {
     var _tree$id$members, _tree$id$members$prod;
     return ((_tree$id$members = tree[id].members) == null ? void 0 : (_tree$id$members$prod = _tree$id$members.productRef) == null ? void 0 : _tree$id$members$prod.value) || id;
   });
-  const currentNode = drawing.structure.currentNode;
-  const currentProduct = currentNode && (((_tree$currentNode$mem = tree[currentNode].members) == null ? void 0 : (_tree$currentNode$mem2 = _tree$currentNode$mem.productRef) == null ? void 0 : _tree$currentNode$mem2.value) || currentNode);
+  const currentInstance = drawing.structure.currentInstance;
+  const currentProduct = currentInstance && (((_tree$currentInstance = tree[currentInstance].members) == null ? void 0 : (_tree$currentInstance2 = _tree$currentInstance.productRef) == null ? void 0 : _tree$currentInstance2.value) || currentInstance);
   const pathLength = currentProduct && path.indexOf(currentProduct);
   if (pathLength && pathLength !== -1) {
     path.splice(pathLength);
@@ -16796,7 +16809,7 @@ const getMatePath = (drawingId, prRefId) => {
 };
 
 /**
- * Validator for CSysDisplay component. Checks drawing and currentNode existance.
+ * Validator for CSysDisplay component. Checks drawing and currentInstance existance.
  *
  * @param drawingId
  * @returns
@@ -16807,24 +16820,24 @@ const CSysDisplayValidator = ({
 }) => {
   const warnings = {};
   useDrawingVerifier(drawingId, warnings);
-  useCurNodeVerifier(drawingId, warnings);
+  useCurInstanceVerifier(drawingId, warnings);
   return /*#__PURE__*/React__default.createElement(ErrorBoundary, {
     warnings: warnings
   }, children);
 };
 
-function useFeaturesIds(drawingId, curNodeId) {
+function useFeaturesIds(drawingId, curInstanceId) {
   const curClass = useDrawing(drawingId, d => {
     var _d$structure$tree$cur;
-    return (_d$structure$tree$cur = d.structure.tree[curNodeId]) == null ? void 0 : _d$structure$tree$cur.class;
+    return (_d$structure$tree$cur = d.structure.tree[curInstanceId]) == null ? void 0 : _d$structure$tree$cur.class;
   }) || '';
   const prodId = useDrawingCCId(drawingId, d => {
     if (ccUtils.base.isA(curClass, CCClasses.IProductReference)) {
-      var _node$members;
-      const node = d.structure.tree[curNodeId];
-      return (_node$members = node.members) == null ? void 0 : _node$members.productId.value;
+      var _instance$members;
+      const instance = d.structure.tree[curInstanceId];
+      return (_instance$members = instance.members) == null ? void 0 : _instance$members.productId.value;
     }
-    return curNodeId;
+    return curInstanceId;
   });
   const opSeqId = useOperationSequence(drawingId, prodId) || NOCCID;
   const opSeqChildren = useDrawingArr(drawingId, d => {
@@ -16838,11 +16851,11 @@ function useFeaturesIds(drawingId, curNodeId) {
   });
   return featureIds;
 }
-function getFeaturesIds(drawingId, curNodeId) {
-  var _tree$curNodeId$membe, _tree$prodId, _tree$opSeqId;
+function getFeaturesIds(drawingId, curInstanceId) {
+  var _tree$curInstanceId$m, _tree$prodId, _tree$opSeqId;
   const tree = getDrawing(drawingId).structure.tree;
-  const curClass = tree[curNodeId].class;
-  const prodId = ccUtils.base.isA(curClass, CCClasses.IProductReference) ? ((_tree$curNodeId$membe = tree[curNodeId].members) == null ? void 0 : _tree$curNodeId$membe.productId.value) || NOCCID : curNodeId;
+  const curClass = tree[curInstanceId].class;
+  const prodId = ccUtils.base.isA(curClass, CCClasses.IProductReference) ? ((_tree$curInstanceId$m = tree[curInstanceId].members) == null ? void 0 : _tree$curInstanceId$m.productId.value) || NOCCID : curInstanceId;
   const prodChildren = ((_tree$prodId = tree[prodId]) == null ? void 0 : _tree$prodId.children) || [];
   const opSeqId = prodChildren.find(id => {
     var _tree$id;
@@ -16965,14 +16978,14 @@ const CSysWrapper = ({
     isSelected,
     isActive
   } = userData;
-  const currentNode = useDrawing(drawingId, drawing => drawing.structure.currentNode);
+  const currentInstance = useDrawing(drawingId, drawing => drawing.structure.currentInstance);
   const matrix = useCsysMatrix(drawingId, csysId, flip, reoriented);
   const activeColor = getHighlightedColor(false, false, false, true);
   const onPointerMove_ = React__default.useCallback(() => onPointerMove && onPointerMove(csysId, matePath), [onPointerMove, matePath, csysId]);
   const onPointerOut_ = React__default.useCallback(() => onPointerOut && onPointerOut(csysId, matePath), [onPointerOut, matePath, csysId]);
   return /*#__PURE__*/React__default.createElement(GlobalTransform, {
     drawingId: drawingId,
-    objectId: currentNode
+    objectId: currentInstance
   }, /*#__PURE__*/React__default.createElement(MatePathTransform, {
     drawingId: drawingId,
     matePath: matePath
@@ -17014,9 +17027,9 @@ const getActiveReference = (drawingId, matePath, activeRefs) => {
     return undefined;
   }
   const root = drawing.structure.root;
-  const currentNode = drawing.structure.currentNode;
+  const currentInstance = drawing.structure.currentInstance;
   const tree = drawing.structure.tree;
-  const pathET = currentNode === root ? [...matePath] : [...matePath, currentNode];
+  const pathET = currentInstance === root ? [...matePath] : [...matePath, currentInstance];
   pathET.reverse();
   pathET.forEach((id, idx) => {
     if (idx === 0) {
@@ -17057,8 +17070,8 @@ const CSysDisplayImpl = ({
 }) => {
   // If we are in part mode, the products array contains the id of the CC_Part and no product references!
   // TODO: Split the products array into `products` and `productRefs` in the drawing state.
-  const currentNode = useDrawingCCId(drawingId, drawing => drawing.structure.currentNode);
-  const rigidSets = useDrawingArr(drawingId, drawing => drawing.structure.tree[currentNode].children);
+  const currentInstance = useDrawingCCId(drawingId, drawing => drawing.structure.currentInstance);
+  const rigidSets = useDrawingArr(drawingId, drawing => drawing.structure.tree[currentInstance].children);
   const productIds = useDrawing(drawingId, drawing => drawing.structure.products);
   const selectors = useDrawing(drawingId, drawing => drawing.selection.refs);
   const activeSelector = useDrawing(drawingId, drawing => drawing.selection.active && drawing.selection.refs[drawing.selection.active]);
@@ -17070,11 +17083,11 @@ const CSysDisplayImpl = ({
   const prevHoveredIdRef = React__default.useRef(undefined);
   const displayTimers = React__default.useRef({});
   const activeProducts = React__default.useMemo(() => {
-    if (!currentNode || !productIds) {
+    if (!currentInstance || !productIds) {
       return [];
     }
-    return productIds.filter(id => getAncestors(drawingId, id).indexOf(currentNode) !== -1);
-  }, [drawingId, currentNode, productIds]);
+    return productIds.filter(id => getAncestors(drawingId, id).indexOf(currentInstance) !== -1);
+  }, [drawingId, currentInstance, productIds]);
   React__default.useEffect(() => {
     if (prevHoveredIdRef.current !== undefined) {
       const prevHoveredId = prevHoveredIdRef.current;
@@ -19088,10 +19101,10 @@ function useMenuItems$2(drawingId, pluginId, prodId, setEditName) {
         caption: 'add',
         icon: /*#__PURE__*/React__default.createElement(PlusSquareOutlined, null),
         callback: () => {
-          const curNodeId = getDrawing(drawingId).structure.currentNode;
-          ccAPI.assemblyBuilder.addNodes(drawingId, [{
-            referenceId: prodId,
-            ownerId: curNodeId,
+          const curInstanceId = getDrawing(drawingId).structure.currentInstance;
+          ccAPI.assemblyBuilder.addInstances(drawingId, [{
+            productId: prodId,
+            ownerId: curInstanceId,
             transformation: [{
               x: 0,
               y: 0,
@@ -19556,22 +19569,22 @@ const ViewImpl = ({
   drawingId,
   pluginId
 }) => {
-  const currNodeId = useDrawing(drawingId, d => d.structure.currentNode);
+  const currInstanceId = useDrawing(drawingId, d => d.structure.currentInstance);
   const prodId = usePlugin(drawingId, pluginId, p => p.state.product);
   const [pos, setPos] = React__default.useState(new THREE.Vector3());
   const onClick = React__default.useCallback(e => {
     if (e.delta > 1) return;
     const run = async () => {
       const drawing = getDrawing(drawingId);
-      if (drawing && prodId && currNodeId && pos) {
+      if (drawing && prodId && currInstanceId && pos) {
         const pos1 = {
           x: pos.x,
           y: pos.y,
           z: pos.z
         };
-        ccAPI.assemblyBuilder.addNodes(drawingId, [{
-          referenceId: prodId,
-          ownerId: currNodeId,
+        ccAPI.assemblyBuilder.addInstances(drawingId, [{
+          productId: prodId,
+          ownerId: currInstanceId,
           transformation: [pos1, {
             x: 1,
             y: 0,
@@ -19585,7 +19598,7 @@ const ViewImpl = ({
       }
     };
     run();
-  }, [drawingId, prodId, currNodeId, pos]);
+  }, [drawingId, prodId, currInstanceId, pos]);
   const onPointerMove = React__default.useCallback(e => {
     setPos(() => e.point.clone());
   }, []);
@@ -19888,11 +19901,20 @@ const PluginGeometryBounds = ({
           }
         case CCClasses.CCSketch:
           {
-            var _obj$members3;
-            const sketchBB = (_obj$members3 = obj.members) == null ? void 0 : _obj$members3.boundingBox;
-            const [min, max] = sketchBB.members.map(memb => convertToVector(memb));
-            bb_.expandByPoint(min);
-            bb_.expandByPoint(max);
+            // consider sketch bb only if sketch geometry exists
+            if (obj.children && obj.children.length > 0) {
+              var _obj$members3;
+              const sketchBB = (_obj$members3 = obj.members) == null ? void 0 : _obj$members3.boundingBox;
+              const [min, max] = sketchBB.members.map(memb => convertToVector(memb));
+              // apply sketch's transformation
+              if (obj.coordinateSystem) {
+                const matrix4 = MathUtils.convertToMatrix4(obj.coordinateSystem);
+                min.applyMatrix4(matrix4);
+                max.applyMatrix4(matrix4);
+              }
+              bb_.expandByPoint(min);
+              bb_.expandByPoint(max);
+            }
             break;
           }
       }
@@ -19972,11 +19994,11 @@ const SelectedMateObj = ({
   reoriented,
   opacity
 }) => {
-  const currentNode = useDrawing(drawingId, drawing => drawing.structure.currentNode);
+  const currentInstance = useDrawing(drawingId, drawing => drawing.structure.currentInstance);
   const matrix = useCsysMatrix(drawingId, csysId, flip, reoriented);
   return /*#__PURE__*/React__default.createElement(GlobalTransform, {
     drawingId: drawingId,
-    objectId: currentNode
+    objectId: currentInstance
   }, /*#__PURE__*/React__default.createElement(MatePathTransform, {
     drawingId: drawingId,
     matePath: matePath
@@ -20852,27 +20874,27 @@ const Outline = /*#__PURE__*/React__default.forwardRef(function Outline(_ref, fo
 });
 
 const useVisibleSolids = drawingId => {
-  const curNodeId = useDrawing(drawingId, d => d.structure.currentNode);
+  const curInstanceId = useDrawing(drawingId, d => d.structure.currentInstance);
   const curProdId = useDrawing(drawingId, d => d.structure.currentProduct);
   const solidsIds = useDrawingArr(drawingId, d => {
     var _d$structure$tree$cur;
     return (_d$structure$tree$cur = d.structure.tree[curProdId]) == null ? void 0 : _d$structure$tree$cur.solids;
   });
 
-  // This useDrawing is used ONLY for reactiveness, since we don't want to react to all the tree changes, and reacting to current node's children changes should be enough
+  // This useDrawing is used ONLY for reactiveness, since we don't want to react to all the tree changes, and reacting to current instance's children changes should be enough
   useDrawing(drawingId, d => {
     var _d$structure$tree$cur2;
-    return (_d$structure$tree$cur2 = d.structure.tree[curNodeId]) == null ? void 0 : _d$structure$tree$cur2.children;
+    return (_d$structure$tree$cur2 = d.structure.tree[curInstanceId]) == null ? void 0 : _d$structure$tree$cur2.children;
   });
   const tree = getDrawing(drawingId).structure.tree;
-  const descendants = curNodeId ? getDescendants(tree, curNodeId) : [];
+  const descendants = curInstanceId ? getDescendants(tree, curInstanceId) : [];
   const partDescendants = descendants.filter((id, i) => {
-    var _node$members, _node$members$product;
-    const node = tree[id];
-    if (node && !ccUtils.base.isA(node.class, CCClasses.IProductReference)) {
+    var _instance$members, _instance$members$pro;
+    const instance = tree[id];
+    if (instance && !ccUtils.base.isA(instance.class, CCClasses.IProductReference)) {
       return false;
     }
-    const product = tree[(_node$members = node.members) == null ? void 0 : (_node$members$product = _node$members.productId) == null ? void 0 : _node$members$product.value];
+    const product = tree[(_instance$members = instance.members) == null ? void 0 : (_instance$members$pro = _instance$members.productId) == null ? void 0 : _instance$members$pro.value];
     if (product && !ccUtils.base.isA(product.class, CCClasses.CCPart)) {
       return false;
     }
@@ -20883,9 +20905,9 @@ const useVisibleSolids = drawingId => {
   });
   let solids = [];
   partDescendants.forEach(id => {
-    var _node$members2, _node$members2$produc;
-    const node = tree[id];
-    const product = tree[(_node$members2 = node.members) == null ? void 0 : (_node$members2$produc = _node$members2.productId) == null ? void 0 : _node$members2$produc.value];
+    var _instance$members2, _instance$members2$pr;
+    const instance = tree[id];
+    const product = tree[(_instance$members2 = instance.members) == null ? void 0 : (_instance$members2$pr = _instance$members2.productId) == null ? void 0 : _instance$members2$pr.value];
     const solids_ = product == null ? void 0 : product.solids;
     solids_ && solids.push(...solids_);
   });
@@ -20920,9 +20942,9 @@ const getMateRefIds = (drawingId, constrId) => {
   if (pRefIds.length === 0) {
     return;
   }
-  const curNodeId = drawing.structure.currentNode;
-  const curNode = tree[curNodeId];
-  const curRefIds = (curNode == null ? void 0 : curNode.instances) || (curNode == null ? void 0 : curNode.children) || [];
+  const curInstanceId = drawing.structure.currentInstance;
+  const curInstance = tree[curInstanceId];
+  const curRefIds = (curInstance == null ? void 0 : curInstance.instances) || (curInstance == null ? void 0 : curInstance.children) || [];
   const mateRefIds = [];
   curRefIds.forEach(id => {
     var _tree$id$members, _tree$id$members$prod;
@@ -21069,10 +21091,10 @@ const Constraint = ({
   }, [drawingId, constraintId]);
   const onMouseEnter = React__default.useCallback(() => {
     const setHovered = getDrawing(drawingId).api.interaction.setHovered;
-    const curNodeId = getDrawing(drawingId).structure.currentNode;
+    const curInstanceId = getDrawing(drawingId).structure.currentInstance;
     setHovered(createInfo({
       objectId: constraintId,
-      prodRefId: curNodeId
+      prodRefId: curInstanceId
     }));
   }, [drawingId, constraintId]);
   const onMouseLeave = React__default.useCallback(() => {
@@ -22785,7 +22807,7 @@ const fileTypes = ['ofb', 'stp', 'stl'];
  * The model tree header.
  *
  * Responsibility:
- * - Show name of current node
+ * - Show name of current instance
  * - Show back button
  * - Show assembly node menu
  *      - Provide convert to template functionality
@@ -22798,11 +22820,11 @@ const ModelTreeHeader = ({
   const pStackNotEmpty = useCADStore(s => s.assemblyTree.prodStack.length) !== 0;
   const mode = useEditMode(drawingId);
   const currProd = useCurrentProduct(drawingId);
-  const currNode = useCurrentNode(drawingId);
-  const objDetails = useObjectDetails(drawingId, (currNode == null ? void 0 : currNode.id) || NOCCID);
+  const currInstance = useCurrentInstance(drawingId);
+  const objDetails = useObjectDetails(drawingId, (currInstance == null ? void 0 : currInstance.id) || NOCCID);
   const showBackBtn = React__default.useMemo(() => pStackNotEmpty || !objDetails.isRoot && (objDetails.isAssemblyNode || objDetails.isAssembly), [objDetails.isAssembly, objDetails.isAssemblyNode, objDetails.isRoot, pStackNotEmpty]);
   const isFeatureActive = useDrawing(drawingId, d => d.plugin.active.feature !== null) || false;
-  const name = currProd ? currProd.name : currNode ? currNode.name : '';
+  const name = currProd ? currProd.name : currInstance ? currInstance.name : '';
   const [rename, setRename] = React__default.useState(false);
   const [showNameChoice, setShowNameChoice] = React__default.useState(false);
   const enableProductManagement = React__default.useCallback(enabled => {
@@ -22813,7 +22835,7 @@ const ModelTreeHeader = ({
       drawing.api.plugin.setActiveGlobal(plugId, enabled);
     }
   }, [drawingId]);
-  const toExportId = (currNode == null ? void 0 : currNode.id) || (currProd == null ? void 0 : currProd.id);
+  const toExportId = (currInstance == null ? void 0 : currInstance.id) || (currProd == null ? void 0 : currProd.id);
   const exportNode = React__default.useCallback((type = 'ofb') => toExportId && FileUtils.exportNode(drawingId, toExportId, type), [drawingId, toExportId]);
 
   // Disable the ProductManagement plugin on unmount
@@ -22939,10 +22961,10 @@ const ModelTreeImpl = ({
   drawingId
 }) => {
   const mode = useEditMode(drawingId);
-  const currNode = useCurrentNode(drawingId);
+  const currInstance = useCurrentInstance(drawingId);
   const children = useDrawingArr(drawingId, d => {
     var _d$structure$tree;
-    return (_d$structure$tree = d.structure.tree[(currNode == null ? void 0 : currNode.id) || NOCCID]) == null ? void 0 : _d$structure$tree.children;
+    return (_d$structure$tree = d.structure.tree[(currInstance == null ? void 0 : currInstance.id) || NOCCID]) == null ? void 0 : _d$structure$tree.children;
   });
   return /*#__PURE__*/React__default.createElement("div", {
     style: {
@@ -23351,7 +23373,7 @@ const Solid = ({
   const onClick = React__default.useCallback(e => {
     var _drawing$structure$tr;
     const drawing = getDrawing(drawingId);
-    const curNodeId = drawing.structure.currentNode;
+    const curInstanceId = drawing.structure.currentInstance;
     const curProdId = drawing.structure.currentProduct;
     const selId = drawing.selection.active;
     if (selId) {
@@ -23382,21 +23404,21 @@ const Solid = ({
       objectId,
       graphicId: solidId,
       containerId: solidId,
-      prodRefId: isPart ? curProdId : curNodeId
+      prodRefId: isPart ? curProdId : curInstanceId
     }), multi);
   }, [drawingId, solidId]);
   const onMouseEnter = React__default.useCallback(() => {
     var _getDrawing$structure;
     const setHovered = getDrawing(drawingId).api.interaction.setHovered;
     const objectId = getDrawing(drawingId).geometry.cache[solidId].container.ownerId;
-    const curNodeId = getDrawing(drawingId).structure.currentNode;
+    const curInstanceId = getDrawing(drawingId).structure.currentInstance;
     const curProdId = getDrawing(drawingId).structure.currentProduct;
     const isPart = ccUtils.base.isA(((_getDrawing$structure = getDrawing(drawingId).structure.tree[curProdId]) == null ? void 0 : _getDrawing$structure.class) || '', CCClasses.CCPart);
     setHovered(createInfo({
       objectId,
       graphicId: solidId,
       containerId: solidId,
-      prodRefId: isPart ? curProdId : curNodeId
+      prodRefId: isPart ? curProdId : curInstanceId
     }));
   }, [drawingId, solidId]);
   const onMouseLeave = React__default.useCallback(() => {
@@ -23639,20 +23661,20 @@ const PartModeCmds = (drawingId, rootId) => {
       icon: /*#__PURE__*/React__default.createElement(Icon, {
         url: img$I
       }),
-      callback: wrapper(() => featureApi.createExtrusion(drawingId, rootId))
+      callback: wrapper(() => featureApi.createFeature(drawingId, rootId, CCClasses.CCExtrusion, 'Extrusion'))
     }, {
       label: 'Revolve',
       icon: /*#__PURE__*/React__default.createElement(Icon, {
         url: img$H
       }),
-      callback: wrapper(() => featureApi.createRevolve(drawingId, rootId))
+      callback: wrapper(() => featureApi.createFeature(drawingId, rootId, CCClasses.CCRevolve, 'Revolve'))
     }],
     Boolean: {
       label: 'Boolean',
       icon: /*#__PURE__*/React__default.createElement(Icon, {
         url: img$m
       }),
-      callback: wrapper(() => featureApi.createBooleanOperation(drawingId, rootId))
+      callback: wrapper(() => featureApi.createFeature(drawingId, rootId, CCClasses.CCUnion, 'Union'))
     },
     Slice: [{
       label: 'Slice',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/react-cad",
-  "version": "0.8.0",
+  "version": "0.9.0-beta.1",
   "description": "buerli CAD components",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "repository": {},
@@ -91,8 +91,8 @@
   },
   "dependencies": {
     "@ant-design/compatible": "^1.0.8",
-    "@buerli.io/classcad": "0.8.0",
-    "@buerli.io/react": "0.8.0",
+    "@buerli.io/classcad": "0.9.0-beta.1",
+    "@buerli.io/react": "0.9.0-beta.1",
     "@react-three/postprocessing": "2.14.9",
     "antd": "^4.23.4",
     "path-browserify": "^1.0.1",

package/build/components/UI/CAD/hooks/useCurrentNode.d.ts

@@ -1,2 +0,0 @@
-import { DrawingID } from '@buerli.io/core';
-export declare const useCurrentNode: (drawingId: DrawingID) => import("@buerli.io/core").IStructureObject | undefined;