pollination-react-io 1.98.1 → 1.100.0

package/build/GetGeometry/GetGeometry.types.d.ts

@@ -1,9 +1,11 @@
+import { MeshOptions, GeometryFilter } from "../hooks";
 export declare enum GetModelActions {
     selection = "selection",
     subscribe = "subscribe",
     preview = "preview"
 }
 export interface GetGeometryProps {
+    defaultKey: string;
     setParentState?: (data: any) => void;
     optionsConfig?: {
         [index in GetModelActions]: {
@@ -12,6 +14,7 @@ export interface GetGeometryProps {
         };
     };
     buttonLabel?: string;
-    defaultKey?: string;
     useIcon?: boolean;
+    meshOptions?: MeshOptions;
+    geometryFilter?: GeometryFilter;
 }

package/build/hooks/useCustomEvent.d.ts

@@ -0,0 +1,8 @@
+import { EventHandler } from 'react';
+/**
+ * Listen for a CustomEvent.
+ * If web it uses document, if panel it uses webview
+ * @param eventName Name of the CustomEvent
+ * @param handler Handler to trigger
+ */
+export declare const useCustomEvent: (eventName: 'onGeometryChanged' | 'onModelChanged' | 'onResultChanged', handler: EventHandler<any>) => void;

package/build/hooks/useGetGeometry.d.ts

@@ -4,8 +4,16 @@ declare global {
         chrome?: any;
     }
 }
-export declare const useGetGeometry: () => {
+export interface MeshOptions {
+    gridSize?: number;
+    union?: boolean;
+}
+export interface GeometryFilter {
+    type?: Array<string>;
+    layer?: Array<string>;
+}
+export declare const useGetGeometry: (meshOptions?: MeshOptions, geometryFilter?: GeometryFilter) => {
     host: string;
     geometry: Blob;
-    getGeometry: (key?: any, selection?: any, force?: any) => void;
+    getGeometry: (key?: any, selection?: boolean, force?: boolean, useSelection?: boolean) => void;
 };

package/build/index.esm.js

@@ -41072,12 +41072,14 @@ function stubFalse() {
 module.exports = isEqual;
 });
 
