@mapomodule/uikit 2.0.0-beta.17 → 2.0.0-beta.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (121) hide show
  1. package/dist/__tests__/MapoMediaEditor.component.test.d.ts +2 -0
  2. package/dist/__tests__/MapoMediaEditor.component.test.d.ts.map +1 -0
  3. package/dist/__tests__/MapoMediaFolderPicker.component.test.d.ts +2 -0
  4. package/dist/__tests__/MapoMediaFolderPicker.component.test.d.ts.map +1 -0
  5. package/dist/__tests__/MapoMediaFolders.component.test.d.ts +2 -0
  6. package/dist/__tests__/MapoMediaFolders.component.test.d.ts.map +1 -0
  7. package/dist/__tests__/MapoMediaGallery.component.test.d.ts +2 -0
  8. package/dist/__tests__/MapoMediaGallery.component.test.d.ts.map +1 -0
  9. package/dist/__tests__/MapoMediaUploadHandover.component.test.d.ts +2 -0
  10. package/dist/__tests__/MapoMediaUploadHandover.component.test.d.ts.map +1 -0
  11. package/dist/__tests__/MapoMenuManager.component.test.d.ts +2 -0
  12. package/dist/__tests__/MapoMenuManager.component.test.d.ts.map +1 -0
  13. package/dist/__tests__/mediaDrag.test.d.ts +2 -0
  14. package/dist/__tests__/mediaDrag.test.d.ts.map +1 -0
  15. package/dist/__tests__/mediaFolders.test.d.ts +2 -0
  16. package/dist/__tests__/mediaFolders.test.d.ts.map +1 -0
  17. package/dist/__tests__/mediaMetadata.test.d.ts +2 -0
  18. package/dist/__tests__/mediaMetadata.test.d.ts.map +1 -0
  19. package/dist/__tests__/mediaStore.test.d.ts +2 -0
  20. package/dist/__tests__/mediaStore.test.d.ts.map +1 -0
  21. package/dist/__tests__/mediaUrl.test.d.ts +2 -0
  22. package/dist/__tests__/mediaUrl.test.d.ts.map +1 -0
  23. package/dist/index.d.mts +1 -0
  24. package/dist/index.d.ts +1 -0
  25. package/dist/index.d.ts.map +1 -1
  26. package/dist/module.d.mts +17 -0
  27. package/dist/module.d.ts +16 -0
  28. package/dist/module.d.ts.map +1 -1
  29. package/dist/module.json +1 -1
  30. package/dist/module.mjs +4 -0
  31. package/dist/runtime/adapters/defaultMediaAdapter.d.ts +1 -0
  32. package/dist/runtime/adapters/defaultMediaAdapter.d.ts.map +1 -1
  33. package/dist/runtime/adapters/defaultMediaAdapter.js +6 -1
  34. package/dist/runtime/components/MapoDetail.vue +9 -5
  35. package/dist/runtime/components/MapoDetail.vue.d.ts +3 -3
  36. package/dist/runtime/components/MapoDetail.vue.d.ts.map +1 -1
  37. package/dist/runtime/components/MapoDropArea.vue +17 -6
  38. package/dist/runtime/components/MapoDropArea.vue.d.ts.map +1 -1
  39. package/dist/runtime/components/MapoListQuickEdit.vue +7 -1
  40. package/dist/runtime/components/MapoListQuickEdit.vue.d.ts.map +1 -1
  41. package/dist/runtime/components/MapoMediaEditor.vue +94 -38
  42. package/dist/runtime/components/MapoMediaEditor.vue.d.ts +4 -0
  43. package/dist/runtime/components/MapoMediaEditor.vue.d.ts.map +1 -1
  44. package/dist/runtime/components/MapoMediaFolderPicker.vue +129 -0
  45. package/dist/runtime/components/MapoMediaFolderPicker.vue.d.ts +33 -0
  46. package/dist/runtime/components/MapoMediaFolderPicker.vue.d.ts.map +1 -0
  47. package/dist/runtime/components/MapoMediaFolders.vue +254 -72
  48. package/dist/runtime/components/MapoMediaFolders.vue.d.ts.map +1 -1
  49. package/dist/runtime/components/MapoMediaGallery.vue +228 -143
  50. package/dist/runtime/components/MapoMediaGallery.vue.d.ts +5 -1
  51. package/dist/runtime/components/MapoMediaGallery.vue.d.ts.map +1 -1
  52. package/dist/runtime/components/MapoMediaManager.vue +6 -2
  53. package/dist/runtime/components/MapoMediaManager.vue.d.ts +11 -2
  54. package/dist/runtime/components/MapoMediaManager.vue.d.ts.map +1 -1
  55. package/dist/runtime/components/MapoMediaManagerDialog.vue.d.ts +1 -1
  56. package/dist/runtime/components/MapoMediaManagerDialog.vue.d.ts.map +1 -1
  57. package/dist/runtime/components/MapoMediaPreview.vue +5 -3
  58. package/dist/runtime/components/MapoMediaPreview.vue.d.ts.map +1 -1
  59. package/dist/runtime/components/MapoMediaUploader.vue +5 -1
  60. package/dist/runtime/components/MapoMediaUploader.vue.d.ts.map +1 -1
  61. package/dist/runtime/components/MapoMenuManager.vue +13 -5
  62. package/dist/runtime/components/MapoMenuManager.vue.d.ts.map +1 -1
  63. package/dist/runtime/stores/media.d.ts +43 -6
  64. package/dist/runtime/stores/media.d.ts.map +1 -1
  65. package/dist/runtime/stores/media.js +201 -16
  66. package/dist/runtime/types/media.d.ts +17 -2
  67. package/dist/runtime/types/media.d.ts.map +1 -1
  68. package/dist/runtime/utils/contentLanguages.d.ts +9 -0
  69. package/dist/runtime/utils/contentLanguages.d.ts.map +1 -0
  70. package/dist/runtime/utils/contentLanguages.js +8 -0
  71. package/dist/runtime/utils/langInfo.d.ts +13 -0
  72. package/dist/runtime/utils/langInfo.d.ts.map +1 -1
  73. package/dist/runtime/utils/langInfo.js +9 -0
  74. package/dist/runtime/utils/mediaDrag.d.ts +21 -0
  75. package/dist/runtime/utils/mediaDrag.d.ts.map +1 -0
  76. package/dist/runtime/utils/mediaDrag.js +11 -0
  77. package/dist/runtime/utils/mediaFolders.d.ts +65 -0
  78. package/dist/runtime/utils/mediaFolders.d.ts.map +1 -0
  79. package/dist/runtime/utils/mediaFolders.js +97 -0
  80. package/dist/runtime/utils/mediaMetadata.d.ts +39 -0
  81. package/dist/runtime/utils/mediaMetadata.d.ts.map +1 -0
  82. package/dist/runtime/utils/mediaMetadata.js +97 -0
  83. package/dist/runtime/utils/mediaUrl.d.ts +16 -0
  84. package/dist/runtime/utils/mediaUrl.d.ts.map +1 -0
  85. package/dist/runtime/utils/mediaUrl.js +12 -0
  86. package/package.json +3 -3
  87. package/src/__tests__/MapoDetail.component.test.ts +64 -1
  88. package/src/__tests__/MapoMediaEditor.component.test.ts +447 -0
  89. package/src/__tests__/MapoMediaFolderPicker.component.test.ts +220 -0
  90. package/src/__tests__/MapoMediaFolders.component.test.ts +519 -0
  91. package/src/__tests__/MapoMediaGallery.component.test.ts +211 -0
  92. package/src/__tests__/MapoMediaUploadHandover.component.test.ts +241 -0
  93. package/src/__tests__/MapoMenuManager.component.test.ts +175 -0
  94. package/src/__tests__/langInfo.test.ts +38 -1
  95. package/src/__tests__/mediaDrag.test.ts +42 -0
  96. package/src/__tests__/mediaFolders.test.ts +204 -0
  97. package/src/__tests__/mediaMetadata.test.ts +169 -0
  98. package/src/__tests__/mediaStore.test.ts +569 -0
  99. package/src/__tests__/mediaUrl.test.ts +44 -0
  100. package/src/index.ts +1 -0
  101. package/src/module.ts +25 -0
  102. package/src/runtime/adapters/defaultMediaAdapter.ts +11 -1
  103. package/src/runtime/components/MapoDetail.vue +21 -9
  104. package/src/runtime/components/MapoDropArea.vue +24 -6
  105. package/src/runtime/components/MapoListQuickEdit.vue +10 -1
  106. package/src/runtime/components/MapoMediaEditor.vue +131 -47
  107. package/src/runtime/components/MapoMediaFolderPicker.vue +176 -0
  108. package/src/runtime/components/MapoMediaFolders.vue +311 -72
  109. package/src/runtime/components/MapoMediaGallery.vue +263 -152
  110. package/src/runtime/components/MapoMediaManager.vue +16 -2
  111. package/src/runtime/components/MapoMediaPreview.vue +8 -3
  112. package/src/runtime/components/MapoMediaUploader.vue +8 -1
  113. package/src/runtime/components/MapoMenuManager.vue +24 -7
  114. package/src/runtime/stores/media.ts +335 -21
  115. package/src/runtime/types/media.ts +20 -2
  116. package/src/runtime/utils/contentLanguages.ts +18 -0
  117. package/src/runtime/utils/langInfo.ts +25 -0
  118. package/src/runtime/utils/mediaDrag.ts +29 -0
  119. package/src/runtime/utils/mediaFolders.ts +182 -0
  120. package/src/runtime/utils/mediaMetadata.ts +165 -0
  121. package/src/runtime/utils/mediaUrl.ts +30 -0
