@buerli.io/react-cad 0.4.1 → 0.5.0-beta.2

package/build/plugins/HLConstraints/components/Limits.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { DrawingID, ObjectID } from '@buerli.io/core';
 import { MemberParam } from '../../../types';
-export declare type LimitsParam = [number | undefined, number | undefined];
+import { LimitsParam } from '@buerli.io/classcad';
 export declare function useLimitsParam(drawingId: DrawingID, objId: ObjectID, memberName: string, options?: {
     angle?: boolean;
     forceNoLimits?: boolean;

package/build/plugins/HLConstraints/validators.d.ts

@@ -1,2 +1,2 @@
-import { LimitsParam } from './components/Limits';
+import { LimitsParam } from '@buerli.io/classcad';
 export declare function validateLimits(limits: LimitsParam, name: string): string[];

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

@@ -1,8 +1,19 @@
-import { IStructureTree } from '@buerli.io/core';
+import { IStructureObject, IStructureTree, ObjectID } from '@buerli.io/core';
+declare type GeometryChecker = {
+    type: string;
+    check: (object: IStructureObject) => number | number[];
+};
+declare type ConstraintGeometryCombination = {
+    entityAdapter: (entities: ObjectID[]) => ObjectID[][];
+    input: GeometryChecker[];
+};
+declare function createHelper(type: string, name: string, ...constraintGeometryCombinations: ConstraintGeometryCombination[]): {
+    type: string;
+    name: string;
+    adapt(entities: ObjectID[], tree: IStructureTree): number[][] | undefined;
+    getTooltip(): string[];
+};
 export declare const constraintsHelpers: {
-    [key: string]: {
-        type: string;
-        name: string;
-        adapt: (entities: number[], tree: IStructureTree) => number[][] | undefined;
-    };
+    [key: string]: ReturnType<typeof createHelper>;
 };
+export {};

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

@@ -4,6 +4,4 @@ export declare enum Patterns {
     CIRCULAR = "CIRCULAR",
     MIRROR = "MIRROR"
 }
-export declare const RectPattern: React.FC;
-export declare const CircPattern: React.FC;
-export declare const MirrorPattern: React.FC;
+export declare const CopyPatterns: React.FC;

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

@@ -1,2 +1,3 @@
 import React from 'react';
+import './Handlers.css';
 export declare const Handlers: React.FC;

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

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const Regions: React.FC;

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

@@ -0,0 +1,8 @@
+import React from 'react';
+export declare const SketchGroup: React.FC<{
+    caption: string;
+    helpUrl?: string | URL;
+    collapse?: boolean;
+    postfix?: React.ReactNode;
+    children?: React.ReactNode;
+}>;

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

@@ -0,0 +1,11 @@
+import React from 'react';
+/**
+ *
+ * @param ref reference to a div element; Its size will be used for calculations
+ * @returns object containing width, proposed side padding and margin for icons
+ */
+export declare const useLayoutSize: (ref: React.MutableRefObject<HTMLDivElement>) => {
+    width: number;
+    sidePadding: number;
+    iconMargin: number;
+};

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

@@ -2,7 +2,7 @@ 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, scalePlus?: boolean | undefined) => number;
+export declare const useTubeRadius: (drawingId: DrawingID, pluginId: PluginID, scalePlus?: boolean) => number;
 export declare const Arc: React.FC<{
     start: THREE.Vector3;
     end: THREE.Vector3;

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

@@ -18,5 +18,7 @@ export declare const MeshContext: React.Context<{
  * 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 declare const MergedWrapper: React.FC<{
+    children?: React.ReactNode;
+}>;
 export {};

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

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const MousePosition: React.FC;

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

@@ -19,7 +19,7 @@ export declare const getColor: (object: IStructureObject, objState: ObjState) =>
  * @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 useSketchHandlers: (objId: ObjectID) => Record<string, (e: import("@react-three/fiber").ThreeEvent<PointerEvent> & import("../../types").PointerEventsT) => void> | undefined;
 export declare const useColor: (objId: ObjectID, gHovered: boolean) => number;
 export declare const useUserData: (objId: ObjectID) => {
     objId: number;
@@ -29,7 +29,7 @@ export declare const useUserData: (objId: ObjectID) => {
     onHUD?: undefined;
 };
 export declare const useHandlersAndColor: (drawingId: DrawingID, objId: ObjectID) => {
-    handlers: Record<string, (e: PointerEvent & import("@react-three/fiber/dist/declarations/src/core/events").IntesectionEvent<PointerEvent> & import("../../types").PointerEventsT) => void>;
+    handlers: {};
     color: number;
 };
 export {};

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

@@ -2,4 +2,4 @@ import React from 'react';
 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>;
+export declare function useScale<T extends THREE.Object3D>(drawingId: DrawingID, pluginId: PluginID, getVector?: (sf: number) => [number, number, number]): React.RefObject<T>;

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

@@ -38,6 +38,7 @@ export declare type SketchPState = {
         max: THREE.Vector2;
     } | undefined;
     cursor: null | string;
+    needsUpdate: number;
 };
 export declare type TmpObjectID = string;
 export declare enum HandlersList {

package/build/utils/FileUtils.d.ts

@@ -13,6 +13,6 @@ export declare const FileUtils: {
     loadFile: (onLoad: (files: {
         file: File;
         content: any;
-    }[]) => void, type?: "Text" | "DataURL" | "ArrayBuffer" | "BinaryString" | undefined, multiple?: boolean | undefined) => void;
-    exportNode: (drawingId: DrawingID, objectId: ObjectID, type?: 'of1' | 'stp' | 'stl') => Promise<void>;
+    }[]) => void, type?: 'DataURL' | 'ArrayBuffer' | 'BinaryString' | 'Text', multiple?: boolean) => void;
+    exportNode: (drawingId: DrawingID, objectId: ObjectID, type?: 'ofb' | 'stp' | 'step' | 'stl') => Promise<void>;
 };

package/build/utils/useRetainVisibility.d.ts

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

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<import("three").Event> | undefined>;
+export declare function useScale<T extends THREE.Object3D>(position: THREE.Vector3, getVector?: (sf: number) => [number, number, number]): React.RefObject<T>;

package/build/utils/validation.d.ts

@@ -9,4 +9,4 @@ export declare function acceptableRange(min: {
 } | undefined, max: {
     value: number;
     isInclusive: boolean;
-} | undefined): (numParam: APIParam<number>, paramName?: string | undefined) => string[];
+} | undefined): (numParam: APIParam<number>, paramName?: string) => string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buerli.io/react-cad",
-  "version": "0.4.1",
+  "version": "0.5.0-beta.2",
   "description": "buerli CAD components",
   "author": "AWV Informatik AG <info@awv-informatik.ch>",
   "repository": {},
