@genome-spy/core 0.26.0 → 0.28.0

package/dist/schema.json

@@ -946,6 +946,19 @@
       },
       "type": "object"
     },
+    "ExprDef": {
+      "additionalProperties": false,
+      "properties": {
+        "expr": {
+          "description": "An expression. Properties of the data can be accessed through the `datum` object.",
+          "type": "string"
+        }
+      },
+      "required": [
+        "expr"
+      ],
+      "type": "object"
+    },
     "Field": {
       "description": "The name of the field or a JavaScript expression for accessing nested properties. Dots and brackets in the field name must be escaped.",
       "type": "string"
@@ -4570,6 +4583,9 @@
         },
         {
           "$ref": "#/definitions/StringDatumDef"
+        },
+        {
+          "$ref": "#/definitions/ExprDef"
         }
       ]
     },

package/package.json

@@ -7,7 +7,7 @@
   },
   "contributors": [],
   "license": "BSD-2-Clause",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "main": "dist/index.js",
   "module": "src/index.js",
   "exports": {
@@ -46,12 +46,11 @@
     "d3-format": "^3.0.1",
     "flatqueue": "^2.0.3",
     "internmap": "^2.0.3",
-    "lit-html": "^2.0.2",
+    "lit-html": "^2.4.0",
     "twgl.js": "^4.19.1",
     "vega-expression": "^5.0.0",
     "vega-loader": "^4.4.0",
     "vega-scale": "^7.1.1",
     "vega-util": "^1.16.0"
-  },
-  "gitHead": "586a200b57b9d9ef12b2d28d7a843b2c7cc1b33a"
+  }
 }

package/src/spec/channel.d.ts

@@ -293,7 +293,10 @@ export interface StringFieldDef<F extends Field>
     extends FieldDefWithoutScale<F>,
         FormatMixins {}
 
-export type TextDef<F extends Field> = StringFieldDef<F> | StringDatumDef;
+export type TextDef<F extends Field> =
+    | StringFieldDef<F>
+    | StringDatumDef
+    | ExprDef;
 
 export type ChannelDef<F extends Field = string> =
     Encoding<F>[keyof Encoding<F>];

package/src/view/gridView.js

@@ -3,6 +3,7 @@ import {
     FlexDimensions,
     getLargestSize,
     mapToPixelCoords,
+    parseSizeDef,
     ZERO_SIZEDEF,
 } from "../utils/layout/flexLayout";
 import Grid from "../utils/layout/grid";
@@ -429,6 +430,13 @@ export default class GridView extends ContainerView {
         let grow = 0;
         let px = 0;
 
+        const explicitSize =
+            (direction == "row" && this.spec.height) ||
+            (direction == "column" && this.spec.width);
+        if (explicitSize !== undefined && explicitSize !== "") {
+            return parseSizeDef(explicitSize);
+        }
+
         const sizes = this.#getSizes(direction);
 
         for (const [i, size] of sizes.entries()) {

package/LICENSE

@@ -1,24 +0,0 @@
-BSD 2-Clause License
-
-Copyright (c) 2018-2022 Kari Lavikka
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.