Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Tree node styling. #592

Merged
merged 10 commits into from
Oct 27, 2022
Merged

feat: Tree node styling. #592

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7ac3e64
chore: Sync up Tailwind config with Ann's final color document.
dhess Oct 26, 2022
ac5f199
refactor: More idiomatic way of applying dynamic class names to nodes.
dhess Oct 26, 2022
a50d20f
fix: Add Tailwind stroke colors for all defined (non-hover) colors.
dhess Oct 26, 2022
a4068c1
fix: Make nodes' text color (mostly) match the UI design spec.
dhess Oct 26, 2022
e978559
feat: Add hover states to most node flavors.
dhess Oct 26, 2022
5c21b04
fix: Use `rounded-md` for node borders.
dhess Oct 26, 2022
715dbfe
fix: Use `ring` rather than `outline` for node... outlines.
dhess Oct 26, 2022
8d423ed
feat: Style labels per UI design spec (mostly).
dhess Oct 26, 2022
88eef4c
fix: Use a solid fill color for "syntax" nodes.
dhess Oct 27, 2022
986024d
fix: Render patterns in a style consistent with equivalent exprs.
dhess Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/components/TreeReactFlow/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ function flavorLabel(flavor: NodeFlavor): string {
}

const primerNodeTypeName = "primer";

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, the lack of line breaks were intentional. This is all part of defining a "primer node", and I like to group related definitions (though maybe it's a bit odd that there is then a blank line within PrimerNode.

Anyway, it really doesn't matter.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found it hard to read and follow, personally.

type PrimerNodePropsNode = {
label?: string;
contents?: string;
Expand All @@ -154,12 +155,22 @@ type PrimerNodePropsNode = {
color: string;
selected: boolean;
};

type PrimerNodePropsTree = {
// Invariant: these will be the same for all nodes in a single tree.
def: GlobalName;
nodeType: NodeType;
};

type PrimerNodeProps = PrimerNodePropsTree & PrimerNodePropsNode;

const primerNodeClasses = (selected: boolean) =>
classNames({
"outline outline-4 outline-offset-4": selected,
"flex items-center justify-center rounded border-4 text-grey-tertiary bg-white-primary":
true,
});

const PrimerNode = (p: NodeProps<PrimerNodeProps>) => {
// these properties are necessary due to an upstream bug: https://github.com/wbkd/react-flow/issues/2193
const handleStyle = "absolute border-[2px] border-solid border-grey-tertiary";
Expand All @@ -168,10 +179,7 @@ const PrimerNode = (p: NodeProps<PrimerNodeProps>) => {
<>
<Handle type="target" position={Position.Top} className={handleStyle} />
<div
className={classNames(
"flex items-center justify-center rounded border-4 text-grey-tertiary bg-white-primary",
p.data.selected && "outline outline-4 outline-offset-4"
)}
className={primerNodeClasses(p.data.selected)}
style={{
width: p.data.width,
height: p.data.height,
Expand All @@ -195,6 +203,7 @@ const PrimerNode = (p: NodeProps<PrimerNodeProps>) => {
</>
);
};

const nodeTypes = { [primerNodeTypeName]: PrimerNode };

const convertTree = (
Expand Down