pollination-react-io 1.100.0 → 1.101.0

package/build/GetModel/GetModel.types.d.ts

@@ -5,6 +5,7 @@ export declare enum GetModelActions {
     preview = "preview"
 }
 export interface GetModelProps {
+    defaultKey: string;
     onChange?: (event: any) => void;
     optionsConfig?: {
         [index in GetModelActions]: {
@@ -15,6 +16,5 @@ export interface GetModelProps {
     buttonLabel?: string;
     inputProps?: HTMLProps<HTMLInputElement>;
     showHelpText?: boolean;
-    defaultKey?: string;
     useIcon?: boolean;
 }

package/build/hooks/useGetHbjson.d.ts

@@ -7,5 +7,5 @@ declare global {
 export declare const useGetHbjson: () => {
     host: string;
     hbjson: Blob;
-    getHbjson: (key?: any, selection?: any, force?: any) => void;
+    getHbjson: (key?: any, selection?: any, force?: any, useSelection?: boolean) => void;
 };

package/build/index.esm.js

@@ -41183,14 +41183,18 @@ var useGetHbjson = function () {
         // @ts-ignore
         return function () { return window.parent.readHbjson = undefined; };
     }, [setReturnValue]);
-    var dotNetGetHbjson = useCallback(function (key, selection, force) {
+    var dotNetGetHbjson = useCallback(function (key, selection, force, useSelection) {
         if (key === void 0) { key = 'use-get-hbjson'; }
         if (selection === void 0) { selection = false; }
         if (force === void 0) { force = false; }
+        if (useSelection === void 0) { useSelection = true; }
         if (!checkDotNet())
             return;
         var res = window.parent.chrome.webview
-            .hostObjects.sync.hbjson.Get(key, selection);
+            .hostObjects.sync.hbjson.Read(key, JSON.stringify({
+            select: selection,
+            useSelection: useSelection
+        }));
         if (res) {
             setReturnValue(res, force);
         }
@@ -41746,15 +41750,42 @@ var GetModelActions$1;
     GetModelActions["preview"] = "preview";
 })(GetModelActions$1 || (GetModelActions$1 = {}));
 
+/**
+ * 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 GetModel = function (_a) {
     var onChange = _a.onChange, optionsConfig = _a.optionsConfig, _b = _a.buttonLabel, buttonLabel = _b === void 0 ? 'Get Model' : _b, _c = _a.showHelpText, showHelpText = _c === void 0 ? true : _c, _d = _a.defaultKey, defaultKey = _d === void 0 ? 'get-model-btn' : _d, _e = _a.useIcon, useIcon = _e === void 0 ? true : _e;
-    var subscribeRef = useRef();
     var sendHbjson = useSendHbjson().sendHbjson;
-    var _f = useState(performance.now().toString()), key = _f[0], setKey = _f[1];
-    var _g = useState(false), isClicked = _g[0], setIsClicked = _g[1];
-    var _h = useState(), selection = _h[0], setSelection = _h[1];
-    var _j = useState(), subscribe = _j[0], setSubscribe = _j[1];
-    var _k = useState(), preview = _k[0], setPreview = _k[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 _k = useState(), refresh = _k[0], setRefresh = _k[1];
+    var _l = useState(), result = _l[0], setResult = _l[1];
+    // This method does not read runtime state variables. Props only
+    var customEventHandler = function (e) {
+        (e.detail.id === defaultKey) && setRefresh(performance.now().toString());
+    };
+    useCustomEvent('onModelChanged', customEventHandler);
     // Config only on bootstrap
     var initialConfig = useMemo(function () {
         if (!optionsConfig)
@@ -41762,7 +41793,7 @@ var GetModel = function (_a) {
         return optionsConfig;
     }, []);
     // pollination-react-io hooks
-    var _l = useGetHbjson(), host = _l.host, hbjson = _l.hbjson, getHbjson = _l.getHbjson;
+    var _m = useGetHbjson(), host = _m.host, hbjson = _m.hbjson, getHbjson = _m.getHbjson;
     // set selection and subscribe on props change
     useEffect(function () {
         if (!initialConfig)
@@ -41777,58 +41808,55 @@ var GetModel = function (_a) {
         setSelection(sel);
         setSubscribe(sub);
     }, [initialConfig]);
+    /**
+     * From Blob geometry to string
+     */
     useEffect(function () {
-        // Send data only after the first click
+        // Only if clicked
         if (!hbjson || !isClicked)
             return;
-        onChange && onChange(new File([hbjson], "Model_linked_from_".concat(host, ".hbjson")));
-        if (onChange) {
-            var fr = new FileReader();
-            fr.onload = function () {
-                if (typeof this.result !== 'string')
-                    return;
-                // If preview is ON
-                preview && sendHbjson('SubscribePreviewHBJSON', {
-                    data: this.result,
-                    uniqueId: defaultKey,
-                    options: {}
-                });
-                // If preview is OFF
-                !preview && sendHbjson('ClearHBJSON', {
-                    data: this.result,
-                    uniqueId: defaultKey,
-                    options: {}
-                });
-            };
-            fr.readAsText(hbjson);
-        }
-    }, [hbjson, host, onChange, preview]);
-    // subscribe
+        var fr = new FileReader();
+        fr.onload = function () {
+            if (typeof this.result !== 'string')
+                return;
+            setResult(this.result);
+        };
+        fr.readAsText(hbjson);
+    }, [hbjson]);
+    /**
+     * Set parent state if result change
+     */
     useEffect(function () {
-        if (!getHbjson)
+        if (!result || !onChange)
             return;
-        if (subscribe
-            && typeof subscribeRef.current === 'undefined') {
-            subscribeRef.current = setInterval(function () {
-                getHbjson(key, false);
-            }, 1000);
-        }
-        else if (!subscribe
-            && typeof subscribeRef.current !== 'undefined') {
-            clearInterval(subscribeRef.current);
-            subscribeRef.current = undefined;
-        }
-    }, [getHbjson, key, subscribe, subscribeRef]);
-    // selection and subscription
+        onChange(new File([hbjson], "Model_linked_from_".concat(host, ".hbjson")));
+    }, [result, onChange]);
+    /**
+     * 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 && sendHbjson('SubscribePreviewHBJSON', {
+            data: result,
+            uniqueId: defaultKey,
+            options: {}
+        });
+        // Preview OFF
+        !preview && sendHbjson('ClearHBJSON', {
+            data: result,
+            uniqueId: defaultKey,
+            options: {}
+        });
+    }, [result, preview]);
+    // Event effect if subscribe is active
+    // If subscribe is enable or disable rerun
+    useEffect(function () {
+        if (!getHbjson)
+            return;
+        subscribe && getHbjson(defaultKey, false, false, selection);
+    }, [getHbjson, refresh, subscribe]);
     return (host === 'web'
         ? (React__default.createElement(FileInput, { onChange: function (file) {
                 if (!file)
@@ -41839,7 +41867,7 @@ var GetModel = function (_a) {
                 if (!getHbjson)
                     return;
                 setIsClicked(true);
-                getHbjson(key, selection, true);
+                getHbjson(defaultKey, selection, true, selection);
             }, disabled: !getHbjson, 
             // @ts-ignore
             options: host !== 'revit' ? [{
@@ -41863,10 +41891,6 @@ var GetModel = 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; });
                             },
                         },
@@ -42239,7 +42263,7 @@ var ComboFileSelector = function (_a) {
                     return (React__default.createElement(FileInput, { onChange: onChange, inputProps: inputProps, accept: typeof inputProps.accept === 'string' ?
                             inputProps.accept.split(', ') : undefined }));
                 case 'get_model':
-                    return (React__default.createElement(GetModel, { onChange: onChange, inputProps: inputProps, showHelpText: false }));
+                    return (React__default.createElement(GetModel, { defaultKey: projectName, onChange: onChange, inputProps: inputProps, showHelpText: false }));
                 case 'get_cloud':
                     return (React__default.createElement(SelectCloudArtifacts, { projectOwner: projectOwner, projectName: projectName, value: value, hidden: hidden, fileNameMatch: typeof inputProps.accept === 'string' ?
                             ".*(".concat(inputProps.accept.replace(/\./g, '').split(', ').join('$|'), "$)") : '.*', onChange: onChange, client: client }));
@@ -47939,28 +47963,6 @@ 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, _e = _a.meshOptions, meshOptions = _e === void 0 ? {} : _e, _f = _a.geometryFilter, geometryFilter = _f === void 0 ? {} : _f;
     // Hooks
@@ -48040,11 +48042,12 @@ var GetGeometry = function (_a) {
         });
     }, [result, preview]);
     // Event effect if subscribe is active
+    // If subscribe is enable or disable rerun
     useEffect(function () {
         if (!getGeometry)
             return;
         subscribe && getGeometry(defaultKey, false, false, selection);
-    }, [getGeometry, refresh]);
+    }, [getGeometry, refresh, subscribe]);
     return (React__default.createElement(SettingsButton, { icon: useIcon && ((isClicked && geometry) ? React__default.createElement(CheckCircle$1, null) : undefined), onClick: function () {
             if (!getGeometry)
                 return;