@@ -1,7 +1,16 @@
1
1
  <script setup>
2
- import { ref, computed } from "vue";
2
+ import { ref, computed, watch, onBeforeUnmount } from "vue";
3
3
  import { useI18n } from "vue-i18n";
4
4
  import { useMediaStore } from "../stores/media.js";
5
+ import {
6
+ ROOT_FOLDER_KEY,
7
+ buildFolderTree,
8
+ canMoveFolderTo,
9
+ findFolderNode,
10
+ folderKey,
11
+ folderNodeIcon
12
+ } from "../utils/mediaFolders.js";
13
+ import { startMediaDrag } from "../utils/mediaDrag.js";
5
14
  const { t } = useI18n();
6
15
  const store = useMediaStore();
7
16
  const editingFolder = ref(null);
@@ -71,6 +80,136 @@ function onNameKeyup(event) {
71
80
  if (event.key === "Enter") saveFolder();
72
81
  else if (event.key === "Escape") cancelEdit();
73
82
  }
83
+ const nodeKey = (node) => node.key;
84
+ const tree = computed(
85
+ () => buildFolderTree(store.folderChildren, {
86
+ root: t("mapo.mediaManager.root"),
87
+ loading: t("mapo.loading")
88
+ })
89
+ );
90
+ const selectedNode = computed(
91
+ () => findFolderNode(tree.value, folderKey(store.parentFolder?.id))
92
+ );
93
+ const hasNoFolders = computed(
94
+ () => store.folderChildren[ROOT_FOLDER_KEY]?.length === 0
95
+ );
96
+ const expanded = ref([ROOT_FOLDER_KEY]);
97
+ watch(
98
+ () => store.parentFolders.map((folder) => folderKey(folder.id)).join("/"),
99
+ () => {
100
+ const path = store.parentFolders.map((folder) => folderKey(folder.id));
101
+ expanded.value = [
102
+ .../* @__PURE__ */ new Set([...expanded.value, ROOT_FOLDER_KEY, ...path])
103
+ ];
104
+ },
105
+ { immediate: true }
106
+ );
107
+ let navigatingTo = null;
108
+ function onSelectNode(event, node) {
109
+ event.preventDefault();
110
+ if (node.pending) return;
111
+ navigatingTo = node.key;
112
+ return store.navigateToFolder(node.folder).finally(() => {
113
+ navigatingTo = null;
114
+ });
115
+ }
116
+ function onToggleNode(event, node) {
117
+ const isOpening = !event.detail.isExpanded;
118
+ const isLoaded = store.folderChildren[node.key] !== void 0;
119
+ const isNavigatingThere = navigatingTo === node.key;
120
+ if (!isOpening || isLoaded || isNavigatingThere || node.pending) return;
121
+ store.loadFolderChildren(node.folder?.id ?? null).catch(() => {
122
+ });
123
+ }
124
+ function isRenaming(node) {
125
+ const renamingId = editingFolder.value?.id;
126
+ return renamingId != null && node.folder?.id === renamingId;
127
+ }
128
+ const movingFolder = ref(null);
129
+ const pickerOpen = ref(false);
130
+ const isMoving = computed(() => store.movingFolderId !== null);
131
+ const pickerExclude = computed(
132
+ () => movingFolder.value ? [movingFolder.value.id] : []
133
+ );
134
+ function startMove(folder) {
135
+ movingFolder.value = folder;
136
+ pickerOpen.value = true;
137
+ }
138
+ function onMoveConfirm(target) {
139
+ const folder = movingFolder.value;
140
+ if (!folder) return;
141
+ return store.moveFolder(folder, target?.id ?? null);
142
+ }
143
+ const dropKey = ref(null);
144
+ const OPEN_ON_HOVER_MS = 700;
145
+ let openTimer;
146
+ function canDragRow(node) {
147
+ return !!node.folder && !isRenaming(node) && !isMoving.value;
148
+ }
149
+ function canDropOn(node) {
150
+ const drag = store.dragged;
151
+ if (!drag || node.pending) return false;
152
+ if (drag.kind === "media") return true;
153
+ if (isMoving.value) return false;
154
+ const targetId = node.folder?.id ?? null;
155
+ return canMoveFolderTo(store.folderChildren, drag.folder, targetId);
156
+ }
157
+ function onRowDragStart(event, node) {
158
+ if (!node.folder || !canDragRow(node)) return;
159
+ const drag = { kind: "folder", folder: node.folder };
160
+ startMediaDrag(event, drag);
161
+ store.dragged = drag;
162
+ }
163
+ function onRowDragOver(event, node) {
164
+ if (!canDropOn(node)) return;
165
+ event.preventDefault();
166
+ if (event.dataTransfer) event.dataTransfer.dropEffect = "move";
167
+ if (dropKey.value === node.key) return;
168
+ dropKey.value = node.key;
169
+ openWhenResting(node);
170
+ }
171
+ function onRowDragLeave(event, node) {
172
+ const row = event.currentTarget;
173
+ const into = event.relatedTarget;
174
+ if (row && into && row.contains(into)) return;
175
+ if (dropKey.value !== node.key) return;
176
+ dropKey.value = null;
177
+ clearTimeout(openTimer);
178
+ }
179
+ function onRowDrop(event, node) {
180
+ const drag = store.dragged;
181
+ if (!drag || !canDropOn(node)) return;
182
+ event.preventDefault();
183
+ store.dragged = null;
184
+ const targetId = node.folder?.id ?? null;
185
+ if (drag.kind === "media") return store.moveMedia(drag.ids, targetId);
186
+ return store.moveFolder(drag.folder, targetId);
187
+ }
188
+ function onRowDragEnd() {
189
+ store.dragged = null;
190
+ }
191
+ function openWhenResting(node) {
192
+ clearTimeout(openTimer);
193
+ const isOpen = expanded.value.includes(node.key);
194
+ const hasBranch = !!node.children?.length;
195
+ if (isOpen || !hasBranch) return;
196
+ openTimer = setTimeout(() => {
197
+ expanded.value = [...expanded.value, node.key];
198
+ const isLoaded = store.folderChildren[node.key] !== void 0;
199
+ if (isLoaded) return;
200
+ store.loadFolderChildren(node.folder?.id ?? null).catch(() => {
201
+ });
202
+ }, OPEN_ON_HOVER_MS);
203
+ }
204
+ watch(
205
+ () => store.dragged,
206
+ (drag) => {
207
+ if (drag) return;
208
+ dropKey.value = null;
209
+ clearTimeout(openTimer);
210
+ }
211
+ );
212
+ onBeforeUnmount(() => clearTimeout(openTimer));
74
213
  </script>
