Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade dependencies #480

Merged
merged 5 commits into from Dec 10, 2019
Merged

Upgrade dependencies #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
acb0dee
Upgrade dependencies
thyhjwb6 Dec 10, 2019
6c386c8
Fix serialize-javascript security vulnerability
thyhjwb6 Dec 10, 2019
f677643
Remove use of empty functions
thyhjwb6 Dec 10, 2019
b4beab0
Reduce code complexity
thyhjwb6 Dec 10, 2019
709934b
Update Button docs as onClick is not required
thyhjwb6 Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -23,7 +23,8 @@
},
"resolutions": {
"**/**/handlebars": "^4.5.3",
"**/**/mem": "^4.0.0"
"**/**/mem": "^4.0.0",
"**/**/terser-webpack-plugin": "^1.4.2"
},
"prettier": {
"bracketSpacing": true,
Expand Down
25 changes: 13 additions & 12 deletions packages/docs-site/package.json
View file
Open in desktop
Expand Up @@ -43,20 +43,21 @@
"@royalnavy/icon-library": "^1.8.0",
"@royalnavy/react-component-library": "^1.8.0",
"change-case": "^3.1.0",
"formik": "^2.0.6",
"gatsby": "^2.18.5",
"eslint-plugin-import": "2.18.2",
"formik": "^2.0.7",
"gatsby": "^2.18.8",
"gatsby-image": "^2.2.34",
"gatsby-plugin-catch-links": "^2.1.19",
"gatsby-plugin-manifest": "^2.2.30",
"gatsby-plugin-mdx": "^1.0.58",
"gatsby-plugin-offline": "^3.0.25",
"gatsby-plugin-manifest": "^2.2.31",
"gatsby-plugin-mdx": "^1.0.59",
"gatsby-plugin-offline": "^3.0.27",
"gatsby-plugin-react-helmet": "^3.1.16",
"gatsby-plugin-sass": "^2.1.24",
"gatsby-plugin-sass-resources": "^2.0.0",
"gatsby-plugin-sharp": "^2.3.4",
"gatsby-plugin-sharp": "^2.3.5",
"gatsby-plugin-styled-components": "^3.1.14",
"gatsby-source-filesystem": "^2.1.39",
"gatsby-transformer-sharp": "^2.3.6",
"gatsby-source-filesystem": "^2.1.40",
"gatsby-transformer-sharp": "^2.3.7",
"lodash": "^4.17.15",
"mixin-deep": "^2.0.1",
"normalize-scss": "^7.0.1",
Expand All @@ -70,7 +71,7 @@
"uuid": "^3.3.3"
},
"devDependencies": {
"@babel/core": "^7.7.4",
"@babel/core": "^7.7.5",
"@royalnavy/eslint-config-react": "^1.8.0",
"@svgr/cli": "^4.3.3",
"@testing-library/jest-dom": "^4.2.4",
Expand All @@ -79,16 +80,16 @@
"babel-jest": "^24.9.0",
"babel-plugin-styled-components": "^1.10.6",
"babel-preset-gatsby": "^0.2.23",
"eslint": "^6.7.1",
"eslint": "^6.7.2",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.7.0",
"eslint-junit": "^1.0.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jest": "^23.0.5",
"eslint-plugin-jest": "^23.1.1",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-react": "^7.17.0",
"firebase-tools": "^7.8.1",
"firebase-tools": "^7.9.0",
"formik": "^2.0.3",
"identity-obj-proxy": "^3.0.0",
"jest": "^24.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs-site/src/library/pages/components/button.md
View file
Open in desktop
Expand Up @@ -208,7 +208,7 @@ source={`<Button onClick={action} icon={<TriangleDown />}>Closed</Button>
{
Name: 'onClick',
Type: '(event: React.SyntheticEvent):void',
Required: 'True',
Required: 'False',
Default: '',
Description: 'Function to call when a user clicks on a button',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-react/package.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"node": ">=10.13.0 <13"
},
"devDependencies": {
"eslint": "^6.7.1",
"eslint": "^6.7.2",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.7.0",
"eslint-plugin-import": "^2.18.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/icon-library/package.json
View file
Open in desktop
Expand Up @@ -26,17 +26,17 @@
"react": "^16.12.0"
},
"devDependencies": {
"@babel/cli": "^7.7.4",
"@babel/core": "^7.7.4",
"@babel/preset-env": "^7.7.4",
"@babel/cli": "^7.7.5",
"@babel/core": "^7.7.5",
"@babel/preset-env": "^7.7.6",
"@babel/preset-react": "^7.7.4",
"@babel/preset-typescript": "^7.7.4",
"@svgr/cli": "^4.3.3",
"babel-loader": "^8.0.6",
"clean-webpack-plugin": "^3.0.0",
"npm-run-all": "^4.1.5",
"source-map-loader": "^0.2.4",
"typescript": "^3.7.2",
"typescript": "^3.7.3",
"webpack": "^4.41.2",
"webpack-cli": "^3.3.10",
"webpack-merge": "^4.2.2"
Expand Down
41 changes: 21 additions & 20 deletions packages/react-component-library/package.json
View file
Open in desktop
Expand Up @@ -40,55 +40,55 @@
"*.@(js|jsx|ts|tsx)": "eslint"
},
"devDependencies": {
"@babel/cli": "^7.7.4",
"@babel/core": "^7.7.4",
"@babel/cli": "^7.7.5",
"@babel/core": "^7.7.5",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-object-rest-spread": "^7.7.4",
"@babel/plugin-transform-modules-commonjs": "^7.7.4",
"@babel/preset-env": "^7.7.4",
"@babel/plugin-transform-modules-commonjs": "^7.7.5",
"@babel/preset-env": "^7.7.6",
"@babel/preset-react": "^7.7.4",
"@babel/preset-typescript": "^7.7.4",
"@royalnavy/storybook-react-input-state": "^1.8.0",
"@storybook/addon-actions": "^5.2.6",
"@storybook/addon-knobs": "^5.2.6",
"@storybook/addon-links": "^5.2.6",
"@storybook/addons": "^5.2.6",
"@storybook/react": "^5.2.6",
"@storybook/addon-actions": "^5.2.8",
"@storybook/addon-knobs": "^5.2.8",
"@storybook/addon-links": "^5.2.8",
"@storybook/addons": "^5.2.8",
"@storybook/react": "^5.2.8",
"@svgr/webpack": "^4.3.3",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@types/classnames": "^2.2.9",
"@types/enzyme": "^3.10.3",
"@types/enzyme": "^3.10.4",
"@types/enzyme-adapter-react-16": "^1.0.5",
"@types/jest": "^24.0.23",
"@types/jsdom": "^12.2.4",
"@types/lodash": "^4.14.149",
"@types/node": "^12.12.14",
"@types/react": "^16.9.13",
"@types/node": "^12.12.16",
"@types/react": "^16.9.16",
"@types/react-addons-css-transition-group": "^15.0.5",
"@types/react-dom": "^16.9.4",
"@types/react-select": "^3.0.8",
"@types/storybook__react": "^4.0.2",
"@types/uuid": "^3.4.6",
"@types/yup": "^0.26.26",
"@typescript-eslint/eslint-plugin": "^2.9.0",
"@typescript-eslint/eslint-plugin": "^2.11.0",
"babel-loader": "^8.0.6",
"babel-polyfill": "^6.26.0",
"clean-webpack-plugin": "^3.0.0",
"concurrently": "^5.0.0",
"css-loader": "^3.2.0",
"eslint": "^6.7.1",
"concurrently": "^5.0.1",
"css-loader": "^3.3.0",
"eslint": "^6.7.2",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.7.0",
"eslint-junit": "^1.0.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jest": "^23.0.5",
"eslint-plugin-jest": "^23.1.1",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-react": "^7.17.0",
"express": "^4.17.1",
"file-loader": "^4.3.0",
"formik": "^2.0.6",
"formik": "^2.0.7",
"html-webpack-plugin": "^3.2.0",
"image-webpack-loader": "^6.0.0",
"jest": "^24.9.0",
Expand All @@ -104,7 +104,7 @@
"sass-loader": "^8.0.0",
"source-map-loader": "^0.2.4",
"style-loader": "^1.0.1",
"typescript": "^3.7.2",
"typescript": "^3.7.3",
"webpack": "^4.41.2",
"webpack-bundle-analyzer": "^3.6.0",
"webpack-cli": "^3.3.10",
Expand All @@ -128,12 +128,13 @@
"@types/react-responsive": "^8.0.2",
"classnames": "^2.2.6",
"date-fns": "^2.8.1",
"eslint-plugin-import": "2.18.2",
"react-addons-css-transition-group": "^15.6.2",
"react-children-utilities": "^1.3.3",
"react-compound-slider": "^2.4.0",
"react-indiana-drag-scroll": "^1.5.2",
"react-responsive": "^8.0.1",
"react-select": "^3.0.8",
"react-tether": "^2.0.5"
"react-tether": "^2.0.6"
}
}
21 changes: 21 additions & 0 deletions packages/react-component-library/src/components/Button/Button.test.tsx
View file
Open in desktop
Expand Up @@ -49,6 +49,27 @@ describe('Button', () => {
})
})

describe('when the onClick callback has not been specified', () => {
beforeEach(() => {
wrapper = render(<Button>Click me</Button>)
button = wrapper.getByText('Click me').parentElement
})

describe('when the button is clicked', () => {
beforeEach(() => {
fireEvent.click(button, {
target: {
blur: blurSpy,
},
})
})

it('should blur the button so it does not remain active', () => {
expect(blurSpy).toHaveBeenCalledTimes(1)
})
})
})

describe('when the size is specified', () => {
it.each`
size | expected
Expand Down
7 changes: 5 additions & 2 deletions packages/react-component-library/src/components/Button/Button.tsx
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ export const Button: React.FC<ButtonProps> = ({
color,
disabled,
icon,
onClick = () => {},
onClick,
size = 'regular',
type = 'button',
variant,
Expand All @@ -39,7 +39,10 @@ export const Button: React.FC<ButtonProps> = ({
type={type}
onClick={e => {
e.currentTarget.blur()
onClick(e)

if (onClick) {
onClick(e)
}
}}
{...rest}
>
Expand Down
23 changes: 22 additions & 1 deletion packages/react-component-library/src/components/NumberInput/NumberInput.test.tsx
View file
Open in desktop
Expand Up @@ -12,7 +12,6 @@ describe('NumberInput', () => {
props = {
name: 'balloons',
onChange: jest.fn(),
onBlur: jest.fn(),
}

wrapper = undefined
Expand Down Expand Up @@ -485,4 +484,26 @@ describe('NumberInput', () => {
})
})
})

describe('when the onBlur callback has been specified', () => {
let onBlurSpy: jest.SpyInstance

beforeEach(() => {
props.onBlur = () => { return true }
onBlurSpy = jest.spyOn(props, 'onBlur')

wrapper = render(<NumberInput {...props} />)
})

describe('when the number input loses focus', () => {
beforeEach(() => {
wrapper.getByTestId('number-input-input').focus()
wrapper.getByTestId('number-input-increase').focus()
})

it('should call the onBlur callback once', () => {
expect(onBlurSpy).toHaveBeenCalledTimes(1)
})
})
})
})
7 changes: 5 additions & 2 deletions packages/react-component-library/src/components/NumberInput/NumberInput.tsx
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ export const NumberInput: React.FC<NumberInputProps> = ({
max,
min,
name,
onBlur = () => {},
onBlur,
onChange,
placeholder = '',
step = 1,
Expand Down Expand Up @@ -116,7 +116,10 @@ export const NumberInput: React.FC<NumberInputProps> = ({

const onLocalBlur = (event: React.FormEvent) => {
setFocus(false)
onBlur(event)

if (onBlur) {
onBlur(event)
}
}

const EndAdornment = (
Expand Down
8 changes: 6 additions & 2 deletions packages/react-component-library/src/components/TabSet/TabSet.test.tsx
View file
Open in desktop
Expand Up @@ -18,7 +18,9 @@ describe('TabSet', () => {
beforeEach(() => {
const props = {
className: 'rn-tab-set--modifier',
onChangeCallback: () => {},
onChangeCallback: () => {
return true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume the empty functions here are just being used to stop it from failing loudly where a prop is required? Is this change because of a new lint rule or were these warnings?

},
}

onChangeSpy = jest.spyOn(props, 'onChangeCallback')
Expand Down Expand Up @@ -130,7 +132,9 @@ describe('TabSet', () => {
)

const tabs = wrapper.getByTestId('tabs')
tabs.scrollTo = () => {}
tabs.scrollTo = () => {
return true
}

scrollToSpy = jest
.spyOn(tabs, 'scrollTo')
Expand Down
33 changes: 31 additions & 2 deletions packages/react-component-library/src/components/TextArea/TextArea.test.tsx
View file
Open in desktop
Expand Up @@ -17,8 +17,8 @@ describe('TextArea', () => {
field = {
name: 'colour',
value: '',
onChange: jest.fn(),
onBlur: jest.fn(),
onBlur: null,
onChange: jest.fn()
}

form = {
Expand Down Expand Up @@ -187,4 +187,33 @@ describe('TextArea', () => {
)
})
})

describe('when the onBlur callback is provided', () => {
let onBlurSpy: jest.SpyInstance

beforeEach(() => {
field.onBlur = () => {
return true
}
onBlurSpy = jest.spyOn(field, 'onBlur')

textInput = render(
<div>
<TextArea {...field} />
<input type="text" data-testid="next-field" />
</div>
)
})

describe('when the text area loses focus', () => {
beforeEach(() => {
textInput.getByTestId('textarea-input').focus()
textInput.getByTestId('next-field').focus()
})

it('should call the onBlur callback once', () => {
expect(onBlurSpy).toHaveBeenCalledTimes(1)
})
})
})
})