waibu-bootstrap 1.1.2 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-bootstrap",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Bootstrap suport for Waibu Framework",
   "main": "index.js",
   "scripts": {

package/waibuMpa/theme/component/factory/app-launcher-trigger.js

@@ -23,7 +23,7 @@ async function appLauncherTrigger () {
       const { fastGlob } = this.plugin.lib
       const { omit } = this.plugin.lib._
       let logo = 'waibu'
-      const files = await fastGlob(`${this.plugin.app.main.dir.pkg}/bajo/logo.*`)
+      const files = await fastGlob(`${this.plugin.app.main.dir.pkg}/plugin/logo.*`)
       if (files.length > 0) logo = 'main'
       this.params.tag = 'a'
       const sentence = [

package/waibuMpa/theme/component/factory/breadcrumb.js

@@ -1,10 +1,9 @@
 const cls = 'breadcrumb'
 
 function bcHandler (href, source, opts = {}) {
-  const { last } = this.plugin.lib._
-  const { titleize } = this.plugin.app.bajo
+  const { last, camelCase } = this.plugin.lib._
   const parts = href.split('/')
-  const content = titleize(last(parts))
+  const content = this.component.req.t(camelCase(last(parts)))
   if (href === source) return { content }
   return { content, href, hrefRebuild: opts.hrefRebuild }
 }

package/waibuMpa/theme/component/factory/card-subtitle.js

@@ -5,7 +5,8 @@ async function cardSubtitle () {
     constructor (options) {
       super(options)
       this.selector = '.' + cls
-      this.component.normalizeAttr(this.params, { tag: 'h6', cls: [cls, 'mb-2', 'text-body-secondary'] })
+      this.component.normalizeAttr(this.params, { tag: 'h6', cls: [cls, 'mb-2'] })
+      if (!this.params.attr.text) this.params.attr.class.push('text-body-secondary')
     }
   }
 }

package/waibuMpa/theme/component/factory/nav-divider.js

@@ -12,7 +12,7 @@ async function navDivider () {
       this.params.attr.padding = 'y-2'
       const attr = {
         class: ['vr'],
-        display: 'type:none type:flex-lg',
+        display: 'type:flex-lg',
         dim: 'height:100',
         margin: this.params.attr.margin ?? 'x-2'
       }

package/waibuMpa/theme/component/factory/nav-dropdown-darkmode.js

@@ -1,9 +1,14 @@
 async function navDropdownDarkmode () {
   return class NavDropdownDarkmode extends this.baseFactory {
     build = async () => {
-      const { titleize } = this.plugin.app.bajo
+      const { titleize, isSet } = this.plugin.app.bajo
       const { set } = this.plugin.lib._
       const cfgWmpa = this.plugin.app.waibuMpa.config
+      this.params.noTag = true
+      if (isSet(this.plugin.app.waibuMpa.config.darkMode.set)) {
+        this.params.html = ''
+        return
+      }
       const name = this.component.req.darkMode ? 'dark' : 'bright'
       const content = this.component.req.iconset ? await this.component.buildTag({ tag: 'icon', attr: { name } }) : this.component.req.t(titleize(name))
       const attr = {
@@ -12,11 +17,11 @@ async function navDropdownDarkmode () {
         dropdownMenudir: this.params.attr.dropdownMenudir,
         content
       }
+      if (this.params.attr.text) attr.text = this.params.attr.text
       const html = [
         await this.component.buildTag({ tag: 'dropdownItem', attr: { href: this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'false') }), active: !this.component.req.darkMode }, html: this.component.req.t('brightMode') }),
         await this.component.buildTag({ tag: 'dropdownItem', attr: { href: this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'true') }), active: this.component.req.darkMode }, html: this.component.req.t('darkMode') })
       ].join('\n')
-      this.params.noTag = true
       this.params.html = await this.component.buildTag({ tag: 'navItem', attr, html })
     }
   }

package/waibuMpa/theme/component/factory/nav-dropdown-language.js

@@ -10,6 +10,7 @@ async function navDropdownLanguage () {
         dropdownMenudir: this.params.attr.dropdownMenudir,
         content: lang.toUpperCase()
       }
