Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"react-bootstrap": "^2.10.10",
"react-dom": "^19.2.7",
"react-grid-layout": "^1.0.0",
"react-modal": "^3.16.3",
"regenerator-runtime": "^0.14.1",
"summernote": "^0.9.1",
"tippy.js": "^6.3.7",
Expand Down Expand Up @@ -66,6 +67,7 @@
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
"@types/react-grid-layout": "^1.0.0",
"@types/react-modal": "^3.16.3",
"@types/typeahead.js": "^0.11.6",
"@typescript-eslint/type-utils": "^8.61.1",
"@webpack-cli/serve": "^2.0.1",
Expand Down
64 changes: 49 additions & 15 deletions src/frontend/components/dashboard/lib/react/EditModal/EditModal.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,67 @@
import React, { JSX } from "react";
import { Modal as Mdl, ModalBody, ModalHeader, ModalFooter } from "react-bootstrap";
/* eslint-disable @stylistic/semi */
import React, { useEffect } from "react";
import Modal, {Styles} from "react-modal";
import { AppModalProps } from "../types";

/**
* The edit modal component
* @param param0 Parameters for the edit modal
* @returns The edit modal
* Edit modal component
* @param {AppModalProps} props - The modal props
* @returns {React.JSX.Element} The rendered modal component
*/
export default function EditModal({ editModalOpen, closeModal, editError, loadingEditHtml, editHtml, formRef, deleteActiveWidget, saveActiveWidget }: AppModalProps): JSX.Element {
return (<Mdl show={editModalOpen} className="edit-widget-modal">
<ModalHeader>
export default function EditModal({ editModalOpen, closeModal, editError, loadingEditHtml, editHtml, formRef, deleteActiveWidget, saveActiveWidget }:AppModalProps): React.JSX.Element {
const modalStyle: Styles = {
content: {
minWidth: "350px",
maxWidth: "80vw",
maxHeight: "90vh",
top: "50%",
left: "50%",
right: "auto",
bottom: "auto",
marginRight: "-50%",
transform: "translate(-50%, -50%)",
msTransform: "translate(-50%, -50%)",
padding: "2rem 1.5rem"
},
overlay: {
zIndex: 1030,
background: "rgba(0, 0, 0, .15)"
}
};

useEffect(() => {
Modal.setAppElement("#ld-app");
}, []);

const test = window.test;

return (<Modal
isOpen={editModalOpen}
onRequestClose={closeModal}
style={modalStyle}
shouldCloseOnOverlayClick={true}
contentLabel="Edit Modal"
ariaHideApp = {!test}
>
<div className='modal-header d-flex justify-content-between align-items-center'>
<div className='modal-header__content'>
<h3 className='modal-title'>Edit widget</h3>
</div>
<button className='btn close' onClick={closeModal}><span aria-hidden='true' className='hidden'>Close</span></button>
</ModalHeader>
<ModalBody>
</div>
<div className="modal-body">
{editError
&& <p className="alert alert-danger">{editError}</p>}
{loadingEditHtml
? <span className='ld-modal__loading'>Loading...</span> : <div ref={formRef} dangerouslySetInnerHTML={{ __html: editHtml ?? "" }} />}
</ModalBody>
<ModalFooter>
? <span className='ld-modal__loading'>Loading...</span> : <div ref={formRef} dangerouslySetInnerHTML={{ __html: editHtml! }} />}
</div>
<div className='modal-footer'>
<div className='modal-footer__left'>
<button className="btn btn-cancel" onClick={deleteActiveWidget}>Delete</button>
</div>
<div className='modal-footer__right'>
<button className="btn btn-primary" onClick={saveActiveWidget}>Save</button>
</div>
</ModalFooter>
</Mdl>);
</div>
</Modal>)
}
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"react",
"react-dom",
"react-grid-layout",
"react-modal",
"typeahead.js"
],
"paths": {
Expand Down
11 changes: 9 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2113,6 +2113,13 @@
dependencies:
"@types/react" "*"

"@types/react-modal@^3.16.3":
version "3.16.3"
resolved "https://registry.yarnpkg.com/@types/react-modal/-/react-modal-3.16.3.tgz#250f32c07f1de28e2bcf9c3e84b56adaa6897013"
integrity sha512-xXuGavyEGaFQDgBv4UVm8/ZsG+qxeQ7f77yNrW3n+1J6XAstUy5rYHeIHPh1KzsGc6IkCIdu6lQ2xWzu1jBTLg==
dependencies:
"@types/react" "*"

"@types/react-transition-group@^4.4.6":
version "4.4.12"
resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz"
Expand Down Expand Up @@ -4121,7 +4128,7 @@ executable@^4.1.1:

exenv@^1.2.0:
version "1.2.2"
resolved "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz"
resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
integrity sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==

exit@^0.1.2:
Expand Down Expand Up @@ -6732,7 +6739,7 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:

react-modal@^3.16.3:
version "3.16.3"
resolved "https://registry.npmjs.org/react-modal/-/react-modal-3.16.3.tgz"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.16.3.tgz#c412d41915782e3c261253435d01468e2439b11b"
integrity sha512-yCYRJB5YkeQDQlTt17WGAgFJ7jr2QYcWa1SHqZ3PluDmnKJ/7+tVU+E6uKyZ0nODaeEj+xCpK4LcSnKXLMC0Nw==
dependencies:
exenv "^1.2.0"
Expand Down
Loading