Skip to content

Commit 5325cac

Browse files
Merge pull request #7 from oslabs-beta/links
Links
2 parents a18a335 + 3f46c3a commit 5325cac

File tree

4 files changed

+71
-23
lines changed

4 files changed

+71
-23
lines changed

reactime-website

Submodule reactime-website added at cb1d59c

src/app/components/StateRoute/ComponentMap/ComponentMap.tsx

Lines changed: 50 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,19 @@ import ToolTipDataDisplay from './ToolTipDataDisplay';
2121
import { toggleExpanded, setCurrentTabInApp } from '../../../slices/mainSlice';
2222
import { useDispatch } from 'react-redux';
2323
import { LinkTypesProps, DefaultMargin, ToolTipStyles } from '../../../FrontendTypes';
24+
import { store } from '../../../store';
2425

2526
const linkStroke = '#F00008'; //#F00008 original
2627
const rootStroke = '#F00008'; //#F00008 original
2728
const nodeParentFill = '#161521'; //#161521 original
2829
const nodeChildFill = '#62d6fb'; //#62d6fb original
2930
const nodeParentStroke = '#F00008'; //#F00008 original
3031
const nodeChildStroke = '#4D4D4D'; //#4D4D4D original
32+
const hoverClass = '#ab269b'; //pinkish
33+
3134
let stroke = '';
3235

36+
3337
/* Heat Map Colors (for links) */
3438
const lightOrange = '#F1B476';
3539
const darkOrange = '#E4765B';
@@ -235,9 +239,11 @@ export default function ComponentMap({
235239
{(tree) => (
236240
<Group top={origin.y + 35} left={origin.x + 50 / aspect}>
237241
{tree.links().map((link, i) => {
242+
238243
const linkName = link.source.data.name;
239244
const propsObj = link.source.data.componentData.props;
240245
const childPropsObj = link.target.data.componentData.props;
246+
//consolelog const above
241247
let propsLength;
242248
let childPropsLength;
243249

@@ -250,7 +256,7 @@ export default function ComponentMap({
250256
}
251257
// go to https://en.wikipedia.org/wiki/Logistic_function
252258
// for an explanation of Logistic functions and parameters used
253-
const yshift = -3;
259+
const y0 = -3;
254260
const x0 = 5;
255261
const L = 25;
256262
const k = .4;
@@ -268,19 +274,46 @@ export default function ComponentMap({
268274
} else {
269275
stroke = plum;
270276
}
271-
// stroke = '#df6f37'
272277
}
278+
279+
280+
const [isHovered, setIsHovered] = useState(false);
281+
const handleMouseEnter = () => {
282+
setIsHovered(true);
283+
};
284+
const handleMouseLeave = () => {
285+
setIsHovered(false)
286+
}
287+
288+
let strokeColor; //isHovered ? hoverClass : stroke;
289+
let chooseCursor;
290+
291+
if (isHovered){
292+
strokeColor = hoverClass;
293+
}
294+
else {
295+
strokeColor = stroke
296+
}
297+
273298

274299
return (
275-
<LinkComponent
276-
className='compMapLink'
277-
key={i}
278-
data={link}
279-
percent={stepPercent}
280-
stroke={stroke} // color of the link --not used--
281-
strokeWidth= {strokeWidthIndex} /* strokeWidth */ // width of the link
282-
fill='none'
283-
/>
300+
<>
301+
<LinkComponent
302+
className='compMapLink'
303+
key={i}
304+
data={link}
305+
percent={stepPercent}
306+
stroke={strokeColor} // changing this color on hover
307+
strokeWidth= {strokeWidthIndex} /* strokeWidth */ // width of the link
308+
fill='none'
309+
//testing hover functionality
310+
onMouseEnter={handleMouseEnter}
311+
onMouseLeave={handleMouseLeave}
312+
/>
313+
<div className="linkHoverInfo">
314+
<h1>Props</h1>
315+
</div>
316+
</>
284317
)
285318
})
286319
}
@@ -494,7 +527,7 @@ export default function ComponentMap({
494527
</Tree>
495528
</Group>
496529
</svg>
497-
{tooltipOpen && tooltipData && (
530+
{tooltipOpen && tooltipData && ( // if the tooltip is open and there is data to display...
498531
<TooltipInPortal
499532
// set this to random so it correctly updates with parent bounds
500533
key={Math.random()}
@@ -537,6 +570,11 @@ export default function ComponentMap({
537570
</div>
538571
</TooltipInPortal>
539572
)}
573+
<div className="linkHover-Info">
574+
<p><strong>Props </strong>():</p>
575+
<div></div>
576+
</div>
577+
540578
</div>
541579
);
542580
}

src/app/styles/components/_componentMap.scss

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
// .compMapLink {
2-
// // stroke: $map-link;
3-
// stroke: $secondary-color;
4-
// }
5-
.compMapLink:hover {
6-
box-shadow: 10px 10px rgb(163, 205, 24);
7-
};
1+
2+
83

94
.comp-map-options {
105
color: $map-options-label;
@@ -22,6 +17,8 @@
2217
// //stroke: $map-parent-stroke;
2318
// }
2419

20+
21+
2522
.compMapParentText {
2623
fill: $map-parent-text
2724
}
@@ -44,3 +41,19 @@
4441
fill: $map-root-text;
4542
}
4643

44+
<<<<<<< HEAD
45+
46+
.linkHover-Info {
47+
height: 100px;
48+
width: 100px;
49+
// border: 1px solid red;
50+
z-index: 100;
51+
overflow: visible;
52+
// position: absolute;
53+
offset-position: 100px;
54+
border-radius: 5px;
55+
background-color: rgba(255, 0, 0, 0.067);
56+
// margin-bottom: 10px;
57+
}
58+
=======
59+
>>>>>>> dev

src/app/styles/layout/_stateContainer.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,6 @@
242242
z-index: 2;
243243
}
244244

245-
// .state-container .router-link {
246-
// border: 0.5px solid rgba(0, 0, 0, 0.5);
247-
// border-bottom: none;
248-
// }
249245

250246
.tooltipData {
251247
background-color: #373737;

0 commit comments

Comments
 (0)