@blokkli/editor 2.0.0-alpha.52 → 2.0.0-alpha.53

package/dist/runtime/editor/features/workspace/Overlay/index.vue

@@ -0,0 +1,177 @@
+<template>
+  <SearchOverlay
+    v-slot="{ focusedIndex, onMouseEnter }"
+    v-model:text="searchText"
+    :title="$t('workspaceTitle', 'Switch page')"
+    :total-items="displayItems.length"
+    :is-searching
+    :placeholder="$t('workspaceSearchPlaceholder', 'Search pages...')"
+    :item-height="70"
+    :is-loading
+    @select="onSelectByIndex"
+    @close="emit('close')"
+  >
+    <a
+      v-for="(item, i) in displayItems"
+      :key="item.uuid"
+      ref="itemEls"
+      :href="item.url"
+      class="bk-command _bk_flex _bk_items-center _bk_gap-10 _bk_px-15 _bk_w-full _bk_text-left _bk_no-underline _bk_max-w-full _bk_min-w-0 _bk_border _bk_border-transparent"
+      :class="
+  focusedIndex === i ? '_bk_bg-mono-800 _bk_border-mono-100 _bk_text-white' : '_bk_text-mono-300'
+"
+      @mouseenter="onMouseEnter(i)"
+    >
+      <div class="_bk_flex-1 _bk_min-w-0">
+        <div class="_bk_truncate _bk_font-semibold _bk_text-base">
+          {{ item.label }}
+          <span class="_bk_font-normal _bk_text-mono-500">{{ item.id }}</span>
+        </div>
+        <ul class="_bk_flex _bk_gap-5 _bk_mt-3">
+          <li class="bk-workspace-pill _bk_px-0 _bk_text-mono-300">
+            {{ getBundleLabel(item) }}
+          </li>
+          <li
+            v-if="item.lastChanged"
+            class="bk-workspace-pill _bk_bg-yellow-dark/60 _bk_text-yellow-light"
+          >
+            <RelativeTime :timestamp="item.lastChanged" />
+          </li>
+          <li
+            v-if="item.uid && item.uid === ownerId"
+            class="bk-workspace-pill _bk_bg-accent-700/80"
+          >
+            <span>{{ $t("owner", "Owner") }}</span>
+          </li>
+        </ul>
+      </div>
+    </a>
+  </SearchOverlay>
+</template>
+
+<script setup>
+import {
+  ref,
+  computed,
+  useBlokkli,
+  onMounted,
+  onBeforeUnmount,
+  watch
+} from "#imports";
+import { SearchOverlay, RelativeTime } from "#blokkli/editor/components";
+import { AsyncFzf, asyncExtendedMatch } from "fzf";
+const emit = defineEmits(["close"]);
+const { adapter, $t, context, state, cache } = useBlokkli();
+const searchText = ref("");
+const isLoading = ref(true);
+const allItems = ref([]);
+const labelMap = ref(null);
+const fzfResults = ref([]);
+const isSearching = ref(false);
+const ownerId = computed(() => state.owner.value?.id);
+const currentEntityUuid = computed(() => context.value.entityUuid);
+const defaultSorted = computed(() => {
+  return allItems.value.filter((v) => v.uuid !== currentEntityUuid.value).sort((a, b) => {
+    const aHasState = a.lastChanged !== null ? 0 : 1;
+    const bHasState = b.lastChanged !== null ? 0 : 1;
+    if (aHasState !== bHasState) return aHasState - bHasState;
+    const aIsOwner = a.uid && a.uid === ownerId.value ? 0 : 1;
+    const bIsOwner = b.uid && b.uid === ownerId.value ? 0 : 1;
+    if (aIsOwner !== bIsOwner) return aIsOwner - bIsOwner;
+    if (a.lastChanged && b.lastChanged) {
+      return new Date(b.lastChanged).getTime() - new Date(a.lastChanged).getTime();
+    }
+    if (a.lastChanged) return -1;
+    if (b.lastChanged) return 1;
+    return a.label.localeCompare(b.label);
+  });
+});
+const allSortedItems = computed(() => {
+  if (searchText.value.trim()) {
+    return fzfResults.value.filter((v) => v.uuid !== currentEntityUuid.value);
+  }
+  return defaultSorted.value;
+});
+const displayItems = computed(() => allSortedItems.value.slice(0, 50));
+function getBundleLabel(item) {
+  return labelMap.value?.bundles[item.bundle] ?? item.bundle;
+}
+function onSelectByIndex(index) {
+  const item = displayItems.value[index];
+  if (item) {
+    window.location.href = item.url;
+  }
+}
+function getFzf() {
+  return cache.get(
+    "workspace:fzf",
+    () => new AsyncFzf(allItems.value, {
+      selector: (item) => item.context ? item.label + " " + item.context : item.label,
+      match: asyncExtendedMatch
+    })
+  );
+}
+let searchTimeout = null;
+watch(searchText, (newValue) => {
+  if (searchTimeout) {
+    clearTimeout(searchTimeout);
+    searchTimeout = null;
+  }
+  if (!newValue.trim()) {
+    fzfResults.value = [];
+    isSearching.value = false;
+    return;
+  }
+  isSearching.value = true;
+  const query = newValue.trim();
+  searchTimeout = setTimeout(async () => {
+    if (searchText.value.trim() !== query) {
+      isSearching.value = false;
+      return;
+    }
+    try {
+      const results = await getFzf().find(query);
+      if (searchText.value.trim() === query) {
+        fzfResults.value = results.map((r) => r.item);
+      }
+    } finally {
+      if (searchText.value.trim() === query) {
+        isSearching.value = false;
+      }
+    }
+  }, 150);
+});
+onMounted(async () => {
+  try {
+    const result = await cache.getAsync(
+      "workspace:hostEntities",
+      () => adapter.getHostEntities()
+    );
+    allItems.value = result.items;
+    labelMap.value = result.labelMap;
+  } finally {
+    isLoading.value = false;
+  }
+});
+onBeforeUnmount(() => {
+  if (searchTimeout) {
+    clearTimeout(searchTimeout);
+  }
+});
+</script>
+
+<style>
+.bk .bk-workspace-pill {
+    display: flex;
+    align-items: center;
+    gap: 3px;
+    border-radius: 9999px;
+    padding-left: 5px;
+    padding-right: 5px;
+    padding-top: 1px;
+    padding-bottom: 1px;
+    font-size: 12px;
+    line-height: 16px;
+    font-weight: 500
+}
+</style>

