@macrostrat/feedback-components 1.0.1 → 1.1.1

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 (105) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/esm/feedback-components.3b3a5357.js +137 -0
  3. package/dist/esm/feedback-components.3b3a5357.js.map +1 -0
  4. package/dist/esm/feedback-components.46a7a347.js +269 -0
  5. package/dist/esm/feedback-components.46a7a347.js.map +1 -0
  6. package/dist/esm/{node.28634e40.js → feedback-components.5509fab3.js} +11 -6
  7. package/dist/esm/feedback-components.5509fab3.js.map +1 -0
  8. package/dist/esm/feedback-components.586103e8.js +578 -0
  9. package/dist/esm/feedback-components.586103e8.js.map +1 -0
  10. package/dist/esm/{extractions.65bb73cc.js → feedback-components.5df2a926.js} +46 -18
  11. package/dist/esm/feedback-components.5df2a926.js.map +1 -0
  12. package/dist/esm/{main.module.cd706d67.js → feedback-components.6d32ee91.js} +1 -1
  13. package/dist/esm/{main.module.cd706d67.js.map → feedback-components.6d32ee91.js.map} +1 -1
  14. package/dist/esm/feedback-components.95dbe7d7.js +82 -0
  15. package/dist/esm/feedback-components.95dbe7d7.js.map +1 -0
  16. package/dist/esm/{type-selector.6e8952d6.js → feedback-components.ad9f284e.js} +6 -5
  17. package/dist/esm/feedback-components.ad9f284e.js.map +1 -0
  18. package/dist/esm/{main.module.8d366b6e.css → feedback-components.bf93773c.css} +1 -1
  19. package/dist/esm/{main.module.8d366b6e.css.map → feedback-components.bf93773c.css.map} +1 -1
  20. package/dist/esm/{main.module.2f2972c8.css → feedback-components.e273ed5b.css} +1 -1
  21. package/dist/esm/{main.module.2f2972c8.css.map → feedback-components.e273ed5b.css.map} +1 -1
  22. package/dist/esm/{main.module.d2fbdf09.js → feedback-components.f9850d85.js} +1 -1
  23. package/dist/esm/{main.module.d2fbdf09.js.map → feedback-components.f9850d85.js.map} +1 -1
  24. package/dist/esm/{edit-state.c39d8466.js → feedback-components.fa1d3641.js} +125 -7
  25. package/dist/esm/feedback-components.fa1d3641.js.map +1 -0
  26. package/dist/esm/feedback-components.fb60c70d.css +180 -0
  27. package/dist/esm/feedback-components.fb60c70d.css.map +1 -0
  28. package/dist/esm/index.d.ts +10 -64
  29. package/dist/esm/index.d.ts.map +1 -1
  30. package/dist/esm/index.js +2 -2
  31. package/dist/node/feedback-components.2f391fa4.js +2 -0
  32. package/dist/node/feedback-components.2f391fa4.js.map +1 -0
  33. package/dist/node/feedback-components.561466ac.js +2 -0
  34. package/dist/node/feedback-components.561466ac.js.map +1 -0
  35. package/dist/node/feedback-components.571ee23c.js +2 -0
  36. package/dist/node/feedback-components.571ee23c.js.map +1 -0
  37. package/dist/node/{main.module.ebdf985b.js → feedback-components.794f429b.js} +2 -2
  38. package/dist/node/feedback-components.794f429b.js.map +1 -0
  39. package/dist/node/{main.module.1fdfe813.css → feedback-components.83c21466.css} +1 -1
  40. package/dist/node/feedback-components.83c21466.css.map +1 -0
  41. package/dist/node/feedback-components.8b03e8be.js +2 -0
  42. package/dist/node/feedback-components.8b03e8be.js.map +1 -0
  43. package/dist/node/{main.module.6bc7d51b.css → feedback-components.9eb1d41a.css} +1 -1
  44. package/dist/node/feedback-components.9eb1d41a.css.map +1 -0
  45. package/dist/node/feedback-components.a39f7653.js +2 -0
  46. package/dist/node/feedback-components.a39f7653.js.map +1 -0
  47. package/dist/node/feedback-components.acac789b.js +2 -0
  48. package/dist/node/feedback-components.acac789b.js.map +1 -0
  49. package/dist/node/feedback-components.b7946db4.js +2 -0
  50. package/dist/node/feedback-components.b7946db4.js.map +1 -0
  51. package/dist/node/feedback-components.c459cc27.js +2 -0
  52. package/dist/node/feedback-components.c459cc27.js.map +1 -0
  53. package/dist/node/feedback-components.c88cb37f.css +2 -0
  54. package/dist/node/feedback-components.c88cb37f.css.map +1 -0
  55. package/dist/node/feedback-components.ec54a1e7.js +2 -0
  56. package/dist/node/feedback-components.ec54a1e7.js.map +1 -0
  57. package/dist/node/index.js +1 -1
  58. package/dist/node/index.js.map +1 -1
  59. package/package.json +7 -6
  60. package/src/extractions/index.ts +76 -21
  61. package/src/extractions/types.ts +6 -1
  62. package/src/feedback/edit-state.ts +184 -16
  63. package/src/feedback/feedback.module.sass +121 -9
  64. package/src/feedback/graph.ts +90 -32
  65. package/src/feedback/index.ts +553 -146
  66. package/src/feedback/node.ts +7 -1
  67. package/src/feedback/text-visualizer.ts +286 -49
  68. package/src/feedback/type-selector/index.ts +4 -2
  69. package/dist/esm/edit-state.c39d8466.js.map +0 -1
  70. package/dist/esm/extractions.65bb73cc.js.map +0 -1
  71. package/dist/esm/feedback.5c86878e.js +0 -252
  72. package/dist/esm/feedback.5c86878e.js.map +0 -1
  73. package/dist/esm/feedback.module.55921afe.css +0 -44
  74. package/dist/esm/feedback.module.55921afe.css.map +0 -1
  75. package/dist/esm/feedback.module.765b1e58.js +0 -28
  76. package/dist/esm/feedback.module.765b1e58.js.map +0 -1
  77. package/dist/esm/graph.f4f65d79.js +0 -83
  78. package/dist/esm/graph.f4f65d79.js.map +0 -1
  79. package/dist/esm/node.28634e40.js.map +0 -1
  80. package/dist/esm/text-visualizer.198e27ff.js +0 -101
  81. package/dist/esm/text-visualizer.198e27ff.js.map +0 -1
  82. package/dist/esm/type-selector.6e8952d6.js.map +0 -1
  83. package/dist/node/edit-state.f50ca728.js +0 -2
  84. package/dist/node/edit-state.f50ca728.js.map +0 -1
  85. package/dist/node/extractions.e6ea2eb9.js +0 -2
  86. package/dist/node/extractions.e6ea2eb9.js.map +0 -1
  87. package/dist/node/feedback.8d3d1219.js +0 -2
  88. package/dist/node/feedback.8d3d1219.js.map +0 -1
  89. package/dist/node/feedback.module.a8744203.js +0 -2
  90. package/dist/node/feedback.module.a8744203.js.map +0 -1
  91. package/dist/node/feedback.module.c4eab97d.css +0 -2
  92. package/dist/node/feedback.module.c4eab97d.css.map +0 -1
  93. package/dist/node/graph.ca5b649f.js +0 -2
  94. package/dist/node/graph.ca5b649f.js.map +0 -1
  95. package/dist/node/main.module.1857be22.js +0 -2
  96. package/dist/node/main.module.1857be22.js.map +0 -1
  97. package/dist/node/main.module.1fdfe813.css.map +0 -1
  98. package/dist/node/main.module.6bc7d51b.css.map +0 -1
  99. package/dist/node/main.module.ebdf985b.js.map +0 -1
  100. package/dist/node/node.33108ccc.js +0 -2
  101. package/dist/node/node.33108ccc.js.map +0 -1
  102. package/dist/node/text-visualizer.1e770afa.js +0 -2
  103. package/dist/node/text-visualizer.1e770afa.js.map +0 -1
  104. package/dist/node/type-selector.0035ef7d.js +0 -2
  105. package/dist/node/type-selector.0035ef7d.js.map +0 -1
