Skip to content

Commit

Permalink
Merge branch 'feat/analytical-table-props' of github.com:SAP/ui5-webc…
Browse files Browse the repository at this point in the history
…omponents-react into feat/analytical-table-props
  • Loading branch information
vbersch committed Sep 18, 2019
2 parents 860af42 + 953099a commit 0787927
Show file tree
Hide file tree
Showing 19 changed files with 495 additions and 9 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.5.1-rc.14](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.13...v0.5.1-rc.14) (2019-09-18)


### Bug Fixes

* **base:** Added missing react peer dependency ([#130](https://github.com/SAP/ui5-webcomponents-react/issues/130)) ([d899f11](https://github.com/SAP/ui5-webcomponents-react/commit/d899f11))


### Features

* **Breadcrumbs:** Initial Component Implementation ([#129](https://github.com/SAP/ui5-webcomponents-react/issues/129)) ([ada4c3a](https://github.com/SAP/ui5-webcomponents-react/commit/ada4c3a))





## [0.5.1-rc.13](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.12...v0.5.1-rc.13) (2019-09-18)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "0.5.1-rc.13",
"version": "0.5.1-rc.14",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
11 changes: 11 additions & 0 deletions packages/base/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.5.1-rc.14](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.13...v0.5.1-rc.14) (2019-09-18)


### Bug Fixes

* **base:** Added missing react peer dependency ([#130](https://github.com/SAP/ui5-webcomponents-react/issues/130)) ([d899f11](https://github.com/SAP/ui5-webcomponents-react/commit/d899f11))





## [0.5.1-rc.13](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.12...v0.5.1-rc.13) (2019-09-18)

**Note:** Version bump only for package @ui5/webcomponents-react-base
Expand Down
5 changes: 4 additions & 1 deletion packages/base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-react-base",
"version": "0.5.1-rc.13",
"version": "0.5.1-rc.14",
"description": "Base for ui5-webcomponents-react",
"main": "index.cjs.js",
"module": "index.esm.js",
Expand All @@ -20,5 +20,8 @@
"hoist-non-react-statics": "^3.3.0",
"react-jss": "10.0.0-alpha.23",
"tslib": "^1.9.3"
},
"peerDependencies": {
"react": "^16.8.0"
}
}
8 changes: 8 additions & 0 deletions packages/charts/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.5.1-rc.14](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.13...v0.5.1-rc.14) (2019-09-18)

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





## [0.5.1-rc.13](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.12...v0.5.1-rc.13) (2019-09-18)

**Note:** Version bump only for package @ui5/webcomponents-react-charts
Expand Down
6 changes: 3 additions & 3 deletions packages/charts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-react-charts",
"version": "0.5.1-rc.13",
"version": "0.5.1-rc.14",
"description": "Charts for ui5-webcomponents-react",
"main": "index.cjs.js",
"module": "index.esm.js",
Expand All @@ -20,8 +20,8 @@
"@types/chart.js": "^2.7.56"
},
"dependencies": {
"@ui5/webcomponents-react": "0.5.1-rc.13",
"@ui5/webcomponents-react-base": "0.5.1-rc.13",
"@ui5/webcomponents-react": "0.5.1-rc.14",
"@ui5/webcomponents-react-base": "0.5.1-rc.14",
"chart.js": "^2.8.0",
"chartjs-plugin-datalabels": "^0.6.0",
"get-best-contrast-color": "^0.3.1",
Expand Down
8 changes: 8 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.5.1-rc.14](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.13...v0.5.1-rc.14) (2019-09-18)

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





## [0.5.1-rc.13](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.12...v0.5.1-rc.13) (2019-09-18)

**Note:** Version bump only for package @ui5/webcomponents-react-cli
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@ui5/webcomponents-react-cli",
"private": true,
"version": "0.5.1-rc.13",
"version": "0.5.1-rc.14",
"description": "CLI for creating React Components",
"repository": {
"type": "git",
Expand Down
11 changes: 11 additions & 0 deletions packages/main/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.5.1-rc.14](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.13...v0.5.1-rc.14) (2019-09-18)


### Features

* **Breadcrumbs:** Initial Component Implementation ([#129](https://github.com/SAP/ui5-webcomponents-react/issues/129)) ([ada4c3a](https://github.com/SAP/ui5-webcomponents-react/commit/ada4c3a))





## [0.5.1-rc.13](https://github.com/SAP/ui5-webcomponents-react/compare/v0.5.1-rc.12...v0.5.1-rc.13) (2019-09-18)


Expand Down
4 changes: 2 additions & 2 deletions packages/main/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui5/webcomponents-react",
"version": "0.5.1-rc.13",
"version": "0.5.1-rc.14",
"description": "React Wrapper for UI5 Web Components and additional components",
"repository": {
"type": "git",
Expand All @@ -20,7 +20,7 @@
},
"dependencies": {
"@ui5/webcomponents": "1.0.0-rc.2",
"@ui5/webcomponents-react-base": "0.5.1-rc.13",
"@ui5/webcomponents-react-base": "0.5.1-rc.14",
"lodash.debounce": "^4.0.8",
"react-table": "7.0.0-beta.0",
"react-toastify": "^5.0.1"
Expand Down
5 changes: 4 additions & 1 deletion packages/main/scripts/create-library-export.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@ const fs = require('fs');
const PATHS = require('../../../config/paths');

const LIB_BASE_PATH = path.resolve(PATHS.packages, 'main', 'src', 'lib');
const INTERNAL_COMPONENTS = ['withWebComponent', 'ScrollContext'];

const allLibFiles = fs
.readdirSync(LIB_BASE_PATH)
.filter((file) => fs.statSync(`${LIB_BASE_PATH}/${file}`).isFile())
.map((file) => path.basename(file, '.ts'));
.map((file) => path.basename(file, '.ts'))
// filter internal components
.filter((file) => !INTERNAL_COMPONENTS.includes(file));

let fileContent = `// This is an autogenerated file, please do not modify this file manually.
// All exported modules have to be made available via the /lib folder.
Expand Down
31 changes: 31 additions & 0 deletions packages/main/src/components/Breadcrumbs/Breadcrumbs.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { mountThemedComponent } from '@shared/tests/utils';
import { Breadcrumbs } from '@ui5/webcomponents-react/lib/Breadcrumbs';
import { BreadcrumbsSeparatorStyle } from '@ui5/webcomponents-react/lib/BreadcrumbsSeparatorStyle';
import { Link } from '@ui5/webcomponents-react/lib/Link';
import React from 'react';

describe('Breadcrumbs', () => {
Object.values(BreadcrumbsSeparatorStyle).forEach((style) => {
test(`separatorStyle: '${style}'`, () => {
const wrapper = mountThemedComponent(
<Breadcrumbs separatorStyle={style}>
<Link>Link 1</Link>
<Link>Link 2</Link>
<Link>Link 3</Link>
</Breadcrumbs>
);
expect(wrapper.render()).toMatchSnapshot();
});
});

test('with currentLocationText', () => {
const wrapper = mountThemedComponent(
<Breadcrumbs currentLocationText="Current Location">
<Link>Link 1</Link>
<Link>Link 2</Link>
<Link>Link 3</Link>
</Breadcrumbs>
);
expect(wrapper.render()).toMatchSnapshot();
});
});
Loading

0 comments on commit 0787927

Please sign in to comment.