Skip to content

Commit 8e1926d

Browse files
committed
fix(preprocess): add new regex to catch variable names for context menu
1 parent bef76be commit 8e1926d

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/preprocess/preprocess.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -564,15 +564,20 @@ func exposeAPIs_main(input string) string {
564564
croppedInput := utils.FindFirstMatch(input, `.*value:"contextmenu"`)[0]
565565
react := utils.FindLastMatch(croppedInput, `([a-zA-Z_\$][\w\$]*)\.useRef`)[1]
566566
candicates := utils.FindLastMatch(croppedInput, `\(\{[^}]*menu:([a-zA-Z_\$][\w\$]*),[^}]*trigger:([a-zA-Z_\$][\w\$]*),[^}]*triggerRef:([a-zA-Z_\$][\w\$]*)`)
567+
oldCandicates := utils.FindLastMatch(croppedInput, `([a-zA-Z_\$][\w\$]*)=[\w_$]+\.menu[^}]*,([a-zA-Z_\$][\w\$]*)=[\w_$]+\.trigger[^}]*,([a-zA-Z_\$][\w\$]*)=[\w_$]+\.triggerRef`)
567568
var menu, trigger, target string
568-
if len(candicates) == 0 {
569-
menu = "e.menu"
570-
trigger = "e.trigger"
571-
target = "e.triggerRef"
572-
} else {
569+
if len(oldCandicates) != 0 {
570+
menu = oldCandicates[1]
571+
trigger = oldCandicates[2]
572+
target = oldCandicates[3]
573+
} else if len(candicates) != 0 {
573574
menu = candicates[1]
574575
trigger = candicates[2]
575576
target = candicates[3]
577+
} else {
578+
menu = "e.menu"
579+
trigger = "e.trigger"
580+
target = "e.triggerRef"
576581
}
577582

578583
utils.Replace(&input, `\(0,([\w_$]+)\.jsx\)\([\w_$]+\.[\w_$]+,\{value:"contextmenu"[^\}]+\}\)\}\)`, func(submatches ...string) string {

0 commit comments

Comments
 (0)