Skip to content

Commit

Permalink
Merge branch 'main' into empty-icon-mapping
Browse files Browse the repository at this point in the history
  • Loading branch information
mollykreis authored Feb 29, 2024
2 parents 33fa6a3 + 7a14257 commit 59bdedb
Show file tree
Hide file tree
Showing 12 changed files with 277 additions and 48 deletions.
15 changes: 15 additions & 0 deletions angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/nimble-angular",
"entries": [
{
"date": "Wed, 28 Feb 2024 21:22:49 GMT",
"version": "20.2.13",
"tag": "@ni/nimble-angular_v20.2.13",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v21.7.1",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 28 Feb 2024 19:35:04 GMT",
"version": "20.2.12",
Expand Down
10 changes: 9 additions & 1 deletion angular-workspace/projects/ni/nimble-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/nimble-angular

This log was last generated on Wed, 28 Feb 2024 19:35:04 GMT and should not be manually modified.
This log was last generated on Wed, 28 Feb 2024 21:22:49 GMT and should not be manually modified.

<!-- Start content -->

## 20.2.13

Wed, 28 Feb 2024 21:22:49 GMT

### Patches

- Bump @ni/nimble-components to v21.7.1

## 20.2.12

Wed, 28 Feb 2024 19:35:04 GMT
Expand Down
4 changes: 2 additions & 2 deletions angular-workspace/projects/ni/nimble-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-angular",
"version": "20.2.12",
"version": "20.2.14",
"description": "Angular components for the NI Nimble Design System",
"scripts": {
"invoke-publish": "cd ../../../ && npm run build:library && cd dist/ni/nimble-angular && npm publish"
Expand Down Expand Up @@ -31,7 +31,7 @@
"@angular/forms": "^15.2.10",
"@angular/localize": "^15.2.10",
"@angular/router": "^15.2.10",
"@ni/nimble-components": "^21.7.0"
"@ni/nimble-components": "^21.7.1"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down

This file was deleted.

8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/nimble-blazor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-blazor",
"version": "14.3.9",
"version": "14.3.11",
"description": "Blazor components for the NI Nimble Design System",
"scripts": {
"postinstall": "node build/generate-playwright-version-properties/source/index.js",
Expand Down
45 changes: 45 additions & 0 deletions packages/nimble-components/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,51 @@
{
"name": "@ni/nimble-components",
"entries": [
{
"date": "Thu, 29 Feb 2024 07:48:58 GMT",
"version": "21.7.1",
"tag": "@ni/nimble-components_v21.7.1",
"comments": {
"none": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "f3ec1ba17e88c1669c133cb5bebf5cb5ec09546c",
"comment": "Update rendering spec for Wafer Map component with API changes"
}
]
}
},
{
"date": "Wed, 28 Feb 2024 23:45:15 GMT",
"version": "21.7.1",
"tag": "@ni/nimble-components_v21.7.1",
"comments": {
"none": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "62af2a597dbc070a55bbc49194bffbcb72fde5f2",
"comment": "Docs and test for table column header text in span"
}
]
}
},
{
"date": "Wed, 28 Feb 2024 21:22:49 GMT",
"version": "21.7.1",
"tag": "@ni/nimble-components_v21.7.1",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "52693524c553f3b115e6c1004c902d10e7dd4050",
"comment": "Create web worker class for future faster rendering wafer map"
}
]
}
},
{
"date": "Wed, 28 Feb 2024 19:35:04 GMT",
"version": "21.7.0",
Expand Down
10 changes: 9 additions & 1 deletion packages/nimble-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/nimble-components

This log was last generated on Wed, 28 Feb 2024 19:35:04 GMT and should not be manually modified.
This log was last generated on Wed, 28 Feb 2024 21:22:49 GMT and should not be manually modified.

<!-- Start content -->

## 21.7.1

Wed, 28 Feb 2024 21:22:49 GMT

### Patches

- Create web worker class for future faster rendering wafer map ([ni/nimble@5269352](https://github.com/ni/nimble/commit/52693524c553f3b115e6c1004c902d10e7dd4050))

## 21.7.0

Wed, 28 Feb 2024 19:35:04 GMT
Expand Down
2 changes: 1 addition & 1 deletion packages/nimble-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-components",
"version": "21.7.0",
"version": "21.7.1",
"description": "Styled web components for the NI Nimble Design System",
"scripts": {
"build": "npm run generate-icons && npm run generate-workers && npm run build-components && npm run bundle-components && npm run generate-scss && npm run build-storybook",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ interface HeaderContentTableArgs extends SharedTableArgs {
}

const headerContentIntro = 'The content of each column header comes from whatever is slotted in the column element.';
const headerTextContent = `If you provide only text content, Nimble will style it
const headerTextContent = `If you provide only text content (or text content inside a \`<span>\`), Nimble will style it
and add a \`title\` to show a tooltip when truncated.`;
const headerIconContent = 'If you provide icon content, you should set your own `title` on the icon element.';
const headerTitleContent = 'Titles should use "Headline Casing" and Nimble will automatically capitalize them for display in the header.';
Expand Down
14 changes: 14 additions & 0 deletions packages/nimble-components/src/table/tests/table.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,20 @@ describe('Table', () => {
expect(pageObject.getHeaderTitle(0)).toBe(headerContents);
});

it('sets title when header text is ellipsized in a span', async () => {
const headerContents = 'a very long value that should get ellipsized due to not fitting within the default header width';
await element.setData(simpleTableData);
await connect();
await waitForUpdatesAsync();
const span = document.createElement('span');
span.textContent = headerContents;
element.columns[0]!.textContent = '';
element.columns[0]!.appendChild(span);
pageObject.dispatchEventToHeader(0, new MouseEvent('mouseover'));
await waitForUpdatesAsync();
expect(pageObject.getHeaderTitle(0)).toBe(headerContents);
});

it('does not set title when header text is fully visible', async () => {
const headerContents = 'short value';
await element.setData(simpleTableData);
Expand Down
Loading

0 comments on commit 59bdedb

Please sign in to comment.