@blokkli/editor 1.1.0 → 1.1.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "blokkli",
   "configKey": "blokkli",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "compatibility": {
     "nuxt": "^3.12.0"
   },

package/dist/module.mjs

@@ -7,16 +7,20 @@ import MagicString from 'magic-string';
 import { walk } from 'estree-walker-ts';
 import { BK_VISIBLE_LANGUAGES, BK_HIDDEN_GLOBALLY } from '../dist/runtime/helpers/symbols.js';
 
-const version = "1.1.0";
+const version = "1.1.1";
 
 function sortObjectKeys(obj) {
-  const sortedKeys = Object.keys(obj).sort();
-  const sortedObj = {};
-  sortedKeys.forEach((key) => {
-    const value = obj[key];
-    sortedObj[key] = typeof value === "object" && value !== null ? sortObjectKeys(value) : value;
-  });
-  return sortedObj;
+  if (Array.isArray(obj)) {
+    return obj.map(sortObjectKeys);
+  } else if (obj && typeof obj === "object") {
+    const sortedObj = {};
+    const keys = Object.keys(obj).sort();
+    for (const key of keys) {
+      sortedObj[key] = sortObjectKeys(obj[key]);
+    }
+    return sortedObj;
+  }
+  return obj;
 }
 
 function falsy(value) {

package/dist/runtime/components/Edit/DraggableList.vue

@@ -200,18 +200,18 @@ function isMuted(item?: FieldListItem) {
 
 watch(root, function (newRoot) {
   if (newRoot) {
-    dom.updateFieldElement(props.entity.uuid, props.name, newRoot)
+    dom.updateFieldElement(props.entity, props.name, newRoot)
   }
 })
 
 onMounted(() => {
   if (root.value) {
-    dom.registerField(props.entity.uuid, props.name, root.value)
+    dom.registerField(props.entity, props.name, root.value)
   }
 })
 
 onBeforeUnmount(() => {
-  dom.unregisterField(props.entity.uuid, props.name)
+  dom.unregisterField(props.entity, props.name)
 })
 
 defineOptions({

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

@@ -69,7 +69,7 @@ import { getDefaultDefinition } from '#blokkli/definitions'
 import defineCommands from '#blokkli/helpers/composables/defineCommands'
 import onBlokkliEvent from '#blokkli/helpers/composables/onBlokkliEvent'
 import { PluginTourItem } from '#blokkli/plugins'
-import { getFieldKey } from '#blokkli/helpers'
+import { getFieldKey, onlyUnique } from '#blokkli/helpers'
 
 const { settings } = defineBlokkliFeature({
   id: 'block-add-list',
@@ -157,6 +157,31 @@ const getAllowedTypesForSelected = (p: DraggableExistingBlock): string[] => {
   }
 }
 
+// All allowed bundles for which a field is being rendered currently.
+// Some blocks may have nested blocks, however they may not render them via
+// a <BlokkliField>. This would make it so that these nested block bundles
+// show up in the add list, but there is no place where these could be added.
+const bundlesForRenderedFields = computed(() =>
+  dom.registeredFieldTypes.value
+    .flatMap((field) => {
+      return (
+        types.getFieldConfig(
+          field.entityType,
+          field.entityBundle,
+          field.fieldName,
+        )?.allowedBundles || []
+      )
+    })
+    .filter(onlyUnique),
+)
+
+const generallyAvailableBundles = computed(() =>
+  types.generallyAvailableBundles.filter((v) =>
+    // Exclude bundles for which no field is currently being rendered.
+    bundlesForRenderedFields.value.includes(v.id),
+  ),
+)
+
 const selectableBundles = computed(() => {
   if (selection.blocks.value.length) {
     return selection.blocks.value.flatMap((v) => getAllowedTypesForSelected(v))
@@ -174,10 +199,10 @@ const selectableBundles = computed(() => {
     )
   }
 
-  return types.generallyAvailableBundles.map((v) => v.id || '')
+  return generallyAvailableBundles.value.map((v) => v.id || '')
 })
 
-const determineVisibility = (bundle: string, label: string): boolean => {
+function determineVisibility(bundle: string, label: string): boolean {
   if (ui.isMobile.value && !selectableBundles.value.includes(bundle)) {
     return false
   }
@@ -200,7 +225,7 @@ const determineVisibility = (bundle: string, label: string): boolean => {
 }
 
 const sortedList = computed(() => {
-  return [...types.generallyAvailableBundles]
+  return [...generallyAvailableBundles.value]
     .filter((v) => !reservedBundles.includes(v.id))
     .map((v) => {
       const isVisible = determineVisibility(v.id, v.label)

package/dist/runtime/helpers/domProvider.d.ts

@@ -4,6 +4,11 @@ import type { DraggableExistingBlock, BlokkliFieldElement, DraggableItem, Droppa
 import type { UiProvider } from './uiProvider.js';
 import type { BlockBundleWithNested, ValidFieldListTypes } from '#blokkli/generated-types';
 import type { DebugProvider } from './debugProvider.js';
+type RegisteredFieldType = {
+    entityType: string;
+    entityBundle: string;
+    fieldName: string;
+};
 type MeasuredBlockRect = Rectangle & {
     time: number;
 };
@@ -19,9 +24,10 @@ export type DomProvider = {
     findField(entityUuid: string, fieldName: string): BlokkliFieldElement | undefined;
     registerBlock: (uuid: string, instance: ComponentInternalInstance | null | HTMLElement, bundle: string, fieldListType: ValidFieldListTypes, parentBlockBundle?: BlockBundleWithNested) => void;
     unregisterBlock: (uuid: string) => void;
-    registerField: (uuid: string, fieldName: string, instance: HTMLElement) => void;
-    updateFieldElement: (uuid: string, fieldName: string, element: HTMLElement) => void;
-    unregisterField: (uuid: string, fieldName: string) => void;
+    registerField: (entity: EntityContext, fieldName: string, instance: HTMLElement) => void;
+    updateFieldElement: (entity: EntityContext, fieldName: string, element: HTMLElement) => void;
+    unregisterField: (entity: EntityContext, fieldName: string) => void;
+    registeredFieldTypes: ComputedRef<RegisteredFieldType[]>;
     /**
      * Get all droppable entity fields.
      */

package/dist/runtime/helpers/domProvider.js

@@ -141,23 +141,43 @@ export default function(ui, debug) {
   const observer = useDelayedIntersectionObserver(intersectionCallback);
   const registeredBlocks = reactive({});
   const registeredFields = reactive({});
-  const registerField = (uuid, fieldName, element) => {
-    const key = `${uuid}:${fieldName}`;
-    registeredFields[key] = element;
+  const registeredFieldTypes = computed(() => {
+    const fields = Object.values(registeredFields);
+    const found = /* @__PURE__ */ new Set();
+    const uniqueFieldTypes = [];
+    for (let i = 0; i < fields.length; i++) {
+      const field = fields[i];
+      if (field) {
+        const key = `${field.entity.type}:${field.entity.bundle}:${field.fieldName}`;
+        if (!found.has(key)) {
+          uniqueFieldTypes.push({
+            entityType: field.entity.type,
+            entityBundle: field.entity.bundle,
+            fieldName: field.fieldName
+          });
+          found.add(key);
+        }
+      }
+    }
+    return uniqueFieldTypes;
+  });
+  const registerField = (entity, fieldName, element) => {
+    const key = `${entity.uuid}:${fieldName}`;
+    registeredFields[key] = { element, entity, fieldName };
     observer.observe(element);
   };
-  const updateFieldElement = (uuid, fieldName, element) => {
-    const key = `${uuid}:${fieldName}`;
-    const existingElement = registeredFields[key];
+  const updateFieldElement = (entity, fieldName, element) => {
+    const key = `${entity.uuid}:${fieldName}`;
+    const existingElement = registeredFields[key]?.element;
     if (existingElement) {
       observer.unobserve(existingElement);
     }
-    registeredFields[key] = element;
+    registeredFields[key] = { entity, fieldName, element };
     observer.observe(element);
   };
-  const unregisterField = (uuid, fieldName) => {
-    const key = `${uuid}:${fieldName}`;
-    const el = registeredFields[key];
+  const unregisterField = (entity, fieldName) => {
+    const key = `${entity.uuid}:${fieldName}`;
+    const el = registeredFields[key]?.element;
     if (el) {
       observer.unobserve(el);
     }
@@ -380,7 +400,7 @@ export default function(ui, debug) {
         continue;
       }
       fieldRects[key] = ui.getAbsoluteElementRect(
-        field.getBoundingClientRect(),
+        field.element.getBoundingClientRect(),
         scale,
         offset
       );
@@ -464,6 +484,7 @@ export default function(ui, debug) {
     isReady: computed(() => mutationsReady.value && intersectionReady.value),
     init,
     getDragElement,
-    updateVisibleRects
+    updateVisibleRects,
+    registeredFieldTypes
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blokkli/editor",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Interactive page building experience for Nuxt",
   "repository": "blokkli/editor",
   "type": "module",