diff --git a/.gitignore b/.gitignore index f9b0a22fd3c..78f9633ebed 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ packages/components/Emblem packages/components/Example packages/components/Footer packages/components/Icon -packages/components/Linedrawing +packages/components/LineDrawing packages/components/Logo packages/components/Navbar packages/components/Ogol @@ -31,6 +31,8 @@ packages/utils/defaultGist packages/utils/defaultSa packages/utils/formatImperial packages/utils/formatMm +packages/utils/measurementAsMm +packages/utils/measurementDiffers packages/utils/neckstimate packages/utils/optionDefault packages/utils/optionType @@ -41,7 +43,6 @@ packages/utils/sliderStep packages/utils/smallestImperialStep packages/utils/storage packages/utils/tiler -packages/utils/measurementAsMm packages/utils/validateEmail packages/utils/validateTld diff --git a/config/exceptions.yaml b/config/exceptions.yaml index 75c333b99f5..7824c0d33a6 100644 --- a/config/exceptions.yaml +++ b/config/exceptions.yaml @@ -70,6 +70,8 @@ packageJson: - "defaultSa/*" - "formatImperial/*" - "formatMm/*" + - "measurementAsMm/*" + - "measurementDiffers/*" - "neckstimate/*" - "optionDefault/*" - "optionType/*" @@ -80,7 +82,6 @@ packageJson: - "smallestImperialStep/*" - "storage/*" - "tiler/*" - - "measurementAsMm/*" - "validateEmail/*" - "validateTld/*" diff --git a/packages/components/package.json b/packages/components/package.json index f2b268b7d85..d599a130363 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@freesewing/components", - "version": "2.0.0", + "version": "2.0.0-1", "description": "A collection of React components for FreeSewing web UIs", "author": "Joost De Cock (https://github.com/joostdecock)", "homepage": "https://freesewing.org/", diff --git a/packages/utils/src/index.js b/packages/utils/src/index.js index 1da6fbb8dd2..e7217cbc5d3 100644 --- a/packages/utils/src/index.js +++ b/packages/utils/src/index.js @@ -7,6 +7,8 @@ export default [ 'defaultSa', 'formatImperial', 'formatMm', + 'measurementAsMm', + 'measurementDiffers', 'neckstimate', 'optionDefault', 'optionType', @@ -17,7 +19,6 @@ export default [ 'smallestImperialStep', 'storage', 'tiler', - 'measurementAsMm', 'validateEmail', 'validateTld' ] diff --git a/packages/utils/src/measurementDiffers/index.js b/packages/utils/src/measurementDiffers/index.js new file mode 100644 index 00000000000..92b6bf75695 --- /dev/null +++ b/packages/utils/src/measurementDiffers/index.js @@ -0,0 +1,11 @@ +import neckstimate from '../neckstimate' + +// This returns how many sizes a measurement differs from the neckstimate value +const measurementDiffers = ( + neckCircumference, + measurementName, + measurementValue, + breasts = false +) => Math.abs(Math.round((measurementValue - neckstimate(neckCircumference, measurementName)) / 20)) + +export default measurementDiffers