Skip to content

Commit 93f78a8

Browse files
MarcusNotheisMarcusNotheis
authored
Merge branch 'master' into fix/AnalyticalTable
2 parents 56cb2bc + 9e6173e commit 93f78a8

27 files changed

+324
-111
lines changed

‎CHANGELOG.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,33 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [0.4.2-rc.11](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.10...v0.4.2-rc.11) (2019-08-02)
7+
8+
9+
### Features
10+
11+
* **FilterItem:** Add MultiSelect option to FilterTypes ([#79](https://github.com/SAP/ui5-webcomponents-react/issues/79)) ([0665824](https://github.com/SAP/ui5-webcomponents-react/commit/0665824))
12+
13+
14+
15+
16+
17+
## [0.4.2-rc.10](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.9...v0.4.2-rc.10) (2019-08-02)
18+
19+
20+
### Code Refactoring
21+
22+
* **VariantManagement:** removed unused prop enabled ([#77](https://github.com/SAP/ui5-webcomponents-react/issues/77)) ([5080316](https://github.com/SAP/ui5-webcomponents-react/commit/5080316))
23+
24+
25+
### BREAKING CHANGES
26+
27+
* **VariantManagement:** Removed prop `enabled`, please use `disabled` instead. This change should not affect your applications, because `enabled` was never implemented.
28+
29+
30+
31+
32+
633
## [0.4.2-rc.9](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.8...v0.4.2-rc.9) (2019-07-31)
734

835

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "0.4.2-rc.9",
5+
"version": "0.4.2-rc.11",
66
"npmClient": "yarn",
77
"useWorkspaces": true,
88
"command": {

‎packages/base/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [0.4.2-rc.11](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.10...v0.4.2-rc.11) (2019-08-02)
7+
8+
**Note:** Version bump only for package @ui5/webcomponents-react-base
9+
10+
11+
12+
13+
14+
## [0.4.2-rc.10](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.9...v0.4.2-rc.10) (2019-08-02)
15+
16+
**Note:** Version bump only for package @ui5/webcomponents-react-base
17+
18+
19+
20+
21+
622
## [0.4.2-rc.9](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.8...v0.4.2-rc.9) (2019-07-31)
723

824
**Note:** Version bump only for package @ui5/webcomponents-react-base

‎packages/base/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ui5/webcomponents-react-base",
3-
"version": "0.4.2-rc.9",
3+
"version": "0.4.2-rc.11",
44
"description": "Base for ui5-webcomponents-react",
55
"main": "index.cjs.js",
66
"module": "index.esm.js",

‎packages/charts/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [0.4.2-rc.11](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.10...v0.4.2-rc.11) (2019-08-02)
7+
8+
**Note:** Version bump only for package @ui5/webcomponents-react-charts
9+
10+
11+
12+
13+
14+
## [0.4.2-rc.10](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.9...v0.4.2-rc.10) (2019-08-02)
15+
16+
**Note:** Version bump only for package @ui5/webcomponents-react-charts
17+
18+
19+
20+
21+
622
## [0.4.2-rc.9](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.8...v0.4.2-rc.9) (2019-07-31)
723

824
**Note:** Version bump only for package @ui5/webcomponents-react-charts

‎packages/charts/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ui5/webcomponents-react-charts",
3-
"version": "0.4.2-rc.9",
3+
"version": "0.4.2-rc.11",
44
"description": "Charts for ui5-webcomponents-react",
55
"main": "index.cjs.js",
66
"module": "index.esm.js",
@@ -20,7 +20,7 @@
2020
"@types/chart.js": "^2.7.56"
2121
},
2222
"dependencies": {
23-
"@ui5/webcomponents-react-base": "0.4.2-rc.9",
23+
"@ui5/webcomponents-react-base": "0.4.2-rc.11",
2424
"chart.js": "^2.8.0",
2525
"chartjs-plugin-datalabels": "^0.6.0",
2626
"deepmerge": "^4.0.0",

‎packages/cli/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [0.4.2-rc.11](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.10...v0.4.2-rc.11) (2019-08-02)
7+
8+
**Note:** Version bump only for package @ui5/webcomponents-react-cli
9+
10+
11+
12+
13+
14+
## [0.4.2-rc.10](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.9...v0.4.2-rc.10) (2019-08-02)
15+
16+
**Note:** Version bump only for package @ui5/webcomponents-react-cli
17+
18+
19+
20+
21+
622
## [0.4.2-rc.9](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.8...v0.4.2-rc.9) (2019-07-31)
723

824
**Note:** Version bump only for package @ui5/webcomponents-react-cli

‎packages/cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@ui5/webcomponents-react-cli",
33
"private": true,
4-
"version": "0.4.2-rc.9",
4+
"version": "0.4.2-rc.11",
55
"description": "CLI for creating React Components",
66
"repository": {
77
"type": "git",

‎packages/main/CHANGELOG.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,33 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [0.4.2-rc.11](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.10...v0.4.2-rc.11) (2019-08-02)
7+
8+
9+
### Features
10+
11+
* **FilterItem:** Add MultiSelect option to FilterTypes ([#79](https://github.com/SAP/ui5-webcomponents-react/issues/79)) ([0665824](https://github.com/SAP/ui5-webcomponents-react/commit/0665824))
12+
13+
14+
15+
16+
17+
## [0.4.2-rc.10](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.9...v0.4.2-rc.10) (2019-08-02)
18+
19+
20+
### Code Refactoring
21+
22+
* **VariantManagement:** removed unused prop enabled ([#77](https://github.com/SAP/ui5-webcomponents-react/issues/77)) ([5080316](https://github.com/SAP/ui5-webcomponents-react/commit/5080316))
23+
24+
25+
### BREAKING CHANGES
26+
27+
* **VariantManagement:** Removed prop `enabled`, please use `disabled` instead. This change should not affect your applications, because `enabled` was never implemented.
28+
29+
30+
31+
32+
633
## [0.4.2-rc.9](https://github.com/SAP/ui5-webcomponents-react/compare/v0.4.2-rc.8...v0.4.2-rc.9) (2019-07-31)
734

835

‎packages/main/__karma_snapshots__/FilterBar.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,31 @@
352352
</div>
353353
</div>
354354
</FilterItem>
355+
<FilterItem filterItems={{...}} label="Classification" type="MultiSelect" placeholder="" renderText={[Function: renderText]} onChange={[Function: onChange]} loading={false}>
356+
<div className="FilterItem--filterItem---" style={[undefined]} title={[undefined]}>
357+
<div className="FilterItem--innerFilterItemContainer---">
358+
<Label for="">
359+
<ui5-label for="" class="">
360+
Classification
361+
</ui5-label>
362+
</Label>
363+
<MultiComboBox onSelectionChange={[Function: onMultiCbChange]} value="" placeholder="" valueState="None">
364+
<ui5-multi-combobox value="" placeholder="" value-state="None" class="">
365+
<StandardListItem data-key="1" type="Active" infoState="None">
366+
<ui5-li data-key="1" type="Active" info-state="None" class="">
367+
Text 1
368+
</ui5-li>
369+
</StandardListItem>
370+
<StandardListItem data-key="2" type="Active" infoState="None">
371+
<ui5-li data-key="2" type="Active" info-state="None" class="">
372+
Text 2
373+
</ui5-li>
374+
</StandardListItem>
375+
</ui5-multi-combobox>
376+
</MultiComboBox>
377+
</div>
378+
</div>
379+
</FilterItem>
355380
</div>
356381
</div>
357382
</FilterBar>

0 commit comments

Comments
 (0)