Compare commits

...

5 Commits

Author SHA1 Message Date
JaiPandey425 1ce24675ba Merge remote-tracking branch 'origin/main' into jai 2025-07-23 12:57:08 +05:30
=bhagwanSingh f206d54963 tagUpdate 2025-07-23 12:35:32 +05:30
=bhagwanSingh ddc4768612 Adding radion merge conflict 2025-07-23 12:07:30 +05:30
=bhagwanSingh eb7836f033 test 2025-07-23 11:57:17 +05:30
=bhagwanSingh cfc44b7d96 Merge branch 'jai' 2025-07-22 14:17:29 +05:30
2 changed files with 33 additions and 31 deletions

View File

@ -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)
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 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")

View File

@ -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