refactor: change kunkun-drag-region to start with data

kunkunsh · Oct 29, 2024 · c55d130 · c55d130
1 parent 6e04d83
commit c55d130
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 11 deletions.
diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @kksh/cli
 
+## 0.0.22
+
+### Patch Changes
+
+- Updated dependencies
+  - @kksh/api@0.0.23
+
 ## 0.0.21
 
 ### Patch Changes

diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@kksh/cli",
 	"module": "dist/cli.js",
-	"version": "0.0.21",
+	"version": "0.0.22",
 	"type": "module",
 	"bin": {
 		"@kksh/cli": "./dist/cli.js",

diff --git a/apps/create-kunkun/CHANGELOG.md b/apps/create-kunkun/CHANGELOG.md
@@ -1,5 +1,12 @@
 # create-kunkun
 
+## 0.1.30
+
+### Patch Changes
+
+- Updated dependencies
+  - @kksh/api@0.0.23
+
 ## 0.1.29
 
 ### Patch Changes

diff --git a/apps/create-kunkun/package.json b/apps/create-kunkun/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "create-kunkun",
 	"type": "module",
-	"version": "0.1.29",
+	"version": "0.1.30",
 	"bin": {
 		"create-kunkun": "dist/index.mjs"
 	},

diff --git a/apps/desktop/pages/add-dev-ext.vue b/apps/desktop/pages/add-dev-ext.vue
@@ -17,6 +17,7 @@ function onBack() {
 </script>
 <template>
 	<main class="container h-screen w-screen pt-10">
+		<div class="absolute left-0 top-0 h-10 w-screen" data-tauri-drag-region />
 		<Button variant="outline" size="icon" class="absolute left-2 top-2 z-50" @click="onBack">
 			<ArrowLeftIcon />
 		</Button>

diff --git a/apps/desktop/pages/set-dev-ext-path.vue b/apps/desktop/pages/set-dev-ext-path.vue
@@ -15,6 +15,7 @@ function onBack() {
 </script>
 <template>
 	<main class="container h-screen w-screen pt-10">
+		<div class="absolute left-0 top-0 h-10 w-screen" data-tauri-drag-region />
 		<Button variant="outline" size="icon" class="absolute left-2 top-2 z-50" @click="onBack">
 			<ArrowLeftIcon />
 		</Button>

diff --git a/apps/desktop/stores/extension.ts b/apps/desktop/stores/extension.ts
@@ -303,14 +303,18 @@ export const useExtensionStore = defineStore("kk-extensions", () => {
 		})
 	}
 	const $listItems = computed(() => {
-		return manifests.value
-			.map((manifest) =>
-				manifestToCmdItems(
-					manifest,
-					extPath.value ? isExtPathInDev(extPath.value, manifest.extPath) : false
+		return (
+			manifests.value
+				.map((manifest) =>
+					manifestToCmdItems(
+						manifest,
+						extPath.value ? isExtPathInDev(extPath.value, manifest.extPath) : false
+					)
 				)
-			)
-			.flat()
+				.flat()
+				// isDev goes first
+				.sort((a, b) => (a.flags.isDev ? -1 : 1) - (b.flags.isDev ? -1 : 1))
+		)
 	})
 	const $filteredListItems = computed<TListItem[]>(() => {
 		return appStateStore.searchTerm.length === 0

diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @kksh/api
 
+## 0.0.23
+
+### Patch Changes
+
+- refactor: change kunkun-drag-region to start with data
+
 ## 0.0.22
 
 ### Patch Changes

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@kksh/api",
-	"version": "0.0.22",
+	"version": "0.0.23",
 	"type": "module",
 	"exports": {
 		".": "./src/index.ts",

diff --git a/packages/api/src/ui/api/iframe-ui.ts b/packages/api/src/ui/api/iframe-ui.ts
@@ -2,7 +2,7 @@ import type { Remote } from "@huakunshen/comlink"
 import type { IOs } from "tauri-api-adapter/client"
 import { type IUiIframe } from "../client"
 
-export const KK_DRAG_REGION_ATTR = "kunkun-drag-region"
+export const KK_DRAG_REGION_ATTR = "data-kunkun-drag-region"
 
 export function constructIframeUiAPI(api: {
 	iframeUi: Remote<IUiIframe>