shinkansen-cogs 1.5.75 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "shinkansen-cogs",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.6.0",
|
|
4
4
|
"description": "Shinkansen Cogs",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Shinkansen",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"lint": "cross-env NODE_ENV=production eslint . .storybook --ext .mjs --ext .cjs --ext .jsx --ext .mts --ext .cts",
|
|
34
34
|
"lint:fix": "npm run lint -- --fix",
|
|
35
35
|
"pretest": "npm run nvm",
|
|
36
|
-
"test": "cross-env NODE_ENV=test jest --collect-coverage false --
|
|
36
|
+
"test": "cross-env NODE_ENV=test jest --collect-coverage false --run-in-band",
|
|
37
37
|
"nvm": "bash nvm.sh",
|
|
38
38
|
"storybook": "npm run build && npm run transform && start-storybook -p 6006",
|
|
39
39
|
"prepare": "husky install"
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"classnames": "^2.3.2",
|
|
43
43
|
"debug": "^4.3.4",
|
|
44
|
-
"
|
|
44
|
+
"fast-deep-equal": "^3.1.3"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@babel/core": "^7.21.8",
|
|
@@ -69,8 +69,6 @@
|
|
|
69
69
|
"cross-env": "^7.0.3",
|
|
70
70
|
"cssnano": "^6.0.1",
|
|
71
71
|
"del": "^7.0.0",
|
|
72
|
-
"enzyme": "^3.11.0",
|
|
73
|
-
"enzyme-adapter-react-16": "^1.15.7",
|
|
74
72
|
"eslint": "^8.40.0",
|
|
75
73
|
"eslint-config-standard": "^17.0.0",
|
|
76
74
|
"eslint-config-standard-with-typescript": "^34.0.1",
|
|
@@ -97,10 +95,10 @@
|
|
|
97
95
|
"postcss-map": "^0.11.0",
|
|
98
96
|
"postcss-normalize": "^10.0.1",
|
|
99
97
|
"postcss-scss": "^4.0.6",
|
|
100
|
-
"prop-types": "15.
|
|
101
|
-
"react": "
|
|
102
|
-
"react-dom": "
|
|
103
|
-
"react-test-renderer": "
|
|
98
|
+
"prop-types": "^15.8.1",
|
|
99
|
+
"react": "^18.2.0",
|
|
100
|
+
"react-dom": "^18.2.0",
|
|
101
|
+
"react-test-renderer": "^18.2.0",
|
|
104
102
|
"regenerator-runtime": "^0.13.11",
|
|
105
103
|
"rimraf": "^5.0.0",
|
|
106
104
|
"sass": "^1.62.1",
|
|
@@ -3,14 +3,14 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import React, { Component } from 'react'
|
|
5
5
|
import PropTypes from 'prop-types'
|
|
6
|
-
import
|
|
6
|
+
import equal from 'fast-deep-equal'
|
|
7
7
|
|
|
8
8
|
import transform from 'shinkansen-cogs/transformers/error-message'
|
|
9
9
|
|
|
10
10
|
import TextContent from 'shinkansen-cogs/components/common/text-content'
|
|
11
11
|
|
|
12
12
|
export default class ErrorMessage extends Component {
|
|
13
|
-
state = {
|
|
13
|
+
state = {}
|
|
14
14
|
|
|
15
15
|
hasTextContent () {
|
|
16
16
|
const { errorMessage } = this.props
|
|
@@ -36,24 +36,24 @@ export default class ErrorMessage extends Component {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
/**
|
|
39
|
-
*
|
|
39
|
+
* Merge latest `props` to `state`
|
|
40
40
|
*
|
|
41
|
-
* @param {
|
|
42
|
-
* @param {
|
|
41
|
+
* @param {{errorMessage?: CogsTypes.ErrorDefinitionType}} props Latest props
|
|
42
|
+
* @param {{errorMessage?: CogsTypes.ErrorDefinitionType}} state Current state
|
|
43
|
+
* @returns {{errorMessage: CogsTypes.ErrorDefinitionType | void}}
|
|
43
44
|
*/
|
|
44
45
|
static getDerivedStateFromProps ({ errorMessage }, { errorMessage: E }) {
|
|
45
|
-
const e = Immutable.Map(errorMessage)
|
|
46
|
-
|
|
47
46
|
return {
|
|
48
|
-
errorMessage:
|
|
47
|
+
errorMessage: equal(E, errorMessage) ? E : errorMessage
|
|
49
48
|
}
|
|
50
49
|
}
|
|
51
50
|
|
|
52
51
|
/**
|
|
53
|
-
* Compare
|
|
52
|
+
* Compare current and latest `state` for changes to `errorMessage`
|
|
54
53
|
*
|
|
55
|
-
* @param {
|
|
56
|
-
* @param {
|
|
54
|
+
* @param {{errorMessage?: CogsTypes.ErrorDefinitionType}} props Latest props
|
|
55
|
+
* @param {{errorMessage?: CogsTypes.ErrorDefinitionType}} state Latest state
|
|
56
|
+
* @returns {boolean}
|
|
57
57
|
*/
|
|
58
58
|
shouldComponentUpdate (props, state) {
|
|
59
59
|
const {
|
|
@@ -64,7 +64,7 @@ export default class ErrorMessage extends Component {
|
|
|
64
64
|
errorMessage: E
|
|
65
65
|
} = this.state
|
|
66
66
|
|
|
67
|
-
return (e
|
|
67
|
+
return !equal(E, e)
|
|
68
68
|
}
|
|
69
69
|
|
|
70
70
|
renderTextContent () {
|