From 6ad5b04e1486580529234a79a51d6280044cc310 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sat, 8 Aug 2020 11:10:40 -0400 Subject: [PATCH] chore(*): unify react-base16-styling versions (#566) --- .../react-json-tree/examples/package.json | 2 +- packages/react-json-tree/package.json | 2 +- packages/react-json-tree/src/index.js | 13 +------ .../redux-devtools-inspector/package.json | 2 +- .../src/DevtoolsInspector.js | 6 ++- yarn.lock | 38 +------------------ 6 files changed, 10 insertions(+), 53 deletions(-) diff --git a/packages/react-json-tree/examples/package.json b/packages/react-json-tree/examples/package.json index 53893a0b..68887f44 100644 --- a/packages/react-json-tree/examples/package.json +++ b/packages/react-json-tree/examples/package.json @@ -38,7 +38,7 @@ "dependencies": { "immutable": "^3.8.2", "react": "^16.13.1", - "react-base16-styling": "^0.5.3", + "react-base16-styling": "^0.6.0", "react-dom": "^16.13.1", "react-json-tree": "^0.12.0" } diff --git a/packages/react-json-tree/package.json b/packages/react-json-tree/package.json index 37940d77..2a01a8db 100644 --- a/packages/react-json-tree/package.json +++ b/packages/react-json-tree/package.json @@ -60,6 +60,6 @@ }, "dependencies": { "prop-types": "^15.7.2", - "react-base16-styling": "^0.5.1" + "react-base16-styling": "^0.6.0" } } diff --git a/packages/react-json-tree/src/index.js b/packages/react-json-tree/src/index.js index 0d8d351f..0f00480e 100644 --- a/packages/react-json-tree/src/index.js +++ b/packages/react-json-tree/src/index.js @@ -62,18 +62,9 @@ function checkLegacyTheming(theme, props) { function getStateFromProps(props) { let theme = checkLegacyTheming(props.theme, props); if (props.invertTheme) { - if (typeof theme === 'string') { - theme = `${theme}:inverted`; - } else if (theme && theme.extend) { - if (typeof theme === 'string') { - theme = { ...theme, extend: `${theme.extend}:inverted` }; - } else { - theme = { ...theme, extend: invertTheme(theme.extend) }; - } - } else if (theme) { - theme = invertTheme(theme); - } + theme = invertTheme(theme); } + return { styling: createStylingFromTheme(theme) }; diff --git a/packages/redux-devtools-inspector/package.json b/packages/redux-devtools-inspector/package.json index 60f46c8d..0de342db 100644 --- a/packages/redux-devtools-inspector/package.json +++ b/packages/redux-devtools-inspector/package.json @@ -76,7 +76,7 @@ "jss-vendor-prefixer": "^4.0.0", "lodash.debounce": "^4.0.8", "prop-types": "^15.7.2", - "react-base16-styling": "^0.4.1", + "react-base16-styling": "^0.6.0", "react-dragula": "^1.1.17", "react-json-tree": "^0.12.0", "react-pure-render": "^1.0.2", diff --git a/packages/redux-devtools-inspector/src/DevtoolsInspector.js b/packages/redux-devtools-inspector/src/DevtoolsInspector.js index bb67dae3..62f772fa 100644 --- a/packages/redux-devtools-inspector/src/DevtoolsInspector.js +++ b/packages/redux-devtools-inspector/src/DevtoolsInspector.js @@ -9,7 +9,7 @@ import ActionList from './ActionList'; import ActionPreview from './ActionPreview'; import getInspectedState from './utils/getInspectedState'; import createDiffPatcher from './createDiffPatcher'; -import { getBase16Theme } from 'react-base16-styling'; +import { getBase16Theme, invertTheme } from 'react-base16-styling'; import { reducer, updateMonitorState } from './redux'; import { ActionCreators } from 'redux-devtools'; @@ -99,7 +99,9 @@ function createIntermediateState(props, monitorState) { function createThemeState(props) { const base16Theme = getBase16Theme(props.theme, base16Themes); - const styling = createStylingFromTheme(props.theme, props.invertTheme); + + const theme = props.invertTheme ? invertTheme(props.theme) : props.theme; + const styling = createStylingFromTheme(theme); return { base16Theme, styling }; } diff --git a/yarn.lock b/yarn.lock index 47c30c22..e3509097 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3335,11 +3335,6 @@ ajv@^6.0.1, ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.7.0, ajv@^ json-schema-traverse "^0.4.1" uri-js "^4.2.2" -almost-equal@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/almost-equal/-/almost-equal-1.1.0.tgz#f851c631138757994276aa2efbe8dfa3066cccdd" - integrity sha1-+FHGMROHV5lCdqou++jfowZszN0= - amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -5162,14 +5157,6 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-space@^1.14.3: - version "1.16.0" - resolved "https://registry.yarnpkg.com/color-space/-/color-space-1.16.0.tgz#611781bca41cd8582a1466fd9e28a7d3d89772a2" - integrity sha512-A6WMiFzunQ8KEPFmj02OnnoUnqhmSaHaZ/0LVFcPTdlvm8+3aMJ5x1HRHy3bDHPkovkf4sS0f4wsVvwk71fKkg== - dependencies: - hsluv "^0.0.3" - mumath "^3.3.4" - color-string@^1.5.2: version "1.5.3" resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" @@ -8365,11 +8352,6 @@ hpack.js@^2.1.6: readable-stream "^2.0.1" wbuf "^1.1.0" -hsluv@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/hsluv/-/hsluv-0.0.3.tgz#829107dafb4a9f8b52a1809ed02e091eade6754c" - integrity sha1-gpEH2vtKn4tSoYCe0C4JHq3mdUw= - html-element-map@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz#dfbb09efe882806af63d990cf6db37993f099f22" @@ -11297,13 +11279,6 @@ multimatch@^3.0.0: arrify "^1.0.1" minimatch "^3.0.4" -mumath@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/mumath/-/mumath-3.3.4.tgz#48d4a0f0fd8cad4e7b32096ee89b161a63d30bbf" - integrity sha1-SNSg8P2MrU57Mglu6JsWGmPTC78= - dependencies: - almost-equal "^1.1.0" - mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" @@ -13115,18 +13090,7 @@ react-addons-create-fragment@^15.5.3: loose-envify "^1.3.1" object-assign "^4.1.0" -react-base16-styling@^0.4.1: - version "0.4.7" - resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.4.7.tgz#a3eaf884a0adfc1896455f6302ff75de72e51a2e" - integrity sha1-o+r4hKCt/BiWRV9jAv913nLlGi4= - dependencies: - base16 "^1.0.0" - color-space "^1.14.3" - lodash.curry "^4.0.1" - lodash.flow "^3.3.0" - pure-color "^1.2.0" - -react-base16-styling@^0.5.1, react-base16-styling@^0.5.3: +react-base16-styling@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.5.3.tgz#3858f24e9c4dd8cbd3f702f3f74d581ca2917269" integrity sha1-OFjyTpxN2MvT9wLz901YHKKRcmk=