@buerli.io/react-cad 0.0.23-beta.4 → 0.0.24-beta.1

package/build/plugins/Sketch/Root/Constraints/index.d.ts

@@ -0,0 +1,2 @@
+export { Constraints } from './Constraints';
+export { constraintsHelpers } from './constraintsHelpers';

package/build/plugins/Sketch/Root/Constraints/utils.d.ts

@@ -0,0 +1,6 @@
+import { CCClasses } from '@buerli.io/classcad';
+export declare const classNameMap: {
+    [key: string]: string;
+};
+export declare function getKeyCode(constrClass: CCClasses): "KeyF" | "KeyH" | "KeyV" | "KeyI" | "KeyT" | "KeyP" | "KeyC" | "KeyE" | "KeyO" | "KeyD" | "KeyR" | null | undefined;
+export declare function getHotKey(constrClass: CCClasses): string;

package/build/plugins/Sketch/View/graphics/Merged/Arc.d.ts

@@ -1,6 +1,8 @@
 import React from 'react';
 import * as THREE from 'three';
+import { DrawingID, PluginID } from '@buerli.io/core';
 import { commonProps } from '../primitives';
+export declare const useTubeRadius: (drawingId: DrawingID, pluginId: PluginID) => number;
 export declare const Arc: React.FC<{
     start: THREE.Vector3;
     end: THREE.Vector3;

package/build/plugins/Sketch/View/graphics/Merged/ArcGeometry.d.ts

@@ -0,0 +1,2 @@
+import * as THREE from 'three';
+export declare const createArcGeometry: (radialSegments: number, tubularSegments: number, instanceLimit: number) => THREE.BufferGeometry;

package/build/plugins/Sketch/View/graphics/Merged/ArcMaterial.d.ts

@@ -0,0 +1,2 @@
+import * as THREE from 'three';
+export declare const createArcMaterial: () => THREE.ShaderMaterial;

package/build/plugins/Sketch/View/graphics/Merged/Circle.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import * as THREE from 'three';
+import { commonProps } from '../primitives';
+export declare const Circle: React.FC<{
+    center: THREE.Vector3;
+    radius: number;
+} & commonProps>;

package/build/plugins/Sketch/View/graphics/Merged/MergedWrapper.d.ts

@@ -1,14 +1,22 @@
 import React from 'react';
 import * as THREE from 'three';
+declare type ArcInstance = THREE.Group & {
+    radius: number;
+    tubeRadius: number;
+    angularLength: number;
+};
 export declare const getCylBB: () => THREE.Box3;
 export declare const getSphereBB: () => THREE.Box3;
+export declare const getArcBB: (mesh: ArcInstance) => THREE.Box3;
 export declare const MeshContext: React.Context<{
-    Cylinder: any;
-    Sphere: any;
+    MockCylinder: any;
+    MockSphere: any;
+    MockArc: any;
 }>;
 /**
  * Component which implements InstancedMesh from three.js.
- * Merged component from drei takes globaly created meshes and then passes corresponding "mocked" components via function props (Box and Sphere) to children.
+ * Merged component from drei takes globaly created meshes and then passes corresponding "mocked" components via function props (MockCylinder and MockSphere) to children.
  * "mocked" components are used for saying drei where to draw instances.
  */
 export declare const MergedWrapper: React.FC;
+export {};

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

@@ -14,17 +14,18 @@ declare type ObjState = {
     lgsState: number;
 };
 export declare const getColor: (object: IStructureObject, objState: ObjState) => number;
-export declare const useSketchHandlers: (objId: ObjectID) => {
-    [key: string]: (e: PointerEvent & import("@react-three/fiber/dist/declarations/src/core/events").IntesectionEvent<PointerEvent> & import("../../types").PointerEventsT) => void;
-} | undefined;
+/**
+ * Return pointerHandlers of currently enabled sketch Handler.
+ * @param objId
+ * @returns
+ */
+export declare const useSketchHandlers: (objId: ObjectID) => Record<string, (e: PointerEvent & import("@react-three/fiber/dist/declarations/src/core/events").IntesectionEvent<PointerEvent> & import("../../types").PointerEventsT) => void> | undefined;
 export declare const useColor: (objId: ObjectID, gHovered: boolean) => number;
 export declare const useUserData: (objId: ObjectID) => {
     objId: number;
 };
 export declare const useHandlersAndColor: (drawingId: DrawingID, objId: ObjectID) => {
-    handlers: {
-        [key: string]: (e: PointerEvent & import("@react-three/fiber/dist/declarations/src/core/events").IntesectionEvent<PointerEvent> & import("../../types").PointerEventsT) => void;
-    };
+    handlers: Record<string, (e: PointerEvent & import("@react-three/fiber/dist/declarations/src/core/events").IntesectionEvent<PointerEvent> & import("../../types").PointerEventsT) => void>;
     color: number;
 };
 export {};

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

@@ -1,8 +1,8 @@
 import * as THREE from 'three';
 import React from 'react';
-export declare const lineWidth = 0.2;
-export declare const pointSize = 0.5;
-export declare const arcWidth = 0.2;
+export declare const lineWidth = 0.25;
+export declare const pointSize = 0.6;
+export declare const arcWidth = 0.25;
 export declare const radSegments = 32;
 export declare const tubeSegments = 6;
 export declare type commonProps = {

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

@@ -1,4 +1,5 @@
 import React from 'react';
-export declare function setScale(newScale: number): void;
-export declare function getScale(): number;
-export declare function useScale(getVector?: (sf: number) => [number, number, number]): React.MutableRefObject<import("three").Object3D | undefined>;
+import { DrawingID, PluginID } from '@buerli.io/core';
+export declare function setScale(drawingId: DrawingID, pluginId: PluginID, newScale: number): void;
+export declare function getScale(drawingId: DrawingID, pluginId: PluginID): number;
+export declare function useScale(drawingId: DrawingID, pluginId: PluginID, getVector?: (sf: number) => [number, number, number]): React.MutableRefObject<import("three").Object3D<import("three").Event> | undefined>;

package/build/plugins/Sketch/View/handlers/{Handlers.d.ts → HandlersConstructors.d.ts}

@@ -9,7 +9,7 @@ import { DrawCircle } from './DrawCircle';
 import { Fillet } from './Fillet';
 import { Trim } from './Trim';
 import { UseRef } from './UseRef';
-export declare const Handlers: {
+export declare const HandlersConstructors: {
     createAngle: typeof CreateAngle;
     drag: typeof Drag;
     drawPoint: typeof DrawPoint;

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

@@ -1,22 +1,21 @@
 import * as THREE from 'three';
 import { IStructureTree, ObjectID, IStructureObject } from '@buerli.io/core';
-import { WithChildren, WithMembers } from '../../../../types';
 export declare function getSketchDescendants(tree: IStructureTree, sketchId: ObjectID): number[];
 export declare function findPointsAt(pos: THREE.Vector3, tree: IStructureTree, sketchId: ObjectID): IStructureObject[];
 export declare function findConstraints(type: string, objA: IStructureObject, objB: IStructureObject, tree: IStructureTree, sketchId: ObjectID): number[];
 declare type FilletInfo = {
-    lines: Array<IStructureObject & WithMembers & WithChildren>;
-    lineStarts: Array<IStructureObject & WithMembers>;
-    lineEnds: Array<IStructureObject & WithMembers>;
+    lines: Array<IStructureObject>;
+    lineStarts: Array<IStructureObject>;
+    lineEnds: Array<IStructureObject>;
     control: THREE.Vector3;
 };
 declare type NewFilletInfo = FilletInfo & {
     incidence: ObjectID;
 };
 declare type ExistingFilletInfo = FilletInfo & {
-    object: IStructureObject & WithMembers & WithChildren;
+    object: IStructureObject;
     objectEnds: IStructureObject[];
-    filletPoint: IStructureObject & WithMembers;
+    filletPoint: IStructureObject;
 };
 export declare function recognizeFilletableAngle(pos: THREE.Vector3, tree: IStructureTree, sketchId: ObjectID): NewFilletInfo | null;
 export declare function getTouchPoints(info: FilletInfo, distance: number): THREE.Vector3[] | null;
@@ -29,7 +28,7 @@ export declare function calculateFilletParams(info: FilletInfo, distance: number
     clockwise: boolean;
     control: THREE.Vector3;
 } | null;
-export declare function calculateNewFilletData(object: IStructureObject & WithMembers, tree: IStructureTree, sketchId: ObjectID): {
+export declare function calculateNewFilletData(object: IStructureObject, tree: IStructureTree, sketchId: ObjectID): {
     info: NewFilletInfo;
     params: {
         start: THREE.Vector3;
@@ -39,5 +38,5 @@ export declare function calculateNewFilletData(object: IStructureObject & WithMe
         control: THREE.Vector3;
     };
 } | null;
-export declare function recognizeFilletByArc(object: IStructureObject & WithMembers & WithChildren, tree: IStructureTree, sketchId: ObjectID): ExistingFilletInfo | null;
+export declare function recognizeFilletByArc(object: IStructureObject, tree: IStructureTree, sketchId: ObjectID): ExistingFilletInfo | null;
 export {};

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

@@ -1,3 +1,5 @@
 import { PluginDescription } from '@buerli.io/core';
+import { SketchPState } from './types';
+export declare const initialState: SketchPState;
 export declare const description: PluginDescription;
 export declare const tolerance = 0.000001;

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

@@ -1,10 +1,8 @@
 /// <reference types="react" />
 import { ThreeEvent, ReactThreeFiber } from '@react-three/fiber';
 import { IStructureObject, ObjectID, PluginID } from '@buerli.io/core';
-import { CCClasses } from '@buerli.io/classcad';
 import { InfinityPlane } from '../../components/graphics/InfinityPlane';
 import { Geometry } from 'three-stdlib';
-export declare const UNDEFINEDID = -1;
 export declare type HighlightedConstraintsT = Array<{
     constraintId: ObjectID;
     geometryId: ObjectID;
@@ -25,6 +23,7 @@ export declare type SketchPState = {
     selected: ObjectID[];
     hovered: ObjectID;
     highlighted: ObjectID[];
+    isDragged: boolean;
     scale: number;
     step: number;
     dimPluginId: PluginID | undefined;
@@ -34,6 +33,7 @@ export declare type SketchPState = {
         min: THREE.Vector2;
         max: THREE.Vector2;
     } | undefined;
+    cursor: null | string;
 };
 export declare type TmpObjectID = string;
 export declare enum HandlersList {
@@ -59,25 +59,33 @@ export declare type PointerEventsT = {
 export declare type Handler = {
     name: HandlersList;
     filter: (object: IStructureObject) => boolean;
-    onConstruct?: () => void;
-    onDestruct?: () => void;
-    isSelector?: boolean;
-    escHandler?: () => void;
-    pointerHandlers: {
-        [key: string]: (e: ThreeEvent<PointerEvent> & PointerEventsT) => void;
-    };
-    keyHandlers?: {
-        [key: string]: (e: KeyboardEvent) => boolean | void;
-    };
+    onActivate?: () => void;
+    onDeactivate?: () => void;
+    pointerHandlers: Record<string, (e: ThreeEvent<PointerEvent> & PointerEventsT) => void>;
+    keyHandlers?: Record<string, (e: KeyboardEvent) => boolean | void>;
 };
+export declare enum TmpObjClasses {
+    Line = "Line",
+    Point = "Point",
+    Circle = "Cirlce",
+    Arc = "Arc",
+    AngularDimension = "AngularDimension",
+    Rectangle = "Rectangle"
+}
 declare type TmpObjectCommon = {
-    class: CCClasses;
+    class: TmpObjClasses;
     id: string;
 };
 export declare type TmpLineT = TmpObjectCommon & {
     startPId: TmpObjectID;
     endPId: TmpObjectID;
 };
+export declare type TmpRectT = TmpObjectCommon & {
+    start: THREE.Vector3;
+    end: THREE.Vector3;
+    isSquare: boolean;
+    isCentered: boolean;
+};
 export declare type TmpPointT = TmpObjectCommon & {
     position: THREE.Vector3;
 };
@@ -99,7 +107,7 @@ export declare type TmpAngularDimensionT = TmpObjectCommon & {
     dimPos: THREE.Vector3;
     reflex: number;
 };
-export declare type TmpObject = TmpLineT | TmpPointT | TmpArcT | TmpCircleT | TmpAngularDimensionT;
+export declare type TmpObject = TmpLineT | TmpPointT | TmpArcT | TmpCircleT | TmpAngularDimensionT | TmpRectT;
 export declare type TmpObjects = {
     [key: string]: TmpObject;
 };

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

@@ -1,6 +1,17 @@
 import React from 'react';
 import { DrawingID } from '@buerli.io/core';
 import { MemberParam } from '../../types';
+/**
+ * @param drawingId - id of the drawing.
+ * @param update - a function which will be called when user presses "Update" button.
+ * @param params - all params which should be sent to the server. PluginForm validates each of them.
+ * @param validator - smart validation (check https://awv-informatik.atlassian.net/wiki/spaces/CLAS/pages/2428076033/Validation for mor details)
+ * @param autoClose - (optional) if true plugin will closed after update. Default is true.
+ * @param forceUpdateEnabled - if plugin is opened for the recently created feature it contains default values.
+ * User should be able to click "Update" button (clicking on close will remove the feature). Since there is no params changed by the user validator disables "Update" button.
+ * To make "Update" button enabled with default values pass true to forceUpdateEnabled
+ * @returns
+ */
 export declare const PluginForm: React.FC<{
     drawingId: DrawingID;
     update: () => Promise<void>;

package/build/types.d.ts

@@ -1,16 +1,4 @@
 /// <reference types="react" />
-import { IStructureMember, ObjectID } from '@buerli.io/core';
-export declare type WithMembers = {
-    members: {
-        [key: string]: IStructureMember;
-    };
-};
-export declare type WithChildren = {
-    children: ObjectID[];
-};
-export declare type WithParent = {
-    parent: ObjectID;
-};
 export declare type MemberParam<T> = {
     userValue: T;
     serverValue: T;

package/build/utils/defaultValues.d.ts

@@ -0,0 +1,3 @@
+export declare const EMPTYARRAY: never[];
+export declare const NOCCID: number;
+export declare const EMPTYSTR = "";

package/build/utils/drawing/index.d.ts

@@ -0,0 +1,3 @@
+export { useDrawingArr } from './useDrawingArr';
+export { useDrawingCCId } from './useDrawingCCId';
+export { useDrawingStr } from './useDrawingStr';

package/build/utils/drawing/useDrawingArr.d.ts

@@ -0,0 +1,10 @@
+import { DrawingID, DrawingState } from '@buerli.io/core';
+/**
+ * Wrapper around useDrawing which allows to avoid ReferenceErrors.
+ * Use useDrawingArr if you want to get an array from store. It returns EMPTYARRAY if requested one is undefined.
+ *
+ * @param drawingId
+ * @param selector
+ * @returns requested by selector array or EMPTYARRAY if requested is undefined or null
+ */
+export declare function useDrawingArr<T>(drawingId: DrawingID, selector: (state: DrawingState) => Array<T> | undefined): Array<T>;

package/build/utils/drawing/useDrawingCCId.d.ts

@@ -0,0 +1,10 @@
+import { DrawingID, DrawingState, ObjectID } from '@buerli.io/core';
+/**
+ * Wrapper around useDrawing which allows to avoid ReferenceErrors.
+ * Use useDrawingCCId if you want to get an object id from store. It returns NOCCID if requested one is undefined or null.
+ *
+ * @param drawingId
+ * @param selector
+ * @returns requested by selector object id or NOCCID if requested is undefined or null
+ */
+export declare function useDrawingCCId(drawingId: DrawingID, selector: (state: DrawingState) => ObjectID | undefined): ObjectID;

package/build/utils/drawing/useDrawingStr.d.ts

@@ -0,0 +1,10 @@
+import { DrawingID, DrawingState } from '@buerli.io/core';
+/**
+ * Wrapper around useDrawing which allows to avoid ReferenceErrors.
+ * Use useDrawingStr if you want to get a string from store. It returns EMPTYSTR if requested one is undefined.
+ *
+ * @param drawingId
+ * @param selector
+ * @returns requested by selector string or EMPTYSTRING if requested one is undefined or null
+ */
+export declare function useDrawingStr(drawingId: DrawingID, selector: (state: DrawingState) => string | undefined): string;

package/build/utils/helpers.d.ts

@@ -1,7 +1,6 @@
 import { CCClasses } from '@buerli.io/classcad';
 import { DrawingID, GeometryElement, GraphicID, IStructureObject, IStructureTree, MemberType, ObjectID, PointMem, PointMemValue, SelectedItem } from '@buerli.io/core';
 import * as THREE from 'three';
-import { WithChildren, WithMembers } from '../types';
 export declare function membersValues(drawingId: DrawingID, ccObjId: DrawingID): any;
 export declare function addMembers(drawingId: DrawingID, ccObjId: DrawingID): {
     members?: undefined;
@@ -15,7 +14,7 @@ export declare function convertToVector(point: PointMem): THREE.Vector3;
 export declare function convertToArray(point: PointMem): number[];
 export declare function linesIntersection(point1: THREE.Vector3, dir1: THREE.Vector3, point2: THREE.Vector3, dir2: THREE.Vector3): THREE.Vector3 | null;
 export declare const angleVecVec: (a: THREE.Vector3, b: THREE.Vector3) => number;
-export declare const calculateTangent: (tree: IStructureTree, object: IStructureObject & WithMembers & WithChildren, point: THREE.Vector3) => THREE.Vector3 | undefined;
+export declare const calculateTangent: (tree: IStructureTree, object: IStructureObject, point: THREE.Vector3) => THREE.Vector3 | undefined;
 export declare function getDescendants(tree: IStructureTree, objectId: ObjectID): number[];
 export declare function getAncestorIdByClass(drawingId: DrawingID, objectId: ObjectID, parentClass: CCClasses): number | null;
 export declare const isSketchGeometry: (arg: IStructureObject | CCClasses) => boolean;
@@ -34,3 +33,4 @@ 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 solveQuartic: (a: number, b: number, c: number, d: number, e: number) => number[];

package/build/utils/selection/useSelectorsOrder.d.ts

@@ -4,4 +4,9 @@ export declare type SelectorsOrderT = {
     removeSelector: (selId: SelectorID) => void;
     switchToNext: (selId: SelectorID) => void;
 };
+/**
+ * Allows to automatically enable all selectors in form one by one.
+ * @param drawingId
+ * @returns
+ */
 export declare function useSelectorsOrder(drawingId: DrawingID): SelectorsOrderT;

package/build/utils/useScale.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare function useScale(position: THREE.Vector3, getVector?: (sf: number) => [number, number, number]): React.MutableRefObject<import("three").Object3D | undefined>;
+export declare function useScale(position: THREE.Vector3, getVector?: (sf: number) => [number, number, number]): React.MutableRefObject<import("three").Object3D<import("three").Event> | undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/react-cad",
-  "version": "0.0.23-beta.4",
+  "version": "0.0.24-beta.1",
   "description": "buerli CAD components",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "repository": {},
@@ -47,7 +47,7 @@
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.10.4",
     "@buerli.io/icons": "^1.0.9",
-    "@react-three/drei": "^7.26.1",
+    "@react-three/drei": "^8.10.6",
     "@react-three/fiber": "^7.0.19",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-image": "^2.1.0",
@@ -57,9 +57,10 @@
     "@testing-library/react-hooks": "^3.4.2",
     "@types/jest": "^26.0.8",
     "@types/node": "^11.13.8",
+    "@types/path-browserify": "^1.0.0",
     "@types/react": "^16.9.55",
     "@types/styled-components": "^4.1.16",
-    "@types/three": "^0.130.0",
+    "@types/three": "^0.137",
     "@types/uuid": "^3.4.5",
     "@typescript-eslint/eslint-plugin": "4.13.0",
     "@typescript-eslint/parser": "4.13.0",
@@ -85,19 +86,20 @@
     "rollup-plugin-postcss": "^4.0.1",
     "rollup-plugin-size-snapshot": "^0.12.0",
     "rollup-plugin-terser": "^7.0.2",
-    "three": "^0.131.3",
+    "three": "^0.138",
     "typescript": "4.1.2"
   },
   "peerDependencies": {
-    "@react-three/drei": ">= 7.26.1",
+    "@react-three/drei": "^8.10.6",
     "@react-three/fiber": ">= 7.0.17",
-    "three": ">=0.129"
+    "three": ">=0.138"
   },
   "dependencies": {
     "@ant-design/compatible": "^1.0.8",
-    "@buerli.io/classcad": "0.0.35-beta.4",
-    "@buerli.io/react": "0.0.35-beta.4",
+    "@buerli.io/classcad": "0.0.36-beta.2",
+    "@buerli.io/react": "0.0.36-beta.2",
     "antd": "^4.15.3",
+    "path-browserify": "^1.0.1",
     "react": "^17.0.2",
     "react-colorful": "^5.3.0",
     "react-movable": "^2.3.0",

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

@@ -1,7 +0,0 @@
-import React from 'react';
-import 'antd/dist/antd.css';
-export declare const CAD: React.FC<{
-    data: ArrayBuffer;
-    format: 'of1' | 'stp';
-    name?: string;
-}>;

package/build/components/UI/CAD/SideBar/AssemblyTree/AssemblyTree.d.ts

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

package/build/components/UI/CAD/SideBar/AssemblyTree/index.d.ts

@@ -1 +0,0 @@
-export { AssemblyTree } from './AssemblyTree';

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

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

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

@@ -1 +0,0 @@
-export { SideBar } from './SideBar';

package/build/utils/zoomToFit.d.ts

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