Skip to content

🔥 The free & Open Source DocuSign alternative

fix: when click on label in radio or checkbox widget it's border not visible

prafull-opensignlabs7584667643dc
diff --git a/apps/OpenSign/src/components/pdf/Placeholder.js b/apps/OpenSign/src/components/pdf/Placeholder.js
index 81a645067..d7c8f7d36 100644
--- a/apps/OpenSign/src/components/pdf/Placeholder.js
+++ b/apps/OpenSign/src/components/pdf/Placeholder.js
@@ -168,8 +168,8 @@ function Placeholder(props) {
};
}, [isShowDateFormat]);
- //onclick placeholder function to open signature pad
- const handlePlaceholderClick = () => {
+ //`handleWidgetIdandPopup` is used to set current widget id and open relative popup
+ const handleWidgetIdandPopup = () => {
if (props.setSelectWidgetId) {
props.setSelectWidgetId(props.pos.key);
}
@@ -238,9 +238,18 @@ function Placeholder(props) {
}
}
};
-
- //function to set state value of onclick on widget's setting icon
- const handleWidgetsOnclick = () => {
+ const handleOnClickPlaceholder = () => {
+ if (!props.isNeedSign) {
+ props.setWidgetType(props.pos.type);
+ }
+ if (props.isNeedSign && props.data?.signerObjId === props.signerObjId) {
+ handleWidgetIdandPopup();
+ } else if (props.isPlaceholder || props.isSignYourself) {
+ handleWidgetIdandPopup();
+ }
+ };
+ //`handleOnClickSettingIcon` is used set current widget details and open setting of it
+ const handleOnClickSettingIcon = () => {
if (props.pos.type === radioButtonWidget) {
props.setIsRadio(true);
} else if (props.pos.type === "dropdown") {
@@ -312,11 +321,11 @@ function Placeholder(props) {
<i
onClick={(e) => {
e.stopPropagation();
- handleWidgetsOnclick();
+ handleOnClickSettingIcon();
}}
onTouchEnd={(e) => {
e.stopPropagation();
- handleWidgetsOnclick();
+ handleOnClickSettingIcon();
}}
className="fa-solid fa-gear settingIcon"
style={{
@@ -335,11 +344,11 @@ function Placeholder(props) {
<i
onClick={(e) => {
e.stopPropagation();
- handleWidgetsOnclick();
+ handleOnClickSettingIcon();
}}
onTouchEnd={(e) => {
e.stopPropagation();
- handleWidgetsOnclick();
+ handleOnClickSettingIcon();
}}
className="fa-solid fa-gear settingIcon"
style={{
@@ -622,14 +631,7 @@ function Placeholder(props) {
false
);
}}
- onClick={() => {
- !props.isNeedSign && props.setWidgetType(props.pos.type);
- props.isNeedSign && props.data?.signerObjId === props.signerObjId
- ? handlePlaceholderClick()
- : props.isPlaceholder
- ? handlePlaceholderClick()
- : props.isSignYourself && handlePlaceholderClick();
- }}
+ onClick={() => handleOnClickPlaceholder()}
>
{props.isShowBorder &&
props.pos.type !== radioButtonWidget &&
@@ -679,14 +681,7 @@ function Placeholder(props) {
// height: props.posHeight(props.pos, props.isSignYourself),
zIndex: "10"
}}
- onTouchEnd={() => {
- !props.isNeedSign && props.setWidgetType(props.pos.type);
- props.isNeedSign && props.data?.signerObjId === props.signerObjId
- ? handlePlaceholderClick()
- : props.isPlaceholder
- ? handlePlaceholderClick()
- : props.isSignYourself && handlePlaceholderClick();
- }}
+ onTouchEnd={() => handleOnClickPlaceholder()}
>
{props.pos.key === props.selectWidgetId && <PlaceholderIcon />}
diff --git a/apps/OpenSign/src/components/pdf/PlaceholderType.js b/apps/OpenSign/src/components/pdf/PlaceholderType.js
index 71614bd8b..8f5b78ce8 100644
--- a/apps/OpenSign/src/components/pdf/PlaceholderType.js
+++ b/apps/OpenSign/src/components/pdf/PlaceholderType.js
@@ -332,15 +332,14 @@ function PlaceholderType(props) {
<div style={{ zIndex: props.isSignYourself && "99" }}>
{props.pos.options?.values?.map((data, ind) => {
return (
- <div key={ind} className="flex items-center gap-1 min-w-max">
+ <div key={ind} className="flex items-center text-center gap-0.5">
<input
id={data}
style={{
width: props.pos.Width,
display: "flex",
justifyContent: "center",
- marginBottom: "6px",
- marginTop: "5px"
+ marginTop: ind === 0 ? 0 : "5px"
}}
onBlur={handleInputBlur}
disabled={
@@ -375,7 +374,10 @@ function PlaceholderType(props) {
}}
/>
{!props.pos.options?.isHideLabel && (
- <label htmlFor={data} className="text-xs">
+ <label
+ htmlFor={!props.isPlaceholder && data}
+ className="text-xs mb-0 text-center"
+ >
{data}
</label>
)}
@@ -710,18 +712,14 @@ function PlaceholderType(props) {
<div>
{props.pos.options?.values.map((data, ind) => {
return (
- <div
- key={ind}
- className="flex flex-row items-center gap-1 min-w-max"
- >
+ <div key={ind} className="flex items-center text-center gap-0.5">
<input
id={data}
style={{
width: props.pos.Width,
display: "flex",
justifyContent: "center",
- marginBottom: "6px",
- marginTop: "5px"
+ marginTop: ind === 0 ? 0 : "5px"
}}
type="radio"
disabled={
@@ -737,7 +735,10 @@ function PlaceholderType(props) {
}}
/>
{!props.pos.options?.isHideLabel && (
- <label htmlFor={data} className="text-xs">
+ <label
+ htmlFor={!props.isPlaceholder && data}
+ className="text-xs mb-0"
+ >
{data}
</label>
)}