Merge branch 'master' into refactor/component-perf-tuning

.github/workflows/crowdin-uploads.yml

@@ -29,7 +29,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Upload
-      uses: crowdin/github-action@1.1.2
+      uses: crowdin/github-action@v1.7.0
       with:
         config: crowdin.yml
         crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}

lerna.json

@@ -13,6 +13,6 @@
     }
   },
   "npmClient": "yarn",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "useWorkspaces": true
 }

packages/api-generator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuetify/api-generator",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "private": true,
   "description": "",
   "scripts": {
@@ -18,7 +18,7 @@
     "rimraf": "^3.0.2",
     "ts-morph": "^16.0.0",
     "vue": "^3.2.47",
-    "vuetify": "^3.1.7"
+    "vuetify": "^3.1.8"
   },
   "devDependencies": {
     "@babel/node": "^7.20.7"

packages/api-generator/src/locale/en/ClickOutside.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/Intersect.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/Mutate.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/Resize.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/Ripple.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/Scroll.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/Touch.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/data-table-group.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/icon.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/touch.json

@@ -1,5 +1 @@
-{
-  "argument": {
-    "value": "The value is always an object. The `start`, `end`, `move`, `left`, `right`, `up` and `down` functions can be used to invoke a function when the corresponding touch action occurs. If the `parent` option attaches the touch listeners to the parent element instead of the element the directive is used on. The `options` object is described [here](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener)."
-  }
-}
+{}

packages/api-generator/src/locale/en/useDisplay.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/useLayout.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/useLocale.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/useRtl.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/useTheme.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-alert-title.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-app-bar-title.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-card-actions.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-class-icon.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-component-icon.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-expand.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-footer.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-group.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-paginate.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-row.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-rows.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-select.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-server.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-sort.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-data-table-virtual.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-dialog-bottom-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-dialog-top-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-expand-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-expand-x-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-expansion-panel-text.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-fab-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-fade-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-ligature-icon.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-no-ssr.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-scale-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-scroll-x-reverse-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-scroll-x-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-scroll-y-reverse-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-scroll-y-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-slide-x-reverse-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-slide-x-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-slide-y-reverse-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-slide-y-transition.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-svg-icon.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/v-toolbar-items.json

@@ -0,0 +1 @@
+{}

packages/api-generator/src/locale/en/virtual.json

@@ -0,0 +1 @@
+{}

packages/docs/package.json

@@ -3,7 +3,7 @@
   "description": "A Vue.js project",
   "private": true,
   "author": "John Leider <john@vuetifyjs.com>",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuetifyjs/vuetify.git",
@@ -38,7 +38,7 @@
     "vue-i18n": "^9.3.0-beta.16",
     "vue-instantsearch": "^4.8.3",
     "vue-prism-component": "^2.0.0",
-    "vuetify": "^3.1.7"
+    "vuetify": "^3.1.8"
   },
   "devDependencies": {
     "@emailjs/browser": "^3.10.0",
@@ -50,7 +50,7 @@
     "@vitejs/plugin-basic-ssl": "^0.1.2",
     "@vitejs/plugin-vue": "^3.0.3",
     "@vue/compiler-sfc": "^3.2.47",
-    "@vuetify/api-generator": "^3.1.7",
+    "@vuetify/api-generator": "^3.1.8",
     "@vuetify/vite-ssg": "^0.20.2",
     "ajv": "^8.12.0",
     "date-fns": "^2.29.3",

packages/docs/src/components/app/BackToTop.vue

@@ -1,7 +1,7 @@
 <template>
   <v-layout-item
     v-scroll="onScroll"
-    class="text-end"
+    class="text-end pointer-events-none"
     model-value
     position="bottom"
     size="88"
@@ -10,7 +10,7 @@
       <v-fab-transition>
         <v-btn
           v-show="model"
-          class="mt-auto"
+          class="mt-auto pointer-events-initial"
           color="primary"
           elevation="8"
           icon="mdi-chevron-up"
@@ -38,3 +38,13 @@
     })
   }
 </script>
