sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "refactor: 画面サイズのしきい値をconstにまとめる"

Browse Source 
This reverts commit 05ca36f400.
This commit is contained in:
kakkokari-gtyih
2024-08-20 15:56:54 +09:00
parent 22f0e1f30e
commit 3971e214f9
9 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/frontend/src/ui/classic.vue
View File

@@ -50,7 +50,6 @@ import { defineAsyncComponent, onMounted, provide, ref, computed, shallowRef } f
import XSidebar from './classic.sidebar.vue';
import XCommon from './_common_/common.vue';
import { instanceName } from '@/config.js';
import { DESKTOP_THRESHOLD } from '@/const.js';
import { StickySidebar } from '@/scripts/sticky-sidebar.js';
import * as os from '@/os.js';
import { PageMetadata, provideMetadataReceiver, provideReactiveMetadata } from '@/scripts/page-metadata.js';
@@ -63,6 +62,8 @@ const XWidgets = defineAsyncComponent(() => import('./universal.widgets.vue'));
const isRoot = computed(() => mainRouter.currentRoute.value.name === 'index');
const DESKTOP_THRESHOLD = 1100;
const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
const pageMetadata = ref<null | PageMetadata>(null);

5
packages/frontend/src/ui/deck.vue
View File

@@ -101,7 +101,6 @@ import XSidebar from '@/ui/_common_/navbar.vue';
import XDrawerMenu from '@/ui/_common_/navbar-for-mobile.vue';
import MkButton from '@/components/MkButton.vue';
import * as os from '@/os.js';
import { MOBILE_THRESHOLD } from '@/const.js';
import { navbarItemDef } from '@/navbar.js';
import { $i } from '@/account.js';
import { i18n } from '@/i18n.js';
@@ -146,9 +145,9 @@ mainRouter.navHook = (path, flag): boolean => {
return false;
};
const isMobile = ref(window.innerWidth <= MOBILE_THRESHOLD);
const isMobile = ref(window.innerWidth <= 500);
window.addEventListener('resize', () => {
isMobile.value = window.innerWidth <= MOBILE_THRESHOLD;
isMobile.value = window.innerWidth <= 500;
});
const snapScroll = deviceKind === 'smartphone' || deviceKind === 'tablet';

5
packages/frontend/src/ui/universal.vue
View File

@@ -108,7 +108,7 @@ import { $i } from '@/account.js';
import { PageMetadata, provideMetadataReceiver, provideReactiveMetadata } from '@/scripts/page-metadata.js';
import { deviceKind } from '@/scripts/device-kind.js';
import { miLocalStorage } from '@/local-storage.js';
import { CURRENT_STICKY_BOTTOM, DESKTOP_THRESHOLD, MOBILE_THRESHOLD } from '@/const.js';
import { CURRENT_STICKY_BOTTOM } from '@/const.js';
import { useScrollPositionManager } from '@/nirax.js';
import { mainRouter } from '@/router/main.js';
@@ -119,6 +119,9 @@ const XAnnouncements = defineAsyncComponent(() => import('@/ui/_common_/announce
const isRoot = computed(() => mainRouter.currentRoute.value.name === 'index');
const DESKTOP_THRESHOLD = 1100;
const MOBILE_THRESHOLD = 500;
// デスクトップでウィンドウを狭くしたときモバイルUIが表示されて欲しいことはあるので deviceKind === 'desktop' の判定は行わない
const isDesktop = ref(window.innerWidth >= DESKTOP_THRESHOLD);
const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD);

3
packages/frontend/src/ui/visitor.vue
View File

@@ -72,7 +72,6 @@ SPDX-License-Identifier: AGPL-3.0-only
import { onMounted, provide, ref, computed } from 'vue';
import XCommon from './_common_/common.vue';
import { instanceName } from '@/config.js';
import { DESKTOP_THRESHOLD } from '@/const.js';
import * as os from '@/os.js';
import { instance } from '@/instance.js';
import XSigninDialog from '@/components/MkSigninDialog.vue';
@@ -85,6 +84,8 @@ import { mainRouter } from '@/router/main.js';
const isRoot = computed(() => mainRouter.currentRoute.value.name === 'index');
const DESKTOP_THRESHOLD = 1100;
const pageMetadata = ref<null | PageMetadata>(null);
provide('router', mainRouter);