Skip to content

Commit

Permalink
Merge pull request #226 from pxblue/dev
Browse files Browse the repository at this point in the history
Go BLUI
  • Loading branch information
jeffvg authored Nov 10, 2021
2 parents 2582d49 + 4594e7c commit 3722cf0
Show file tree
Hide file tree
Showing 73 changed files with 356 additions and 344 deletions.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
file: './components/coverage/clover.xml'
token: c0991605-ebc1-430d-aa3f-3e134c6a8a0e

# Builds the Storybook app using @pxblue/react-native-components persisted in /dist folder.
# Builds the Storybook app using @brightlayer-ui/react-native-components persisted in /dist folder.
build_storybook:
docker:
- image: circleci/node:12.9.1-browsers
Expand All @@ -89,9 +89,9 @@ jobs:
cd demos/storybook
yarn install --frozen-lockfile
# Install the packed version of @pxblue/react-native-components
# Install the packed version of @brightlayer-ui/react-native-components
PACKAGED_VERSION=`node -p "require('../../dist/package.json').version"`
yarn add ../../dist/pxblue-react-native-components-$PACKAGED_VERSION.tgz
yarn add ../../dist/brightlayer-ui-react-native-components-$PACKAGED_VERSION.tgz
- save_cache:
name: Save Cache
paths:
Expand Down Expand Up @@ -137,9 +137,9 @@ jobs:
cd demos/api
yarn install --frozen-lockfile
# Install the packed version of @pxblue/react-native-components
# Install the packed version of @brightlayer-ui/react-native-components
PACKAGED_VERSION=`node -p "require('../../dist/package.json').version"`
yarn add ../../dist/pxblue-react-native-components-$PACKAGED_VERSION.tgz
yarn add ../../dist/brightlayer-ui-react-native-components-$PACKAGED_VERSION.tgz
- save_cache:
name: Save Cache
paths:
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
command: cat /sys/fs/cgroup/memory/memory.max_usage_in_bytes
when: always

# Builds the Showcase app using @pxblue/react-native-components persisted in /dist folder.
# Builds the Showcase app using @brightlayer-ui/react-native-components persisted in /dist folder.
build_showcase:
docker:
- image: circleci/node:12.9.1-browsers
Expand All @@ -204,9 +204,9 @@ jobs:
cd demos/showcase
yarn install --frozen-lockfile
# Install the packed version of @pxblue/react-native-components
# Install the packed version of @brightlayer-ui/react-native-components
PACKAGED_VERSION=`node -p "require('../../dist/package.json').version"`
yarn add ../../dist/pxblue-react-native-components-$PACKAGED_VERSION.tgz
yarn add ../../dist/brightlayer-ui-react-native-components-$PACKAGED_VERSION.tgz
- save_cache:
name: Save Cache
paths:
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
- DEV_BRANCH: dev
- DEV_TARGET: https://github.com/brightlayer-ui-components/react-native-dev
- MASTER_TARGET: https://github.com/brightlayer-ui-components/react-native
- GH_EMAIL: pxblue@eaton.com
- GH_EMAIL: brightlayer-ui@eaton.com
- GH_NAME: Brightlayer UI Agent
steps:
- checkout
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
echo "//registry.yarnpkg.com/:_authToken=$NPM_TOKEN" >> ~/.npmrc
- run:
name: Publish @pxblue/react-native-components
name: Publish @brightlayer-ui/react-native-components
command: |
yarn publish:package -b $CIRCLE_BRANCH
Expand All @@ -291,7 +291,7 @@ jobs:
at: .
- gh/setup
- run:
name: Tag @pxblue/react-native-components
name: Tag @brightlayer-ui/react-native-components
command: |
yarn tag:package -b $CIRCLE_BRANCH
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "demos/showcase"]
path = demos/showcase
url = https://github.com/pxblue/react-native-showcase-demo
branch = dev
branch = feature/blui
34 changes: 23 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
# Change Log

## v6.0.1 (November 10, 2021)

### Changed

- Changed package namespace from `@pxblue` to `@brightlayer-ui`.

## Package Migration Notice

Previous versions listed after this indicator refer to our deprecated `@pxblue` packages.

---

## v6.0.1 (October 26, 2021)

### Fixed