75
214
 
76
215
  <template>
@@ -137,84 +276,127 @@ function onNameKeyup(event) {
137
276
  </UInput>
138
277
  </div>
139
278
 
140
- <!-- Folder list -->
279
+ <!-- Folder tree: the root, then the folders, loaded branch by branch -->
141
280
  <div class="flex-1 overflow-y-auto px-2">
142
- <div v-for="folder in store.folders" :key="folder.id">
143
- <!-- Editing this folder -->
144
- <UInput
145
- v-if="editingFolder?.id === folder.id"
146
- v-model="folderName"
147
- size="xs"
148
- autofocus
149
- @keyup="onNameKeyup"
150
- >
151
- <template #trailing>
152
- <UButton
153
- icon="i-lucide-check"
154
- size="xs"
155
- variant="ghost"
156
- color="primary"
157
- :loading="saving"
158
- @click="saveFolder"
159
- />
160
- </template>
161
- </UInput>
162
-
163
- <!-- Folder row -->
164
- <div
165
- v-else
166
- class="group flex items-center gap-1 rounded px-1 py-1 hover:bg-elevated"
167
- >
168
- <UButton
169
- variant="ghost"
170
- color="neutral"
171
- size="xs"
172
- icon="i-lucide-folder"
173
- class="flex-1 justify-start truncate"
174
- @click="store.navigateToFolder(folder)"
281
+ <UTree
282
+ v-model:expanded="expanded"
283
+ :items="tree"
284
+ :model-value="selectedNode"
285
+ :get-key="nodeKey"
286
+ size="sm"
287
+ color="neutral"
288
+ @select="onSelectNode"
289
+ @toggle="onToggleNode"
290
+ >
291
+ <!-- The whole row is the tree item, so the rename and delete buttons
292
+ sit next to the label instead of inside another button. The row
293
+ is also where folders are dragged from and media and folders are
294
+ dropped. -->
295
+ <template #item-wrapper="{ item, expanded: isOpen, selected, ui }">
296
+ <div
297
+ :class="[
298
+ ui.link({ selected, disabled: !!item.pending }),
299
+ dropKey === item.key && 'bg-primary/10 ring-1 ring-inset ring-primary'
300
+ ]"
301
+ :draggable="canDragRow(item)"
302
+ @dragstart="onRowDragStart($event, item)"
303
+ @dragend="onRowDragEnd"
304
+ @dragenter="onRowDragOver($event, item)"
305
+ @dragover="onRowDragOver($event, item)"
306
+ @dragleave="onRowDragLeave($event, item)"
307
+ @drop="onRowDrop($event, item)"
175
308
  >
