@blokkli/editor 2.0.0-alpha.15 → 2.0.0-alpha.17

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

@@ -1,185 +1,24 @@
 <template>
-  <PluginSidebar
-    v-if="debug.isEnabled.value"
-    id="debug"
-    title="Debug"
-    icon="bug"
-    weight="200"
-  >
-    <div class="bk bk-debug">
-      <section>
-        <h2>Keyboard</h2>
-        <div class="bk-debug-list">
-          <div>
-            <div>Space</div>
-            <div>{{ keyboard.isPressingSpace.value }}</div>
-          </div>
-          <div>
-            <div>Control</div>
-            <div>{{ keyboard.isPressingControl.value }}</div>
-          </div>
-        </div>
-      </section>
-
-      <section>
-        <h2>Selection</h2>
-        <div class="bk-debug-list">
-          <div>
-            <div>Count</div>
-            <div>{{ selection.uuids.value.length }}</div>
-          </div>
-          <div>
-            <div>isDragging</div>
-            <div>{{ selection.isDragging.value }}</div>
-          </div>
-          <div>
-            <div>isDraggingExisting</div>
-            <div>{{ selection.isDraggingExisting.value }}</div>
-          </div>
-          <div>
-            <div>Is multiselecting</div>
-            <div>{{ selection.isMultiSelecting.value }}</div>
-          </div>
-        </div>
-      </section>
-
-      <section>
-        <h2>Rendering</h2>
-        <div class="bk-debug-list">
-          <div v-for="overlay in debug.overlays.value" :key="overlay.id">
-            <FormToggle
-              :label="overlay.label"
-              :model-value="overlay.active"
-              @update:model-value="debug.toggleOverlay(overlay.id)"
-            />
-          </div>
-          <div>
-            <FormToggle
-              label="Set transforming"
-              :model-value="ui.isTransforming.value"
-              @update:model-value="toggleTransforming"
-            />
-          </div>
-
-          <div>
-            <FormToggle
-              label="Enable WebGL"
-              :model-value="animation.webglEnabled.value"
-              @update:model-value="toggleWebgl"
-            />
-          </div>
-        </div>
-      </section>
-
-      <section>
-        <h2>Icons</h2>
-        <div class="bk-debug-icons">
-          <div v-for="icon in iconItems" :key="icon">
-            <Icon :name="icon" />
-            <p>{{ icon }}</p>
-          </div>
-        </div>
-      </section>
-
-      <section>
-        <h2>Features</h2>
-        <div class="bk-debug-features">
-          <div v-for="feature in featuresList" :key="feature.id">
-            <div>
-              <span
-                class="bk-status-indicator"
-                :class="feature.mounted ? 'bk-is-success' : 'bk-is-danger'"
-              />
-            </div>
-            <div>
-              <h3>{{ feature.label }}</h3>
-              <div>{{ feature.id }}</div>
-              <p>{{ feature.description }}</p>
-            </div>
-          </div>
-        </div>
-      </section>
-    </div>
-  </PluginSidebar>
-
-  <PluginDebugOverlay id="viewport" title="Show viewport overlay">
-    <DebugViewport />
-  </PluginDebugOverlay>
-
-  <PluginDebugOverlay id="rects" title="Show field and block rects">
-    <DebugRects />
-  </PluginDebugOverlay>
+  <Renderer v-if="debug.isEnabled.value" :logger />
 </template>
 
 <script setup>
-import {
-  useBlokkli,
-  onMounted,
-  onBeforeUnmount,
-  defineBlokkliFeature,
-  computed
-} from "#imports";
-import { PluginSidebar, PluginDebugOverlay } from "#blokkli/plugins";
-import { Icon, FormToggle } from "#blokkli/components";
-import { icons } from "#blokkli-build/icons";
 import onBlokkliEvent from "#blokkli/helpers/composables/onBlokkliEvent";
