Skip to content

Commit 8342db0

Browse files
fakefeikfakefeik
committed
Update peerDependencies range
1 parent 90b1122 commit 8342db0

File tree

10 files changed

+173
-201
lines changed

10 files changed

+173
-201
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v1.3.x - 2021.05.31
4+
- Add support for dark theme using react-ui ThemeContext
5+
- Update supported peerDependencies versions range
6+
37
## v1.2.7 - 2021.03.26
48
- Fix bug with TaskDataJsonSerializer: add TimeGuid and Timestamp converters
59

‎cassandra-distributed-task-queue-ui/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
"test": "mocha **/*.test.ts"
3737
},
3838
"peerDependencies": {
39-
"@skbkontur/react-icons": ">=3 <=4",
40-
"@skbkontur/react-ui": ">=2 <3",
39+
"@skbkontur/react-icons": ">=3 <=5",
40+
"@skbkontur/react-ui": ">=2 <=3",
4141
"react": ">=16 <=17",
4242
"react-dom": ">=16 <=17",
43-
"react-router": ">=4 <=5",
44-
"react-router-dom": ">=4 <=5"
43+
"react-router": ">=5.1.0 <=6",
44+
"react-router-dom": ">=5.1.0 <=6"
4545
},
4646
"dependencies": {
4747
"@skbkontur/react-stack-layout": "^1.0.3",
@@ -63,8 +63,8 @@
6363
"@babel/preset-typescript": "^7.12.7",
6464
"@babel/runtime": "^7.12.5",
6565
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
66-
"@skbkontur/react-icons": "^4.4.0",
67-
"@skbkontur/react-ui": "^2.13.0",
66+
"@skbkontur/react-icons": "^5.0.0",
67+
"@skbkontur/react-ui": "^3.0.0",
6868
"@storybook/addon-actions": "^6.1.15",
6969
"@storybook/addons": "^6.1.15",
7070
"@storybook/react": "^6.1.15",

‎cassandra-distributed-task-queue-ui/stories/Themes/TaskError.stories.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DEFAULT_THEME, DEFAULT_THEME_8PX, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
1+
import { DEFAULT_THEME, DEFAULT_THEME_OLD, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
22
import { Theme } from "@skbkontur/react-ui/lib/theming/Theme";
33
import React from "react";
44
import StoryRouter from "storybook-react-router";
@@ -7,7 +7,6 @@ import { CustomRenderer } from "../../index";
77
import { TaskDetailsPageContainer } from "../../src/containers/TaskDetailsPageContainer";
88
import { RtqMonitoringApiFake } from "../Api/RtqMonitoringApiFake";
99

10-
import { infraUiDark } from "./infraUiDark";
1110
import { reactUiDark } from "./reactUiDark";
1211

1312
export default {
@@ -31,6 +30,5 @@ const TaskDetailsContainer = ({ theme }: { theme: Theme }) => (
3130

3231
export const Default = (): JSX.Element => <TaskDetailsContainer theme={DEFAULT_THEME} />;
3332
export const Flat = (): JSX.Element => <TaskDetailsContainer theme={FLAT_THEME} />;
34-
export const EightPx = (): JSX.Element => <TaskDetailsContainer theme={DEFAULT_THEME_8PX} />;
33+
export const Old = (): JSX.Element => <TaskDetailsContainer theme={DEFAULT_THEME_OLD} />;
3534
export const Dark = (): JSX.Element => <TaskDetailsContainer theme={ThemeFactory.create(reactUiDark)} />;
36-
export const InfraDark = (): JSX.Element => <TaskDetailsContainer theme={ThemeFactory.create(infraUiDark)} />;

‎cassandra-distributed-task-queue-ui/stories/Themes/TaskNotFound.stories.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DEFAULT_THEME, DEFAULT_THEME_8PX, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
1+
import { DEFAULT_THEME, DEFAULT_THEME_OLD, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
22
import { Theme } from "@skbkontur/react-ui/lib/theming/Theme";
33
import React from "react";
44
import StoryRouter from "storybook-react-router";
@@ -7,7 +7,6 @@ import { CustomRenderer } from "../../index";
77
import { TaskDetailsPageContainer } from "../../src/containers/TaskDetailsPageContainer";
88
import { RtqMonitoringApiFake } from "../Api/RtqMonitoringApiFake";
99

10-
import { infraUiDark } from "./infraUiDark";
1110
import { reactUiDark } from "./reactUiDark";
1211

1312
export default {
@@ -31,6 +30,5 @@ const TaskDetailsContainer = ({ theme }: { theme: Theme }) => (
3130

3231
export const Default = (): JSX.Element => <TaskDetailsContainer theme={DEFAULT_THEME} />;
3332
export const Flat = (): JSX.Element => <TaskDetailsContainer theme={FLAT_THEME} />;
34-
export const EightPx = (): JSX.Element => <TaskDetailsContainer theme={DEFAULT_THEME_8PX} />;
33+
export const Old = (): JSX.Element => <TaskDetailsContainer theme={DEFAULT_THEME_OLD} />;
3534
export const Dark = (): JSX.Element => <TaskDetailsContainer theme={ThemeFactory.create(reactUiDark)} />;
36-
export const InfraDark = (): JSX.Element => <TaskDetailsContainer theme={ThemeFactory.create(infraUiDark)} />;

‎cassandra-distributed-task-queue-ui/stories/Themes/TaskTree.stories.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { DEFAULT_THEME, DEFAULT_THEME_8PX, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
1+
import { DEFAULT_THEME, DEFAULT_THEME_OLD, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
22
import { Theme } from "@skbkontur/react-ui/lib/theming/Theme";
33
import React from "react";
44
import StoryRouter from "storybook-react-router";
55

66
import { TaskChainsTreeContainer } from "../../src/containers/TaskChainsTreeContainer";
77
import { RtqMonitoringApiFake } from "../Api/RtqMonitoringApiFake";
88

9-
import { infraUiDark } from "./infraUiDark";
109
import { reactUiDark } from "./reactUiDark";
1110

1211
export default {
@@ -27,6 +26,5 @@ const TaskTreeContainer = ({ theme }: { theme: Theme }) => (
2726

2827
export const Default = (): JSX.Element => <TaskTreeContainer theme={DEFAULT_THEME} />;
2928
export const Flat = (): JSX.Element => <TaskTreeContainer theme={FLAT_THEME} />;
30-
export const EightPx = (): JSX.Element => <TaskTreeContainer theme={DEFAULT_THEME_8PX} />;
29+
export const Old = (): JSX.Element => <TaskTreeContainer theme={DEFAULT_THEME_OLD} />;
3130
export const Dark = (): JSX.Element => <TaskTreeContainer theme={ThemeFactory.create(reactUiDark)} />;
32-
export const InfraDark = (): JSX.Element => <TaskTreeContainer theme={ThemeFactory.create(infraUiDark)} />;

‎cassandra-distributed-task-queue-ui/stories/Themes/Tasks.stories.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { DEFAULT_THEME, DEFAULT_THEME_8PX, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
1+
import { DEFAULT_THEME, DEFAULT_THEME_OLD, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
22
import { Theme } from "@skbkontur/react-ui/lib/theming/Theme";
33
import React from "react";
44
import StoryRouter from "storybook-react-router";
55

66
import { TasksPageContainer } from "../../src/containers/TasksPageContainer";
77
import { RtqMonitoringApiFake } from "../Api/RtqMonitoringApiFake";
88

9-
import { infraUiDark } from "./infraUiDark";
109
import { reactUiDark } from "./reactUiDark";
1110

1211
export default {
@@ -28,6 +27,5 @@ const TypesContainer = ({ theme }: { theme: Theme }) => (
2827

2928
export const Default = (): JSX.Element => <TypesContainer theme={DEFAULT_THEME} />;
3029
export const Flat = (): JSX.Element => <TypesContainer theme={FLAT_THEME} />;
31-
export const EightPx = (): JSX.Element => <TypesContainer theme={DEFAULT_THEME_8PX} />;
30+
export const Old = (): JSX.Element => <TypesContainer theme={DEFAULT_THEME_OLD} />;
3231
export const Dark = (): JSX.Element => <TypesContainer theme={ThemeFactory.create(reactUiDark)} />;
33-
export const InfraDark = (): JSX.Element => <TypesContainer theme={ThemeFactory.create(infraUiDark)} />;

‎cassandra-distributed-task-queue-ui/stories/Themes/TasksDetails.stories.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DEFAULT_THEME, DEFAULT_THEME_8PX, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
1+
import { DEFAULT_THEME, DEFAULT_THEME_OLD, FLAT_THEME, ThemeContext, ThemeFactory } from "@skbkontur/react-ui";
22
import { Theme } from "@skbkontur/react-ui/lib/theming/Theme";
33
import React from "react";
44
import StoryRouter from "storybook-react-router";
@@ -7,7 +7,6 @@ import { CustomRenderer } from "../../index";
77
import { TaskDetailsPageContainer } from "../../src/containers/TaskDetailsPageContainer";
88
import { RtqMonitoringApiFake } from "../Api/RtqMonitoringApiFake";
99

10-
import { infraUiDark } from "./infraUiDark";
1110
import { reactUiDark } from "./reactUiDark";
1211

1312
export default {
@@ -31,6 +30,5 @@ const TaskDetailsContainer = ({ theme }: { theme: Theme }) => (
3130

3231
export const Default = (): JSX.Element => <TaskDetailsContainer theme={DEFAULT_THEME} />;
3332
export const Flat = (): JSX.Element => <TaskDetailsContainer theme={FLAT_THEME} />;
34-
export const EightPx = (): JSX.Element => <TaskDetailsContainer theme={DEFAULT_THEME_8PX} />;
33+
export const Old = (): JSX.Element => <TaskDetailsContainer theme={DEFAULT_THEME_OLD} />;
3534
export const Dark = (): JSX.Element => <TaskDetailsContainer theme={ThemeFactory.create(reactUiDark)} />;
36-
export const InfraDark = (): JSX.Element => <TaskDetailsContainer theme={ThemeFactory.create(infraUiDark)} />;

‎cassandra-distributed-task-queue-ui/stories/Themes/infraUiDark.ts‎

Lines changed: 0 additions & 128 deletions
This file was deleted.

0 commit comments

Comments
 (0)