@@ -1,7 +1,7 @@
1
1
  import { TreeData } from "./types";
2
2
  import { treeToGraph } from "./edit-state";
3
- import h from "@macrostrat/hyper";
4
-
3
+ import styles from "./feedback.module.sass";
4
+ import hyper from "@macrostrat/hyper";
5
5
  import {
6
6
  forceSimulation,
7
7
  SimulationNodeDatum,
@@ -12,25 +12,32 @@ 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, Switch } from "@blueprintjs/core";
16
+ import { ErrorBoundary } from "@macrostrat/ui-components";
17
+ import { getTagStyle } from "../extractions";
18
+
19
+ const h = hyper.styled(styles);
16
20
 
17
21
  export function GraphView(props: {
18
22
  tree: TreeData[];
19
23
  width: number;
20
24
  height: number;
25
+ dispatch: (action: any) => void;
26
+ selectedNodes: number[];
21
27
  }) {
22
28
  // A graph view with react-flow
23
29
  // Get positions of nodes using force simulation
24
- const { tree, width, height } = props;
30
+ const { tree, width, height, dispatch, selectedNodes } = props;
25
31
 
26
32
  const [nodes, setNodes] = useState<SimulationNodeDatum[]>(null);
27
33
  const [links, setLinks] = useState<SimulationLinkDatum[]>(null);
34
+ const [showLabels, setShowLabels] = useState(false);
28
35
 
29
36
  useEffect(() => {
30
37
  const { nodes, edges } = treeToGraph(tree);
31
38
 
32
39
  const nodesMap = new Map<number, SimulationNodeDatum>(
33
- nodes.map((d) => [d.id, d])
40
+ nodes.map((d) => [d.id, d]),
34
41
  );
35
42
 
36
43
  const links = edges.map((d) => {
@@ -66,33 +73,84 @@ export function GraphView(props: {
66
73
  return h(Spinner);
67
74
  }
68
75
 
69
- console.log("Graph", nodes, links);
76
+ console.log("Graph", nodes, links, selectedNodes);
77
+
78
+ return h(
79
+ ErrorBoundary,
80
+ {
81
+ description: "An error occurred while rendering the graph view.",
82
+ },
83
+ h("div.graph-view", { style: { width, height } }, [
84
+ h(Switch, {
85
+ className: "show-labels-switch",
86
+ label: "Show Labels",
87
+ checked: showLabels,
88
+ onChange: (e) => setShowLabels(e.target.checked),
89
+ }),
90
+ h("svg", { width, height }, [
91
+ h(
92
+ "g.links",
93
+ links.map((d) => {
94
+ return h("line", {
95
+ x1: d.source.x,
96
+ y1: d.source.y,
97
+ x2: d.target.x,
98
+ y2: d.target.y,
99
+ stroke: "black",
100
+ });
101
+ }),
102
+ ),
103
+ h(
104
+ "g.nodes",
105
+ nodes.map((d) => {
106
+ const active = selectedNodes.includes(d.id);
107
+ const stroke = active ? "white" : "black";
108
+ const highlighted = isHighlighted(d.id, selectedNodes, nodes);
109
+ const style = getTagStyle(d.color, { highlighted, active });
70
110
 
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
- ),
111
+ return h("g", [
112
+ h("circle", {
113
+ cx: d.x,
114
+ cy: d.y,
115
+ r: 8,
116
+ fill: style.backgroundColor || "blue",
117
+ onClick: (e) => {
118
+ e.stopPropagation();
119
+ dispatch({
120
+ type: "toggle-node-selected",
121
+ payload: { ids: [d.id] },
122
+ });
123
+ },
124
+ className: active ? "selected" : "",
125
+ stroke,
126
+ strokeWidth: 2,
127
+ }),
128
+ h.if(showLabels)(
129
+ "text",
130
+ {
131
+ x: d.x + 10,
132
+ y: d.y + 4,
133
+ className: "node-label",
134
+ },
135
+ d.name || `Node ${d.id}`,
136
+ ),
137
+ h.if(!showLabels)("title", d.name || `Node ${d.id}`),
138
+ ]);
139
+ }),
140
+ ),
141
+ ]),
96
142
  ]),
97
- ]);
143
+ );
144
+ }
145
+
146
+ function isHighlighted(id: number, selectedNodes: number[], nodes: TreeData[]) {
147
+ if (selectedNodes.length === 0) return true;
148
+ return (
149
+ selectedNodes.includes(id) ||
150
+ nodes.some(
151
+ (node) =>
152
+ selectedNodes.includes(node.id) &&
153
+ node.children.some((child) => child.id === id),
154
+ )
155
+ );
98
156
  }