Skip to content
This repository was archived by the owner on Oct 20, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ ReactDOM.render(Root, document.getElementById('app'));

*To see what is exported from nordnet-ui-kit, please see the documentation below or [index.js](https://github.com/nordnet/nordnet-ui-kit/blob/master/src/index.js)*

## Compatibility

* `v1.5.1` and lower depends on `jss-theme-reactor` and `jss@7`
* `v1.6.0+` depends on `@iamstarkov/jss-theme-reactor` and `jss@8`, so please update your components to use `@iamstarkov/jss-theme-reactor` instead of `jss-theme-reactor`

## Documentation for the latest release is available [here](https://nordnet.github.io/nordnet-ui-kit).

## [Changelog](https://github.com/nordnet/nordnet-ui-kit/blob/master/CHANGELOG.md)
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,9 @@
"homepage": "https://nordnet.github.io/nordnet-ui-kit",
"license": "MIT",
"dependencies": {
"@iamstarkov/jss-theme-reactor": "^0.12.1",
"classnames": "^2.2.3",
"color": "^1.0.3",
"jss": "^7.1.0",
"jss-preset-default": "^2.0.0",
"jss-theme-reactor": "^0.11.1",
"lodash": "^4.17.4",
"prop-types": "^15.5.8",
"react": "^15.5.4",
Expand Down
2 changes: 1 addition & 1 deletion src/components/alert/alert-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

export default createStyleSheet('Alert', theme => {
const { palette, mixins } = theme;
Expand Down
2 changes: 1 addition & 1 deletion src/components/animate/animate.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types';
import React from 'react';
import cn from 'classnames';
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import CSSTransitionGroup from 'react-transition-group/CSSTransitionGroup';
import modifierHeight from './modifierHeight';
import easings from '../../styles/transitions/easings';
Expand Down
2 changes: 1 addition & 1 deletion src/components/animate/animate.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Below is an example of how it behaves when animating.
// component. This was needed to have a toggle button with state.
const React = require('react');
const PropTypes = require('prop-types');
const { createStyleSheet } = require('jss-theme-reactor');
const { createStyleSheet } = require('@iamstarkov/jss-theme-reactor');

const divStyle = { height: 50, padding: 10 };
const outerDivStyle = { backgroundColor: 'tomato', height: 100, padding: 10, color: 'white' };
Expand Down
2 changes: 1 addition & 1 deletion src/components/avatar/avatar.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types';
import React from 'react';
import cn from 'classnames';
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

export const styleSheet = createStyleSheet('Avatar', theme => {
const { palette, typography, mixins } = theme;
Expand Down
2 changes: 1 addition & 1 deletion src/components/badge/badge.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types';
import React from 'react';
import cn from 'classnames';
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

export const styleSheet = createStyleSheet('Badge', theme => {
const { palette, typography, mixins } = theme;
Expand Down
2 changes: 1 addition & 1 deletion src/components/button/button-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import c from 'color';

// This function was created because 'focused' versions on colors were not found in the palette
Expand Down
2 changes: 1 addition & 1 deletion src/components/dropdown/dropdown-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

export default createStyleSheet('Dropdown', theme => {
const { palette, mixins } = theme;
Expand Down
2 changes: 1 addition & 1 deletion src/components/input/help-text.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types';
import React from 'react';
import classNames from 'classnames';
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

const styleSheet = createStyleSheet('HelpText', theme => {
const { palette } = theme;
Expand Down
2 changes: 1 addition & 1 deletion src/components/input/input-checkbox-radio-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

export default createStyleSheet('InputCheckboxRadio', theme => {
const { palette, transitions, mixins } = theme;
Expand Down
2 changes: 1 addition & 1 deletion src/components/input/input-default-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import Color from 'color';

export default createStyleSheet('InputDefault', theme => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/input/input-select-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

export default createStyleSheet('InputSelect', theme => {
const { palette, transitions, mixins } = theme;
Expand Down
2 changes: 1 addition & 1 deletion src/components/labeled-value/labeled-value.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import cn from 'classnames';
import { kebabCase } from 'lodash';
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

export const styleSheet = createStyleSheet('LabeledValue', theme => {
const { palette, typography, mixins } = theme;
Expand Down
2 changes: 1 addition & 1 deletion src/components/li/li.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import classNames from 'classnames';

const styleSheet = createStyleSheet('Li', theme => ({
Expand Down
2 changes: 1 addition & 1 deletion src/components/pane/pane-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

export default createStyleSheet('Pane', theme => {
const { palette, mixins, typography } = theme;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

export default createStyleSheet('SegmentedControl', theme => {
const { palette, typography } = theme;
Expand Down
2 changes: 1 addition & 1 deletion src/components/spinner/spinner-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

const identifier = `spinner-${Math.round(1000 * Math.random())}`;

Expand Down
2 changes: 1 addition & 1 deletion src/components/table/table-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import styleUtils from './style-utilities';

export default createStyleSheet('Table', theme => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/tbody/tbody-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import styleUtils from '../table/style-utilities';

export default createStyleSheet('Tbody', theme => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/td/td-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import styleUtils from '../table/style-utilities';

export default createStyleSheet('Td', theme => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/tfoot/tfoot-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import styleUtils from '../table/style-utilities';

export default createStyleSheet('Tfoot', theme => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/th/th-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import styleUtils from '../table/style-utilities';

export default createStyleSheet('Th', theme => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/thead/thead-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import styleUtils from '../table/style-utilities';
import color from '../../styles/color';

Expand Down
2 changes: 1 addition & 1 deletion src/components/tooltip/tooltip-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';

const zIndexTooltip = 2;

Expand Down
2 changes: 1 addition & 1 deletion src/components/tr/tr-styles.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createStyleSheet } from 'jss-theme-reactor';
import { createStyleSheet } from '@iamstarkov/jss-theme-reactor';
import styleUtils from '../table/style-utilities';
import color from '../../styles/color';

Expand Down
71 changes: 3 additions & 68 deletions src/styles/ThemeProvider.jsx
Original file line number Diff line number Diff line change
@@ -1,70 +1,5 @@
import PropTypes from 'prop-types';
import { Component } from 'react';
import { create as createJss } from 'jss';
import jssPreset from 'jss-preset-default';
import { createStyleManager } from 'jss-theme-reactor/styleManager';
import { createThemeProvider } from '@iamstarkov/jss-theme-reactor/ThemeProvider';
import { createTheme } from './theme';

// https://github.com/callemall/material-ui/tree/next/src/styles

export default class ThemeProvider extends Component {
static propTypes = {
children: PropTypes.node.isRequired,
styleManager: PropTypes.object, // eslint-disable-line react/no-unused-prop-types
theme: PropTypes.object, // eslint-disable-line react/no-unused-prop-types
};

static defaultProps = {
styleManager: null,
theme: null,
};

static childContextTypes = {
styleManager: PropTypes.object.isRequired,
theme: PropTypes.object.isRequired,
};

static createDefaultContext(props = {}) {
const theme = props.theme || createTheme();
const styleManager =
props.styleManager ||
createStyleManager({
theme,
jss: createJss(jssPreset()),
});

return { theme, styleManager };
}

getChildContext() {
const { theme, styleManager } = this;
return {
theme,
styleManager,
};
}

componentWillMount() {
const { theme, styleManager } = ThemeProvider.createDefaultContext(this.props);
this.theme = theme;
this.styleManager = styleManager;
}

componentWillUpdate(nextProps) {
if (this.styleManager !== nextProps.styleManager) {
const { theme, styleManager } = ThemeProvider.createDefaultContext(nextProps);
this.theme = theme;
this.styleManager = styleManager;
} else if (this.theme && nextProps.theme && nextProps.theme !== this.theme) {
this.theme = nextProps.theme;
this.styleManager.updateTheme(this.theme);
}
}

theme = undefined;
styleManager = undefined;

render() {
return this.props.children;
}
}
// https://github.com/RikardGehlin/jss-theme-reactor/blob/master/src/ThemeProvider.js
export default createThemeProvider(createTheme);
56 changes: 0 additions & 56 deletions test/styles/ThemeProvider.test.js

This file was deleted.

Loading