@blokkli/editor 2.0.0-alpha.1 → 2.0.0-alpha.11

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "blokkli",
   "configKey": "blokkli",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.11",
   "compatibility": {
     "nuxt": "^3.15.0"
   },

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { resolveFiles, createResolver, addComponent, addImports, addTemplate, addTypeTemplate, resolveAlias, defineNuxtModule, addPlugin, addBuildPlugin } from '@nuxt/kit';
+import { resolveAlias, resolveFiles, createResolver, addComponent, addImports, addTemplate, addTypeTemplate, defineNuxtModule, addPlugin, addBuildPlugin } from '@nuxt/kit';
 import { createUnplugin } from 'unplugin';
 import MagicString from 'magic-string';
 import { walk } from 'estree-walker-ts';
@@ -13,7 +13,7 @@ import { BK_VISIBLE_LANGUAGES, BK_HIDDEN_GLOBALLY } from '../dist/runtime/helper
 import fs from 'node:fs';
 import { defu, createDefu } from 'defu';
 
-const version = "2.0.0-alpha.1";
+const version = "2.0.0-alpha.11";
 
 function sortObjectKeys(obj) {
   if (Array.isArray(obj)) {
@@ -275,8 +275,10 @@ class BlockCollector extends Collector {
     this.patterns = (helper.options.pattern || []).map((pattern) => {
       if (pattern.startsWith("/")) {
         return pattern;
+      } else if (pattern.startsWith(".")) {
+        return helper.resolvers.src.resolve(pattern);
       }
-      return helper.resolvers.src.resolve(pattern);
+      return resolveAlias(pattern);
     });
   }
   async init() {
@@ -566,7 +568,7 @@ class ModuleHelper {
     this.paths = {
       blokkliBuildDir: this.resolvers.build.resolve("blokkli"),
       srcDir: nuxt.options.srcDir,
-      editAdapter: this.findEditAdapterPath()
+      editAdapter: ""
     };
     this.relativePaths = {
       TYPES: relative(
@@ -615,6 +617,7 @@ class ModuleHelper {
       fieldListTypes: fieldListTypes.filter(onlyUnique),
       chunkNames: chunkNames.filter(onlyUnique)
     };
+    this.paths.editAdapter = this.findEditAdapterPath();
   }
   relativePaths;
   paths;
@@ -6342,6 +6345,9 @@ declare const adapter: BlokkliAdapterFactory<any>
 
 export default adapter
 `;
+  },
+  {
+    write: true
   }
 );
 
@@ -6350,7 +6356,7 @@ const styles = defineFileTemplate("styles.css", (ctx) => {
     "./runtime/css/output.css"
   );
   return `
-@import url("${relative(ctx.helper.paths.blokkliBuildDir, cssFilePath)}");
+@import url("${cssFilePath}");
 
 ${ctx.theme.css}
 `;
@@ -7387,6 +7393,7 @@ const runtimeOptions = defineCodeTemplate(
     }).filter(falsy);
     const declarations = [];
     const OPTIONS = /* @__PURE__ */ new Map();
+    const FIELD_MAPPING = /* @__PURE__ */ new Map();
     for (const item of items) {
       const optionDefinitions = Object.entries(item.definition.options || {});
       const options = {};
@@ -7411,11 +7418,20 @@ const runtimeOptions = defineCodeTemplate(
           OPTIONS.set(variation, item.varName);
         }
       });
+      if (isBlock(item.definition)) {
+        if (item.definition.propsFieldMapping) {
+          FIELD_MAPPING.set(
+            item.definition.bundle,
+            JSON.stringify(item.definition.propsFieldMapping, null, 2)
+          );
+        }
+      }
     }
     return `
 ${declarations.join("\n")}
 
 ${toObject("OPTIONS", OPTIONS)}
+${toObject("FIELD_MAPPING", FIELD_MAPPING)}
 `;
   },
   (ctx) => {
@@ -7477,6 +7493,7 @@ ${runtimeMappedOptionTypes}
 }
 
 export declare const OPTIONS: Record<string, Record<string, RuntimeBlockOptionArray>>
+export declare const FIELD_MAPPING: Record<string, Record<string, string>>
 `;
   },
   {
@@ -7617,7 +7634,7 @@ ${lines.join("\n  ")}
       const imports = items.map((v) => {
         return `${v.typeName} as Bundle_${v.bundle}_Props`;
       }).join(", ");
-      const importPath = relative(ctx.helper.paths.blokkliBuildDir, from);
+      const importPath = from.startsWith("/") ? relative(ctx.helper.paths.blokkliBuildDir, from) : from;
       return `import type { ${imports} } from '${importPath}'`;
     }).join("\n");
     const BundleProps = Object.entries(propTypes).map(([key, type]) => {
@@ -8056,7 +8073,6 @@ const module = defineNuxtModule({
     }
   },
   defaults: {
-    pattern: ["components/Blokkli/**/*.vue"],
     globalOptions: {
       [BK_VISIBLE_LANGUAGES]: {
         type: "checkboxes",
@@ -8070,8 +8086,7 @@ const module = defineNuxtModule({
         default: false
       }
     },
-    chunkNames: ["global"],
-    itemEntityType: "block"
+    chunkNames: ["global"]
   },
   async setup(moduleOptions, nuxt) {
     const blokkliModules = moduleOptions.modules || [];
@@ -8134,6 +8149,7 @@ const module = defineNuxtModule({
     helper.addComposable("defineBlokkliFragment");
     helper.addComposable("defineBlokkliFeature");
     helper.addComposable("useBlokkli");
+    helper.addComposable("useBlokkliHelper");
     helper.addAlias("#blokkli-build", helper.paths.blokkliBuildDir);
     helper.addAlias("#blokkli/types", resolver.resolve("runtime/types"));
     helper.addAlias("#blokkli/constants", resolver.resolve("runtime/constants"));

package/dist/modules/drupal/graphql/base/fragment.blokkliProps.graphql

@@ -0,0 +1,8 @@
+fragment blokkliProps on ParagraphsBlokkliProps {
+  entityUuid
+  entityType
+  entityBundle
+  canEdit
+  editLabel
+  language
+}

package/dist/modules/drupal/graphql/base/fragment.paragraphsFieldItem.graphql

@@ -0,0 +1,6 @@
+fragment paragraphsFieldItem on Paragraph {
+  uuid
+  bundle: entityBundle
+  isNew
+  options: paragraphsBlokkliOptions
+}

package/dist/modules/drupal/index.mjs

@@ -1,4 +1,5 @@
 import { useLogger, createResolver } from '@nuxt/kit';
+import { fileURLToPath } from 'node:url';
 import { join } from 'pathe';
 import { isObjectType, isInterfaceType } from 'graphql';
 import { useGraphqlModuleContext } from 'nuxt-graphql-middleware/utils';
@@ -14,6 +15,12 @@ function defineBlokkliModule(init) {
 
 const logger = useLogger("@blokkli/editor");
 
+function toPascalCase(text) {
+  return text.replace(/(^\w|_\w)/g, clearAndUpper);
+}
+function clearAndUpper(text) {
+  return text.replace(/_/, "").toUpperCase();
+}
 const index = defineBlokkliModule({
   alterOptions(options) {
     if (!options.itemEntityType) {
@@ -23,10 +30,20 @@ const index = defineBlokkliModule({
       options.pattern = ["~/components/Paragraph/**/*.vue"];
     }
     if (!options.editAdapterPath) {
-      const resolver = createResolver(join(import.meta.url));
-      const filePath = resolver.resolve("./adapter/index.mjs");
+      const resolver = createResolver(
+        fileURLToPath(new URL("./", import.meta.url))
+      );
+      const filePath = resolver.resolve("./runtime/adapter/index.js");
       options.editAdapterPath = filePath;
     }
+    if (!options.getBundlePropsType) {
+      options.getBundlePropsType = function(bundle) {
+        return {
+          typeName: `Paragraph${toPascalCase(bundle)}Fragment`,
+          from: "#graphql-operations"
+        };
+      };
+    }
   },
   setup({ context }) {
     if (!useGraphqlModuleContext({ nullOnMissing: true })) {
@@ -36,6 +53,11 @@ const index = defineBlokkliModule({
       throw new Error("Failed to initialise bl\xF6kkli Drupal module.");
     }
     const graphql = useGraphqlModuleContext();
+    const blokkliModuleResolver = createResolver(
+      fileURLToPath(new URL("./", import.meta.url))
+    );
+    const filePath = blokkliModuleResolver.resolve("./runtime");
+    context.helper.addAlias("#blokkli/drupal", filePath);
     function getTypeFields(typeName) {
       const type = graphql.schemaGetType(typeName);
       if (isObjectType(type) || isInterfaceType(type)) {
@@ -47,10 +69,12 @@ const index = defineBlokkliModule({
     const queryFields = getTypeFields("Query");
     const editStateFields = getTypeFields("ParagraphsBlokkliEditState");
     const editMutationStateFields = getTypeFields("ParagraphsEditMutationState");
-    const resolver = createResolver(join(import.meta.url, "graphql"));
+    const resolver = createResolver(
+      join(fileURLToPath(new URL("./", import.meta.url)), "graphql")
+    );
     function addGraphqlDocument(fileName) {
-      const filePath = resolver.resolve(fileName);
-      graphql.addImportFile(filePath);
+      const filePath2 = resolver.resolve(fileName);
+      graphql.addImportFile(filePath2);
     }
     function addMutation(mutationName, feature) {
       if (editMutationStateFields.has(mutationName)) {
@@ -65,6 +89,8 @@ const index = defineBlokkliModule({
       "fragment.paragraphsBlokkliMutationItem.graphql",
       "fragment.paragraphsBlokkliMutationResult.graphql",
       "fragment.paragraphsBlokkliViolation.graphql",
+      "fragment.blokkliProps.graphql",
+      "fragment.paragraphsFieldItem.graphql",
       "query.pbConfig.graphql",
       "query.pbEditState.graphql"
     ];
@@ -141,9 +167,9 @@ const index = defineBlokkliModule({
       context.features.disableFeature("preview-grant");
     }
     if (editStateFields.has("publishOptions") && queryFields.has("pbSearchEditStates")) {
-      addGraphqlDocument("publishNew.graphql");
+      addGraphqlDocument("features/publishNew.graphql");
     } else {
-      addGraphqlDocument("publish.graphql");
+      addGraphqlDocument("features/publish.graphql");
     }
   }
 });

package/dist/modules/drupal/runtime/adapter/index.d.ts

@@ -0,0 +1,3 @@
+import type { ParagraphsBlokkliEditStateFragment } from '#graphql-operations';
+declare const _default: import("#blokkli/adapter").BlokkliAdapterFactory<ParagraphsBlokkliEditStateFragment>;
+export default _default;

package/dist/modules/drupal/{adapter/index.mjs → runtime/adapter/index.js}

@@ -1,11 +1,16 @@
-import { defineBlokkliEditAdapter } from '#blokkli/adapter';
-import { falsy } from '#blokkli/helpers';
-import { availableFeaturesAtBuild } from '#blokkli-build/features';
-import { operationSources } from '#nuxt-graphql-middleware/sources';
-import { computed, useGraphqlQuery, useRoute, useRouter, useGraphqlMutation } from '#imports';
-import { ParagraphsBlokkliRemoteVideoProvider } from '#graphql-operations';
-
-const index = defineBlokkliEditAdapter(
+import { defineBlokkliEditAdapter } from "#blokkli/adapter";
+import { falsy } from "#blokkli/helpers";
+import { availableFeaturesAtBuild } from "#blokkli-build/features";
+import { operationSources } from "#nuxt-graphql-middleware/sources";
+import {
+  useGraphqlQuery,
+  useGraphqlMutation,
+  computed,
+  useRoute,
+  useRouter
+} from "#imports";
+import { ParagraphsBlokkliRemoteVideoProvider } from "#graphql-operations";
+export default defineBlokkliEditAdapter(
   async (providedContext) => {
     const availableFeatureIds = new Set(availableFeaturesAtBuild);
     const availableGraphqlOperations = new Set(Object.keys(operationSources));
@@ -758,5 +763,3 @@ const index = defineBlokkliEditAdapter(
     return adapter;
   }
 );
-
-export { index as default };

package/dist/runtime/blokkliPlugins/ContextMenu/index.vue.d.ts

@@ -1,30 +1,13 @@
 import type { ContextMenu } from '#blokkli/types';
-import ContextMenuMenu from './Menu/index.vue.js';
 type __VLS_Props = {
     id: string;
     menu: ContextMenu[];
     tag?: string;
 };
-declare const ui: import("../../helpers/uiProvider.js").UiProvider;
-declare const isVisible: import("vue").ComputedRef<boolean>;
-declare const x: import("vue").Ref<number, number>;
-declare const y: import("vue").Ref<number, number>;
-declare const onContextMenu: (e: MouseEvent) => void;
-declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
 declare var __VLS_10: {};
-type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_10) => any;
-}>;
-declare const __VLS_self: import("vue").DefineComponent<__VLS_Props, {
-    ContextMenuMenu: typeof ContextMenuMenu;
-    ui: typeof ui;
-    isVisible: typeof isVisible;
-    x: typeof x;
-    y: typeof y;
-    onContextMenu: typeof onContextMenu;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
-    tag: string;
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+};
 declare const __VLS_component: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
     tag: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/runtime/blokkliPlugins/DebugOverlay/index.vue.d.ts

@@ -2,15 +2,10 @@ type __VLS_Props = {
     id: string;
     title: string;
 };
-declare const isVisible: import("vue").ComputedRef<boolean | undefined>;
-declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
 declare var __VLS_5: {};
-type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_5) => any;
-}>;
-declare const __VLS_self: import("vue").DefineComponent<__VLS_Props, {
-    isVisible: typeof isVisible;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+};
 declare const __VLS_component: 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>;
 declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
 export default _default;

package/dist/runtime/blokkliPlugins/DroppableEdit/index.vue

@@ -11,7 +11,7 @@
         <slot />
         <template #footer>
           <button class="bk-button bk-is-primary" @click="onSubmit">
-            {{ $t('droppableEditFormSave', 'Save') }}
+            {{ $t("droppableEditFormSave", "Save") }}
           </button>
         </template>
       </FormOverlay>

package/dist/runtime/blokkliPlugins/DroppableEdit/index.vue.d.ts

@@ -1,4 +1,3 @@
-import { FormOverlay } from '#blokkli/components';
 import type { BlokkliIcon } from '#blokkli-build/icons';
 import type { DroppableEntityField } from '#blokkli/types';
 type __VLS_Props = {
@@ -7,26 +6,10 @@ type __VLS_Props = {
     icon: BlokkliIcon;
     entityType: string;
 };
-declare const $t: import("../../helpers/textProvider.js").TextProvider;
-declare const isVisible: import("vue").Ref<boolean, boolean>;
-declare const onClose: () => void;
-declare const onSubmit: () => void;
-declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
 declare var __VLS_18: {};
-type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_18) => any;
-}>;
-declare const __VLS_self: import("vue").DefineComponent<__VLS_Props, {
-    FormOverlay: typeof FormOverlay;
-    $t: typeof $t;
-    isVisible: typeof isVisible;
-    onClose: typeof onClose;
-    onSubmit: typeof onSubmit;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    save: (data: DroppableEntityField) => any;
-}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
-    onSave?: ((data: DroppableEntityField) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+};
 declare const __VLS_component: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     save: (data: DroppableEntityField) => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{

package/dist/runtime/blokkliPlugins/ItemAction/index.vue.d.ts

@@ -69,11 +69,12 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
 }> & Readonly<{
     onClick?: ((items: DraggableExistingBlock[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    icon?: ((props: {}) => any) | undefined;
-    default?: ((props: {
+    icon?: (props: {}) => any;
+} & {
+    default?: (props: {
         items: DraggableExistingBlock[];
         uuids: string[];
-    }) => any) | undefined;
+    }) => any;
 }>;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {

package/dist/runtime/blokkliPlugins/ItemDropdown/index.vue.d.ts

@@ -7,7 +7,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     title: string;
     enabled: boolean;
 }> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    default?: ((props: {}) => any) | undefined;
+    default?: (props: {}) => any;
 }>;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {

package/dist/runtime/blokkliPlugins/MenuButton/index.vue.d.ts

@@ -22,7 +22,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
 }> & Readonly<{
     onClick?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    default?: ((props: {}) => any) | undefined;
+    default?: (props: {}) => any;
 }>;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {

package/dist/runtime/blokkliPlugins/Sidebar/Detached/index.vue.d.ts

@@ -1,4 +1,3 @@
-import { Icon, ViewportBlockingRect, ScrollBoundary } from '#blokkli/components';
 import type { BlokkliIcon } from '#blokkli-build/icons';
 type __VLS_Props = {
     id: string;
@@ -12,64 +11,16 @@ type __VLS_Props = {
     };
     isLeft?: boolean;
 };
-declare function onPointerMove(e: PointerEvent): void;
-declare const isMinimized: import("vue").WritableComputedRef<boolean, boolean>;
-declare const storageKey: import("vue").ComputedRef<string>;
-declare const focusedSidebar: import("vue").WritableComputedRef<string, string>;
-type MouseMode = 'move' | 'resize-right' | 'resize-bottom' | 'resize-bottom-right' | '';
-declare const isResizing: import("vue").ComputedRef<boolean>;
-declare const userWidth: import("vue").Ref<number, number>;
-declare const userHeight: import("vue").Ref<number, number>;
-declare const style: import("vue").ComputedRef<{
-    transform: string;
-    zIndex: number;
-}>;
-declare const innerStyle: import("vue").ComputedRef<{
-    width: string;
-    height: string | number;
-}>;
-declare const onFocus: () => void;
-declare const onMouseDown: (e: MouseEvent, mode: MouseMode) => void;
-declare const el: import("vue").Ref<HTMLDivElement | null, HTMLDivElement | null>;
-declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
 declare var __VLS_16: {}, __VLS_30: {
     width: number;
     height: number;
     isResizing: boolean;
 };
-type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+type __VLS_Slots = {} & {
     icon?: (props: typeof __VLS_16) => any;
 } & {
     default?: (props: typeof __VLS_30) => any;
-}>;
-declare const __VLS_self: import("vue").DefineComponent<__VLS_Props, {
-    Icon: typeof Icon;
-    ViewportBlockingRect: typeof ViewportBlockingRect;
-    ScrollBoundary: typeof ScrollBoundary;
-    onPointerMove: typeof onPointerMove;
-    isMinimized: typeof isMinimized;
-    storageKey: typeof storageKey;
-    focusedSidebar: typeof focusedSidebar;
-    isResizing: typeof isResizing;
-    userWidth: typeof userWidth;
-    userHeight: typeof userHeight;
-    style: typeof style;
-    innerStyle: typeof innerStyle;
-    onFocus: typeof onFocus;
-    onMouseDown: typeof onMouseDown;
-    el: typeof el;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    close: (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
-    onClose?: ((...args: any[]) => any) | undefined;
-}>, {
-    size: {
-        width: number;
-        height: number;
-    };
-    minWidth: number;
-    minHeight: number;
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+};
 declare const __VLS_component: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     close: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{

package/dist/runtime/blokkliPlugins/Sidebar/index.vue.d.ts

@@ -57,9 +57,13 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
     minHeight: number;
     region: "left" | "right";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    icon?: (((props: {}) => any) & ((props: {}) => any)) | undefined;
-    badge?: ((props: {}) => any) | undefined;
-    default?: (((props: {
+    icon?: (props: {}) => any;
+} & {
+    badge?: (props: {}) => any;
+} & {
+    icon?: (props: {}) => any;
+} & {
+    default?: (props: {
         key: string;
         scrolledToEnd: boolean;
         isDetached: true;
@@ -67,7 +71,9 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         height: number;
         toggleSidebar: () => void;
         isResizing: boolean;
-    }) => any) & ((props: {
+    }) => any;
+} & {
+    default?: (props: {
         key: string;
         scrolledToEnd: boolean;
         isDetached: false;
@@ -75,7 +81,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
         height: undefined;
         toggleSidebar: () => void;
         isResizing: boolean;
-    }) => any)) | undefined;
+    }) => any;
 }>;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {

package/dist/runtime/blokkliPlugins/ToolbarButton/index.vue.d.ts

@@ -38,7 +38,7 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
 }> & Readonly<{
     onClick?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    default?: ((props: {}) => any) | undefined;
+    default?: (props: {}) => any;
 }>;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {

package/dist/runtime/blokkliPlugins/TourItem/index.vue.d.ts

@@ -4,12 +4,10 @@ type __VLS_Props = {
     text: string;
     selector?: string;
 };
-declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
 declare var __VLS_1: {};
-type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
+type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_1) => any;
-}>;
-declare const __VLS_self: 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>;
+};
 declare const __VLS_component: 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>;
 declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
 export default _default;

package/dist/runtime/blokkliPlugins/ViewOption/index.vue.d.ts

@@ -26,10 +26,11 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<{
 }> & Readonly<{
     "onUpdate:modelValue"?: ((data: boolean) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
-    icon?: ((props: {}) => any) | undefined;
-    default?: ((props: {
+    icon?: (props: {}) => any;
+} & {
+    default?: (props: {
         isActive: boolean;
-    }) => any) | undefined;
+    }) => any;
 }>;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {

package/dist/runtime/components/BlokkliEditable.vue

@@ -16,6 +16,7 @@ const props = defineProps({
   value: { type: String, required: true },
   tag: { type: String, required: false, default: "div" }
 });
+defineSlots();
 const valueOverride = ref("");
 const isEditing = inject(INJECT_IS_EDITING, false);
 const entity = inject(INJECT_ENTITY_CONTEXT);

package/dist/runtime/components/BlokkliEditable.vue.d.ts

@@ -3,25 +3,11 @@ type __VLS_Props = {
     value: string;
     tag?: string;
 };
-declare const renderedValue: import("vue").ComputedRef<string>;
-declare const attrs: import("vue").ComputedRef<{
-    'data-blokkli-editable-field': string;
-    'data-blokkli-editable-component': string;
-    'data-blokkli-editable-value': string;
-} | undefined>;
-declare const __VLS_ctx: InstanceType<__VLS_PickNotAny<typeof __VLS_self, new () => {}>>;
-declare var __VLS_6: {
-    value: string;
+type __VLS_Slots = {
+    default(props: {
+        value: string;
+    }): any;
 };
-type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.$slots> & {
-    default?: (props: typeof __VLS_6) => any;
-}>;
-declare const __VLS_self: import("vue").DefineComponent<__VLS_Props, {
-    renderedValue: typeof renderedValue;
-    attrs: typeof attrs;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
-    tag: string;
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_component: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
     tag: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/runtime/components/BlokkliField.vue

@@ -89,6 +89,7 @@ const attrs = useAttrs();
 defineOptions({
   inheritAttrs: false
 });
+defineSlots();
 const isEditing = inject(INJECT_IS_EDITING, false);
 const isGlobalProxyMode = inject(
   INJECT_GLOBAL_PROXY_MODE,
@@ -151,11 +152,12 @@ function filterVisible(item) {
 const filteredList = computed(() => {
   if (mutatedFields && !isInReusable && editContext && fieldKey.value && (isPreview?.value || isEditing)) {
     return ((mutatedFields[fieldKey.value] || {}).list || []).map((v) => {
+      const mutatedOptions = editContext.mutatedOptions[v.uuid] || {};
       return {
         ...v,
         options: {
-          ...v.options
-          // ...mutatedOptions,
+          ...v.options,
+          ...mutatedOptions
         }
       };
     });