Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't unselect on click and Enter #116

Merged
merged 2 commits into from
Jul 6, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Don't unselect on click and Enter
Select if click occurs in tree item sub element
fcollonval committed Jul 5, 2024

Verified

This commit was signed with the committer’s verified signature.
nilsingwersen Nils Ingwersen
commit a09b2c285af305ed91a09200116efb384a98d5a8
40 changes: 38 additions & 2 deletions packages/components/src/tree-view/index.ts
Original file line number Diff line number Diff line change
@@ -3,8 +3,10 @@
// Distributed under the terms of the Modified BSD License.

import {
isTreeItemElement,
treeViewTemplate as template,
TreeView
TreeView,
type TreeItem
} from '@microsoft/fast-foundation';
import { treeViewStyles as styles } from './tree-view.styles.js';

@@ -14,7 +16,41 @@ import { treeViewStyles as styles } from './tree-view.styles.js';
* @public
* @tagname jp-tree-view
*/
class JupyterTreeView extends TreeView {}
class JupyterTreeView extends TreeView {
/**
* Handles click events bubbling up
*
* @internal
*/
public handleClick(e: Event): boolean | void {
if (e.defaultPrevented) {
// handled, do nothing
return;
}

if (!(e.target instanceof Element)) {
// not a tree item, ignore
return true;
}

let item = e.target as Element | null;
while (item && !isTreeItemElement(item)) {
item = item.parentElement;

// Escape if we get out of the tree view component
if (item === this) {
item = null;
}
}

if (item && !(item as TreeItem).disabled) {
// Force selection - it is not possible to unselect
(item as TreeItem).selected = true;
}

return;
}
}