package/dist/runtime/editor/features/{assistant → workspace}/Overlay/index.vue.d.ts

@@ -1,9 +1,7 @@
-declare const _default: typeof __VLS_export;
-export default _default;
 declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     close: () => any;
-    submit: (result: import("../types.js").AssistantResultMarkup) => any;
 }, string, import("vue").PublicProps, Readonly<{}> & Readonly<{
     onClose?: (() => any) | undefined;
-    onSubmit?: ((result: import("../types.js").AssistantResultMarkup) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+declare const _default: typeof __VLS_export;
+export default _default;

package/dist/runtime/editor/features/workspace/index.d.vue.ts

@@ -0,0 +1,3 @@
+declare const _default: typeof __VLS_export;
+export default _default;
+declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/editor/features/workspace/index.vue

@@ -0,0 +1,46 @@
+<template>
+  <Teleport :to="ui.mainLayoutElement.value">
+    <div class="bk">
+      <BlokkliTransition name="command-palette">
+        <Overlay v-if="isVisible" @close="isVisible = false" />
+      </BlokkliTransition>
+    </div>
+  </Teleport>
+
+  <PluginToolbarButton
+    id="workspace"
+    :title="$t('workspaceOpen', 'Switch page')"
+    meta
+    key-code="P"
+    no-command
+    region="title"
+    weight="500"
+    icon="bk_mdi_feature_search"
+    class="_bk_relative"
+    @click="isVisible = !isVisible"
+  />
+</template>
+
+<script setup>
+import { useBlokkli, defineBlokkliFeature } from "#imports";
+import { BlokkliTransition } from "#blokkli/editor/components";
+import { PluginToolbarButton } from "#blokkli/editor/plugins";
+import Overlay from "./Overlay/index.vue";
+import { onBlokkliEvent, useDialog } from "#blokkli/editor/composables";
+defineBlokkliFeature({
+  id: "workspace",
+  icon: "bk_mdi_workspaces",
+  label: "Workspace",
+  description: "Allows users to switch between edit states.",
+  requiredAdapterMethods: ["getHostEntities"]
+});
+const { $t, ui } = useBlokkli();
+const isVisible = useDialog("workspace", "center");
+onBlokkliEvent("window:clickAway", () => isVisible.value = false);
+</script>
+
+<script>
+export default {
+  name: "Workspace"
+};
+</script>

package/dist/runtime/editor/features/workspace/index.vue.d.ts

@@ -0,0 +1,3 @@
+declare const _default: typeof __VLS_export;
+export default _default;
+declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/runtime/editor/features/workspace/types.d.ts

@@ -0,0 +1,59 @@
+export type HostEntitySearchResultLabelMap = {
+    label: string;
+    bundles: Record<string, string>;
+};
+export type HostEntitySearchResultItem = {
+    /**
+     * The ID of the host entity.
+     */
+    id: string;
+    /**
+     * The UUID of the host entity.
+     */
+    uuid: string;
+    /**
+     * The entity type of the host entity.
+     */
+    entityType: string;
+    /**
+     * The entity bundle of the host entity.
+     */
+    bundle: string;
+    /**
+     * The label of the host entity.
+     */
+    label: string;
+    /**
+     * The url to start editing.
+     */
+    url: string;
+    /**
+     * If an edit state exists: The time when the edit state was last changed.
+     */
+    lastChanged: string | null;
+    /**
+     * If an edit state exists: The ID of the owner of the edit state.
+     */
+    uid: string | null;
+    /**
+     * Optional additional context used for searching (e.g. SKU, internal ID).
+     *
+     * Not displayed in the UI, but included in the fzf search.
+     */
+    context?: string;
+};
+export type HostEntitySearchResult = {
+    items: HostEntitySearchResultItem[];
+    /**
+     * A map with keys that are entity types.
+     */
+    labelMap: HostEntitySearchResultLabelMap;
+};
+declare module '#blokkli/editor/adapter' {
+    interface BlokkliAdapter<T> {
+        /**
+         * Search for host entities.
+         */
+        getHostEntities?: () => Promise<HostEntitySearchResult>;
+    }
+}

package/dist/runtime/editor/icons/svg/spinner.svg

@@ -1,15 +1,15 @@
   <svg
     aria-hidden="true"
     viewBox="0 0 100 101"
-    fill="none"
     xmlns="http://www.w3.org/2000/svg"
   >
     <path
       d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
       fill="currentColor"
+      style="opacity: 0.3"
     />
     <path
       d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-      fill="currentFill"
+      fill="currentColor"
     />
   </svg>

package/dist/runtime/editor/plugins/ContextMenu/Menu/index.vue

@@ -1,10 +1,21 @@
 <template>
-  <div class="bk bk-context-menu" :style="{ left: x + 'px', top: y + 'px' }">
-    <div ref="rootEl" class="bk-context-menu-inner" :style="innerStyle">
+  <div
+    class="bk bk-context-menu _bk_fixed _bk_z-context-menu _bk_pointer-events-auto"
+    :style="{ left: x + 'px', top: y + 'px' }"
+  >
+    <div
+      ref="rootEl"
+      class="bk-context-menu-inner _bk_absolute _bk_bg-mono-950 _bk_text-mono-100 _bk_shadow-xl-even _bk_border _bk_border-mono-600 _bk_rounded _bk_overflow-hidden _bk_min-w-200"
+      :style="innerStyle"
+    >
       <div v-for="(item, i) in menu" :key="i">
-        <hr v-if="item.type === 'rule'" />
-        <button v-else-if="item.type === 'button'" @click="onClick(i)">
-          <Icon :name="item.icon" />
+        <hr v-if="item.type === 'rule'" class="_bk_border-t-mono-600" />
+        <button
+          v-else-if="item.type === 'button'"
+          class="_bk_p-10 _bk_whitespace-nowrap _bk_text-left _bk_flex _bk_items-center _bk_gap-5 _bk_font-sans _bk_font-semibold _bk_hover:bg-mono-800 _bk_w-full _bk_text-base _bk_text-mono-300 _bk_hover:text-mono-50"
+          @click="onClick(i)"
+        >
+          <Icon :name="item.icon" class="_bk_size-20" />
           <span>{{ item.label }}</span>
         </button>
       </div>
@@ -32,8 +43,11 @@ const emit = defineEmits(["close"]);
 const { ui, selection } = useBlokkli();
 const rootEl = ref(null);
 const innerStyle = computed(() => {
-  const horizontal = props.x - 300 > ui.visibleViewportPadded.value.x + ui.visibleViewportPadded.value.width ? { right: 0 } : { left: 0 };
-  const vertical = props.y + 300 > ui.visibleViewportPadded.value.y + ui.visibleViewportPadded.value.height ? { bottom: 0 } : { top: 0 };
+  const vp = ui.visibleViewportPadded.value;
+  const vpRight = vp.x + vp.width;
+  const vpBottom = vp.y + vp.height;
+  const horizontal = props.x + 300 > vpRight ? { right: 0 } : { left: 0 };
+  const vertical = props.y + 300 > vpBottom ? { bottom: 0 } : { top: 0 };
   return {
     ...horizontal,
     ...vertical

package/dist/runtime/editor/plugins/ContextMenu/index.vue

@@ -32,6 +32,10 @@ const onContextMenu = (e) => {
   if (!props.id || typeof props.id !== "string" || !props.menu.length) {
     return;
   }
+  if (props.id === ui.openContextMenu.value) {
+    ui.openContextMenu.value = "";
+    return;
+  }
   x.value = e.clientX;
   y.value = e.clientY;
   ui.openContextMenu.value = props.id;

package/dist/runtime/editor/plugins/ItemAction/index.d.vue.ts

@@ -59,6 +59,13 @@ type __VLS_Props = {
      * Unlike disabled, this completely hides the button via v-show.
      */
     hidden?: boolean;
+    /**
+     * When true, the disabled reason tooltip is rendered in lime (success)
+     * instead of the default yellow (warning).
+     *
+     * Use this when the disabled state is a positive outcome rather than an error.
+     */
+    disabledReasonSuccess?: boolean;
     /**
      * Optional icon to display in the button.
      */
@@ -70,14 +77,14 @@ type __VLS_Props = {
      */
     tourText?: string;
 };
-declare var __VLS_7: {}, __VLS_21: {
+declare var __VLS_7: {}, __VLS_34: {
     items: any;
     uuids: any;
 };
 type __VLS_Slots = {} & {
     icon?: (props: typeof __VLS_7) => any;
 } & {
-    default?: (props: typeof __VLS_21) => any;
+    default?: (props: typeof __VLS_34) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     click: (items: RenderedFieldListItem[]) => any;

package/dist/runtime/editor/plugins/ItemAction/index.vue

@@ -5,7 +5,7 @@
       v-show="!hidden"
       ref="el"
       :disabled="isDisabled"
-      class="bk-item-action"
+      class="bk-item-action _bk_group/tooltip"
       :class="[
   { 'bk-is-active': active, 'bk-is-last': weight === 'last' },
   $attrs.class
@@ -16,20 +16,24 @@
       <slot name="icon">
         <Icon v-if="icon" :name="icon" class="bk-item-action-icon" />
       </slot>
-      <div class="bk-tooltip">
-        <span>{{ title }}</span>
-        <ShortcutIndicator
-          v-if="keyCode"
-          :meta="meta"
-          :label="title"
-          :key-code="keyCode"
-          group="blocks"
-          @pressed="onClick"
-        />
-        <div v-if="disabledReason" class="bk-item-action-disabled-reason">
-          <span>{{ disabledReason }}</span>
-        </div>
-      </div>
+      <Tooltip :label="title" placement="above-left" class="_bk_min-w-full">
+        <template v-if="keyCode" #shortcut>
+          <ShortcutIndicator
+            :meta="meta"
+            :label="title"
+            :key-code="keyCode"
+            group="blocks"
+            @pressed="onClick"
+          />
+        </template>
+        <template #status>
+          <TooltipStatus
+            v-if="disabledReason"
+            :description="disabledReason"
+            :status="disabledReasonSuccess ? 'success' : 'warning'"
+          />
+        </template>
+      </Tooltip>
     </button>
   </Teleport>
   <slot :items="selection.items.value" :uuids="uuids" />
@@ -37,7 +41,12 @@
 
 <script setup>
 import { computed, ref, useBlokkli } from "#imports";
-import { Icon, ShortcutIndicator } from "#blokkli/editor/components";
+import {
+  Icon,
+  ShortcutIndicator,
+  Tooltip,
+  TooltipStatus
+} from "#blokkli/editor/components";
 import { defineCommands, defineTourItem } from "#blokkli/editor/composables";
 const { selection, state } = useBlokkli();
 const el = ref(null);
@@ -53,6 +62,7 @@ const props = defineProps({
   editOnly: { type: Boolean, required: false },
   weight: { type: [Number, String], required: false },
   hidden: { type: Boolean, required: false },
+  disabledReasonSuccess: { type: Boolean, required: false },
   icon: { type: null, required: false },
   tourText: { type: String, required: false }
 });

package/dist/runtime/editor/plugins/ItemAction/index.vue.d.ts

@@ -59,6 +59,13 @@ type __VLS_Props = {
      * Unlike disabled, this completely hides the button via v-show.
      */
     hidden?: boolean;
+    /**
+     * When true, the disabled reason tooltip is rendered in lime (success)
+     * instead of the default yellow (warning).
+     *
+     * Use this when the disabled state is a positive outcome rather than an error.
+     */
+    disabledReasonSuccess?: boolean;
     /**
      * Optional icon to display in the button.
      */
@@ -70,14 +77,14 @@ type __VLS_Props = {
      */
     tourText?: string;
 };
-declare var __VLS_7: {}, __VLS_21: {
+declare var __VLS_7: {}, __VLS_34: {
     items: any;
     uuids: any;
 };
 type __VLS_Slots = {} & {
     icon?: (props: typeof __VLS_7) => any;
 } & {
-    default?: (props: typeof __VLS_21) => any;
+    default?: (props: typeof __VLS_34) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     click: (items: RenderedFieldListItem[]) => any;

package/dist/runtime/editor/plugins/Sidebar/Detached/index.vue

@@ -2,7 +2,7 @@
   <ViewportBlockingRect
     :id="storageKey"
     ref="root"
-    class="bk-sidebar-detached bk-sidebar-inner"
+    class="bk bk-sidebar-detached bk-sidebar-inner"
     :class="{ 'bk-is-focused': focusedSidebar === id }"
     :style="style"
     tabindex="10"
@@ -10,34 +10,32 @@
     @focus.capture="onFocus"
   >
     <ScrollBoundary>
-      <div class="bk">
-        <div
-          class="bk-sidebar-title"
-          @mousedown.stop="onMouseDown($event, 'move')"
+      <div
+        class="bk-sidebar-title"
+        @mousedown.stop="onMouseDown($event, 'move')"
+      >
+        <div class="bk-sidebar-title-icon">
+          <slot name="icon">
+            <Icon v-if="icon" :name="icon" />
+          </slot>
+        </div>
+        <span>{{ title }}</span>
+        <button
+          @click.prevent.stop.capture="isMinimized = !isMinimized"
+          @mousedown.capture.stop
+        >
+          <Icon :name="isMinimized ? 'window-maximize' : 'window-minimize'" />
+        </button>
+        <button
+          @click.prevent.stop.capture="$emit('attach')"
+          @mousedown.capture.stop
         >
-          <div class="bk-sidebar-title-icon">
-            <slot name="icon">
-              <Icon v-if="icon" :name="icon" />
-            </slot>
-          </div>
-          <span>{{ title }}</span>
-          <button
-            @click.prevent.stop.capture="isMinimized = !isMinimized"
-            @mousedown.capture.stop
-          >
-            <Icon :name="isMinimized ? 'window-maximize' : 'window-minimize'" />
-          </button>
-          <button
-            @click.prevent.stop.capture="$emit('attach')"
-            @mousedown.capture.stop
-          >
-            <Icon
-              :name="
+          <Icon
+            :name="
   region === 'left' ? 'bk_mdi_dock_to_left' : 'bk_mdi_dock_to_right'
 "
-            />
-          </button>
-        </div>
+          />
+        </button>
       </div>
       <div class="bk-sidebar-detached-inner" :style="innerStyle">
         <slot