From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Tue, 26 May 2020 14:58:07 +0000 (+0200)
Subject: fix: allow arbitrary selectors starting with #
X-Git-Tag: v4.0.0-alpha.13~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14b859dfa6fa5ccefe42c6f834ddd24dd9921a1b;p=thirdparty%2Fvuejs%2Frouter.git

fix: allow arbitrary selectors starting with #

BREAKING CHANGE: It is now necessary to escape id selectors like
explained at https://mathiasbynens.be/notes/css-escapes. This was
necessary to allow selectors like `#container > child`.
---

diff --git a/e2e/scroll-behavior/index.ts b/e2e/scroll-behavior/index.ts
index 5ba37ef5..f98dbea8 100644
--- a/e2e/scroll-behavior/index.ts
+++ b/e2e/scroll-behavior/index.ts
@@ -36,15 +36,14 @@ const scrollBehavior: ScrollBehavior = async function (
 
     // scroll to anchor by returning the selector
     if (to.hash) {
-      position = { selector: to.hash }
+      position = { selector: decodeURI(to.hash) }
 
       // specify offset of the element
       if (to.hash === '#anchor2') {
         position.offset = { y: 100 }
       }
 
-      // bypass #1number check
-      if (/^#\d/.test(to.hash) || document.querySelector(to.hash)) {
+      if (document.querySelector(position.selector)) {
         return position
       }
 
@@ -80,6 +79,7 @@ scrollWaiter.add()
 const app = createApp({
   setup() {
     return {
+      hashWithNumber: { path: '/bar', hash: '#\\31 number' },
       flushWaiter: scrollWaiter.flush,
       setupWaiter: scrollWaiter.add,
     }
@@ -99,7 +99,7 @@ const app = createApp({
         <li><router-link to="/bar">/bar</router-link></li>
         <li><router-link to="/bar#anchor">/bar#anchor</router-link></li>
         <li><router-link to="/bar#anchor2">/bar#anchor2</router-link></li>
-        <li><router-link to="/bar#1number">/bar#1number</router-link></li>
+        <li><router-link :to="hashWithNumber">/bar#1number</router-link></li>
       </ul>
       <router-view class="view" v-slot="{ Component, props }">
         <transition
diff --git a/src/scrollBehavior.ts b/src/scrollBehavior.ts
index 8af9d6af..322543a6 100644
--- a/src/scrollBehavior.ts
+++ b/src/scrollBehavior.ts
@@ -68,26 +68,37 @@ export function scrollToPosition(position: ScrollPosition): void {
 
   if ('selector' in position) {
     /**
-     * `id`s can accept pretty much any characters, including CSS combinators like >
-     * or ~. It's still possible to retrieve elements using
+     * `id`s can accept pretty much any characters, including CSS combinators
+     * like `>` or `~`. It's still possible to retrieve elements using
      * `document.getElementById('~')` but it needs to be escaped when using
-     * `document.querySelector('#\\~')` for it to be valid. The only requirements
-     * for `id`s are them to be unique on the page and to not be empty (`id=""`).
-     * Because of that, when passing an `id` selector, it shouldn't have any other
-     * selector attached to it (like a class or an attribute) because it wouldn't
-     * have any effect anyway. We are therefore considering any selector starting
-     * with a `#` to be an `id` selector so we can directly use `getElementById`
-     * instead of `querySelector`, allowing users to write simpler selectors like:
-     * `#1-thing` or `#with~symbols` without having to manually escape them to valid
-     * CSS selectors: `#\31 -thing` and `#with\\~symbols`.
+     * `document.querySelector('#\\~')` for it to be valid. The only
+     * requirements for `id`s are them to be unique on the page and to not be
+     * empty (`id=""`). Because of that, when passing an id selector, it should
+     * be properly escaped for it to work with `querySelector`. We could check
+     * for the id selector to be simple (no CSS combinators `+ >~`) but that
+     * would make things inconsistent since they are valid characters for an
+     * `id` but would need to be escaped when using `querySelector`, breaking
+     * their usage and ending up in no selector returned. Selectors need to be
+     * escaped:
+     *
+     * - `#1-thing` becomes `#\31 -thing`
+     * - `#with~symbols` becomes `#with\\~symbols`
      *
      * - More information about  the topic can be found at
      *   https://mathiasbynens.be/notes/html5-id-class.
      * - Practical example: https://mathiasbynens.be/demo/html5-id
      */
-    const el = position.selector.startsWith('#')
-      ? document.getElementById(position.selector.slice(1))
-      : document.querySelector(position.selector)
+    if (__DEV__) {
+      try {
+        document.querySelector(position.selector)
+      } catch {
+        warn(
+          `The selector "${position.selector}" is invalid. If you are using an id selector, make sure to escape it. You can find more information about escaping characters in selectors at https://mathiasbynens.be/notes/css-escapes.`
+        )
+      }
+    }
+
+    const el = document.querySelector(position.selector)
 
     if (!el) {
       __DEV__ &&