@nascentdigital/funnel-editor 4.5.7 → 4.6.1

package/dist/core/domain/CollectionBrowser.d.ts

@@ -18,8 +18,8 @@ export declare class CollectionBrowser {
     get template(): Schema.Collection;
     get count(): number;
     get items(): readonly CollectionSummary[];
-    get languages(): ("id" | "is" | "tw" | "cy" | "fr" | "fy" | "to" | "br" | "hr" | "li" | "th" | "tr" | "no" | "aa" | "ab" | "ae" | "af" | "ak" | "am" | "an" | "ar" | "as" | "av" | "ay" | "az" | "ba" | "be" | "bg" | "bh" | "bi" | "bm" | "bn" | "bo" | "bs" | "ca" | "ce" | "ch" | "co" | "cr" | "cs" | "cu" | "cv" | "da" | "de" | "dv" | "dz" | "ee" | "el" | "en" | "eo" | "es" | "et" | "eu" | "fa" | "ff" | "fi" | "fj" | "fo" | "ga" | "gd" | "gl" | "gn" | "gu" | "gv" | "ha" | "he" | "hi" | "ho" | "ht" | "hu" | "hy" | "hz" | "ia" | "ie" | "ig" | "ii" | "ik" | "io" | "it" | "iu" | "ja" | "jv" | "ka" | "kg" | "ki" | "kj" | "kk" | "kl" | "km" | "kn" | "ko" | "kr" | "ks" | "ku" | "kv" | "kw" | "ky" | "la" | "lb" | "lg" | "ln" | "lo" | "lt" | "lu" | "lv" | "mg" | "mh" | "mi" | "mk" | "ml" | "mn" | "mr" | "ms" | "mt" | "my" | "na" | "nb" | "nd" | "ne" | "ng" | "nl" | "nn" | "nr" | "nv" | "ny" | "oc" | "oj" | "om" | "or" | "os" | "pa" | "pi" | "pl" | "ps" | "pt" | "qu" | "rm" | "rn" | "ro" | "ru" | "rw" | "sa" | "sc" | "sd" | "se" | "sg" | "si" | "sk" | "sl" | "sm" | "sn" | "so" | "sq" | "sr" | "ss" | "st" | "su" | "sv" | "sw" | "ta" | "te" | "tg" | "ti" | "tk" | "tl" | "tn" | "ts" | "tt" | "ty" | "ug" | "uk" | "ur" | "uz" | "ve" | "vi" | "vo" | "wa" | "wo" | "xh" | "yi" | "yo" | "za" | "zh" | "zu")[];
-    get defaultLanguage(): "id" | "is" | "tw" | "cy" | "fr" | "fy" | "to" | "br" | "hr" | "li" | "th" | "tr" | "no" | "aa" | "ab" | "ae" | "af" | "ak" | "am" | "an" | "ar" | "as" | "av" | "ay" | "az" | "ba" | "be" | "bg" | "bh" | "bi" | "bm" | "bn" | "bo" | "bs" | "ca" | "ce" | "ch" | "co" | "cr" | "cs" | "cu" | "cv" | "da" | "de" | "dv" | "dz" | "ee" | "el" | "en" | "eo" | "es" | "et" | "eu" | "fa" | "ff" | "fi" | "fj" | "fo" | "ga" | "gd" | "gl" | "gn" | "gu" | "gv" | "ha" | "he" | "hi" | "ho" | "ht" | "hu" | "hy" | "hz" | "ia" | "ie" | "ig" | "ii" | "ik" | "io" | "it" | "iu" | "ja" | "jv" | "ka" | "kg" | "ki" | "kj" | "kk" | "kl" | "km" | "kn" | "ko" | "kr" | "ks" | "ku" | "kv" | "kw" | "ky" | "la" | "lb" | "lg" | "ln" | "lo" | "lt" | "lu" | "lv" | "mg" | "mh" | "mi" | "mk" | "ml" | "mn" | "mr" | "ms" | "mt" | "my" | "na" | "nb" | "nd" | "ne" | "ng" | "nl" | "nn" | "nr" | "nv" | "ny" | "oc" | "oj" | "om" | "or" | "os" | "pa" | "pi" | "pl" | "ps" | "pt" | "qu" | "rm" | "rn" | "ro" | "ru" | "rw" | "sa" | "sc" | "sd" | "se" | "sg" | "si" | "sk" | "sl" | "sm" | "sn" | "so" | "sq" | "sr" | "ss" | "st" | "su" | "sv" | "sw" | "ta" | "te" | "tg" | "ti" | "tk" | "tl" | "tn" | "ts" | "tt" | "ty" | "ug" | "uk" | "ur" | "uz" | "ve" | "vi" | "vo" | "wa" | "wo" | "xh" | "yi" | "yo" | "za" | "zh" | "zu";
+    get languages(): ("cy" | "fr" | "fy" | "to" | "br" | "hr" | "li" | "th" | "tr" | "id" | "is" | "tw" | "no" | "aa" | "ab" | "ae" | "af" | "ak" | "am" | "an" | "ar" | "as" | "av" | "ay" | "az" | "ba" | "be" | "bg" | "bh" | "bi" | "bm" | "bn" | "bo" | "bs" | "ca" | "ce" | "ch" | "co" | "cr" | "cs" | "cu" | "cv" | "da" | "de" | "dv" | "dz" | "ee" | "el" | "en" | "eo" | "es" | "et" | "eu" | "fa" | "ff" | "fi" | "fj" | "fo" | "ga" | "gd" | "gl" | "gn" | "gu" | "gv" | "ha" | "he" | "hi" | "ho" | "ht" | "hu" | "hy" | "hz" | "ia" | "ie" | "ig" | "ii" | "ik" | "io" | "it" | "iu" | "ja" | "jv" | "ka" | "kg" | "ki" | "kj" | "kk" | "kl" | "km" | "kn" | "ko" | "kr" | "ks" | "ku" | "kv" | "kw" | "ky" | "la" | "lb" | "lg" | "ln" | "lo" | "lt" | "lu" | "lv" | "mg" | "mh" | "mi" | "mk" | "ml" | "mn" | "mr" | "ms" | "mt" | "my" | "na" | "nb" | "nd" | "ne" | "ng" | "nl" | "nn" | "nr" | "nv" | "ny" | "oc" | "oj" | "om" | "or" | "os" | "pa" | "pi" | "pl" | "ps" | "pt" | "qu" | "rm" | "rn" | "ro" | "ru" | "rw" | "sa" | "sc" | "sd" | "se" | "sg" | "si" | "sk" | "sl" | "sm" | "sn" | "so" | "sq" | "sr" | "ss" | "st" | "su" | "sv" | "sw" | "ta" | "te" | "tg" | "ti" | "tk" | "tl" | "tn" | "ts" | "tt" | "ty" | "ug" | "uk" | "ur" | "uz" | "ve" | "vi" | "vo" | "wa" | "wo" | "xh" | "yi" | "yo" | "za" | "zh" | "zu")[];
+    get defaultLanguage(): "cy" | "fr" | "fy" | "to" | "br" | "hr" | "li" | "th" | "tr" | "id" | "is" | "tw" | "no" | "aa" | "ab" | "ae" | "af" | "ak" | "am" | "an" | "ar" | "as" | "av" | "ay" | "az" | "ba" | "be" | "bg" | "bh" | "bi" | "bm" | "bn" | "bo" | "bs" | "ca" | "ce" | "ch" | "co" | "cr" | "cs" | "cu" | "cv" | "da" | "de" | "dv" | "dz" | "ee" | "el" | "en" | "eo" | "es" | "et" | "eu" | "fa" | "ff" | "fi" | "fj" | "fo" | "ga" | "gd" | "gl" | "gn" | "gu" | "gv" | "ha" | "he" | "hi" | "ho" | "ht" | "hu" | "hy" | "hz" | "ia" | "ie" | "ig" | "ii" | "ik" | "io" | "it" | "iu" | "ja" | "jv" | "ka" | "kg" | "ki" | "kj" | "kk" | "kl" | "km" | "kn" | "ko" | "kr" | "ks" | "ku" | "kv" | "kw" | "ky" | "la" | "lb" | "lg" | "ln" | "lo" | "lt" | "lu" | "lv" | "mg" | "mh" | "mi" | "mk" | "ml" | "mn" | "mr" | "ms" | "mt" | "my" | "na" | "nb" | "nd" | "ne" | "ng" | "nl" | "nn" | "nr" | "nv" | "ny" | "oc" | "oj" | "om" | "or" | "os" | "pa" | "pi" | "pl" | "ps" | "pt" | "qu" | "rm" | "rn" | "ro" | "ru" | "rw" | "sa" | "sc" | "sd" | "se" | "sg" | "si" | "sk" | "sl" | "sm" | "sn" | "so" | "sq" | "sr" | "ss" | "st" | "su" | "sv" | "sw" | "ta" | "te" | "tg" | "ti" | "tk" | "tl" | "tn" | "ts" | "tt" | "ty" | "ug" | "uk" | "ur" | "uz" | "ve" | "vi" | "vo" | "wa" | "wo" | "xh" | "yi" | "yo" | "za" | "zh" | "zu";
     sync(): Promise<void>;
     private raiseEvent;
 }