+      if (this.params.attr.text) attr.text = this.params.attr.text
       const html = []
       for (const s of supported) {
         html.push(await this.component.buildTag({

package/waibuMpa/theme/component/factory/nav-dropdown-setting.js

@@ -6,6 +6,7 @@ async function navDropdownSetting () {
       const { groupAttrs } = this.plugin.app.waibuMpa
       const { generateId } = this.plugin.app.bajo
       const { routePath } = this.plugin.app.waibu
+      const { isSet } = this.plugin.app.bajo
       const { req } = this.component
       const cfgWmpa = this.plugin.app.waibuMpa.config
 
@@ -28,11 +29,17 @@ async function navDropdownSetting () {
           </div>
         `)
       }
+      let darkMode = ''
+      if (!isSet(cfgWmpa.darkMode.set)) {
+        darkMode = `
+          <c:dropdown-item divider />
+          <c:dropdown-item href="${this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'false') })}" ${this.component.req.darkMode ? '' : 'active'} t:content="bright" />
+          <c:dropdown-item href="${this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'true') })}" ${!this.component.req.darkMode ? '' : 'active'} t:content="dark" />
+        `
+      }
       let html = `
         ${profile}
-        <c:dropdown-item divider />
-        <c:dropdown-item href="${this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'false') })}" ${this.component.req.darkMode ? '' : 'active'} t:content="bright" />
-        <c:dropdown-item href="${this.component.buildUrl({ params: set({}, cfgWmpa.darkMode.qsKey, 'true') })}" ${!this.component.req.darkMode ? '' : 'active'} t:content="dark" />
+        ${darkMode}
       `
       if (supported.length > 0) {
         html += `

package/waibuMpa/theme/component/factory/nav-dropdown-user.js

@@ -25,6 +25,7 @@ async function navDropdownUser () {
         dropdownMenudir: this.params.attr.dropdownMenudir,
         content: `${icon} ${text}`
       }
+      if (this.params.attr.text) attr.text = this.params.attr.text
       if (this.params.attr.noMenu) {
         delete attr.dropdown
         delete attr.dropdownMenu

package/waibuMpa/theme/component/factory/nav-toggle-fullscreen.js

@@ -11,6 +11,7 @@ async function navToggleFullscreen () {
         '@click': 'toggle()',
         content
       }
+      if (this.params.attr.text) attr.text = this.params.attr.text
       attr['@fullscreenchange.document'] = `
         const el = $refs.fullscreen.querySelector('i')
         if (document.fullscreenElement) {

package/waibuMpa/theme/component/factory/sidebar.js

@@ -7,6 +7,7 @@ function formatSentence (item, params) {
   if (this.params.attr.divider) attr.border = `side:${item.bottom ? 'top' : 'bottom'}`
   if (this.params.attr.expanded) attr.rounded = 'width:0'
   merge(attr, omit(item, ['component', 'icon', 'ohref', 'html']))
+  if (this.params.attr.text && !attr.active) attr.text = this.params.attr.text
   const result = [`<c:${cmp}`]
   for (const k in attr) {
     result.push(attr[k] === true ? k : `${k}="${attr[k]}"`)

package/waibuMpa/theme/component/method/after-build-tag/_lib.js

@@ -4,7 +4,7 @@ export const weights = ['bold', 'bolder', 'semibold', 'medium', 'normal', 'light
 export const fstyles = ['italic', 'normal']
 export const heights = ['1', 'sm', 'base', 'lg']
 export const cvariants = ['emphasis', 'secondary', 'tertiary']
-export const cbgvariants = ['subtle', 'secondary', 'tertiary']
+export const cbgvariants = ['subtle']
 export const opacities = ['25', '50', '75', '100']
 export const aligns = ['top', 'bottom', 'start', 'end', 'middle']
 export const dirs = ['up', 'down', 'start', 'end']

package/waibuMpa/theme/component/method/after-build-tag/margin-padding.js

@@ -1,13 +1,14 @@
-import { aligns, widths } from './_lib.js'
+import { aligns, widths, breakpoints } from './_lib.js'
 
 const sides = ['x', 'y', 'all', ...aligns]
 const sizes = ['0', 'auto', ...widths]
 
 function marginPadding ({ key, params }) {
   for (const item of this.plugin.app.waibuMpa.attrToArray(params.attr[key])) {
-    const [side, size] = item.split('-')
+    let [side, size, bp] = item.split('-')
+    if (bp && !breakpoints.includes(bp)) bp = undefined
     if (sides.includes(side) && (!size || sizes.includes(size))) {
-      params.attr.class.push(`${key[0]}${side === 'all' ? '' : side[0]}${size ? ('-' + size) : ''}`)
+      params.attr.class.push(`${key[0]}${side === 'all' ? '' : side[0]}${bp ? ('-' + bp) : ''}${size ? ('-' + size) : ''}`)
     }
   }
 }