@maas/vue-equipment 1.0.0-beta.13 → 1.0.0-beta.15
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.
- package/dist/nuxt/module.json +1 -1
- package/dist/plugins/MagicAccordion/src/components/MagicAccordionContent.vue +65 -82
- package/dist/plugins/MagicAccordion/src/components/MagicAccordionContent.vue.d.ts +2 -2
- package/dist/plugins/MagicAccordion/src/components/MagicAccordionProvider.vue +24 -30
- package/dist/plugins/MagicAccordion/src/components/MagicAccordionTrigger.vue +65 -61
- package/dist/plugins/MagicAccordion/src/components/MagicAccordionTrigger.vue.d.ts +1 -1
- package/dist/plugins/MagicAccordion/src/components/MagicAccordionView.vue +41 -45
- package/dist/plugins/MagicAccordion/src/components/MagicAccordionView.vue.d.ts +1 -1
- package/dist/plugins/MagicCommand/src/components/MagicCommandContent.vue +137 -150
- package/dist/plugins/MagicCommand/src/components/MagicCommandContent.vue.d.ts +1 -1
- package/dist/plugins/MagicCommand/src/components/MagicCommandDrawer.vue +45 -52
- package/dist/plugins/MagicCommand/src/components/MagicCommandItem.vue +80 -82
- package/dist/plugins/MagicCommand/src/components/MagicCommandItem.vue.d.ts +1 -1
- package/dist/plugins/MagicCommand/src/components/MagicCommandModal.vue +40 -47
- package/dist/plugins/MagicCommand/src/components/MagicCommandProvider.vue +68 -74
- package/dist/plugins/MagicCommand/src/components/MagicCommandRenderer.vue +22 -38
- package/dist/plugins/MagicCommand/src/components/MagicCommandTrigger.vue +95 -85
- package/dist/plugins/MagicCommand/src/components/MagicCommandTrigger.vue.d.ts +1 -1
- package/dist/plugins/MagicCommand/src/components/MagicCommandView.vue +41 -47
- package/dist/plugins/MagicCommand/src/components/MagicCommandView.vue.d.ts +1 -1
- package/dist/plugins/MagicCookie/src/components/MagicCookieItem.vue +41 -39
- package/dist/plugins/MagicCookie/src/components/MagicCookieItem.vue.d.ts +2 -2
- package/dist/plugins/MagicCookie/src/components/MagicCookieProvider.vue +23 -34
- package/dist/plugins/MagicCookie/src/components/MagicCookieView.vue +40 -73
- package/dist/plugins/MagicCookie/src/components/MagicCookieView.vue.d.ts +1 -1
- package/dist/plugins/MagicDraggable/src/components/MagicDraggable.vue +70 -86
- package/dist/plugins/MagicDraggable/src/components/MagicDraggable.vue.d.ts +14 -13
- package/dist/plugins/MagicDrawer/src/components/MagicDrawer.vue +263 -303
- package/dist/plugins/MagicDrawer/src/components/MagicDrawer.vue.d.ts +50 -49
- package/dist/plugins/MagicEmitter/src/composables/useMagicEmitter.d.ts +100 -100
- package/dist/plugins/MagicMarquee/src/components/MagicMarquee.vue +41 -69
- package/dist/plugins/MagicMarquee/src/composables/useMagicMarquee.d.ts +1 -1
- package/dist/plugins/MagicMenu/src/components/MagicMenuChannel.vue +54 -59
- package/dist/plugins/MagicMenu/src/components/MagicMenuChannel.vue.d.ts +2 -2
- package/dist/plugins/MagicMenu/src/components/MagicMenuContent.vue +188 -208
- package/dist/plugins/MagicMenu/src/components/MagicMenuContent.vue.d.ts +3 -3
- package/dist/plugins/MagicMenu/src/components/MagicMenuFloat.vue +181 -194
- package/dist/plugins/MagicMenu/src/components/MagicMenuItem.vue +91 -100
- package/dist/plugins/MagicMenu/src/components/MagicMenuItem.vue.d.ts +1 -1
- package/dist/plugins/MagicMenu/src/components/MagicMenuProvider.vue +83 -85
- package/dist/plugins/MagicMenu/src/components/MagicMenuRemote.vue +79 -75
- package/dist/plugins/MagicMenu/src/components/MagicMenuRemote.vue.d.ts +1 -1
- package/dist/plugins/MagicMenu/src/components/MagicMenuTrigger.vue +106 -105
- package/dist/plugins/MagicMenu/src/components/MagicMenuTrigger.vue.d.ts +1 -1
- package/dist/plugins/MagicMenu/src/components/MagicMenuView.vue +54 -60
- package/dist/plugins/MagicMenu/src/components/MagicMenuView.vue.d.ts +1 -1
- package/dist/plugins/MagicModal/src/components/MagicModal.vue +137 -163
- package/dist/plugins/MagicModal/src/components/MagicModal.vue.d.ts +9 -8
- package/dist/plugins/MagicNoise/src/components/MagicNoise.vue +53 -78
- package/dist/plugins/MagicPie/src/components/MagicPie.vue +147 -175
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerAudio.vue +49 -65
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerAudioControls.vue +87 -129
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerDisplayTime.vue +33 -41
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerMuxPopover.vue +99 -109
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerOverlay.vue +47 -75
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerPoster.vue +16 -31
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerProvider.vue +43 -44
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerTimeline.vue +52 -109
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerVideo.vue +65 -72
- package/dist/plugins/MagicPlayer/src/components/MagicPlayerVideoControls.vue +154 -225
- package/dist/plugins/MagicPlayer/src/composables/useMagicPlayer.d.ts +1 -1
- package/dist/plugins/MagicScroll/src/components/MagicScrollCollision.vue +49 -59
- package/dist/plugins/MagicScroll/src/components/MagicScrollMotion.vue +63 -70
- package/dist/plugins/MagicScroll/src/components/MagicScrollProvider.vue +29 -33
- package/dist/plugins/MagicScroll/src/components/MagicScrollScene.vue +59 -69
- package/dist/plugins/MagicToast/src/components/MagicToastProvider.vue +81 -94
- package/dist/plugins/MagicToast/src/components/MagicToastView.vue +52 -70
- package/dist/plugins/MagicToast/src/components/MagicToastView.vue.d.ts +2 -2
- package/package.json +1 -1
- package/dist/plugins/MagicAccordion/demo/data/footer.json +0 -117
- package/dist/plugins/MagicCommand/demo/data/about.json +0 -3
- package/dist/plugins/MagicCommand/demo/data/search.json +0 -594
|
@@ -1,6 +1,15 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
<template>
|
|
2
|
+
<magic-modal
|
|
3
|
+
:id="instanceId"
|
|
4
|
+
class="magic-command-modal"
|
|
5
|
+
:options="options"
|
|
6
|
+
v-bind="$attrs"
|
|
7
|
+
>
|
|
8
|
+
<slot />
|
|
9
|
+
</magic-modal>
|
|
10
|
+
</template>
|
|
11
|
+
|
|
12
|
+
<script setup>
|
|
4
13
|
import { inject, watch, onBeforeUnmount } from "vue";
|
|
5
14
|
import {
|
|
6
15
|
useMagicModal,
|
|
@@ -8,50 +17,34 @@ import {
|
|
|
8
17
|
} from "@maas/vue-equipment/plugins";
|
|
9
18
|
import { useMagicCommand } from "../composables/useMagicCommand";
|
|
10
19
|
import { MagicCommandInstanceId } from "../symbols";
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
const { close, isActive } = useMagicCommand(instanceId);
|
|
28
|
-
const modalApi = useMagicModal(instanceId);
|
|
29
|
-
watch(isActive, (value) => {
|
|
30
|
-
if (value) {
|
|
31
|
-
modalApi.open();
|
|
32
|
-
} else {
|
|
33
|
-
modalApi.close();
|
|
34
|
-
}
|
|
35
|
-
});
|
|
36
|
-
emitter.on("afterLeave", afterLeaveCallback);
|
|
37
|
-
onBeforeUnmount(() => {
|
|
38
|
-
emitter.off("afterLeave", afterLeaveCallback);
|
|
39
|
-
close();
|
|
40
|
-
});
|
|
41
|
-
return (_ctx, _cache) => {
|
|
42
|
-
const _component_magic_modal = _resolveComponent("magic-modal");
|
|
43
|
-
return _openBlock(), _createBlock(_component_magic_modal, _mergeProps({
|
|
44
|
-
id: _unref(instanceId),
|
|
45
|
-
class: "magic-command-modal",
|
|
46
|
-
options: _ctx.options
|
|
47
|
-
}, _ctx.$attrs), {
|
|
48
|
-
default: _withCtx(() => [
|
|
49
|
-
_renderSlot(_ctx.$slots, "default")
|
|
50
|
-
]),
|
|
51
|
-
_: 3
|
|
52
|
-
/* FORWARDED */
|
|
53
|
-
}, 16, ["id", "options"]);
|
|
54
|
-
};
|
|
20
|
+
defineOptions({
|
|
21
|
+
inheritAttrs: false
|
|
22
|
+
});
|
|
23
|
+
defineProps({
|
|
24
|
+
options: {
|
|
25
|
+
type: null,
|
|
26
|
+
required: false
|
|
27
|
+
}
|
|
28
|
+
});
|
|
29
|
+
const instanceId = inject(MagicCommandInstanceId, "");
|
|
30
|
+
const emitter = useMagicEmitter();
|
|
31
|
+
function afterLeaveCallback(payload) {
|
|
32
|
+
if (typeof payload === "string" && payload === instanceId) {
|
|
33
|
+
close();
|
|
55
34
|
}
|
|
35
|
+
}
|
|
36
|
+
const { close, isActive } = useMagicCommand(instanceId);
|
|
37
|
+
const modalApi = useMagicModal(instanceId);
|
|
38
|
+
watch(isActive, (value) => {
|
|
39
|
+
if (value) {
|
|
40
|
+
modalApi.open();
|
|
41
|
+
} else {
|
|
42
|
+
modalApi.close();
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
emitter.on("afterLeave", afterLeaveCallback);
|
|
46
|
+
onBeforeUnmount(() => {
|
|
47
|
+
emitter.off("afterLeave", afterLeaveCallback);
|
|
48
|
+
close();
|
|
56
49
|
});
|
|
57
50
|
</script>
|
|
@@ -1,91 +1,85 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
<template>
|
|
2
|
+
<primitive :data-id="id" :as-child="asChild" class="magic-command-provider">
|
|
3
|
+
<slot />
|
|
4
|
+
</primitive>
|
|
5
|
+
</template>
|
|
6
|
+
|
|
7
|
+
<script setup>
|
|
4
8
|
import { shallowRef, provide, watch, onBeforeUnmount } from "vue";
|
|
5
9
|
import { useMagicKeys, usePointer } from "@vueuse/core";
|
|
6
|
-
import { Primitive } from "@maas/vue-primitive";
|
|
7
10
|
import { createDefu } from "defu";
|
|
8
11
|
import { useCommandState } from "../composables/private/useCommandState";
|
|
9
12
|
import { useMagicCommand } from "../composables/useMagicCommand";
|
|
10
13
|
import { defaultOptions } from "../utils/defaultOptions";
|
|
11
14
|
import { MagicCommandInstanceId, MagicCommandProviderOptions } from "../symbols";
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
asChild: { type: Boolean, required: false },
|
|
17
|
-
options: { type: Object, required: false, default: () => ({}) }
|
|
15
|
+
const { id, options = {} } = defineProps({
|
|
16
|
+
id: {
|
|
17
|
+
type: null,
|
|
18
|
+
required: true
|
|
18
19
|
},
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
20
|
+
asChild: {
|
|
21
|
+
type: Boolean,
|
|
22
|
+
required: false
|
|
23
|
+
},
|
|
24
|
+
options: {
|
|
25
|
+
type: Object,
|
|
26
|
+
required: false
|
|
27
|
+
}
|
|
28
|
+
});
|
|
29
|
+
const customDefu = createDefu((obj, key, value) => {
|
|
30
|
+
if (key === "open" || key === "close" || key === "next" || key === "prev") {
|
|
31
|
+
obj[key] = value;
|
|
32
|
+
return true;
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
const mappedOptions = customDefu(options, defaultOptions);
|
|
36
|
+
const { initializeState, deleteState } = useCommandState(id);
|
|
37
|
+
const state = initializeState(mappedOptions);
|
|
38
|
+
const lastX = shallowRef(0);
|
|
39
|
+
const lastY = shallowRef(0);
|
|
40
|
+
const { x, y } = usePointer();
|
|
41
|
+
watch(
|
|
42
|
+
() => state?.input.type,
|
|
43
|
+
(value) => {
|
|
44
|
+
if (value === "keyboard") {
|
|
45
|
+
lastX.value = x.value;
|
|
46
|
+
lastY.value = y.value;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
);
|
|
50
|
+
watch([x, y], ([x2, y2]) => {
|
|
51
|
+
if (x2 !== lastX.value || y2 !== lastY.value) {
|
|
52
|
+
if (state) {
|
|
53
|
+
state.input.type = "pointer";
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
const keys = useMagicKeys();
|
|
58
|
+
const commandApi = useMagicCommand(id);
|
|
59
|
+
const { open, close } = commandApi;
|
|
60
|
+
if (mappedOptions.keyListener?.open) {
|
|
61
|
+
for (const key of mappedOptions.keyListener.open) {
|
|
62
|
+
watch(keys[key], (value) => {
|
|
63
|
+
if (value) {
|
|
64
|
+
open();
|
|
46
65
|
}
|
|
47
66
|
});
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
open();
|
|
56
|
-
}
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
if (mappedOptions.keyListener?.close) {
|
|
61
|
-
for (const key of mappedOptions.keyListener.close) {
|
|
62
|
-
watch(keys[key], (value) => {
|
|
63
|
-
if (value) {
|
|
64
|
-
close();
|
|
65
|
-
}
|
|
66
|
-
});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (mappedOptions.keyListener?.close) {
|
|
70
|
+
for (const key of mappedOptions.keyListener.close) {
|
|
71
|
+
watch(keys[key], (value) => {
|
|
72
|
+
if (value) {
|
|
73
|
+
close();
|
|
67
74
|
}
|
|
68
|
-
}
|
|
69
|
-
onBeforeUnmount(() => {
|
|
70
|
-
deleteState();
|
|
71
75
|
});
|
|
72
|
-
provide(MagicCommandInstanceId, __props.id);
|
|
73
|
-
provide(MagicCommandProviderOptions, mappedOptions);
|
|
74
|
-
return (_ctx, _cache) => {
|
|
75
|
-
return _openBlock(), _createBlock(_unref(Primitive), {
|
|
76
|
-
"data-id": _ctx.id,
|
|
77
|
-
"as-child": _ctx.asChild,
|
|
78
|
-
class: "magic-command-provider"
|
|
79
|
-
}, {
|
|
80
|
-
default: _withCtx(() => [
|
|
81
|
-
_renderSlot(_ctx.$slots, "default")
|
|
82
|
-
]),
|
|
83
|
-
_: 3
|
|
84
|
-
/* FORWARDED */
|
|
85
|
-
}, 8, ["data-id", "as-child"]);
|
|
86
|
-
};
|
|
87
76
|
}
|
|
77
|
+
}
|
|
78
|
+
onBeforeUnmount(() => {
|
|
79
|
+
deleteState();
|
|
88
80
|
});
|
|
81
|
+
provide(MagicCommandInstanceId, id);
|
|
82
|
+
provide(MagicCommandProviderOptions, mappedOptions);
|
|
89
83
|
</script>
|
|
90
84
|
|
|
91
85
|
<style>
|
|
@@ -1,48 +1,32 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
class: "magic-command-renderer"
|
|
7
|
-
};
|
|
1
|
+
<template>
|
|
2
|
+
<div ref="el" class="magic-command-renderer" />
|
|
3
|
+
</template>
|
|
4
|
+
|
|
5
|
+
<script setup>
|
|
8
6
|
import { inject, onBeforeUnmount, useTemplateRef } from "vue";
|
|
9
7
|
import {
|
|
10
8
|
useMagicEmitter
|
|
11
9
|
} from "@maas/vue-equipment/plugins";
|
|
12
10
|
import { MagicCommandInstanceId } from "./../symbols";
|
|
13
11
|
import { useCommandState } from "../composables/private/useCommandState";
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
function enterCallback(payload) {
|
|
28
|
-
if (typeof payload === "string" && payload === instanceId) {
|
|
29
|
-
state.renderer = elRef.value;
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
emitter.on("enter", enterCallback);
|
|
33
|
-
onBeforeUnmount(() => {
|
|
34
|
-
emitter.off("enter", enterCallback);
|
|
35
|
-
});
|
|
36
|
-
return (_ctx, _cache) => {
|
|
37
|
-
return _openBlock(), _createElementBlock(
|
|
38
|
-
"div",
|
|
39
|
-
_hoisted_1,
|
|
40
|
-
null,
|
|
41
|
-
512
|
|
42
|
-
/* NEED_PATCH */
|
|
43
|
-
);
|
|
44
|
-
};
|
|
12
|
+
const instanceId = inject(MagicCommandInstanceId, "");
|
|
13
|
+
const emitter = useMagicEmitter();
|
|
14
|
+
if (!instanceId) {
|
|
15
|
+
throw new Error(
|
|
16
|
+
"MagicCommandRenderer must be nested inside MagicCommandProvider"
|
|
17
|
+
);
|
|
18
|
+
}
|
|
19
|
+
const elRef = useTemplateRef("el");
|
|
20
|
+
const { initializeState } = useCommandState(instanceId);
|
|
21
|
+
const state = initializeState();
|
|
22
|
+
function enterCallback(payload) {
|
|
23
|
+
if (typeof payload === "string" && payload === instanceId) {
|
|
24
|
+
state.renderer = elRef.value;
|
|
45
25
|
}
|
|
26
|
+
}
|
|
27
|
+
emitter.on("enter", enterCallback);
|
|
28
|
+
onBeforeUnmount(() => {
|
|
29
|
+
emitter.off("enter", enterCallback);
|
|
46
30
|
});
|
|
47
31
|
</script>
|
|
48
32
|
|
|
@@ -1,8 +1,20 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
<template>
|
|
2
|
+
<primitive
|
|
3
|
+
ref="el"
|
|
4
|
+
:data-id="`${mappedViewId}-trigger`"
|
|
5
|
+
:data-active="mappedActive"
|
|
6
|
+
:data-disabled="mappedDisabled"
|
|
7
|
+
:as-child="asChild"
|
|
8
|
+
class="magic-command-trigger"
|
|
9
|
+
@click="onClick"
|
|
10
|
+
@mouseenter="onMouseenter"
|
|
11
|
+
>
|
|
12
|
+
<slot :view-active="view?.active" :trigger-disabled="mappedDisabled" />
|
|
13
|
+
</primitive>
|
|
14
|
+
</template>
|
|
15
|
+
|
|
16
|
+
<script setup>
|
|
4
17
|
import { computed, inject, useTemplateRef, toValue, watch } from "vue";
|
|
5
|
-
import { Primitive } from "@maas/vue-primitive";
|
|
6
18
|
import { useCommandView } from "../composables/private/useCommandView";
|
|
7
19
|
import { useCommandTrigger } from "../composables/private/useCommandTrigger";
|
|
8
20
|
import {
|
|
@@ -13,91 +25,89 @@ import {
|
|
|
13
25
|
MagicCommandProviderOptions
|
|
14
26
|
} from "../symbols";
|
|
15
27
|
import { useMagicKeys } from "@vueuse/core";
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
28
|
+
const {
|
|
29
|
+
viewId,
|
|
30
|
+
active = void 0,
|
|
31
|
+
disabled = void 0,
|
|
32
|
+
action = "open",
|
|
33
|
+
trigger = ["click"]
|
|
34
|
+
} = defineProps({
|
|
35
|
+
viewId: {
|
|
36
|
+
type: String,
|
|
37
|
+
required: false
|
|
25
38
|
},
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
active: {
|
|
40
|
+
type: Boolean,
|
|
41
|
+
required: false
|
|
42
|
+
},
|
|
43
|
+
disabled: {
|
|
44
|
+
type: Boolean,
|
|
45
|
+
required: false
|
|
46
|
+
},
|
|
47
|
+
action: {
|
|
48
|
+
type: String,
|
|
49
|
+
required: false
|
|
50
|
+
},
|
|
51
|
+
trigger: {
|
|
52
|
+
type: Array,
|
|
53
|
+
required: false
|
|
54
|
+
},
|
|
55
|
+
asChild: {
|
|
56
|
+
type: Boolean,
|
|
57
|
+
required: false
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
const elRef = useTemplateRef("el");
|
|
61
|
+
const instanceId = inject(MagicCommandInstanceId, void 0);
|
|
62
|
+
const itemActive = inject(MagicCommandItemActive, void 0);
|
|
63
|
+
const itemDisabled = inject(MagicCommandItemDisabled, void 0);
|
|
64
|
+
const injectedViewId = inject(MagicCommandViewId, void 0);
|
|
65
|
+
const mappedViewId = computed(() => viewId ?? injectedViewId);
|
|
66
|
+
if (!instanceId) {
|
|
67
|
+
throw new Error(
|
|
68
|
+
"MagicCommandTrigger must be nested inside MagicCommandProvider"
|
|
69
|
+
);
|
|
70
|
+
}
|
|
71
|
+
if (!mappedViewId.value) {
|
|
72
|
+
throw new Error(
|
|
73
|
+
"MagicCommandTrigger must be nested inside MagicCommandView or a viewId must be provided"
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
const { getView } = useCommandView(instanceId);
|
|
77
|
+
const view = getView(mappedViewId.value);
|
|
78
|
+
const mappedActive = computed(() => active ?? toValue(itemActive) ?? false);
|
|
79
|
+
const mappedDisabled = computed(
|
|
80
|
+
() => disabled ?? toValue(itemDisabled) ?? false
|
|
81
|
+
);
|
|
82
|
+
const options = inject(MagicCommandProviderOptions, void 0);
|
|
83
|
+
const { onMouseenter, onClick, onEnter } = useCommandTrigger({
|
|
84
|
+
instanceId,
|
|
85
|
+
viewId: mappedViewId.value,
|
|
86
|
+
mappedActive,
|
|
87
|
+
mappedDisabled,
|
|
88
|
+
trigger,
|
|
89
|
+
action,
|
|
90
|
+
elRef
|
|
91
|
+
});
|
|
92
|
+
watch(
|
|
93
|
+
() => view?.active,
|
|
94
|
+
async (value) => {
|
|
95
|
+
if (value) {
|
|
96
|
+
await new Promise((resolve) => requestAnimationFrame(resolve));
|
|
97
|
+
toValue(elRef)?.$el?.blur();
|
|
42
98
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
)
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
instanceId,
|
|
52
|
-
viewId: mappedViewId.value,
|
|
53
|
-
mappedActive,
|
|
54
|
-
mappedDisabled,
|
|
55
|
-
trigger: __props.trigger,
|
|
56
|
-
action: __props.action,
|
|
57
|
-
elRef
|
|
58
|
-
});
|
|
59
|
-
watch(
|
|
60
|
-
() => view?.active,
|
|
61
|
-
async (value) => {
|
|
62
|
-
if (value) {
|
|
63
|
-
await new Promise((resolve) => requestAnimationFrame(resolve));
|
|
64
|
-
toValue(elRef)?.$el?.blur();
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
);
|
|
68
|
-
const keys = useMagicKeys();
|
|
69
|
-
if (options?.keyListener?.enter) {
|
|
70
|
-
for (const key of options.keyListener.enter) {
|
|
71
|
-
watch(keys[key], (value) => {
|
|
72
|
-
if (value) {
|
|
73
|
-
onEnter();
|
|
74
|
-
}
|
|
75
|
-
});
|
|
99
|
+
}
|
|
100
|
+
);
|
|
101
|
+
const keys = useMagicKeys();
|
|
102
|
+
if (options?.keyListener?.enter) {
|
|
103
|
+
for (const key of options.keyListener.enter) {
|
|
104
|
+
watch(keys[key], (value) => {
|
|
105
|
+
if (value) {
|
|
106
|
+
onEnter();
|
|
76
107
|
}
|
|
77
|
-
}
|
|
78
|
-
return (_ctx, _cache) => {
|
|
79
|
-
return _openBlock(), _createBlock(_unref(Primitive), {
|
|
80
|
-
ref: "el",
|
|
81
|
-
"data-id": `${mappedViewId.value}-trigger`,
|
|
82
|
-
"data-active": mappedActive.value,
|
|
83
|
-
"data-disabled": mappedDisabled.value,
|
|
84
|
-
"as-child": _ctx.asChild,
|
|
85
|
-
class: "magic-command-trigger",
|
|
86
|
-
onClick: _unref(onClick),
|
|
87
|
-
onMouseenter: _unref(onMouseenter)
|
|
88
|
-
}, {
|
|
89
|
-
default: _withCtx(() => [
|
|
90
|
-
_renderSlot(_ctx.$slots, "default", {
|
|
91
|
-
viewActive: _unref(view)?.active,
|
|
92
|
-
triggerDisabled: mappedDisabled.value
|
|
93
|
-
})
|
|
94
|
-
]),
|
|
95
|
-
_: 3
|
|
96
|
-
/* FORWARDED */
|
|
97
|
-
}, 8, ["data-id", "data-active", "data-disabled", "as-child", "onClick", "onMouseenter"]);
|
|
98
|
-
};
|
|
108
|
+
});
|
|
99
109
|
}
|
|
100
|
-
}
|
|
110
|
+
}
|
|
101
111
|
</script>
|
|
102
112
|
|
|
103
113
|
<style>
|
|
@@ -9,7 +9,7 @@ interface MagicCommandTriggerProps {
|
|
|
9
9
|
asChild?: boolean;
|
|
10
10
|
}
|
|
11
11
|
declare const mappedViewId: import("vue").ComputedRef<string | undefined>;
|
|
12
|
-
declare const view: import("../types").CommandView | undefined;
|
|
12
|
+
declare const view: import("../types/index.js").CommandView | undefined;
|
|
13
13
|
declare const mappedActive: import("vue").ComputedRef<boolean>;
|
|
14
14
|
declare const mappedDisabled: import("vue").ComputedRef<boolean>;
|
|
15
15
|
declare const onMouseenter: () => Promise<void>, onClick: (e: MouseEvent) => Promise<void>;
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
<template>
|
|
2
|
+
<div :data-id="mappedId" class="magic-menu-view">
|
|
3
|
+
<slot :view-active="view.active" />
|
|
4
|
+
</div>
|
|
5
|
+
</template>
|
|
6
|
+
|
|
7
|
+
<script setup>
|
|
5
8
|
import { computed, inject, onBeforeUnmount, provide, useId, watch } from "vue";
|
|
6
9
|
import { useCommandView } from "../composables/private/useCommandView";
|
|
7
10
|
import {
|
|
@@ -11,50 +14,41 @@ import {
|
|
|
11
14
|
MagicCommandItemId,
|
|
12
15
|
MagicCommandViewActive
|
|
13
16
|
} from "../symbols";
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
initial: { type: Boolean, required: false, default: false }
|
|
17
|
+
const { id, initial = false } = defineProps({
|
|
18
|
+
id: {
|
|
19
|
+
type: String,
|
|
20
|
+
required: false
|
|
19
21
|
},
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const itemId = inject(MagicCommandItemId, void 0);
|
|
24
|
-
if (!instanceId) {
|
|
25
|
-
throw new Error("MagicCommandView must be nested inside MagicCommandProvider");
|
|
26
|
-
}
|
|
27
|
-
const mappedId = computed(() => __props.id ?? `magic-command-view-${useId()}`);
|
|
28
|
-
const mappedParentTree = computed(() => [...parentTree, mappedId.value]);
|
|
29
|
-
const mappedActive = computed(() => view.active);
|
|
30
|
-
const { initializeView, deleteView, sortViewItems } = useCommandView(instanceId);
|
|
31
|
-
const view = initializeView({
|
|
32
|
-
id: mappedId.value,
|
|
33
|
-
parent: { views: parentTree, item: itemId ?? "" },
|
|
34
|
-
initial: __props.initial
|
|
35
|
-
});
|
|
36
|
-
provide(MagicCommandViewId, mappedId.value);
|
|
37
|
-
provide(MagicCommandViewActive, mappedActive);
|
|
38
|
-
provide(MagicCommandParentTree, mappedParentTree.value);
|
|
39
|
-
watch(
|
|
40
|
-
() => view?.items,
|
|
41
|
-
() => {
|
|
42
|
-
sortViewItems(mappedId.value);
|
|
43
|
-
}
|
|
44
|
-
);
|
|
45
|
-
onBeforeUnmount(() => {
|
|
46
|
-
deleteView(mappedId.value);
|
|
47
|
-
});
|
|
48
|
-
return (_ctx, _cache) => {
|
|
49
|
-
return _openBlock(), _createElementBlock("div", {
|
|
50
|
-
"data-id": mappedId.value,
|
|
51
|
-
class: "magic-menu-view"
|
|
52
|
-
}, [
|
|
53
|
-
_renderSlot(_ctx.$slots, "default", {
|
|
54
|
-
viewActive: _unref(view).active
|
|
55
|
-
})
|
|
56
|
-
], 8, _hoisted_1);
|
|
57
|
-
};
|
|
22
|
+
initial: {
|
|
23
|
+
type: Boolean,
|
|
24
|
+
required: false
|
|
58
25
|
}
|
|
59
26
|
});
|
|
27
|
+
const parentTree = inject(MagicCommandParentTree, []);
|
|
28
|
+
const instanceId = inject(MagicCommandInstanceId, void 0);
|
|
29
|
+
const itemId = inject(MagicCommandItemId, void 0);
|
|
30
|
+
if (!instanceId) {
|
|
31
|
+
throw new Error("MagicCommandView must be nested inside MagicCommandProvider");
|
|
32
|
+
}
|
|
33
|
+
const mappedId = computed(() => id ?? `magic-command-view-${useId()}`);
|
|
34
|
+
const mappedParentTree = computed(() => [...parentTree, mappedId.value]);
|
|
35
|
+
const mappedActive = computed(() => view.active);
|
|
36
|
+
const { initializeView, deleteView, sortViewItems } = useCommandView(instanceId);
|
|
37
|
+
const view = initializeView({
|
|
38
|
+
id: mappedId.value,
|
|
39
|
+
parent: { views: parentTree, item: itemId ?? "" },
|
|
40
|
+
initial
|
|
41
|
+
});
|
|
42
|
+
provide(MagicCommandViewId, mappedId.value);
|
|
43
|
+
provide(MagicCommandViewActive, mappedActive);
|
|
44
|
+
provide(MagicCommandParentTree, mappedParentTree.value);
|
|
45
|
+
watch(
|
|
46
|
+
() => view?.items,
|
|
47
|
+
() => {
|
|
48
|
+
sortViewItems(mappedId.value);
|
|
49
|
+
}
|
|
50
|
+
);
|
|
51
|
+
onBeforeUnmount(() => {
|
|
52
|
+
deleteView(mappedId.value);
|
|
53
|
+
});
|
|
60
54
|
</script>
|
|
@@ -3,7 +3,7 @@ interface MagicCommandViewProps {
|
|
|
3
3
|
initial?: boolean;
|
|
4
4
|
}
|
|
5
5
|
declare const mappedId: import("vue").ComputedRef<string>;
|
|
6
|
-
declare const view: import("../types").CommandView;
|
|
6
|
+
declare const view: import("../types/index.js").CommandView;
|
|
7
7
|
declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
|
|
8
8
|
declare var __VLS_1: {
|
|
9
9
|
viewActive: boolean;
|