Skip to content

Commit b23878b

Browse files
committed
[REFACTOR]: Add font-family in scss Tooltip and improve ripple on Dropzone component
1 parent a806d65 commit b23878b

4 files changed

Lines changed: 11 additions & 13 deletions

File tree

src/components/dropzone/components/Dropzone/Dropzone.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from "../utils/validation.utils";
1212
import { DropzoneProps, DropzonePropsDefault } from "./DropzoneProps";
1313
import {
14-
createRipple,
14+
//createRipple,
1515
createRippleFromElement,
1616
} from "../utils/dropzone-ui.utils";
1717
import DropzoneHeader from "../DropzoneHeader/DropzoneHeader";
@@ -326,7 +326,7 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
326326
localValidator
327327
);
328328
if (!disableRipple) {
329-
createRippleFromElement(dz_ui_ripple_ref.current, color as string);
329+
createRippleFromElement(dz_ui_ripple_ref.current, evt,color as string);
330330

331331
// createRipple(evt, color as string);
332332
}
@@ -417,7 +417,7 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => {
417417
let referenceInput = inputRef.current;
418418
referenceInput?.click();
419419
if (!disableRipple) {
420-
createRippleFromElement(dz_ui_ripple_ref.current, color as string);
420+
createRippleFromElement(dz_ui_ripple_ref.current,e, color as string);
421421
//createRipple(e, color as string);
422422
}
423423
onClick?.(e);

src/components/dropzone/components/utils/dropzone-ui.utils.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ export function createRipple<
3131
}
3232

3333

34-
export function createRippleFromElement(element: HTMLDivElement | null, color: string) {
34+
export function createRippleFromElement<
35+
T extends HTMLButtonElement | HTMLAnchorElement | HTMLDivElement
36+
>(element: HTMLDivElement | null, event: React.MouseEvent<T, MouseEvent>,color: string) {
3537
if (!element) {
3638
return;
3739
}
@@ -46,9 +48,9 @@ export function createRippleFromElement(element: HTMLDivElement | null, color: s
4648
const radius: number = diameter / 2;
4749

4850
circle.style.width = circle.style.height = `${diameter}px`;
49-
circle.style.left = `${buttonAnchorDiv.offsetLeft - radius
51+
circle.style.left = `${event.clientX - buttonAnchorDiv.offsetLeft - radius
5052
}px`;
51-
circle.style.top = `${buttonAnchorDiv.offsetTop - radius}px`;
53+
circle.style.top = `${event.clientY - buttonAnchorDiv.offsetTop - radius}px`;
5254
circle.classList.add("ripple");
5355

5456
circle.style.backgroundColor = hexColorToRGB(

src/components/file-item/components/FileItem/FileItem.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@
313313
}
314314
}
315315
.dropzone-ui-tooltiptext {
316+
font-family: "Poppins", sans-serif;
316317
font-size: 0.8rem;
317318
visibility: hidden;
318319
width: 133px;

src/components/tooltip/components/Tooltip.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,12 @@ const Tooltip: FC<TooltipProps> = (props: TooltipProps) => {
5454
};
5555
useEffect(() => {
5656
handleChangeStatus(uploadStatus, valid);
57+
// eslint-disable-next-line
5758
}, [uploadStatus, valid]);
5859
return (
5960
<Fragment>
6061
{open && message && statusClassName && (
61-
<span
62-
className={
63-
statusClassName
64-
? `dropzone-ui-tooltiptext ${statusClassName}`
65-
: "dropzone-ui-tooltiptext"
66-
}
67-
>
62+
<span className={`dropzone-ui-tooltiptext ${statusClassName}`}>
6863
{
6964
/* !valid
7065
? errors?.map((error, index) => (

0 commit comments

Comments
 (0)