@varlet/cli 1.25.0-alpha.1642582155449 → 1.25.1-alpha.1643124613252

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "1.25.0-alpha.1642582155449",
+  "version": "1.25.1-alpha.1643124613252",
   "description": "cli of varlet",
   "bin": {
     "varlet-cli": "./lib/index.js"
@@ -33,9 +33,9 @@
     "@babel/helper-plugin-utils": "^7.14.5",
     "@babel/preset-env": "^7.14.8",
     "@babel/preset-typescript": "^7.14.5",
-    "@varlet/icons": "1.25.0-alpha.1642582155449",
-    "@varlet/markdown-vite-plugin": "1.25.0-alpha.1642582155449",
-    "@varlet/touch-emulator": "1.25.0-alpha.1642582155449",
+    "@varlet/icons": "1.25.1-alpha.1643124613252",
+    "@varlet/markdown-vite-plugin": "1.25.1-alpha.1643124613252",
+    "@varlet/touch-emulator": "1.25.1-alpha.1643124613252",
     "@vitejs/plugin-vue": "1.9.2",
     "@vitejs/plugin-vue-jsx": "1.1.8",
     "@vue/babel-plugin-jsx": "1.0.7",
@@ -74,7 +74,7 @@
     "@types/semver": "^7.3.9"
   },
   "peerDependencies": {
-    "@varlet/touch-emulator": "1.25.0-alpha.1642582155449",
+    "@varlet/touch-emulator": "1.25.1-alpha.1643124613252",
     "@vue/test-utils": "^2.0.0-rc.6",
     "clipboard": "^2.0.6",
     "live-server": "^1.2.1",

package/site/components/code-example/CodeExample.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="var-site-code-example">
     <div class="var-site-code-example__toolbar">
-      <var-site-button text round @click="toggle" v-if="fold">
+      <var-site-button text round @click="toggle" v-if="fold && !disabledFold">
         <var-site-icon name="xml" size="18" />
       </var-site-button>
 
@@ -53,30 +53,21 @@ export default defineComponent({
     const code: Ref<HTMLElement | null> = ref(null)
     const cid: Ref<number> = ref(clipId++)
     const fold: Ref = ref(get(config, 'pc.fold'))
+    const disabledFold: Ref<boolean> = ref(false)
     const clipboard: Ref = ref(get(config, 'pc.clipboard', {}))
-    const height: Ref<number> = ref(fold.value?.defaultFold ? fold.value?.foldHeight : -1)
+    const height: Ref<number> = ref(-1)
+
+    let fullHeight = 0
 
     const toggle = async () => {
       const foldHeight = fold.value.foldHeight
 
       if (height.value === foldHeight) {
-        height.value = -1
-        await nextTick()
-        const { offsetHeight } = code.value as HTMLElement
-
         height.value = foldHeight
         await doubleRaf()
-
-        if (offsetHeight - foldHeight < offset) {
-          Snackbar(get(config, `pc.fold.message.${getPCLocationInfo().language}`))
-          height.value = foldHeight
-        } else {
-          height.value = offsetHeight
-        }
+        height.value = fullHeight
       } else {
-        const { offsetHeight } = code.value as HTMLElement
-
-        height.value = offsetHeight
+        height.value = fullHeight
         await doubleRaf()
         height.value = foldHeight
       }
@@ -88,6 +79,11 @@ export default defineComponent({
       trigger.on('success', () => {
         Snackbar.success(clipboard.value[getPCLocationInfo().language])
       })
+
+      const { offsetHeight } = code.value as HTMLElement
+      fullHeight = offsetHeight
+      disabledFold.value = fullHeight - fold.value.foldHeight < offset
+      height.value = fold.value?.defaultFold ? fold.value?.foldHeight : -1
     })
 
     return {
@@ -95,6 +91,7 @@ export default defineComponent({
       height,
       cid,
       fold,
+      disabledFold,
       clipboard,
       toggle
     }

package/site/components/utils/shared.ts

@@ -16,9 +16,8 @@ export const isPlainObject = (val: unknown): val is Record<string, any> =>
   Object.prototype.toString.call(val) === '[object Object]'
 
 export function kebabCase(str: string): string {
-  const reg = /([^-])([A-Z])/g
-
-  return str.replace(reg, '$1-$2').replace(reg, '$1-$2').toLowerCase()
+  const ret = str.replace(/([A-Z])/g, ' $1').trim()
+  return ret.split(' ').join('-').toLowerCase()
 }
 
 export const isString = (val: unknown): val is string => typeof val === 'string'

package/varlet.default.config.js

@@ -37,10 +37,6 @@ module.exports = {
       'en-US': 'The code has been copied to the clipboard',
     },
     fold: {
-      message: {
-        'zh-CN': '已显示完整代码',
-        'en-US': 'Complete code displayed',
-      },
       defaultFold: true,
       foldHeight: 60,
     },
@@ -100,7 +96,7 @@ module.exports = {
     'color-progress-track': '#202020',
     'color-side-bar': '#4a7afe',
     'color-side-bar-active-background': '#4a7afe1a',
-    'color-app-bar': '#4a7afe',
+    'color-app-bar': '#272727',
     'color-nav-button-hover-background': 'rgba(255, 255, 255, 0.08)',
     'color-mobile-cell-hover': '#4a7afe',
     'color-pc-language-active': '#4a7afe',