@blokkli/editor 2.0.0-alpha.13 → 2.0.0-alpha.14

package/dist/runtime/components/Edit/Features/Artboard/Renderer.vue

@@ -0,0 +1,296 @@
+<template>
+  <Scrollbar :artboard="artboard" orientation="y" />
+  <PluginToolbarButton
+    id="artboard_reset_zoom"
+    :title="$t('artboardResetZoom', 'Reset zoom')"
+    :shortcut-group="$t('artboard', 'Artboard')"
+    :tour-text="
+  $t(
+    'artboardToolbarButtonTourText',
+    'Shows the current zoom factor. Click on it to reset the zoom back to 100%.'
+  )
+"
+    icon="magnifier"
+    meta
+    key-code="0"
+    region="view-options"
+    weight="100"
+    @click="resetZoom"
+  >
+    <div class="bk-feature-canvas-button">
+      <span>{{ zoomLevel }}</span>
+    </div>
+  </PluginToolbarButton>
+
+  <PluginViewOption
+    id="artboardOverview"
+    v-slot="{ isActive }"
+    :label="$t('artboardOverviewToggle', 'Toggle overview')"
+    :title-on="$t('artboardOverviewShow', 'Show overview')"
+    :title-off="$t('artboardOverviewHide', 'Hide overview')"
+    :tour-text="
+  $t(
+    'artboardOverviewTourText',
+    `Displays a top level overview of your content.`
+  )
+"
+    icon="eye"
+    key-code="O"
+    weight="90"
+  >
+    <Teleport v-if="isActive && dom.isReady.value" to="body">
+      <Overview :artboard="artboard" />
+    </Teleport>
+  </PluginViewOption>
+</template>
+
+<script setup>
+import {
+  watch,
+  computed,
+  useBlokkli,
+  onMounted,
+  onBeforeUnmount
+} from "#imports";
+import {
+  asValidNumber,
+  isInsideRect,
+  subtractRectFromViewport
+} from "#blokkli/helpers";
+import { PluginToolbarButton, PluginViewOption } from "#blokkli/plugins";
+import Overview from "./Overview/index.vue";
+import Scrollbar from "./Scrollbar/index.vue";
+import onBlokkliEvent from "#blokkli/helpers/composables/onBlokkliEvent";
+import {
+  createArtboard,
+  touch,
+  wheel,
+  mouse,
+  dom as domPlugin
+} from "artboard-deluxe";
+import { addElementClasses } from "#blokkli/helpers/addElementClasses";
+const props = defineProps({
+  persist: { type: Boolean, required: true },
+  momentum: { type: Boolean, required: true },
+  scrollSpeed: { type: Number, required: true }
+});
+addElementClasses(document.documentElement, "bk-is-artboard");
+const { context, storage, ui, animation, $t, dom, selection } = useBlokkli();
+const artboardElement = ui.artboardElement();
+const zoomLevel = computed(() => Math.round(ui.artboardScale.value * 100) + "%");
+const PADDING = 50;
+const options = computed(() => {
+  return {
+    maxScale: ui.isMobile.value ? 1 : 3,
+    direction: ui.isMobile.value ? "vertical" : "both",
+    minScale: 0.1,
+    overscrollBounds: {
+      top: ui.visibleViewport.value.y + PADDING,
+      left: ui.visibleViewport.value.x + PADDING,
+      right: ui.viewport.value.width - ui.visibleViewport.value.width - ui.visibleViewport.value.x + PADDING,
+      bottom: PADDING
+    },
+    getBlockingRects: () => {
+      const toolbarRects = subtractRectFromViewport(
+        ui.viewport.value,
+        ui.visibleViewport.value
+      );
+      return [...toolbarRects, ...ui.viewportBlockingRects.value];
+    }
+  };
+});
+watch(options, function(newOptions) {
+  artboard.setOptions(newOptions);
+});
+const storageKey = computed(
+  () => "artboard:" + context.value.entityUuid + (ui.isMobile.value ? "mobile" : "desktop")
+);
+const savedState = storage.use(storageKey, null);
+const saveState = () => {
+  if (!props.persist) {
+    return;
+  }
+  savedState.value = {
+    offset: artboard.getOffset(),
+    scale: artboard.getScale()
+  };
+};
+let pluginWheel = null;
+const wheelOptions = computed(() => {
+  return {
+    useMomentumZoom: props.momentum,
+    useMomentumScroll: props.momentum,
+    interceptWheel: true,
+    scrollSpeed: props.scrollSpeed,
+    wheelZoomFactor: props.scrollSpeed
+  };
+});
+watch(wheelOptions, function(newOptions) {
+  if (pluginWheel) {
+    pluginWheel.options.setAll(newOptions);
+  }
+});
+watch(selection.uuids, function() {
+  if (artboard.getMomentum()) {
+    artboard.cancelAnimation();
+  }
+});
+function getArtboard() {
+  pluginWheel = wheel(wheelOptions.value);
+  return createArtboard(
+    ui.rootElement(),
+    [
+      mouse(),
+      touch(),
+      pluginWheel,
+      domPlugin({
+        element: artboardElement,
+        precision: 1,
+        restoreStyles: true
+      })
+    ],
+    {
+      initTransform: savedState.value && props.persist ? {
+        x: asValidNumber(savedState.value.offset.x, 0),
+        y: asValidNumber(savedState.value.offset.y, 0),
+        scale: asValidNumber(savedState.value?.scale, 1)
+      } : void 0,
+      ...options.value
+    }
+  );
+}
+const artboard = getArtboard();
+watch(options, function(newOptions) {
+  artboard.setOptions(newOptions);
+});
+const AUTOSCROLL_EDGE_ZONE = 130;
+const AUTOSCROLL_SPEED = 12;
+let autoScrollSpeed = 1;
+function edgeStep(distance) {
+  const ratio = distance / AUTOSCROLL_EDGE_ZONE;
+  return Math.pow(ratio, 3) * AUTOSCROLL_SPEED;
+}
+let hasLeftAddList = false;
+onBlokkliEvent("dragging:end", () => {
+  hasLeftAddList = false;
+});
+onBlokkliEvent("animationFrame:before", ({ time, mouseY, mouseX }) => {
+  if (selection.isDragging.value) {
+    if (ui.addListOrientation.value === "horizontal") {
+      if (!hasLeftAddList) {
+        if (isInsideRect(mouseX, mouseY, ui.visibleViewportPadded.value)) {
+          hasLeftAddList = true;
+        } else {
+          return;
+        }
+      }
+    }
+    const viewportHeight = ui.viewport.value.height;
+    const currentOffset = artboard.getOffset();
+    const y = Math.min(Math.max(mouseY, 0), viewportHeight);
+    let dy = 0;
+    if (y < AUTOSCROLL_EDGE_ZONE) {
+      const dist = AUTOSCROLL_EDGE_ZONE - y;
+      dy = edgeStep(dist);
+    } else if (y > viewportHeight - AUTOSCROLL_EDGE_ZONE) {
+      const dist = y - (viewportHeight - AUTOSCROLL_EDGE_ZONE);
+      dy = -edgeStep(dist);
+    } else {
+      autoScrollSpeed = 1;
+    }
+    if (dy !== 0) {
+      artboard.setOffset(null, currentOffset.y + dy * autoScrollSpeed);
+      autoScrollSpeed = Math.min(autoScrollSpeed * 1.01, 2.25);
+    }
+  } else {
+    autoScrollSpeed = 1;
+  }
+  artboard.loop(time);
+  const artboardSize = artboard.getArtboardSize();
+  if (artboardSize) {
+    ui.artboardSize.value.height = artboardSize.height;
+    ui.artboardSize.value.width = artboardSize.width;
+  }
+  const offset = artboard.getOffset();
+  ui.artboardOffset.value.x = asValidNumber(Math.ceil(offset.x), 0);
+  ui.artboardOffset.value.y = asValidNumber(Math.ceil(offset.y), 0);
+  ui.artboardScale.value = asValidNumber(artboard.getScale(), 1);
+  animation.requestDraw();
+});
+onMounted(() => {
+  window.addEventListener("beforeunload", saveState);
+});
+onBeforeUnmount(() => {
+  saveState();
+  artboard.destroy();
+  window.removeEventListener("beforeunload", saveState);
+});
+const resetZoom = () => {
+  artboard.resetZoom({
+    duration: 500
+  });
+  animation.requestDraw();
+};
+onBlokkliEvent("keyPressed", (e) => {
+  if (e.code === "Home") {
+    e.originalEvent.preventDefault();
+    artboard.scrollToTop();
+    animation.requestDraw();
+  } else if (e.code === "End") {
+    e.originalEvent.preventDefault();
+    artboard.scrollToEnd();
+    animation.requestDraw();
+  } else if (e.code === "PageUp") {
+    e.originalEvent.preventDefault();
+    artboard.scrollPageUp();
+    animation.requestDraw();
+  } else if (e.code === "PageDown") {
+    e.originalEvent.preventDefault();
+    artboard.scrollPageDown();
+    animation.requestDraw();
+  } else if (e.code === "ArrowUp") {
+    e.originalEvent.preventDefault();
+    artboard.scrollUp();
+    animation.requestDraw();
+  } else if (e.code === "ArrowDown") {
+    e.originalEvent.preventDefault();
+    artboard.scrollDown();
+    animation.requestDraw();
+  } else if (e.code === "0" && e.meta) {
+    e.originalEvent.preventDefault();
+    resetZoom();
+  } else if (e.code === "1" && e.meta) {
+    e.originalEvent.preventDefault();
+    artboard.scaleToFit();
+    animation.requestDraw();
+  }
+});
+onBlokkliEvent("scrollIntoView", (e) => {
+  if ("uuid" in e) {
+    const rect = dom.getBlockRect(e.uuid);
+    if (!rect) {
+      return;
+    }
+    if (dom.isBlockVisible(e.uuid)) {
+      return;
+    }
+    artboard.scrollIntoView(rect, {
+      scale: "none",
+      axis: "y",
+      behavior: e.immediate ? "instant" : "auto"
+    });
+  } else {
+    if (artboardElement.contains(e.element)) {
+      artboard.scrollElementIntoView(e.element, {
+        scale: "none",
+        axis: "y",
+        behavior: e.immediate ? "instant" : "auto"
+      });
+    } else {
+      artboard.scrollToTop({
+        duration: 0
+      });
+    }
+  }
+});
+</script>