-import DebugViewport from "./Viewport/index.vue";
-import DebugRects from "./Rects/index.vue";
+import { defineBlokkliFeature, useBlokkli } from "#imports";
+import Renderer from "./Renderer.vue";
 const { logger } = defineBlokkliFeature({
   id: "debug",
   label: "Debug",
   icon: "bug",
   description: "Provides debugging functionality."
 });
-const { keyboard, selection, eventBus, features, debug, ui, animation } = useBlokkli();
-const iconItems = computed(() => Object.keys(icons));
-const featuresList = computed(() => {
-  return features.features.value.map((v) => {
-    const feature = features.mountedFeatures.value.find((f) => f.id === v.id);
-    return {
-      id: v.id,
-      label: v.label,
-      description: v.description,
-      dependencies: v.dependencies?.join(", "),
-      mounted: !!feature
-    };
-  });
-});
+const { debug } = useBlokkli();
 onBlokkliEvent("keyPressed", (e) => {
   if (e.code === "=" && e.meta) {
     e.originalEvent.preventDefault();
     debug.toggle();
   }
 });
-const onEvent = (name, data) => {
-  if (!debug.isEnabled.value) {
-    return;
-  }
-  if (name === "animationFrame" || name === "animationFrame:before" || name === "canvas:draw") {
-    return;
-  }
-  logger.log("Event: " + String(name), data);
-};
-function toggleTransforming() {
-  if (ui.isTransforming.value) {
-    ui.setTransform();
-  } else {
-    ui.setTransform("Transform plugin label");
-  }
-}
-function toggleWebgl() {
-  if (animation.webglEnabled.value) {
-    animation.webglEnabled.value = false;
-  } else {
-    animation.webglEnabled.value = true;
-  }
-}
-onMounted(() => {
-  eventBus.on("*", onEvent);
-});
-onBeforeUnmount(() => {
-  eventBus.off("*", onEvent);
-});
 </script>
 
 <script>

package/dist/runtime/components/Edit/Features/DraggingOverlay/DragItems/index.vue

@@ -7,7 +7,7 @@
     <BlokkliTransition name="drag-item">
       <div
         v-show="activeLabel"
-        class="bk-dragging-overlay-label"
+        class="bk bk-dragging-overlay-label"
         :style="{ backgroundColor: currentActiveColor }"
       >
         <Icon name="cursor-move" />

package/dist/runtime/components/Edit/Features/DraggingOverlay/DropTargets/fragment.glsl

@@ -8,6 +8,7 @@ varying vec3 v_color;
 uniform float u_scale;
 uniform float u_dpi;
 uniform vec2 u_resolution;
