Skip to content

Add support for margin to ordinal color legend. #1082

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

Closed
wants to merge 9 commits into from
Closed

Add support for margin to ordinal color legend. #1082

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da3a3e6
Add support for margin to ordinal color legend.
dgwyer Oct 11, 2022
97bc43c
added pixel default for margin bottom
dgwyer Oct 12, 2022
0ddd696
removed prettier script in package.json
dgwyer Oct 12, 2022
32e26ed
fixed prettier linting issue
dgwyer Oct 13, 2022
db49103
Merge branch 'observablehq:main' into feature/add-margin-support-to-o…
dgwyer Oct 14, 2022
b7ffeb3
update branch to push changes
dgwyer Oct 14, 2022
9a19a48
reverting changes
dgwyer Oct 14, 2022
4d6a7c2
update prettier changes
dgwyer Oct 14, 2022
40ba5c5
updated default bottom margin
dgwyer Oct 17, 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
43 changes: 25 additions & 18 deletions src/legends/swatches.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {path} from "d3";
import {inferFontVariant} from "../axes.js";
import {maybeAutoTickFormat} from "../axis.js";
import {Context, create} from "../context.js";
import {isNoneish, maybeColorChannel, maybeNumberChannel} from "../options.js";
import {isOrdinalScale, isThresholdScale} from "../scales.js";
import {applyInlineStyles, impliedString, maybeClassName} from "../style.js";
import { path } from "d3";
import { inferFontVariant } from "../axes.js";
import { maybeAutoTickFormat } from "../axis.js";
import { Context, create } from "../context.js";
import { isNoneish, maybeColorChannel, maybeNumberChannel } from "../options.js";
import { isOrdinalScale, isThresholdScale } from "../scales.js";
import { applyInlineStyles, impliedString, maybeClassName } from "../style.js";

function maybeScale(scale, key) {
if (key == null) return key;
Expand Down Expand Up @@ -88,6 +88,9 @@ function legendItems(scale, options = {}, swatch, swatchStyle) {
swatchSize = 15,
swatchWidth = swatchSize,
swatchHeight = swatchSize,
marginTop = 0,
marginRight = 0,
marginBottom = 0,
marginLeft = 0,
className,
style,
Expand Down Expand Up @@ -170,18 +173,22 @@ function legendItems(scale, options = {}, swatch, swatchStyle) {
div.insert("style", "*").text(`
.${className} {
font-family: system-ui, sans-serif;
font-size: 10px;
margin-bottom: 0.5em;${
marginLeft === undefined
? ""
: `
margin-left: ${+marginLeft}px;`
}${
width === undefined
font-size: 10px;${marginTop === undefined
? ""
: `
width: ${width}px;`
}
: `margin-top: ${+marginTop}px;`
}${marginRight === undefined
? ""
: `margin-right: ${+marginRight}px;`
}${marginBottom === undefined
? `margin-bottom: 0.5em;`
: `margin-bottom: ${+marginBottom}px;`
Copy link
Contributor

@Fil Fil Oct 11, 2022

Choose a reason for hiding this comment

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

this mix seems like a problem, not sure how to unify that properly. Should we default to the equivalent number of pixels, on line 93?

Copy link
Author

@dgwyer dgwyer Oct 12, 2022

Choose a reason for hiding this comment

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

I've updated it to default to 8px which should be the equivalent. What do you think?

}${marginLeft === undefined
? ""
: `margin-left: ${+marginLeft}px;`
}${width === undefined
? ""
: `width: ${width}px;`
}
}
${swatchStyle(className)}
${extraStyle}
Expand Down