Skip to content

Commit 306768f

Browse files
Merge pull request #617 from OpenSignLabs/fix_issue
fix: input number type validation issue with space and fix send mail modal design
2 parents 673245d + d82da53 commit 306768f

File tree

2 files changed

+24
-16
lines changed

2 files changed

+24
-16
lines changed

apps/OpenSign/src/components/pdf/PlaceholderType.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function PlaceholderType(props) {
6363
validateExpression(regexValidation);
6464
break;
6565
case "number":
66-
regexValidation = /^\d+$/;
66+
regexValidation = /^[0-9\s]*$/;
6767
validateExpression(regexValidation);
6868
break;
6969
case "text":

apps/OpenSign/src/pages/PlaceHolderSign.js

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -987,26 +987,32 @@ function PlaceHolderSign() {
987987
return shareLinkList.map((data, ind) => {
988988
return (
989989
<div
990-
className="flex flex-col md:flex-row justify-between mb-1"
990+
className="flex flex-row justify-between items-center mb-1"
991991
key={ind}
992992
>
993993
{copied && <Alert type="success">Copied</Alert>}
994-
<span className="w-[200px] md:w-[300px] whitespace-nowrap overflow-hidden text-ellipsis ">
994+
<span className="w-[220px] md:w-[300px] whitespace-nowrap overflow-hidden text-ellipsis ">
995995
{data.signerEmail}
996996
</span>
997-
<div className=" ">
998-
<span
999-
className="mr-3 underline text-blue-700 cursor-pointer "
997+
<div className="flex flex-row items-center gap-3 ">
998+
<button
1000999
onClick={() => copytoclipboard(data.url)}
1000+
type="button"
1001+
className="flex flex-row items-center text-white font-[500]"
10011002
>
1002-
<i className="fa-solid fa-link "></i> copy link
1003-
</span>
1003+
<i
1004+
className="fa-solid fa-link underline text-blue-700"
1005+
aria-hidden="true"
1006+
></i>
1007+
<span className=" hidden md:block ml-1 underline text-blue-700">
1008+
Copy link
1009+
</span>
1010+
</button>
10041011
<RWebShare
10051012
data={{
10061013
url: data.url,
10071014
title: "Sign url"
10081015
}}
1009-
// onClick={() => console.log("shared successfully!")}
10101016
>
10111017
<i
10121018
className="fa-solid fa-share-from-square cursor-pointer "
@@ -1727,7 +1733,7 @@ function PlaceHolderSign() {
17271733
)}
17281734
<div
17291735
className={
1730-
"flex flex-col md:flex-row md:items-center md:gap-6 mt-2 "
1736+
"flex flex-row md:items-center gap-2 md:gap-6 mt-2 "
17311737
}
17321738
>
17331739
<div className="flex flex-row gap-2">
@@ -1768,10 +1774,12 @@ function PlaceHolderSign() {
17681774
)}
17691775

17701776
{!isSubscribe && isEnableSubscription && (
1771-
<Upgrade
1772-
message="Upgrade to customize Email"
1773-
newWindow={true}
1774-
/>
1777+
<div className="mt-2">
1778+
<Upgrade
1779+
message="Upgrade to customize Email"
1780+
newWindow={true}
1781+
/>
1782+
</div>
17751783
)}
17761784
</div>
17771785
</>
@@ -1781,7 +1789,7 @@ function PlaceHolderSign() {
17811789

17821790
{isSendAlert.mssg === "confirm" && (
17831791
<>
1784-
<div className="flex justify-center items-center mt-4">
1792+
<div className="flex justify-center items-center mt-3">
17851793
<span
17861794
style={{
17871795
height: 1,
@@ -1798,7 +1806,7 @@ function PlaceHolderSign() {
17981806
}}
17991807
></span>
18001808
</div>
1801-
<div className="mt-4 mb-3">{handleShareList()}</div>
1809+
<div className="mt-3 mb-3">{handleShareList()}</div>
18021810
</>
18031811
)}
18041812
</div>

0 commit comments

Comments
 (0)