@oliasoft-open-source/charts-library 2.11.1 → 2.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oliasoft-open-source/charts-library",
-  "version": "2.11.1",
+  "version": "2.11.3",
   "description": "React Chart Library (based on Chart.js and react-chart-js-2)",
   "homepage": "https://gitlab.com/oliasoft-open-source/charts-library",
   "bugs": {
@@ -39,7 +39,6 @@
     "chartjs-plugin-dragdata": "^2.2.5",
     "chartjs-plugin-zoom": "^1.2.1",
     "classnames": "^2.3.1",
-    "fraction.js": "^4.2.0",
     "lodash": "^4",
     "react-base64-downloader": "^2.1.7",
     "react-chartjs-2": "^4.3.1",
@@ -50,8 +49,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/preset-env": "^7.18.10",
     "@babel/preset-react": "^7.18.6",
-    "@oliasoft-open-source/react-ui-library": "3.3.11-beta-1",
-    "@oliasoft-open-source/units": "^2",
+    "@oliasoft-open-source/react-ui-library": "3.3.12",
+    "@oliasoft-open-source/units": "2.1.0",
     "@storybook/addon-actions": "^6.5.10",
     "@storybook/addon-docs": "^6.5.10",
     "@storybook/addon-links": "^6.5.10",
@@ -97,7 +96,7 @@
   },
   "peerDependencies": {
     "@oliasoft-open-source/react-ui-library": "^3",
-    "@oliasoft-open-source/units": "^2",
+    "@oliasoft-open-source/units": "^2.1",
     "immer": "^9",
     "prop-types": "^15",
     "react": "^17",

package/release-notes.md

@@ -1,12 +1,21 @@
 # Charts Library Release Notes
 
+## 2.11.3
+
+- Submit Axes option on keyboard Enter ([OW-10995](https://oliasoft.atlassian.net/browse/OW-10995))
+
+## 2.11.2
+
+- remove number handling functions that were duplicated from units package
+  ([OW-11062](https://oliasoft.atlassian.net/browse/OW-11062))
+
 ## 2.11.1
 
 - updated icon import
 
 ## 2.11.0
 
-- added dragData feature(plugin-https://github.com/chrispahm/chartjs-plugin-dragData)
+- added `dragData` feature ([chartjs-plugin-dragdata](https://github.com/chrispahm/chartjs-plugin-dragdata))
 
 ## 2.10.2
 
@@ -15,7 +24,7 @@
 ## 2.10.1
 
 - Use `peerDependencies` for common versions of shared packages like `units` and `react-ui-library` so reduce double
-installs and conflicting versions in parent apps ([OW-10974](https://oliasoft.atlassian.net/browse/OW-10974))
+  installs and conflicting versions in parent apps ([OW-10974](https://oliasoft.atlassian.net/browse/OW-10974))
 
 ## 2.10.0
 

package/src/components/controls/axes-options/axes-options.jsx

@@ -45,7 +45,8 @@ const AxesOptionsPopover = ({
     });
   };
 
-  const onDone = () => {
+  const onDone = (e) => {
+    e.preventDefault();
     if (valid) {
       const sanitizedFormState = formState.map((axis) => ({
         ...axis,
@@ -72,7 +73,7 @@ const AxesOptionsPopover = ({
   const isCustomValue = axes.filter((axis) => axis.max || axis.min).length > 0;
   const handleInputFocus = (e) => e.target.select();
   return (
-    <>
+    <form onSubmit={onDone}>
       {axes.map((axis, i) => {
         const axisLabel = controlsAxesLabels.find(
           (el) => el.id === axis.id,
@@ -121,7 +122,7 @@ const AxesOptionsPopover = ({
         );
       })}
       <Flex gap="8px" alignItems="center">
-        <Button small colored label="Done" onClick={onDone} disabled={!valid} />
+        <Button type="submit" small colored label="Done" disabled={!valid} />
         <Button
           small
           name="resetAxes"
@@ -133,7 +134,7 @@ const AxesOptionsPopover = ({
           or double click on canvas
         </Text>
       </Flex>
-    </>
+    </form>
   );
 };
 

package/src/components/line-chart/line-chart-utils.js

@@ -1,142 +1,8 @@
-import Fraction from 'fraction.js';
+import { toNum as toNumber, isValidNum } from '@oliasoft-open-source/units';
 
-const isNull = (str) => str === null;
-const isUndefined = (str) => str === undefined;
-const isArray = (str) => str && str.constructor === Array;
-const isObject = (str) => str && str.constructor === Object;
-const hasDivisor = (str) =>
-  str && typeof str.includes === 'function' && str.includes('/');
-export const isEmptyString = (str) => str === '';
-const isTrailingPeriodSeparator = (str) => str && str[str.length - 1] === '.';
-const isTrailingCommaSeparator = (str) => str && str[str.length - 1] === ',';
 const isOnlyNumbers = (str) => /^-?\d*\.?\d+$/.test(str);
 
-export const charCount = (chr, str) => {
-  let total = 0,
-    last_location = 0,
-    single_char = (chr + '')[0];
-  while ((last_location = str.indexOf(single_char, last_location) + 1)) {
-    total += 1;
-  }
-  return total;
-};
-
-export const cleanNumStr = (str) => {
-  str += '';
-  let slashCount = charCount('/', str);
-  let spaceCount = charCount(' ', str) + charCount(' ', str);
-  let dotcount = charCount('.', str);
-  let commacount = charCount(',', str);
-  if (slashCount === 0 && spaceCount > 0) str = str.replace(/\s/g, '');
-  if (commacount > 1) str = str.replace(/,/g, '');
-  if (dotcount > 1) str = str.replace(/\./g, '');
-  commacount = charCount(',', str);
-  dotcount = charCount('.', str);
-  if (dotcount === 1 && commacount === 1) {
-    // One of each, make the rightmost act as decimal separator
-    if (str.indexOf(',') > str.indexOf('.')) {
-      str = str.replace('.', '');
-      str = str.replace(',', '.');
-    } else {
-      str = str.replace(',', '');
-    }
-    if (str.indexOf('.') === 0) {
-      str = 0 + str;
-    }
-    return str;
-  }
-  if (dotcount === 1 && commacount) str = str.replace(',', '');
-  if (!dotcount && commacount) str = str.replace(',', '.');
-  if (str.indexOf('.') === 0) {
-    str = 0 + str;
-  }
-  return str;
-};
-
-export const numFraction = (str) => {
-  if (str instanceof Array || str === null || str === undefined) {
-    return str;
-  }
-  if (typeof str === 'string') {
-    str = str.trim(); //trailing whitespace causes InvalidParameter error in fraction.js
-  }
-  let result = str;
-  try {
-    result = Fraction(str);
-  } catch (e) {
-    //do nothing
-  }
-  return result.valueOf();
-};
-
-export const isValidNum = (input) => {
-  let result = false;
-  if (isEmptyString(input)) {
-    result = true;
-  } else {
-    if (
-      !(
-        isNull(input) ||
-        isUndefined(input) ||
-        isTrailingPeriodSeparator(input) ||
-        isTrailingCommaSeparator(input) ||
-        isArray(input) ||
-        isObject(input) ||
-        !isOnlyNumbers(input)
-      )
-    ) {
-      let number;
-      const cleaned = cleanNumStr(input);
-      if (hasDivisor(cleaned)) {
-        //numFraction is slow, so only call it if needed
-        number = numFraction(cleaned);
-      } else {
-        number = parseFloat(cleaned);
-      }
-      if (!isNaN(number)) {
-        result = true;
-      }
-    }
-  }
-  return result;
-};
-
-export const toNumber = (input, defaultValue, minimum) => {
-  let result;
-  defaultValue = defaultValue === undefined ? input : defaultValue;
-  if (
-    isNull(input) ||
-    isUndefined(input) ||
-    isEmptyString(input) ||
-    isTrailingPeriodSeparator(input) ||
-    isTrailingCommaSeparator(input) ||
-    isArray(input) ||
-    isObject(input)
-  ) {
-    result = defaultValue;
-  } else {
-    let number;
-    const cleaned = cleanNumStr(input);
-    if (hasDivisor(cleaned)) {
-      //numFraction is slow, so only call it if needed
-      number = numFraction(cleaned);
-    } else {
-      number = parseFloat(cleaned);
-    }
-    if (isNaN(number)) {
-      result = defaultValue;
-    } else if (minimum && number < minimum) {
-      result = minimum;
-    } else {
-      result = number;
-    }
-  }
-  return result;
-};
-
-export const validNumber = (value) => {
-  return isValidNum(value);
-};
+export const validNumber = (input) => isValidNum(input) && isOnlyNumbers(input);
 
 export const toNum = (value) => {
   const asNumber = toNumber(value);