@macrostrat/feedback-components 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (86) hide show
  1. package/CHANGELOG.md +13 -5
  2. package/dist/esm/feedback-components.4359bc80.js +70 -0
  3. package/dist/esm/feedback-components.4359bc80.js.map +1 -0
  4. package/dist/{extractions.54be85f8.js → esm/feedback-components.5df2a926.js} +52 -24
  5. package/dist/esm/feedback-components.5df2a926.js.map +1 -0
  6. package/dist/esm/feedback-components.6a6c8af5.js +552 -0
  7. package/dist/esm/feedback-components.6a6c8af5.js.map +1 -0
  8. package/dist/{main.module.ca3db294.js → esm/feedback-components.6d32ee91.js} +1 -1
  9. package/dist/{main.module.ca3db294.js.map → esm/feedback-components.6d32ee91.js.map} +1 -1
  10. package/dist/esm/feedback-components.7cd9b6cc.js +114 -0
  11. package/dist/esm/feedback-components.7cd9b6cc.js.map +1 -0
  12. package/dist/{node.30d0b8c3.js → esm/feedback-components.87533431.js} +12 -7
  13. package/dist/esm/feedback-components.87533431.js.map +1 -0
  14. package/dist/esm/feedback-components.921dcd46.js +241 -0
  15. package/dist/esm/feedback-components.921dcd46.js.map +1 -0
  16. package/dist/{type-selector.e75dd247.js → esm/feedback-components.ad9f284e.js} +11 -10
  17. package/dist/esm/feedback-components.ad9f284e.js.map +1 -0
  18. package/dist/esm/feedback-components.b7d9b015.css +156 -0
  19. package/dist/esm/feedback-components.b7d9b015.css.map +1 -0
  20. package/dist/{edit-state.e8edb13a.js → esm/feedback-components.bf5f7cf7.js} +105 -14
  21. package/dist/esm/feedback-components.bf5f7cf7.js.map +1 -0
  22. package/dist/{main.module.f9f92ece.css → esm/feedback-components.bf93773c.css} +1 -1
  23. package/dist/{main.module.f9f92ece.css.map → esm/feedback-components.bf93773c.css.map} +1 -1
  24. package/dist/{main.module.d6508c0e.css → esm/feedback-components.e273ed5b.css} +1 -1
  25. package/dist/{main.module.d6508c0e.css.map → esm/feedback-components.e273ed5b.css.map} +1 -1
  26. package/dist/{main.module.21bbfaf4.js → esm/feedback-components.f9850d85.js} +1 -1
  27. package/dist/{main.module.21bbfaf4.js.map → esm/feedback-components.f9850d85.js.map} +1 -1
  28. package/dist/{index.d.ts → esm/index.d.ts} +38 -13
  29. package/dist/esm/index.d.ts.map +1 -0
  30. package/dist/{index.js → esm/index.js} +2 -2
  31. package/dist/node/feedback-components.15e1316d.js +2 -0
  32. package/dist/node/feedback-components.15e1316d.js.map +1 -0
  33. package/dist/node/feedback-components.2f391fa4.js +2 -0
  34. package/dist/node/feedback-components.2f391fa4.js.map +1 -0
  35. package/dist/node/feedback-components.65d8488e.js +2 -0
  36. package/dist/node/feedback-components.65d8488e.js.map +1 -0
  37. package/dist/node/feedback-components.6681dbde.js +2 -0
  38. package/dist/node/feedback-components.6681dbde.js.map +1 -0
  39. package/dist/node/feedback-components.77b6fc89.css +2 -0
  40. package/dist/node/feedback-components.77b6fc89.css.map +1 -0
  41. package/dist/node/feedback-components.794f429b.js +2 -0
  42. package/dist/node/feedback-components.794f429b.js.map +1 -0
  43. package/dist/node/feedback-components.7caa447a.js +2 -0
  44. package/dist/node/feedback-components.7caa447a.js.map +1 -0
  45. package/dist/node/feedback-components.83c21466.css +2 -0
  46. package/dist/node/feedback-components.83c21466.css.map +1 -0
  47. package/dist/node/feedback-components.8b03e8be.js +2 -0
  48. package/dist/node/feedback-components.8b03e8be.js.map +1 -0
  49. package/dist/node/feedback-components.9eb1d41a.css +2 -0
  50. package/dist/node/feedback-components.9eb1d41a.css.map +1 -0
  51. package/dist/node/feedback-components.acac789b.js +2 -0
  52. package/dist/node/feedback-components.acac789b.js.map +1 -0
  53. package/dist/node/feedback-components.e2f3c4b7.js +2 -0
  54. package/dist/node/feedback-components.e2f3c4b7.js.map +1 -0
  55. package/dist/node/feedback-components.e8aa70b8.js +2 -0
  56. package/dist/node/feedback-components.e8aa70b8.js.map +1 -0
  57. package/dist/node/index.js +2 -0
  58. package/dist/node/index.js.map +1 -0
  59. package/package.json +29 -15
  60. package/src/extractions/index.ts +76 -21
  61. package/src/extractions/types.ts +6 -1
  62. package/src/feedback/edit-state.ts +146 -16
  63. package/src/feedback/feedback.module.sass +93 -1
  64. package/src/feedback/graph.ts +71 -30
  65. package/src/feedback/index.ts +444 -71
  66. package/src/feedback/node.ts +7 -1
  67. package/src/feedback/text-visualizer.ts +258 -47
  68. package/src/feedback/type-selector/index.ts +4 -2
  69. package/dist/edit-state.e8edb13a.js.map +0 -1
  70. package/dist/extractions.54be85f8.js.map +0 -1
  71. package/dist/feedback.46c2b5c4.js +0 -252
  72. package/dist/feedback.46c2b5c4.js.map +0 -1
  73. package/dist/feedback.module.7e16830e.css +0 -44
  74. package/dist/feedback.module.7e16830e.css.map +0 -1
  75. package/dist/feedback.module.c28cbac7.js +0 -28
  76. package/dist/feedback.module.c28cbac7.js.map +0 -1
  77. package/dist/graph.cb42b871.js +0 -83
  78. package/dist/graph.cb42b871.js.map +0 -1
  79. package/dist/index.d.ts.map +0 -1
  80. package/dist/node.30d0b8c3.js.map +0 -1
  81. package/dist/text-visualizer.77af0d24.js +0 -101
  82. package/dist/text-visualizer.77af0d24.js.map +0 -1
  83. package/dist/type-selector.e75dd247.js.map +0 -1
  84. package/stories/feedback.stories.ts +0 -40
  85. package/stories/test-data.ts +0 -330
  86. /package/dist/{index.js.map → esm/index.js.map} +0 -0
