Skip to content

Virtual whiteboard for sketching hand-drawn like diagrams

refactor: remove `defaultProps` (#9035)

David Luzarfa05ae123007
diff --git a/packages/excalidraw/components/ToolButton.tsx b/packages/excalidraw/components/ToolButton.tsx
index 30014d4b14..09b0b6cf83 100644
--- a/packages/excalidraw/components/ToolButton.tsx
+++ b/packages/excalidraw/components/ToolButton.tsx
@@ -55,146 +55,152 @@ type ToolButtonProps =
onPointerDown?(data: { pointerType: PointerType }): void;
});
-export const ToolButton = React.forwardRef((props: ToolButtonProps, ref) => {
- const { id: excalId } = useExcalidrawContainer();
- const innerRef = React.useRef(null);
- React.useImperativeHandle(ref, () => innerRef.current);
- const sizeCn = `ToolIcon_size_${props.size}`;
+export const ToolButton = React.forwardRef(
+ (
+ {
+ size = "medium",
+ visible = true,
+ className = "",
+ ...props
+ }: ToolButtonProps,
+ ref,
+ ) => {
+ const { id: excalId } = useExcalidrawContainer();
+ const innerRef = React.useRef(null);
+ React.useImperativeHandle(ref, () => innerRef.current);
+ const sizeCn = `ToolIcon_size_${size}`;
- const [isLoading, setIsLoading] = useState(false);
+ const [isLoading, setIsLoading] = useState(false);
- const isMountedRef = useRef(true);
+ const isMountedRef = useRef(true);
- const onClick = async (event: React.MouseEvent) => {
- const ret = "onClick" in props && props.onClick?.(event);
+ const onClick = async (event: React.MouseEvent) => {
+ const ret = "onClick" in props && props.onClick?.(event);
- if (isPromiseLike(ret)) {
- try {
- setIsLoading(true);
- await ret;
- } catch (error: any) {
- if (!(error instanceof AbortError)) {
- throw error;
- } else {
- console.warn(error);
- }
- } finally {
- if (isMountedRef.current) {
- setIsLoading(false);
+ if (isPromiseLike(ret)) {
+ try {
+ setIsLoading(true);
+ await ret;
+ } catch (error: any) {
+ if (!(error instanceof AbortError)) {
+ throw error;
+ } else {
+ console.warn(error);
+ }
+ } finally {
+ if (isMountedRef.current) {
+ setIsLoading(false);
+ }
}
}
- }
- };
-
- useEffect(() => {
- isMountedRef.current = true;
- return () => {
- isMountedRef.current = false;
};
- }, []);
- const lastPointerTypeRef = useRef<PointerType | null>(null);
+ useEffect(() => {
+ isMountedRef.current = true;
+ return () => {
+ isMountedRef.current = false;
+ };
+ }, []);
+
+ const lastPointerTypeRef = useRef<PointerType | null>(null);
+
+ if (
+ props.type === "button" ||
+ props.type === "icon" ||
+ props.type === "submit"
+ ) {
+ const type = (props.type === "icon" ? "button" : props.type) as
+ | "button"
+ | "submit";
+ return (
+ <button
+ className={clsx(
+ "ToolIcon_type_button",
+ sizeCn,
+ className,
+ visible && !props.hidden
+ ? "ToolIcon_type_button--show"
+ : "ToolIcon_type_button--hide",
+ {
+ ToolIcon: !props.hidden,
+ "ToolIcon--selected": props.selected,
+ "ToolIcon--plain": props.type === "icon",
+ },
+ )}
+ style={props.style}
+ data-testid={props["data-testid"]}
+ hidden={props.hidden}
+ title={props.title}
+ aria-label={props["aria-label"]}
+ type={type}
+ onClick={onClick}
+ ref={innerRef}
+ disabled={isLoading || props.isLoading || !!props.disabled}
+ >
+ {(props.icon || props.label) && (
+ <div
+ className="ToolIcon__icon"
+ aria-hidden="true"
+ aria-disabled={!!props.disabled}
+ >
+ {props.icon || props.label}
+ {props.keyBindingLabel && (
+ <span className="ToolIcon__keybinding">
+ {props.keyBindingLabel}
+ </span>
+ )}
+ {props.isLoading && <Spinner />}
+ </div>
+ )}
+ {props.showAriaLabel && (
+ <div className="ToolIcon__label">
+ {props["aria-label"]} {isLoading && <Spinner />}
+ </div>
+ )}
+ {props.children}
+ </button>
+ );
+ }
- if (
- props.type === "button" ||
- props.type === "icon" ||
- props.type === "submit"
- ) {
- const type = (props.type === "icon" ? "button" : props.type) as
- | "button"
- | "submit";
return (
- <button
- className={clsx(
- "ToolIcon_type_button",
- sizeCn,
- props.className,
- props.visible && !props.hidden
- ? "ToolIcon_type_button--show"
- : "ToolIcon_type_button--hide",
- {
- ToolIcon: !props.hidden,
- "ToolIcon--selected": props.selected,
- "ToolIcon--plain": props.type === "icon",
- },
- )}
- style={props.style}
- data-testid={props["data-testid"]}
- hidden={props.hidden}
+ <label
+ className={clsx("ToolIcon", className)}
title={props.title}
- aria-label={props["aria-label"]}
- type={type}
- onClick={onClick}
- ref={innerRef}
- disabled={isLoading || props.isLoading || !!props.disabled}
+ onPointerDown={(event) => {
+ lastPointerTypeRef.current = event.pointerType || null;
+ props.onPointerDown?.({ pointerType: event.pointerType || null });
+ }}
+ onPointerUp={() => {
+ requestAnimationFrame(() => {
+ lastPointerTypeRef.current = null;
+ });
+ }}
>
- {(props.icon || props.label) && (
- <div
- className="ToolIcon__icon"
- aria-hidden="true"
- aria-disabled={!!props.disabled}
- >
- {props.icon || props.label}
- {props.keyBindingLabel && (
- <span className="ToolIcon__keybinding">
- {props.keyBindingLabel}
- </span>
- )}
- {props.isLoading && <Spinner />}
- </div>
- )}
- {props.showAriaLabel && (
- <div className="ToolIcon__label">
- {props["aria-label"]} {isLoading && <Spinner />}
- </div>
- )}
- {props.children}
- </button>
+ <input
+ className={`ToolIcon_type_radio ${sizeCn}`}
+ type="radio"
+ name={props.name}
+ aria-label={props["aria-label"]}
+ aria-keyshortcuts={props["aria-keyshortcuts"]}
+ data-testid={props["data-testid"]}
+ id={`${excalId}-${props.id}`}
+ onChange={() => {
+ props.onChange?.({ pointerType: lastPointerTypeRef.current });
+ }}
+ checked={props.checked}
+ ref={innerRef}
+ />
+ <div className="ToolIcon__icon">
+ {props.icon}
+ {props.keyBindingLabel && (
+ <span className="ToolIcon__keybinding">
+ {props.keyBindingLabel}
+ </span>
+ )}
+ </div>
+ </label>
);
- }
-
- return (
- <label
- className={clsx("ToolIcon", props.className)}
- title={props.title}
- onPointerDown={(event) => {
- lastPointerTypeRef.current = event.pointerType || null;
- props.onPointerDown?.({ pointerType: event.pointerType || null });
- }}
- onPointerUp={() => {
- requestAnimationFrame(() => {
- lastPointerTypeRef.current = null;
- });
- }}
- >
- <input
- className={`ToolIcon_type_radio ${sizeCn}`}
- type="radio"
- name={props.name}
- aria-label={props["aria-label"]}
- aria-keyshortcuts={props["aria-keyshortcuts"]}
- data-testid={props["data-testid"]}
- id={`${excalId}-${props.id}`}
- onChange={() => {
- props.onChange?.({ pointerType: lastPointerTypeRef.current });
- }}
- checked={props.checked}
- ref={innerRef}
- />
- <div className="ToolIcon__icon">
- {props.icon}
- {props.keyBindingLabel && (
- <span className="ToolIcon__keybinding">{props.keyBindingLabel}</span>
- )}
- </div>
- </label>
- );
-});
-
-ToolButton.defaultProps = {
- visible: true,
- className: "",
- size: "medium",
-};
+ },
+);
ToolButton.displayName = "ToolButton";