pollination-react-io 0.0.13 → 0.0.14

package/build/SendGeometry/SendGeometry.types.d.ts

@@ -1,3 +1,4 @@
 export interface SendGeometryProps {
     geometry?: string[];
+    defaultAction?: 'add' | 'delete' | 'preview' | 'clear' | 'subscribe-preview';
 }

package/build/SendModel/SendModel.types.d.ts

@@ -1,3 +1,4 @@
 export interface SendModelProps {
     hbjson?: object;
+    defaultAction?: 'add' | 'preview' | 'clear' | 'subscribe-preview';
 }

package/build/hooks/types.d.ts

@@ -2,9 +2,11 @@ export interface Options {
     layer?: string;
     units?: string;
 }
-export declare type actions = 'BakeGeometry' | 'ClearGeometry' | 'DrawGeometry' | 'DisableDraw' | 'CombinedRendering' | 'RunCommand' | 'BakePollinationModel' | 'DisableDrawPollinationModel' | 'DrawPollinationModel' | 'CombinedRenderingPollinationModel' | 'SetModelSettings';
+export declare type GeometryAction = 'BakeGeometry' | 'ClearGeometry' | 'DrawGeometry' | 'DisableDraw' | 'CombinedRendering';
+export declare type ModelAction = 'BakePollinationModel' | 'DisableDrawPollinationModel' | 'DrawPollinationModel' | 'CombinedRenderingPollinationModel';
+export declare type Action = GeometryAction | ModelAction | 'RunCommand' | 'SetModelSettings';
 export interface Message {
-    action?: actions;
+    action?: Action;
     data?: any;
     options?: any;
 }

package/build/hooks/useSendGeometry.d.ts

