@astryxdesign/lab 0.7.8-canary.36cde5e → 0.7.8-canary.42ccd7c

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.
@@ -1 +1 @@
1
- {"version":3,"file":"ChartZoom.d.ts","sourceRoot":"","sources":["../../src/Chart/ChartZoom.tsx"],"names":[],"mappings":"AAmBA,6CAA6C;AAC7C,MAAM,MAAM,mBAAmB,GAC7B,WAAW,GAAG,UAAU,GAAG,cAAc,GAAG,aAAa,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IACrD,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAErD;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,OAAO,CAAC,EAAE,KAAK,GAAG,mBAAmB,CAAC;CACvC;AAiDD,wBAAgB,SAAS,CAAC,EACxB,eAAe,EACf,eAAe,EACf,SAAe,EACf,KAAa,EACb,KAAa,EACb,OAAqB,GACtB,EAAE,cAAc,+BAwShB"}
1
+ {"version":3,"file":"ChartZoom.d.ts","sourceRoot":"","sources":["../../src/Chart/ChartZoom.tsx"],"names":[],"mappings":"AAmBA,6CAA6C;AAC7C,MAAM,MAAM,mBAAmB,GAC7B,WAAW,GAAG,UAAU,GAAG,cAAc,GAAG,aAAa,CAAC;AAE5D,MAAM,WAAW,cAAc;IAC7B,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IACrD,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAErD;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,OAAO,CAAC,EAAE,KAAK,GAAG,mBAAmB,CAAC;CACvC;AAiDD,wBAAgB,SAAS,CAAC,EACxB,eAAe,EACf,eAAe,EACf,SAAe,EACf,KAAa,EACb,KAAa,EACb,OAAqB,GACtB,EAAE,cAAc,+BA6RhB"}
@@ -7,10 +7,10 @@
7
7
  *
8
8
  * Zoom is aspect-ratio-normalized: both axes scale by the same visual
9
9
  * factor regardless of their domain ranges. Reset button restores
10
- * the initial domains captured on mount.
10
+ * the domains of the first render.
11
11
  */
12
12
 
13
- import { useCallback, useRef, useEffect } from 'react';
13
+ import { useCallback, useRef, useState } from 'react';
14
14
  import { createPortal } from 'react-dom';
15
15
  import { IconButton } from '@astryxdesign/core/IconButton';
16
16
  import { useChart } from "./ChartContext.js";
@@ -77,20 +77,10 @@ export function ChartZoom({
77
77
  yScale,
78
78
  svgRef
79
79
  } = useChart();
80
-
81
- // Capture initial domains on mount for reset
82
- const initialDomainsRef = useRef(null);
83
- useEffect(() => {
84
- if (initialDomainsRef.current) {
85
- return;
86
- } // only capture once
87
- const xDomain = isBandScale(xScale) ? null : xScale.domain();
88
- const yDomain = yScale.domain();
89
- initialDomainsRef.current = {
90
- x: xDomain,
91
- y: yDomain
92
- };
93
- }, [xScale, yScale]);
80
+ const [initialDomains] = useState(() => ({
81
+ x: isBandScale(xScale) ? null : xScale.domain(),
82
+ y: yScale.domain()
83
+ }));
94
84
  const dragRef = useRef(null);
95
85
  const pointersRef = useRef(new Map());
96
86
  const pinchRef = useRef(null);
@@ -219,15 +209,11 @@ export function ChartZoom({
219
209
  }
220
210
  }, []);
221
211
  const handleReset = useCallback(() => {
222
- const init = initialDomainsRef.current;
223
- if (!init) {
224
- return;
225
- }
226
- if (init.x) {
227
- onXDomainChange?.(init.x);
212
+ if (initialDomains.x) {
213
+ onXDomainChange?.(initialDomains.x);
228
214
  }
229
- onYDomainChange?.(init.y);
230
- }, [onXDomainChange, onYDomainChange]);
215
+ onYDomainChange?.(initialDomains.y);
216
+ }, [initialDomains, onXDomainChange, onYDomainChange]);
231
217
 
