Skip to content

Commit

Permalink
Merge branch 'main' into issue-1420/floating-toolbar
Browse files Browse the repository at this point in the history
  • Loading branch information
sorina-ocheana committed Jan 9, 2024
2 parents b93eb60 + d4b0b60 commit b4780d5
Show file tree
Hide file tree
Showing 65 changed files with 605 additions and 237 deletions.

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

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trimble-oss/modus-angular-components",
"version": "0.9.0-ng14",
"version": "0.11.0-ng14",
"license": "MIT",
"description": "Trimble Modus Angular Components Library",
"homepage": "https://modus-web-components.trimble.com/",
Expand All @@ -14,7 +14,7 @@
"peerDependencies": {
"@angular/common": "^14.1.1",
"@angular/core": "^14.1.1",
"@trimble-oss/modus-web-components": "0.9.0"
"@trimble-oss/modus-web-components": "0.11.0"
},
"dependencies": {
"tslib": "^2.5.3"
Expand Down

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

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trimble-oss/modus-angular-components",
"version": "0.9.0-ng15",
"version": "0.11.0-ng15",
"license": "MIT",
"description": "Trimble Modus Angular Components Library",
"homepage": "https://modus-web-components.trimble.com/",
Expand All @@ -14,7 +14,7 @@
"peerDependencies": {
"@angular/common": "^15.2.9",
"@angular/core": "^15.2.9",
"@trimble-oss/modus-web-components": "0.9.0"
"@trimble-oss/modus-web-components": "0.11.0"
},
"dependencies": {
"tslib": "^2.5.3"
Expand Down

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

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@trimble-oss/modus-angular-components",
"version": "0.9.0-ng16",
"version": "0.11.0-ng16",
"license": "MIT",
"description": "Trimble Modus Angular Components Library",
"homepage": "https://modus-web-components.trimble.com/",
Expand All @@ -14,7 +14,7 @@
"peerDependencies": {
"@angular/common": "^16.1.7",
"@angular/core": "^16.1.7",
"@trimble-oss/modus-web-components": "0.9.0"
"@trimble-oss/modus-web-components": "0.11.0"
},
"dependencies": {
"tslib": "^2.5.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,15 +225,15 @@ export declare interface ModusCard extends Components.ModusCard {}


@ProxyCmp({
inputs: ['ariaLabel', 'checked', 'disabled', 'indeterminate', 'label', 'stopPropagation', 'tabIndexValue'],
inputs: ['ariaLabel', 'checked', 'disabled', 'indeterminate', 'label', 'size', 'stopPropagation', 'tabIndexValue'],
methods: ['focusCheckbox']
})
@Component({
selector: 'modus-checkbox',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['ariaLabel', 'checked', 'disabled', 'indeterminate', 'label', 'stopPropagation', 'tabIndexValue'],
inputs: ['ariaLabel', 'checked', 'disabled', 'indeterminate', 'label', 'size', 'stopPropagation', 'tabIndexValue'],
})
export class ModusCheckbox {
protected el: HTMLElement;
Expand Down Expand Up @@ -395,14 +395,14 @@ export declare interface ModusDatePicker extends Components.ModusDatePicker {}


@ProxyCmp({
inputs: ['animateList', 'ariaLabel', 'customPlacement', 'disabled', 'placement', 'toggleElementId']
inputs: ['animateList', 'ariaLabel', 'customPlacement', 'disabled', 'placement', 'showDropdownListBorder', 'toggleElementId']
})
@Component({
selector: 'modus-dropdown',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['animateList', 'ariaLabel', 'customPlacement', 'disabled', 'placement', 'toggleElementId'],
inputs: ['animateList', 'ariaLabel', 'customPlacement', 'disabled', 'placement', 'showDropdownListBorder', 'toggleElementId'],
})
export class ModusDropdown {
protected el: HTMLElement;
Expand Down Expand Up @@ -501,15 +501,15 @@ export declare interface ModusList extends Components.ModusList {}


@ProxyCmp({
inputs: ['borderless', 'disabled', 'selected', 'size', 'type'],
inputs: ['borderless', 'disabled', 'selected', 'size', 'subText', 'type', 'wrapSubText'],
methods: ['focusItem']
})
@Component({
selector: 'modus-list-item',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['borderless', 'disabled', 'selected', 'size', 'type'],
inputs: ['borderless', 'disabled', 'selected', 'size', 'subText', 'type', 'wrapSubText'],
})
export class ModusListItem {
protected el: HTMLElement;
Expand Down Expand Up @@ -655,7 +655,7 @@ export declare interface ModusNavbar extends Components.ModusNavbar {
/**
* An event that fires on profile menu sign out click.
*/
profileMenuSignOutClick: EventEmitter<CustomEvent<MouseEvent>>;
profileMenuSignOutClick: EventEmitter<CustomEvent<KeyboardEvent | MouseEvent>>;
/**
* An event that fires on search value change.
*/
Expand Down Expand Up @@ -900,14 +900,14 @@ export declare interface ModusProgressBar extends Components.ModusProgressBar {}


@ProxyCmp({
inputs: ['ariaLabel', 'checkedId', 'name', 'radioButtons']
inputs: ['ariaLabel', 'checkedId', 'name', 'radioButtons', 'size']
})
@Component({
selector: 'modus-radio-group',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['ariaLabel', 'checkedId', 'name', 'radioButtons'],
inputs: ['ariaLabel', 'checkedId', 'name', 'radioButtons', 'size'],
})
export class ModusRadioGroup {
protected el: HTMLElement;
Expand Down Expand Up @@ -1104,14 +1104,14 @@ export declare interface ModusSpinner extends Components.ModusSpinner {}


@ProxyCmp({
inputs: ['ariaLabel', 'checked', 'disabled', 'label']
inputs: ['ariaLabel', 'checked', 'disabled', 'label', 'size']
})
@Component({
selector: 'modus-switch',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['ariaLabel', 'checked', 'disabled', 'label'],
inputs: ['ariaLabel', 'checked', 'disabled', 'label', 'size'],
})
export class ModusSwitch {
protected el: HTMLElement;
Expand All @@ -1132,15 +1132,15 @@ export declare interface ModusSwitch extends Components.ModusSwitch {


@ProxyCmp({
inputs: ['columnReorder', 'columnResize', 'columns', 'data', 'density', 'displayOptions', 'fullWidth', 'hover', 'manualPaginationOptions', 'manualSortingOptions', 'maxHeight', 'maxWidth', 'pageSizeList', 'pagination', 'rowActions', 'rowSelection', 'rowSelectionOptions', 'rowsExpandable', 'showSortIconOnHover', 'sort', 'summaryRow', 'toolbar', 'toolbarOptions'],
inputs: ['columnReorder', 'columnResize', 'columns', 'data', 'defaultSort', 'density', 'displayOptions', 'fullWidth', 'hover', 'manualPaginationOptions', 'manualSortingOptions', 'maxHeight', 'maxWidth', 'pageSizeList', 'pagination', 'rowActions', 'rowSelection', 'rowSelectionOptions', 'rowsExpandable', 'showSortIconOnHover', 'sort', 'summaryRow', 'toolbar', 'toolbarOptions'],
methods: ['getColumnData', 'toggleColumnVisibility']
})
@Component({
selector: 'modus-table',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['columnReorder', 'columnResize', 'columns', 'data', 'density', 'displayOptions', 'fullWidth', 'hover', 'manualPaginationOptions', 'manualSortingOptions', 'maxHeight', 'maxWidth', 'pageSizeList', 'pagination', 'rowActions', 'rowSelection', 'rowSelectionOptions', 'rowsExpandable', 'showSortIconOnHover', 'sort', 'summaryRow', 'toolbar', 'toolbarOptions'],
inputs: ['columnReorder', 'columnResize', 'columns', 'data', 'defaultSort', 'density', 'displayOptions', 'fullWidth', 'hover', 'manualPaginationOptions', 'manualSortingOptions', 'maxHeight', 'maxWidth', 'pageSizeList', 'pagination', 'rowActions', 'rowSelection', 'rowSelectionOptions', 'rowsExpandable', 'showSortIconOnHover', 'sort', 'summaryRow', 'toolbar', 'toolbarOptions'],
})
export class ModusTable {
protected el: HTMLElement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Component, OnInit } from '@angular/core';
<modus-card>
<div style="padding:10px">
<h4 id="card-title">Card title</h4>
<h5 id="card-subtitle">Card subtitle</h5>
<h5>Card subtitle</h5>
<p>Some quick example text to build on the card title and make up the bulk of the card's content.</p>
<modus-button color="primary">Go somewhere</modus-button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Component, OnInit } from '@angular/core';
<modus-card>
<div style="padding:10px">
<h4 id="card-title">Card title</h4>
<h5 id="card-subtitle">Card subtitle</h5>
<h5>Card subtitle</h5>
<p>Some quick example text to build on the card title and make up the bulk of the card's content.</p>
<modus-button color="primary">Go somewhere</modus-button>
</div>
Expand Down
8 changes: 4 additions & 4 deletions angular-workspace/test-web-components/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 angular-workspace/test-web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@angular/platform-browser": "^15.2.9",
"@angular/platform-browser-dynamic": "^15.2.9",
"@angular/router": "^15.2.9",
"@trimble-oss/modus-web-components": "0.8.0",
"@trimble-oss/modus-web-components": "0.11.0",
"rxjs": "~7.8.1",
"tslib": "^2.5.3",
"zone.js": "~0.12.0"
Expand Down
Loading

0 comments on commit b4780d5

Please sign in to comment.