Merge pull request #282 from code0-tech/feat/pictor-triangulum-update

Pictor and triangulum update

Author: nicosammito

.env.local

@@ -5,7 +5,7 @@ SAGITTARIUS_GRAPHQL_URL=http://localhost:80/graphql
 SAGITTARIUS_CABLE_URL=http://localhost:80/cable
 
 NEXT_PUBLIC_SCULPTOR_VERSION=0.0.0
-NEXT_PUBLIC_PICTOR_VERSION=0.10.9
+NEXT_PUBLIC_PICTOR_VERSION=0.11.0
 NEXT_PUBLIC_ALLOWED_REDIRECT_DOMAINS=*.code0.tech,*.codezero.build
 
 NEXT_PUBLIC_OTEL_SERVICE_NAME=#"sculptor-client"

package-lock.json

@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@apollo/client": "^4.0.9",
-    "@code0-tech/pictor": "^0.10.9",
-    "@code0-tech/triangulum": "^0.25.5",
+    "@code0-tech/pictor": "^0.11.0",
+    "@code0-tech/triangulum": "^0.25.6",
     "@codemirror/lang-javascript": "^6.2.5",
     "@codemirror/lint": "^6.9.5",
     "@icons-pack/react-simple-icons": "^13.13.0",

package.json

@@ -178,13 +178,7 @@ export const AIChatComponent: React.FC<AIChatComponentProps> = (props) => {
                                     boxShadow: "none"
                                 }
                             }}
-                            placeholder={"Describe what you want to edit..."}
-                            language={StreamLanguage.define({
-                                token(stream) {
-                                    stream.next()
-                                    return null;
-                                }
-                            })}/>
+                            placeholder={"Describe what you want to edit..."}/>
                     )
                 }
                 <Spacing spacing={"xxs"}/>

src/packages/ce/src/ai/components/AIChatComponent.tsx

@@ -34,48 +34,53 @@ export const DataTypeInputComponent: React.FC<DataTypeInputComponentProps> = (pr
     const suggestions = "schema" in (schema ?? {}) ? (schema as NodeSchema)?.schema?.suggestions as (NodeFunction | ReferenceValue | LiteralValue)[] : []
     const inputName = "schema" in (schema ?? {}) ? (schema as NodeSchema)?.schema?.input : (schema as Schema)?.input
 
-    if ("schema" in (schema ?? {}) && (((schema as NodeSchema).blockedBy?.length ?? 0) > 0) && (rest.formValidation?.valid ?? false)) {
-        return null
-    }
+    return React.useMemo(
+        () => {
+            if ("schema" in (schema ?? {}) && (((schema as NodeSchema).blockedBy?.length ?? 0) > 0) && (rest.formValidation?.valid ?? false)) {
+                return null
+            }
 
-    switch (inputName) {
-        case "boolean":
-            return <DataTypeBooleanInputComponent
-                schema={schema}
-                suggestions={suggestions}
-                {...rest}
-            />
-        case "select":
-            return <DataTypeSelectInputComponent
-                schema={schema}
-                suggestions={suggestions}
-                {...rest}/>
-        case "number":
-            return <DataTypeNumberInputComponent
-                schema={schema}
-                suggestions={suggestions}
-                {...rest}/>
-        case "list":
-        case "data":
-            return <DataTypeJSONInputComponent
-                schema={schema}
-                suggestions={suggestions}
-                {...rest}/>
-        case "generic":
-            return <DataTypeGenericInputComponent
-                schema={schema}
-                suggestions={suggestions}
-                {...rest}/>
-        case "sub-flow":
-            return <DataTypeSubFlowInputComponent
-                schema={schema}
-                suggestions={suggestions}
-                {...rest}/>
-        default:
-            return <DataTypeTextInputComponent
-                suggestions={suggestions}
-                schema={schema}
-                {...rest}
-            />
-    }
+            switch (inputName) {
+                case "boolean":
+                    return <DataTypeBooleanInputComponent
+                        schema={schema}
+                        suggestions={suggestions}
+                        {...rest}
+                    />
+                case "select":
+                    return <DataTypeSelectInputComponent
+                        schema={schema}
+                        suggestions={suggestions}
+                        {...rest}/>
+                case "number":
+                    return <DataTypeNumberInputComponent
+                        schema={schema}
+                        suggestions={suggestions}
+                        {...rest}/>
+                case "list":
+                case "data":
+                    return <DataTypeJSONInputComponent
+                        schema={schema}
+                        suggestions={suggestions}
+                        {...rest}/>
+                case "generic":
+                    return <DataTypeGenericInputComponent
+                        schema={schema}
+                        suggestions={suggestions}
+                        {...rest}/>
+                case "sub-flow":
+                    return <DataTypeSubFlowInputComponent
+                        schema={schema}
+                        suggestions={suggestions}
+                        {...rest}/>
+                default:
+                    return <DataTypeTextInputComponent
+                        suggestions={suggestions}
+                        schema={schema}
+                        {...rest}
+                    />
+            }
+        },
+        [rest.initialValue, inputName, suggestions?.length ?? 0, rest.formValidation?.valid ?? true, rest.formValidation?.notValidMessage ?? ""]
+    )
 }

src/packages/ce/src/datatype/components/inputs/DataTypeInputComponent.tsx

@@ -1,8 +1,6 @@
 import React from "react";
 import {DataTypeInputComponentProps} from "../DataTypeInputComponent";
-import {EditorInput, hashToColor, InputDescription, InputLabel} from "@code0-tech/pictor";
-import {StreamLanguage} from "@codemirror/language";
-import {tags} from "@lezer/highlight";
+import {EditorInput, InputDescription, InputLabel} from "@code0-tech/pictor";
 import {useDebouncedCallback} from "use-debounce";
 import {
     LiteralValue,
@@ -55,15 +53,6 @@ export const DataTypeNumberInputComponent: React.FC<DataTypeNumberInputComponent
                          formValidation={{...formValidation, setValue: undefined}}
                          maw={"100%"}
                          placeholder={String(title) ?? ""}
-                         language={StreamLanguage.define({
-                             token(stream) {
-                                 stream.next()
-                                 return null;
-                             }
-                         })}
-                         tokenStyles={[
-                             {tag: tags.keyword, color: hashToColor("bracket")},
-                         ]}
                          right={
                              <DataTypeInputControlsComponent suggestions={suggestions} onSelect={value => {
                                  formValidation?.setValue?.(value)