232
218
  // Toolbar portal target
233
219
  const portalTarget = svgRef.current?.parentElement;
@@ -1,7 +1,7 @@
1
1
  /**
2
2
  * @file CommentActions.tsx
3
- * @input Uses React, React DOM flushSync, StyleX, IconButton, Button, Tooltip,
4
- * ToggleButton, OverflowList, DropdownMenu, Popover, Text
3
+ * @input Uses React, React DOM flushSync, StyleX, useClipboard, IconButton,
4
+ * Button, Tooltip, ToggleButton, OverflowList, DropdownMenu, Popover, Text
5
5
  * @output Exports CommentActions (a comment's header actions), ReactionSummary
6
6
  * (its reaction toggles), and the action-lookup helpers rows use for focus
7
7
  * hand-offs
@@ -1 +1 @@
1
- {"version":3,"file":"CommentActions.d.ts","sourceRoot":"","sources":["../../src/Comments/CommentActions.tsx"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,OAAO,EAA2C,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAI/E,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,iCAAiC,CAAC;AAazC,OAAO,EAAkB,KAAK,UAAU,EAAC,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAkB,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAoBpE,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAEhF,oEAAoE;AACpE,MAAM,MAAM,aAAa,GAAG;IAAC,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAC,CAAC;AAE9E;;sBAEsB;AACtB,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,WAAW,GAAG,IAAI,EACxB,MAAM,EAAE,eAAe,GACtB,WAAW,GAAG,IAAI,CAMpB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,WAAW,GAAG,IAAI,GACvB,WAAW,GAAG,IAAI,CAIpB;AAiCD,kFAAkF;AAClF,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD,sCA0CA;AAkDD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC7B,iBAAiB,EACjB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,MAAM,EACN,SAAS,EACT,SAAS,EACT,YAAY,EACZ,OAAO,EACP,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;IACD,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,sDAAsD;IACtD,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACxC,OAAO,EAAE,CACP,OAAO,EAAE,UAAU,EACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,qBAAqB,KAC3B,IAAI,CAAC;IACV,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAC1C,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B,+BA6RA"}
1
+ {"version":3,"file":"CommentActions.d.ts","sourceRoot":"","sources":["../../src/Comments/CommentActions.tsx"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,OAAO,EAAgC,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAIpE,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,iCAAiC,CAAC;AAczC,OAAO,EAAkB,KAAK,UAAU,EAAC,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAkB,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAmBpE,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAEhF,oEAAoE;AACpE,MAAM,MAAM,aAAa,GAAG;IAAC,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAC,CAAC;AAE9E;;sBAEsB;AACtB,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,WAAW,GAAG,IAAI,EACxB,MAAM,EAAE,eAAe,GACtB,WAAW,GAAG,IAAI,CAMpB;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,WAAW,GAAG,IAAI,GACvB,WAAW,GAAG,IAAI,CAIpB;AAiCD,kFAAkF;AAClF,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,OAAO,EACP,MAAM,EACN,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD,sCA0CA;AAkDD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC7B,iBAAiB,EACjB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,MAAM,EACN,SAAS,EACT,SAAS,EACT,YAAY,EACZ,OAAO,EACP,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;IACD,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,sDAAsD;IACtD,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACxC,OAAO,EAAE,CACP,OAAO,EAAE,UAAU,EACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,qBAAqB,KAC3B,IAAI,CAAC;IACV,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAC1C,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B,+BAuQA"}
@@ -4,18 +4,19 @@
4
4
 
5
5
  /**
6
6
  * @file CommentActions.tsx
7
- * @input Uses React, React DOM flushSync, StyleX, IconButton, Button, Tooltip,
8
- * ToggleButton, OverflowList, DropdownMenu, Popover, Text
7
+ * @input Uses React, React DOM flushSync, StyleX, useClipboard, IconButton,
8
+ * Button, Tooltip, ToggleButton, OverflowList, DropdownMenu, Popover, Text
9
9
  * @output Exports CommentActions (a comment's header actions), ReactionSummary
10
10
  * (its reaction toggles), and the action-lookup helpers rows use for focus
11
11
  * hand-offs
12
12
  * @position Internal parts of a comment row in the Comments family
13
13
  */
