mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-10 14:28:35 +00:00
fix: secret input
This commit is contained in:
committed by
Akhil Mohan
parent
81827e2deb
commit
7f753b23f8
@@ -1,6 +1,5 @@
|
|||||||
/* eslint-disable react/no-danger */
|
/* eslint-disable react/no-danger */
|
||||||
import { forwardRef, HTMLAttributes } from "react";
|
import { forwardRef, HTMLAttributes, useState } from "react";
|
||||||
import ContentEditable from "react-contenteditable";
|
|
||||||
import sanitizeHtml, { DisallowedTagsModes } from "sanitize-html";
|
import sanitizeHtml, { DisallowedTagsModes } from "sanitize-html";
|
||||||
|
|
||||||
import { useToggle } from "@app/hooks";
|
import { useToggle } from "@app/hooks";
|
||||||
@@ -38,7 +37,7 @@ const syntaxHighlight = (content?: string | null, isVisible?: boolean) => {
|
|||||||
return newContent;
|
return newContent;
|
||||||
};
|
};
|
||||||
|
|
||||||
type Props = Omit<HTMLAttributes<HTMLDivElement>, "onChange" | "onBlur"> & {
|
type Props = Omit<HTMLAttributes<HTMLTextAreaElement>, "onChange" | "onBlur"> & {
|
||||||
value?: string | null;
|
value?: string | null;
|
||||||
isVisible?: boolean;
|
isVisible?: boolean;
|
||||||
isDisabled?: boolean;
|
isDisabled?: boolean;
|
||||||
@@ -46,30 +45,44 @@ type Props = Omit<HTMLAttributes<HTMLDivElement>, "onChange" | "onBlur"> & {
|
|||||||
onBlur?: () => void;
|
onBlur?: () => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const SecretInput = forwardRef<HTMLDivElement, Props>(
|
const commonClassName =
|
||||||
({ value, isVisible, onChange, onBlur, isDisabled, ...props }, ref) => {
|
"font-mono text-base leading-5 caret-white border-none outline-none w-full break-all ";
|
||||||
|
|
||||||
|
export const SecretInput = forwardRef<HTMLTextAreaElement, Props>(
|
||||||
|
({ value, isVisible, onChange, onBlur, isDisabled, onFocus, ...props }, ref) => {
|
||||||
const [isSecretFocused, setIsSecretFocused] = useToggle();
|
const [isSecretFocused, setIsSecretFocused] = useToggle();
|
||||||
|
const [text, setText] = useState(() => value || "");
|
||||||
|
|
||||||
|
const update = (code: string) => {
|
||||||
|
setText(code);
|
||||||
|
if (onChange) {
|
||||||
|
onChange(code);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const onInput = (event: any) => {
|
||||||
|
const code = event.target.value.trim() || "";
|
||||||
|
update(code);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div className="relative">
|
||||||
className="thin-scrollbar relative overflow-y-auto overflow-x-hidden"
|
<pre aria-hidden className="m-0 whitespace-pre-wrap">
|
||||||
style={{ maxHeight: `${21 * 7}px` }}
|
<code className={`code inline-block w-full ${commonClassName}`}>
|
||||||
>
|
<span
|
||||||
<div
|
dangerouslySetInnerHTML={{
|
||||||
dangerouslySetInnerHTML={{
|
__html: syntaxHighlight(text, isVisible || isSecretFocused) ?? ""
|
||||||
__html: syntaxHighlight(value, isVisible || isSecretFocused)
|
}}
|
||||||
}}
|
/>
|
||||||
className={`absolute top-0 left-0 z-0 h-full w-full inline-block text-ellipsis whitespace-pre-wrap break-all ${
|
</code>
|
||||||
!value && value !== "" && "italic text-red-600/70"
|
</pre>
|
||||||
}`}
|
|
||||||
|
<textarea
|
||||||
|
aria-label="secret value"
|
||||||
ref={ref}
|
ref={ref}
|
||||||
/>
|
className={`textarea absolute inset-0 h-full overflow-hidden block focus:border-0 resize-none bg-transparent text-transparent ${commonClassName}`}
|
||||||
<ContentEditable
|
value={text}
|
||||||
className="relative z-10 h-full w-full text-ellipsis inline-block whitespace-pre-wrap break-all text-transparent caret-white outline-none"
|
onChange={onInput}
|
||||||
role="textbox"
|
|
||||||
onChange={(evt) => {
|
|
||||||
if (onChange) onChange(evt.currentTarget.innerText.trim());
|
|
||||||
}}
|
|
||||||
onFocus={() => setIsSecretFocused.on()}
|
onFocus={() => setIsSecretFocused.on()}
|
||||||
disabled={isDisabled}
|
disabled={isDisabled}
|
||||||
spellCheck={false}
|
spellCheck={false}
|
||||||
@@ -77,14 +90,6 @@ export const SecretInput = forwardRef<HTMLDivElement, Props>(
|
|||||||
if (onBlur) onBlur();
|
if (onBlur) onBlur();
|
||||||
setIsSecretFocused.off();
|
setIsSecretFocused.off();
|
||||||
}}
|
}}
|
||||||
html={
|
|
||||||
isVisible || isSecretFocused
|
|
||||||
? sanitizeHtml(
|
|
||||||
value?.replaceAll("<", "<").replaceAll(">", ">") || "",
|
|
||||||
sanitizeConf
|
|
||||||
)
|
|
||||||
: syntaxHighlight(value, false)
|
|
||||||
}
|
|
||||||
{...props}
|
{...props}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user