Skip to content

Revisit shape defaults #6237

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

Merged
merged 2 commits into from
Jun 20, 2022
Merged

Revisit shape defaults #6237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ce35fe
no need to coerce shape.path twice
archmoj Jun 20, 2022
2c711a6
faster shape path checks
archmoj Jun 20, 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
9 changes: 4 additions & 5 deletions src/components/shapes/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) {
var path = coerce('path');
var dfltType = path ? 'path' : 'rect';
var shapeType = coerce('type', dfltType);
if(shapeOut.type !== 'path') delete shapeOut.path;
var noPath = shapeType !== 'path';
if(noPath) delete shapeOut.path;

coerce('editable');
coerce('layer');
Expand Down Expand Up @@ -68,7 +69,7 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) {
}

// Coerce x0, x1, y0, y1
if(shapeType !== 'path') {
if(noPath) {
var dflt0 = 0.25;
var dflt1 = 0.75;

Expand Down Expand Up @@ -112,9 +113,7 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) {
}
}

if(shapeType === 'path') {
coerce('path');
} else {
if(noPath) {
Lib.noneOrAll(shapeIn, shapeOut, ['x0', 'x1', 'y0', 'y1']);
}
}