merge queue: checking #8089 on main (9c31607), stacked on 4 pull requests ahead

apps/app-frontend/package.json

@@ -14,6 +14,7 @@
 		"test": "vue-tsc --noEmit"
 	},
 	"dependencies": {
+		"@dnd-kit/dom": "^0.5.0",
 		"@dnd-kit/vue": "^0.5.0",
 		"@modrinth/api-client": "workspace:^",
 		"@modrinth/assets": "workspace:*",

apps/app-frontend/src/app/shell/sidebar/index.vue

@@ -15,7 +15,7 @@ import { injectOnboardingChecklist } from '@/providers/onboarding-checklist'
 
 import Promotion from './promotion.vue'
 
-defineProps<{
+const props = defineProps<{
 	credentials: ModrinthCredentials | null | undefined
 	hasPlus: boolean
 	showAd: boolean
@@ -37,6 +37,9 @@ const friends = ref<InstanceType<typeof FriendsList> | null>(null)
 const scrollContainer = ref<HTMLElement | null>(null)
 const scrollViewport = ref<HTMLElement | null>(null)
 const upgradeHeight = ref(0)
+const promotionPaddingStyle = computed(() =>
+	props.showAd ? { paddingBottom: `calc(1rem + ${upgradeHeight.value}px)` } : undefined,
+)
 const { showTopFade, showBottomFade, checkScrollState } = useScrollIndicator(scrollViewport)
 
 let removeScrollbarListener: (() => void) | undefined
@@ -103,7 +106,11 @@ const messages = defineMessages({
 					@login-minecraft="accounts?.login()"
 					@login-modrinth="emit('login-modrinth')"
 				/>
-				<div id="sidebar-teleport-target" class="sidebar-teleport-content contents"></div>
+				<div
+					id="sidebar-teleport-target"
+					class="sidebar-teleport-content empty:hidden"
+					:style="promotionPaddingStyle"
+				></div>
 				<div class="sidebar-default-content hidden" :class="{ 'sidebar-enabled': visible }">
 					<div
 						v-show="hasLoggedIntoMinecraft"
@@ -131,9 +138,7 @@ const messages = defineMessages({
 					<PrideFundraiserBanner
 						class="p-4 border-0 border-b-[1px] border-[--brand-gradient-border] border-solid"
 					/>
-					<NewsSidebar
-						:style="showAd ? { paddingBottom: `calc(1rem + ${upgradeHeight}px)` } : undefined"
-					/>
+					<NewsSidebar :style="promotionPaddingStyle" />
 				</div>
 			</div>
 			<div

apps/app-frontend/src/components/ui/library/instance-group/instance-card.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { PointerActivationConstraints } from '@dnd-kit/dom'
 import { KeyboardSensor, PointerSensor, useDraggable } from '@dnd-kit/vue'
 import { CheckIcon, DownloadIcon, PlayIcon, SpinnerIcon, StopCircleIcon } from '@modrinth/assets'
 import { defineMessages, IconButton, injectNotificationManager, useVIntl } from '@modrinth/ui'
@@ -23,7 +24,7 @@ const LOADING_INDICATOR_DELAY_MS = 100
 
 const instanceCardSensors = [
 	PointerSensor.configure({
-		preventActivation: () => false,
+		activationConstraints: [new PointerActivationConstraints.Distance({ value: 5 })],
 	}),
 	KeyboardSensor,
 ]

apps/frontend/src/locales/en-US/index.json

@@ -1007,21 +1007,12 @@
   "collection.button.discover-mods": {
     "message": "Discover mods"
   },
-  "collection.button.edit-icon": {
-    "message": "Edit icon"
-  },
   "collection.button.remove-icon": {
     "message": "Remove icon"
   },
   "collection.button.remove-project": {
     "message": "Remove project"
   },
-  "collection.button.replace-icon": {
-    "message": "Replace icon"
-  },
-  "collection.button.select-icon": {
-    "message": "Select icon"
-  },
   "collection.button.unfollow-project": {
     "message": "Unfollow project"
   },
@@ -1034,15 +1025,21 @@
   "collection.description": {
     "message": "{description} - View the collection {name} by {username} on Modrinth"
   },
+  "collection.description-placeholder": {
+    "message": "This is a collection of..."
+  },
   "collection.description.following": {
     "message": "Auto-generated collection of all the projects you're following."
   },
-  "collection.editing": {
-    "message": "Editing collection"
+  "collection.edit": {
+    "message": "Edit collection"
   },
   "collection.error.not-found": {
     "message": "Collection not found"
   },
+  "collection.icon-label": {
+    "message": "Icon"
+  },
   "collection.label.created-at": {
     "message": "Created {ago}"
   },
@@ -1058,6 +1055,9 @@
   "collection.label.updated-at": {
     "message": "Updated {ago}"
   },
+  "collection.name-placeholder": {
+    "message": "Enter collection name..."
+  },
   "collection.return-link.dashboard-collections": {
     "message": "Your collections"
   },