package/dist/core/domain/CollectionFieldProxy.d.ts

@@ -51,7 +51,7 @@ export declare class CollectionFieldProxy implements IAssetStore, ICollectionSto
     getInlineData(): Schema.Collection.Data.AsInline;
     getAssetScope(range: Schema.AssetScope.Range): Schema.AssetScope;
     getSearchScope(): AssetClient.GetAssets.Scope;
-    getAsset(id: Asset.Id): Asset | undefined;
+    getAsset(assetId: Asset.Id): Asset | undefined;
     addAsset(asset: Asset): void;
     removeAsset(assetId: Asset.Id): boolean;
     getCollection(collectionId: Schema.Collection.Id): Schema.Collection.Data.AsLink | undefined;
@@ -62,6 +62,11 @@ export declare class CollectionFieldProxy implements IAssetStore, ICollectionSto
     save(shared?: boolean): Promise<void>;
     private raiseEvent;
     static create(args: CollectionFieldProxy.CreateArgs): Promise<CollectionFieldProxy>;
+    /**
+     * Data format could be either flattened data or inline data.
+     * Either way get the underlying inline collection data.
+     */
+    private dataFrom;
 }
 export declare namespace CollectionFieldProxy {
     type ConstructorArgs = {
@@ -72,7 +77,7 @@ export declare namespace CollectionFieldProxy {
         collectionSchema: Schema.Collection;
         language: Language;
         initialValue?: Schema.CollectionField.Value;
-        initialData?: Schema.Collection.Data | Schema.Collection.Data.AsInline;
+        initialData?: Schema.Collection.FlattenedData | Schema.Collection.Data.AsInline;
     };
     type CreateArgs = Omit<ConstructorArgs, 'initialData'>;
     type Events = Event | Item.Event | Field.Event | ObjectField.Event | FieldList.Event;

package/dist/core/domain/CollectionFieldProxy.js

@@ -22,7 +22,8 @@ class CollectionFieldProxy {
         this._initialData = initialData;
         this._syncing = false;
         // initialize name
-        const name = (initialData === null || initialData === void 0 ? void 0 : initialData.name) || '';
+        const data = this.dataFrom(initialData);
+        const name = (data === null || data === void 0 ? void 0 : data.name) || '';
         this.nameField = new funnel_core_1.Field({
             id: 'name',
             name: 'Name',
@@ -40,7 +41,7 @@ class CollectionFieldProxy {
         // initialize tags
         const tags = repository_1.TagSerializer.deserializeTags({
             groups: collectionSchema.tags,
-            tagsData: (_a = initialData === null || initialData === void 0 ? void 0 : initialData.tags) !== null && _a !== void 0 ? _a : []
+            tagsData: (_a = data === null || data === void 0 ? void 0 : data.tags) !== null && _a !== void 0 ? _a : []
         });
         this._initialTags = new Set(tags);
         this._tags = new Set(tags);
@@ -50,7 +51,7 @@ class CollectionFieldProxy {
             id,
             eventBus,
             schema,
-            content: initialData === null || initialData === void 0 ? void 0 : initialData.fields[id],
+            content: data === null || data === void 0 ? void 0 : data.fields[id],
             snapshot: undefined
         }));
         // initial errors
@@ -77,14 +78,14 @@ class CollectionFieldProxy {
     }
     get assets() {
         const { assetStore, _initialData } = this;
-        return funnel_core_1.Schema.Collection.Data.filter(_initialData)
-            ? _initialData.files
+        return funnel_core_1.Schema.Collection.FlattenedData.filter(_initialData)
+            ? Object.values(_initialData.files)
             : assetStore.assets;
     }
     get collections() {
         const { collectionStore, _initialData } = this;
-        return funnel_core_1.Schema.Collection.Data.filter(_initialData)
-            ? _initialData.collections
+        return funnel_core_1.Schema.Collection.FlattenedData.filter(_initialData)
+            ? Object.values(_initialData.collections)
             : collectionStore.collections;
     }
     get groupId() {
@@ -208,46 +209,31 @@ class CollectionFieldProxy {
             ? { target: 'collection', type, groupId }
             : assetStore.getSearchScope();
     }
-    getAsset(id) {
+    getAsset(assetId) {
         const { assetStore, _initialData } = this;
-        return funnel_core_1.Schema.Collection.Data.filter(_initialData)
-            ? _initialData.files.find(asset => asset.value.id === id)
-            : assetStore.getAsset(id);
+        return funnel_core_1.Schema.Collection.FlattenedData.filter(_initialData)
+            ? _initialData.files[assetId]
+            : assetStore.getAsset(assetId);
     }
     addAsset(asset) {
         // forward if not remote
         const { assetStore, _initialData } = this;
-        if (!funnel_core_1.Schema.Collection.Data.filter(_initialData)) {
+        if (!funnel_core_1.Schema.Collection.FlattenedData.filter(_initialData)) {
             return assetStore.addAsset(asset);
         }
-        // replace asset if it exists
-        const { files } = _initialData;
-        const { id } = asset.value;
-        const assetIndex = files.findIndex(asset => asset.value.id === id);
-        if (assetIndex >= 0) {
-            files[assetIndex] = asset;
-        }
-        // or add asset
-        else {
-            files.push(asset);
-        }
+        // set asset
+        _initialData.files[asset.value.id] = asset;
         // raise event
         this.raiseEvent('changed');
     }
     removeAsset(assetId) {
         // forward if not remote
         const { assetStore, _initialData } = this;
-        if (!funnel_core_1.Schema.Collection.Data.filter(_initialData)) {
+        if (!funnel_core_1.Schema.Collection.FlattenedData.filter(_initialData)) {
             return assetStore.removeAsset(assetId);
         }
-        // skip if asset isn't there
-        const { files } = _initialData;
-        const assetIndex = files.findIndex(asset => asset.value.id === assetId);
-        if (assetIndex < 0) {
-            return false;
-        }
         // remove asset
-        files.splice(assetIndex, 1);
+        delete _initialData.files[assetId];
         // raise event
         this.raiseEvent('changed');
         // indicate success
@@ -255,44 +241,29 @@ class CollectionFieldProxy {
     }
     getCollection(collectionId) {
         const { collectionStore, _initialData } = this;
-        return funnel_core_1.Schema.Collection.Data.filter(_initialData)
-            ? _initialData.collections.find(collection => collection.id === collectionId)
+        return funnel_core_1.Schema.Collection.FlattenedData.filter(_initialData)
+            ? _initialData.collections[collectionId]
             : collectionStore.getCollection(collectionId);
     }
     addCollection(collection) {
         // forward if not remote
         const { collectionStore, _initialData } = this;
-        if (!funnel_core_1.Schema.Collection.Data.filter(_initialData)) {
+        if (!funnel_core_1.Schema.Collection.FlattenedData.filter(_initialData)) {
             return collectionStore.addCollection(collection);
         }
-        // replace collection if it exists
-        const { collections } = _initialData;
-        const collectionId = collection.id;
-        const collectionIndex = collections.findIndex(collection => collection.id === collectionId);
-        if (collectionIndex >= 0) {
-            collections[collectionIndex] = collection;
-        }
-        // or add collection
-        else {
-            collections.push(collection);
-        }
+        // set collection
+        _initialData.collections[collection.id] = collection;
         // raise event
         this.raiseEvent('changed');
     }
     removeCollection(collectionId) {
         // forward if not remote
         const { collectionStore, _initialData } = this;
-        if (!funnel_core_1.Schema.Collection.Data.filter(_initialData)) {
+        if (!funnel_core_1.Schema.Collection.FlattenedData.filter(_initialData)) {
             return collectionStore.removeCollection(collectionId);
         }
-        // skip if collection isn't there
-        const { collections } = _initialData;
-        const collectionIndex = collections.findIndex(collection => collection.id === collectionId);
-        if (collectionIndex < 0) {
-            return false;
-        }
         // remove collection
-        collections.splice(collectionIndex, 1);
+        delete _initialData.collections[collectionId];
         // raise event
         this.raiseEvent('changed');
         // indicate success
@@ -322,7 +293,7 @@ class CollectionFieldProxy {
         let initialData = undefined;
         if (_initialData !== undefined) {
             // shared collection means the initial data should be collection data
-            if (!funnel_core_1.Schema.Collection.Data.filter(_initialData)) {
+            if (!funnel_core_1.Schema.Collection.FlattenedData.filter(_initialData)) {
                 throw new funnel_core_1.IllegalStateError('Local data is not collection data');
             }
             // set collection data
@@ -350,8 +321,8 @@ class CollectionFieldProxy {
                 initialData = collectionData;
                 // update initial value
                 this._initialValue = {
-                    id: collectionData.id,
-                    type: collectionData.type
+                    id: collectionData.data.id,
+                    type: collectionData.data.type
                 };
             }
             console.debug('[CollectionFieldProxy/save] updating remote instance', initialData);
@@ -363,34 +334,34 @@ class CollectionFieldProxy {
             this.onSaveStart();
             savables.forEach(savable => savable.onSaveStart());
             // update page
-            const { collection: collectionData } = await collectionRepository.editorApi.updateCollection(update);
+            const { collection } = await collectionRepository.editorApi.updateCollection(update);
             // update collection in store and reset if updated
-            if (collectionData) {
+            if (collection) {
                 // add to collection store
-                collectionStore.addCollection(collectionData);
+                collectionStore.addCollection(collection.data);
                 // reset fields
-                nameField.reset(funnel_core_1.Schema.TextField.Value.toData(collectionData.name));
+                nameField.reset(funnel_core_1.Schema.TextField.Value.toData(collection.data.name));
                 fields.forEach(field => {
                     var _a, _b, _c;
                     if (field instanceof funnel_core_1.Field) {
-                        field.reset((_a = collectionData.fields[field.id]) !== null && _a !== void 0 ? _a : null);
+                        field.reset((_a = collection.data.fields[field.id]) !== null && _a !== void 0 ? _a : null);
                     }
                     else if (field instanceof funnel_core_1.ObjectField) {
-                        field.reset((_b = collectionData.fields[field.id]) !== null && _b !== void 0 ? _b : null);
+                        field.reset((_b = collection.data.fields[field.id]) !== null && _b !== void 0 ? _b : null);
                     }
                     else {
-                        field.reset((_c = collectionData.fields[field.id]) !== null && _c !== void 0 ? _c : null);
+                        field.reset((_c = collection.data.fields[field.id]) !== null && _c !== void 0 ? _c : null);
                     }
                 });
                 // update data
-                initialData = collectionData;
+                initialData = collection;
             }
             // update collection store with updated local values
             else {
                 // update data
-                initialData = Object.assign(Object.assign({}, initialData), this.getInlineData());
+                initialData.data = Object.assign(Object.assign({}, initialData.data), this.getInlineData());
                 // add to collection store
-                collectionStore.addCollection(initialData);
+                collectionStore.addCollection(initialData.data);
             }
             // complete all updates
             savables.forEach(savable => savable.onSaveComplete());
@@ -422,6 +393,24 @@ class CollectionFieldProxy {
         // return new model
         return new CollectionFieldProxy(Object.assign(Object.assign({}, args), { initialData }));
     }
+    /**
+     * Data format could be either flattened data or inline data.
+     * Either way get the underlying inline collection data.
+     */
+    dataFrom(data) {
+        // undefined data
+        if (data === undefined) {
+            return undefined;
+        }
+        // otherwise check if flattened data (need to return inner data)
+        else if (funnel_core_1.Schema.Collection.FlattenedData.filter(data)) {
+            return data.data;
+        }
+        // otherwise inline data
+        else {
+            return data;
+        }
+    }
 }
 exports.CollectionFieldProxy = CollectionFieldProxy;
 // extension

package/dist/core/domain/SectionBlock.d.ts

@@ -12,6 +12,11 @@ export declare class SectionBlock<TBlock extends Schema.Block = Schema.Block> ex
     get name(): string;
     get config(): ReadonlyArray<FieldModel>;
     get fields(): ReadonlyArray<FieldModel>;
+    get nameField(): import("@nascentdigital/funnel-core").Field<Schema.TextField>;
+    get messageFields(): readonly FieldModel[];
+    get visualFields(): readonly FieldModel[];
+    get listsFields(): readonly FieldModel[];
+    get extendedFields(): readonly FieldModel[];
     get state(): "undefined" | "invalid" | "valid";
     get value(): Schema.Section.Data.ForBlock;
     get modified(): boolean;

package/dist/core/domain/SectionBlock.js

@@ -28,6 +28,21 @@ class SectionBlock extends ItemBase_1.ItemBase {
     get fields() {
         return this.block.fields;
     }
+    get nameField() {
+        return this.block.nameField;
+    }
+    get messageFields() {
+        return this.block.messageFields;
+    }
+    get visualFields() {
+        return this.block.visualFields;
+    }
+    get listsFields() {
+        return this.block.listsFields;
+    }
+    get extendedFields() {
+        return this.block.extendedFields;
+    }
     get state() {
         return this.block.state;
     }

package/dist/core/hooks/useBlockConfiguration.d.ts

@@ -1,2 +1,8 @@
 import { BlockConfiguration } from '../domain';
-export declare function useBlockConfiguration(configuration?: BlockConfiguration): void;
+export declare function useBlockConfiguration(newConfiguration?: BlockConfiguration): BlockConfiguration | undefined;
+export declare const BlockConfigurationContext: import("react").Context<BlockConfigurationContext.Data>;
+export declare namespace BlockConfigurationContext {
+    type Data = {
+        configuration?: BlockConfiguration;
+    };
+}

package/dist/core/hooks/useBlockConfiguration.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockConfigurationContext = void 0;
 exports.useBlockConfiguration = useBlockConfiguration;
 const client_1 = require("@nascentdigital/funnel-ui/client");
 const react_1 = require("react");
 // hook
-function useBlockConfiguration(configuration) {
+function useBlockConfiguration(newConfiguration) {
     // bind touch (for re-rendering parent)
+    const { configuration: existingConfiguration } = (0, react_1.useContext)(exports.BlockConfigurationContext);
+    const configuration = newConfiguration !== null && newConfiguration !== void 0 ? newConfiguration : existingConfiguration;
     const touch = (0, client_1.useTouch)();
     // listen to configuration changes
     (0, react_1.useEffect)(() => {
@@ -18,4 +21,8 @@ function useBlockConfiguration(configuration) {
         // unsubscribe on unmount
         return () => subscription.unsubscribe();
     }, [configuration, touch]);
+    // return configuration
+    return configuration;
 }
+// context
+exports.BlockConfigurationContext = (0, react_1.createContext)({});

package/dist/core/hooks/usePage.d.ts

@@ -1,6 +1,6 @@
 import { Page } from '../domain';
-export declare function usePossiblePage(): Page | undefined;
-export declare function usePage(): Page;
+export declare function usePossiblePage(newPage?: Page): Page | undefined;
+export declare function usePage(newPage?: Page): Page;
 export declare const PageContext: import("react").Context<PageContext.Data>;
 export declare namespace PageContext {
     type Data = {

package/dist/core/hooks/usePage.js

@@ -7,9 +7,10 @@ const funnel_core_1 = require("@nascentdigital/funnel-core");
 const client_1 = require("@nascentdigital/funnel-ui/client");
 const react_1 = require("react");
 // hook
-function usePossiblePage() {
+function usePossiblePage(newPage) {
     // bind context + touch
-    const { page } = (0, react_1.useContext)(exports.PageContext);
+    const { page: existingPage } = (0, react_1.useContext)(exports.PageContext);
+    const page = newPage !== null && newPage !== void 0 ? newPage : existingPage;
     const touch = (0, client_1.useTouch)();
     // listen to page changes
     (0, react_1.useEffect)(() => {
@@ -25,9 +26,9 @@ function usePossiblePage() {
     // return page
     return page;
 }
-function usePage() {
+function usePage(newPage) {
     // resolve page
-    const page = usePossiblePage();
+    const page = usePossiblePage(newPage);
     // throw if there's no page (should never happen)
     if (!page) {
         throw new funnel_core_1.InvalidOperationError('Attempt to access Page outside of PageContext');

package/dist/core/repository/CollectionRepository.js

@@ -60,7 +60,7 @@ class CollectionRepository {
         if (collectionData) {
             console.debug('[CollectionRepository/save] received new collection');
             const { eventBus, template } = collection;
-            return CollectionSerializer_1.CollectionSerializer.deserializeCollection(Object.assign(Object.assign({}, collectionData), { eventBus, template }));
+            return CollectionSerializer_1.CollectionSerializer.deserializeCollection({ flattenedCollection: collectionData, eventBus, template });
         }
         // or simply update the collection updated stamp
         else {

package/dist/core/repository/CollectionSerializer.d.ts

@@ -6,9 +6,10 @@ export declare namespace CollectionSerializer {
         eventBus: EventBus;
     };
     function deserializeCollectionGroup({ template, eventBus, group: groupData, collection: collectionData }: DeserializeCollectionGroupArgs): CollectionGroup;
-    type DeserializeCollectionArgs = Schema.Collection.Data & {
+    type DeserializeCollectionArgs = {
+        flattenedCollection: Schema.Collection.FlattenedData;
         template: Schema.Collection;
         eventBus: EventBus;
     };
-    function deserializeCollection({ eventBus, template, tags, fields, files, collections, pageIds, snapshot, ...data }: DeserializeCollectionArgs): Collection;
+    function deserializeCollection({ eventBus, template, flattenedCollection }: DeserializeCollectionArgs): Collection;
 }

package/dist/core/repository/CollectionSerializer.js

@@ -20,7 +20,11 @@ var CollectionSerializer;
 (function (CollectionSerializer) {
     function deserializeCollectionGroup({ template, eventBus, group: groupData, collection: collectionData }) {
         // deserialize collection (if any)
-        const collection = collectionData && deserializeCollection(Object.assign(Object.assign({}, collectionData), { template, eventBus }));
+        const collection = collectionData && deserializeCollection({
+            flattenedCollection: collectionData,
+            template,
+            eventBus
+        });
         // deserialize summary
         const { groupId, brand, name, instances } = groupData;
         return new domain_1.CollectionGroup({
@@ -33,8 +37,11 @@ var CollectionSerializer;
         });
     }
     CollectionSerializer.deserializeCollectionGroup = deserializeCollectionGroup;
-    function deserializeCollection(_a) {
-        var { eventBus, template, tags, fields = {}, files = [], collections = [], pageIds = [], snapshot } = _a, data = __rest(_a, ["eventBus", "template", "tags", "fields", "files", "collections", "pageIds", "snapshot"]);
+    function deserializeCollection({ eventBus, template, flattenedCollection }) {
+        const { data, files, collections } = flattenedCollection;
+        const { snapshot, tags, fields, pageIds } = data, dataRest = __rest(data
+        // determine latest snapshot (if any)
+        , ["snapshot", "tags", "fields", "pageIds"]);
         // determine latest snapshot (if any)
         const { fields: snapshotFields = {} } = snapshot !== null && snapshot !== void 0 ? snapshot : {};
         // create new collection using shared bus
@@ -42,15 +49,13 @@ var CollectionSerializer;
             template, tags: TagSerializer_1.TagSerializer.deserializeTags({
                 groups: template.tags,
                 tagsData: tags
-            }) }, data), { fields: Object.entries(template.editableFields).map(([id, schema]) => FieldSerializer_1.FieldSerializer.deserializeField({
+            }) }, dataRest), { fields: Object.entries(template.editableFields).map(([id, schema]) => FieldSerializer_1.FieldSerializer.deserializeField({
                 id,
                 eventBus,
                 schema,
                 content: fields[id],
                 snapshot: snapshotFields[id]
-            })), files,
-            collections,
-            pageIds,
+            })), files: Object.values(files), collections: Object.values(collections), pageIds,
             snapshot }));
     }
     CollectionSerializer.deserializeCollection = deserializeCollection;

package/dist/core/repository/PageRepository.js

@@ -73,8 +73,8 @@ class PageRepository {
         // return new page if it was updated
         if (pageData) {
             console.debug('[PageRepository/save] received new page');
-            const { eventBus, template, region } = page;
-            return PageSerializer_1.PageSerializer.deserializePage(Object.assign(Object.assign({}, pageData), { eventBus, template, region }));
+            const { eventBus, template, region, language } = page;
+            return PageSerializer_1.PageSerializer.deserializePage({ flattenedPage: pageData, eventBus, target: { template, region, language } });
         }
         // or simply update the page updated stamp
         else {

package/dist/core/repository/PageSerializer.d.ts

@@ -5,9 +5,11 @@ export declare namespace PageSerializer {
     type DeserializePageWithSummaryArgs = Schema.Page.Data.AsGroup & PageTarget & {
         eventBus: EventBus;
     };
-    function deserializePageWithSummary({ eventBus, group: groupData, page: pageData, ...args }: DeserializePageWithSummaryArgs): Page.WithSummary;
-    type DeserializePageArgs = Schema.Page.Data & PageTarget & {
+    function deserializePageWithSummary({ eventBus, group: groupData, page: flattenedPage, ...target }: DeserializePageWithSummaryArgs): Page.WithSummary;
+    type DeserializePageArgs = {
+        flattenedPage: Schema.Page.FlattenedData;
+        target: PageTarget;
         eventBus: EventBus;
     };
-    function deserializePage({ eventBus, template, tags, discover, content, files, pages, collections, snapshot, ...data }: DeserializePageArgs): Page;
+    function deserializePage({ flattenedPage, target, eventBus }: DeserializePageArgs): Page;
 }

package/dist/core/repository/PageSerializer.js

@@ -20,30 +20,30 @@ const TagSerializer_1 = require("./TagSerializer");
 var PageSerializer;
 (function (PageSerializer) {
     function deserializePageWithSummary(_a) {
-        var { eventBus, group: groupData, page: pageData } = _a, args = __rest(_a, ["eventBus", "group", "page"]);
+        var { eventBus, group: groupData, page: flattenedPage } = _a, target = __rest(_a, ["eventBus", "group", "page"]);
         // deserialize page (if any)
-        const { template, region } = args;
-        const page = pageData && deserializePage(Object.assign(Object.assign({}, pageData), { template, region, eventBus }));
+        const page = flattenedPage && deserializePage({ flattenedPage, target, eventBus });
         // deserialize summary
         const { brand, groupId, instances } = groupData;
-        const summary = new domain_1.PageSummary(Object.assign(Object.assign({}, args), { brand,
+        const summary = new domain_1.PageSummary(Object.assign(Object.assign({}, target), { brand,
             groupId, pages: instances }));
         // return result
         return { summary, page };
     }
     PageSerializer.deserializePageWithSummary = deserializePageWithSummary;
-    function deserializePage(_a) {
-        var { eventBus, template, tags, discover = {}, content = {}, files = [], pages = [], collections = [], snapshot } = _a, data = __rest(_a, ["eventBus", "template", "tags", "discover", "content", "files", "pages", "collections", "snapshot"]);
+    function deserializePage({ flattenedPage, target, eventBus }) {
+        const { data, files, pages, collections } = flattenedPage;
+        const { snapshot, discover, content, tags } = data, dataRest = __rest(data, ["snapshot", "discover", "content", "tags"]);
+        const { template, region } = target;
         // determine latest snapshot (if any)
         const { discover: discoverSnapshot = {}, preview: previewSnapshot = {}, content: contentSnapshot = {} } = snapshot !== null && snapshot !== void 0 ? snapshot : {};
         // create new page using shared bus
-        const region = data.region;
         const pageSchemas = funnel_core_1.Schema.Site.current().regions[region];
         const page = new domain_1.Page(Object.assign(Object.assign({ eventBus,
             template, tags: TagSerializer_1.TagSerializer.deserializeTags({
                 groups: template.tags,
                 tagsData: tags
-            }) }, data), { discover: [
+            }) }, dataRest), { discover: [
                 deserializeBlock({ schema: funnel_core_1.Schema.Seo, eventBus, key: 'seo', content: discover['seo'], snapshot: discoverSnapshot['seo'] })
             ], content: Object.entries(template.content).map(([key, schema]) => deserializeContent({
                 key,
@@ -51,11 +51,10 @@ var PageSerializer;
                 eventBus,
                 content: content[key],
                 snapshot: contentSnapshot[key]
-            })), files, pages: pages.map((_a) => {
+            })), files: Object.values(files), pages: Object.values(pages).map((_a) => {
                 var { type, tags } = _a, ref = __rest(_a, ["type", "tags"]);
                 return (Object.assign(Object.assign({}, ref), { template: pageSchemas[type], tags: template.tags.flatMap(tagGroup => tagGroup.parse(tags)) }));
-            }), collections,
-            snapshot }));
+            }), collections: Object.values(collections), snapshot }));
         // repair any issues on the page
         page.repair();
         // return page

package/dist/explore/components/CreateCollectionDialog.d.ts

@@ -1,5 +1,4 @@
-import { Rect } from '@nascentdigital/funnel-core';
-import { Collection, CollectionBrowser } from '../../core';
+import { Collection, CollectionBrowser, Popup } from '../../core';
 export declare const CreateCollectionDialog: import("react").ForwardRefExoticComponent<import("react").RefAttributes<CreateCollectionDialog.Ref>>;
 export declare namespace CreateCollectionDialog {
     type Props = {};
@@ -8,6 +7,6 @@ export declare namespace CreateCollectionDialog {
     }
     type Options = {
         collectionBrowser: CollectionBrowser;
-        anchor: HTMLElement | Rect;
+        anchor: Popup.Anchor;
     };
 }

package/dist/explore/components/CreateCollectionDialog.js

@@ -110,7 +110,7 @@ exports.CreateCollectionDialog = (0, react_1.forwardRef)(function CreateCollecti
         deferral.resolve(result !== null && result !== void 0 ? result : undefined);
     };
     // skip if we don't have any params
-    if (!deferral || !collectionBrowser) {
+    if (!deferral || !collectionBrowser || !anchor) {
         return null;
     }
     // render

package/dist/explore/components/CreatePageDialog.d.ts

@@ -1,5 +1,5 @@
-import { Rect, Schema } from '@nascentdigital/funnel-core';
-import { Page, Pages, Site } from '../../core';
+import { Schema } from '@nascentdigital/funnel-core';
+import { Page, Pages, Popup, Site } from '../../core';
 export declare const CreatePageDialog: import("react").ForwardRefExoticComponent<import("react").RefAttributes<CreatePageDialog.Ref>>;
 export declare namespace CreatePageDialog {
     type Props = {};
@@ -10,6 +10,6 @@ export declare namespace CreatePageDialog {
         site: Site;
         template: Schema.Page;
         collection: Pages;
-        anchor: HTMLElement | Rect;
+        anchor: Popup.Anchor;
     };
 }

package/dist/explore/components/CreatePageDialog.js

@@ -159,11 +159,11 @@ exports.CreatePageDialog = (0, react_1.forwardRef)(function CreatePageDialog(_,
         deferral.resolve(result !== null && result !== void 0 ? result : undefined);
     };
     // skip if we don't have any params
-    if (!deferral || !site || !template) {
+    if (!deferral || !site || !template || !anchor) {
         return null;
     }
     // render
-    return ((0, jsx_runtime_1.jsxs)(core_1.MiniEditor, { className: "flex flex-col gap-l8", title: `Create new ${(_d = template.name) !== null && _d !== void 0 ? _d : 'page'}`, open: result === undefined, anchor: anchor, anchorOffset: 4, placement: "bottom-end", renderSaveLabel: state => state === 'saving' ? 'Creating...' : 'Create', canSave: onValidate, onSave: onCreate, onClose: onCancel, onClosed: onClosed, children: [(0, jsx_runtime_1.jsx)(core_1.ErrorMessage, { error: error }), (0, jsx_runtime_1.jsxs)(core_1.FieldErrorController, { errorLevel: errorLevel, children: [(0, jsx_runtime_1.jsx)(core_1.FieldEditor, { field: nameField, autoFocus: true }), (0, jsx_runtime_1.jsx)(core_1.TextField, { ref: slugFieldRef, field: slugField, onKeyDown: onSlugKeyDown }), multiLanguage &&
+    return ((0, jsx_runtime_1.jsxs)(core_1.MiniEditor, { className: "flex flex-col gap-l8", title: `Create new ${(_d = template.name) !== null && _d !== void 0 ? _d : 'page'}`, open: result === undefined, anchor: anchor, anchorOffset: 4, placement: "left", renderSaveLabel: state => state === 'saving' ? 'Creating...' : 'Create', canSave: onValidate, onSave: onCreate, onClose: onCancel, onClosed: onClosed, children: [(0, jsx_runtime_1.jsx)(core_1.ErrorMessage, { error: error }), (0, jsx_runtime_1.jsxs)(core_1.FieldErrorController, { errorLevel: errorLevel, children: [(0, jsx_runtime_1.jsx)(core_1.FieldEditor, { field: nameField, autoFocus: true }), (0, jsx_runtime_1.jsx)(core_1.TextField, { ref: slugFieldRef, field: slugField, onKeyDown: onSlugKeyDown }), multiLanguage &&
                         (0, jsx_runtime_1.jsx)(core_1.FieldEditor, { field: languageField })] })] }));
 });
 function getLanguageOptions(site) {