176
- {{ folder.name }}
177
- </UButton>
178
- <div class="hidden items-center gap-0.5 group-hover:flex">
179
- <UButton
180
- icon="i-lucide-pencil"
181
- size="xs"
182
- variant="ghost"
183
- color="neutral"
184
- @click.stop="startEdit(folder)"
309
+ <UIcon
310
+ :name="folderNodeIcon(item, isOpen)"
311
+ :class="[ui.linkLeadingIcon(), item.pending && 'animate-spin']"
185
312
  />
186
- <UButton
187
- icon="i-lucide-trash-2"
313
+
314
+ <UInput
315
+ v-if="isRenaming(item)"
316
+ v-model="folderName"
188
317
  size="xs"
189
- variant="ghost"
190
- color="error"
191
- @click.stop="store.deleteFolder(folder)"
192
- />
318
+ class="min-w-0 flex-1"
319
+ autofocus
320
+ @click.stop
321
+ @keydown.stop
322
+ @keyup="onNameKeyup"
323
+ >
324
+ <template #trailing>
325
+ <UButton
326
+ icon="i-lucide-check"
327
+ size="xs"
328
+ variant="ghost"
329
+ color="primary"
330
+ :loading="saving"
331
+ :aria-label="t('mapo.save')"
332
+ @click.stop="saveFolder"
333
+ />
334
+ </template>
335
+ </UInput>
336
+ <template v-else>
337
+ <span :class="ui.linkLabel()">{{ item.label }}</span>
338
+ </template>
339
+
340
+ <span :class="ui.linkTrailing()">
341
+ <UIcon
342
+ v-if="item.children?.length"
343
+ name="i-lucide-chevron-down"
344
+ :class="ui.linkTrailingIcon()"
345
+ />
346
+ </span>
347
+
348
+ <!-- Laid over the end of the row, so they take no room from the
349
+ name; transparent until the row is hovered or a button has
350
+ the keyboard focus. -->
351
+ <span
352
+ v-if="item.folder && !isRenaming(item)"
353
+ class="absolute end-1 top-1/2 flex -translate-y-1/2 items-center gap-0.5 rounded-md bg-default opacity-0 shadow-sm transition-opacity group-hover:opacity-100 focus-within:opacity-100"
354
+ >
355
+ <UButton
356
+ icon="i-lucide-pencil"
357
+ size="xs"
358
+ variant="ghost"
359
+ color="neutral"
360
+ :aria-label="t('mapo.edit')"
361
+ :disabled="isMoving"
362
+ @click.stop="startEdit(item.folder)"
363
+ />
364
+ <UButton
365
+ icon="i-lucide-folder-input"
366
+ size="xs"
367
+ variant="ghost"
368
+ color="neutral"
369
+ :aria-label="t('mapo.mediaMove.moveTo')"
370
+ :disabled="isMoving"
371
+ :loading="store.movingFolderId === item.folder.id"
372
+ @click.stop="startMove(item.folder)"
373
+ />
374
+ <UButton
375
+ icon="i-lucide-trash-2"
376
+ size="xs"
377
+ variant="ghost"
378
+ color="error"
379
+ :aria-label="t('mapo.delete')"
380
+ :disabled="isMoving"
381
+ @click.stop="store.deleteFolder(item.folder)"
382
+ />
383
+ </span>
193
384
  </div>