-var useGetGeometry = function () {
+var useGetGeometry = function (meshOptions, geometryFilter) {
+    if (meshOptions === void 0) { meshOptions = {}; }
+    if (geometryFilter === void 0) { geometryFilter = {}; }
     var host = getHost();
     var _a = useState(undefined), geometry = _a[0], setGeometry = _a[1];
     var geometryRef = useRef(undefined);
     var setReturnVal = useCallback(function (_a, force) {
-        var data = _a.data; _a.identifier;
+        var data = _a.data;
         var bytes = new TextEncoder().encode(data);
         if (!force && geometryRef.current) {
             if (!lodash_isequal(bytes, geometryRef.current)) {
@@ -41103,22 +41105,35 @@ var useGetGeometry = function () {
         };
         // @ts-ignore
         return function () { return window.parent.readGeometry = undefined; };
-    }, [host, setReturnVal]);
-    var dotNetGetGeometry = useCallback(function (key, selection, force) {
+    }, [host, setReturnVal, meshOptions, geometryFilter]);
+    var dotNetGetGeometry = useCallback(function (key, selection, force, useSelection) {
         if (key === void 0) { key = 'use-get-geometry'; }
         if (selection === void 0) { selection = false; }
         if (force === void 0) { force = false; }
+        if (useSelection === void 0) { useSelection = true; }
         if (!checkDotNet())
             return;
         var res = {
             data: null,
             identifier: null,
         };
-        res = window.parent.chrome.webview.hostObjects.sync.geometry.Get(key, selection);
+        var optionalValues = __assign(__assign({}, meshOptions), geometryFilter);
+        var options = (Object.values(optionalValues).length !== 0) ? {
+            select: selection,
+            useSelection: useSelection,
+            gridSize: optionalValues === null || optionalValues === void 0 ? void 0 : optionalValues.gridSize,
+            merge: optionalValues === null || optionalValues === void 0 ? void 0 : optionalValues.union,
+            layer: optionalValues === null || optionalValues === void 0 ? void 0 : optionalValues.layer,
+            type: optionalValues === null || optionalValues === void 0 ? void 0 : optionalValues.type,
+        } : {
+            select: selection,
+            useSelection: useSelection
+        };
+        res = window.parent.chrome.webview.hostObjects.sync.geometry.Read(key, JSON.stringify(options));
         if (res) {
             setReturnVal(res, force);
         }
-    }, [setReturnVal]);
+    }, [setReturnVal, meshOptions, geometryFilter]);
     var getGeometry = useMemo(function () {
         switch (host) {
             case 'rhino':
@@ -47924,23 +47939,50 @@ var GetModelActions;
     GetModelActions["preview"] = "preview";
 })(GetModelActions || (GetModelActions = {}));
 
+/**
+ * Listen for a CustomEvent.
+ * If web it uses document, if panel it uses webview
+ * @param eventName Name of the CustomEvent
+ * @param handler Handler to trigger
+ */
+var useCustomEvent = function (eventName, handler) {
+    var host = getHost();
+    useEffect(function () {
+        // If web use document
+        var owner = document;
+        // If panel use webview
+        if (host !== 'web') {
+            owner = window.parent.chrome.webview;
+        }
+        owner.addEventListener(eventName, handler);
+        return function () {
+            owner.removeEventListener(eventName, handler);
+        };
+    }, []);
+};
+
 var GetGeometry = function (_a) {
-    var setParentState = _a.setParentState, optionsConfig = _a.optionsConfig, _b = _a.buttonLabel, buttonLabel = _b === void 0 ? 'Get Geometry' : _b, _c = _a.defaultKey, defaultKey = _c === void 0 ? 'get-geometry-btn' : _c, _d = _a.useIcon, useIcon = _d === void 0 ? false : _d;
-    var subscribeRef = useRef();
+    var setParentState = _a.setParentState, optionsConfig = _a.optionsConfig, _b = _a.buttonLabel, buttonLabel = _b === void 0 ? 'Get Geometry' : _b, _c = _a.defaultKey, defaultKey = _c === void 0 ? 'get-geometry-btn' : _c, _d = _a.useIcon, useIcon = _d === void 0 ? false : _d, _e = _a.meshOptions, meshOptions = _e === void 0 ? {} : _e, _f = _a.geometryFilter, geometryFilter = _f === void 0 ? {} : _f;
+    // Hooks
     var sendMessage = useSendMessage().sendMessage;
-    var _e = useState(performance.now().toString()), key = _e[0], setKey = _e[1];
-    var _f = useState(false), isClicked = _f[0], setIsClicked = _f[1];
-    var _g = useState(), selection = _g[0], setSelection = _g[1];
-    var _h = useState(), subscribe = _h[0], setSubscribe = _h[1];
-    var _j = useState(), preview = _j[0], setPreview = _j[1];
+    var _g = useGetGeometry(meshOptions, geometryFilter), host = _g.host, geometry = _g.geometry, getGeometry = _g.getGeometry;
+    var _h = useState(false), isClicked = _h[0], setIsClicked = _h[1];
+    var _j = useState(), selection = _j[0], setSelection = _j[1];
+    var _k = useState(), subscribe = _k[0], setSubscribe = _k[1];
+    var _l = useState(), preview = _l[0], setPreview = _l[1];
+    var _m = useState(), refresh = _m[0], setRefresh = _m[1];
+    var _o = useState(), result = _o[0], setResult = _o[1];
+    // This method does not read runtime state variables. Props only
+    var customEventHandler = function (e) {
+        (e.detail.id === defaultKey) && setRefresh(performance.now().toString());
+    };
+    useCustomEvent('onGeometryChanged', customEventHandler);
     // Config only on bootstrap
     var initialConfig = useMemo(function () {
         if (!optionsConfig)
             return undefined;
         return optionsConfig;
     }, []);
-    // pollination-react-io hooks
-    var _k = useGetGeometry(), host = _k.host, geometry = _k.geometry, getGeometry = _k.getGeometry;
     // set selection and subscribe on props change
     useEffect(function () {
         if (!initialConfig)
@@ -47955,61 +47997,59 @@ var GetGeometry = function (_a) {
         setSelection(sel);
         setSubscribe(sub);
     }, [initialConfig]);
+    /**
+     * From Blob geometry to string
+     */
     useEffect(function () {
-        // Send data only after the first click
-        if (!geometry || !setParentState || !isClicked)
+        // Only if clicked
+        if (!geometry || !isClicked)
             return;
         var fr = new FileReader();
         fr.onload = function () {
             if (typeof this.result !== 'string')
                 return;
-            setParentState({ geometry: JSON.parse(this.result) });
-            // If preview is ON
-            preview && sendMessage('SubscribePreviewGeometry', {
-                data: this.result,
-                uniqueId: defaultKey,
-                options: {}
-            });
-            // If preview is OFF
-            !preview && sendMessage('ClearGeometry', {
-                data: this.result,
-                uniqueId: defaultKey,
-                options: {}
-            });
+            setResult(this.result);
         };
         fr.readAsText(geometry);
-    }, [geometry, setParentState, preview]);
-    // subscribe
+    }, [geometry]);
+    /**
+     * Set parent state if result change
+     */
     useEffect(function () {
-        if (!getGeometry)
+        if (!result || !setParentState)
             return;
-        if (subscribe
-            && typeof subscribeRef.current === 'undefined') {
-            subscribeRef.current = setInterval(function () {
-                getGeometry(key);
-            }, 1000);
-        }
-        else if (!subscribe
-            && typeof subscribeRef.current !== 'undefined') {
-            clearInterval(subscribeRef.current);
-            subscribeRef.current = undefined;
-        }
-    }, [getGeometry, key, subscribe, subscribeRef, selection]);
-    // selection and subscription
+        setParentState({ geometry: JSON.parse(result) });
+    }, [result, setParentState]);
+    /**
+     * Preview only
+     */
     useEffect(function () {
-        // If selection is deactivated and subscription is active
-        if (!selection && typeof subscribeRef.current !== 'undefined') {
-            clearInterval(subscribeRef.current);
-            subscribeRef.current = undefined;
-            // Force subscribe
-            setKey(performance.now().toString());
-        }
-    }, [selection]);
+        if (!result)
+            return;
+        // Preview ON
+        preview && sendMessage('SubscribePreviewGeometry', {
+            data: result,
+            uniqueId: defaultKey,
+            options: {}
+        });
+        // Preview OFF
+        !preview && sendMessage('ClearGeometry', {
+            data: result,
+            uniqueId: defaultKey,
+            options: {}
+        });
+    }, [result, preview]);
+    // Event effect if subscribe is active
+    useEffect(function () {
+        if (!getGeometry)
+            return;
+        subscribe && getGeometry(defaultKey, false, false, selection);
+    }, [getGeometry, refresh]);
     return (React__default.createElement(SettingsButton, { icon: useIcon && ((isClicked && geometry) ? React__default.createElement(CheckCircle$1, null) : undefined), onClick: function () {
             if (!getGeometry)
                 return;
             setIsClicked(true);
-            getGeometry(key, selection, true);
+            getGeometry(defaultKey, selection, true, selection);
         }, disabled: typeof getGeometry === 'undefined', 
         // @ts-ignore
         options: host !== 'revit' ? [{
@@ -48033,10 +48073,6 @@ var GetGeometry = function (_a) {
                         checked: selection,
                         icon: React__default.createElement(BoundingBox$1, { size: 16 }),
                         onSelect: function () {
-                            // reset key when "select" option is deselected
-                            if (selection) {
-                                setKey(performance.now().toString());
-                            }
                             setSelection(function (state) { return !state; });
                         },
                     },