From 12ec7d4207b2c937265d3e0d8821d2cbc9a383ed Mon Sep 17 00:00:00 2001
From: TheoryOfNekomata <allan.crisostomo@outlook.com>
Date: Tue, 18 Jul 2023 14:15:45 +0800
Subject: [PATCH] Improve keyboard handling

Use keyboard shortcut on toggling maskedtextinput visibility.
---
 .../src/components/MaskedTextInput/index.tsx     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/categories/freeform/react/src/components/MaskedTextInput/index.tsx b/categories/freeform/react/src/components/MaskedTextInput/index.tsx
index 6fcfb44..ef60d21 100644
--- a/categories/freeform/react/src/components/MaskedTextInput/index.tsx
+++ b/categories/freeform/react/src/components/MaskedTextInput/index.tsx
@@ -60,6 +60,7 @@ export const MaskedTextInput = React.forwardRef<
     style,
     length,
     disabled,
+    onKeyUp,
     ...etcProps
   }: MaskedTextInputProps,
   forwardedRef,
@@ -70,6 +71,17 @@ export const MaskedTextInput = React.forwardRef<
   const id = idProp ?? defaultId;
   const [visible, setVisible] = React.useState(false);
 
+  const handleKeyUp: React.KeyboardEventHandler<MaskedTextInputDerivedElement> = React.useCallback((e) => {
+    if (e.ctrlKey && e.code === 'Space') {
+      setVisible((prev) => !prev);
+    }
+    onKeyUp?.(e);
+  }, [onKeyUp]);
+
+  const handleToggleVisible = React.useCallback(() => {
+    setVisible((prev) => !prev);
+  }, []);
+
   return (
     <div
       className={clsx(
@@ -121,6 +133,7 @@ export const MaskedTextInput = React.forwardRef<
         aria-labelledby={labelId}
         type={!visible ? 'password' : 'text'}
         data-testid="input"
+        onKeyUp={handleKeyUp}
         className={clsx(
           'bg-negative rounded-inherit w-full peer block font-inherit',
           'focus:outline-0',
@@ -188,6 +201,7 @@ export const MaskedTextInput = React.forwardRef<
           disabled={disabled}
           type="button"
           data-testid="indicator"
+          tabIndex={-1}
           className={clsx(
             'text-center z-[1] focus:outline-0 flex items-center justify-center aspect-square absolute bottom-0 right-0 select-none text-primary group-focus-within:text-secondary',
             {
@@ -196,7 +210,7 @@ export const MaskedTextInput = React.forwardRef<
               'w-16': size === 'large',
             },
           )}
-          onClick={() => { setVisible((b) => !b); }}
+          onClick={handleToggleVisible}
         >
           <svg
             className="w-6 h-6 fill-none stroke-current stroke-2 linejoin-round linecap-round"