@pie-element/graphing 5.2.6-next.7 → 5.2.6

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.2.6](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing@5.2.5...@pie-element/graphing@5.2.6) (2024-01-30)
+
+
+### Bug Fixes
+
+* **graphing, charting:** use all supported values if given value is not included in the preferred ones PD-3427 ([04f9dde](https://github.com/pie-framework/pie-elements/commit/04f9ddeb89ed01de48a6954c6851ff392408fb95))
+
+
+
+
+
 ## [5.2.5](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing@5.2.4...@pie-element/graphing@5.2.5) (2024-01-24)
 
 

package/configure/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.2.5](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-configure@5.2.4...@pie-element/graphing-configure@5.2.5) (2024-01-30)
+
+
+### Bug Fixes
+
+* **graphing, charting:** use all supported values if given value is not included in the preferred ones PD-3427 ([04f9dde](https://github.com/pie-framework/pie-elements/commit/04f9ddeb89ed01de48a6954c6851ff392408fb95))
+
+
+
+
+
 ## [5.2.4](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-configure@5.2.3...@pie-element/graphing-configure@5.2.4) (2024-01-24)
 
 

package/configure/lib/utils.js

@@ -53,8 +53,11 @@ exports.VALID_LABEL_VALUES = VALID_LABEL_VALUES;
 var getGridValues = function getGridValues(axis, size) {
   var prefferedValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var minValue = 10 * (axis.max - axis.min) / size;
-  var maxValue = minValue * 10;
-  var values = prefferedValues ? PREFERRED_VALID_GRID_VALUES : VALID_GRID_VALUES;
+  var maxValue = minValue * 10; // if preferred values should be used enforce all values to be used if the axis step
+  // is included in all supported values and not included in preferred values
+
+  var useAllValues = prefferedValues && !PREFERRED_VALID_GRID_VALUES.includes(axis.step) && VALID_GRID_VALUES.includes(axis.step);
+  var values = !prefferedValues || useAllValues ? VALID_GRID_VALUES : PREFERRED_VALID_GRID_VALUES;
   return values.filter(function (value) {
     return value >= minValue && value <= maxValue;
   });

package/configure/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/utils.js"],"names":["VALID_GRID_VALUES","PREFERRED_VALID_GRID_VALUES","VALID_LABEL_VALUES","getGridValues","axis","size","prefferedValues","minValue","max","min","maxValue","values","filter","value","getLabelValues","applyConstraints","oldGridValues","oldLabelValues","gridValues","labelValues","step","includes","preferredValues","lowestValue","labelStep","getPlotablePoints","prop","tickValues","tickVal","indexOf","push","Math","round","tV","filterPlotableMarks","domain","range","answers","domainValues","rangeValues","isPointPlotable","x","y","Object","entries","reduce","newAnswers","key","answer","marks","mark","type","points","find","point","from","root","to","edge","building"],"mappings":"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","sourcesContent":["import isEqual from 'lodash/isEqual';\n\nconst VALID_GRID_VALUES = [\n  0.01, 0.02, 0.04, 0.05, 0.0625, 0.1, 0.125, 0.2, 0.25, 0.5, 1, 2, 3, 4, 5, 8, 10, 12, 15, 20, 40, 50, 64, 100, 500,\n  1000,\n];\n\n// same as VALID_GRID_VALUES but next values are excluded: 0.04, 0.0625, 0.125, 3, 4, 8, 12, 15, 40, 64\nconst PREFERRED_VALID_GRID_VALUES = [0.01, 0.02, 0.05, 0.1, 0.2, 0.25, 0.5, 1, 2, 5, 10, 20, 50, 100, 500, 1000];\n\nexport const VALID_LABEL_VALUES = {\n  0.01: [0, 0.01, 0.02, 0.04, 0.05, 0.1],\n  0.02: [0, 0.02, 0.04, 0.1],\n  0.04: [0, 0.04, 0.08, 0.16, 0.2],\n  0.05: [0, 0.05, 0.1, 0.2, 0.25],\n  0.0625: [0, 0.0625, 0.125, 0.25, 0.5],\n  0.1: [0, 0.1, 0.2, 0.4, 0.5, 1],\n  0.125: [0, 0.125, 0.25, 0.5, 1],\n  0.2: [0, 0.2, 0.5, 0.1],\n  0.25: [0, 0.25, 0.5, 1, 2],\n  0.5: [0, 0.5, 1, 2],\n  1: [0, 1, 2, 4, 5, 10],\n  2: [0, 2, 4, 8, 10],\n  3: [0, 3, 6, 12, 15],\n  4: [0, 4, 8, 16, 20],\n  5: [0, 5, 10, 20, 25],\n  8: [0, 8, 16, 32, 40, 64],\n  10: [0, 10, 20, 40, 50, 100],\n  12: [0, 12, 24],\n  15: [0, 15, 30, 60],\n  20: [0, 20, 40, 80, 100],\n  40: [0, 40, 80, 160, 200],\n  50: [0, 50, 100, 200, 250],\n  64: [0, 64, 128],\n  100: [0, 100, 200, 400, 500],\n  500: [0, 500, 1000, 2500],\n  1000: [0, 1000, 2000, 4000, 5000],\n};\n\nexport const getGridValues = (axis, size, prefferedValues = false) => {\n  const minValue = (10 * (axis.max - axis.min)) / size;\n  const maxValue = minValue * 10;\n  const values = prefferedValues ? PREFERRED_VALID_GRID_VALUES : VALID_GRID_VALUES;\n\n  return values.filter((value) => value >= minValue && value <= maxValue);\n};\n\nexport const getLabelValues = (value) => VALID_LABEL_VALUES[value] || [];\n\nexport const applyConstraints = (axis, size, oldGridValues, oldLabelValues) => {\n  const gridValues = getGridValues(axis, size);\n  let labelValues = getLabelValues(axis.step);\n\n  if (!isEqual(oldGridValues, gridValues) && !gridValues.includes(axis.step)) {\n    const preferredValues = getGridValues(axis, size, true);\n    const lowestValue = preferredValues[0] || 1;\n\n    axis.step = lowestValue;\n    labelValues = getLabelValues(lowestValue);\n\n    if (!labelValues.includes(axis.labelStep)) {\n      axis.labelStep = lowestValue;\n    }\n\n    return { gridValues, labelValues };\n  }\n\n  if (!isEqual(oldLabelValues, labelValues) && !labelValues.includes(axis.labelStep)) {\n    axis.labelStep = axis.step;\n  }\n\n  return { gridValues, labelValues };\n};\n\n// also used in pie-lib/graphing/utils as 'getTickValues'\nconst getPlotablePoints = (prop) => {\n  const tickValues = [];\n  let tickVal = 0;\n\n  while (tickVal >= prop.min && tickValues.indexOf(tickVal) < 0) {\n    tickValues.push(tickVal);\n    tickVal = Math.round((tickVal - prop.step) * 10000) / 10000;\n  }\n\n  tickVal = Math.round(prop.step * 10000) / 10000;\n\n  while (tickVal <= prop.max && tickValues.indexOf(tickVal) < 0) {\n    tickValues.push(tickVal);\n    tickVal = Math.round((tickVal + prop.step) * 10000) / 10000;\n  }\n\n  // return only ticks that are inside the min-max interval\n  if (tickValues) {\n    return tickValues.filter((tV) => tV >= prop.min && tV <= prop.max);\n  }\n\n  return [];\n};\n\nexport const filterPlotableMarks = (domain, range, answers) => {\n  const domainValues = getPlotablePoints(domain);\n  const rangeValues = getPlotablePoints(range);\n\n  const isPointPlotable = (x, y) => domainValues.includes(x) && rangeValues.includes(y);\n\n  return Object.entries(answers || {}).reduce((newAnswers, [key, answer]) => {\n    newAnswers[key] = {\n      ...answer,\n      marks: (answer.marks || []).filter((mark) => {\n        if (mark.type === 'point') {\n          return isPointPlotable(mark.x, mark.y);\n        }\n\n        if (mark.type === 'polygon') {\n          return !mark.points.find((point) => !isPointPlotable(point.x, point.y));\n        }\n\n        const from = mark.from || mark.root;\n        const to = mark.to || mark.edge;\n\n        return mark.building\n          ? isPointPlotable(from.x, from.y)\n          : isPointPlotable(from.x, from.y) && isPointPlotable(to.x, to.y);\n      }),\n    };\n\n    return newAnswers;\n  }, {});\n};\n"],"file":"utils.js"}
+{"version":3,"sources":["../src/utils.js"],"names":["VALID_GRID_VALUES","PREFERRED_VALID_GRID_VALUES","VALID_LABEL_VALUES","getGridValues","axis","size","prefferedValues","minValue","max","min","maxValue","useAllValues","includes","step","values","filter","value","getLabelValues","applyConstraints","oldGridValues","oldLabelValues","gridValues","labelValues","preferredValues","lowestValue","labelStep","getPlotablePoints","prop","tickValues","tickVal","indexOf","push","Math","round","tV","filterPlotableMarks","domain","range","answers","domainValues","rangeValues","isPointPlotable","x","y","Object","entries","reduce","newAnswers","key","answer","marks","mark","type","points","find","point","from","root","to","edge","building"],"mappings":"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","sourcesContent":["import isEqual from 'lodash/isEqual';\n\nconst VALID_GRID_VALUES = [\n  0.01, 0.02, 0.04, 0.05, 0.0625, 0.1, 0.125, 0.2, 0.25, 0.5, 1, 2, 3, 4, 5, 8, 10, 12, 15, 20, 40, 50, 64, 100, 500,\n  1000,\n];\n\n// same as VALID_GRID_VALUES but next values are excluded: 0.04, 0.0625, 0.125, 3, 4, 8, 12, 15, 40, 64\nconst PREFERRED_VALID_GRID_VALUES = [0.01, 0.02, 0.05, 0.1, 0.2, 0.25, 0.5, 1, 2, 5, 10, 20, 50, 100, 500, 1000];\n\nexport const VALID_LABEL_VALUES = {\n  0.01: [0, 0.01, 0.02, 0.04, 0.05, 0.1],\n  0.02: [0, 0.02, 0.04, 0.1],\n  0.04: [0, 0.04, 0.08, 0.16, 0.2],\n  0.05: [0, 0.05, 0.1, 0.2, 0.25],\n  0.0625: [0, 0.0625, 0.125, 0.25, 0.5],\n  0.1: [0, 0.1, 0.2, 0.4, 0.5, 1],\n  0.125: [0, 0.125, 0.25, 0.5, 1],\n  0.2: [0, 0.2, 0.5, 0.1],\n  0.25: [0, 0.25, 0.5, 1, 2],\n  0.5: [0, 0.5, 1, 2],\n  1: [0, 1, 2, 4, 5, 10],\n  2: [0, 2, 4, 8, 10],\n  3: [0, 3, 6, 12, 15],\n  4: [0, 4, 8, 16, 20],\n  5: [0, 5, 10, 20, 25],\n  8: [0, 8, 16, 32, 40, 64],\n  10: [0, 10, 20, 40, 50, 100],\n  12: [0, 12, 24],\n  15: [0, 15, 30, 60],\n  20: [0, 20, 40, 80, 100],\n  40: [0, 40, 80, 160, 200],\n  50: [0, 50, 100, 200, 250],\n  64: [0, 64, 128],\n  100: [0, 100, 200, 400, 500],\n  500: [0, 500, 1000, 2500],\n  1000: [0, 1000, 2000, 4000, 5000],\n};\n\nexport const getGridValues = (axis, size, prefferedValues = false) => {\n  const minValue = (10 * (axis.max - axis.min)) / size;\n  const maxValue = minValue * 10;\n\n  // if preferred values should be used enforce all values to be used if the axis step\n  // is included in all supported values and not included in preferred values\n  const useAllValues =\n    prefferedValues && !PREFERRED_VALID_GRID_VALUES.includes(axis.step) && VALID_GRID_VALUES.includes(axis.step);\n  const values = !prefferedValues || useAllValues ? VALID_GRID_VALUES : PREFERRED_VALID_GRID_VALUES;\n\n  return values.filter((value) => value >= minValue && value <= maxValue);\n};\n\nexport const getLabelValues = (value) => VALID_LABEL_VALUES[value] || [];\n\nexport const applyConstraints = (axis, size, oldGridValues, oldLabelValues) => {\n  const gridValues = getGridValues(axis, size);\n  let labelValues = getLabelValues(axis.step);\n\n  if (!isEqual(oldGridValues, gridValues) && !gridValues.includes(axis.step)) {\n    const preferredValues = getGridValues(axis, size, true);\n    const lowestValue = preferredValues[0] || 1;\n\n    axis.step = lowestValue;\n    labelValues = getLabelValues(lowestValue);\n\n    if (!labelValues.includes(axis.labelStep)) {\n      axis.labelStep = lowestValue;\n    }\n\n    return { gridValues, labelValues };\n  }\n\n  if (!isEqual(oldLabelValues, labelValues) && !labelValues.includes(axis.labelStep)) {\n    axis.labelStep = axis.step;\n  }\n\n  return { gridValues, labelValues };\n};\n\n// also used in pie-lib/graphing/utils as 'getTickValues'\nconst getPlotablePoints = (prop) => {\n  const tickValues = [];\n  let tickVal = 0;\n\n  while (tickVal >= prop.min && tickValues.indexOf(tickVal) < 0) {\n    tickValues.push(tickVal);\n    tickVal = Math.round((tickVal - prop.step) * 10000) / 10000;\n  }\n\n  tickVal = Math.round(prop.step * 10000) / 10000;\n\n  while (tickVal <= prop.max && tickValues.indexOf(tickVal) < 0) {\n    tickValues.push(tickVal);\n    tickVal = Math.round((tickVal + prop.step) * 10000) / 10000;\n  }\n\n  // return only ticks that are inside the min-max interval\n  if (tickValues) {\n    return tickValues.filter((tV) => tV >= prop.min && tV <= prop.max);\n  }\n\n  return [];\n};\n\nexport const filterPlotableMarks = (domain, range, answers) => {\n  const domainValues = getPlotablePoints(domain);\n  const rangeValues = getPlotablePoints(range);\n\n  const isPointPlotable = (x, y) => domainValues.includes(x) && rangeValues.includes(y);\n\n  return Object.entries(answers || {}).reduce((newAnswers, [key, answer]) => {\n    newAnswers[key] = {\n      ...answer,\n      marks: (answer.marks || []).filter((mark) => {\n        if (mark.type === 'point') {\n          return isPointPlotable(mark.x, mark.y);\n        }\n\n        if (mark.type === 'polygon') {\n          return !mark.points.find((point) => !isPointPlotable(point.x, point.y));\n        }\n\n        const from = mark.from || mark.root;\n        const to = mark.to || mark.edge;\n\n        return mark.building\n          ? isPointPlotable(from.x, from.y)\n          : isPointPlotable(from.x, from.y) && isPointPlotable(to.x, to.y);\n      }),\n    };\n\n    return newAnswers;\n  }, {});\n};\n"],"file":"utils.js"}

package/configure/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/graphing-configure",
   "private": true,
-  "version": "5.2.4",
+  "version": "5.2.5",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "5.2.6-next.7+ef6ab1c42",
+  "version": "5.2.6",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -21,7 +21,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "ef6ab1c42d2d9ca9ccaccd30c179dea25981f58c",
+  "gitHead": "fc2fc7176c224c03231643442859993fabfae7f9",
   "main": "lib/index.js",
   "module": "src/index.js"
 }