From 9ce35fe0b0a252bdd02687a7af34ec12a35d6ada Mon Sep 17 00:00:00 2001 From: Mojtaba Samimi Date: Mon, 20 Jun 2022 14:05:51 -0400 Subject: [PATCH 1/2] no need to coerce shape.path twice --- src/components/shapes/defaults.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/shapes/defaults.js b/src/components/shapes/defaults.js index aba09ed32a0..ef9b5398f3d 100644 --- a/src/components/shapes/defaults.js +++ b/src/components/shapes/defaults.js @@ -112,9 +112,7 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) { } } - if(shapeType === 'path') { - coerce('path'); - } else { + if(shapeType !== 'path') { Lib.noneOrAll(shapeIn, shapeOut, ['x0', 'x1', 'y0', 'y1']); } } From 2c711a6a597d2fca6ed1cff65053d44173db1fa4 Mon Sep 17 00:00:00 2001 From: Mojtaba Samimi Date: Mon, 20 Jun 2022 14:17:52 -0400 Subject: [PATCH 2/2] faster shape path checks --- src/components/shapes/defaults.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/shapes/defaults.js b/src/components/shapes/defaults.js index ef9b5398f3d..fb757386a08 100644 --- a/src/components/shapes/defaults.js +++ b/src/components/shapes/defaults.js @@ -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'); @@ -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; @@ -112,7 +113,7 @@ function handleShapeDefaults(shapeIn, shapeOut, fullLayout) { } } - if(shapeType !== 'path') { + if(noPath) { Lib.noneOrAll(shapeIn, shapeOut, ['x0', 'x1', 'y0', 'y1']); } }