From 81c03e4619d4846982d1fd194d5fbb9ca5a94b71 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 7 Apr 2024 15:14:18 -0400 Subject: [PATCH] Fix --- packages/redux-devtools-ui/src/Button/Button.tsx | 2 +- packages/redux-devtools-ui/src/Dialog/Dialog.tsx | 2 +- packages/redux-devtools-ui/src/Editor/Editor.tsx | 2 +- packages/redux-devtools-ui/src/Form/Form.tsx | 2 +- packages/redux-devtools-ui/src/Notification/Notification.tsx | 2 +- .../src/SegmentedControl/SegmentedControl.tsx | 2 +- packages/redux-devtools-ui/src/Slider/Slider.tsx | 2 +- packages/redux-devtools-ui/src/Toolbar/styles/Toolbar.ts | 2 +- packages/redux-devtools-ui/src/index.ts | 2 +- packages/redux-devtools-ui/src/themes/default.ts | 2 +- packages/redux-devtools-ui/src/themes/material.ts | 2 +- packages/redux-devtools-ui/src/utils/createStyledComponent.ts | 2 +- .../redux-devtools-ui/src/utils/createThemedComponent.tsx | 4 ++-- packages/redux-devtools-ui/src/utils/invertColors.ts | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/redux-devtools-ui/src/Button/Button.tsx b/packages/redux-devtools-ui/src/Button/Button.tsx index f8387e6f..1bdb1aa4 100644 --- a/packages/redux-devtools-ui/src/Button/Button.tsx +++ b/packages/redux-devtools-ui/src/Button/Button.tsx @@ -1,5 +1,5 @@ import React, { Component, ReactNode } from 'react'; -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; import createStyledComponent from '../utils/createStyledComponent'; import * as styles from './styles'; import { commonStyle, tooltipStyle } from './styles/common'; diff --git a/packages/redux-devtools-ui/src/Dialog/Dialog.tsx b/packages/redux-devtools-ui/src/Dialog/Dialog.tsx index d1f568f7..6045e361 100644 --- a/packages/redux-devtools-ui/src/Dialog/Dialog.tsx +++ b/packages/redux-devtools-ui/src/Dialog/Dialog.tsx @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; import createStyledComponent from '../utils/createStyledComponent'; import * as styles from './styles'; import Button from '../Button'; diff --git a/packages/redux-devtools-ui/src/Editor/Editor.tsx b/packages/redux-devtools-ui/src/Editor/Editor.tsx index a41359ef..d9e1e5c5 100644 --- a/packages/redux-devtools-ui/src/Editor/Editor.tsx +++ b/packages/redux-devtools-ui/src/Editor/Editor.tsx @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import styled from 'styled-components'; import CodeMirror, { EditorChange } from 'codemirror'; -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; import { defaultStyle, themedStyle } from './styles'; import { Theme } from '../themes/default'; diff --git a/packages/redux-devtools-ui/src/Form/Form.tsx b/packages/redux-devtools-ui/src/Form/Form.tsx index a708c966..d4f2a963 100644 --- a/packages/redux-devtools-ui/src/Form/Form.tsx +++ b/packages/redux-devtools-ui/src/Form/Form.tsx @@ -1,6 +1,6 @@ import React, { PureComponent, Component } from 'react'; import JSONSchemaForm, { FormProps } from '@rjsf/core'; -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; import createStyledComponent from '../utils/createStyledComponent'; import styles from './styles'; import Button from '../Button'; diff --git a/packages/redux-devtools-ui/src/Notification/Notification.tsx b/packages/redux-devtools-ui/src/Notification/Notification.tsx index bac1256e..43d0fa82 100644 --- a/packages/redux-devtools-ui/src/Notification/Notification.tsx +++ b/packages/redux-devtools-ui/src/Notification/Notification.tsx @@ -3,7 +3,7 @@ import { MdClose } from 'react-icons/md'; import { MdWarning } from 'react-icons/md'; import { MdError } from 'react-icons/md'; import { MdCheckCircle } from 'react-icons/md'; -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; import createStyledComponent from '../utils/createStyledComponent'; import styles from './styles'; diff --git a/packages/redux-devtools-ui/src/SegmentedControl/SegmentedControl.tsx b/packages/redux-devtools-ui/src/SegmentedControl/SegmentedControl.tsx index 86cdb88c..fcdc0f9e 100644 --- a/packages/redux-devtools-ui/src/SegmentedControl/SegmentedControl.tsx +++ b/packages/redux-devtools-ui/src/SegmentedControl/SegmentedControl.tsx @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; import createStyledComponent from '../utils/createStyledComponent'; import styles from './styles'; diff --git a/packages/redux-devtools-ui/src/Slider/Slider.tsx b/packages/redux-devtools-ui/src/Slider/Slider.tsx index 3d3a232d..dfe34f5f 100644 --- a/packages/redux-devtools-ui/src/Slider/Slider.tsx +++ b/packages/redux-devtools-ui/src/Slider/Slider.tsx @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; import createStyledComponent from '../utils/createStyledComponent'; import * as styles from './styles'; import { containerStyle } from './styles/common'; diff --git a/packages/redux-devtools-ui/src/Toolbar/styles/Toolbar.ts b/packages/redux-devtools-ui/src/Toolbar/styles/Toolbar.ts index bee6a842..5ca7c7c7 100644 --- a/packages/redux-devtools-ui/src/Toolbar/styles/Toolbar.ts +++ b/packages/redux-devtools-ui/src/Toolbar/styles/Toolbar.ts @@ -1,5 +1,5 @@ import styled, { ThemedStyledInterface } from 'styled-components'; -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; import * as CSS from 'csstype'; export type BorderPosition = 'top' | 'bottom'; diff --git a/packages/redux-devtools-ui/src/index.ts b/packages/redux-devtools-ui/src/index.ts index 58b36732..81653324 100644 --- a/packages/redux-devtools-ui/src/index.ts +++ b/packages/redux-devtools-ui/src/index.ts @@ -1,4 +1,4 @@ -export type { Base16Theme } from 'base16'; +export type { Base16Theme } from 'react-base16-styling'; export { default as Container } from './Container'; export { default as Button } from './Button'; diff --git a/packages/redux-devtools-ui/src/themes/default.ts b/packages/redux-devtools-ui/src/themes/default.ts index 862b61e0..32724f83 100644 --- a/packages/redux-devtools-ui/src/themes/default.ts +++ b/packages/redux-devtools-ui/src/themes/default.ts @@ -1,4 +1,4 @@ -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; import * as CSS from 'csstype'; import * as themes from './index'; diff --git a/packages/redux-devtools-ui/src/themes/material.ts b/packages/redux-devtools-ui/src/themes/material.ts index d6dbb93c..73cfb4c0 100644 --- a/packages/redux-devtools-ui/src/themes/material.ts +++ b/packages/redux-devtools-ui/src/themes/material.ts @@ -1,4 +1,4 @@ -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; export default (colors: Base16Theme) => ({ fontFamily: "'Roboto', sans-serif", diff --git a/packages/redux-devtools-ui/src/utils/createStyledComponent.ts b/packages/redux-devtools-ui/src/utils/createStyledComponent.ts index b1592e4a..95f9d3ec 100644 --- a/packages/redux-devtools-ui/src/utils/createStyledComponent.ts +++ b/packages/redux-devtools-ui/src/utils/createStyledComponent.ts @@ -6,8 +6,8 @@ import styled, { ThemedStyledInterface, ThemedStyledProps, } from 'styled-components'; +import type { Base16Theme } from 'react-base16-styling'; import getDefaultTheme, { Theme } from '../themes/default'; -import { Base16Theme } from 'base16'; import { ThemeFromProvider } from './theme'; type StyleFunction< diff --git a/packages/redux-devtools-ui/src/utils/createThemedComponent.tsx b/packages/redux-devtools-ui/src/utils/createThemedComponent.tsx index 5c21a8d6..02ec5f01 100644 --- a/packages/redux-devtools-ui/src/utils/createThemedComponent.tsx +++ b/packages/redux-devtools-ui/src/utils/createThemedComponent.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import getDefaultTheme, { Theme } from '../themes/default'; import { withTheme } from 'styled-components'; -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; +import getDefaultTheme, { Theme } from '../themes/default'; export default >( UnthemedComponent: React.ComponentProps extends { theme?: Theme } diff --git a/packages/redux-devtools-ui/src/utils/invertColors.ts b/packages/redux-devtools-ui/src/utils/invertColors.ts index 2c70b0b6..fbc069a8 100644 --- a/packages/redux-devtools-ui/src/utils/invertColors.ts +++ b/packages/redux-devtools-ui/src/utils/invertColors.ts @@ -1,4 +1,4 @@ -import { Base16Theme } from 'base16'; +import type { Base16Theme } from 'react-base16-styling'; function invertColors(theme: Base16Theme) { return {