194
- </div>
195
- </div>
385
+ </template>
386
+ </UTree>
196
387
 
197
- <p
198
- v-if="store.folders.length === 0"
199
- class="px-2 py-3 text-xs text-dimmed italic"
200
- >
201
- {{ t("mapo.mediaFolders.noFolders") }}
202
- </p>
388
+ <template v-if="hasNoFolders">
389
+ <p class="px-2 py-3 text-xs text-dimmed italic">
390
+ {{ t("mapo.mediaFolders.noFolders") }}
391
+ </p>
392
+ </template>
203
393
  </div>
204
394
 
205
- <!-- Back -->
206
- <div v-if="store.parentFolder" class="border-t border-default px-2 pt-2">
207
- <UButton
208
- icon="i-lucide-arrow-left"
209
- size="xs"
210
- variant="ghost"
211
- color="neutral"
212
- block
213
- class="justify-start"
214
- @click="store.navigateToFolder(null)"
215
- >
216
- {{ t("mapo.mediaFolders.goBack") }}
217
- </UButton>
218
- </div>
395
+ <MapoMediaFolderPicker
396
+ v-model:open="pickerOpen"
397
+ :title="t('mapo.mediaMove.folderTitle', { name: movingFolder?.name })"
398
+ :exclude="pickerExclude"
399
+ @confirm="onMoveConfirm"
400
+ />
219
401
  </div>
220
402
  </template>
@@ -1 +1 @@
1
- {"version":3,"file":"MapoMediaFolders.vue.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/MapoMediaFolders.vue"],"names":[],"mappings":"AAkyBA,QAAA,MAAM,YAAY,+QAChB,CAAC;wBACkB,OAAO,YAAY;AAAxC,wBAAyC"}
1
+ {"version":3,"file":"MapoMediaFolders.vue.d.ts","sourceRoot":"","sources":["../../../src/runtime/components/MapoMediaFolders.vue"],"names":[],"mappings":"AA20CA,QAAA,MAAM,YAAY,+QAChB,CAAC;wBACkB,OAAO,YAAY;AAAxC,wBAAyC"}