Skip to content

italic and underline features added #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
intropercib wants to merge 1 commit into
base: main
Choose a base branch
from
Open

italic and underline features added #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 59 additions & 19 deletions src/components/floatingToolBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,87 @@ import useUpdateDom from "../customHooks/useUpdateDom";

export default function FloatingToolBar({ x, y }) {
const [open, setOpen] = useState(true);
const changeType = useEditor(state=>state.changeType)
const {addBold} = useUpdateDom()
const changeType = useEditor(state => state.changeType)
const { addBold, addItalic, addUnderline } = useUpdateDom()

const closeMenu = () => setOpen(!open);
const toggleModal = useModal(state=>state.toggleModal)
const toggleCommentModal = useCommentModal(state=>state.toggleCommentModal)
const toggleModal = useModal(state => state.toggleModal)
const toggleCommentModal = useCommentModal(state => state.toggleCommentModal)

const type = useEditor((state) => state.type);
const config = useEditor((state) => state.config);

const openModal = ({name,value}) => {
const openModal = ({ name, value }) => {


changeType({name,value})
if(name === 'bold') return;
if(name === 'comment'){
changeType({ name, value })
if (name === 'bold') return;
if (name === 'italic') return;
if (name === 'underline') return;
if (name === 'comment') {
toggleCommentModal()
}
else{
else {
toggleModal()

}

}
useEffect(()=>{
if(type.name === 'bold' && config.selectedText){
addBold();
}
},[type.name,addBold])
useEffect(() => {
setOpen(true);
if (type.name === 'bold' && config.selectedText) {
addBold();
}
if (type.name === 'italic' && config.selectedText) {
addItalic();
}
if (type.name === 'underline' && config.selectedText) {
addUnderline();
}
}, [type.name, addBold, addItalic, addUnderline])
useEffect(() => {
setOpen(true);
}, [x]);
return (
<>
{open && config.selectedText && x ? (
<section
style={{ left: `${x-100}px`, top: `${y+10}px`, position: "absolute" }}
style={{ left: `${x - 100}px`, top: `${y + 10}px`, position: "absolute" }}
>
<div className="floating-toolbar">
<span onClick={()=>openModal({name:'bold'})} >B</span>
<span onClick={()=>openModal({name:'highlight'})}>
<span onClick={() => openModal({ name: 'bold' })} >
<svg
xmlns="http://www.w3.org/2000/svg"
height={"20px"}
width={"20px"}
fill="#000000"
viewBox="0 -960 960 960"
>
<path d="M272-200v-560h221q65 0 120 40t55 111q0 51-23 78.5T602-491q25 11 55.5 41t30.5 90q0 89-65 124.5T501-200H272Zm121-112h104q48 0 58.5-24.5T566-372q0-11-10.5-35.5T494-432H393v120Zm0-228h93q33 0 48-17t15-38q0-24-17-39t-44-15h-95v109Z" />
</svg>
</span>
<span onClick={() => openModal({ name: 'italic' })}>
<svg
xmlns="http://www.w3.org/2000/svg"
height={"20px"}
width={"20px"}
fill="#000000"
viewBox="0 -960 960 960"
>
<path d="M200-200v-100h160l120-360H320v-100h400v100H580L460-300h140v100H200Z" />
</svg>
</span>
<span onClick={() => openModal({ name: 'underline' })}>
<svg
xmlns="http://www.w3.org/2000/svg"
height={"20px"}
width={"20px"}
fill="#000000"
viewBox="0 -960 960 960"
>
<path d="M200-120v-80h560v80H200Zm280-160q-101 0-157-63t-56-167v-330h103v336q0 56 28 91t82 35q54 0 82-35t28-91v-336h103v330q0 104-56 167t-157 63Z" />
</svg>
</span>
<span onClick={() => openModal({ name: 'highlight' })}>
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
Expand All @@ -63,7 +103,7 @@ if(type.name === 'bold' && config.selectedText){
/>
</svg>
</span>
<span onClick={()=>openModal({name:'comment'})} >
<span onClick={() => openModal({ name: 'comment' })} >
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
Expand Down
96 changes: 58 additions & 38 deletions src/customHooks/useUpdateDom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,45 +31,44 @@ export default function useUpdateDom() {
specificIndex = index;
const elements = domElement.split(config.selectedText);
let Childrens = []
elements.forEach((element,index) => {
if(index === elements.length-1){
Childrens.push(element)
elements.forEach((element, index) => {
if (index === elements.length - 1) {
Childrens.push(element)
}
else{
Childrens.push(element)
Childrens.push( {
type: "span",
props: {
children:
type.name === "comment"
? [
config.selectedText,
{
type: "span",
props: {
className: "hover-card",
children: [
{
type: "span",
props: {
className: "hover-title",
children: [config.selectedText],
},
},
type.value,
],
},
},
]
: [config.selectedText],
className: `text-shadow-reed ${type.name} ${
type.value ? type.value : ""
} `,
},
},)
else {
Childrens.push(element)
Childrens.push({
type: "span",
props: {
children:
type.name === "comment"
? [
config.selectedText,
{
type: "span",
props: {
className: "hover-card",
children: [
{
type: "span",
props: {
className: "hover-title",
children: [config.selectedText],
},
},
type.value,
],
},
},
]
: [config.selectedText],
className: `text-shadow-reed ${type.name} ${type.value ? type.value : ""
} `,
},
},)
}
})

})
let child = {
type: "span",
props: {
Expand Down Expand Up @@ -99,7 +98,7 @@ export default function useUpdateDom() {
config.selectedText &&
config.xPath
) {

let updatedDom = updateDom(dom, "");
const newDom = Object.create(updatedDom);
setDom(newDom);
Expand All @@ -118,6 +117,25 @@ export default function useUpdateDom() {
changeType({ name: "", value: "" });
}
};

const addItalic = () => {
if (type.name === "italic" && config.selectedText && config.xPath) {
let updatedDom = updateDom(dom, "");
const newDom = Object.create(updatedDom);
setDom(newDom);
changeConfig({ xPath: "", selectedText: "" });
changeType({ name: "", value: "" });
}
};
const addUnderline = () => {
if (type.name === "underline" && config.selectedText && config.xPath) {
let updatedDom = updateDom(dom, "");
const newDom = Object.create(updatedDom);
setDom(newDom);
changeConfig({ xPath: "", selectedText: "" });
changeType({ name: "", value: "" });
}
};
const addComment = () => {
if (type.name === "comment" && config.selectedText && config.xPath) {
let updatedDom = updateDom(dom, "");
Expand All @@ -130,6 +148,8 @@ export default function useUpdateDom() {

return {
addBold,
addItalic,
addUnderline,
addComment,
addHighlight,
};
Expand Down
10 changes: 10 additions & 0 deletions src/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
position: relative;
transition: all .2s ease-in-out;
color:#000;
border-right: 1px solid rgb(83, 82, 82);
}
.floating-toolbar span:last-child {
border-right: none;
}
.floating-toolbar span:hover {
background: #f2f2f2;
Expand Down Expand Up @@ -205,6 +209,12 @@
font-weight: bold;
letter-spacing: 1;
}
.italic {
font-style: italic;
}
.underline{
text-decoration: underline;
}
.highlight {
border-radius: 4px;
padding: 4px;
Expand Down