@@ -41,26 +41,25 @@
   },
   "license": "ISC",
   "devDependencies": {
-    "@ant-design/icons": "^4.4.0",
+    "@ant-design/icons": "^4.7.0",
     "@babel/plugin-transform-runtime": "^7.15.0",
     "@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": "8.16.6",
-    "@react-three/fiber": "7.0.19",
+    "@react-three/drei": "9.34.1",
+    "@react-three/fiber": "8.7.1",
     "@rollup/plugin-babel": "^5.3.0",
     "@rollup/plugin-image": "^2.1.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
     "@testing-library/jest-dom": "^5.11.5",
-    "@testing-library/react": "^11.1.1",
-    "@testing-library/react-hooks": "^3.4.2",
-    "@types/jest": "^26.0.8",
+    "@testing-library/react": "^13.4.0",
+    "@types/jest": "^29.1.2",
     "@types/node": "^11.13.8",
     "@types/path-browserify": "^1.0.0",
-    "@types/react": "17.0.19",
-    "@types/styled-components": "^4.1.16",
-    "@types/three": "^0.137",
+    "@types/react": "18.0.0",
+    "@types/styled-components": "^5.1.14",
+    "@types/three": "^0.143",
     "@types/uuid": "^3.4.5",
     "@typescript-eslint/eslint-plugin": "4.13.0",
     "@typescript-eslint/parser": "4.13.0",
@@ -74,41 +73,43 @@
     "eslint-plugin-react-hooks": "^4.2.0",
     "husky": "4.3.7",
     "immer": "^7.0.7",
-    "jest": "^26.1.0",
+    "jest": "^29.1.2",
+    "jest-environment-jsdom": "^29.1.2",
     "lint-staged": "10.5.3",
     "postcss": "^8.2.14",
     "prettier": "^2.2.1",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "18.0.0",
+    "react-dom": "18.0.0",
     "react-test-renderer": "^16.13.1",
     "rimraf": "^2.6.3",
     "rollup": "^2.56.2",
     "rollup-plugin-postcss": "^4.0.1",
     "rollup-plugin-size-snapshot": "^0.12.0",
     "rollup-plugin-terser": "^7.0.2",
-    "three": "^0.138",
-    "typescript": "4.4.3"
+    "three": "^0.143",
+    "typescript": "4.8.4"
   },
   "peerDependencies": {
-    "@react-three/drei": ">=8.16.6",
-    "@react-three/fiber": ">=7.0.17",
-    "three": ">=0.138",
-    "react": ">=17.0"
+    "@react-three/drei": ">=9.34.1",
+    "@react-three/fiber": ">=8.7.1",
+    "three": ">=0.143",
+    "react": ">=18.0"
   },
   "dependencies": {
     "@ant-design/compatible": "^1.0.8",
-    "@buerli.io/classcad": "0.4.1",
-    "@buerli.io/react": "0.4.1",
-    "@react-three/postprocessing": "2.3.1",
-    "antd": ">=4.15.3 <4.17",
+    "@buerli.io/classcad": "0.5.0-beta.2",
+    "@buerli.io/react": "0.5.0-beta.2",
+    "@react-three/postprocessing": "2.6.2",
+    "antd": "^4.23.4",
     "path-browserify": "^1.0.1",
+    "postprocessing": "6.28.5",
     "react-colorful": "^5.3.0",
     "react-movable": "^2.3.0",
     "react-sortable-hoc": "^2.0.0",
     "react-uid": "^2.3.1",
-    "styled-components": "^4.3.2",
+    "styled-components": "^5.3.1",
     "three-rounded-box": "^0.1.1",
     "uuid": "^3.3.2",
-    "zustand": "^3.5.7"
+    "zustand": "^4.1.4"
   }
 }