@vizzly/dashboard 0.15.0-dev-ac044c49c73d54ff3c144918a639d24aea98b549 → 0.15.0-dev-01ea5aa946daad108dcca8cdb39a89202fb70c38

package/dist/dashboard.esm.js

@@ -34862,16 +34862,6 @@ var calculateMinMax = function calculateMinMax(values) {
     maxValue: maxValue
   };
 };
-var normalizeKey = function normalizeKey(value) {
-  if (typeof value === 'number' || !isNaN(Number(value)) && !isNaN(parseFloat(value))) {
-    var numValue = Number(value);
-    if (numValue >= 0 && numValue <= 1) {
-      return numValue.toString();
-    }
-    return numValue.toString().split('.')[0];
-  }
-  return String(value);
-};
 
 // @TODO: Adjust the totalItems logic to be flexible based on the available width
 var showDataLabel = function showDataLabel(totalItems) {
@@ -34891,7 +34881,7 @@ var getLabelDictionary = function getLabelDictionary(formattedData, keys) {
     var convertedArray = keys.map(function (key) {
       var _d$key, _ref;
       if (!((_d$key = d[key]) != null && _d$key.formattedValue)) return;
-      var valueKey = normalizeKey(d[key].value);
+      var valueKey = String(d[key].value);
       var label = d[key].formattedValue;
       return _ref = {}, _ref[valueKey] = label, _ref;
     }).flat();
@@ -34915,11 +34905,10 @@ var getLabelDictionary = function getLabelDictionary(formattedData, keys) {
   return dictionary;
 };
 var getFormattedValue = function getFormattedValue(value, dictionary) {
-  var _dictionary$normalize;
+  var _dictionary$actualVal;
   var actualValue = (value == null ? void 0 : value.value) !== undefined ? value.value : value;
   if (!dictionary) return actualValue;
-  var normalizedKey = normalizeKey(actualValue);
-  return (_dictionary$normalize = dictionary[normalizedKey]) != null ? _dictionary$normalize : actualValue;
+  return (_dictionary$actualVal = dictionary[actualValue]) != null ? _dictionary$actualVal : actualValue;
 };
 var getAllChartValues = function getAllChartValues(data, keys) {
   var allValues = [];
@@ -45878,6 +45867,7 @@ function BarGroup(_ref) {
   var data = _ref.data,
     keys = _ref.keys,
     height = _ref.height,
+    width = _ref.width,
     xKey = _ref.xKey,
     xScaleDataType = _ref.xScaleDataType,
     xScale = _ref.xScale,
@@ -45943,7 +45933,8 @@ function BarGroup(_ref) {
               showLabels: showLabels,
               labelDictionary: labelDictionary,
               yScale: yScale,
-              containerHeight: height
+              containerHeight: height,
+              chartWidth: width
             }, "bar-" + bar.index + "-" + bar.x);
           })
         }, "bar-group-" + barGroup.index + "-" + barGroup.x0);
@@ -45951,6 +45942,22 @@ function BarGroup(_ref) {
     }
   });
 }
