From ba0b959dddc8d2f34b6c2a325b822896b4d971e5 Mon Sep 17 00:00:00 2001 From: Eana Hufwe Date: Thu, 1 Aug 2024 00:55:11 +0000 Subject: [PATCH 1/3] fix(client): Fix logical property bugs (batch 1) --- .../client/src/components/MkContainer.vue | 8 +++++ .../client/src/components/MkEmojiPicker.vue | 9 ++++++ packages/client/src/components/MkFolder.vue | 8 +++++ .../client/src/components/MkMediaList.vue | 23 +++++++++++++ .../client/src/components/MkModPlayer.vue | 8 +++++ .../client/src/components/MkPullToRefresh.vue | 32 ++++++++++++++++--- .../src/components/MkReactionsViewer.vue | 9 ++++++ .../src/components/MkSimpleTextWindow.vue | 8 +++++ packages/client/src/components/MkTab.vue | 8 +++++ packages/client/src/components/MkTimeline.vue | 2 +- .../client/src/components/MkUrlPreview.vue | 9 ++++++ .../client/src/components/global/MkAvatar.vue | 4 +++ .../src/components/global/MkPageHeader.vue | 9 ++++++ packages/client/src/init.ts | 24 +++++++++++++- .../src/pages/messaging/messaging-room.vue | 8 +++++ packages/client/src/pages/timeline.vue | 8 +++++ packages/client/src/style.scss | 9 ++++++ packages/client/src/ui/_common_/navbar.vue | 9 ++++++ packages/client/src/ui/deck.vue | 9 ++++++ packages/client/src/ui/deck/column.vue | 11 +++++++ packages/client/src/ui/universal.vue | 17 ++++++++++ 21 files changed, 226 insertions(+), 6 deletions(-) diff --git a/packages/client/src/components/MkContainer.vue b/packages/client/src/components/MkContainer.vue index 8b7a6b275a..16aebe5830 100644 --- a/packages/client/src/components/MkContainer.vue +++ b/packages/client/src/components/MkContainer.vue @@ -170,10 +170,18 @@ defineExpose({ diff --git a/packages/client/src/components/MkReactionsViewer.vue b/packages/client/src/components/MkReactionsViewer.vue index d7c441f23f..8837605180 100644 --- a/packages/client/src/components/MkReactionsViewer.vue +++ b/packages/client/src/components/MkReactionsViewer.vue @@ -38,6 +38,7 @@ const isMe = computed(() => isSignedIn(me) && me.id === props.note.userId); margin-block-start: 0.2em; inline-size: 100%; display: flex; + overflow-x: auto; overflow-inline: auto; margin-inline: -24px; padding-inline: 22px 160px; @@ -55,6 +56,14 @@ const isMe = computed(() => isSignedIn(me) && me.id === props.note.userId); ); scrollbar-width: none; pointer-events: none; + + @supports not (overflow-inline: auto) { + .vertical-lr &, .vertical-rl & { + overflow-x: visible; + overflow-y: auto; + } + } + :deep(*) { pointer-events: all; } diff --git a/packages/client/src/components/MkSimpleTextWindow.vue b/packages/client/src/components/MkSimpleTextWindow.vue index 06e1ad8c86..872b7a230f 100644 --- a/packages/client/src/components/MkSimpleTextWindow.vue +++ b/packages/client/src/components/MkSimpleTextWindow.vue @@ -31,9 +31,17 @@ const emit = defineEmits<{ diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index 5c9cb1537f..86c708d901 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -663,7 +663,16 @@ console.log(mainRouter.currentRoute.value.name); inline-size: 100%; min-inline-size: 0; $widgets-hide-threshold: 1090px; + overflow-x: clip; overflow-inline: clip; + + @supports not (overflow-inline: clip) { + .vertical-lr &, .vertical-rl & { + overflow-x: visible; + overflow-y: clip; + } + } + @media (max-inline-size: $widgets-hide-threshold) { padding-block-end: calc(env(safe-area-inset-bottom, 0px) + 96px); } @@ -673,6 +682,7 @@ console.log(mainRouter.currentRoute.value.name); position: sticky; inset-block-start: 0; max-block-size: 100vb; + overflow-y: auto; overflow-block: auto; padding-block: 0; padding-inline: var(--margin); @@ -680,6 +690,13 @@ console.log(mainRouter.currentRoute.value.name); min-inline-size: max-content; box-sizing: content-box; + @supports not (overflow-block: auto) { + .vertical-lr &, .vertical-rl & { + overflow-y: visible; + overflow-x: auto; + } + } + @media (max-inline-size: $widgets-hide-threshold) { display: none; } From 1879e236c4919962945e60b25cfefce13a5d761e Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 1 Aug 2024 10:54:46 +0900 Subject: [PATCH 2/3] chore(client): address sass deprecation warning --- packages/client/src/components/MkMediaList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue index 8cd5a0b1c2..15f97bf8a3 100644 --- a/packages/client/src/components/MkMediaList.vue +++ b/packages/client/src/components/MkMediaList.vue @@ -319,6 +319,8 @@ const previewableCount = computed( inset-inline-start: 50%; transform: translateX(-50%); + inline-size: 75%; + &:dir(rtl) { inset-inline-start: auto; inset-inline-end: 50%; @@ -332,8 +334,6 @@ const previewableCount = computed( inset-inline-end: 50%; inset-inline-start: auto; } - - inline-size: 75%; } .pwsp__alt-text { From d46c336ef5491ecf464baccf1823c86f5fd8ef0f Mon Sep 17 00:00:00 2001 From: Eana Hufwe Date: Thu, 1 Aug 2024 13:55:31 +0000 Subject: [PATCH 3/3] fix(client): MkPullToRefresh logical directions --- packages/client/src/components/MkPullToRefresh.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/MkPullToRefresh.vue b/packages/client/src/components/MkPullToRefresh.vue index 6e28ffbb16..c61bb75811 100644 --- a/packages/client/src/components/MkPullToRefresh.vue +++ b/packages/client/src/components/MkPullToRefresh.vue @@ -261,7 +261,7 @@ defineExpose({ position: relative; overflow: clip; inline-size: 100%; - min-block-size: var(--frame-min-height, 0px); + min-block-size: var(--frame-min-block-size, 0px); mask-image: linear-gradient(var(--gradient-to-inline-end), #000 0%, #000 80%, transparent); -webkit-mask-image: -webkit-linear-gradient( var(--gradient-to-inline-end), @@ -290,6 +290,12 @@ defineExpose({ transition: transform 0.25s; &.refresh { transform: rotate(180deg); + :global(.vertical-rl) & { + transform: rotate(-90deg); + } + :global(.vertical-lr) & { + transform: rotate(90deg); + } } } > .text {