package/dist/runtime/components/Edit/Features/Artboard/Renderer.vue.d.ts

@@ -0,0 +1,7 @@
+type __VLS_Props = {
+    persist: boolean;
+    momentum: boolean;
+    scrollSpeed: number;
+};
+declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+export default _default;

package/dist/runtime/components/Edit/Features/Artboard/index.vue

@@ -1,72 +1,16 @@
 <template>
-  <PluginToolbarButton
-    id="artboard_reset_zoom"
-    :title="$t('artboardResetZoom', 'Reset zoom')"
-    :shortcut-group="$t('artboard', 'Artboard')"
-    :tour-text="
-  $t(
-    'artboardToolbarButtonTourText',
-    'Shows the current zoom factor. Click on it to reset the zoom back to 100%.'
-  )
-"
-    icon="magnifier"
-    meta
-    key-code="0"
-    region="view-options"
-    weight="100"
-    @click="resetZoom"
-  >
-    <div class="bk-feature-canvas-button">
-      <span>{{ zoomLevel }}</span>
-    </div>
-  </PluginToolbarButton>
-
-  <PluginViewOption
-    id="artboardOverview"
-    v-slot="{ isActive }"
-    :label="$t('artboardOverviewToggle', 'Toggle overview')"
-    :title-on="$t('artboardOverviewShow', 'Show overview')"
-    :title-off="$t('artboardOverviewHide', 'Hide overview')"
-    :tour-text="
-  $t(
-    'artboardOverviewTourText',
-    `Displays a top level overview of your content.`
-  )
-"
-    icon="eye"
-    key-code="O"
-    weight="90"
-  >
-    <Teleport v-if="isActive" to="body">
-      <Overview :artboard="artboard" />
-    </Teleport>
-  </PluginViewOption>
-
-  <Scrollbar :artboard="artboard" orientation="y" />
+  <Renderer
+    v-if="renderArtboard"
+    :persist="settings.persist"
+    :momentum="settings.momentum"
+    :scroll-speed="settings.scrollSpeed"
+  />
 </template>
 
 <script setup>
