Skip to content

Commit

Permalink
Merge branch 'main' into tooltip-implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
aidendk authored Jun 20, 2022
2 parents 5529194 + c1031e3 commit fbb30a3
Show file tree
Hide file tree
Showing 21 changed files with 545 additions and 163 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@ NOTE: To update the component status:
| Text Field - Multiline | [XD](https://xd.adobe.com/view/33ffad4a-eb2c-4241-b8c5-ebfff1faf6f6-66ac/screen/7c146e4b-c7c9-4975-a158-10e6093c522d/) | | [:white_check_mark: - SB](https://ni.github.io/nimble/storybook/?path=/story/text-area--outline-text-area) | :white_check_mark: | :white_check_mark: |
| Text Field - Single | [XD](https://xd.adobe.com/view/33ffad4a-eb2c-4241-b8c5-ebfff1faf6f6-66ac/screen/842889a5-67ba-4350-91c1-55eee48f4fa2/) | | [:white_check_mark: - SB](https://ni.github.io/nimble/storybook/?path=/docs/text-field--text-field) | :white_check_mark: | :white_check_mark: |
| Toggle Icon Button | [XD](https://xd.adobe.com/view/33ffad4a-eb2c-4241-b8c5-ebfff1faf6f6-66ac/screen/d022d8af-22f4-4bf2-981c-1dc0c61afece/) | | [:white_check_mark: - SB](https://ni.github.io/nimble/storybook/?path=/story/toggle-button--icon-button) | :white_check_mark: | :white_check_mark: |
| Toolbar | | [Issue](https://github.com/ni/nimble/issues/411) | [:arrows_counterclockwise: - SB](https://ni.github.io/nimble/storybook/?path=/story/toolbar--toolbar) | :white_check_mark: | :white_check_mark: |
| Toolbar | | [Issue](https://github.com/ni/nimble/issues/411) | [:white_check_mark: - SB](https://ni.github.io/nimble/storybook/?path=/story/toolbar--toolbar) | :white_check_mark: | :white_check_mark: |
| Tooltip | [XD](https://xd.adobe.com/view/33ffad4a-eb2c-4241-b8c5-ebfff1faf6f6-66ac/screen/044414d7-1714-40f2-9679-2ce2c8202d1c/) | [Issue](https://github.com/ni/nimble/issues/309) | :o: | :o: | :o: |
| Tree View | | | [:white_check_mark: - SB](https://ni.github.io/nimble/storybook/?path=/docs/tree-view--tree-view) | :white_check_mark: | :white_check_mark: |
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ p, a {
}

.sub-container > * {
padding-right: $ni-nimble-standard-padding;
margin-right: $ni-nimble-standard-padding;
}

.theme-select {
display: block;
width: 150px;
min-width: unset;
min-width: unset;
}

.drawer-location-select {
Expand Down
60 changes: 60 additions & 0 deletions angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,66 @@
{
"name": "@ni/nimble-angular",
"entries": [
{
"date": "Thu, 16 Jun 2022 18:11:31 GMT",
"tag": "@ni/nimble-angular_v7.1.1",
"version": "7.1.1",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v11.0.4",
"commit": "74a9b600ec41d4a0372dfe863f0ee5705c65aafb"
}
]
}
},
{
"date": "Thu, 16 Jun 2022 17:21:19 GMT",
"tag": "@ni/nimble-angular_v7.1.0",
"version": "7.1.0",
"comments": {
"minor": [
{
"author": "[email protected]",
"package": "@ni/nimble-angular",
"commit": "99097d94dd325e49c9a2e1886c80577c98fa7a63",
"comment": "Export IconStatus enum from nimble-angular"
}
]
}
},
{
"date": "Wed, 15 Jun 2022 19:12:55 GMT",
"tag": "@ni/nimble-angular_v7.0.3",
"version": "7.0.3",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v11.0.3",
"commit": "3a3780e4676fd32ff9d89c0ed7c455c1ce0f6f81"
}
]
}
},
{
"date": "Mon, 13 Jun 2022 22:34:57 GMT",
"tag": "@ni/nimble-angular_v7.0.2",
"version": "7.0.2",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v11.0.2",
"commit": "c930471568477d0b665ce9039cd13a73511b5c8e"
}
]
}
},
{
"date": "Tue, 07 Jun 2022 15:43:41 GMT",
"tag": "@ni/nimble-angular_v7.0.1",
Expand Down
34 changes: 33 additions & 1 deletion angular-workspace/projects/ni/nimble-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,41 @@
# Change Log - @ni/nimble-angular

This log was last generated on Tue, 07 Jun 2022 15:43:41 GMT and should not be manually modified.
This log was last generated on Thu, 16 Jun 2022 18:11:31 GMT and should not be manually modified.

<!-- Start content -->

## 7.1.1

Thu, 16 Jun 2022 18:11:31 GMT

### Patches

- Bump @ni/nimble-components to v11.0.4

## 7.1.0

Thu, 16 Jun 2022 17:21:19 GMT

### Minor changes

- Export IconStatus enum from nimble-angular ([ni/nimble@99097d9](https://github.com/ni/nimble/commit/99097d94dd325e49c9a2e1886c80577c98fa7a63))

## 7.0.3

Wed, 15 Jun 2022 19:12:55 GMT

### Patches

- Bump @ni/nimble-components to v11.0.3

## 7.0.2

Mon, 13 Jun 2022 22:34:57 GMT

### Patches

- Bump @ni/nimble-components to v11.0.2

## 7.0.1

Tue, 07 Jun 2022 15:43:41 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": "7.0.1",
"version": "7.1.1",
"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 All @@ -22,7 +22,7 @@
"@angular/core": "^12.1.0",
"@angular/forms": "^12.1.0",
"@angular/router": "^12.1.0",
"@ni/nimble-components": "^11.0.1"
"@ni/nimble-components": "^11.0.4"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@ export * from './directives/tree-view/nimble-tree-view.directive';
export * from './directives/tree-view/nimble-tree-view.module';
export * from './testing/async-helpers';

// To avoid exporting ButtonAppearance from multiple places, export the enum a single time here.
export { ButtonAppearance } from '@ni/nimble-components/dist/esm/patterns/button/types';
// Export enums that are used by multiple components here to avoid exporting them multiple times.
export { ButtonAppearance } from '@ni/nimble-components/dist/esm/patterns/button/types';
export { IconStatus } from '@ni/nimble-components/dist/esm/icon-base/types';
12 changes: 6 additions & 6 deletions package-lock.json

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

15 changes: 15 additions & 0 deletions packages/beachball-lock-update/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/beachball-lock-update",
"entries": [
{
"date": "Thu, 16 Jun 2022 21:43:10 GMT",
"tag": "@ni/beachball-lock-update_v1.0.2",
"version": "1.0.2",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "@ni/beachball-lock-update",
"commit": "0eb32ef4bb6f1cd2b0d832e85cea9b1a9ca15879",
"comment": "Bump peerDependency version on beachball to uptake security fix"
}
]
}
},
{
"date": "Wed, 12 Jan 2022 18:12:32 GMT",
"tag": "@ni/beachball-lock-update_v1.0.1",
Expand Down
10 changes: 9 additions & 1 deletion packages/beachball-lock-update/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/beachball-lock-update

This log was last generated on Wed, 12 Jan 2022 18:12:32 GMT and should not be manually modified.
This log was last generated on Thu, 16 Jun 2022 21:43:10 GMT and should not be manually modified.

<!-- Start content -->

## 1.0.2

Thu, 16 Jun 2022 21:43:10 GMT

### Patches

- Bump peerDependency version on beachball to uptake security fix ([ni/nimble@0eb32ef](https://github.com/ni/nimble/commit/0eb32ef4bb6f1cd2b0d832e85cea9b1a9ca15879))

## 1.0.1

Wed, 12 Jan 2022 18:12:32 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/beachball-lock-update/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/beachball-lock-update",
"version": "1.0.1",
"version": "1.0.2",
"description": "Beachball script to update package-lock.json files in npm workspace monorepos",
"main": "./src/index.js",
"scripts": {
Expand Down Expand Up @@ -29,6 +29,6 @@
"jasmine": "^3.7.0"
},
"peerDependencies": {
"beachball": "^2.20.0"
"beachball": "~2.22.4"
}
}
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": "5.0.1",
"version": "5.0.4",
"description": "Blazor components for the NI Nimble Design System",
"scripts": {
"build": "npm run generate-icons && npm run build:release && npm run build:client",
Expand Down
75 changes: 75 additions & 0 deletions packages/nimble-components/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,81 @@
{
"name": "@ni/nimble-components",
"entries": [
{
"date": "Thu, 16 Jun 2022 19:45:58 GMT",
"tag": "@ni/nimble-components_v11.0.4",
"version": "11.0.4",
"comments": {
"none": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "4632d79046e86a9efec1a938dab44284ac1de51f",
"comment": "tooltip spec (#309)"
}
]
}
},
{
"date": "Thu, 16 Jun 2022 18:11:31 GMT",
"tag": "@ni/nimble-components_v11.0.4",
"version": "11.0.4",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "74a9b600ec41d4a0372dfe863f0ee5705c65aafb",
"comment": "Fix bug where menu-button could accidentally hide the button's content"
}
]
}
},
{
"date": "Wed, 15 Jun 2022 19:12:55 GMT",
"tag": "@ni/nimble-components_v11.0.3",
"version": "11.0.3",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "3a3780e4676fd32ff9d89c0ed7c455c1ce0f6f81",
"comment": "Keyboard focus styling for select"
}
]
}
},
{
"date": "Mon, 13 Jun 2022 22:34:57 GMT",
"tag": "@ni/nimble-components_v11.0.2",
"version": "11.0.2",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "c930471568477d0b665ce9039cd13a73511b5c8e",
"comment": "Text/Number fields hover indicator grows from middle"
}
]
}
},
{
"date": "Wed, 08 Jun 2022 18:11:53 GMT",
"tag": "@ni/nimble-components_v11.0.1",
"version": "11.0.1",
"comments": {
"none": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "d928589a70a2c14d2845ac81863c6f6f56eade1c",
"comment": "Change test to use IntersectionObserver"
}
]
}
},
{
"date": "Tue, 07 Jun 2022 15:43:41 GMT",
"tag": "@ni/nimble-components_v11.0.1",
Expand Down
26 changes: 25 additions & 1 deletion packages/nimble-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
# Change Log - @ni/nimble-components

This log was last generated on Tue, 07 Jun 2022 15:43:41 GMT and should not be manually modified.
This log was last generated on Thu, 16 Jun 2022 18:11:31 GMT and should not be manually modified.

<!-- Start content -->

## 11.0.4

Thu, 16 Jun 2022 18:11:31 GMT

### Patches

- Fix bug where menu-button could accidentally hide the button's content ([ni/nimble@74a9b60](https://github.com/ni/nimble/commit/74a9b600ec41d4a0372dfe863f0ee5705c65aafb))

## 11.0.3

Wed, 15 Jun 2022 19:12:55 GMT

### Patches

- Keyboard focus styling for select ([ni/nimble@3a3780e](https://github.com/ni/nimble/commit/3a3780e4676fd32ff9d89c0ed7c455c1ce0f6f81))

## 11.0.2

Mon, 13 Jun 2022 22:34:57 GMT

### Patches

- Text/Number fields hover indicator grows from middle ([ni/nimble@c930471](https://github.com/ni/nimble/commit/c930471568477d0b665ce9039cd13a73511b5c8e))

## 11.0.1

Tue, 07 Jun 2022 15:43:41 GMT
Expand Down
Loading

0 comments on commit fbb30a3

Please sign in to comment.