+
+<style scoped>
+  .pointer-events-none {
+    pointer-events: none;
+  }
+
+  .pointer-events-initial {
+    pointer-events: initial;
+  }
+</style>

packages/docs/src/components/app/Toc.vue

@@ -83,10 +83,6 @@
               <small class="text-disabled">Your logo here</small>
             </v-card>
           </v-col>
-
-          <v-col cols="12">
-            <carbon />
-          </v-col>
         </v-row>
       </v-container>
     </template>

packages/docs/src/components/promoted/Carbon.vue

@@ -1,7 +1,12 @@
 <template>
   <promoted-base
+    ref="script"
+    :class="[
+      'mb-4',
+      isDark ? 'theme--dark' : 'theme--light',
+    ]"
     border
-    min-height="230"
+    min-height="118"
     max-width="360"
   >
     <promoted-script
@@ -19,68 +24,64 @@
   import PromotedScript from './Script.vue'
 
   // Composables
-  import { useRoute } from 'vue-router'
+  import { useTheme } from 'vuetify'
 
   // Utilities
-  import { ref, watch } from 'vue'
+  import { computed, onBeforeUnmount, ref } from 'vue'
 
-  // Globals
-  import { IN_BROWSER } from '@/util/globals'
-
-  const route = useRoute()
   const error = ref(false)
+  const script = ref(null)
+
+  onBeforeUnmount(() => {
+    const script = document.getElementById('carbonads-script')
 
-  function refresh () {
-    if (!IN_BROWSER || typeof (window as any)._carbonads === 'undefined') return
+    script?.remove()
+  })
 
-    (window as any)._carbonads.refresh()
-  }
+  const theme = useTheme()
 
-  watch(route, refresh)
+  const isDark = computed(() => theme.current.value.dark)
 </script>
 
 <style lang="sass">
-  #carbonads
+  #carbonads,
+  #carbonads_1,
+  #carbonads_2
     width: 100%
 
     > span
       display: flex
       position: relative
-      flex-wrap: wrap
 
     .carbon-wrap
       display: flex
-      flex-wrap: wrap
 
     .carbon-text,
     .carbon-poweredby
       max-width: 200px
+      padding: 0 0 0 16px
       text-decoration: none
 
     .carbon-img
       display: inline-flex
-      margin: 1rem auto
+      margin: 0.5rem
 
       img
         border-radius: 4px 0 0 4px
         max-height: 100px
 
     .carbon-text
       color: inherit
-      font-size: 0.70rem
-      padding: 0 0.475rem
-      margin: 0 auto
-      text-align: center
+      font-size: 0.75rem
+      padding: 0.475rem
 
     .carbon-poweredby
-      color: inherit
+      bottom: 0.5rem
       font-size: 0.625rem
       font-weight: 400
-      letter-spacing: 0.075rem
-      margin: 0 auto
-      opacity: .56
-      padding: 8px 0 16px 0
-      text-align: center
+      letter-spacing: 0.09375rem
+      position: absolute
+      right: 0.5rem
       text-transform: uppercase
 
   .v-app-ad.theme--light

packages/docs/src/components/promoted/Entry.vue

@@ -1,5 +1,5 @@
 <template>
-  <vuetify medium="entry" />
+  <carbon />
 </template>
 
 <script setup>

packages/docs/src/components/promoted/Inline.vue

@@ -1,13 +1,10 @@
 <template>
-  <div>
-    <!-- TODO: resolve style issues -->
-    <app-markdown
-      v-if="ad"
-      :content="description"
-      class="v-markdown--inline d-inline"
-      tag="span"
-    />
-  </div>
+  <app-markdown
+    v-if="ad"
+    :content="description"
+    class="v-markdown--inline d-inline"
+    tag="span"
+  />
 </template>
 
 <script setup>