@@ -1,4 +1,4 @@
-import { Message } from './types';
+import { GeometryAction, Message } from './types';
 interface SendGeometryOptions {
     layer: string;
     units: string;
@@ -11,6 +11,6 @@ declare type SendGeometryMessage = Message & SendGeometry;
 export declare const useSendGeometry: () => {
     host: any;
     state: {};
-    sendGeometry: (message: SendGeometryMessage, preview?: any) => Message;
+    sendGeometry: (action: GeometryAction, message: SendGeometryMessage) => Message;
 };
 export {};

package/build/hooks/useSendHbjson.d.ts

@@ -1,4 +1,4 @@
-import { Message } from './types';
+import { ModelAction, Message } from './types';
 interface SendGeometryOptions {
     layer: string;
     units: string;
@@ -11,6 +11,6 @@ declare type SendGeometryMessage = Message & SendGeometry;
 export declare const useSendHbjson: () => {
     host: any;
     state: {};
-    sendHbjson: (message: SendGeometryMessage, preview?: any) => Message;
+    sendHbjson: (action: ModelAction, message: SendGeometryMessage) => Message;
 };
 export {};

package/build/index.esm.js

@@ -2136,19 +2136,17 @@ function __generator(thisArg, body) {
 var useSendHbjson = function () {
     var host = getHost();
     var _a = useState({}), state = _a[0], setState = _a[1];
-    var rubySendHbjson = useCallback(function (message, preview) {
-        if (preview === void 0) { preview = true; }
+    var rubySendHbjson = useCallback(function (action, message) {
         if (!checkRuby())
             return;
-        var response = sendMessageRuby(__assign$2({ action: preview ? 'CombinedRenderingPollinationModel' : 'BakePollinationModel' }, message));
+        var response = sendMessageRuby(__assign$2({ action: action }, message));
         setState(function (state) { return (__assign$2(__assign$2({}, state), { response: response })); });
         return response;
     }, []);
-    var dotNetSendHbjson = useCallback(function (message, preview) {
-        if (preview === void 0) { preview = true; }
+    var dotNetSendHbjson = useCallback(function (action, message) {
         if (!checkDotNet())
             return;
-        var response = sendMessageDotNet(__assign$2({ action: preview ? 'CombinedRenderingPollinationModel' : 'BakePollinationModel' }, message));
+        var response = sendMessageDotNet(__assign$2({ action: action }, message));
         setState(function (state) { return (__assign$2(__assign$2({}, state), { response: response })); });
         return response;
     }, []);
@@ -2174,19 +2172,17 @@ var useSendHbjson = function () {
 var useSendGeometry = function () {
     var host = getHost();
     var _a = useState({}), state = _a[0], setState = _a[1];
-    var rubySendGeometry = useCallback(function (message, preview) {
-        if (preview === void 0) { preview = true; }
+    var rubySendGeometry = useCallback(function (action, message) {
         if (!checkRuby())
             return;
-        var response = sendMessageRuby(__assign$2({ action: preview ? 'CombinedRendering' : 'BakeGeometry' }, message));
+        var response = sendMessageRuby(__assign$2({ action: action }, message));
         setState(function (state) { return (__assign$2(__assign$2({}, state), { response: response })); });
         return response;
     }, []);
-    var dotNetSendGeometry = useCallback(function (message, preview) {
-        if (preview === void 0) { preview = true; }
+    var dotNetSendGeometry = useCallback(function (action, message) {
         if (!checkDotNet())
             return;
-        var response = sendMessageDotNet(__assign$2({ action: preview ? 'CombinedRendering' : 'BakeGeometry' }, message));
+        var response = sendMessageDotNet(__assign$2({ action: action }, message));
         setState(function (state) { return (__assign$2(__assign$2({}, state), { response: response })); });
         return response;
     }, []);
@@ -4505,7 +4501,7 @@ function styleInject(css, ref) {
   }
 }
 
-var css_248z$2 = ":root {\n  --background: #FFFAEE;\n  --primary: #1890ff;\n  --primary2: #40a9ff;\n  --primary0: #e6f7ff;\n  --grey5: #8c8c8c;\n  --grey3: #d0d7de;\n  --secondary: #fff566;\n  --font-color: #494949;\n}\n\n@media (prefers-color-scheme: dark) {\n  :root {\n    --background: #3c3c3c;\n    --font-color: #fafafa;\n  }\n}\n.poll-select-content {\n  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", Segoe UI Symbol, \"Noto Color Emoji\";\n  display: flex;\n  flex-direction: column;\n  width: fit-content;\n  background-color: white;\n  border: 1px solid var(--grey3);\n  border-radius: 4px;\n  padding: 6px 4px;\n  box-shadow: rgba(0, 0, 0, 0.08) 0px 2px 4px;\n  gap: 2px;\n}\n\n.poll-select-item {\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  gap: 6px;\n  border-radius: 2px;\n  padding: 2px 8px;\n  transition: background-color 0.15s linear, color 0.15s linear;\n}\n\n.poll-select-item[data-state=checked] {\n  background-color: var(--primary2);\n  color: white;\n}\n\n.poll-select-item:focus-visible {\n  outline: none;\n}\n\n.poll-select-item:hover {\n  background-color: var(--primary0);\n  cursor: pointer;\n  color: unset;\n}\n\n.poll-separator {\n  background-color: #d0d7de;\n  height: 1px;\n  width: 100%;\n  margin: 4px 0;\n}";
+var css_248z$2 = ":root {\n  --background: #FFFAEE;\n  --primary: #1890ff;\n  --primary2: #40a9ff;\n  --primary0: #e6f7ff;\n  --grey5: #8c8c8c;\n  --grey3: #d0d7de;\n  --secondary: #fff566;\n  --font-color: #494949;\n}\n\n@media (prefers-color-scheme: dark) {\n  :root {\n    --background: #3c3c3c;\n    --font-color: #fafafa;\n  }\n}\n.poll-select-content {\n  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", Segoe UI Symbol, \"Noto Color Emoji\";\n  display: flex;\n  flex-direction: column;\n  width: fit-content;\n  background-color: white;\n  border: 1px solid var(--grey3);\n  border-radius: 4px;\n  padding: 6px 4px;\n  box-shadow: rgba(0, 0, 0, 0.08) 0px 2px 4px;\n  gap: 2px;\n}\n\n.poll-select-item {\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  gap: 6px;\n  border-radius: 2px;\n  padding: 2px 8px 2px 24px;\n  transition: background-color 0.15s linear, color 0.15s linear;\n}\n\n.poll-select-item[data-state=checked] {\n  background-color: var(--primary2);\n  color: white;\n}\n\n.poll-select-item:focus-visible {\n  outline: none;\n}\n\n.poll-select-item:hover {\n  background-color: var(--primary0);\n  cursor: pointer;\n  color: unset;\n}\n\n.poll-separator {\n  background-color: #d0d7de;\n  height: 1px;\n  width: 100%;\n  margin: 4px 0;\n}";
 styleInject(css_248z$2);
 
 var Dropdown = function (_a) {
@@ -4519,15 +4515,12 @@ var Dropdown = function (_a) {
                             o.onSelect(o);
                     }, checked: o.checked, disabled: o.disabled }, itemProps),
                     o.checked ?
-                        React__default.createElement(ItemIndicator, null,
-                            React__default.createElement("div", { style: {
-                                    display: 'flex',
-                                    alignItems: 'center',
-                                    justifyContent: 'center',
-                                    width: 12,
-                                    height: 12,
-                                } },
-                                React__default.createElement(CheckCircle$1, null))) :
+                        React__default.createElement(ItemIndicator, { style: {
+                                position: 'absolute',
+                                display: 'inline-flex',
+                                left: 10
+                            } },
+                            React__default.createElement(CheckCircle$1, null)) :
                         React__default.createElement("div", { style: {
                                 width: 12,
                                 minWidth: 12,
@@ -4539,21 +4532,12 @@ var Dropdown = function (_a) {
                         if (o.onSelect)
                             o.onSelect(o);
                     }, textValue: o.label, value: o.id, disabled: o.disabled }, itemProps),
-                    o.checked ?
-                        React__default.createElement(ItemIndicator, null,
-                            React__default.createElement("div", { style: {
-                                    display: 'flex',
-                                    alignItems: 'center',
-                                    justifyContent: 'center',
-                                    width: 12,
-                                    height: 12,
-                                } },
-                                React__default.createElement(CheckCircle$1, null))) :
-                        React__default.createElement("div", { style: {
-                                width: 12,
-                                minWidth: 12,
-                                height: 12
-                            } }),
+                    React__default.createElement(ItemIndicator, { style: {
+                            position: 'absolute',
+                            display: 'inline-flex',
+                            left: 10
+                        } },
+                        React__default.createElement(CheckCircle$1, null)),
                     o.label));
             case 'label':
                 return (React__default.createElement(Label, { key: o.id }, o.label));
@@ -4569,7 +4553,7 @@ var Dropdown = function (_a) {
         React__default.createElement(Content, __assign$2({ className: 'poll-select-content' }, contentProps),
             optionGroups.map(function (group, i, a) { return (React__default.createElement(React__default.Fragment, null,
                 group.type && group.type === 'radio' ?
-                    React__default.createElement(RadioGroup, null, group.options.map(renderItem))
+                    React__default.createElement(RadioGroup, { value: group.value }, group.options.map(renderItem))
                     :
                         group.type && group.type === 'default' ?
                             React__default.createElement(Group, null, group.options.map(renderItem)) :
@@ -4712,6 +4696,8 @@ var GetModel = function (_a) {
     var _d = useGetHbjson(); _d.host; var hbjson = _d.hbjson, getHbjson = _d.getHbjson;
     // initial retrieval of geometry
     useEffect(function () {
+        if (!getHbjson)
+            return;
         getHbjson(key);
     }, [key, getHbjson]);
     useEffect(function () {
@@ -4752,7 +4738,7 @@ var GetModel = function (_a) {
             if (!getHbjson)
                 return;
             getHbjson(key, selOption === 'select', true);
-        }, disabled: typeof getHbjson === 'undefined', options: [{
+        }, disabled: !getHbjson, options: [{
                 type: 'radio',
                 value: selOption,
                 options: [
@@ -4787,73 +4773,183 @@ var GetModel = function (_a) {
 var css_248z = ":root {\n  --background: #FFFAEE;\n  --primary: #1890ff;\n  --primary2: #40a9ff;\n  --primary0: #e6f7ff;\n  --grey5: #8c8c8c;\n  --grey3: #d0d7de;\n  --secondary: #fff566;\n  --font-color: #494949;\n}\n\n@media (prefers-color-scheme: dark) {\n  :root {\n    --background: #3c3c3c;\n    --font-color: #fafafa;\n  }\n}";
 styleInject(css_248z);
 
-var KEY = performance.now().toString();
+var getAction$1 = function (key) {
+    switch (key) {
+        case 'add':
+            return 'BakeGeometry';
+        case 'delete':
+            return 'ClearGeometry';
+        case 'preview':
+            return 'DrawGeometry';
+        case 'clear':
+            return 'DisableDraw';
+        case 'subscribe-preview':
+            return 'DrawGeometry';
+    }
+};
 var SendGeometry = function (_a) {
-    var geometry = _a.geometry;
-    var _b = useState(true), preview = _b[0], setPreview = _b[1];
-    var _c = useSendGeometry(); _c.host; _c.state; var sendGeometry = _c.sendGeometry;
-    // TODO:
-    // useEffect(() => {
-    //   return () => {
-    //     if (host === 'rhino') {
-    //       sendMessageDotNet({
-    //         action: 'DisableDraw'
-    //       })
-    //     }
-    //   }
-    // }, [host])
+    var geometry = _a.geometry, defaultAction = _a.defaultAction;
+    var _b = useState(defaultAction !== null && defaultAction !== void 0 ? defaultAction : 'preview'), selOpt = _b[0], setSelOpt = _b[1];
+    var _c = useState(performance.now().toString()), key = _c[0]; _c[1];
+    var _d = useSendGeometry(); _d.host; _d.state; var sendGeometry = _d.sendGeometry;
+    useEffect(function () {
+        if (!sendGeometry || selOpt !== 'subscribe-preview')
+            return;
+        sendGeometry('DrawGeometry', {
+            data: geometry,
+            uniqueId: key,
+            options: {
+                layer: 'StreamlitLayer',
+                units: 'Meters',
+            },
+        });
+    }, [selOpt, geometry, sendGeometry, key]);
     return (React__default.createElement(SettingsButton, { disabled: !sendGeometry, onClick: function () {
             if (!sendGeometry)
                 return;
-            sendGeometry({
+            sendGeometry(getAction$1(selOpt), {
                 data: geometry,
-                uniqueId: KEY,
+                uniqueId: key,
                 options: {
                     layer: 'StreamlitLayer',
                     units: 'Meters',
                 },
-            }, preview);
+            });
         }, options: [{
+                type: 'radio',
+                value: selOpt,
                 options: [
                     {
-                        type: 'checkbox',
-                        id: 'preview-send-geometry',
+                        type: 'radio',
+                        id: 'preview',
                         label: 'Preview',
-                        checked: preview,
                         disabled: !sendGeometry,
-                        onSelect: function () { return setPreview(function (p) { return !p; }); },
+                        onSelect: function () {
+                            setSelOpt(function (state) { return state === 'preview' ? undefined : 'preview'; });
+                        },
+                    },
+                    {
+                        type: 'radio',
+                        id: 'add',
+                        label: 'Add',
+                        disabled: !sendGeometry,
+                        onSelect: function () {
+                            setSelOpt(function (state) { return state === 'add' ? undefined : 'add'; });
+                        }
+                    },
+                    {
+                        type: 'radio',
+                        id: 'delete',
+                        label: 'Delete',
+                        disabled: !sendGeometry,
+                        onSelect: function () {
+                            setSelOpt(function (state) { return state === 'delete' ? undefined : 'delete'; });
+                        },
+                    },
+                    {
+                        type: 'radio',
+                        id: 'clear',
+                        label: 'Clear',
+                        disabled: !sendGeometry,
+                        onSelect: function () {
+                            setSelOpt(function (state) { return state === 'clear' ? undefined : 'clear'; });
+                        },
+                    },
+                    {
+                        type: 'radio',
+                        id: 'subscribe-preview',
+                        label: 'Subscribe Preview',
+                        disabled: !sendGeometry,
+                        onSelect: function () {
+                            setSelOpt(function (state) { return state === 'subscribe-preview' ? undefined : 'subscribe-preview'; });
+                        },
                     },
                 ]
-            }], label: preview ? "Preview Geometry" : "Bake Geometry" }));
+            }], label: "".concat(selOpt ? selOpt.split('-').map(function (o) { return o.charAt(0).toUpperCase() + o.slice(1); }).join(' ') : 'Send', " Geometry") }));
 };
 
+var getAction = function (key) {
+    switch (key) {
+        case 'add':
+            return 'BakePollinationModel';
+        case 'preview':
+            return 'DrawPollinationModel';
+        case 'clear':
+            return 'DisableDrawPollinationModel';
+        case 'subscribe-preview':
+            return 'DrawPollinationModel';
+    }
+};
 var SendModel = function (_a) {
-    var hbjson = _a.hbjson;
-    var _b = useState(true), preview = _b[0], setPreview = _b[1];
-    var _c = useSendHbjson(); _c.host; _c.state; var sendHbjson = _c.sendHbjson;
+    var hbjson = _a.hbjson, defaultAction = _a.defaultAction;
+    var _b = useState(defaultAction !== null && defaultAction !== void 0 ? defaultAction : 'preview'), selOpt = _b[0], setSelOpt = _b[1];
+    var _c = useState(performance.now().toString()), key = _c[0]; _c[1];
+    var _d = useSendHbjson(); _d.host; _d.state; var sendHbjson = _d.sendHbjson;
+    useEffect(function () {
+        if (!sendHbjson || selOpt !== 'subscribe-preview')
+            return;
+        sendHbjson('DrawPollinationModel', {
+            data: hbjson,
+            uniqueId: key,
+            options: {
+                layer: 'StreamlitLayer',
+                units: 'Meters',
+            },
+        });
+    }, [selOpt, hbjson, sendHbjson, key]);
     return (React__default.createElement(SettingsButton, { disabled: !sendHbjson, onClick: function () {
             if (!sendHbjson)
                 return;
-            sendHbjson({
+            sendHbjson(getAction(selOpt), {
                 data: hbjson,
-                uniqueId: performance.now().toString(),
+                uniqueId: key,
                 options: {
                     layer: 'StreamlitLayer',
                     units: 'Meters',
                 },
-            }, preview);
+            });
         }, options: [{
+                type: 'radio',
+                value: selOpt,
                 options: [
                     {
-                        type: 'checkbox',
-                        id: 'preview-send-model',
+                        type: 'radio',
+                        id: 'preview',
                         label: 'Preview',
-                        checked: preview,
                         disabled: !sendHbjson,
-                        onSelect: function () { return setPreview(function (p) { return !p; }); },
+                        onSelect: function () {
+                            setSelOpt(function (state) { return state === 'preview' ? undefined : 'preview'; });
+                        },
+                    },
+                    {
+                        type: 'radio',
+                        id: 'add',
+                        label: 'Add',
+                        disabled: !sendHbjson,
+                        onSelect: function () {
+                            setSelOpt(function (state) { return state === 'add' ? undefined : 'add'; });
+                        }
+                    },
+                    {
+                        type: 'radio',
+                        id: 'clear',
+                        label: 'Clear',
+                        disabled: !sendHbjson,
+                        onSelect: function () {
+                            setSelOpt(function (state) { return state === 'clear' ? undefined : 'clear'; });
+                        },
+                    },
+                    {
+                        type: 'radio',
+                        id: 'subscribe-preview',
+                        label: 'Subscribe Preview',
+                        disabled: !sendHbjson,
+                        onSelect: function () {
+                            setSelOpt(function (state) { return state === 'subscribe-preview' ? undefined : 'subscribe-preview'; });
+                        },
                     },
                 ]
-            }], label: preview ? "Preview Model" : "Bake Model" }));
+            }], label: "".concat(selOpt ? selOpt.split('-').map(function (o) { return o.charAt(0).toUpperCase() + o.slice(1); }).join(' ') : 'Send', " Model") }));
 };
 
 export { GetGeometry, GetModel, SendGeometry, SendModel, checkDotNet, checkRuby, getHost, sendMessageDotNet, sendMessageRuby, subscribeDotNet, useGetGeometry, useGetHbjson, useHbjsontoVTK, useManageSettings, useRunCommand, useSendGeometry, useSendHbjson };