closes #172

riot · Oct 20, 2023 · a1fab0a · a1fab0a
1 parent 91fbc53
commit a1fab0a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/src/components/router-hoc.riot b/src/components/router-hoc.riot
@@ -90,7 +90,7 @@
           getBase(context) {
             const baseAttr = getAttribute(BASE_ATTRIBUTE_NAME)
 
-            return baseAttr ? this.el.getAttribute(BASE_ATTRIBUTE_NAME) || baseAttr.evaluate(context) : '/'
+            return baseAttr ? baseAttr.evaluate(context) : this.el.getAttribute(BASE_ATTRIBUTE_NAME) || '/'
           },
           setBase(context) {
             setBase(props ? props.base : this.getBase(context))

diff --git a/src/index.js b/src/index.js
@@ -5,6 +5,8 @@ import route, {
   toPath,
   toRegexp,
   toURL,
+  configure,
+  defaults,
 } from 'rawth'
 import Route from './components/route-hoc.riot'
 import Router from './components/router-hoc.riot'
@@ -13,6 +15,8 @@ import initDomListeners from './dom.js'
 import setBase from './set-base.js'
 
 export {
+  defaults,
+  configure,
   route,
   createURLStreamPipe,
   match,

diff --git a/test/components.spec.js b/test/components.spec.js
@@ -2,9 +2,10 @@ import { base, sleep } from './util.js'
 import HistoryRouterApp from './components/history-router-app.riot'
 import NestedUpdates from './components/nested-updates.riot'
 import RecursiveUpdatesBugRouter from './components/recursive-updates-bug-router.riot'
+import StaticBasePath from './components/static-base-path.riot'
 import { component } from 'riot'
 import { expect } from 'chai'
-import { router } from '../src/index.js'
+import { router, defaults } from '../src/index.js'
 
 describe('components', function () {
   beforeEach(async function () {
@@ -73,4 +74,13 @@ describe('components', function () {
 
     comp.unmount()
   })
+
+  it('Static base path attributes are supported (bug 172) ', async function () {
+    const el = document.createElement('div')
+    const comp = component(StaticBasePath)(el)
+
+    expect(defaults.base).to.be.equal('https://riot.rocks/app')
+
+    comp.unmount()
+  })
 })
diff --git a/test/components/static-base-path.riot b/test/components/static-base-path.riot
@@ -0,0 +1,24 @@
+<static-base-path>
+  <router base="/app">
+    <a href="/home">
+      Home
+    </a>
+    <route path="(.*)">
+        <p>{state.message}</p>
+    </route>
+  </router>
+
+  <script>
+    import { Router, Route } from '../../src/index.js'
+
+    export default {
+      components: {
+        Router,
+        Route,
+      },
+      state: {
+        message: 'hello',
+      }
+    }
+  </script>
+</static-base-path>