layerchart 0.92.0 → 0.92.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@
3
3
  import { extent, min, max } from 'd3-array';
4
4
  import { clamp } from '@layerstack/utils';
5
5
  import { cls } from '@layerstack/tailwind';
6
- import { format as formatValue, type FormatType } from '@layerstack/utils';
6
+ import { format as formatValue, type FormatType, Logger } from '@layerstack/utils';
7
7
 
8
8
  import { chartContext } from './ChartContext.svelte';
9
9
  import Frame from './Frame.svelte';
@@ -74,6 +74,9 @@
74
74
 
75
75
  let frameEl: SVGRectElement;
76
76
 
77
+ const logger = new Logger('Brush');
78
+ const RESET_THRESHOLD = 1; // size of pointer delta to ignore
79
+
77
80
  function handler(
78
81
  fn: (
79
82
  start: {
@@ -85,35 +88,50 @@
85
88
  ) => void
86
89
  ) {
87
90
  return (e: PointerEvent) => {
91
+ const startPoint = localPoint(frameEl, e);
88
92
  const start = {
89
93
  xDomain: [xDomain?.[0] ?? xDomainMin, xDomain?.[1] ?? xDomainMax] as [number, number],
90
94
  yDomain: [yDomain?.[0] ?? yDomainMin, yDomain?.[1] ?? yDomainMax] as [number, number],
91
95
  value: {
92
- x: $xScale.invert?.((localPoint(frameEl, e)?.x ?? 0) - $padding.left),
93
- y: $yScale.invert?.((localPoint(frameEl, e)?.y ?? 0) - $padding.top),
96
+ x: $xScale.invert?.((startPoint?.x ?? 0) - $padding.left),
97
+ y: $yScale.invert?.((startPoint?.y ?? 0) - $padding.top),
94
98
  },
95
99
  };
96
100
 
97
101
  onbrushstart({ xDomain, yDomain });
98
102
 
99
103
  const onPointerMove = (e: PointerEvent) => {
104
+ const currentPoint = localPoint(frameEl, e);
100
105
  fn(start, {
101
- x: $xScale.invert?.((localPoint(frameEl, e)?.x ?? 0) - $padding.left),
102
- y: $yScale.invert?.((localPoint(frameEl, e)?.y ?? 0) - $padding.top),
106
+ x: $xScale.invert?.((currentPoint?.x ?? 0) - $padding.left),
107
+ y: $yScale.invert?.((currentPoint?.y ?? 0) - $padding.top),
103
108
  });
104
109
 
105
- // if (xDomain[0] === xDomain[1] || yDomain[0] === yDomain[1]) {
106
- // // Ignore?
107
- // // TODO: What about when using `x` or `y` axis?
108
- // } else {
109
110
  onchange({ xDomain, yDomain });
110
- // }
111
111
  };
112
112
 
113
113
  const onPointerUp = (e: PointerEvent) => {
114
- if (e.target === frameEl) {
114
+ const currentPoint = localPoint(frameEl, e);
115
+ const xPointDelta = Math.abs((startPoint?.x ?? 0) - (currentPoint?.x ?? 0));
116
+ const yPointDelta = Math.abs((startPoint?.y ?? 0) - (currentPoint?.y ?? 0));
117
+
118
+ if (
119
+ (e.target == frameEl && xPointDelta < RESET_THRESHOLD && yPointDelta < RESET_THRESHOLD) ||
120
+ rangeWidth < RESET_THRESHOLD ||
121
+ rangeHeight < RESET_THRESHOLD
122
+ ) {
123
+ // Clicked on frame, or pointer delta was <1
124
+ logger.info('resetting due to frame click');
115
125
  reset();
116
126
  onchange({ xDomain, yDomain });
127
+ } else {
128
+ logger.info('drag', {
129
+ target: e.target,
130
+ xPointDelta,
131
+ yPointDelta,
132
+ rangeWidth,
133
+ rangeHeight,
134
+ });
117
135
  }
118
136
 
119
137
  onbrushend({ xDomain, yDomain });
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "author": "Sean Lynch <techniq35@gmail.com>",
5
5
  "license": "MIT",
6
6
  "repository": "techniq/layerchart",
7
- "version": "0.92.0",
7
+ "version": "0.92.1",
8
8
  "devDependencies": {
9
9
  "@changesets/cli": "^2.27.12",
10
10
  "@mdi/js": "^7.4.47",