/**
* A function that returns a {@link @microsoft/fast-foundation#TreeView} registration for configuring the component with a DesignSystem.
2 changes: 1 addition & 1 deletion packages/components/src/tree-view/tree-view.stories.ts
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ const Template: StoryFn = (args): HTMLElement => {
<jp-tree-item>Nested item 3</jp-tree-item>
</jp-tree-item>
<jp-tree-item expanded>
Root item 2
Root <em style="padding: 0 0.2rem;">item</em> 2
<jp-tree-item>
Flowers
<jp-tree-item disabled>Daisy</jp-tree-item>

Unchanged files with check annotations Beta

test('With Image', async ({ page }) => {
await page.goto('/iframe.html?id=components-avatar--with-image');
expect(await page.locator('jp-avatar').screenshot()).toMatchSnapshot(

Check failure on line 25 in packages/components/src/avatar/avatar.test.ts

GitHub Actions / visual-test

[chromium] › src/avatar/avatar.test.ts:22:1 › With Image

1) [chromium] › src/avatar/avatar.test.ts:22:1 › With Image ────────────────────────────────────── Error: Screenshot comparison failed: 666 pixels (ratio 0.66 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-chromium/avatar-with-image-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-chromium/avatar-with-image-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-chromium/avatar-with-image-diff.png 23 | await page.goto('/iframe.html?id=components-avatar--with-image'); 24 | > 25 | expect(await page.locator('jp-avatar').screenshot()).toMatchSnapshot( | ^ 26 | 'avatar-with-image.png' 27 | ); 28 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/avatar/avatar.test.ts:25:56

Check failure on line 25 in packages/components/src/avatar/avatar.test.ts

GitHub Actions / visual-test

[chromium] › src/avatar/avatar.test.ts:22:1 › With Image

1) [chromium] › src/avatar/avatar.test.ts:22:1 › With Image ────────────────────────────────────── Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Error: Screenshot comparison failed: 666 pixels (ratio 0.66 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-chromium-retry1/avatar-with-image-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-chromium-retry1/avatar-with-image-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-chromium-retry1/avatar-with-image-diff.png 23 | await page.goto('/iframe.html?id=components-avatar--with-image'); 24 | > 25 | expect(await page.locator('jp-avatar').screenshot()).toMatchSnapshot( | ^ 26 | 'avatar-with-image.png' 27 | ); 28 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/avatar/avatar.test.ts:25:56

Check failure on line 25 in packages/components/src/avatar/avatar.test.ts

GitHub Actions / visual-test

[chromium] › src/avatar/avatar.test.ts:22:1 › With Image

1) [chromium] › src/avatar/avatar.test.ts:22:1 › With Image ────────────────────────────────────── Retry #2 ─────────────────────────────────────────────────────────────────────────────────────── Error: Screenshot comparison failed: 666 pixels (ratio 0.66 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-chromium-retry2/avatar-with-image-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-chromium-retry2/avatar-with-image-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-chromium-retry2/avatar-with-image-diff.png 23 | await page.goto('/iframe.html?id=components-avatar--with-image'); 24 | > 25 | expect(await page.locator('jp-avatar').screenshot()).toMatchSnapshot( | ^ 26 | 'avatar-with-image.png' 27 | ); 28 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/avatar/avatar.test.ts:25:56

Check failure on line 25 in packages/components/src/avatar/avatar.test.ts

GitHub Actions / visual-test

[firefox] › src/avatar/avatar.test.ts:22:1 › With Image

3) [firefox] › src/avatar/avatar.test.ts:22:1 › With Image ─────────────────────────────────────── Error: Screenshot comparison failed: 666 pixels (ratio 0.66 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-firefox/avatar-with-image-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-firefox/avatar-with-image-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-firefox/avatar-with-image-diff.png 23 | await page.goto('/iframe.html?id=components-avatar--with-image'); 24 | > 25 | expect(await page.locator('jp-avatar').screenshot()).toMatchSnapshot( | ^ 26 | 'avatar-with-image.png' 27 | ); 28 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/avatar/avatar.test.ts:25:56

Check failure on line 25 in packages/components/src/avatar/avatar.test.ts

GitHub Actions / visual-test

[firefox] › src/avatar/avatar.test.ts:22:1 › With Image

3) [firefox] › src/avatar/avatar.test.ts:22:1 › With Image ─────────────────────────────────────── Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Error: Screenshot comparison failed: 666 pixels (ratio 0.66 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-firefox-retry1/avatar-with-image-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-firefox-retry1/avatar-with-image-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-firefox-retry1/avatar-with-image-diff.png 23 | await page.goto('/iframe.html?id=components-avatar--with-image'); 24 | > 25 | expect(await page.locator('jp-avatar').screenshot()).toMatchSnapshot( | ^ 26 | 'avatar-with-image.png' 27 | ); 28 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/avatar/avatar.test.ts:25:56

Check failure on line 25 in packages/components/src/avatar/avatar.test.ts

GitHub Actions / visual-test

[firefox] › src/avatar/avatar.test.ts:22:1 › With Image

3) [firefox] › src/avatar/avatar.test.ts:22:1 › With Image ─────────────────────────────────────── Retry #2 ─────────────────────────────────────────────────────────────────────────────────────── Error: Screenshot comparison failed: 666 pixels (ratio 0.66 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-firefox-retry2/avatar-with-image-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-firefox-retry2/avatar-with-image-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-avatar-avatar-With-Image-firefox-retry2/avatar-with-image-diff.png 23 | await page.goto('/iframe.html?id=components-avatar--with-image'); 24 | > 25 | expect(await page.locator('jp-avatar').screenshot()).toMatchSnapshot( | ^ 26 | 'avatar-with-image.png' 27 | ); 28 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/avatar/avatar.test.ts:25:56
'avatar-with-image.png'
);
});
test('Default', async ({ page }) => {
await page.goto('/iframe.html?id=components-tree-view--default');
expect(await page.locator('jp-tree-view').screenshot()).toMatchSnapshot(

Check failure on line 9 in packages/components/src/tree-view/tree-view.test.ts

GitHub Actions / visual-test

[chromium] › src/tree-view/tree-view.test.ts:6:1 › Default

2) [chromium] › src/tree-view/tree-view.test.ts:6:1 › Default ──────────────────────────────────── Error: Screenshot comparison failed: 72 pixels (ratio 0.01 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-chromium/tree-view-default-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-chromium/tree-view-default-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-chromium/tree-view-default-diff.png 7 | await page.goto('/iframe.html?id=components-tree-view--default'); 8 | > 9 | expect(await page.locator('jp-tree-view').screenshot()).toMatchSnapshot( | ^ 10 | 'tree-view-default.png' 11 | ); 12 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/tree-view/tree-view.test.ts:9:59

Check failure on line 9 in packages/components/src/tree-view/tree-view.test.ts

GitHub Actions / visual-test

[chromium] › src/tree-view/tree-view.test.ts:6:1 › Default

2) [chromium] › src/tree-view/tree-view.test.ts:6:1 › Default ──────────────────────────────────── Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Error: Screenshot comparison failed: 72 pixels (ratio 0.01 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-chromium-retry1/tree-view-default-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-chromium-retry1/tree-view-default-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-chromium-retry1/tree-view-default-diff.png 7 | await page.goto('/iframe.html?id=components-tree-view--default'); 8 | > 9 | expect(await page.locator('jp-tree-view').screenshot()).toMatchSnapshot( | ^ 10 | 'tree-view-default.png' 11 | ); 12 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/tree-view/tree-view.test.ts:9:59

Check failure on line 9 in packages/components/src/tree-view/tree-view.test.ts

GitHub Actions / visual-test

[chromium] › src/tree-view/tree-view.test.ts:6:1 › Default

2) [chromium] › src/tree-view/tree-view.test.ts:6:1 › Default ──────────────────────────────────── Retry #2 ─────────────────────────────────────────────────────────────────────────────────────── Error: Screenshot comparison failed: 72 pixels (ratio 0.01 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-chromium-retry2/tree-view-default-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-chromium-retry2/tree-view-default-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-chromium-retry2/tree-view-default-diff.png 7 | await page.goto('/iframe.html?id=components-tree-view--default'); 8 | > 9 | expect(await page.locator('jp-tree-view').screenshot()).toMatchSnapshot( | ^ 10 | 'tree-view-default.png' 11 | ); 12 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/tree-view/tree-view.test.ts:9:59

Check failure on line 9 in packages/components/src/tree-view/tree-view.test.ts

GitHub Actions / visual-test

[firefox] › src/tree-view/tree-view.test.ts:6:1 › Default

4) [firefox] › src/tree-view/tree-view.test.ts:6:1 › Default ───────────────────────────────────── Error: Screenshot comparison failed: 72 pixels (ratio 0.01 of all image pixels) are different. Expected: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-firefox/tree-view-default-expected.png Received: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-firefox/tree-view-default-actual.png Diff: /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/test-results/src-tree-view-tree-view-Default-firefox/tree-view-default-diff.png 7 | await page.goto('/iframe.html?id=components-tree-view--default'); 8 | > 9 | expect(await page.locator('jp-tree-view').screenshot()).toMatchSnapshot( | ^ 10 | 'tree-view-default.png' 11 | ); 12 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/tree-view/tree-view.test.ts:9:59
'tree-view-default.png'
);
});
// Copyright (c) Jupyter Development Team.

Check failure on line 1 in packages/components/src/anchor/anchor.base.test.ts

GitHub Actions / visual-test

[chromium] › src/anchor/anchor.base.test.ts:29:3 › jpAnchor › receive focus when focused programatically

1) [chromium] › src/anchor/anchor.base.test.ts:29:3 › jpAnchor › receive focus when focused programatically Test timeout of 30000ms exceeded.

Check failure on line 1 in packages/components/src/anchor/anchor.base.test.ts

GitHub Actions / visual-test

[chromium] › src/anchor/anchor.base.test.ts:29:3 › jpAnchor › receive focus when focused programatically

1) [chromium] › src/anchor/anchor.base.test.ts:29:3 › jpAnchor › receive focus when focused programatically Pending operations: - locator.waitFor at src/anchor/anchor.base.test.ts:31:19
// Copyright (c) Microsoft Corporation.
// Distributed under the terms of the Modified BSD License.
test('receive focus when focused programatically', async ({ page }) => {
const element = page.locator('jp-anchor');
await element.waitFor();

Check failure on line 31 in packages/components/src/anchor/anchor.base.test.ts

GitHub Actions / visual-test

[chromium] › src/anchor/anchor.base.test.ts:29:3 › jpAnchor › receive focus when focused programatically

1) [chromium] › src/anchor/anchor.base.test.ts:29:3 › jpAnchor › receive focus when focused programatically Error: locator.waitFor: Target closed =========================== logs =========================== waiting for locator('jp-anchor') to be visible locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resolved to hidden <jp-anchor href="#" id="anchor1" class="neutral" appearance…>Hello</jp-anchor> locator resol
await element.focus();
expect(await page.evaluate(() => document.activeElement?.id)).toEqual(
expect(
await selectedOption.evaluate<number, JpOption>(node => node.scrollTop)
).toBeLessThanOrEqual(6);

Check failure on line 355 in packages/components/src/select/select.base.test.ts

GitHub Actions / visual-test

[chromium] › src/select/select.base.test.ts:307:5 › JpSelect › when opened › should scroll the selected option into view

2) [chromium] › src/select/select.base.test.ts:307:5 › JpSelect › when opened › should scroll the selected option into view Error: expect(received).toBeLessThanOrEqual(expected) Expected: <= 6 Received: 794 353 | expect( 354 | await selectedOption.evaluate<number, JpOption>(node => node.scrollTop) > 355 | ).toBeLessThanOrEqual(6); | ^ 356 | }); 357 | }); 358 | }); at /home/runner/work/jupyter-ui-toolkit/jupyter-ui-toolkit/packages/components/src/select/select.base.test.ts:355:9
});
});
});