@buerli.io/react-cad 0.9.0 → 0.11.0

package/build/plugins/AppearanceEditor/Root.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+import { PluginID, DrawingID } from '@buerli.io/core';
+export declare function Root({ drawingId, pluginId }: {
+    drawingId: DrawingID;
+    pluginId: PluginID;
+}): JSX.Element;
+export default Root;

package/build/plugins/AppearanceEditor/index.d.ts

@@ -0,0 +1,7 @@
+import { ObjectID, PluginDescription } from '@buerli.io/core';
+import { Root } from './Root';
+declare type InternalState = {
+    solidIds: ObjectID[];
+};
+declare const description: PluginDescription<InternalState>;
+export { Root, description };

package/build/plugins/Dimensions/DimContext.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 import * as THREE from 'three';
-import { DrawingID, PluginID } from '@buerli.io/core';
-export declare const DimContext: React.Context<{
+import { DrawingID } from '@buerli.io/core';
+export declare const DimSetContext: React.Context<{
     globalToLocalM: THREE.Matrix4;
-    pluginId: PluginID;
     drawingId: DrawingID;
 }>;
+export declare const DimContext: React.Context<{
+    globalToLocalM: THREE.Matrix4;
+}>;

package/build/plugins/Dimensions/Root.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DrawingID, PluginID } from '@buerli.io/core';
+import { PluginID, DrawingID } from '@buerli.io/core';
 export declare const Root: React.FC<{
     drawingId: DrawingID;
     pluginId: PluginID;

package/build/plugins/Dimensions/View.d.ts

@@ -1,6 +1,6 @@
-import React from 'react';
+/// <reference types="react" />
 import { DrawingID, PluginID } from '@buerli.io/core';
-export declare const View: React.FC<{
+export declare function View({ drawingId, pluginId }: {
     drawingId: DrawingID;
     pluginId: PluginID;
-}>;
+}): JSX.Element;

package/build/plugins/Dimensions/graphics/DimensionSet.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import { DrawingID, ObjectID } from '@buerli.io/core';
+export declare const DimensionSet: React.FC<{
+    drawingId: DrawingID;
+    objectId: ObjectID;
+    applyTransform?: boolean;
+    allowDeletion?: boolean;
+}>;

package/build/plugins/Dimensions/index.d.ts

@@ -1,7 +1,5 @@
-import { ObjectID, Plugin as PluginT } from '@buerli.io/core';
-export { useDimensionSetId } from './utils';
-export declare type DimensionsPState = {
-    selected: ObjectID[];
-};
-declare const Plugin: PluginT;
-export { Plugin };
+import { PluginDescription } from '@buerli.io/core';
+import { View } from './View';
+import { Root } from './Root';
+declare const description: PluginDescription;
+export { Root, View, description };

package/build/plugins/Dimensions/utils.d.ts

@@ -1,3 +1,5 @@
 import { DrawingID, ObjectID, IStructureObject } from '@buerli.io/core';
 export declare function useDimensionSetId(drawingId: DrawingID, ownerId: ObjectID): ObjectID | undefined;
 export declare const isAngular: (dim: IStructureObject) => boolean;
+export declare const isRadial: (dim: IStructureObject) => boolean;
+export declare const isDiameter: (dim: IStructureObject) => boolean;

package/build/plugins/Sketch/Root/useContextMenuItems.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import 'antd/dist/antd.css';
+import { DrawingID, PluginID } from '@buerli.io/core';
+import { MenuElement } from '../../../components/UI/CAD/common/ContextMenu';
+export declare function useContextMenuItems(drawingId: DrawingID, pluginId: PluginID, setRename: React.Dispatch<React.SetStateAction<boolean>>): MenuElement[];

package/build/plugins/Sketch/View/graphics/hooks.d.ts

@@ -9,8 +9,8 @@ export declare const useGeomParams: (objId: ObjectID) => {
 declare type ObjState = {
     isSketchActive: boolean;
     isHighlighted: boolean;
-    isHovered: boolean;
     isGHovered: boolean;
+    isSHovered: boolean;
     isSelected: boolean;
     lgsState: number;
 };
@@ -21,7 +21,7 @@ export declare const getColor: (object: IStructureObject, objState: ObjState) =>
  * @returns
  */
 export declare const useSketchHandlers: (objId: ObjectID) => Record<string, (e: import("@react-three/fiber/dist/declarations/src/core/events").IntersectionEvent<PointerEvent> & import("@react-three/fiber").Properties<PointerEvent> & import("../../types").PointerEventsT) => void> | undefined;
-export declare const useColor: (objId: ObjectID, gHovered: boolean) => number;
+export declare const useColor: (objId: ObjectID) => number;
 export declare const useUserData: (objId: ObjectID) => {
     objId: number;
     onHUD: true;

package/build/plugins/Sketch/View/handlers/DrawRectangle.d.ts

@@ -1,3 +1,3 @@
 import { DrawingID, PluginID } from '@buerli.io/core';
-import { Handler } from '../../types';
-export declare function DrawRectangle(drawingId: DrawingID, pluginId: PluginID): Handler;
+import { Handler, HandlersList } from '../../types';
+export declare function DrawRectangle(drawingId: DrawingID, pluginId: PluginID, rectType: HandlersList.DRAWRECT2POINTS | HandlersList.DRAWRECTCENTER): Handler;

package/build/plugins/Sketch/View/handlers/HandlersConstructors.d.ts

@@ -3,10 +3,10 @@ import { CreateAngle } from './CreateAngle';
 import { Drag } from './Drag';
 import { DrawPoint } from './DrawPoint';
 import { DrawLine } from './DrawLine';
-import { DrawRectangle } from './DrawRectangle';
 import { DrawCircle } from './DrawCircle';
 import { Fillet } from './Fillet';
 import { Trim } from './Trim';
+import { Split } from './Split';
 import { UseRef } from './UseRef';
 export declare const HandlersConstructors: {
     createAngle: typeof CreateAngle;
@@ -14,10 +14,12 @@ export declare const HandlersConstructors: {
     drawPoint: typeof DrawPoint;
     drawLine: typeof DrawLine;
     drawCircle: typeof DrawCircle;
-    drawRectangle: typeof DrawRectangle;
     fillet: typeof Fillet;
     trim: typeof Trim;
+    split: typeof Split;
     useReference: typeof UseRef;
+    drawRect2Points: (drawingId: DrawingID, pluginId: PluginID) => import("../../types").Handler;
+    drawRectCenter: (drawingId: DrawingID, pluginId: PluginID) => import("../../types").Handler;
     drawArcCenter: (drawingId: DrawingID, pluginId: PluginID) => import("../../types").Handler;
     drawArcMidlde: (drawingId: DrawingID, pluginId: PluginID) => import("../../types").Handler;
     drawArcTangent: (drawingId: DrawingID, pluginId: PluginID) => import("../../types").Handler;

package/build/plugins/Sketch/View/handlers/Split.d.ts

@@ -0,0 +1,3 @@
+import { DrawingID, PluginID } from '@buerli.io/core';
+import { Handler } from '../../types';
+export declare function Split(drawingId: DrawingID, pluginId: PluginID): Handler;

package/build/plugins/Sketch/View/handlers/splitHelpers.d.ts

@@ -0,0 +1,34 @@
+import * as THREE from 'three';
+import { DrawingID, ObjectID } from "@buerli.io/core";
+import { CCClasses } from "@buerli.io/classcad";
+declare type CommonInfo = {
+    class: CCClasses.CCLine | CCClasses.CCArc | CCClasses.CCCircle;
+    bb: THREE.Box2;
+};
+declare type LineInfo = CommonInfo & {
+    start: THREE.Vector3;
+    end: THREE.Vector3;
+    dir: THREE.Vector3;
+};
+declare type ArcInfo = CommonInfo & {
+    start: THREE.Vector3;
+    end: THREE.Vector3;
+    center: THREE.Vector3;
+    radius: number;
+    clockwise: boolean;
+    startAngle: number;
+    endAngle: number;
+    angularlength: number;
+};
+declare type CircleInfo = CommonInfo & {
+    center: THREE.Vector3;
+    radius: number;
+};
+export declare type ObjInfo = LineInfo | ArcInfo | CircleInfo;
+export declare function getSketchObjInfo(drawingId: DrawingID, objId: ObjectID): LineInfo | CircleInfo | undefined;
+export declare function getNormalizedPosition(point: THREE.Vector3, sketchObject: ObjInfo): number;
+export declare function getParameterizedPosition(t: number, sketchObject: ObjInfo): THREE.Vector3;
+export declare function calculateIntersections(object: ObjInfo, sketchObjects: ObjInfo[]): number[];
+export declare function calculateClosestIntersection(point: THREE.Vector3, object1: ObjInfo, object2: ObjInfo): number[][];
+export declare function getClosestPoint(point: THREE.Vector3, sketchObject: ObjInfo): THREE.Vector3;
+export {};

package/build/plugins/Sketch/types.d.ts

@@ -9,6 +9,7 @@ export declare type HighlightedConstraintsT = Array<{
 }>;
 export declare type SketchPState = {
     alwaysShowConstr: boolean;
+    showCoincidence: boolean;
     constraintsToGeometry: {
         [key: number]: ObjectID;
     };
@@ -20,12 +21,11 @@ export declare type SketchPState = {
     tmpObjects: {
         [key: string]: TmpObject;
     };
-    selected: ObjectID[];
-    hovered: ObjectID;
     highlighted: ObjectID[];
     interaction: {
         cycle: number;
         objects: ObjectID[];
+        lastPos: THREE.Vector3 | undefined;
     };
     isDragged: boolean;
     scale: number;
@@ -46,7 +46,8 @@ export declare enum HandlersList {
     DRAG = "drag",
     DRAWPOINT = "drawPoint",
     DRAWLINE = "drawLine",
-    DRAWRECTANGLE = "drawRectangle",
+    DRAWRECT2POINTS = "drawRect2Points",
+    DRAWRECTCENTER = "drawRectCenter",
     DRAWARCTANGENT = "drawArcTangent",
     DRAWARCCENTER = "drawArcCenter",
     DRAWARCMIDDLE = "drawArcMidlde",
@@ -54,6 +55,7 @@ export declare enum HandlersList {
     FILLET = "fillet",
     HOVER = "hover",
     TRIM = "trim",
+    SPLIT = "split",
     USEREF = "useReference",
     GSELECTION = "globalSelection"
 }
@@ -65,7 +67,7 @@ export declare type Handler = {
     name: HandlersList;
     filter: (object: IStructureObject) => boolean;
     onActivate?: () => void;
-    onDeactivate?: () => void;
+    onDeactivate?: (() => void) | (() => Promise<void>);
     pointerHandlers: Record<string, (e: ThreeEvent<PointerEvent> & PointerEventsT) => void>;
     keyHandlers?: Record<string, (e: KeyboardEvent) => boolean | void>;
 };
@@ -80,6 +82,7 @@ export declare enum TmpObjClasses {
 declare type TmpObjectCommon = {
     class: TmpObjClasses;
     id: string;
+    color?: THREE.ColorRepresentation;
 };
 export declare type TmpLineT = TmpObjectCommon & {
     startPId: TmpObjectID;
@@ -93,6 +96,7 @@ export declare type TmpRectT = TmpObjectCommon & {
 };
 export declare type TmpPointT = TmpObjectCommon & {
     position: THREE.Vector3;
+    size?: number;
 };
 export declare type TmpArcT = TmpObjectCommon & {
     startPId: TmpObjectID;

package/build/plugins/Sketch/utils/Interaction.d.ts

@@ -1,5 +1,6 @@
+import * as THREE from 'three';
 import { DrawingID, PluginID, ObjectID } from '@buerli.io/core';
-export declare const hover: (drawingId: DrawingID, pluginId: PluginID, hoveredId: ObjectID) => void;
-export declare const unhover: (drawingId: DrawingID, pluginId: PluginID, hoveredId: ObjectID) => void;
+export declare const hover: (drawingId: DrawingID, pluginId: PluginID, objIds: ObjectID[], hoverPos?: THREE.Vector3) => void;
+export declare const unhover: (drawingId: DrawingID, pluginId: PluginID, objId: ObjectID) => void;
 export declare const select: (drawingId: DrawingID, pluginId: PluginID, selectedId: ObjectID) => void;
 export declare const tab: (drawingId: DrawingID, pluginId: PluginID) => void;

package/build/plugins/Sketch/utils/getConstrEntities.d.ts

@@ -0,0 +1,2 @@
+import { DrawingID, ObjectID } from '@buerli.io/core';
+export declare const getConstrEntities: (drawingId: DrawingID, constrId: ObjectID) => number[];

package/build/plugins/Sketch/utils/getGeometryPriority.d.ts

@@ -1,2 +1,2 @@
 import { IStructureObject } from '@buerli.io/core';
-export declare function getGeometryPriority(object: IStructureObject): 1 | 2 | 3 | 4 | -1 | 5;
+export declare function getGeometryPriority(object: IStructureObject): 1 | 2 | 4 | 3 | -1 | 5;

package/build/plugins/Twist/Root.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import { DrawingID, PluginID } from '@buerli.io/core';
+export declare const Root: React.FC<{
+    drawingId: DrawingID;
+    pluginId: PluginID;
+}>;

package/build/plugins/Twist/index.d.ts

@@ -0,0 +1,4 @@
+import { PluginDescription } from '@buerli.io/core';
+import { Root } from './Root';
+declare const description: PluginDescription;
+export { Root, description };

package/build/plugins/components/PluginForm.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DrawingID } from '@buerli.io/core';
+import { DrawingID, PluginID } from '@buerli.io/core';
 import { MemberParam } from '../../types';
 /**
  * @param drawingId - id of the drawing.
@@ -14,6 +14,7 @@ import { MemberParam } from '../../types';
  */
 export declare const PluginForm: React.FC<{
     drawingId: DrawingID;
+    pluginId: PluginID;
     update: () => Promise<void>;
     params: Record<string, MemberParam<any>>;
     children?: React.ReactNode;

package/build/utils/helpers.d.ts

@@ -33,4 +33,5 @@ export declare function rgbToHex(color: {
 }): string;
 export declare function fmod(num: number, denom: number): number;
 export declare function numberToHexColor(color: number): string;
+export declare const solveQuadratic: (a: number, b: number, c: number) => number[];
 export declare const solveQuartic: (a: number, b: number, c: number, d: number, e: number) => number[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/react-cad",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "buerli CAD components",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "repository": {},
@@ -37,8 +37,8 @@
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.10.4",
-    "@buerli.io/icons": "^1.0.10",
-    "@react-three/drei": "9.77.1",
+    "@buerli.io/icons": "^1.0.12",
+    "@react-three/drei": "9.92.3",
     "@react-three/fiber": "8.13.0",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-image": "^2.1.0",
@@ -71,7 +71,7 @@
     "jest-environment-jsdom": "^29.1.2",
     "lint-staged": "10.5.3",
     "postcss": "^8.2.14",
-    "prettier": "^2.4.0",
+    "prettier": "^3.0.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",
     "react-test-renderer": "^16.13.1",
@@ -84,26 +84,26 @@
     "typescript": "4.8.4"
   },
   "peerDependencies": {
-    "@react-three/drei": ">=9.77.1",
+    "@react-three/drei": ">=9.92.3",
     "@react-three/fiber": ">=8.13.0",
     "three": ">=0.153",
     "react": ">=18.0"
   },
   "dependencies": {
-    "@ant-design/compatible": "^1.0.8",
-    "@buerli.io/classcad": "0.9.0",
-    "@buerli.io/react": "0.9.0",
-    "@react-three/postprocessing": "2.14.9",
+    "@buerli.io/classcad": "0.11.0",
+    "@buerli.io/react": "0.11.0",
+    "@dnd-kit/core": "^6.0.8",
+    "@dnd-kit/modifiers": "^6.0.1",
+    "@dnd-kit/sortable": "^7.0.2",
+    "@react-three/postprocessing": "2.15.0",
     "antd": "^4.23.4",
     "path-browserify": "^1.0.1",
-    "postprocessing": "6.31.0",
+    "postprocessing": "6.33.0",
     "react-colorful": "^5.3.0",
-    "react-movable": "^2.3.0",
-    "react-sortable-hoc": "^2.0.0",
     "react-uid": "^2.3.1",
     "styled-components": "^5.3.1",
     "three-rounded-box": "^0.1.1",
-    "uuid": "^3.3.2",
+    "uuid": "^9.0.0",
     "zustand": "^4.1.4"
   }
 }

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

@@ -1,5 +0,0 @@
-import React from 'react';
-import 'antd/dist/antd.css';
-import { DrawingID, ObjectID } from '@buerli.io/core';
-import { MenuItems } from '../common/Menu';
-export declare function useMenuItems(drawingId: DrawingID, objectId: ObjectID, setRename: React.Dispatch<React.SetStateAction<boolean>>): MenuItems;

package/build/components/UI/CAD/Solids/ColorPicker.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-import './colorPicker.css';
-import { DrawingID, ObjectID } from '@buerli.io/core';
-export declare const ColorPicker: React.FC<{
-    drawingId: DrawingID;
-    solidId: ObjectID;
-}>;

package/build/components/UI/CAD/Solids/useMenuItems.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import 'antd/dist/antd.css';
-import { DrawingID, ObjectID } from '@buerli.io/core';
-import { MenuItems } from '../common/Menu';
-export declare function useMenuItems(drawingId: DrawingID, solidId: ObjectID, setEditName: React.Dispatch<React.SetStateAction<boolean>>): MenuItems;

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

@@ -1,5 +0,0 @@
-import React from 'react';
-import 'antd/dist/antd.css';
-import { DrawingID, ObjectID } from '@buerli.io/core';
-import { MenuItems } from '../common/Menu';
-export declare function useMenuItems(drawingId: DrawingID, featureId: ObjectID, isActive: boolean, setEditName: React.Dispatch<React.SetStateAction<boolean>>): MenuItems;

package/build/components/UI/CAD/plugins/ProductManagement/useMenuItems.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import 'antd/dist/antd.css';
-import { DrawingID, ObjectID, PluginID } from '@buerli.io/core';
-import { MenuItems } from '../../common/Menu';
-export declare function useMenuItems(drawingId: DrawingID, pluginId: PluginID, prodId: ObjectID, setEditName: React.Dispatch<React.SetStateAction<boolean>>): MenuItems;

package/build/plugins/Sketch/Root/useMenuItems.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import 'antd/dist/antd.css';
-import { DrawingID, ObjectID, PluginID } from '@buerli.io/core';
-import { MenuItems } from '../../../components/UI/CAD/common/Menu';
-export declare function useMenuItems(drawingId: DrawingID, pluginId: PluginID, objectId: ObjectID, setRename: React.Dispatch<React.SetStateAction<boolean>>): MenuItems;