Skip to content

Commit e8f99cd

Browse files
committed
Fix react-bootstrap import style
Getting some errors with ts-jest and the import style for tyhese components. Unfortunately this import style prevents tree-shaking I think, so should be reviewed once we have figured out our typescript setup with TS5 in #3240
1 parent 1947fd6 commit e8f99cd

19 files changed

+19
-19
lines changed

frontend/js/src/cb-review/CBReviewModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
99
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
1010
import { IconProp } from "@fortawesome/fontawesome-svg-core";
1111
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
12-
import Modal from "react-bootstrap/Modal";
12+
import { Modal } from "react-bootstrap";
1313
import { kebabCase, lowerCase } from "lodash";
1414
import { Link, useNavigate } from "react-router-dom";
1515
import GlobalAppContext from "../utils/GlobalAppContext";

frontend/js/src/common/flairs/FlairsExplanationModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react";
22
import { get as _get } from "lodash";
33
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
4-
import Modal from "react-bootstrap/Modal";
4+
import { Modal } from "react-bootstrap";
55
import { Link, useNavigate } from "react-router-dom";
66

77
export default NiceModal.create(() => {

frontend/js/src/common/listens/AddToPlaylist.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { toast } from "react-toastify";
99
import { Link } from "react-router-dom";
1010
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
11-
import Modal from "react-bootstrap/Modal";
11+
import { Modal } from "react-bootstrap";
1212
import { ToastMsg } from "../../notifications/Notifications";
1313
import { PLAYLIST_URI_PREFIX, listenToJSPFTrack } from "../../playlists/utils";
1414
import GlobalAppContext from "../../utils/GlobalAppContext";

frontend/js/src/common/listens/ListenPayloadModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react";
22
import { get as _get } from "lodash";
33
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
4-
import Modal from "react-bootstrap/Modal";
4+
import { Modal } from "react-bootstrap";
55
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
66
import { faCopy } from "@fortawesome/free-solid-svg-icons";
77
import hljs from "highlight.js/lib/core";

frontend/js/src/common/listens/MBIDMappingModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
2-
import Modal from "react-bootstrap/Modal";
2+
import { Modal } from "react-bootstrap";
33
import { faTimesCircle } from "@fortawesome/free-regular-svg-icons";
44
import {
55
faExchangeAlt,

frontend/js/src/common/stats/StatsExplanationsModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react";
22
import { get as _get } from "lodash";
33
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
4-
import Modal from "react-bootstrap/Modal";
4+
import { Modal } from "react-bootstrap";
55

66
export default NiceModal.create(() => {
77
const modal = useModal();

frontend/js/src/components/ConfirmationModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
2-
import Modal from "react-bootstrap/Modal";
2+
import { Modal } from "react-bootstrap";
33
import * as React from "react";
44

55
type ConfirmationModalProps = {

frontend/js/src/components/SyndicationFeedModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
2-
import Modal from "react-bootstrap/Modal";
2+
import { Modal } from "react-bootstrap";
33
import * as React from "react";
44
import { useState } from "react";
55
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";

frontend/js/src/personal-recommendations/PersonalRecommendationsModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react";
22
import { uniq, includes, toLower } from "lodash";
33
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
4-
import Modal from "react-bootstrap/Modal";
4+
import { Modal } from "react-bootstrap";
55
import { toast } from "react-toastify";
66
import GlobalAppContext from "../utils/GlobalAppContext";
77
import NamePill from "./NamePill";

frontend/js/src/pins/PinRecordingModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from "react";
22
import { get as _get } from "lodash";
33
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
4-
import Modal from "react-bootstrap/Modal";
4+
import { Modal } from "react-bootstrap";
55
import { toast } from "react-toastify";
66
import GlobalAppContext from "../utils/GlobalAppContext";
77
import {

frontend/js/src/playlists/components/CreateOrEditPlaylistModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
3-
import Modal from "react-bootstrap/Modal";
3+
import { Modal } from "react-bootstrap";
44
import { toast } from "react-toastify";
55
import { omit, isEqual } from "lodash";
66
import { Link } from "react-router-dom";

frontend/js/src/playlists/components/DeletePlaylistConfirmationModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
2-
import Modal from "react-bootstrap/Modal";
2+
import { Modal } from "react-bootstrap";
33
import * as React from "react";
44
import { toast } from "react-toastify";
55
import { ToastMsg } from "../../notifications/Notifications";

frontend/js/src/report-user/ReportUserModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
3-
import Modal from "react-bootstrap/Modal";
3+
import { Modal } from "react-bootstrap";
44
import { toast } from "react-toastify";
55
import { Link } from "react-router-dom";
66
import GlobalAppContext from "../utils/GlobalAppContext";

frontend/js/src/settings/link-listens/MultiTrackMBIDMappingModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
2-
import Modal from "react-bootstrap/Modal";
2+
import { Modal } from "react-bootstrap";
33
import {
44
faArrowRightLong,
55
faInfoCircle,

frontend/js/src/user-feed/ThanksModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
3-
import Modal from "react-bootstrap/Modal";
3+
import { Modal } from "react-bootstrap";
44
import { toast } from "react-toastify";
55
import { startCase } from "lodash";
66
import GlobalAppContext from "../utils/GlobalAppContext";

frontend/js/src/user/components/AddListenModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
44
import { IconProp } from "@fortawesome/fontawesome-svg-core";
55
import { faCalendar } from "@fortawesome/free-regular-svg-icons";
66
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
7-
import Modal from "react-bootstrap/Modal";
7+
import { Modal } from "react-bootstrap";
88
import { toast } from "react-toastify";
99
import { Link } from "react-router-dom";
1010
import { add } from "date-fns";

frontend/js/src/user/playlists/components/ImportAppleMusicPlaylistModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
3-
import Modal from "react-bootstrap/Modal";
3+
import { Modal } from "react-bootstrap";
44
import { toast } from "react-toastify";
55
import { Link } from "react-router-dom";
66
import GlobalAppContext from "../../../utils/GlobalAppContext";

frontend/js/src/user/playlists/components/ImportJSPFPlaylistModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
3-
import Modal from "react-bootstrap/Modal";
3+
import { Modal } from "react-bootstrap";
44
import { toast } from "react-toastify";
55

66
import { Link } from "react-router-dom";

frontend/js/src/user/playlists/components/ImportSpotifyPlaylistModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import NiceModal, { useModal, bootstrapDialog } from "@ebay/nice-modal-react";
3-
import Modal from "react-bootstrap/Modal";
3+
import { Modal } from "react-bootstrap";
44
import { toast } from "react-toastify";
55
import GlobalAppContext from "../../../utils/GlobalAppContext";
66
import { ToastMsg } from "../../../notifications/Notifications";

0 commit comments

Comments
 (0)