+uniform float u_active_hover_nesting_level;
 
 float roundedBoxSDF(vec2 CenterPosition, vec2 Size, float Radius) {
   return length(max(abs(CenterPosition) - Size + Radius, 0.0)) - Radius;
@@ -74,7 +75,12 @@ void main() {
       : alphaInner * 0.2;
 
   if (v_is_hover_area >= 1.0) {
-    adjustedAlphaFill *= 0.5;
+    // If nesting level is 0, don't render the fill (border only)
+    if (u_active_hover_nesting_level < 0.5) {
+      adjustedAlphaFill = 0.0;
+    } else {
+      adjustedAlphaFill *= 0.5;
+    }
   }
 
   if (alphaBorder > 0.0) {

package/dist/runtime/components/Edit/Features/DraggingOverlay/DropTargets/index.vue

@@ -14,6 +14,7 @@ import {
   toShaderColor
 } from "#blokkli/helpers";
 import onBlokkliEvent from "#blokkli/helpers/composables/onBlokkliEvent";
+import defineRenderer from "#blokkli/helpers/composables/defineRenderer";
 import { ref, computed, useBlokkli, onBeforeUnmount } from "#imports";
 import {
   setBuffersAndAttributes,
@@ -444,6 +445,7 @@ class DropTargetRectangleBufferCollector extends RectangleBufferCollector {
         false
       );
     }
+    this.processPendingRects();
     const hasChanged = lengthBefore !== this.positions.length;
     if (hasChanged) {
       this.bufferInfo = this.createBufferInfo();
@@ -483,7 +485,9 @@ class DropTargetRectangleBufferCollector extends RectangleBufferCollector {
     return null;
   }
 }
-const collector = new DropTargetRectangleBufferCollector(gl);
+const collector = new DropTargetRectangleBufferCollector(gl, {
+  deferredMode: true
+});
 if (gl) {
   collector.addRectangle(
     {
@@ -541,6 +545,18 @@ const activeHoverRect = computed(() => {
     return [0, 0, 0, 0];
   }
   const outset = activeHoverField.value.field.nestingLevel === 0 ? 0 : 20;
+  if (activeHoverField.value.emptyChild) {
+    const emptyChildId = activeHoverField.value.emptyChild.id;
+    const adjustedRect = collector.rects[emptyChildId];
+    if (adjustedRect) {
+      return [
+        adjustedRect.x - outset,
+        adjustedRect.y - outset,
+        adjustedRect.width + 2 * outset,
+        adjustedRect.height + 2 * outset
+      ];
+    }
+  }
   return [
     activeHoverField.value.x - outset,
     activeHoverField.value.y - outset,
@@ -551,6 +567,9 @@ const activeHoverRect = computed(() => {
 const activeHoverColor = computed(() => {
   return getColorForField(activeHoverField.value);
 });
+const activeHoverFieldNestingLevel = computed(() => {
+  return activeHoverField.value?.field.nestingLevel ?? 0;
+});
 const uniforms = computed(() => {
   const index = active.value?.index;
   return {
@@ -561,7 +580,8 @@ const uniforms = computed(() => {
     u_color_hover_area: toShaderColor(activeHoverColor.value),
     u_color_area: toShaderColor(theme.teal.value.normal),
     u_active_rect_id: index === void 0 ? -1 : index,
-    u_active_hover_rect: activeHoverRect.value
+    u_active_hover_rect: activeHoverRect.value,
+    u_active_hover_nesting_level: activeHoverFieldNestingLevel.value
   };
 });
 const dragBox = ref({
@@ -607,6 +627,8 @@ function setHoveredFieldArea(box, mouse) {
     activeHoverField.value = candidate;
   }
 }
+let bufferInfo = null;
+let bufferChanged = false;
 onBlokkliEvent("canvas:draw", () => {
   const scale = ui.artboardScale.value;
   const offset = { ...ui.artboardOffset.value };
@@ -617,10 +639,9 @@ onBlokkliEvent("canvas:draw", () => {
     height: props.box.height / scale
   };
   const mouseAbsolute = toCanvasSpaceCoordinates(props.mouseX, props.mouseY);
-  if (gl && programInfo) {
-    gl.useProgram(programInfo.program);
-    animation.setSharedUniforms(gl, programInfo);
-  }
+  const result = collector.getBufferInfo();
+  bufferInfo = result.info;
+  bufferChanged = result.hasChanged;
   if (!props.isTouch) {
     if (cursorIsInsideClipped()) {
       const closest = collector.getClosestIntersectingRect(
@@ -632,44 +653,46 @@ onBlokkliEvent("canvas:draw", () => {
       active.value = null;
     }
   }
-  const { info, hasChanged } = collector.getBufferInfo();
-  if (programInfo && gl) {
-    setHoveredFieldArea(dragBox.value, mouseAbsolute);
-    setUniforms(programInfo, uniforms.value);
-    if (info) {
-      if (hasChanged && gl && programInfo) {
-        setBuffersAndAttributes(gl, programInfo, info);
-      }
-      if (gl) {
-        drawBufferInfo(gl, info, gl.TRIANGLES);
+  setHoveredFieldArea(dragBox.value, mouseAbsolute);
+  if (!gl && ctx) {
+    ctx.clearRect(0, 0, canvas.width, canvas.height);
+    const rects = Object.values(collector.rects);
+    for (let i = 0; i < rects.length; i++) {
+      const rect = rects[i];
+      if (active.value?.id === rect.id) {
+        ctx.fillStyle = rect.color;
+      } else {
+        ctx.fillStyle = rect.colorAlpha;
       }
+      ctx.fillRect(
+        (rect.x * scale + offset.x) * animation.dpi.value,
+        (rect.y * scale + offset.y) * animation.dpi.value,
+        rect.width * animation.dpi.value * scale,
+        rect.height * animation.dpi.value * scale
+      );
     }
-    return;
-  }
-  if (!ctx) {
-    return;
-  }
-  ctx.clearRect(0, 0, canvas.width, canvas.height);
-  const rects = Object.values(collector.rects);
-  for (let i = 0; i < rects.length; i++) {
-    const rect = rects[i];
-    if (active.value?.id === rect.id) {
-      ctx.fillStyle = rect.color;
-    } else {
-      ctx.fillStyle = rect.colorAlpha;
-    }
-    ctx.fillRect(
-      (rect.x * scale + offset.x) * animation.dpi.value,
-      (rect.y * scale + offset.y) * animation.dpi.value,
-      rect.width * animation.dpi.value * scale,
-      rect.height * animation.dpi.value * scale
-    );
   }
 });
+if (gl && programInfo) {
+  defineRenderer("drop-targets", {
+    zIndex: 400,
+    only: true,
+    cursor: () => "grabbing",
+    render: () => {
+      gl.useProgram(programInfo.program);
+      animation.setSharedUniforms(gl, programInfo);
+      setUniforms(programInfo, uniforms.value);
+      if (!bufferInfo) {
+        return;
+      }
+      if (bufferChanged) {
+        setBuffersAndAttributes(gl, programInfo, bufferInfo);
+      }
+      drawBufferInfo(gl, bufferInfo, gl.TRIANGLES);
+    }
+  });
+}
 onBeforeUnmount(() => {
-  if (gl) {
-    gl.clear(gl.COLOR_BUFFER_BIT);
-  }
   if (ctx) {
     ctx.clearRect(0, 0, canvas.width, canvas.height);
   }

package/dist/runtime/components/Edit/Features/DraggingOverlay/DropTargets/vertex.glsl

@@ -17,6 +17,7 @@ uniform vec3 u_color_field_3;
 uniform vec3 u_color_area;
 uniform vec3 u_color_hover_area;
 uniform vec4 u_active_hover_rect;
+uniform float u_active_hover_nesting_level;
 uniform float u_dpi;
 
 varying vec4 v_quad;

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

@@ -2,7 +2,7 @@
   <PluginItemAction
     v-if="isEditing"
     id="edit"
-    :title="$t('edit', 'Edit')"
+    :title="$t('edit', 'Edit...')"
     :disabled="!canEdit"
     meta
     key-code="E"

package/dist/runtime/components/Edit/Features/EditableField/Overlay/Frame/index.vue

@@ -4,13 +4,23 @@
       ref="iframe"
       :style="{ height: Math.max(height, 150) + 'px' }"
       :src="url"
+      @load="onIframeLoad"
     />
   </div>
 </template>
 
 <script setup>
-import { useBlokkli, ref, computed, onMounted, onBeforeUnmount } from "#imports";
-const { adapter } = useBlokkli();
+import {
+  useBlokkli,
+  ref,
+  computed,
+  onMounted,
+  onBeforeUnmount,
+  useTemplateRef
+} from "#imports";
+const { adapter, ui } = useBlokkli();
+const PROPAGATE_WHEEL = false;
+const rootElement = ui.rootElement();
 const props = defineProps({
   modelValue: { type: String, required: true },
   type: { type: String, required: true },
@@ -18,6 +28,56 @@ const props = defineProps({
   host: { type: Object, required: true },
   initialHeight: { type: Number, required: true }
 });
+const iframe = useTemplateRef("iframe");
+function onIframeLoad() {
+  if (!iframe.value || !PROPAGATE_WHEEL) {
+    return;
+  }
+  const iframeDoc = iframe.value.contentDocument;
+  if (!iframeDoc) {
+    return;
+  }
+  let ckEditor = null;
+  iframe.value.contentDocument.addEventListener("wheel", (e) => {
+    if (!ckEditor) {
+      const el = iframeDoc.querySelector(".ck-editor__editable");
+      if (el) {
+        ckEditor = el;
+      }
+    }
+    if (!ckEditor) {
+      return;
+    }
+    const scrollTop = ckEditor.scrollTop;
+    const scrollHeight = ckEditor.scrollHeight;
+    const clientHeight = ckEditor.clientHeight;
+    const isScrolledToTop = scrollTop === 0;
+    const isScrolledToBottom = scrollTop + clientHeight >= scrollHeight - 1;
+    const isScrollingDown = e.deltaY > 0;
+    const isScrollingUp = e.deltaY < 0;
+    const shouldPropagate = isScrollingUp && isScrolledToTop || isScrollingDown && isScrolledToBottom;
+    if (!shouldPropagate) {
+      return;
+    }
+    const wheelEvent = new WheelEvent("wheel", {
+      deltaX: e.deltaX,
+      deltaY: e.deltaY,
+      deltaZ: e.deltaZ,
+      deltaMode: e.deltaMode,
+      clientX: e.clientX,
+      clientY: e.clientY,
+      screenX: e.screenX,
+      screenY: e.screenY,
+      bubbles: true,
+      cancelable: true,
+      ctrlKey: e.ctrlKey,
+      shiftKey: e.shiftKey,
+      altKey: e.altKey,
+      metaKey: e.metaKey
+    });
+    rootElement?.dispatchEvent(wheelEvent);
+  });
+}
 const height = ref(props.initialHeight);
 const url = computed(() => {
   if ("itemBundle" in props.host) {
@@ -43,7 +103,7 @@ const onMessage = (e) => {
 };
 onMounted(() => {
   original.value = props.modelValue;
-  height.value = props.initialHeight + 48;
+  height.value = props.initialHeight;
   window.addEventListener("message", onMessage);
 });
 onBeforeUnmount(() => {

package/dist/runtime/components/Edit/Features/EditableField/Overlay/Plaintext/index.vue

@@ -1,11 +1,16 @@
 <template>
-  <div class="bk bk-editable-field-textarea">
+  <div
+    class="bk bk-editable-field-textarea"
+    :style="{
+  height: height + 'px'
+}"
+  >
     <textarea
+      id="bk-editable-field-textarea"
       ref="input"
       :value="modelValue"
       enterkeyhint="done"
       rows="2"
-      :style="inputStyle"
       v-bind="inputAttributes"
       @keydown.stop.capture="onKeyDown"
       @blur="onBlur"
@@ -13,12 +18,12 @@
   $emit('update:modelValue', $event.target.value)
 "
     />
-    <div :style="inputStyle" class="bk-textarea" v-html="modelValue" />
   </div>
 </template>
 
 <script setup>
-import { useBlokkli, computed } from "#imports";
+import onBlokkliEvent from "#blokkli/helpers/composables/onBlokkliEvent";
+import { useBlokkli, computed, useTemplateRef, ref } from "#imports";
 const { ui, selection } = useBlokkli();
 const props = defineProps({
   element: { type: null, required: true },
@@ -27,6 +32,8 @@ const props = defineProps({
   modelValue: { type: String, required: true }
 });
 const emit = defineEmits(["close", "save", "update:modelValue"]);
+const input = useTemplateRef("input");
+const height = ref(20);
 const onKeyDown = (e) => {
   if (e.code === "Escape") {
     e.preventDefault();
@@ -61,10 +68,7 @@ const onBlur = (e) => {
     emit("save");
   }, 100);
 };
-const inputStyle = computed(() => {
-  const computedStyle = window.getComputedStyle(props.element);
-  return {
-    textAlign: computedStyle.textAlign
-  };
+onBlokkliEvent("animationFrame", () => {
+  height.value = Math.max(input.value?.scrollHeight ?? 20, 20);
 });
 </script>