- Issue with missing color fallback values ([#214](https://github.com/pxblue/react-native-component-library/issues/214)).
- Issue regarding inability to set ref on `<ThemedTextInput>` ([#213](https://github.com/pxblue/react-native-component-library/issues/213)).
- Issue with missing color fallback values ([#214](https://github.com/brightlayer-ui/react-native-component-library/issues/214)).
- Issue regarding inability to set ref on `<ThemedTextInput>` ([#213](https://github.com/brightlayer-ui/react-native-component-library/issues/213)).

## v6.0.0 (October 1, 2021)

Expand All @@ -15,13 +27,13 @@

### Added

- New peerDependency on [@pxblue/react-native-vector-icons](https://www.npmjs.com/package/@pxblue/react-native-vector-icons).
- [Wrapper components](https://github.com/pxblue/react-native-component-library/tree/master/components/src/themed) for various [React Native Paper](https://callstack.github.io/react-native-paper/index.html) components. These greatly simplify the theming mechanism for using our dark theme, but does require updating to version 6+ of our [@pxblue/react-native-themes](https://www.npmjs.com/package/@pxblue/react-native-themes) package.
- New peerDependency on [@brightlayer-ui/react-native-vector-icons](https://www.npmjs.com/package/@brightlayer-ui/react-native-vector-icons).
- [Wrapper components](https://github.com/brightlayer-ui/react-native-component-library/tree/master/components/src/themed) for various [React Native Paper](https://callstack.github.io/react-native-paper/index.html) components. These greatly simplify the theming mechanism for using our dark theme, but does require updating to version 6+ of our [@brightlayer-ui/react-native-themes](https://www.npmjs.com/package/@brightlayer-ui/react-native-themes) package.
- `unitSpace` prop to `<ChannelValue>` to manage spacing between the value and units.

### Changed

- `IconClass` prop for most components has been renamed to `icon` for clarification and has bee extended to support a wider variety of icon formats (see [Icons](https://github.com/pxblue/react-native-component-library/blob/master/docs/Icons.md)]).
- `IconClass` prop for most components has been renamed to `icon` for clarification and has bee extended to support a wider variety of icon formats (see [Icons](https://github.com/brightlayer-ui/react-native-component-library/blob/master/docs/Icons.md)]).
- In `<Hero>` component, `ValueIconClass` prop has been renamed to `valueIcon`.
- In `<ChannelValue>` component, `IconProps` has been replaced with separate props for `iconSize` and `iconColor`.
- In `<Hero>` component, `fontSize`, `value`, `valueIcon`, `valueColor` and `units` props have been replaced by `ChannelValueProps` prop, which will allow you to specify any props on the underlying `<ChannelValue>` component.
Expand All @@ -42,14 +54,14 @@

### Fixed

- Default `iconColor` for `<InfoListItem>` ([#183](https://github.com/pxblue/react-native-component-library/issues/183)).
- Update `<EmptyState>` default icon color to match the design ([#173](https://github.com/pxblue/react-native-component-library/issues/173)).
- Default `iconColor` for `<InfoListItem>` ([#183](https://github.com/brightlayer-ui/react-native-component-library/issues/183)).
- Update `<EmptyState>` default icon color to match the design ([#173](https://github.com/brightlayer-ui/react-native-component-library/issues/173)).

## v5.4.0 (August 20, 2021)

### Added

- Better component sizing for non-avatars in the `<Header>` component ([#189](https://github.com/pxblue/react-native-component-library/issues/189)).
- Better component sizing for non-avatars in the `<Header>` component ([#189](https://github.com/brightlayer-ui/react-native-component-library/issues/189)).

### Removed

Expand All @@ -69,7 +81,7 @@

### Added

- Improved support for using components in landscape orientation ([#76](https://github.com/pxblue/react-native-component-library/issues/76))
- Improved support for using components in landscape orientation ([#76](https://github.com/brightlayer-ui/react-native-component-library/issues/76))
- Improved intellisense popup documentation with links to full component documentation.

### Removed
Expand Down Expand Up @@ -174,7 +186,7 @@

### Changed

- Updated components to use react-native-paper theming (requires @pxblue/react-themes v5.0.0+).
- Updated components to use react-native-paper theming (requires @brightlayer-ui/react-themes v5.0.0+).
- Internal style properties are now override-able via the `styles` prop in each component.
- `fontSize` prop for `<Hero>`, `<ChannelValue>`, and Typography components now takes a `number` instead of a string.
- Renamed some of the typography variants (`<Label>` -> `<Body1>`, `<Subtitle>` -> `<Subtitle2>`) and added some new ones.
Expand All @@ -184,7 +196,7 @@
### Changed

- PX Blue theme is no longer bundled with the component library
- Theme is now available from [@pxblue/themes](https://www.npmjs.com/package/@pxblue/themes)
- Theme is now available from [@brightlayer-ui/themes](https://www.npmjs.com/package/@brightlayer-ui/themes)

## v1.1.0 (October 29, 2019)

Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# PX Blue React Native Components
# Brightlayer UI React Native Components

[![](https://img.shields.io/circleci/project/github/pxblue/react-native-component-library/master.svg?style=flat)](https://circleci.com/gh/pxblue/react-native-component-library/tree/master)
![npm](https://img.shields.io/npm/v/@pxblue/react-native-components?label=%40pxblue%2Freact-native-components)
[![](https://img.shields.io/circleci/project/github/brightlayer-ui/react-native-component-library/master.svg?style=flat)](https://circleci.com/gh/brightlayer-ui/react-native-component-library/tree/master)
![npm](https://img.shields.io/npm/v/@brightlayer-ui/react-native-components?label=%40brightlayer-ui%2Freact-native-components)

This is a library of re-usable React Native components for use in PX Blue applications. For the most part, these components are meant to simplify building your application by providing drop-in components that implement common use cases in PX Blue and eliminate the need for multiple teams to build their own components for these.
This is a library of re-usable React Native components for use in Brightlayer UI applications. For the most part, these components are meant to simplify building your application by providing drop-in components that implement common use cases in Brightlayer UI and eliminate the need for multiple teams to build their own components for these.

Refer to the [Component Library](https://pxblue-components.github.io/react-native/?path=/story/intro-welcome--to-pxblue) API documentation site for a list of available components or see the repository [documentation](https://github.com/pxblue/react-native-component-library/tree/dev/docs) for each individual component.
Refer to the [Component Library](https://brightlayer-ui-components.github.io/react-native/?path=/story/intro-welcome--to-brightlayer-ui) API documentation site for a list of available components or see the repository [documentation](https://github.com/brightlayer-ui/react-native-component-library/tree/dev/docs) for each individual component.

## Installation

To install the PX Blue react native components from NPM as a dependency for your project, you can run the following command in your project root:
To install the Brightlayer UI react native components from NPM as a dependency for your project, you can run the following command in your project root:

```
yarn add @pxblue/react-native-components
yarn add @brightlayer-ui/react-native-components
```

> **NOTE**: This install command will install the package from NPM. If you are a PX Blue developer working with components locally, you will want to follow the manual linking instructions - see below.
> **NOTE**: This install command will install the package from NPM. If you are a Brightlayer UI developer working with components locally, you will want to follow the manual linking instructions - see below.
### Peer Dependencies

Expand All @@ -32,7 +32,7 @@ yarn add react-native-paper@^4.0.0 react-native-safe-area-context@^3.0.0 react-n
To work with this library, first clone down the repository and install dependencies:

```
git clone https://github.com/pxblue/react-native-component-library
git clone https://github.com/brightlayer-ui/react-native-component-library
cd react-native-component-library
```

Expand Down Expand Up @@ -69,18 +69,18 @@ to bring up a API documentation website (no interactive components).

## Using the Components

See the [documentation](https://github.com/pxblue/react-native-component-library/tree/dev/docs) for information on using these components.
See the [documentation](https://github.com/brightlayer-ui/react-native-component-library/tree/dev/docs) for information on using these components.

### Upgrading from version 5 -> 6

Version 6 of this library is a major update with several breaking changes. Most notably, the `IconClass` prop found in most components has been replaced by `icon` and supports more icon formats.

Versions 5.3.x -> 5.4.x have been updated to include warning messages if you are using any deprecated props. We recommend upgrading to 5.4.x and addressing these warnings before upgrading to version 6.

Version 6 also includes a new set of [wrappers](./components/src/themed) around a subset of [React Native Paper](https://callstack.github.io/react-native-paper/index.html) components to provide the correct styles. In order to get the correct appearance, you should use these themed wrapper components instead of the components directly from RNP. These wrapper components should be used in conjunction with version 6+ of [@pxblue/react-native-themes](https://www.npmjs.com/package/@pxblue/react-native-themes), which consolidated our blueDark and blueDarkAlt themes into a single theme for simpler usage.
Version 6 also includes a new set of [wrappers](./components/src/themed) around a subset of [React Native Paper](https://callstack.github.io/react-native-paper/index.html) components to provide the correct styles. In order to get the correct appearance, you should use these themed wrapper components instead of the components directly from RNP. These wrapper components should be used in conjunction with version 6+ of [@brightlayer-ui/react-native-themes](https://www.npmjs.com/package/@brightlayer-ui/react-native-themes), which consolidated our blueDark and blueDarkAlt themes into a single theme for simpler usage.

## NOTES

This component library relies on [react-native-vector-icons](https://github.com/oblador/react-native-vector-icons) and [@pxblue/react-native-vector-icons](https://github.com/pxblue/icons/tree/master/rn-vector) - these libraries must be installed in your project in order to use the PX Blue components.
This component library relies on [react-native-vector-icons](https://github.com/oblador/react-native-vector-icons) and [@brightlayer-ui/react-native-vector-icons](https://github.com/brightlayer-ui/icons/tree/master/rn-vector) - these libraries must be installed in your project in order to use the Brightlayer UI components.

Additionally, if using [@pxblue/icons-svg](https://github.com/pxblue/icons), SVGs must be transformed using [react-native-svg-transformer](https://github.com/kristerkari/react-native-svg-transformer). Follow the instructions on their readme for setting up or start your project using the PX Blue [CLI](https://www.npmjs.com/package/@pxblue/cli) and this will be configured for you automatically.
Additionally, if using [@brightlayer-ui/icons-svg](https://github.com/brightlayer-ui/icons), SVGs must be transformed using [react-native-svg-transformer](https://github.com/kristerkari/react-native-svg-transformer). Follow the instructions on their readme for setting up or start your project using the Brightlayer UI [CLI](https://www.npmjs.com/package/@brightlayer-ui/cli) and this will be configured for you automatically.
2 changes: 1 addition & 1 deletion components/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
parser: '@typescript-eslint/parser',
extends: ['@pxblue/eslint-config/tsx'],
extends: ['@brightlayer-ui/eslint-config/tsx'],
parserOptions: {
project: "./tsconfig.json",
},
Expand Down
30 changes: 15 additions & 15 deletions components/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"name": "@pxblue/react-native-components",
"name": "@brightlayer-ui/react-native-components",
"version": "6.0.1",
"author": "pxblue <pxblue@eaton.com>",
"description": "Reusable React Native components for PX Blue applications",
"author": "brightlayer-ui <brightlayer-ui@eaton.com>",
"description": "Reusable React Native components for Brightlayer UI applications",
"repository": {
"type": "git",
"url": "git+https://github.com/pxblue/react-native-component-library"
"url": "git+https://github.com/brightlayer-ui/react-native-component-library"
},
"keywords": [
"react native",
"components",
"pxblue"
"brightlayer-ui"
],
"bugs": {
"url": "https://github.com/pxblue/react-native-component-library/issues"
"url": "https://github.com/brightlayer-ui/react-native-component-library/issues"
},
"homepage": "https://github.com/pxblue/react-native-component-library#readme",
"homepage": "https://github.com/brightlayer-ui/react-native-component-library#readme",
"license": "BSD-3-Clause",
"main": "core/index.js",
"types": "core/index.d.ts",
Expand All @@ -26,13 +26,13 @@
"test": "jest --maxWorkers=2",
"test:watch": "jest --watch",
"verify-build": "tsc --noEmit",
"watch:showcase": "tsc --p tsconfig.lib.json --watch --outdir ../demos/showcase/node_modules/@pxblue/react-native-components",
"watch:showcase": "tsc --p tsconfig.lib.json --watch --outdir ../demos/showcase/node_modules/@brightlayer-ui/react-native-components",
"prettier": "prettier \"src/**/**.{ts,tsx,js,jsx,json,css,scss,html}\" --write",
"prettier:check": "prettier \"src/**/**.{ts,tsx,js,jsx,json,css,scss,html}\" --check"
},
"prettier": "@pxblue/prettier-config",
"prettier": "@brightlayer-ui/prettier-config",
"dependencies": {
"@pxblue/colors": "^3.0.0",
"@brightlayer-ui/colors": "^3.0.0",
"color": "^3.1.2",
"react-native-collapsible": "^1.5.3",
"react-native-keyboard-aware-scroll-view": "^0.8.0",
Expand All @@ -44,13 +44,13 @@
"react-native-paper": "^4.0.0",
"react-native-safe-area-context": "^3.0.0",
"react-native-vector-icons": "^7.0.0 || ^8.0.0",
"@pxblue/react-native-vector-icons": "^1.0.0"
"@brightlayer-ui/react-native-vector-icons": "^1.0.0"
},
"devDependencies": {
"@pxblue/eslint-config": "^2.0.4",
"@pxblue/icons-svg": "^1.1.0",
"@pxblue/prettier-config": "^1.0.2",
"@pxblue/react-native-vector-icons": "^1.0.0",
"@brightlayer-ui/eslint-config": "^2.0.4",
"@brightlayer-ui/icons-svg": "^1.1.0",
"@brightlayer-ui/prettier-config": "^1.0.2",
"@brightlayer-ui/react-native-vector-icons": "^1.0.0",
"@testing-library/react-native": "^7.2.0",
"@types/color": "^3.0.0",
"@types/faker": "^4.1.5",
Expand Down
2 changes: 1 addition & 1 deletion components/src/core/__types__/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export type IconFunctionProps = IconComponentProps & {

export type IconFamily = {
name: string;
family?: 'material' | 'pxblue' | 'material-community';
family?: 'material' | 'brightlayer-ui' | 'material-community';
direction?: 'rtl' | 'ltr' | 'auto';
allowFontScaling?: boolean;
};
Expand Down
Loading

0 comments on commit 3722cf0

Please sign in to comment.