+function calculateBarLabelPosition(bar, barGroup, chartWidth, displayValue) {
+  if (!displayValue) return false;
+  var ESTIMATED_FONT_WIDTH = 5.75;
+  var minWidthPercent = 0.02;
+  var maxWidthPercent = 0.15;
+  var minWidthPx = chartWidth * minWidthPercent;
+  var maxWidthPx = chartWidth * maxWidthPercent;
+  var minSize = 0.5;
+  var maxSize = 1.2;
+  var normalizedBarWidth = Math.min(Math.max(bar.width, minWidthPx), maxWidthPx);
+  var logInput = 1 + (normalizedBarWidth - minWidthPx) / (maxWidthPx - minWidthPx) * (Math.E - 1);
+  var logRatio = Math.log(logInput);
+  var size = minSize + logRatio * (maxSize - minSize);
+  var basePosition = barGroup.bars.length > 1 ? bar.x + bar.width * size / 2 : bar.width * size / 2;
+  return basePosition - displayValue.length * ESTIMATED_FONT_WIDTH / 2;
+}
 var Bar = function Bar(_ref2) {
   var bar = _ref2.bar,
     barGroup = _ref2.barGroup,
@@ -45966,18 +45973,20 @@ var Bar = function Bar(_ref2) {
     showLabels = _ref2.showLabels,
     labelDictionary = _ref2.labelDictionary,
     yScale = _ref2.yScale,
-    containerHeight = _ref2.containerHeight;
+    containerHeight = _ref2.containerHeight,
+    chartWidth = _ref2.chartWidth;
   var X_PADDING = 10;
   var Y_PADDING = 8;
   var minWidth = 20;
   var minContainerHeight = 50;
   var showBar = bar.value !== null && bar.height > 0 && bar.width > 0;
-  var labelX = bar.x - X_PADDING;
   var barTopY = yScale(bar.value);
+  var labelX = bar.x - X_PADDING;
   var labelY = barTopY - Y_PADDING;
   var showMinMax = showDataLabel(totalItems);
   var hasSpaceForLabel = showLabels && bar.width > minWidth && containerHeight > minContainerHeight;
   var displayValue = getFormattedValue(bar.value, labelDictionary);
+  var barPosition = chartWidth ? calculateBarLabelPosition(bar, barGroup, chartWidth, displayValue) : labelX;
   return jsxs(Fragment, {
     children: [showBar && jsx(BarRect, {
       barRectKey: "bar-group-bar-" + barGroup.index + "-" + bar.index + "-" + bar.value + "-" + String(bar.key),
@@ -45990,8 +45999,8 @@ var Bar = function Bar(_ref2) {
         return _onClick(e, barGroup, bar);
       },
       enableHover: enableHover
-    }), hasSpaceForLabel && showMinMax && jsx(DataLabel, {
-      x: labelX,
+    }), hasSpaceForLabel && showMinMax && barPosition !== false && jsx(DataLabel, {
+      x: barPosition,
       y: labelY,
       title: displayValue,
       dx: 1,
@@ -46024,7 +46033,7 @@ var BarRect = function BarRect(_ref3) {
   } : {
     name: "1ltmijl-classes",
     styles: "cursor:pointer;label:classes;",
-    map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["BarGroup.tsx"],"names":[],"mappings":"AAuNgC","file":"BarGroup.tsx","sourcesContent":["import { css } from '@emotion/css';\nimport { Group } from '@visx/group';\nimport { BarGroup as VisxBarGroup } from '@visx/shape';\nimport { DatumObject } from '@visx/shape/lib/types';\nimport { ScaleBand, ScaleLinear } from '@visx/vendor/d3-scale';\nimport { Fragment, useMemo, useState } from 'react';\nimport { BarStyles } from 'shared-logic/src/BarChartV2/types';\nimport { ChartDataDefinition, ConditionalFormattingRule, ShapeDefinition } from 'shared-logic/src/ChartsV2/types';\nimport { getAllChartValues, getFormattedValue, showDataLabel } from 'shared-logic/src/DataLabel/index';\nimport { DataType } from 'shared-logic/src/Field/types';\nimport { lightenColor } from '../../../styles/color.functions';\nimport { DataLabel } from '../../components/DataLabel';\nimport { BAR_RADIUS } from '../../constants/BORDER_RADIUS';\nimport { getBarFill } from '../getBarFill';\n\nexport type BarGroupProps = {\n  data: ChartDataDefinition[];\n  keys: string[];\n  height: number;\n  xKey: string;\n  xScaleDataType: DataType;\n  xScale: ScaleBand<string> | ScaleBand<Date> | ScaleBand<number> | null;\n  innerXScale: ScaleBand<string> | undefined;\n  yScale: ScaleLinear<number, number, never>;\n  onClick: (e: React.MouseEvent<SVGRectElement, MouseEvent>, barGroup: any, bar: any) => void;\n  conditionalFormattingRules: ConditionalFormattingRule[];\n  bars: ShapeDefinition<BarStyles>[];\n  enableHover?: boolean;\n  yAxisLabels?: string[];\n  yLabelPosition?: number;\n  showDetailedSubGroupingLabels: boolean;\n  labelStyle?: React.CSSProperties;\n  showLabels?: boolean;\n  labelDictionary: { [key: string]: string };\n};\n\nexport function BarGroup({\n  data,\n  keys,\n  height,\n  xKey,\n  xScaleDataType,\n  xScale,\n  innerXScale,\n  yScale,\n  onClick,\n  conditionalFormattingRules,\n  bars,\n  enableHover,\n  yAxisLabels,\n  yLabelPosition,\n  showDetailedSubGroupingLabels,\n  labelStyle,\n  showLabels,\n  labelDictionary,\n}: BarGroupProps) {\n  const getGroupPosition = (d: DatumObject) => {\n    const xValue = d[xKey as keyof typeof d];\n\n    if (xScaleDataType === 'string') return String(xValue);\n\n    if (xScaleDataType === 'date_time') {\n      return new Date(String(xValue));\n    }\n\n    if (xScaleDataType === 'number') {\n      return Number(xValue);\n    }\n\n    return String(xValue);\n  };\n\n  const totalItems = useMemo(() => {\n    const allBarValues = getAllChartValues(data, keys);\n    return allBarValues.length;\n  }, [data, keys]);\n\n  return (\n    <VisxBarGroup<DatumObject>\n      data={data as DatumObject[]}\n      keys={keys}\n      height={height}\n      x0={getGroupPosition}\n      // @ts-ignore\n      x0Scale={xScale}\n      // @ts-ignore\n      x1Scale={innerXScale}\n      yScale={yScale}\n      color={() => ''}\n    >\n      {(barGroups) => {\n        return barGroups.map((barGroup) => (\n          <Group key={`bar-group-${barGroup.index}-${barGroup.x0}`} left={barGroup.x0}>\n            {barGroup.bars.map((bar) => (\n              <Bar\n                key={`bar-${bar.index}-${bar.x}`}\n                bar={bar}\n                barGroup={barGroup}\n                bars={bars}\n                conditionalFormattingRules={conditionalFormattingRules}\n                enableHover={enableHover}\n                labelStyle={labelStyle}\n                onClick={onClick}\n                showDetailedSubGroupingLabels={showDetailedSubGroupingLabels}\n                yAxisLabels={yAxisLabels}\n                yLabelPosition={yLabelPosition}\n                totalItems={totalItems}\n                showLabels={showLabels}\n                labelDictionary={labelDictionary}\n                yScale={yScale}\n                containerHeight={height}\n              />\n            ))}\n          </Group>\n        ));\n      }}\n    </VisxBarGroup>\n  );\n}\n\ntype BarProps = {\n  bar: any;\n  barGroup: any;\n  bars: ShapeDefinition<BarStyles>[];\n  conditionalFormattingRules: ConditionalFormattingRule[];\n  enableHover?: boolean;\n  onClick: (e: React.MouseEvent<SVGRectElement, MouseEvent>, barGroup: any, bar: any) => void;\n  showDetailedSubGroupingLabels: boolean;\n  labelStyle?: React.CSSProperties;\n  yAxisLabels?: string[];\n  yLabelPosition?: number;\n  totalItems: number;\n  showLabels?: boolean;\n  labelDictionary?: { [key: string]: string };\n  yScale: ScaleLinear<number, number, never>;\n  containerHeight: number;\n};\n\nconst Bar = ({\n  bar,\n  barGroup,\n  bars,\n  conditionalFormattingRules,\n  enableHover,\n  labelStyle,\n  onClick,\n  showDetailedSubGroupingLabels,\n  yAxisLabels,\n  yLabelPosition,\n  totalItems,\n  showLabels,\n  labelDictionary,\n  yScale,\n  containerHeight,\n}: BarProps) => {\n  const X_PADDING = 10;\n  const Y_PADDING = 8;\n\n  const minWidth = 20;\n  const minContainerHeight = 50;\n\n  const showBar = bar.value !== null && bar.height > 0 && bar.width > 0;\n\n  const labelX = bar.x - X_PADDING;\n  const barTopY = yScale(bar.value);\n  const labelY = barTopY - Y_PADDING;\n\n  const showMinMax = showDataLabel(totalItems);\n  const hasSpaceForLabel = showLabels && bar.width > minWidth && containerHeight > minContainerHeight;\n\n  const displayValue = getFormattedValue(bar.value, labelDictionary);\n\n  return (\n    <Fragment>\n      {showBar && (\n        <BarRect\n          barRectKey={`bar-group-bar-${barGroup.index}-${bar.index}-${bar.value}-${String(bar.key)}`}\n          x={bar.x}\n          y={bar.y}\n          width={bar.width}\n          height={bar.height}\n          fill={getBarFill(bars, conditionalFormattingRules, String(bar.key), bar.value)}\n          onClick={(e) => onClick(e, barGroup, bar)}\n          enableHover={enableHover}\n        />\n      )}\n\n      {hasSpaceForLabel && showMinMax && <DataLabel x={labelX} y={labelY} title={displayValue} dx={1} dy={0} />}\n\n      <BarLabel\n        bar={bar}\n        barGroup={barGroup}\n        yLabelPosition={yLabelPosition}\n        yAxisLabels={yAxisLabels}\n        showDetailedSubGroupingLabels={showDetailedSubGroupingLabels}\n        labelStyle={labelStyle}\n      />\n    </Fragment>\n  );\n};\n\ntype BarRectProps = {\n  onClick: (e: React.MouseEvent<SVGRectElement, MouseEvent>) => void;\n  fill?: string;\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  barRectKey: string;\n  enableHover?: boolean;\n};\n\nconst BarRect = ({ onClick, fill, x, y, width, height, barRectKey, enableHover }: BarRectProps) => {\n  const [isHovered, setIsHovered] = useState(false);\n\n  const classes = enableHover ? css({ cursor: 'pointer' }) : '';\n\n  const displayColor = isHovered && enableHover ? lightenColor(fill, 0.8) : fill;\n\n  const handleOnMouseEnter = () => {\n    if (enableHover) {\n      setIsHovered(true);\n    }\n  };\n\n  const handleOnMouseLeave = () => {\n    if (enableHover) {\n      setIsHovered(false);\n    }\n  };\n\n  return (\n    <rect\n      key={barRectKey}\n      x={x}\n      y={y}\n      width={width}\n      height={height}\n      fill={displayColor}\n      rx={BAR_RADIUS}\n      onClick={onClick}\n      onMouseEnter={handleOnMouseEnter}\n      onMouseLeave={handleOnMouseLeave}\n      className={classes}\n    />\n  );\n};\n\ntype BarLabelProps = {\n  bar: any;\n  barGroup: any;\n  yLabelPosition?: number;\n  yAxisLabels?: string[];\n  showDetailedSubGroupingLabels: boolean;\n  labelStyle?: React.CSSProperties;\n};\n\nconst BarLabel = ({\n  bar,\n  barGroup,\n  yLabelPosition,\n  yAxisLabels,\n  showDetailedSubGroupingLabels,\n  labelStyle,\n}: BarLabelProps) => {\n  if (!showDetailedSubGroupingLabels || !yLabelPosition || !yAxisLabels) return null;\n\n  const label = yAxisLabels[bar.index];\n  const columnLabel = label.split('•')[0];\n\n  let formattedColumnLabel: string;\n  if (columnLabel.length >= 13) {\n    formattedColumnLabel = columnLabel.slice(0, 10) + '...';\n  } else {\n    formattedColumnLabel = columnLabel.slice(0, 13);\n  }\n\n  const labelXGap = 4;\n  const labelXPosition = bar.x + bar.width / 2 + labelXGap;\n\n  const labelYGap = 15;\n  const labelYPosition = yLabelPosition + labelYGap;\n\n  const labelKey = `label-${barGroup.index}-${bar.index}-${label}`;\n\n  return (\n    <text\n      key={labelKey}\n      x={labelXPosition}\n      y={labelYPosition}\n      style={labelStyle}\n      transform={`rotate(-70, ${labelXPosition}, ${labelYPosition})`}\n      textAnchor=\"end\"\n    >\n      {formattedColumnLabel}\n    </text>\n  );\n};\n"]} */",
+    map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["BarGroup.tsx"],"names":[],"mappings":"AA2PgC","file":"BarGroup.tsx","sourcesContent":["import { css } from '@emotion/css';\nimport { Group } from '@visx/group';\nimport { BarGroup as VisxBarGroup } from '@visx/shape';\nimport { DatumObject } from '@visx/shape/lib/types';\nimport { ScaleBand, ScaleLinear } from '@visx/vendor/d3-scale';\nimport { Fragment, useMemo, useState } from 'react';\nimport { BarStyles } from 'shared-logic/src/BarChartV2/types';\nimport { ChartDataDefinition, ConditionalFormattingRule, ShapeDefinition } from 'shared-logic/src/ChartsV2/types';\nimport { getAllChartValues, getFormattedValue, showDataLabel } from 'shared-logic/src/DataLabel/index';\nimport { DataType } from 'shared-logic/src/Field/types';\nimport { lightenColor } from '../../../styles/color.functions';\nimport { DataLabel } from '../../components/DataLabel';\nimport { BAR_RADIUS } from '../../constants/BORDER_RADIUS';\nimport { getBarFill } from '../getBarFill';\n\nexport type BarGroupProps = {\n  data: ChartDataDefinition[];\n  keys: string[];\n  height: number;\n  width?: number;\n  xKey: string;\n  xScaleDataType: DataType;\n  xScale: ScaleBand<string> | ScaleBand<Date> | ScaleBand<number> | null;\n  innerXScale: ScaleBand<string> | undefined;\n  yScale: ScaleLinear<number, number, never>;\n  onClick: (e: React.MouseEvent<SVGRectElement, MouseEvent>, barGroup: any, bar: any) => void;\n  conditionalFormattingRules: ConditionalFormattingRule[];\n  bars: ShapeDefinition<BarStyles>[];\n  enableHover?: boolean;\n  yAxisLabels?: string[];\n  yLabelPosition?: number;\n  showDetailedSubGroupingLabels: boolean;\n  labelStyle?: React.CSSProperties;\n  showLabels?: boolean;\n  labelDictionary: { [key: string]: string };\n};\n\nexport function BarGroup({\n  data,\n  keys,\n  height,\n  width,\n  xKey,\n  xScaleDataType,\n  xScale,\n  innerXScale,\n  yScale,\n  onClick,\n  conditionalFormattingRules,\n  bars,\n  enableHover,\n  yAxisLabels,\n  yLabelPosition,\n  showDetailedSubGroupingLabels,\n  labelStyle,\n  showLabels,\n  labelDictionary,\n}: BarGroupProps) {\n  const getGroupPosition = (d: DatumObject) => {\n    const xValue = d[xKey as keyof typeof d];\n\n    if (xScaleDataType === 'string') return String(xValue);\n\n    if (xScaleDataType === 'date_time') {\n      return new Date(String(xValue));\n    }\n\n    if (xScaleDataType === 'number') {\n      return Number(xValue);\n    }\n\n    return String(xValue);\n  };\n\n  const totalItems = useMemo(() => {\n    const allBarValues = getAllChartValues(data, keys);\n    return allBarValues.length;\n  }, [data, keys]);\n\n  return (\n    <VisxBarGroup<DatumObject>\n      data={data as DatumObject[]}\n      keys={keys}\n      height={height}\n      x0={getGroupPosition}\n      // @ts-ignore\n      x0Scale={xScale}\n      // @ts-ignore\n      x1Scale={innerXScale}\n      yScale={yScale}\n      color={() => ''}\n    >\n      {(barGroups) => {\n        return barGroups.map((barGroup) => (\n          <Group key={`bar-group-${barGroup.index}-${barGroup.x0}`} left={barGroup.x0}>\n            {barGroup.bars.map((bar) => (\n              <Bar\n                key={`bar-${bar.index}-${bar.x}`}\n                bar={bar}\n                barGroup={barGroup}\n                bars={bars}\n                conditionalFormattingRules={conditionalFormattingRules}\n                enableHover={enableHover}\n                labelStyle={labelStyle}\n                onClick={onClick}\n                showDetailedSubGroupingLabels={showDetailedSubGroupingLabels}\n                yAxisLabels={yAxisLabels}\n                yLabelPosition={yLabelPosition}\n                totalItems={totalItems}\n                showLabels={showLabels}\n                labelDictionary={labelDictionary}\n                yScale={yScale}\n                containerHeight={height}\n                chartWidth={width}\n              />\n            ))}\n          </Group>\n        ));\n      }}\n    </VisxBarGroup>\n  );\n}\n\nfunction calculateBarLabelPosition(\n  bar: any,\n  barGroup: any,\n  chartWidth: number,\n  displayValue: string | null,\n): number | false {\n  if (!displayValue) return false;\n\n  const ESTIMATED_FONT_WIDTH = 5.75;\n\n  const minWidthPercent = 0.02;\n  const maxWidthPercent = 0.15;\n  const minWidthPx = chartWidth * minWidthPercent;\n  const maxWidthPx = chartWidth * maxWidthPercent;\n\n  const minSize = 0.5;\n  const maxSize = 1.2;\n\n  const normalizedBarWidth = Math.min(Math.max(bar.width, minWidthPx), maxWidthPx);\n  const logInput = 1 + ((normalizedBarWidth - minWidthPx) / (maxWidthPx - minWidthPx)) * (Math.E - 1);\n  const logRatio = Math.log(logInput);\n  const size = minSize + logRatio * (maxSize - minSize);\n\n  const basePosition = barGroup.bars.length > 1 ? bar.x + (bar.width * size) / 2 : (bar.width * size) / 2;\n\n  return basePosition - (displayValue.length * ESTIMATED_FONT_WIDTH) / 2;\n}\n\ntype BarProps = {\n  bar: any;\n  barGroup: any;\n  bars: ShapeDefinition<BarStyles>[];\n  conditionalFormattingRules: ConditionalFormattingRule[];\n  enableHover?: boolean;\n  onClick: (e: React.MouseEvent<SVGRectElement, MouseEvent>, barGroup: any, bar: any) => void;\n  showDetailedSubGroupingLabels: boolean;\n  labelStyle?: React.CSSProperties;\n  yAxisLabels?: string[];\n  yLabelPosition?: number;\n  totalItems: number;\n  showLabels?: boolean;\n  labelDictionary?: { [key: string]: string };\n  yScale: ScaleLinear<number, number, never>;\n  containerHeight: number;\n  chartWidth?: number;\n};\n\nconst Bar = ({\n  bar,\n  barGroup,\n  bars,\n  conditionalFormattingRules,\n  enableHover,\n  labelStyle,\n  onClick,\n  showDetailedSubGroupingLabels,\n  yAxisLabels,\n  yLabelPosition,\n  totalItems,\n  showLabels,\n  labelDictionary,\n  yScale,\n  containerHeight,\n  chartWidth,\n}: BarProps) => {\n  const X_PADDING = 10;\n  const Y_PADDING = 8;\n\n  const minWidth = 20;\n  const minContainerHeight = 50;\n\n  const showBar = bar.value !== null && bar.height > 0 && bar.width > 0;\n\n  const barTopY = yScale(bar.value);\n  const labelX = bar.x - X_PADDING;\n  const labelY = barTopY - Y_PADDING;\n\n  const showMinMax = showDataLabel(totalItems);\n  const hasSpaceForLabel = showLabels && bar.width > minWidth && containerHeight > minContainerHeight;\n\n  const displayValue = getFormattedValue(bar.value, labelDictionary);\n  const barPosition = chartWidth ? calculateBarLabelPosition(bar, barGroup, chartWidth, displayValue) : labelX;\n\n  return (\n    <Fragment>\n      {showBar && (\n        <BarRect\n          barRectKey={`bar-group-bar-${barGroup.index}-${bar.index}-${bar.value}-${String(bar.key)}`}\n          x={bar.x}\n          y={bar.y}\n          width={bar.width}\n          height={bar.height}\n          fill={getBarFill(bars, conditionalFormattingRules, String(bar.key), bar.value)}\n          onClick={(e) => onClick(e, barGroup, bar)}\n          enableHover={enableHover}\n        />\n      )}\n\n      {hasSpaceForLabel && showMinMax && barPosition !== false && (\n        <DataLabel x={barPosition} y={labelY} title={displayValue} dx={1} dy={0} />\n      )}\n\n      <BarLabel\n        bar={bar}\n        barGroup={barGroup}\n        yLabelPosition={yLabelPosition}\n        yAxisLabels={yAxisLabels}\n        showDetailedSubGroupingLabels={showDetailedSubGroupingLabels}\n        labelStyle={labelStyle}\n      />\n    </Fragment>\n  );\n};\n\ntype BarRectProps = {\n  onClick: (e: React.MouseEvent<SVGRectElement, MouseEvent>) => void;\n  fill?: string;\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  barRectKey: string;\n  enableHover?: boolean;\n};\n\nconst BarRect = ({ onClick, fill, x, y, width, height, barRectKey, enableHover }: BarRectProps) => {\n  const [isHovered, setIsHovered] = useState(false);\n\n  const classes = enableHover ? css({ cursor: 'pointer' }) : '';\n\n  const displayColor = isHovered && enableHover ? lightenColor(fill, 0.8) : fill;\n\n  const handleOnMouseEnter = () => {\n    if (enableHover) {\n      setIsHovered(true);\n    }\n  };\n\n  const handleOnMouseLeave = () => {\n    if (enableHover) {\n      setIsHovered(false);\n    }\n  };\n\n  return (\n    <rect\n      key={barRectKey}\n      x={x}\n      y={y}\n      width={width}\n      height={height}\n      fill={displayColor}\n      rx={BAR_RADIUS}\n      onClick={onClick}\n      onMouseEnter={handleOnMouseEnter}\n      onMouseLeave={handleOnMouseLeave}\n      className={classes}\n    />\n  );\n};\n\ntype BarLabelProps = {\n  bar: any;\n  barGroup: any;\n  yLabelPosition?: number;\n  yAxisLabels?: string[];\n  showDetailedSubGroupingLabels: boolean;\n  labelStyle?: React.CSSProperties;\n};\n\nconst BarLabel = ({\n  bar,\n  barGroup,\n  yLabelPosition,\n  yAxisLabels,\n  showDetailedSubGroupingLabels,\n  labelStyle,\n}: BarLabelProps) => {\n  if (!showDetailedSubGroupingLabels || !yLabelPosition || !yAxisLabels) return null;\n\n  const label = yAxisLabels[bar.index];\n  const columnLabel = label.split('•')[0];\n\n  let formattedColumnLabel: string;\n  if (columnLabel.length >= 13) {\n    formattedColumnLabel = columnLabel.slice(0, 10) + '...';\n  } else {\n    formattedColumnLabel = columnLabel.slice(0, 13);\n  }\n\n  const labelXGap = 4;\n  const labelXPosition = bar.x + bar.width / 2 + labelXGap;\n\n  const labelYGap = 15;\n  const labelYPosition = yLabelPosition + labelYGap;\n\n  const labelKey = `label-${barGroup.index}-${bar.index}-${label}`;\n\n  return (\n    <text\n      key={labelKey}\n      x={labelXPosition}\n      y={labelYPosition}\n      style={labelStyle}\n      transform={`rotate(-70, ${labelXPosition}, ${labelYPosition})`}\n      textAnchor=\"end\"\n    >\n      {formattedColumnLabel}\n    </text>\n  );\n};\n"]} */",
     toString: _EMOTION_STRINGIFIED_CSS_ERROR__$9
   }) : '';
   var displayColor = isHovered && enableHover ? lightenColor$2(fill, 0.8) : fill;
@@ -46459,6 +46468,7 @@ var BarChart$5 = function BarChart(_ref) {
             data: dataFlattened,
             keys: yScaleKeys,
             height: innerHeight,
+            width: width,
             xKey: xKey,
             xScaleDataType: xScaleDataType,
             xScale: xScale,
@@ -50067,6 +50077,24 @@ var buildLineChartRepresentation = function buildLineChartRepresentation(_ref) {
   return chart;
 };
 
+var sortDateTimeByDefault = function sortDateTimeByDefault(attributes, dataSet, queryEngineConfig) {
+  if (attributes.order.length > 0) {
+    return attributes.order;
+  }
+  var automaticOrders = [];
+  attributes.dimension.forEach(function (dimension) {
+    var dimensionField = findField(dataSet, dimension.field);
+    if (dimensionField.dataType === 'date_time' && queryEngineConfig.supportedTimeTruncFunctions[dimension["function"]]) {
+      automaticOrders.push({
+        field: dimension.field,
+        direction: 'asc',
+        "function": dimension["function"]
+      });
+    }
+  });
+  return automaticOrders;
+};
+
 var LineChartV2View = function LineChartV2View(props) {
   var _props$library, _props$attributes$vie;
   var _useDashboardBehaviou = useDashboardBehaviourContext(),
@@ -50112,7 +50140,7 @@ var LineChartV2View = function LineChartV2View(props) {
       nullValue: checkForNullValue(props.attributes.dataSetId, props.attributes.dimension, props.attributes.timeDimension, textOverride, valueAlias),
       result: props.result,
       pivotConfig: pivotConfig,
-      order: props.attributes.order,
+      order: sortDateTimeByDefault(props.attributes, props.dataSet, queryEngineConfig),
       numberFormatOptions: props.numberFormatOptions,
       dateTimeFormatOptions: props.dateTimeFormatOptions,
       goalLineAttributes: (_props$attributes$goa = props.attributes.goalLines) != null ? _props$attributes$goa : [],
@@ -50483,7 +50511,7 @@ var AreaChartV2View = function AreaChartV2View(props) {
       nullValue: checkForNullValue(props.attributes.dataSetId, props.attributes.dimension, props.attributes.timeDimension, textOverride, valueAlias),
       result: props.result,
       pivotConfig: pivotConfig,
-      order: props.attributes.order,
+      order: sortDateTimeByDefault(props.attributes, props.dataSet, queryEngineConfig),
       numberFormatOptions: props.numberFormatOptions,
       dateTimeFormatOptions: props.dateTimeFormatOptions,
       goalLineAttributes: (_props$attributes$goa = props.attributes.goalLines) != null ? _props$attributes$goa : [],
@@ -57107,10 +57135,9 @@ var Bar$2 = function Bar(_ref4) {
   var labelX = bar.x - xPadding;
   var labelY = getStepYPosition(step, barHeight, y);
   var isFirstOrLastStep = barGroup.index === 0 || barGroup.index === totalItems - 1;
-  var keyValue = step.end - step.start;
-  var displayValue = getFormattedValue(keyValue, labelDictionary);
+  var displayValue = getFormattedValue(bar.value, labelDictionary);
   var unformattedValue = displayValue.length > 15;
-  if (unformattedValue) displayValue = keyValue;
+  if (unformattedValue) displayValue = bar.value;
   var showMinMax = unformattedValue ? isFirstOrLastStep : totalItems < 20 || isFirstOrLastStep;
   var shouldShowLabel = showLabels && showMinMax;
   return jsxs(Fragment$1, {
@@ -64472,8 +64499,24 @@ var ComboChartCompareSection = function ComboChartCompareSection(props) {
           setPartialAttributes: function setPartialAttributes(attr) {
             if (attr['timeDimensions']) {
               var _attr$timeDimensions$;
+              var newTimeDimension = (_attr$timeDimensions$ = attr['timeDimensions'][0]) != null ? _attr$timeDimensions$ : null;
+              var comboAttrs = props.attributes;
+              var orderField = [].concat(comboAttrs.order);
+              if (newTimeDimension) {
+                var existingOrderIndex = orderField.findIndex(function (order) {
+                  return order.field === newTimeDimension.field && order["function"] === newTimeDimension.truncate;
+                });
+                if (existingOrderIndex === -1) {
+                  orderField.push({
+                    field: newTimeDimension.field,
+                    direction: 'asc',
+                    "function": newTimeDimension.truncate
+                  });
+                }
+              }
               props == null || props.setAttributes({
-                timeDimension: (_attr$timeDimensions$ = attr['timeDimensions'][0]) != null ? _attr$timeDimensions$ : null
+                timeDimension: newTimeDimension,
+                order: orderField
               });
             }
           }

package/dist/shared-logic/src/utils/defaultSortingDateTimes.d.ts

@@ -0,0 +1,4 @@
+import { DataSet } from '../DataSet/types';
+import { QueryAttributes } from '../QueryAttributes/types';
+import { QueryEngineConfig } from '../QueryEngineConfig/types';
+export declare const sortDateTimeByDefault: (attributes: QueryAttributes, dataSet: DataSet, queryEngineConfig: QueryEngineConfig) => QueryAttributes.Order[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vizzly/dashboard",
   "author": "james@vizzly.co",
-  "version": "0.15.0-dev-ac044c49c73d54ff3c144918a639d24aea98b549",
+  "version": "0.15.0-dev-01ea5aa946daad108dcca8cdb39a89202fb70c38",
   "source": "src/index.tsx",
   "types": "./dist/dashboard/src/index.d.ts",
   "module": "./dist/dashboard.esm.js",