@@ -12,16 +12,20 @@ import {
12
12
  forceCollide,
13
13
  } from "d3-force";
14
14
  import { useEffect, useState } from "react";
15
- import { Spinner } from "@blueprintjs/core";
15
+ import { Spinner, Popover } from "@blueprintjs/core";
16
+ import { ErrorBoundary } from "@macrostrat/ui-components";
17
+ import { getTagStyle } from "../extractions";
16
18
 
17
19
  export function GraphView(props: {
18
20
  tree: TreeData[];
19
21
  width: number;
20
22
  height: number;
23
+ dispatch: (action: any) => void;
24
+ selectedNodes: number[];
21
25
  }) {
22
26
  // A graph view with react-flow
23
27
  // Get positions of nodes using force simulation
24
- const { tree, width, height } = props;
28
+ const { tree, width, height, dispatch, selectedNodes } = props;
25
29
 
26
30
  const [nodes, setNodes] = useState<SimulationNodeDatum[]>(null);
27
31
  const [links, setLinks] = useState<SimulationLinkDatum[]>(null);
@@ -30,7 +34,7 @@ export function GraphView(props: {
30
34
  const { nodes, edges } = treeToGraph(tree);
31
35
 
32
36
  const nodesMap = new Map<number, SimulationNodeDatum>(
33
- nodes.map((d) => [d.id, d])
37
+ nodes.map((d) => [d.id, d]),
34
38
  );
35
39
 
36
40
  const links = edges.map((d) => {
@@ -66,33 +70,70 @@ export function GraphView(props: {
66
70
  return h(Spinner);
67
71
  }
68
72
 
69
- console.log("Graph", nodes, links);
73
+ console.log("Graph", nodes, links, selectedNodes);
70
74
 
71
- return h("div.graph-view", { style: { width, height } }, [
72
- h("svg", { width, height }, [
73
- h(
74
- "g.nodes",
75
- nodes.map((d) => {
76
- return h("circle", {
77
- cx: d.x,
78
- cy: d.y,
79
- r: 5,
80
- fill: "blue",
81
- });
82
- })
83
- ),
84
- h(
85
- "g.links",
86
- links.map((d) => {
87
- return h("line", {
88
- x1: d.source.x,
89
- y1: d.source.y,
90
- x2: d.target.x,
91
- y2: d.target.y,
92
- stroke: "black",
93
- });
94
- })
95
- ),
75
+ return h(
76
+ ErrorBoundary,
77
+ {
78
+ description: "An error occurred while rendering the graph view.",
79
+ },
80
+ h("div.graph-view", { style: { width, height } }, [
81
+ h("svg", { width, height }, [
82
+ h(
83
+ "g.links",
84
+ links.map((d) => {
85
+ return h("line", {
86
+ x1: d.source.x,
87
+ y1: d.source.y,
88
+ x2: d.target.x,
89
+ y2: d.target.y,
90
+ stroke: "black",
91
+ });
92
+ }),
93
+ ),
94
+ h(
95
+ "g.nodes",
96
+ nodes.map((d) => {
97
+ const active = selectedNodes.includes(d.id);
98
+ const stroke = active ? "white" : "black";
99
+ const highlighted = isHighlighted(d.id, selectedNodes, nodes);
100
+ const style = getTagStyle(d.color, { highlighted, active });
101
+
102
+ return h(
103
+ "circle",
104
+ {
105
+ cx: d.x,
106
+ cy: d.y,
107
+ r: 5,
108
+ fill: style.backgroundColor || "blue",
109
+ onClick: (e) => {
110
+ e.stopPropagation();
111
+ dispatch({
112
+ type: "toggle-node-selected",
113
+ payload: { ids: [d.id] },
114
+ });
115
+ },
116
+ className: active ? "selected" : "",
117
+ stroke,
118
+ strokeWidth: 2,
119
+ },
120
+ h("title", d.name || `Node ${d.id}`),
121
+ );
122
+ }),
123
+ ),
124
+ ]),
96
125
  ]),
97
- ]);
126
+ );
127
+ }
128
+
129
+ function isHighlighted(id: number, selectedNodes: number[], nodes: TreeData[]) {
130
+ if (selectedNodes.length === 0) return true;
131
+ return (
132
+ selectedNodes.includes(id) ||
133
+ nodes.some(
134
+ (node) =>
135
+ selectedNodes.includes(node.id) &&
136
+ node.children.some((child) => child.id === id),
137
+ )
138
+ );
98
139
  }