-import {
-  watch,
-  computed,
-  useBlokkli,
-  onMounted,
-  onBeforeUnmount,
-  defineBlokkliFeature
-} from "#imports";
-import { PluginToolbarButton, PluginViewOption } from "#blokkli/plugins";
-import { asValidNumber } from "#blokkli/helpers";
-import Overview from "./Overview/index.vue";
-import Scrollbar from "./Scrollbar/index.vue";
-import onBlokkliEvent from "#blokkli/helpers/composables/onBlokkliEvent";
+import { computed, useBlokkli, defineBlokkliFeature } from "#imports";
 import defineShortcut from "#blokkli/helpers/composables/defineShortcut";
-import {
-  createArtboard,
-  touch,
-  wheel,
-  mouse,
-  dom as domPlugin
-} from "artboard-deluxe";
+import Renderer from "./Renderer.vue";
 const { settings } = defineBlokkliFeature({
   id: "artboard",
   label: "Artboard",
@@ -102,173 +46,8 @@ const { settings } = defineBlokkliFeature({
   },
   screenshot: "feature-artboard.jpg"
 });
-const { context, storage, ui, animation, $t, dom, selection } = useBlokkli();
-const zoomLevel = computed(() => Math.round(ui.artboardScale.value * 100) + "%");
-const PADDING = 50;
-const options = computed(() => {
-  return {
-    maxScale: ui.isMobile.value ? 1 : 3,
-    direction: ui.isMobile.value ? "vertical" : "both",
-    minScale: 0.1,
-    overscrollBounds: {
-      top: ui.visibleViewport.value.y + PADDING,
-      left: ui.visibleViewport.value.x + PADDING,
-      right: ui.viewport.value.width - ui.visibleViewport.value.width - ui.visibleViewport.value.x + PADDING,
-      bottom: PADDING
-    }
-  };
-});
-watch(options, function(newOptions) {
-  artboard.setOptions(newOptions);
-});
-const storageKey = computed(() => "artboard:" + context.value.entityUuid);
-const savedState = storage.use(storageKey, null);
-const saveState = () => {
-  if (!settings.value.persist) {
-    return;
-  }
-  savedState.value = {
-    offset: artboard.getOffset(),
-    scale: artboard.getScale()
-  };
-};
-let pluginWheel = null;
-const wheelOptions = computed(() => {
-  return {
-    useMomentumZoom: settings.value.momentum,
-    useMomentumScroll: settings.value.momentum,
-    interceptWheel: true,
-    scrollSpeed: settings.value.scrollSpeed,
-    wheelZoomFactor: settings.value.scrollSpeed
-  };
-});
-watch(wheelOptions, function(newOptions) {
-  if (pluginWheel) {
-    pluginWheel.options.setAll(newOptions);
-  }
-});
-watch(selection.uuids, function() {
-  if (artboard.getMomentum()) {
-    artboard.cancelAnimation();
-  }
-});
-function getArtboard() {
-  pluginWheel = wheel(wheelOptions.value);
-  return createArtboard(
-    ui.rootElement(),
-    [
-      mouse(),
-      touch(),
-      pluginWheel,
-      domPlugin({
-        element: ui.artboardElement(),
-        precision: 1,
-        restoreStyles: true
-      })
-    ],
-    {
-      initTransform: savedState.value && settings.value.persist ? {
-        x: asValidNumber(savedState.value.offset.x, 0),
-        y: asValidNumber(savedState.value.offset.y, 0),
-        scale: asValidNumber(savedState.value?.scale, 1)
-      } : void 0,
-      ...options.value
-    }
-  );
-}
-const artboard = getArtboard();
-watch(options, function(newOptions) {
-  artboard.setOptions(newOptions);
-});
-const AUTOSCROLL_EDGE_ZONE = 130;
-const AUTOSCROLL_SPEED = 12;
-let autoScrollSpeed = 1;
-function edgeStep(distance) {
-  const ratio = distance / AUTOSCROLL_EDGE_ZONE;
-  return Math.pow(ratio, 3) * AUTOSCROLL_SPEED;
-}
-onBlokkliEvent("animationFrame:before", ({ time, mouseY }) => {
-  if (selection.isDragging.value) {
-    const viewportHeight = ui.viewport.value.height;
-    const currentOffset = artboard.getOffset();
-    const y = Math.min(Math.max(mouseY, 0), viewportHeight);
-    let dy = 0;
-    if (y < AUTOSCROLL_EDGE_ZONE) {
-      const dist = AUTOSCROLL_EDGE_ZONE - y;
-      dy = edgeStep(dist);
-    } else if (y > viewportHeight - AUTOSCROLL_EDGE_ZONE) {
-      const dist = y - (viewportHeight - AUTOSCROLL_EDGE_ZONE);
-      dy = -edgeStep(dist);
-    } else {
-      autoScrollSpeed = 1;
-    }
-    if (dy !== 0) {
-      artboard.setOffset(null, currentOffset.y + dy * autoScrollSpeed);
-      autoScrollSpeed = Math.min(autoScrollSpeed * 1.01, 2.25);
-    }
-  } else {
-    autoScrollSpeed = 1;
-  }
-  artboard.loop(time);
-  const artboardSize = artboard.getArtboardSize();
-  if (artboardSize) {
-    ui.artboardSize.value.height = artboardSize.height;
-    ui.artboardSize.value.width = artboardSize.width;
-  }
-  const offset = artboard.getOffset();
-  ui.artboardOffset.value.x = asValidNumber(Math.ceil(offset.x), 0);
-  ui.artboardOffset.value.y = asValidNumber(Math.ceil(offset.y), 0);
-  ui.artboardScale.value = asValidNumber(artboard.getScale(), 1);
-  animation.requestDraw();
-});
-onMounted(() => {
-  window.addEventListener("beforeunload", saveState);
-});
-onBeforeUnmount(() => {
-  saveState();
-  artboard.destroy();
-  window.removeEventListener("beforeunload", saveState);
-});
-const resetZoom = () => {
-  artboard.resetZoom({
-    duration: 500
-  });
-  animation.requestDraw();
-};
-onBlokkliEvent("keyPressed", (e) => {
-  if (e.code === "Home") {
-    e.originalEvent.preventDefault();
-    artboard.scrollToTop();
-    animation.requestDraw();
-  } else if (e.code === "End") {
-    e.originalEvent.preventDefault();
-    artboard.scrollToEnd();
-    animation.requestDraw();
-  } else if (e.code === "PageUp") {
-    e.originalEvent.preventDefault();
-    artboard.scrollPageUp();
-    animation.requestDraw();
-  } else if (e.code === "PageDown") {
-    e.originalEvent.preventDefault();
-    artboard.scrollPageDown();
-    animation.requestDraw();
-  } else if (e.code === "ArrowUp") {
-    e.originalEvent.preventDefault();
-    artboard.scrollUp();
-    animation.requestDraw();
-  } else if (e.code === "ArrowDown") {
-    e.originalEvent.preventDefault();
-    artboard.scrollDown();
-    animation.requestDraw();
-  } else if (e.code === "0" && e.meta) {
-    e.originalEvent.preventDefault();
-    resetZoom();
-  } else if (e.code === "1" && e.meta) {
-    e.originalEvent.preventDefault();
-    artboard.scaleToFit();
-    animation.requestDraw();
-  }
-});
+const { ui, $t } = useBlokkli();
+const renderArtboard = computed(() => !ui.isAnalyzing.value);
 defineShortcut(
   [
     {
@@ -304,20 +83,6 @@ defineShortcut(
     return { ...v, group: $t("artboard", "Artboard") };
   })
 );
-onBlokkliEvent("scrollIntoView", (e) => {
-  const rect = dom.getBlockRect(e.uuid);
-  if (!rect) {
-    return;
-  }
-  if (dom.isBlockVisible(e.uuid)) {
-    return;
-  }
-  artboard.scrollIntoView(rect, {
-    scale: "none",
-    axis: "y",
-    behavior: e.immediate ? "instant" : "auto"
-  });
-});
 </script>
 
 <script>

package/dist/runtime/components/Edit/Features/Assistant/index.vue

@@ -1,8 +1,8 @@
 <template>
   <Teleport to="body">
-    <transition name="bk-slide-in" :duration="200">
+    <BlokkliTransition name="slide-in">
       <Overlay v-if="placedAction" @close="onClose" @submit="onSubmit" />
-    </transition>
+    </BlokkliTransition>
   </Teleport>
 
   <PluginAddAction
@@ -20,6 +20,7 @@
 <script setup>
 import { useBlokkli, defineBlokkliFeature, ref } from "#imports";
 import { PluginAddAction } from "#blokkli/plugins";
+import { BlokkliTransition } from "#blokkli/components";
 import Overlay from "./Overlay/index.vue";
 const { adapter } = defineBlokkliFeature({
   id: "assistant",

package/dist/runtime/components/Edit/Features/BlockAddList/index.vue

@@ -60,6 +60,7 @@ import {
 import { AddListItem } from "#blokkli/components";
 import defineCommands from "#blokkli/helpers/composables/defineCommands";
 import onBlokkliEvent from "#blokkli/helpers/composables/onBlokkliEvent";
+import { isInternalBundle } from "#blokkli/helpers/bundles";
 import { PluginTourItem } from "#blokkli/plugins";
 import { getFieldKey, onlyUnique } from "#blokkli/helpers";
 const { settings } = defineBlokkliFeature({
@@ -79,7 +80,6 @@ const { settings } = defineBlokkliFeature({
     }
   }
 });
-const reservedBundles = ["from_library", "blokkli_fragment"];
 const {
   selection,
   storage,
@@ -174,7 +174,7 @@ function determineVisibility(bundle, label) {
   return true;
 }
 const sortedList = computed(() => {
-  return [...generallyAvailableBundles.value].filter((v) => !reservedBundles.includes(v.id)).map((v) => {
+  return [...generallyAvailableBundles.value].filter((v) => !isInternalBundle(v.id)).map((v) => {
     const isVisible = determineVisibility(v.id, v.label);
     const isDisabled = !v.id || !selectableBundles.value.includes(v.id);
     return {
@@ -208,7 +208,7 @@ const getBundlesForAppendCommands = () => {
         return [];
       }
     }
-    return field.allowedBundles.filter((v) => !reservedBundles.includes(v));
+    return field.allowedBundles.filter((v) => !isInternalBundle(v));
   }
   return [];
 };
@@ -227,7 +227,7 @@ const getAppendEndCommands = () => {
         return [];
       }
     }
-    return field.allowedBundles.filter((v) => !reservedBundles.includes(v)).map((bundle) => {
+    return field.allowedBundles.filter((v) => !isInternalBundle(v)).map((bundle) => {
       const definition = types.getBlockBundleDefinition(bundle);
       return {
         id: "block_add_list:append_end:" + bundle + field.name,