Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix docs hydration errors and overall perfomance #4455

Merged
merged 2 commits into from
Jan 21, 2025
Merged

chore: fix docs hydration errors and overall perfomance #4455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
162c9a9
chore: fix docs hydration errors
m0ksem Jan 20, 2025
3746888
chore: update min vue version to 3.5
m0ksem Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/docs/assets/icon-fonts/icon-fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// These fonts were originally provided by http://weloveiconfonts.com.
// We decided to add these into package after https ceased to work due to lack of support on their side.
@import "entypo/entypo";
@import "ionicons/dist/scss/ionicons.scss";

// Material Icons
@import url(https://fonts.googleapis.com/icon?family=Material+Icons);
Expand Down
10 changes: 4 additions & 6 deletions packages/docs/layouts/default.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const breakpoints = useBreakpoint()

const { currentPresetName } = useColors()

const isSidebarVisible = ref(!breakpoints.smDown)
const isSidebarVisible = ref(false)
const isOptionsVisible = ref(false)
const doShowLoader = ref(true)

Expand Down Expand Up @@ -74,11 +74,10 @@ const onMouseMove = (e: MouseEvent) => {
}

onMounted(() => {

isSidebarVisible.value = !breakpoints.smDown
setTimeout(() => {
doShowLoader.value = false
}, 300);
// setTimeout(() => {
doShowLoader.value = false
// }, 300);

if (window.localStorage.getItem('eventConfig')) {
window.localStorage.setItem('eventConfig', 'none')
Expand Down Expand Up @@ -112,7 +111,6 @@ useHead({
{ href: "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css", rel: "stylesheet" },
],
script: [
{ src: 'https://kit.fontawesome.com/5460c87b2a.js', crossorigin: 'anonymous' },
{ src: 'https://unpkg.com/[email protected]/dist/ionicons/ionicons.esm.js', type: 'module' },
],
})
Expand Down
1 change: 0 additions & 1 deletion packages/docs/layouts/play.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ useHead({
{ href: "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css", rel: "stylesheet" },
],
script: [
{ src: 'https://kit.fontawesome.com/5460c87b2a.js', crossorigin: 'anonymous' },
{ src: 'https://unpkg.com/[email protected]/dist/ionicons/ionicons.esm.js', type: 'module' },
],
})
Expand Down
2 changes: 0 additions & 2 deletions packages/docs/page-config/services/icons-config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@ export default definePageConfig({
head: {
link: [
{ rel: 'dns-prefetch', as: 'script', href: 'https://unpkg.com/[email protected]/dist/ionicons/ionicons.esm.js' },
{ rel: 'dns-prefetch', as: 'script', href: 'https://kit.fontawesome.com/5460c87b2a.js' },
],

script: [
{ crossorigin: 'anonymous', src: 'https://kit.fontawesome.com/5460c87b2a.js' },
{ type: 'module', src: 'https://unpkg.com/[email protected]/dist/ionicons/ionicons.esm.js' },
],
},
Expand Down
112 changes: 48 additions & 64 deletions packages/docs/page-config/ui-elements/dropdown/examples/PlacementAndOffset.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,54 @@
<template>
<table>
<tr>
<td colspan="2">
<div class="title va-text-center mb-2">
Offset direction
</div>
</td>
</tr>
<tr>
<td
colspan="2"
class="p-[4rem]"
>
<div class="flex flex-col items-center">
<VaDropdown
:model-value="true"
:placement="placementWIthAlias"
:close-on-click-outside="false"
:close-on-anchor-click="false"
:close-on-content-click="false"
:offset="offset"
:stateful="false"
>
<template #anchor>
<div><Coordinates :placement="placement" /></div>
</template>
<tbody>
<tr>
<td colspan="2">
<div class="title va-text-center mb-2">
Offset direction
</div>
</td>
</tr>
<tr>
<td colspan="2" class="p-[4rem]">
<div class="flex flex-col items-center">
<VaDropdown :model-value="true" :placement="placementWIthAlias" :close-on-click-outside="false"
:close-on-anchor-click="false" :close-on-content-click="false" :offset="offset" :stateful="false">
<template #anchor>
<div>
<Coordinates :placement="placement" />
</div>
</template>

<VaDropdownContent> Dropdown </VaDropdownContent>
</VaDropdown>
</div>
</td>
</tr>
<tr>
<td class="pr-4">
Placement:
</td>
<td>
<VaSelect
v-model="placementWIthAlias"
class="w-[10rem] sm:w-[unset]"
:options="placements"
/>
</td>
</tr>
<tr>
<td class="text-[var(--va-primary)]">
Main:
</td>
<td>
<VaCounter
v-model="offset[0]"
manual-input
/>
</td>
</tr>
<tr>
<td class="text-[var(--va-secondary)]">
Cross:
</td>
<td>
<VaCounter
v-model="offset[1]"
manual-input
/>
</td>
</tr>
<VaDropdownContent> Dropdown </VaDropdownContent>
</VaDropdown>
</div>
</td>
</tr>
<tr>
<td class="pr-4">
Placement:
</td>
<td>
<VaSelect v-model="placementWIthAlias" class="w-[10rem] sm:w-[unset]" :options="placements" />
</td>
</tr>
<tr>
<td class="text-[var(--va-primary)]">
Main:
</td>
<td>
<VaCounter v-model="offset[0]" manual-input />
</td>
</tr>
<tr>
<td class="text-[var(--va-secondary)]">
Cross:
</td>
<td>
<VaCounter v-model="offset[1]" manual-input />
</td>
</tr>
</tbody>
</table>
</template>

Expand Down
2 changes: 0 additions & 2 deletions packages/docs/page-config/ui-elements/icon/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ export default definePageConfig({
head: {
link: [
{ rel: 'dns-prefetch', as: 'script', href: 'https://unpkg.com/[email protected]/dist/ionicons/ionicons.esm.js' },
{ rel: 'dns-prefetch', as: 'script', href: 'https://kit.fontawesome.com/5460c87b2a.js' },
],

script: [
{ crossorigin: 'anonymous', src: 'https://kit.fontawesome.com/5460c87b2a.js' },
{ type: 'module', src: 'https://unpkg.com/[email protected]/dist/ionicons/ionicons.esm.js' },
],
},
Expand Down
52 changes: 27 additions & 25 deletions packages/docs/page-config/ui-elements/time-picker/examples/view.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,33 @@
</h6>

<table>
<tr>
<td>Hours</td>
<td>Minutes</td>
<td>Seconds</td>
</tr>
<tr>
<td>
<VaTimePicker
v-model="value"
view="hours"
/>
</td>
<td>
<VaTimePicker
v-model="value"
view="minutes"
/>
</td>
<td>
<VaTimePicker
v-model="value"
view="seconds"
/>
</td>
</tr>
<tbody>
<tr>
<td>Hours</td>
<td>Minutes</td>
<td>Seconds</td>
</tr>
<tr>
<td>
<VaTimePicker
v-model="value"
view="hours"
/>
</td>
<td>
<VaTimePicker
v-model="value"
view="minutes"
/>
</td>
<td>
<VaTimePicker
v-model="value"
view="seconds"
/>
</td>
</tr>
</tbody>
</table>
</template>

Expand Down
6 changes: 3 additions & 3 deletions packages/docs/page-config/ui-elements/value/examples/String.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<VaValue v-slot="inputText" default-value="Vuestic">
<div class="preview">
<div class="demo-preview">
<VaValue
v-for="i in 20"
v-slot="textPosition"
Expand Down Expand Up @@ -29,13 +29,13 @@
</template>

<style>
.preview {
.demo-preview {
position: relative;
height: 200px;
background: var(--va-primary);
}

.preview span {
.demo-preview span {
position: absolute;
color: var(--va-on-primary);
font-weight: 800;
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/page-config/ui-elements/value/examples/WithInputs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</span>

<VaValue v-slot="v">
<input v-if="v.value" v-model="form[key]">
<input class="item__input" v-if="v.value" v-model="form[key]">
<span v-else>
{{ form[key] }}
</span>
Expand All @@ -29,7 +29,7 @@
height: 2rem;
}

input {
.item__input {
outline: 1px solid var(--va-background-border);
box-sizing: border-box;
padding: 0 4px;
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"yargs": "^17.5.1"
},
"peerDependencies": {
"vue": "^3.0.4"
"vue": "^3.5.0"
},
"lint-staged": {
"*.{js,ts}": [
Expand Down
19 changes: 7 additions & 12 deletions packages/ui/src/components/va-backtop/VaBacktop.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import { PropType, ref, computed, onMounted, onBeforeUnmount } from 'vue'
import { useComponentPresetProp, useTranslation, useTranslationProp, useNumericProp, makeNumericProp } from '../../composables'
import { VaButton } from '../va-button'
import { isServer } from '../../utils/ssr'
import { warn } from '../../utils/console'

defineOptions({
Expand Down Expand Up @@ -116,22 +115,18 @@ const handleScroll = () => {
: targetElement.scrollTop
}

const server = isServer()

const visible = computed(() => {
if (server) {
if (!visibilityHeightComputed.value) {
return false
}
return targetScrollValue.value > visibilityHeightComputed.value!
return targetScrollValue.value > visibilityHeightComputed.value
})

if (!server) {
onMounted(() => {
targetElement = getTargetElement()
targetElement.addEventListener('scroll', handleScroll, true)
})
onBeforeUnmount(() => targetElement?.removeEventListener('scroll', handleScroll))
}
onMounted(() => {
targetElement = getTargetElement()
targetElement.addEventListener('scroll', handleScroll, true)
})
onBeforeUnmount(() => targetElement?.removeEventListener('scroll', handleScroll))

const { tp } = useTranslation()
</script>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/components/va-layout/VaLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="va-layout">
<template v-for="area in areaNames" :key="area">
<template v-for="area in areaNames" :key="area">
<VaLayoutArea
v-if="$slots[area]"
:area="area"
Expand Down
3 changes: 1 addition & 2 deletions packages/ui/src/components/va-layout/components/VaLayoutArea.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import VaLayoutFixedWrapper from './VaLayoutFixedWrapper.vue'
import { PropType, computed } from 'vue'
import { AreaName } from '../hooks/useGridTemplateArea'
import { AreaConfig } from '../hooks/useLayout'
import { isServer } from '../../../utils/ssr'

defineOptions({
name: 'VaLayoutArea',
Expand All @@ -45,7 +44,7 @@ const props = defineProps({
const emit = defineEmits(['overlay-click'])

const absolute = computed(() => props.config.absolute || false)
const fixed = computed(() => isServer() ? false : props.config.fixed || false)
const fixed = computed(() => props.config.fixed || false)
const overlay = computed(() => props.config.overlay || false)
const zIndex = computed(() => (props.config.order || 0) + 1)
</script>
Expand Down
Loading
Loading