GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2025-06-15 13:36:35 +02:00
Code Issues Releases Activity

Merge branch 'use-react-router-dom' into 'dev'

Browse Source 
Use react-router-dom instead of react-router.

See merge request turris/reforis/foris-js!80
This commit is contained in:
Bogdan Bodnar
2020-01-17 14:35:20 +01:00
parent cbc3c2f3e7 532acf9d86
commit a0a775996e
5 changed files with 61 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/form/components/ForisForm.js
View File

@ -7,7 +7,7 @@
import React, { useEffect } from "react";
import PropTypes from "prop-types";
import { Prompt } from "react-router";
import { Prompt } from "react-router-dom";
import { ALERT_TYPES } from "../../bootstrap/Alert";
import { API_STATE } from "../../api/utils";
@ -73,7 +73,12 @@ ForisForm.defaultProps = {
disabled: false,
};
/** Serves as HOC for all foris forms components. */
/** Serves as HOC for all foris forms components.
*
* As `<Prompt />` from `react-router-dom` is used in this component then it required to
* use exposed `ReactRouterDOM` object from `react-router-dom` library which is exposed by reForis.
* See README for more information.
* */
export function ForisForm({
ws,
forisConfig,

2
src/testUtils/customTestRender.js
View File

@ -9,7 +9,7 @@
import React from "react";
import { UIDReset } from "react-uid";
import { StaticRouter } from "react-router";
import { StaticRouter } from "react-router-dom";
import { render } from "@testing-library/react";
import PropTypes from "prop-types";