Skip to content

Commit dddedac

Browse files
Punpun1643leslieyip02Papattarada Apithanangsiri
authored
fix(moduletree): remove leading line for inactive root node (#4108)
* fix(moduletree): remove leading line for inactive root node * test(moduletree): update snapshot - snapshot is updated because an additional css class sector is added to fix leading horizontal line * fix(moduletree): change back css order and update snapshot * refactor * fix(moduletree) * test: update snapshot --------- Co-authored-by: Leslie Yip <[email protected]> Co-authored-by: Papattarada Apithanangsiri <[email protected]>
1 parent 33a1a86 commit dddedac

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

website/src/views/modules/ModuleTree.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ $connector-size: 0.75rem;
5858
min-width: 4.5rem;
5959
}
6060

61+
.inactiveRootNode::before {
62+
display: none;
63+
}
64+
6165
.prefix {
6266
font-size: 0.75rem;
6367
white-space: nowrap;

website/src/views/modules/ModuleTree.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,15 @@ const Tree: React.FC<TreeDisplay> = (props) => {
131131
const moduleActive = props.getModuleCondensed(name);
132132

133133
// If module is deprecated (undefined) then we grey out, remove color classname
134+
// Hide the left horizontal line for the root node (layer 1) if the module is inactive
135+
const isInactiveRoot = layer === 1 && !moduleActive;
134136

135137
return (
136138
<div
137139
className={classnames(styles.node, styles.moduleNode, {
138140
[`hoverable color-${layer}`]: !!moduleActive,
139141
[styles.leftNode]: prereqTreeOnLeft,
142+
[styles.inactiveRootNode]: isInactiveRoot,
140143
})}
141144
>
142145
{prefix && <span className={styles.prefix}>{prefix}</span>}
@@ -173,7 +176,7 @@ export const ModuleTreeComponent: React.FC<Props> = (props) => {
173176
layer={1}
174177
node={moduleCode}
175178
getModuleCondensed={props.getModuleCondensed}
176-
prereqTreeOnLeft={false}
179+
prereqTreeOnLeft={prereqTreeOnLeft}
177180
/>
178181
</ConditionalReverse>
179182
</li>

website/src/views/modules/__snapshots__/ModuleTree.test.tsx.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ exports[`ModuleTreeComponent should grey out modules that are not in module bank
201201
</li>
202202
</ul>
203203
<div
204-
class="node moduleNode"
204+
class="node moduleNode leftNode inactiveRootNode"
205205
>
206206
<div>
207207
<mockedlink
@@ -351,7 +351,7 @@ exports[`ModuleTreeComponent should render prereq branch with nOf condition: PC2
351351
</li>
352352
</ul>
353353
<div
354-
class="node moduleNode"
354+
class="node moduleNode leftNode inactiveRootNode"
355355
>
356356
<div>
357357
<mockedlink
@@ -883,7 +883,7 @@ exports[`ModuleTreeComponent should render prereq tree of module: CS3244 1`] = `
883883
</li>
884884
</ul>
885885
<div
886-
class="node moduleNode"
886+
class="node moduleNode leftNode inactiveRootNode"
887887
>
888888
<div>
889889
<mockedlink
@@ -1010,7 +1010,7 @@ exports[`ModuleTreeComponent should render prereq tree to the right when tree di
10101010
class="branch"
10111011
>
10121012
<div
1013-
class="node moduleNode"
1013+
class="node moduleNode inactiveRootNode"
10141014
>
10151015
<div>
10161016
<mockedlink
@@ -1078,7 +1078,7 @@ exports[`ModuleTreeComponent should render requirements fulfilled tree of module
10781078
class="branch leftBranch"
10791079
>
10801080
<div
1081-
class="node moduleNode"
1081+
class="node moduleNode leftNode inactiveRootNode"
10821082
>
10831083
<div>
10841084
<mockedlink

0 commit comments

Comments
 (0)