rename ElementMatches to ElementR

dev_helpers.go

@@ -96,7 +96,7 @@ func (p *Page) Overlay(left, top, width, height float64, msg string) (remove fun
 }
 
 // ExposeJSHelper to page's window object, so you can debug helper.js in the browser console.
-// Such as run `rod.elementMatches("div", "ok")` in the browser console to test the Page.ElementMatches.
+// Such as run `rod.elementR("div", "ok")` in the browser console to test the Page.ElementR.
 func (p *Page) ExposeJSHelper() *Page {
 	p.MustEval(`rod => window.rod = rod`, proto.RuntimeRemoteObjectID(""))
 	return p

examples_test.go

@@ -188,7 +188,7 @@ func Example_wait_for_animation() {
 
 	page.MustWaitLoad().MustElement("[data-target='#exampleModalLive']").MustClick()
 
-	saveBtn := page.MustElementMatches("#exampleModalLive button", "Close")
+	saveBtn := page.MustElementR("#exampleModalLive button", "Close")
 
 	// Here, WaitStable will wait until the save button's position becomes
 	// stable. The timeout is 5 seconds, after which it times out (or after 1

hijack_test.go

@@ -251,7 +251,7 @@ func (s *S) TestHandleAuth() {
 
 	page := s.browser.MustPage(url)
 	defer page.MustClose()
-	page.MustElementMatches("p", "ok")
+	page.MustElementR("p", "ok")
 
 	wait := s.browser.HandleAuth("a", "b")
 	go func() { _, _ = s.browser.Page(url + "/err") }()

lib/assets/assets.go

@@ -52,7 +52,7 @@ const Helper = `() => {
       return list
     },
 
-    elementMatches(...pairs) {
+    elementR(...pairs) {
       for (let i = 0; i < pairs.length - 1; i += 2) {
         const selector = pairs[i]
         const pattern = pairs[i + 1]

lib/assets/js/main.go

@@ -14,8 +14,8 @@ const (
 	ElementX NameType = "elementX"
 	//ElementsX NameType function name
 	ElementsX NameType = "elementsX"
-	//ElementMatches NameType function name
-	ElementMatches NameType = "elementMatches"
+	//ElementR NameType function name
+	ElementR NameType = "elementR"
 	//Parents NameType function name
 	Parents NameType = "parents"
 	//ContainsElement NameType function name

lib/examples/compare-chromedp/logic/main.go

@@ -12,7 +12,7 @@ import (
 func main() {
 	page := rod.New().MustConnect().Timeout(time.Second * 15).MustPage("https://github.com/avelino/awesome-go")
 
-	section := page.MustElementMatches("p", "Selenium and browser control tools").MustNext()
+	section := page.MustElementR("p", "Selenium and browser control tools").MustNext()
 
 	// query children elements of an element
 	projects := section.MustElements("li")

lib/examples/compare-chromedp/submit/main.go

@@ -14,7 +14,7 @@ func main() {
 
 	page.MustElement(`input[name=q]`).MustWaitVisible().MustInput("chromedp").MustPress(input.Enter)
 
-	res := page.MustElementMatches("a", "chromedp").MustParent().MustNext().MustText()
+	res := page.MustElementR("a", "chromedp").MustParent().MustNext().MustText()
 
 	log.Printf("got: `%s`", strings.TrimSpace(res))
 }

must.go

@@ -406,11 +406,11 @@ func (p *Page) MustElement(selectors ...string) *Element {
 	return el
 }
 
-// MustElementMatches retries until an element in the page that matches one of the pairs.
-// Each pairs is a css selector and a regex. A sample call will look like page.MustElementMatches("div", "click me").
+// MustElementR retries until an element in the page that matches one of the pairs.
+// Each pairs is a css selector and a regex. A sample call will look like page.MustElementR("div", "click me").
 // The regex is the js regex, not golang's.
-func (p *Page) MustElementMatches(pairs ...string) *Element {
-	el, err := p.ElementMatches(pairs...)
+func (p *Page) MustElementR(pairs ...string) *Element {
+	el, err := p.ElementR(pairs...)
 	utils.E(err)
 	return el
 }
@@ -466,9 +466,9 @@ func (rc *RaceContext) MustElementX(selector string, callback func(*Element)) *R
 	})
 }
 
-// MustElementMatches the doc is similar with MustElement but has a callback when a match is found
-func (rc *RaceContext) MustElementMatches(selector, regex string, callback func(*Element)) *RaceContext {
-	return rc.ElementMatches(selector, regex, func(el *Element) error {
+// MustElementR the doc is similar with MustElement but has a callback when a match is found
+func (rc *RaceContext) MustElementR(selector, regex string, callback func(*Element)) *RaceContext {
+	return rc.ElementR(selector, regex, func(el *Element) error {
 		callback(el)
 		return nil
 	})
@@ -843,10 +843,10 @@ func (el *Element) MustPrevious() *Element {
 	return parent
 }
 
-// MustElementMatches returns the first element in the page that matches the CSS selector and its text matches the regex.
+// MustElementR returns the first element in the page that matches the CSS selector and its text matches the regex.
 // The regex is the js regex, not golang's.
-func (el *Element) MustElementMatches(selector, regex string) *Element {
-	el, err := el.ElementMatches(selector, regex)
+func (el *Element) MustElementR(selector, regex string) *Element {
+	el, err := el.ElementR(selector, regex)
 	utils.E(err)
 	return el
 }

query.go

@@ -110,7 +110,7 @@ func (p *Page) HasX(selectors ...string) (bool, *Element, error) {
 
 // HasMatches doc is similar to the method MustHasMatches
 func (p *Page) HasMatches(pairs ...string) (bool, *Element, error) {
-	el, err := p.Sleeper(nil).ElementMatches(pairs...)
+	el, err := p.Sleeper(nil).ElementR(pairs...)
 	if errors.Is(err, ErrElementNotFound) {
 		return false, nil, nil
 	}
@@ -122,9 +122,9 @@ func (p *Page) Element(selectors ...string) (*Element, error) {
 	return p.ElementByJS(jsHelper(js.Element, JSArgsFromString(selectors)))
 }
 
-// ElementMatches doc is similar to the method MustElementMatches
-func (p *Page) ElementMatches(pairs ...string) (*Element, error) {
-	return p.ElementByJS(jsHelper(js.ElementMatches, JSArgsFromString(pairs)))
+// ElementR doc is similar to the method MustElementR
+func (p *Page) ElementR(pairs ...string) (*Element, error) {
+	return p.ElementByJS(jsHelper(js.ElementR, JSArgsFromString(pairs)))
 }
 
 // ElementX finds elements by XPath
@@ -338,10 +338,10 @@ func (rc *RaceContext) ElementX(selector string, callback func(*Element) error)
 	return rc
 }
 
-// ElementMatches the doc is similar with ElementMatches but has a callback when a match is found
-func (rc *RaceContext) ElementMatches(selector, regex string, callback func(*Element) error) *RaceContext {
+// ElementR the doc is similar with ElementR but has a callback when a match is found
+func (rc *RaceContext) ElementR(selector, regex string, callback func(*Element) error) *RaceContext {
 	rc.branches = append(rc.branches, &raceBranch{
-		func() (*Element, error) { return rc.noSleepPage.ElementMatches(selector, regex) },
+		func() (*Element, error) { return rc.noSleepPage.ElementR(selector, regex) },
 		callback,
 	})
 	return rc
@@ -391,7 +391,7 @@ func (el *Element) HasX(selector string) (bool, *Element, error) {
 
 // HasMatches doc is similar to the method MustHasMatches
 func (el *Element) HasMatches(selector, regex string) (bool, *Element, error) {
-	el, err := el.ElementMatches(selector, regex)
+	el, err := el.ElementR(selector, regex)
 	if errors.Is(err, ErrElementNotFound) {
 		return false, nil, nil
 	}
@@ -433,9 +433,9 @@ func (el *Element) Previous() (*Element, error) {
 	return el.ElementByJS(NewEvalOptions(`this.previousElementSibling`, nil))
 }
 
-// ElementMatches doc is similar to the method MustElementMatches
-func (el *Element) ElementMatches(pairs ...string) (*Element, error) {
-	return el.ElementByJS(jsHelper(js.ElementMatches, JSArgsFromString(pairs)))
+// ElementR doc is similar to the method MustElementR
+func (el *Element) ElementR(pairs ...string) (*Element, error) {
+	return el.ElementByJS(jsHelper(js.ElementR, JSArgsFromString(pairs)))
 }
 
 // Elements doc is similar to the method MustElements

query_test.go

@@ -141,7 +141,7 @@ func (s *S) TestPageRace() {
 	err := p.Sleeper(func() utils.Sleeper { return utils.CountSleeper(2) }).Race().
 		MustElement("not-exists", func(el *rod.Element) {}).
 		MustElementX("//not-exists", func(el *rod.Element) {}).
-		MustElementMatches("not-exists", "test", func(el *rod.Element) {}).
+		MustElementR("not-exists", "test", func(el *rod.Element) {}).
 		Do()
 	s.Error(err)
 
@@ -163,16 +163,16 @@ func (s *S) TestPageElementsX() {
 	s.Len(list, 5)
 }
 
-func (s *S) TestElementMatches() {
+func (s *S) TestElementR() {
 	p := s.page.MustNavigate(srcFile("fixtures/selector.html"))
-	el := p.MustElementMatches("button", `\d1`)
+	el := p.MustElementR("button", `\d1`)
 	s.Equal("01", el.MustText())
 
-	el = p.MustElement("div").MustElementMatches("button", `03`)
+	el = p.MustElement("div").MustElementR("button", `03`)
 	s.Equal("03", el.MustText())
 
 	p = s.page.MustNavigate(srcFile("fixtures/input.html"))
-	el = p.MustElementMatches("input", `submit`)
+	el = p.MustElementR("input", `submit`)
 	s.Equal("submit", el.MustText())
 }