* fix style bugs * fix select styles * test: fix font size issue for cypress tests * incorporate ashit feedback * test: addresed review comments for cypress tests * add analytics events * height issue in view mode * incorporate code review feedbacks * incorporate code review feedbacks * refactor: addressed review comments; removed border radius and box shadow for text widget; Updated migrations * feat: Makes shadow and radius controls keyboard accessible (#11547) * makes shadow and radius controls keyboard accessible * removes unused imports * moves options out of render method * fix: changed the misnomer background property name to the relevant property name * fix: border radius issue for the map widget * address qa bugs * address qa bugs * fix ux of theming pane when widget is selected * fix: * added backgroundColor to the video widget * restricted pop-over border radius to 0.375rem * added box shadow for the input group for select widget * fix: added delete icon in the delete theme modal * address qa bugs * change checkbox column size in config * add js convertible to button color * remove unused imports * test: fixed jest tests * fix primary color typo * fix: migrations for the theming * fix: * Removed background color from MultiTreeSelect and TreeSelect component. * grouped button's menu button pop over border radius restricting to 0.375rem. * test: updated Dsl migration UT * address qa bugs * address qa bugs * fix: address qa comments * address qa bugs * fix: * migration issue; * unit test cases; * fix rating widget scroll issue * fix youtube video border radius bug * fix select widget * fix select widgets styles * address qa bugs * merge conflicts * makes the reset button keyboard accessible (#12134) * -resolved merge conflicts * address qa bugs * fix: labelTextSize migration fixes * refactor: * made changes to the fontSizeUtils function * fixed the issue related to unit tests * fix button group widget * remove unused imports * fix: fixed the text size migration for the table widget * refactor: addressed review comments for the table widget theming migration * fix button group widget * add init calls for view mode * json form init theme changes * fix: added migration for boxShadow, borderRadius and textSizes for table widget * fix broken fields * test: fixed unit tests * wip * inconsistancy fixes and schemaItem update in updateHook/fieldConfiguration * feat: init json form migration theming * json form primaryColor -> accentColor * update table widget * update table widget * object field label styling * fix: migration related to the JSON form * fix: fixed labelTextSize migration for JSON form nested widgets * property control nested stylesheet lookup * JSONForm label styles form array items * show label for checkbox field array item * fix button group widget * wip * refactor: addressed table widget review comments * refactor: addressed ashit review comments; * added childStylesheet for widgets * feat: Keyboard navigable Color Picker control (#11797) * Makes ColorPicker keyboard accessible * seperate out keyboard and mouse interactions * fix issue with not focusing back to input * Adds test for Color picker * chore: added comment for the boxShadow property * fix: * added unit test cases for the widget and property utils * resolved warning messages * wip * theme config update * fix merge conflicts * refactor: moved theming migration inside the migrations folder * fix qa bugs * fix jest test * fix: unit test cases * fix table column creation logic * refactor: addressed review comments for migrations * fix: Overriding margin and padding for custom render in the dropdown component (#12875) * * fix for custom render padding and margin in ADS dropdown * * fix for removing padding from normal render options * refactor: moved the boxShadow condition to the variable * fix qa bugs * fix: migration QA callouts for audio recorder widget * refactor: added updated comments for boxShadow migration for table widget * fix theme binfings for JSONForm fields under Object * fix table widget theming bug * fix: addressed code review comments * fix: unit test cases * fix: qa migration callouts * fix table widget theming bug * fix JSONForm currency input dropdown not submit form * Added new tests - AppThemingSpec * fix qa bugs * fix unit test * fix JSONForm cellBorderWidth to have default value post migration * fix unit test * fix qa bugs * remove unused imports * fix qa bugs * fix JSONForm input height issue * fix qa bugs * Updating Theming spec * * dropdown color fixes (#13249) * fix caching issue ; * Fixed Theming tests * fix tests * fix tab widget tests * fix: json form children level migration issue * fix table widget tests * Updated test * updated tests * updated test * updated tests * updated tests * updated pageload * fix cypress tests * remove cypress created files * fix color picker issues * Failure fixes * Fixed some more tests * fix: cypress test failures * fix tests * remove consoles * fix table tests * fix qa bugs * updating snapshots for AppPageLayout_spec as per new UI * fix rating widget bug * fix qa bugs * fix: * cypress failing tests * Migration QA callouts * Removed unused imports * update constract check algo * fix color contrast issue * fix: cypress failure test cases * update font sizes labels * fix regression bugs * fix: * JSON form labelTextSize issue fix * Updated comment for the fontSizeUtility function * migrations issues related to table widget borderRadius and boxShadow * fix: default labelTextSize issue for the Input and Select families * fix regression bugs * fix regression bugs * PassingParams spec - added wait time * fix: font family default value issue on JS toggle * fix js toggle issue in text widget * fix tests * fix tests * fix tests * fix cypress tests * fix regression bugs * fix regression bugs * fix: * refactored table widget migration function as per review comments, * added default value to the widget * fix: failing unit test cases * fix theming spec * fix cypress tests * test: fixed failed cypress test * incorporate ashit feedback * fix cypress tests * fix: addressed review comments * comment out table cypress test * fix merge conflicts * comment out color picker tests Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local> Co-authored-by: keyurparalkar <keyur@appsmith.com> Co-authored-by: Aswath K <aswath@appsmith.com> Co-authored-by: Nayan <nayan@appsmith.com> Co-authored-by: Ashit Rath <ashit@appsmith.com> Co-authored-by: balajisoundar <balaji@appsmith.com> Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: apple <nandan@thinkify.io> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
173 lines
5.3 KiB
TypeScript
173 lines
5.3 KiB
TypeScript
import React, { useRef, useState } from "react";
|
|
import styled from "styled-components";
|
|
import { useScript, ScriptStatus, AddScriptTo } from "utils/hooks/useScript";
|
|
import {
|
|
GOOGLE_RECAPTCHA_KEY_ERROR,
|
|
GOOGLE_RECAPTCHA_DOMAIN_ERROR,
|
|
createMessage,
|
|
} from "@appsmith/constants/messages";
|
|
import { RecaptchaType, RecaptchaTypes } from "components/constants";
|
|
import ReCAPTCHA from "react-google-recaptcha";
|
|
import { Variant } from "components/ads/common";
|
|
|
|
const RecaptchaWrapper = styled.div`
|
|
position: relative;
|
|
.grecaptcha-badge {
|
|
visibility: hidden;
|
|
}
|
|
`;
|
|
|
|
export interface RecaptchaProps {
|
|
googleRecaptchaKey?: string;
|
|
clickWithRecaptcha?: (token: string) => void;
|
|
handleRecaptchaV2Loading?: (isLoading: boolean) => void;
|
|
recaptchaType?: RecaptchaType;
|
|
onClick?: (event: React.MouseEvent<HTMLElement>) => void;
|
|
}
|
|
|
|
import { Toaster } from "components/ads/Toast";
|
|
|
|
export default function withRecaptcha<
|
|
T extends RecaptchaProps = RecaptchaProps
|
|
>(WrappedComponent: React.ComponentType<T>) {
|
|
const displayName =
|
|
WrappedComponent.displayName || WrappedComponent.name || "Component";
|
|
|
|
function ComponentWithRecaptcha(props: T) {
|
|
if (!props.googleRecaptchaKey) {
|
|
return <WrappedComponent {...props} {...(props as T)} />;
|
|
}
|
|
|
|
const handleError = (
|
|
event: React.MouseEvent<HTMLElement>,
|
|
error: string,
|
|
) => {
|
|
Toaster.show({
|
|
text: error,
|
|
variant: Variant.danger,
|
|
});
|
|
props.onClick && props.onClick(event);
|
|
};
|
|
|
|
if (props.recaptchaType === RecaptchaTypes.V2) {
|
|
return (
|
|
<RecaptchaV2Component {...props} handleError={handleError}>
|
|
<WrappedComponent {...props} {...(props as T)} />
|
|
</RecaptchaV2Component>
|
|
);
|
|
} else {
|
|
return (
|
|
<RecaptchaV3Component {...props} handleError={handleError}>
|
|
<WrappedComponent {...props} {...(props as T)} />
|
|
</RecaptchaV3Component>
|
|
);
|
|
}
|
|
}
|
|
|
|
ComponentWithRecaptcha.displayName = `withRecaptcha(${displayName})`;
|
|
|
|
return ComponentWithRecaptcha;
|
|
}
|
|
|
|
function RecaptchaV2Component(
|
|
props: {
|
|
children: any;
|
|
recaptchaType?: RecaptchaType;
|
|
handleError: (event: React.MouseEvent<HTMLElement>, error: string) => void;
|
|
} & RecaptchaProps,
|
|
) {
|
|
const recaptchaRef = useRef<ReCAPTCHA>(null);
|
|
const [isInvalidKey, setInvalidKey] = useState(false);
|
|
const handleRecaptchaLoading = (isloading: boolean) => {
|
|
props.handleRecaptchaV2Loading && props.handleRecaptchaV2Loading(isloading);
|
|
};
|
|
const handleBtnClick = async (event: React.MouseEvent<HTMLElement>) => {
|
|
if (isInvalidKey) {
|
|
// Handle incorrent google recaptcha site key
|
|
props.handleError(event, createMessage(GOOGLE_RECAPTCHA_KEY_ERROR));
|
|
} else {
|
|
handleRecaptchaLoading(true);
|
|
try {
|
|
await recaptchaRef?.current?.reset();
|
|
const token = await recaptchaRef?.current?.executeAsync();
|
|
if (token && typeof props.clickWithRecaptcha === "function") {
|
|
props.clickWithRecaptcha(token);
|
|
} else {
|
|
// Handle incorrent google recaptcha site key
|
|
props.handleError(event, createMessage(GOOGLE_RECAPTCHA_KEY_ERROR));
|
|
}
|
|
handleRecaptchaLoading(false);
|
|
} catch (err) {
|
|
handleRecaptchaLoading(false);
|
|
// Handle error due to google recaptcha key of different domain
|
|
props.handleError(event, createMessage(GOOGLE_RECAPTCHA_DOMAIN_ERROR));
|
|
}
|
|
}
|
|
};
|
|
return (
|
|
<RecaptchaWrapper onClick={handleBtnClick}>
|
|
{props.children}
|
|
<ReCAPTCHA
|
|
onErrored={() => setInvalidKey(true)}
|
|
ref={recaptchaRef}
|
|
sitekey={props.googleRecaptchaKey || ""}
|
|
size="invisible"
|
|
/>
|
|
</RecaptchaWrapper>
|
|
);
|
|
}
|
|
|
|
function RecaptchaV3Component(
|
|
props: {
|
|
children: any;
|
|
recaptchaType?: RecaptchaType;
|
|
handleError: (event: React.MouseEvent<HTMLElement>, error: string) => void;
|
|
} & RecaptchaProps,
|
|
) {
|
|
// Check if a string is a valid JSON string
|
|
const checkValidJson = (inputString: string): boolean => {
|
|
return !inputString.includes('"');
|
|
};
|
|
|
|
const handleBtnClick = (event: React.MouseEvent<HTMLElement>) => {
|
|
if (status === ScriptStatus.READY) {
|
|
(window as any).grecaptcha.ready(() => {
|
|
try {
|
|
(window as any).grecaptcha
|
|
.execute(props.googleRecaptchaKey, {
|
|
action: "submit",
|
|
})
|
|
.then((token: any) => {
|
|
if (typeof props.clickWithRecaptcha === "function") {
|
|
props.clickWithRecaptcha(token);
|
|
}
|
|
})
|
|
.catch(() => {
|
|
// Handle incorrent google recaptcha site key
|
|
props.handleError(
|
|
event,
|
|
createMessage(GOOGLE_RECAPTCHA_KEY_ERROR),
|
|
);
|
|
});
|
|
} catch (err) {
|
|
// Handle error due to google recaptcha key of different domain
|
|
props.handleError(
|
|
event,
|
|
createMessage(GOOGLE_RECAPTCHA_DOMAIN_ERROR),
|
|
);
|
|
}
|
|
});
|
|
}
|
|
};
|
|
|
|
let validGoogleRecaptchaKey = props.googleRecaptchaKey;
|
|
if (validGoogleRecaptchaKey && !checkValidJson(validGoogleRecaptchaKey)) {
|
|
validGoogleRecaptchaKey = undefined;
|
|
}
|
|
const status = useScript(
|
|
`https://www.google.com/recaptcha/api.js?render=${validGoogleRecaptchaKey}`,
|
|
AddScriptTo.HEAD,
|
|
);
|
|
return <div onClick={handleBtnClick}>{props.children}</div>;
|
|
}
|