@bbl-digital/snorre 4.1.96 → 4.1.98

package/dist/bundle.js

@@ -26364,87 +26364,22 @@
     label: "BarChartContainer"
   })("height:", props => props.height && props.height, ";width:", props => props.width && props.width, ";" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wYWNrYWdlcy9jb3JlL1NpbXBsZUJhckNoYXJ0L3N0eWxlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFOEUiLCJmaWxlIjoiLi4vLi4vLi4vc3JjL3BhY2thZ2VzL2NvcmUvU2ltcGxlQmFyQ2hhcnQvc3R5bGVzLnRzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHN0eWxlZCBmcm9tICdAZW1vdGlvbi9zdHlsZWQnXG5cbmV4cG9ydCBjb25zdCBCYXJDaGFydENvbnRhaW5lciA9IHN0eWxlZC5kaXY8eyB3aWR0aDogc3RyaW5nOyBoZWlnaHQ6IHN0cmluZyB9PmBcbiAgaGVpZ2h0OiAkeyhwcm9wcykgPT4gcHJvcHMuaGVpZ2h0ICYmIHByb3BzLmhlaWdodH07XG4gIHdpZHRoOiAkeyhwcm9wcykgPT4gcHJvcHMud2lkdGggJiYgcHJvcHMud2lkdGh9O1xuYFxuIl19 */"));
 
-  const firstIndexIsNegative = value => value.charAt(0) === '-';
-  const precisionValueIsZero = (value, maxEnd) => {
-    return firstIndexIsNegative(value) ? value.charAt(2 + maxEnd) === '0' : value.charAt(1 + maxEnd) === '0';
-  };
-  const setLeftSide = (value, sliceLeft) => {
-    return firstIndexIsNegative(value) ? `-${value.slice(sliceLeft.start + 1, sliceLeft.end + 1)}` : value.slice(sliceLeft.start, sliceLeft.end);
-  };
-  const setRightSide = (value, sliceRight, sliceLeftEnd) => {
-    return precisionValueIsZero(value, sliceLeftEnd) ? '' : `.${value.slice(sliceRight.start, sliceRight.end)}`;
-  };
-  const getFormat = (value, sliceLeft, sliceRight, sizeTerm) => {
-    return `${setLeftSide(value, sliceLeft)}${setRightSide(value, sliceRight, sliceLeft.end)}${sizeTerm}`;
-  };
-  const formatAxisPrice = val => {
-    const value = String(val);
-    if (value.match(/^(-\d)|(\d)+$/)) {
-      const santizitedValue = firstIndexIsNegative(value) ? value.replace('-', '') : value;
-      const count = santizitedValue.length;
-      if (count > 3) {
-        switch (count) {
-          case 4:
-            return getFormat(value, {
-              start: 0,
-              end: 1
-            }, {
-              start: 1,
-              end: 2
-            }, 'k');
-          case 5:
-            return getFormat(value, {
-              start: 0,
-              end: 2
-            }, {
-              start: 2,
-              end: 3
-            }, 'k');
-          case 6:
-            return getFormat(value, {
-              start: 0,
-              end: 3
-            }, {
-              start: 3,
-              end: 4
-            }, 'k');
-          case 7:
-            return getFormat(value, {
-              start: 0,
-              end: 1
-            }, {
-              start: 1,
-              end: 2
-            }, 'm');
-          case 8:
-            return getFormat(value, {
-              start: 0,
-              end: 2
-            }, {
-              start: 2,
-              end: 3
-            }, 'm');
-          case 9:
-            return getFormat(value, {
-              start: 0,
-              end: 3
-            }, {
-              start: 3,
-              end: 4
-            }, 'm');
-          default:
-            return getFormat(value, {
-              start: 0,
-              end: 3
-            }, {
-              start: 3,
-              end: 4
-            }, 'm');
-        }
-      }
+  function formatAxisPrice(val) {
+    const num = Number(val);
+    if (isNaN(num)) {
+      return String(val);
     }
-    return value;
-  };
+    const absNum = Math.abs(num);
+    let formatted;
+    if (absNum >= 1e6) {
+      formatted = (num / 1e6).toFixed(1).replace(/\.0$/, '') + 'm';
+    } else if (absNum >= 1e3) {
+      formatted = (num / 1e3).toFixed(1).replace(/\.0$/, '') + 'k';
+    } else {
+      formatted = num.toString();
+    }
+    return formatted;
+  }
 
   function _EMOTION_STRINGIFIED_CSS_ERROR__$S() { return "You have tried to stringify object returned from `css` function. It isn't supposed to be used directly (e.g. as value of the `className` prop), but rather handed to emotion so it can handle it (e.g. as value of `css` prop)."; }
   const TooltipWrapper = /*#__PURE__*/_styled__default["default"]("div", process.env.NODE_ENV === "production" ? {

package/esm/core/BarAndLineComposedChart/BarAndLineComposedChart.stories.js

@@ -6,19 +6,19 @@ export default {
 };
 const DefaultData = [{
   name: 'Jan',
-  inntekt: 40000,
-  kostnad: -23000,
-  akkumulert: 17000
+  inntekt: 450000,
+  kostnad: -233000,
+  akkumulert: 170000
 }, {
   name: 'Feb',
-  inntekt: 60000,
-  kostnad: -25000,
-  akkumulert: 35000
+  inntekt: 600000,
+  kostnad: -250000,
+  akkumulert: 350000
 }, {
   name: 'Mars',
-  inntekt: 50000,
-  kostnad: -34000,
-  akkumulert: 16000
+  inntekt: 500000,
+  kostnad: -340000,
+  akkumulert: 160000
 }, {
   name: 'April',
   inntekt: 55000,
@@ -26,44 +26,44 @@ const DefaultData = [{
   akkumulert: 35000
 }, {
   name: 'Mai',
-  inntekt: 54400,
-  kostnad: -30000,
-  akkumulert: 24400
+  inntekt: 540400,
+  kostnad: -300000,
+  akkumulert: 240400
 }, {
   name: 'Jun',
-  inntekt: 65000,
-  kostnad: -25000,
-  akkumulert: 40000
+  inntekt: 650000,
+  kostnad: -250000,
+  akkumulert: 400000
 }, {
   name: 'Jul',
-  inntekt: 43000,
-  kostnad: -30000,
-  akkumulert: 13000
+  inntekt: 430000,
+  kostnad: -300000,
+  akkumulert: 130000
 }, {
   name: 'Aug',
-  inntekt: 60000,
-  kostnad: -40000,
-  akkumulert: 20000
+  inntekt: 600000,
+  kostnad: -400000,
+  akkumulert: 200000
 }, {
   name: 'Sept',
-  inntekt: 70000,
-  kostnad: -50000,
-  akkumulert: 20000
+  inntekt: 700000,
+  kostnad: -500000,
+  akkumulert: 200000
 }, {
   name: 'Okt',
-  inntekt: 60000,
-  kostnad: -34000,
-  akkumulert: 26000
+  inntekt: 600000,
+  kostnad: -340000,
+  akkumulert: 260000
 }, {
   name: 'Nov',
   inntekt: 763000,
-  kostnad: -24000,
-  akkumulert: 1031000
+  kostnad: 0,
+  akkumulert: 1730000
 }, {
   name: 'Des',
-  inntekt: 56000,
-  kostnad: -5500,
-  akkumulert: 50500
+  inntekt: 560000,
+  kostnad: -55000,
+  akkumulert: 505000
 }];
 const ValuePairData = [{
   name: 'Jan',

package/esm/utils/formatGraphPrice.js

@@ -1,82 +1,17 @@
-const firstIndexIsNegative = value => value.charAt(0) === '-';
-const precisionValueIsZero = (value, maxEnd) => {
-  return firstIndexIsNegative(value) ? value.charAt(2 + maxEnd) === '0' : value.charAt(1 + maxEnd) === '0';
-};
-const setLeftSide = (value, sliceLeft) => {
-  return firstIndexIsNegative(value) ? `-${value.slice(sliceLeft.start + 1, sliceLeft.end + 1)}` : value.slice(sliceLeft.start, sliceLeft.end);
-};
-const setRightSide = (value, sliceRight, sliceLeftEnd) => {
-  return precisionValueIsZero(value, sliceLeftEnd) ? '' : `.${value.slice(sliceRight.start, sliceRight.end)}`;
-};
-const getFormat = (value, sliceLeft, sliceRight, sizeTerm) => {
-  return `${setLeftSide(value, sliceLeft)}${setRightSide(value, sliceRight, sliceLeft.end)}${sizeTerm}`;
-};
-const formatAxisPrice = val => {
-  const value = String(val);
-  if (value.match(/^(-\d)|(\d)+$/)) {
-    const santizitedValue = firstIndexIsNegative(value) ? value.replace('-', '') : value;
-    const count = santizitedValue.length;
-    if (count > 3) {
-      switch (count) {
-        case 4:
-          return getFormat(value, {
-            start: 0,
-            end: 1
-          }, {
-            start: 1,
-            end: 2
-          }, 'k');
-        case 5:
-          return getFormat(value, {
-            start: 0,
-            end: 2
-          }, {
-            start: 2,
-            end: 3
-          }, 'k');
-        case 6:
-          return getFormat(value, {
-            start: 0,
-            end: 3
-          }, {
-            start: 3,
-            end: 4
-          }, 'k');
-        case 7:
-          return getFormat(value, {
-            start: 0,
-            end: 1
-          }, {
-            start: 1,
-            end: 2
-          }, 'm');
-        case 8:
-          return getFormat(value, {
-            start: 0,
-            end: 2
-          }, {
-            start: 2,
-            end: 3
-          }, 'm');
-        case 9:
-          return getFormat(value, {
-            start: 0,
-            end: 3
-          }, {
-            start: 3,
-            end: 4
-          }, 'm');
-        default:
-          return getFormat(value, {
-            start: 0,
-            end: 3
-          }, {
-            start: 3,
-            end: 4
-          }, 'm');
-      }
-    }
+function formatAxisPrice(val) {
+  const num = Number(val);
+  if (isNaN(num)) {
+    return String(val);
   }
-  return value;
-};
+  const absNum = Math.abs(num);
+  let formatted;
+  if (absNum >= 1e6) {
+    formatted = (num / 1e6).toFixed(1).replace(/\.0$/, '') + 'm';
+  } else if (absNum >= 1e3) {
+    formatted = (num / 1e3).toFixed(1).replace(/\.0$/, '') + 'k';
+  } else {
+    formatted = num.toString();
+  }
+  return formatted;
+}
 export { formatAxisPrice };

package/lib/core/BarAndLineComposedChart/BarAndLineComposedChart.stories.js

@@ -6,19 +6,19 @@ export default {
 };
 const DefaultData = [{
   name: 'Jan',
-  inntekt: 40000,
-  kostnad: -23000,
-  akkumulert: 17000
+  inntekt: 450000,
+  kostnad: -233000,
+  akkumulert: 170000
 }, {
   name: 'Feb',
-  inntekt: 60000,
-  kostnad: -25000,
-  akkumulert: 35000
+  inntekt: 600000,
+  kostnad: -250000,
+  akkumulert: 350000
 }, {
   name: 'Mars',
-  inntekt: 50000,
-  kostnad: -34000,
-  akkumulert: 16000
+  inntekt: 500000,
+  kostnad: -340000,
+  akkumulert: 160000
 }, {
   name: 'April',
   inntekt: 55000,
@@ -26,44 +26,44 @@ const DefaultData = [{
   akkumulert: 35000
 }, {
   name: 'Mai',
-  inntekt: 54400,
-  kostnad: -30000,
-  akkumulert: 24400
+  inntekt: 540400,
+  kostnad: -300000,
+  akkumulert: 240400
 }, {
   name: 'Jun',
-  inntekt: 65000,
-  kostnad: -25000,
-  akkumulert: 40000
+  inntekt: 650000,
+  kostnad: -250000,
+  akkumulert: 400000
 }, {
   name: 'Jul',
-  inntekt: 43000,
-  kostnad: -30000,
-  akkumulert: 13000
+  inntekt: 430000,
+  kostnad: -300000,
+  akkumulert: 130000
 }, {
   name: 'Aug',
-  inntekt: 60000,
-  kostnad: -40000,
-  akkumulert: 20000
+  inntekt: 600000,
+  kostnad: -400000,
+  akkumulert: 200000
 }, {
   name: 'Sept',
-  inntekt: 70000,
-  kostnad: -50000,
-  akkumulert: 20000
+  inntekt: 700000,
+  kostnad: -500000,
+  akkumulert: 200000
 }, {
   name: 'Okt',
-  inntekt: 60000,
-  kostnad: -34000,
-  akkumulert: 26000
+  inntekt: 600000,
+  kostnad: -340000,
+  akkumulert: 260000
 }, {
   name: 'Nov',
   inntekt: 763000,
-  kostnad: -24000,
-  akkumulert: 1031000
+  kostnad: 0,
+  akkumulert: 1730000
 }, {
   name: 'Des',
-  inntekt: 56000,
-  kostnad: -5500,
-  akkumulert: 50500
+  inntekt: 560000,
+  kostnad: -55000,
+  akkumulert: 505000
 }];
 const ValuePairData = [{
   name: 'Jan',

package/lib/utils/formatGraphPrice.d.ts

@@ -1,3 +1,3 @@
-declare const formatAxisPrice: (val: any) => string;
+declare function formatAxisPrice(val: any): string;
 export { formatAxisPrice };
 //# sourceMappingURL=formatGraphPrice.d.ts.map

package/lib/utils/formatGraphPrice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formatGraphPrice.d.ts","sourceRoot":"","sources":["../../src/packages/utils/formatGraphPrice.ts"],"names":[],"mappings":"AAmCA,QAAA,MAAM,eAAe,QAAS,GAAG,WA+DhC,CAAA;AAED,OAAO,EAAE,eAAe,EAAE,CAAA"}
+{"version":3,"file":"formatGraphPrice.d.ts","sourceRoot":"","sources":["../../src/packages/utils/formatGraphPrice.ts"],"names":[],"mappings":"AAAA,iBAAS,eAAe,CAAC,GAAG,EAAE,GAAG,UAkBhC;AAED,OAAO,EAAE,eAAe,EAAE,CAAA"}

package/lib/utils/formatGraphPrice.js

@@ -1,82 +1,17 @@
-const firstIndexIsNegative = value => value.charAt(0) === '-';
-const precisionValueIsZero = (value, maxEnd) => {
-  return firstIndexIsNegative(value) ? value.charAt(2 + maxEnd) === '0' : value.charAt(1 + maxEnd) === '0';
-};
-const setLeftSide = (value, sliceLeft) => {
-  return firstIndexIsNegative(value) ? `-${value.slice(sliceLeft.start + 1, sliceLeft.end + 1)}` : value.slice(sliceLeft.start, sliceLeft.end);
-};
-const setRightSide = (value, sliceRight, sliceLeftEnd) => {
-  return precisionValueIsZero(value, sliceLeftEnd) ? '' : `.${value.slice(sliceRight.start, sliceRight.end)}`;
-};
-const getFormat = (value, sliceLeft, sliceRight, sizeTerm) => {
-  return `${setLeftSide(value, sliceLeft)}${setRightSide(value, sliceRight, sliceLeft.end)}${sizeTerm}`;
-};
-const formatAxisPrice = val => {
-  const value = String(val);
-  if (value.match(/^(-\d)|(\d)+$/)) {
-    const santizitedValue = firstIndexIsNegative(value) ? value.replace('-', '') : value;
-    const count = santizitedValue.length;
-    if (count > 3) {
-      switch (count) {
-        case 4:
-          return getFormat(value, {
-            start: 0,
-            end: 1
-          }, {
-            start: 1,
-            end: 2
-          }, 'k');
-        case 5:
-          return getFormat(value, {
-            start: 0,
-            end: 2
-          }, {
-            start: 2,
-            end: 3
-          }, 'k');
-        case 6:
-          return getFormat(value, {
-            start: 0,
-            end: 3
-          }, {
-            start: 3,
-            end: 4
-          }, 'k');
-        case 7:
-          return getFormat(value, {
-            start: 0,
-            end: 1
-          }, {
-            start: 1,
-            end: 2
-          }, 'm');
-        case 8:
-          return getFormat(value, {
-            start: 0,
-            end: 2
-          }, {
-            start: 2,
-            end: 3
-          }, 'm');
-        case 9:
-          return getFormat(value, {
-            start: 0,
-            end: 3
-          }, {
-            start: 3,
-            end: 4
-          }, 'm');
-        default:
-          return getFormat(value, {
-            start: 0,
-            end: 3
-          }, {
-            start: 3,
-            end: 4
-          }, 'm');
-      }
-    }
+function formatAxisPrice(val) {
+  const num = Number(val);
+  if (isNaN(num)) {
+    return String(val);
   }
-  return value;
-};
+  const absNum = Math.abs(num);
+  let formatted;
+  if (absNum >= 1e6) {
+    formatted = (num / 1e6).toFixed(1).replace(/\.0$/, '') + 'm';
+  } else if (absNum >= 1e3) {
+    formatted = (num / 1e3).toFixed(1).replace(/\.0$/, '') + 'k';
+  } else {
+    formatted = num.toString();
+  }
+  return formatted;
+}
 export { formatAxisPrice };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbl-digital/snorre",
-  "version": "4.1.96",
+  "version": "4.1.98",
   "description": "Design library for BBL Digital",
   "license": "MIT",
   "main": "./lib/index.js",