Merge pull request #3 from clarkmcc/qol-improvements

Quality-of-life improvements
clarkmcc · Jan 13, 2024 · 215308a · 215308a
2 parents a385214 + 8bcd746
commit 215308a
Show file tree

Hide file tree

Showing 18 changed files with 121 additions and 100 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,7 +1,8 @@
-dist
 .babelrc
 .storybook
 .gitignore
 .prettierrc
 rollup.config.mjs
 tsconfig.json
+src
+lib
diff --git a/lib/NodeGraphEditor.stories.tsx b/lib/NodeGraphEditor.stories.tsx
@@ -24,14 +24,14 @@ const simpleConfig: IGraphConfig = {
       inputs: [
         {
           name: 'Value',
-          identifier: 'value',
+          id: 'value',
           valueType: 'string',
         },
       ],
       outputs: [
         {
           name: 'Value',
-          identifier: 'value',
+          id: 'value',
           valueType: 'string',
         },
       ],
@@ -80,9 +80,6 @@ export const Simple: Story = {
         sourceHandle: 'value',
         target: '2',
         targetHandle: 'value',
-        data: {
-          targetHandleType: 'string',
-        },
       },
     ],
     config: simpleConfig,
@@ -154,34 +151,34 @@ export const InputFields: Story = {
           inputs: [
             {
               name: 'Value',
-              identifier: 'value',
+              id: 'value',
               valueType: 'string',
             },
             {
               name: 'Constant',
-              identifier: 'constant',
+              id: 'constant',
               valueType: 'string',
               isConstant: true,
             },
             {
               name: 'Array',
-              identifier: 'array',
+              id: 'array',
               valueType: 'string',
               isArray: true,
             },
             {
               name: 'Options',
-              identifier: 'options',
+              id: 'options',
               valueType: 'httpMethod',
             },
             {
               name: 'Button Group',
-              identifier: 'buttonGroup',
+              id: 'buttonGroup',
               valueType: 'httpProtocol',
             },
             {
               name: 'Checkbox',
-              identifier: 'checkbox',
+              id: 'checkbox',
               valueType: 'boolean',
             },
           ],
@@ -230,29 +227,20 @@ export const SelectedEdgeHighlighting: Story = {
         sourceHandle: 'vector',
         target: '2',
         targetHandle: 'position',
-        data: {
-          targetHandleType: 'vector',
-        },
       },
       {
         id: 'e2',
         source: '2',
         sourceHandle: 'geometry',
         target: '3',
         targetHandle: 'geometry',
-        data: {
-          targetHandleType: 'geometry',
-        },
       },
       {
         id: 'e3',
         source: '2',
         sourceHandle: 'geometry',
         target: '4',
         targetHandle: 'geometry',
-        data: {
-          targetHandleType: 'geometry',
-        },
       },
     ],
     config: {
@@ -287,24 +275,24 @@ export const SelectedEdgeHighlighting: Story = {
           inputs: [
             {
               name: 'X',
-              identifier: 'x',
+              id: 'x',
               valueType: 'number',
             },
             {
               name: 'Y',
-              identifier: 'y',
+              id: 'y',
               valueType: 'number',
             },
             {
               name: 'Z',
-              identifier: 'z',
+              id: 'z',
               valueType: 'number',
             },
           ],
           outputs: [
             {
               name: 'Vector',
-              identifier: 'vector',
+              id: 'vector',
               valueType: 'vector',
             },
           ],
@@ -315,24 +303,24 @@ export const SelectedEdgeHighlighting: Story = {
           inputs: [
             {
               name: 'Count',
-              identifier: 'count',
+              id: 'count',
               valueType: 'number',
             },
             {
               name: 'Radius',
-              identifier: 'radius',
+              id: 'radius',
               valueType: 'number',
             },
             {
               name: 'Position',
-              identifier: 'position',
+              id: 'position',
               valueType: 'vector',
             },
           ],
           outputs: [
             {
               name: 'Geometry',
-              identifier: 'geometry',
+              id: 'geometry',
               valueType: 'geometry',
             },
           ],
@@ -343,7 +331,7 @@ export const SelectedEdgeHighlighting: Story = {
           inputs: [
             {
               name: 'Geometry',
-              identifier: 'geometry',
+              id: 'geometry',
               valueType: 'geometry',
             },
           ],
@@ -385,19 +373,13 @@ export const ArrayInputs: Story = {
         sourceHandle: 'vector',
         target: '3',
         targetHandle: 'vectors',
-        data: {
-          targetHandleType: 'vector',
-        },
       },
       {
         id: 'e2',
         source: '2',
         sourceHandle: 'vector',
         target: '3',
         targetHandle: 'vectors',
-        data: {
-          targetHandleType: 'vector',
-        },
       },
     ],
     config: {
@@ -432,24 +414,24 @@ export const ArrayInputs: Story = {
           inputs: [
             {
               name: 'X',
-              identifier: 'x',
+              id: 'x',
               valueType: 'number',
             },
             {
               name: 'Y',
-              identifier: 'y',
+              id: 'y',
               valueType: 'number',
             },
             {
               name: 'Z',
-              identifier: 'z',
+              id: 'z',
               valueType: 'number',
             },
           ],
           outputs: [
             {
               name: 'Vector',
-              identifier: 'vector',
+              id: 'vector',
               valueType: 'vector',
             },
           ],
@@ -460,7 +442,7 @@ export const ArrayInputs: Story = {
           inputs: [
             {
               name: 'Vectors',
-              identifier: 'vectors',
+              id: 'vectors',
               valueType: 'vector',
               isArray: true,
             },
@@ -520,17 +502,17 @@ export const HandleSymbols: Story = {
           outputs: [
             {
               name: 'Circle',
-              identifier: 'circle',
+              id: 'circle',
               valueType: 'circle',
             },
             {
               name: 'Diamond',
-              identifier: 'diamond',
+              id: 'diamond',
               valueType: 'diamond',
             },
             {
               name: 'Diamond Dot',
-              identifier: 'diamondDot',
+              id: 'diamondDot',
               valueType: 'diamondDot',
             },
           ],

diff --git a/lib/NodeGraphEditorCustomInput.stories.tsx b/lib/NodeGraphEditorCustomInput.stories.tsx
@@ -26,9 +26,9 @@ const meta = {
           }}
         >
           {Handle && <Handle />}
-          <NodeInputField {...config} name="X" identifier="x" />
-          <NodeInputField {...config} name="Y" identifier="y" />
-          <NodeInputField {...config} name="Z" identifier="z" />
+          <NodeInputField {...config} name="X" id="x" />
+          <NodeInputField {...config} name="Y" id="y" />
+          <NodeInputField {...config} name="Z" id="z" />
         </div>
       )
     }
@@ -49,14 +49,14 @@ const meta = {
             inputs: [
               {
                 name: 'Value',
-                identifier: 'value',
+                id: 'value',
                 valueType: 'vector',
               },
             ],
             outputs: [
               {
                 name: 'Value',
-                identifier: 'value',
+                id: 'value',
                 valueType: 'vector',
               },
             ],

diff --git a/lib/NodeGraphEditorCustomNode.stories.tsx b/lib/NodeGraphEditorCustomNode.stories.tsx
@@ -30,7 +30,7 @@ const meta = {
               onBlur={onBlur}
             />
             <Handle
-              identifier="value"
+              id="value"
               position={Position.Right}
               handleType="source"
               shape="circle"
@@ -65,7 +65,7 @@ const meta = {
         'custom',
         CustomNode,
         [],
-        [{ name: 'Value', identifier: 'value', valueType: 'string' }],
+        [{ name: 'Value', id: 'value', valueType: 'string' }],
       )
       return config.validate()
     }, [])

diff --git a/lib/NodeGraphEditorLayout.stories.tsx b/lib/NodeGraphEditorLayout.stories.tsx
@@ -85,47 +85,41 @@ export const DagreLayout: Story = {
         target: '2',
         sourceHandle: 'value',
         targetHandle: 'value',
-        data: { targetHandleType: 'string' },
       },
       {
         id: '2',
         source: '1',
         target: '3',
         sourceHandle: 'value',
         targetHandle: 'value',
-        data: { targetHandleType: 'string' },
       },
       {
         id: '3',
         source: '2',
         target: '4',
         sourceHandle: 'value',
         targetHandle: 'value',
-        data: { targetHandleType: 'string' },
       },
       {
         id: '4',
         source: '3',
         target: '4',
         sourceHandle: 'value',
         targetHandle: 'value',
-        data: { targetHandleType: 'string' },
       },
       {
         id: '5',
         source: '4',
         target: '5',
         sourceHandle: 'value',
         targetHandle: 'value',
-        data: { targetHandleType: 'string' },
       },
       {
         id: '6',
         source: '4',
         target: '6',
         sourceHandle: 'value',
         targetHandle: 'value',
-        data: { targetHandleType: 'string' },
       },
     ],
     config: {
@@ -150,14 +144,14 @@ export const DagreLayout: Story = {
           inputs: [
             {
               name: 'Value',
-              identifier: 'value',
+              id: 'value',
               valueType: 'string',
             },
           ],
           outputs: [
             {
               name: 'Value',
-              identifier: 'value',
+              id: 'value',
               valueType: 'string',
             },
           ],