Merge remote-tracking branch 'origin/main' into jai
This commit is contained in:
commit
1ce24675ba
|
|
@ -10,14 +10,14 @@ import { useNavigate, useParams } from 'react-router-dom';
|
||||||
|
|
||||||
import { IoMdClose } from 'react-icons/io';
|
import { IoMdClose } from 'react-icons/io';
|
||||||
|
|
||||||
import { fetchRecipients, toggleToTemplates } from '../../../store/slices/selectedRecipientsSlice';
|
import { fetchRecipients, toggleToTemplates, TRANSACTION_TEMPLATE_TOGGLE } from '../../../store/slices/selectedRecipientsSlice';
|
||||||
import { fetchDocuments } from '../../../store/slices/documentSlice';
|
import { fetchDocuments } from '../../../store/slices/documentSlice';
|
||||||
import { FaQuestionCircle } from 'react-icons/fa';
|
import { FaQuestionCircle } from 'react-icons/fa';
|
||||||
import typeToIconMap from '../../../helper/iconMap';
|
import typeToIconMap from '../../../helper/iconMap';
|
||||||
|
|
||||||
import { IoAdd } from 'react-icons/io5';
|
import { IoAdd } from 'react-icons/io5';
|
||||||
import Loader from '../../dashboard/Loader';
|
import Loader from '../../dashboard/Loader';
|
||||||
import { TRANSACTION_TEMPLATE_TOGGLE } from "../../../store/slices/selectedRecipientsSlice";
|
// import { TRANSACTION_TEMPLATE_TOGGLE } from "../../../store/slices/selectedRecipientsSlice";
|
||||||
import { handleGroupBorderPosition } from '../../../utlity/tagGroupConUtils';
|
import { handleGroupBorderPosition } from '../../../utlity/tagGroupConUtils';
|
||||||
|
|
||||||
export interface DroppedItemsObj {
|
export interface DroppedItemsObj {
|
||||||
|
|
@ -574,16 +574,13 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ isSend }) => {
|
||||||
})()
|
})()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// const handleAddRadioClick = (key:string) => {
|
||||||
|
// console.log("Handle Radio Clicled", key)
|
||||||
|
// console.log(droppedItems, "line 525")
|
||||||
|
// }
|
||||||
|
|
||||||
const handleAddRadioClick = (key: string) => {
|
|
||||||
console.log("Handle Radio Clicled", key)
|
const handleAddGroupItemClicked = (key: string, item) => {
|
||||||
console.log(droppedItems, "line 525")
|
|
||||||
// const handleAddRadioClick = (key: string) => {
|
|
||||||
// console.log("Handle Radio Clicled", key)
|
|
||||||
// console.log(droppedItems, "line 525")
|
|
||||||
// }
|
|
||||||
|
|
||||||
const handleAddGroupItemClicked = (key: string, item) => {
|
|
||||||
|
|
||||||
|
|
||||||
const groupId = item.group;
|
const groupId = item.group;
|
||||||
|
|
@ -596,23 +593,22 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ isSend }) => {
|
||||||
handleIGroupBorderPosition(item.group)
|
handleIGroupBorderPosition(item.group)
|
||||||
}, 0)
|
}, 0)
|
||||||
|
|
||||||
setDroppedItems({
|
setDroppedItems({
|
||||||
...droppedItems,
|
...droppedItems,
|
||||||
[key]: [...droppedItems[key], { ...item, isGroupExist: true }],
|
[key]: [...droppedItems[key], { ...item, isGroupExist: true }],
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// const handleAddRadio = (e: React.MouseEvent<HTMLElement>, key: string, index: number) => {
|
|
||||||
// // const dataToSet: DroppedItemsObj = {
|
// const handleAddRadio = (e: React.MouseEvent<HTMLElement>, key: string, index: number) => {
|
||||||
// // ...droppedItems,
|
// // const dataToSet: DroppedItemsObj = {
|
||||||
// // [key]: [...(droppedItems[key] || []),
|
// // ...droppedItems,
|
||||||
// // {
|
// // [key]: [...(droppedItems[key] || []),
|
||||||
// // ...prepData,
|
// // {
|
||||||
// // radioGroups: dragElemData.label === "radio" ? [{ ...prepData }] : []
|
// // ...prepData,
|
||||||
// // }],
|
// // radioGroups: dragElemData.label === "radio" ? [{ ...prepData }] : []
|
||||||
// // }
|
// // }],
|
||||||
|
// // }
|
||||||
|
|
||||||
// // const lastRadioElemRect = e.currentTarget?.parentElement.previousSibling.getBoundingClientRect();
|
// // const lastRadioElemRect = e.currentTarget?.parentElement.previousSibling.getBoundingClientRect();
|
||||||
// // console.log(lastRadioElemRect, "lastRadioElemRect")
|
// // console.log(lastRadioElemRect, "lastRadioElemRect")
|
||||||
|
|
@ -935,4 +931,4 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ isSend }) => {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default DocumentContainer;
|
export default DocumentContainer;
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,16 @@ canvas {
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
.bottom-border>div:hover {
|
||||||
|
background-color: var(--primaryLight2) ;
|
||||||
|
opacity: 0.9;
|
||||||
|
transition: all 0.3s ease-in-out;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Group Border - END */
|
||||||
|
|
||||||
|
|
||||||
/* Loader CSS */
|
/* Loader CSS */
|
||||||
/* From Uiverse.io by Juanes200122 */
|
/* From Uiverse.io by Juanes200122 */
|
||||||
.pl {
|
.pl {
|
||||||
|
|
@ -326,7 +335,6 @@ canvas {
|
||||||
stroke-dashoffset: -440;
|
stroke-dashoffset: -440;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
.bottom-border>div:hover {
|
.bottom-border>div:hover {
|
||||||
background-color: var(--primaryLight2) ;
|
background-color: var(--primaryLight2) ;
|
||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
|
|
@ -336,5 +344,3 @@ canvas {
|
||||||
|
|
||||||
/* Group Border - END */
|
/* Group Border - END */
|
||||||
|
|
||||||
/* Loader CSS */
|
|
||||||
>>>>>>> 313217eded9cceb45db39bd86d6886f199fec226
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue