@genome-spy/core 0.67.0 → 0.68.0

package/dist/src/encoder/accessor.js

@@ -38,6 +38,7 @@ export function createAccessor(channel, channelDef, paramMediator) {
         a.constant = a.fields.length === 0;
         a.channelDef = channelDef;
         a.channel = channel;
+        a.sourceKey = buildAccessorSourceKey(channelDef);
 
         a.scaleChannel =
             ((isChannelDefWithScale(channelDef) &&
@@ -45,6 +46,13 @@ export function createAccessor(channel, channelDef, paramMediator) {
                 (isChannelWithScale(channel) && channel)) ||
             undefined;
 
+        if (a.scaleChannel !== undefined) {
+            a.domainKeyBase = buildDomainKey({
+                scaleChannel: a.scaleChannel,
+                source: getDomainKeySource(channelDef),
+            }).domainKeyBase;
+        }
+
         if ("param" in channelDef) {
             // TODO: Figure out how to fix it. Interval selection depends on FIELDS!
             /*
@@ -62,6 +70,18 @@ export function createAccessor(channel, channelDef, paramMediator) {
             a.predicate.empty = false;
         }
 
+        a.equals = (other) => {
+            if (!other) {
+                return false;
+            } else {
+                return (
+                    a === other ||
+                    (a.sourceKey !== undefined &&
+                        a.sourceKey === other.sourceKey)
+                );
+            }
+        };
+
         a.asNumberAccessor = () =>
             /** @type {import("../types/encoder.js").Accessor<number>} */ (a);
 
@@ -152,3 +172,147 @@ export function createConditionalAccessors(channel, channelDef, paramMediator) {
     }
     return conditionalAccessors;
 }
+
+/**
+ * @param {import("../types/encoder.js").Accessor} accessor
+ * @returns {accessor is import("../types/encoder.js").ScaleAccessor}
+ */
+export function isScaleAccessor(accessor) {
+    return accessor.scaleChannel !== undefined;
+}
+
+/**
+ * @typedef {{
+ *     kind: "field",
+ *     value: string,
+ * } | {
+ *     kind: "expr",
+ *     value: string,
+ * } | {
+ *     kind: "datum",
+ *     value: import("../spec/channel.js").Scalar | import("../spec/parameter.js").ExprRef,
+ * } | {
+ *     kind: "value",
+ *     value: import("../spec/channel.js").Scalar | import("../spec/parameter.js").ExprRef,
+ * }} DomainKeySource
+ */
+
+/**
+ * @param {import("../spec/channel.js").ChannelDef} channelDef
+ * @returns {DomainKeySource}
+ */
+function getDomainKeySource(channelDef) {
+    if (isFieldDef(channelDef)) {
+        return { kind: "field", value: channelDef.field };
+    }
+
+    if (isExprDef(channelDef)) {
+        return { kind: "expr", value: channelDef.expr };
+    }
+
+    if (isDatumDef(channelDef)) {
+        return { kind: "datum", value: channelDef.datum };
+    }
+
+    if (isValueDef(channelDef)) {
+        return { kind: "value", value: channelDef.value };
+    }
+
+    throw new Error(
+        "Cannot derive a domain key from channel definition: " +
+            JSON.stringify(channelDef)
+    );
+}
+
+/**
+ * Builds a key for accessor equality. This is a structural heuristic based on
+ * the data source definition and ignores channel, predicate, and scale.
+ *
+ * @param {import("../spec/channel.js").ChannelDef} channelDef
+ * @returns {string}
+ */
+function buildAccessorSourceKey(channelDef) {
+    const source = getDomainKeySource(channelDef);
+    if (source.kind === "datum" || source.kind === "value") {
+        return "constant|" + stringifyDomainValue(source.value);
+    }
+
+    return source.kind + "|" + stringifyDomainSource(source);
+}
+
+/**
+ * Builds domain key strings in the format:
+ * - domainKeyBase: <scaleChannel>|<kind>|<value>
+ * - domainKey: <type>|<domainKeyBase>
+ *
+ * @param {object} options
+ * @param {import("../spec/channel.js").ChannelWithScale} options.scaleChannel
+ * @param {DomainKeySource} options.source
+ * @param {import("../spec/channel.js").Type} [options.type]
+ * @returns {{ domainKeyBase: string, domainKey?: string }}
+ */
+export function buildDomainKey({ scaleChannel, source, type }) {
+    if (!scaleChannel) {
+        throw new Error("Cannot build a domain key without a scale channel.");
+    }
+
+    const domainKeyBase =
+        scaleChannel + "|" + source.kind + "|" + stringifyDomainSource(source);
+    const domainKey = type ? type + "|" + domainKeyBase : undefined;
+
+    return { domainKeyBase, domainKey };
+}
+
+/**
+ * @param {import("../types/encoder.js").ScaleAccessor} accessor
+ * @param {import("../spec/channel.js").Type} type
+ * @returns {string}
+ */
+export function getAccessorDomainKey(accessor, type) {
+    const { domainKey, domainKeyBase } = buildDomainKey({
+        scaleChannel: accessor.scaleChannel,
+        source: getDomainKeySource(accessor.channelDef),
+        type,
+    });
+    if (!domainKey) {
+        throw new Error(
+            "Cannot finalize a domain key without a resolved type."
+        );
+    }
+    accessor.domainKeyBase = domainKeyBase;
+    accessor.domainKey = domainKey;
+    return domainKey;
+}
+
+/**
+ * @param {DomainKeySource} source
+ * @returns {string}
+ */
+function stringifyDomainSource(source) {
+    switch (source.kind) {
+        case "field":
+        case "expr":
+            return source.value;
+        case "datum":
+        case "value":
+            return stringifyDomainValue(source.value);
+        default:
+            throw new Error("Unknown domain key source.");
+    }
+}
+
+/**
+ * @param {import("../spec/channel.js").Scalar | import("../spec/parameter.js").ExprRef} value
+ * @returns {string}
+ */
+function stringifyDomainValue(value) {
+    if (isExprRef(value)) {
+        return "expr:" + value.expr;
+    }
+
+    if (value === undefined) {
+        return "undefined";
+    }
+
+    return JSON.stringify(value);
+}

package/dist/src/encoder/encoder.d.ts

@@ -8,6 +8,15 @@
  * @returns {Partial<Record<Channel, Encoder>>}
  */
 export default function createEncoders(unitView: import("../view/unitView.js").default, encoding: import("../spec/channel.js").Encoding): Partial<Record<import("../spec/channel.js").Channel, import("../types/encoder.js").Encoder>>;
+/**
+ * Channels that are present in encoding but are not direct mark properties.
+ * Keep this centralized so metadata channels (for example tooltip) can reuse
+ * the same handling path.
+ *
+ * @param {import("../spec/channel.js").Channel} channel
+ * @returns {boolean}
+ */
+export function isNonMarkPropertyChannel(channel: import("../spec/channel.js").Channel): boolean;
 /**
  * @param {import("../types/encoder.js").Accessor[]} accessors
  * @param {(channel: import("../spec/channel.js").ChannelWithScale) => import("../types/encoder.js").VegaScale} scaleSource
@@ -45,12 +54,12 @@ export function isChannelDefWithScale(channelDef: import("../spec/channel.js").C
 /**
  * @param {import("../spec/channel.js").ChannelDef} channelDef
  */
-export function findChannelDefWithScale(channelDef: import("../spec/channel.js").ChannelDef): import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, string> | import("../spec/channel.js").PositionFieldDef | import("../spec/channel.js").PositionDatumDef | import("../spec/channel.js").ChromPosDef | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, number> | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").FieldDefBase & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type>) | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").DatumDef<import("../spec/parameter.js").ExprRef | import("../spec/channel.js").Scalar> & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type>) | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").ValueDefBase<string | import("../spec/parameter.js").ExprRef> & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type>) | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").ValueDefBase<number | import("../spec/parameter.js").ExprRef> & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type>);
+export function findChannelDefWithScale(channelDef: import("../spec/channel.js").ChannelDef): import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, string> | import("../spec/channel.js").PositionFieldDef | import("../spec/channel.js").PositionDatumDef | import("../spec/channel.js").ChromPosDef | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, number> | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").FieldDefBase & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").DomainContributionMixins & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type>) | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").DatumDef<import("../spec/parameter.js").ExprRef | import("../spec/channel.js").Scalar> & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").DomainContributionMixins) | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").ValueDefBase<string | import("../spec/parameter.js").ExprRef> & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").DomainContributionMixins) | (import("../spec/channel.js").ParameterPredicate & import("../spec/channel.js").ValueDefBase<number | import("../spec/parameter.js").ExprRef> & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").DomainContributionMixins);
 /**
  * @param {import("../view/unitView.js").default} view
  * @param {import("../spec/channel.js").Channel} channel
  */
-export function getChannelDefWithScale(view: import("../view/unitView.js").default, channel: import("../spec/channel.js").Channel): import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, string> | import("../spec/channel.js").PositionFieldDef | import("../spec/channel.js").PositionDatumDef | import("../spec/channel.js").ChromPosDef | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, number> | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").TypeForShape>, string> | (import("../spec/channel.js").FieldDefBase & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").PositionMixins & import("../spec/channel.js").XIndexDef) | (import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").DatumDef<import("../spec/parameter.js").ExprRef | import("../spec/channel.js").Scalar> & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").PositionMixins & import("../spec/channel.js").XIndexDef) | (import("../spec/channel.js").ChromPosDefBase & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").PositionMixins & import("../spec/channel.js").TypeMixins<"locus"> & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").XIndexDef);
+export function getChannelDefWithScale(view: import("../view/unitView.js").default, channel: import("../spec/channel.js").Channel): import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, string> | import("../spec/channel.js").PositionFieldDef | import("../spec/channel.js").PositionDatumDef | import("../spec/channel.js").ChromPosDef | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").Type>, number> | import("../spec/channel.js").FieldOrDatumDefWithCondition<import("../spec/channel.js").MarkPropFieldDef<import("../spec/channel.js").TypeForShape>, string> | (import("../spec/channel.js").FieldDefBase & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").DomainContributionMixins & import("../spec/channel.js").PositionMixins & import("../spec/channel.js").XIndexDef) | (import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").DatumDef<import("../spec/parameter.js").ExprRef | import("../spec/channel.js").Scalar> & import("../spec/channel.js").DomainContributionMixins & import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type> & import("../spec/channel.js").PositionMixins & import("../spec/channel.js").XIndexDef) | (import("../spec/channel.js").ChromPosDefBase & import("../spec/channel.js").TitleMixins & import("../spec/channel.js").PositionMixins & import("../spec/channel.js").DomainContributionMixins & import("../spec/channel.js").TypeMixins<"locus"> & import("../spec/channel.js").ScaleMixins & import("../spec/channel.js").XIndexDef);
 /**
  * @param {import("../spec/channel.js").ChannelDef} channelDef
  * @returns {channelDef is import("../spec/channel.js").TypeMixins<import("../spec/channel.js").Type>}

package/dist/src/encoder/encoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../../src/encoder/encoder.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../../src/encoder/encoder.js"],"names":[],"mappings":"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"}

package/dist/src/encoder/encoder.js

@@ -82,10 +82,18 @@ export default function createEncoders(unitView, encoding) {
             continue;
         }
 
-        encoders[channel] = createSimpleOrConditionalEncoder(
+        /** @type {Channel} */
+        const typedChannel = /** @type {Channel} */ (channel);
+        if (isNonMarkPropertyChannel(typedChannel)) {
+            continue;
+        }
+
+        const typedChannelDef =
+            /** @type {import("../spec/channel.js").ChannelDef} */ (channelDef);
+        encoders[typedChannel] = createSimpleOrConditionalEncoder(
             createConditionalAccessors(
-                channel,
-                channelDef,
+                typedChannel,
+                typedChannelDef,
                 unitView.paramMediator
             ),
             scaleSource
@@ -95,6 +103,18 @@ export default function createEncoders(unitView, encoding) {
     return encoders;
 }
 
+/**
+ * Channels that are present in encoding but are not direct mark properties.
+ * Keep this centralized so metadata channels (for example tooltip) can reuse
+ * the same handling path.
+ *
+ * @param {import("../spec/channel.js").Channel} channel
+ * @returns {boolean}
+ */
+export function isNonMarkPropertyChannel(channel) {
+    return channel === "key" || channel === "search";
+}
+
 /**
  * @param {import("../types/encoder.js").Accessor[]} accessors
  * @param {(channel: import("../spec/channel.js").ChannelWithScale) => import("../types/encoder.js").VegaScale} scaleSource
@@ -237,7 +257,7 @@ export function findChannelDefWithScale(channelDef) {
  */
 export function getChannelDefWithScale(view, channel) {
     const channelDef = view.mark.encoding[channel];
-    if (isChannelDefWithScale(channelDef)) {
+    if (!Array.isArray(channelDef) && isChannelDefWithScale(channelDef)) {
         return channelDef;
     } else {
         throw new Error("Not a channel def with scale!");

package/dist/src/encoder/metadataChannels.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Returns key fields used for point selections, if configured.
+ *
+ * @param {import("../spec/channel.js").Encoding} encoding
+ * @returns {string[] | undefined}
+ */
+export function getEncodingKeyFields(encoding: import("../spec/channel.js").Encoding): string[] | undefined;
+/**
+ * Returns search fields configured in encoding.search, if any.
+ *
+ * @param {import("../spec/channel.js").Encoding} encoding
+ * @returns {string[] | undefined}
+ */
+export function getEncodingSearchFields(encoding: import("../spec/channel.js").Encoding): string[] | undefined;
+//# sourceMappingURL=metadataChannels.d.ts.map

package/dist/src/encoder/metadataChannels.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadataChannels.d.ts","sourceRoot":"","sources":["../../../src/encoder/metadataChannels.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,+CAHW,OAAO,oBAAoB,EAAE,QAAQ,GACnC,MAAM,EAAE,GAAG,SAAS,CAIhC;AAED;;;;;GAKG;AACH,kDAHW,OAAO,oBAAoB,EAAE,QAAQ,GACnC,MAAM,EAAE,GAAG,SAAS,CAIhC"}

package/dist/src/encoder/metadataChannels.js

@@ -0,0 +1,65 @@
+/**
+ * Returns key fields used for point selections, if configured.
+ *
+ * @param {import("../spec/channel.js").Encoding} encoding
+ * @returns {string[] | undefined}
+ */
+export function getEncodingKeyFields(encoding) {
+    return getNormalizedFieldsFromChannel(encoding?.key, "key");
+}
+
+/**
+ * Returns search fields configured in encoding.search, if any.
+ *
+ * @param {import("../spec/channel.js").Encoding} encoding
+ * @returns {string[] | undefined}
+ */
+export function getEncodingSearchFields(encoding) {
+    return getNormalizedFieldsFromChannel(encoding?.search, "search");
+}
+
+/**
+ * @param {import("../spec/channel.js").FieldDefWithoutScale | import("../spec/channel.js").FieldDefWithoutScale[] | undefined} channelDef
+ * @param {"key" | "search"} channelName
+ * @returns {string[] | undefined}
+ */
+function getNormalizedFieldsFromChannel(channelDef, channelName) {
+    if (!channelDef) {
+        return;
+    }
+
+    const definitions = Array.isArray(channelDef) ? channelDef : [channelDef];
+    if (definitions.length === 0) {
+        throw new Error(
+            "The " + channelName + " channel array must not be empty."
+        );
+    }
+
+    /** @type {string[]} */
+    const fields = [];
+    for (const definition of definitions) {
+        if (
+            !definition ||
+            typeof definition !== "object" ||
+            !("field" in definition)
+        ) {
+            throw new Error(
+                "The " +
+                    channelName +
+                    " channel must be a field definition or an array of field definitions."
+            );
+        }
+
+        const fieldName = definition.field;
+        if (typeof fieldName !== "string") {
+            throw new Error(
+                "The " +
+                    channelName +
+                    " channel field definition must include a string field name."
+            );
+        }
+        fields.push(fieldName);
+    }
+
+    return fields;
+}

package/dist/src/encoder/metadataChannels.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=metadataChannels.test.d.ts.map

package/dist/src/encoder/metadataChannels.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadataChannels.test.d.ts","sourceRoot":"","sources":["../../../src/encoder/metadataChannels.test.js"],"names":[],"mappings":""}

package/dist/src/genome/scaleLocus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaleLocus.d.ts","sourceRoot":"","sources":["../../../src/genome/scaleLocus.js"],"names":[],"mappings":"AAMA,2EAyFC;;AASD;;;;GAIG;AACH,8CAJW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,SAC5F,MAAM,GACJ,MAAM,GAAG,OAAO,aAAa,EAAE,gBAAgB,CAK3D;AAED;;;;GAIG;AACH,gDAJW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,WAC5F,MAAM,GAAG,OAAO,aAAa,EAAE,gBAAgB,GAC7C,MAAM,CAQlB;AAED;;;;GAIG;AACH,mDAJW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,YAC5F,OAAO,kBAAkB,EAAE,YAAY,GAAG,OAAO,kBAAkB,EAAE,aAAa,GAChF,MAAM,EAAE,CAQpB;AAED;;;;GAIG;AACH,iDAJW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,YAC5F,OAAO,kBAAkB,EAAE,YAAY,GAAG,OAAO,kBAAkB,EAAE,aAAa,GAChF,OAAO,kBAAkB,EAAE,YAAY,GAAG,OAAO,kBAAkB,EAAE,aAAa,CAO9F;AAED;;;GAGG;AACH,+CAHW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,GAC1F,MAAM,EAAE,CAQpB"}
+{"version":3,"file":"scaleLocus.d.ts","sourceRoot":"","sources":["../../../src/genome/scaleLocus.js"],"names":[],"mappings":"AAMA,2EAsGC;;AASD;;;;GAIG;AACH,8CAJW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,SAC5F,MAAM,GACJ,MAAM,GAAG,OAAO,aAAa,EAAE,gBAAgB,CAK3D;AAED;;;;GAIG;AACH,gDAJW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,WAC5F,MAAM,GAAG,OAAO,aAAa,EAAE,gBAAgB,GAC7C,MAAM,CAQlB;AAED;;;;GAIG;AACH,mDAJW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,YAC5F,OAAO,kBAAkB,EAAE,YAAY,GAAG,OAAO,kBAAkB,EAAE,aAAa,GAChF,MAAM,EAAE,CAQpB;AAED;;;;GAIG;AACH,iDAJW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,YAC5F,OAAO,kBAAkB,EAAE,YAAY,GAAG,OAAO,kBAAkB,EAAE,aAAa,GAChF,OAAO,kBAAkB,EAAE,YAAY,GAAG,OAAO,kBAAkB,EAAE,aAAa,CAO9F;AAED;;;GAGG;AACH,+CAHW,OAAO,aAAa,EAAE,OAAO,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,SAAS,GAC1F,MAAM,EAAE,CAQpB"}

package/dist/src/genome/scaleLocus.js

@@ -90,7 +90,20 @@ export default function scaleLocus() {
 
     const originalCopy = scale.copy;
 
-    scale.copy = () => originalCopy().genome(genome);
+    scale.copy = () => {
+        const copied = originalCopy();
+        let copiedGenome = genome;
+        // @ts-expect-error
+        copied.genome = function (_) {
+            if (arguments.length) {
+                copiedGenome = _;
+                return copied;
+            } else {
+                return copiedGenome;
+            }
+        };
+        return copied.genome(genome);
+    };
 
     return scale;
 }

package/dist/src/genomeSpy/containerUi.d.ts

@@ -3,7 +3,6 @@
  */
 export function createContainerUi(container: HTMLElement): {
     canvasWrapper: HTMLElement;
-    loadingMessageElement: HTMLElement;
     loadingIndicatorsElement: HTMLElement;
     tooltip: Tooltip;
     styleElement: HTMLStyleElement;

package/dist/src/genomeSpy/containerUi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"containerUi.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/containerUi.js"],"names":[],"mappings":"AAGA;;GAEG;AACH,6CAFW,WAAW;;;;;;EA2CrB;AAED;;;GAGG;AACH,4CAHW,WAAW,WACX,MAAM,QAUhB;oBA5DmB,wBAAwB"}
+{"version":3,"file":"containerUi.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/containerUi.js"],"names":[],"mappings":"AAGA;;GAEG;AACH,6CAFW,WAAW;;;;;EA6BrB;AAED;;;GAGG;AACH,4CAHW,WAAW,WACX,MAAM,QAUhB;oBA9CmB,wBAAwB"}

package/dist/src/genomeSpy/containerUi.js

@@ -18,12 +18,6 @@ export function createContainerUi(container) {
 
     canvasWrapper.classList.add("loading");
 
-    const loadingMessageElement = element("div", {
-        class: "loading-message",
-        innerHTML: `<div class="message">Loading<span class="ellipsis">...</span></div>`,
-    });
-    canvasWrapper.appendChild(loadingMessageElement);
-
     const loadingIndicatorsElement = element("div", {
         class: "loading-indicators",
     });
@@ -31,16 +25,8 @@ export function createContainerUi(container) {
 
     const tooltip = new Tooltip(container);
 
-    loadingMessageElement
-        .querySelector(".message")
-        .addEventListener("transitionend", () => {
-            /** @type {HTMLElement} */ (loadingMessageElement).style.display =
-                "none";
-        });
-
     return {
         canvasWrapper,
-        loadingMessageElement,
         loadingIndicatorsElement,
         tooltip,
         styleElement,

package/dist/src/genomeSpy/loadingIndicatorManager.d.ts

@@ -1,14 +1,10 @@
 export default class LoadingIndicatorManager {
     /**
      * @param {HTMLElement} loadingIndicatorsElement
+     * @param {import("./loadingStatusRegistry.js").default} loadingStatusRegistry
      */
-    constructor(loadingIndicatorsElement: HTMLElement);
-    /**
-     * @param {import("../view/view.js").default} view
-     * @param {import("../types/viewContext.js").DataLoadingStatus} status
-     * @param {string} [detail]
-     */
-    setDataLoadingStatus(view: import("../view/view.js").default, status: import("../types/viewContext.js").DataLoadingStatus, detail?: string): void;
+    constructor(loadingIndicatorsElement: HTMLElement, loadingStatusRegistry: import("./loadingStatusRegistry.js").default);
+    destroy(): void;
     updateLayout(): void;
     #private;
 }

package/dist/src/genomeSpy/loadingIndicatorManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadingIndicatorManager.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/loadingIndicatorManager.js"],"names":[],"mappings":"AAIA;IAQI;;OAEG;IACH,sCAFW,WAAW,EASrB;IAED;;;;OAIG;IACH,2BAJW,OAAO,iBAAiB,EAAE,OAAO,UACjC,OAAO,yBAAyB,EAAE,iBAAiB,WACnD,MAAM,QAKhB;IAED,qBAwDC;;CACJ"}
+{"version":3,"file":"loadingIndicatorManager.d.ts","sourceRoot":"","sources":["../../../src/genomeSpy/loadingIndicatorManager.js"],"names":[],"mappings":"AAIA;IAYI;;;OAGG;IACH,sCAHW,WAAW,yBACX,OAAO,4BAA4B,EAAE,OAAO,EAWtD;IAED,gBAKC;IAED,qBAoGC;;CACJ"}

package/dist/src/genomeSpy/loadingIndicatorManager.js

@@ -5,45 +5,67 @@ import SPINNER from "../img/90-ring-with-bg.svg";
 export default class LoadingIndicatorManager {
     /** @type {HTMLElement} */
     #loadingIndicatorsElement;
+
     /**
-     * @type {Map<import("../view/view.js").default, { status: import("../types/viewContext.js").DataLoadingStatus, detail?: string }>}
+     * @type {import("./loadingStatusRegistry.js").default}
      */
-    #loadingViews;
+    #loadingStatusRegistry;
+
+    /** @type {(() => void) | null} */
+    #unsubscribe = null;
 
     /**
      * @param {HTMLElement} loadingIndicatorsElement
+     * @param {import("./loadingStatusRegistry.js").default} loadingStatusRegistry
      */
-    constructor(loadingIndicatorsElement) {
+    constructor(loadingIndicatorsElement, loadingStatusRegistry) {
         this.#loadingIndicatorsElement = loadingIndicatorsElement;
 
-        /**
-         * @type {Map<import("../view/view.js").default, { status: import("../types/viewContext.js").DataLoadingStatus, detail?: string }>}
-         */
-        this.#loadingViews = new Map();
-    }
+        this.#loadingStatusRegistry = loadingStatusRegistry;
 
-    /**
-     * @param {import("../view/view.js").default} view
-     * @param {import("../types/viewContext.js").DataLoadingStatus} status
-     * @param {string} [detail]
-     */
-    setDataLoadingStatus(view, status, detail) {
-        this.#loadingViews.set(view, { status, detail });
+        this.#unsubscribe = this.#loadingStatusRegistry.subscribe(() =>
+            this.updateLayout()
+        );
         this.updateLayout();
     }
 
+    destroy() {
+        if (this.#unsubscribe) {
+            this.#unsubscribe();
+            this.#unsubscribe = null;
+        }
+    }
+
     updateLayout() {
         /** @type {import("lit").TemplateResult[]} */
         const indicators = [];
 
-        const isSomethingVisible = () =>
-            [...this.#loadingViews.values()].some(
-                (v) => v.status == "loading" || v.status == "error"
-            );
+        const isSomethingVisible = () => {
+            for (const [, status] of this.#loadingStatusRegistry.entries()) {
+                if (status.status == "loading" || status.status == "error") {
+                    return true;
+                }
+            }
+            return false;
+        };
+
+        /** @type {{ status: import("../types/viewContext.js").DataLoadingStatus, detail?: string } | undefined} */
+        let fallbackStatus;
+        let hasVisibleWithCoords = false;
+
+        for (const [view, status] of this.#loadingStatusRegistry.entries()) {
+            const isVisible =
+                status.status == "loading" || status.status == "error";
 
-        for (const [view, status] of this.#loadingViews) {
             const c = view.coords;
+            if (!c && isVisible && !fallbackStatus) {
+                fallbackStatus = status;
+            }
             if (c) {
+                if (isVisible) {
+                    hasVisibleWithCoords = true;
+                }
+
                 const style = {
                     left: `${c.x}px`,
                     top: `${c.y}px`,
@@ -70,6 +92,32 @@ export default class LoadingIndicatorManager {
             }
         }
 
+        if (fallbackStatus && !hasVisibleWithCoords) {
+            const style = {
+                left: "0px",
+                top: "0px",
+                width: "100%",
+                height: "100%",
+            };
+            indicators.push(
+                html`<div style=${styleMap(style)}>
+                    <div class=${fallbackStatus.status}>
+                        ${fallbackStatus.status == "error"
+                            ? html`<span
+                                  >Loading
+                                  failed${fallbackStatus.detail
+                                      ? html`: ${fallbackStatus.detail}`
+                                      : nothing}</span
+                              >`
+                            : html`
+                                  <img src="${SPINNER}" alt="" />
+                                  <span>Loading...</span>
+                              `}
+                    </div>
+                </div>`
+            );
+        }
+
         // Do some hacks to stop css animations of the loading indicators.
         // Otherwise they fire animation frames even when their opacity is zero.
         // TODO: Instead of this, replace the animated spinners with static images.