14
- import { useCallback, useEffect, useRef, useState } from 'react';
14
+ import { useCallback, useRef, useState } from 'react';
15
15
  import { flushSync } from 'react-dom';
16
16
  import * as stylex from '@stylexjs/stylex';
17
17
  import { Button } from '@astryxdesign/core/Button';
18
18
  import { DropdownMenu } from '@astryxdesign/core/DropdownMenu';
19
+ import { useClipboard } from '@astryxdesign/core/hooks';
19
20
  import { Icon } from '@astryxdesign/core/Icon';
20
21
  import { IconButton } from '@astryxdesign/core/IconButton';
21
22
  import { HStack, VStack } from '@astryxdesign/core/Layout';
@@ -31,7 +32,6 @@ import { reactionDescription } from "./i18n.js";
31
32
  import { CommentIcon } from "./icons.js";
32
33
  import { commentAnchorId } from "./utils.js";
33
34
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
34
- const LINK_COPIED_RESET_MS = 2_000;
35
35
  const MORE_MENU_MIN_WIDTH = `calc(${spacingVars['--spacing-8']} * 5)`;
36
36
  const styles = {
37
37
  actionsList: {
@@ -218,7 +218,10 @@ export function CommentActions({
218
218
  resolveAction
219
219
  }) {
220
220
  const t = useTranslator();
221
- const [isLinkCopied, setIsLinkCopied] = useState(false);
221
+ const {
222
+ copy: copyToClipboard,
223
+ isCopied: isLinkCopied
224
+ } = useClipboard();
222
225
  const [isLinkTooltipOpen, setIsLinkTooltipOpen] = useState(false);
223
226
  const [isPickerOpen, setIsPickerOpen] = useState(false);
224
227
  const [collapsed, setCollapsed] = useState(NO_COLLAPSED_ACTIONS);
@@ -236,24 +239,7 @@ export function CommentActions({
236
239
  }) : /*#__PURE__*/_jsx(CommentIcon, {
237
240
  name: "copyLink"
238
241
  });
239
- const copyCommentLink = async () => {
240
- if (navigator.clipboard == null) {
241
- return;
242
- }
243
- try {
244
- await navigator.clipboard.writeText(new URL(href, window.location.href).href);
245
- setIsLinkCopied(true);
246
- } catch {
247
- setIsLinkCopied(false);
248
- }
249
- };
250
- useEffect(() => {
251
- if (!isLinkCopied) {
252
- return;
253
- }
254
- const timer = window.setTimeout(() => setIsLinkCopied(false), LINK_COPIED_RESET_MS);
255
- return () => window.clearTimeout(timer);
256
- }, [isLinkCopied]);
242
+ const copyCommentLink = () => copyToClipboard(new URL(href, window.location.href).href);
257
243
  const changePicker = isOpen => {
258
244
  setIsPickerOpen(isOpen);
259
245
  onOpenChange(isOpen);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@astryxdesign/lab",
3
- "version": "0.7.8-canary.36cde5e",
3
+ "version": "0.7.8-canary.42ccd7c",
4
4
  "description": "Experimental Astryx components — published to npm only under the @canary dist-tag for early testing; never released as a stable (latest) version.",
5
5
  "author": "Meta Open Source",
6
6
  "license": "MIT",
@@ -49,7 +49,7 @@
49
49
  },
50
50
  "peerDependencies": {
51
51
  "@stylexjs/stylex": ">=0.10.0",
52
- "@astryxdesign/core": "0.7.8-canary.36cde5e",
52
+ "@astryxdesign/core": "0.7.8-canary.42ccd7c",
53
53
  "react": ">=19.0.0",
54
54
  "react-dom": ">=19.0.0"
55
55
  },
@@ -59,9 +59,9 @@
59
59
  "d3-shape": "^3.2.0"
60
60
  },
61
61
  "devDependencies": {
62
- "@astryxdesign/a11y-spec": "0.7.8-canary.36cde5e",
63
- "@astryxdesign/cli": "0.7.8-canary.36cde5e",
64
- "@astryxdesign/interaction-harness": "0.7.8-canary.36cde5e",
62
+ "@astryxdesign/a11y-spec": "0.7.8-canary.42ccd7c",
63
+ "@astryxdesign/cli": "0.7.8-canary.42ccd7c",
64
+ "@astryxdesign/interaction-harness": "0.7.8-canary.42ccd7c",
65
65
  "@babel/cli": "^7.29.7",
66
66
  "@babel/core": "^7.29.7",
67
67
  "@babel/preset-react": "^7.29.7",
@@ -3,14 +3,15 @@
3
3
  /**
4
4
  * @file ChartZoom.test.tsx
5
5
  * @input Renders ChartZoom inside Chart with a stubbed ResizeObserver
6
- * @output Render-smoke coverage for zoom: capture surface, portaled toolbar, toolbar opt-out.
6
+ * @output Render-smoke coverage for zoom: capture surface, portaled toolbar, toolbar opt-out,
7
+ * and Reset back to the first render's domains.
7
8
  * Wheel/pinch gestures need createSVGPoint/getScreenCTM, which do not exist in
8
9
  * jsdom, so they are intentionally out of scope here. (#4295)
9
10
  * @position Colocated test for ChartZoom.tsx
10
11
  */
11
12
 
12
13
  import {describe, it, expect, beforeEach, afterEach, vi} from 'vitest';
13
- import {render, screen, act} from '@testing-library/react';
14
+ import {render, screen, act, fireEvent} from '@testing-library/react';
14
15
  import {Chart} from './Chart';
15
16
  import {ChartZoom} from './ChartZoom';
16
17
 
@@ -87,6 +88,44 @@ describe('ChartZoom', () => {
87
88
  ).toBeInTheDocument();
88
89
  });
89
90
 
91
+ it("resets to the first render's domains after the caller changes them", () => {
92
+ const onXDomainChange = vi.fn();
93
+ const onYDomainChange = vi.fn();
94
+ function ZoomedChart({
95
+ xDomain,
96
+ yDomain,
97
+ }: {
98
+ xDomain: [number, number];
99
+ yDomain: [number, number];
100
+ }) {
101
+ return (
102
+ <Chart
103
+ data={data}
104
+ xKey="x"
105
+ yKeys={['y']}
106
+ xDomain={xDomain}
107
+ yDomain={yDomain}
108
+ interactive>
109
+ <ChartZoom
110
+ onXDomainChange={onXDomainChange}
111
+ onYDomainChange={onYDomainChange}
112
+ />
113
+ </Chart>
114
+ );
115
+ }
116
+ const {rerender} = render(
117
+ <ZoomedChart xDomain={[0, 2]} yDomain={[0, 4]} />,
118
+ );
119
+ reportWidth(464);
120
+ reportWidth(465);
121
+
122
+ rerender(<ZoomedChart xDomain={[0.5, 1.5]} yDomain={[1, 3]} />);
123
+ fireEvent.click(screen.getByRole('button', {name: 'Reset zoom'}));
124
+
125
+ expect(onXDomainChange).toHaveBeenLastCalledWith([0, 2]);
126
+ expect(onYDomainChange).toHaveBeenLastCalledWith([0, 4]);
127
+ });
128
+
90
129
  it('renders no toolbar when toolbar is false', () => {
91
130
  render(
92
131
  <Chart data={data} xKey="x" yKeys={['y']} interactive>
@@ -7,10 +7,10 @@
7
7
  *
8
8
  * Zoom is aspect-ratio-normalized: both axes scale by the same visual
9
9
  * factor regardless of their domain ranges. Reset button restores
10
- * the initial domains captured on mount.
10
+ * the domains of the first render.
11
11
  */
12
12
 
13
- import {type CSSProperties, useCallback, useRef, useEffect} from 'react';
13
+ import {type CSSProperties, useCallback, useRef, useState} from 'react';
14
14
  import {createPortal} from 'react-dom';
15
15
  import {IconButton} from '@astryxdesign/core/IconButton';
16
16
  import {useChart} from './ChartContext';
@@ -101,22 +101,15 @@ export function ChartZoom({
101
101
  }: ChartZoomProps) {
102
102
  const {width, height, xScale, yScale, svgRef} = useChart();
103
103
 
104
- // Capture initial domains on mount for reset
105
- const initialDomainsRef = useRef<{
104
+ const [initialDomains] = useState<{
106
105
  x: [number, number] | null;
107
106
  y: [number, number];
108
- } | null>(null);
109
-
110
- useEffect(() => {
111
- if (initialDomainsRef.current) {
112
- return;
113
- } // only capture once
114
- const xDomain = isBandScale(xScale)
107
+ }>(() => ({
108
+ x: isBandScale(xScale)
115
109
  ? null
116
- : ((xScale as ScaleLinear<number, number>).domain() as [number, number]);
117
- const yDomain = yScale.domain() as [number, number];
118
- initialDomainsRef.current = {x: xDomain, y: yDomain};
119
- }, [xScale, yScale]);
110
+ : ((xScale as ScaleLinear<number, number>).domain() as [number, number]),
111
+ y: yScale.domain() as [number, number],
112
+ }));
120
113
 
121
114
  const dragRef = useRef<{
122
115
  startX: number;
@@ -303,15 +296,11 @@ export function ChartZoom({
303
296
  }, []);
304
297
 
305
298
  const handleReset = useCallback(() => {
306
- const init = initialDomainsRef.current;
307
- if (!init) {
308
- return;
309
- }
310
- if (init.x) {
311
- onXDomainChange?.(init.x);
299
+ if (initialDomains.x) {
300
+ onXDomainChange?.(initialDomains.x);
312
301
  }
313
- onYDomainChange?.(init.y);
314
- }, [onXDomainChange, onYDomainChange]);
302
+ onYDomainChange?.(initialDomains.y);
303
+ }, [initialDomains, onXDomainChange, onYDomainChange]);
315
304
 
316
305
  // Toolbar portal target
317
306
  const portalTarget = svgRef.current?.parentElement;
@@ -28,8 +28,10 @@ import {
28
28
  import {
29
29
  busyWindowProof,
30
30
  CONTROL_RGB,
31
+ countBetween,
31
32
  inPresentationOrder,
32
33
  startBusyControl,
34
+ traceRendering,
33
35
  trackMarker,
34
36
  type TrackedFrame,
35
37
  } from '@astryxdesign/interaction-harness';
@@ -413,50 +415,47 @@ test('a value change keeps moving while a script holds the main thread', async (
413
415
  ).toBeLessThanOrEqual(6);
414
416
  });
415
417
 
416
- test('a value change lays out and paints nothing per frame', async ({
417
- page,
418
- browser,
419
- }) => {
418
+ test('a value change lays out and paints nothing per frame', async ({page}) => {
420
419
  await open(page, 20);
421
- // Stretch the theme's duration so the trace sits wholly inside the change.
420
+ // Stretch the theme's duration so the second judged below sits wholly
421
+ // inside the change.
422
422
  await page.evaluate(() =>
423
423
  (
424
424
  document.querySelector('.astryx-circular-progress-fill') as HTMLElement
425
425
  ).style.setProperty('--duration-medium', '3000ms'),
426
426
  );
427
- await setArgs(page, {value: 80});
428
- await page.waitForTimeout(200);
429
- await browser.startTracing(page, {
430
- categories: ['devtools.timeline', 'disabled-by-default-devtools.timeline'],
427
+ // Tracing starts before the change, so however long it takes to start, it
428
+ // takes none of the change's time. The judged second starts two frames
429
+ // after the change's animations are ready, 200 ms in.
430
+ let from = 0;
431
+ let to = 0;
432
+ let moving = false;
433
+ const trace = await traceRendering(page, async () => {
434
+ await setArgs(page, {value: 80});
435
+ await page.waitForTimeout(200);
436
+ from = await page.evaluate(async () => {
437
+ await Promise.all(document.getAnimations().map(async a => a.ready));
438
+ await new Promise(resolve =>
439
+ requestAnimationFrame(() => requestAnimationFrame(resolve)),
440
+ );
441
+ return performance.timeOrigin + performance.now();
442
+ });
443
+ await page.waitForTimeout(1000);
444
+ [to, moving] = await page.evaluate(
445
+ () =>
446
+ [
447
+ performance.timeOrigin + performance.now(),
448
+ document.getAnimations().some(a => a.playState === 'running'),
449
+ ] as const,
450
+ );
431
451
  });
432
- await page.waitForTimeout(1000);
433
- const moving = await page.evaluate(() =>
434
- document.getAnimations().some(a => a.playState === 'running'),
435
- );
436
- const trace = JSON.parse((await browser.stopTracing()).toString()) as {
437
- traceEvents: {
438
- name: string;
439
- ph: string;
440
- pid: number;
441
- tid: number;
442
- args?: {name?: string};
443
- }[];
444
- };
445
- const mainThreads = new Set(
446
- trace.traceEvents
447
- .filter(e => e.ph === 'M' && e.name === 'thread_name')
448
- .filter(e => e.args?.name === 'CrRendererMain')
449
- .map(e => `${e.pid}:${e.tid}`),
450
- );
451
- const count = (name: string) =>
452
- trace.traceEvents.filter(
453
- e => e.name === name && mainThreads.has(`${e.pid}:${e.tid}`),
454
- ).length;
452
+ const counts = countBetween(trace, from, to);
455
453
  // A full second of the change: nothing lays out or paints. A
456
454
  // stroke-dashoffset transition repainted every frame (36 paints in 410 ms).
455
+ expect(to - from).toBeGreaterThanOrEqual(1000);
457
456
  expect(moving).toBe(true);
458
- expect(count('Layout')).toBe(0);
459
- expect(count('Paint')).toBe(0);
457
+ expect(counts.Layout ?? 0).toBe(0);
458
+ expect(counts.Paint ?? 0).toBe(0);
460
459
  });
461
460
 
462
461
  test('at rest the ring draws what the stroked circle drew', async ({
@@ -4,15 +4,15 @@
4
4
 
5
5
  /**
6
6
  * @file CommentActions.tsx
7
- * @input Uses React, React DOM flushSync, StyleX, IconButton, Button, Tooltip,
8
- * ToggleButton, OverflowList, DropdownMenu, Popover, Text
7
+ * @input Uses React, React DOM flushSync, StyleX, useClipboard, IconButton,
8
+ * Button, Tooltip, ToggleButton, OverflowList, DropdownMenu, Popover, Text
9
9
  * @output Exports CommentActions (a comment's header actions), ReactionSummary
10
10
  * (its reaction toggles), and the action-lookup helpers rows use for focus
11
11
  * hand-offs
12
12
  * @position Internal parts of a comment row in the Comments family
13
13
  */
14
14
 
15
- import {useCallback, useEffect, useRef, useState, type ReactNode} from 'react';
15
+ import {useCallback, useRef, useState, type ReactNode} from 'react';
16
16
  import {flushSync} from 'react-dom';
17
17
  import * as stylex from '@stylexjs/stylex';
18
18
  import {Button} from '@astryxdesign/core/Button';
@@ -20,6 +20,7 @@ import {
20
20
  DropdownMenu,
21
21
  type DropdownMenuOption,
22
22
  } from '@astryxdesign/core/DropdownMenu';
23
+ import {useClipboard} from '@astryxdesign/core/hooks';
23
24
  import {Icon} from '@astryxdesign/core/Icon';
24
25
  import {IconButton} from '@astryxdesign/core/IconButton';
25
26
  import {HStack, VStack} from '@astryxdesign/core/Layout';
@@ -35,7 +36,6 @@ import {CommentIcon} from './icons';
35
36
  import {commentAnchorId, type AnyComment} from './utils';
36
37
  import type {CommentReaction, CommentReactionOption} from './types';
37
38
 
38
- const LINK_COPIED_RESET_MS = 2_000;
39
39
  const MORE_MENU_MIN_WIDTH = `calc(${spacingVars['--spacing-8']} * 5)`;
40
40
 
41
41
  const styles = stylex.create({
@@ -256,7 +256,7 @@ export function CommentActions({
256
256
  resolveAction?: ResolveAction;
257
257
  }) {
258
258
  const t = useTranslator();
259
- const [isLinkCopied, setIsLinkCopied] = useState(false);
259
+ const {copy: copyToClipboard, isCopied: isLinkCopied} = useClipboard();
260
260
  const [isLinkTooltipOpen, setIsLinkTooltipOpen] = useState(false);
261
261
  const [isPickerOpen, setIsPickerOpen] = useState(false);
262
262
  const [collapsed, setCollapsed] = useState(NO_COLLAPSED_ACTIONS);
@@ -276,30 +276,8 @@ export function CommentActions({
276
276
  <CommentIcon name="copyLink" />
277
277
  );
278
278
 
279
- const copyCommentLink = async () => {
280
- if (navigator.clipboard == null) {
281
- return;
282
- }
283
- try {
284
- await navigator.clipboard.writeText(
285
- new URL(href, window.location.href).href,
286
- );
287
- setIsLinkCopied(true);
288
- } catch {
289
- setIsLinkCopied(false);
290
- }
291
- };
292
-
293
- useEffect(() => {
294
- if (!isLinkCopied) {
295
- return;
296
- }
297
- const timer = window.setTimeout(
298
- () => setIsLinkCopied(false),
299
- LINK_COPIED_RESET_MS,
300
- );
301
- return () => window.clearTimeout(timer);
302
- }, [isLinkCopied]);
279
+ const copyCommentLink = () =>
280
+ copyToClipboard(new URL(href, window.location.href).href);
303
281
 
304
282
  const changePicker = (isOpen: boolean) => {
305
283
  setIsPickerOpen(isOpen);
@@ -957,6 +957,38 @@ describe('Comments threads', () => {
957
957
  ).toBeTruthy();
958
958
  });
959
959
 
960
+ it('keeps the copied label for the full time after a second copy', async () => {
961
+ vi.useFakeTimers({toFake: ['setTimeout', 'clearTimeout']});
962
+ const wait = (ms: number) => act(() => vi.advanceTimersByTimeAsync(ms));
963
+ const copyButton = (name: string) => screen.getByRole('button', {name});
964
+ try {
965
+ render(
966
+ <Sized>
967
+ <Comments
968
+ comments={[{...COMMENTS[0], replies: []}]}
969
+ currentUser={OTHER}
970
+ />
971
+ </Sized>,
972
+ );
973
+ await click(copyButton('Copy comment link'));
974
+ await wait(0);
975
+ expect(copyButton('Comment link copied')).toBeTruthy();
976
+
977
+ await wait(1500);
978
+ await click(copyButton('Comment link copied'));
979
+ await wait(0);
980
+ // 2.5 s after the first copy and 1 s after the second one.
981
+ await wait(1000);
982
+ expect(writeText).toHaveBeenCalledTimes(2);
983
+ expect(copyButton('Comment link copied')).toBeTruthy();
984
+
985
+ await wait(1000);
986
+ expect(copyButton('Copy comment link')).toBeTruthy();
987
+ } finally {
988
+ vi.useRealTimers();
989
+ }
990
+ });
991
+
960
992
  it('collapses header actions into the more menu when space runs low', async () => {
961
993
  overflowControl.collapsed = new Set(['reply', 'link']);
962
994
  const onSubmit = vi.fn();